From f703536977143b4474c5704233146ef12247fdf5 Mon Sep 17 00:00:00 2001 From: Brent Westbrook <36778786+ntBre@users.noreply.github.com> Date: Thu, 28 Aug 2025 10:56:58 -0400 Subject: [PATCH] Use new diff rendering format in tests (#20101) ## Summary I spun this off from #19919 to separate the rendering code change and snapshot updates from the (much smaller) changes to expose this in the CLI. I grouped all of the `ruff_linter` snapshot changes in the final commit in an effort to make this easier to review. The code changes are in [this range](https://github.com/astral-sh/ruff/pull/20101/files/619395eb417d2030e31fbb0e487a72dac58902db). I went through all of the snapshots, albeit fairly quickly, and they all looked correct to me. In the last few commits I was trying to resolve an existing issue in the alignment of the line number separator: https://github.com/astral-sh/ruff/blob/73720c73be981df6f71ce837a67ca1167da0265e/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap#L87-L89 In the snapshot above on `main`, you can see that a double-digit line number at the end of the context lines for a snippet was causing a misalignment with the other separators. That's now resolved. The one downside is that this can lead to a mismatch with the diagnostic above: ``` C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:4:6 | 2 | t2 = tuple([1, 2]) 3 | t3 = tuple((1, 2)) 4 | t4 = tuple([ | ______^ 5 | | 1, 6 | | 2 7 | | ]) | |__^ 8 | t5 = tuple( 9 | (1, 2) | help: Rewrite as a tuple literal 1 | t1 = tuple([]) 2 | t2 = tuple([1, 2]) 3 | t3 = tuple((1, 2)) - t4 = tuple([ 4 + t4 = ( 5 | 1, 6 | 2 - ]) 7 + ) 8 | t5 = tuple( 9 | (1, 2) 10 | ) note: This is an unsafe fix and may remove comments or change runtime behavior ``` But I don't think we can avoid that without really reworking this rendering to make the diagnostic and diff rendering aware of each other. Anyway, this should only happen in relatively rare cases where the diagnostic is near a digit boundary and also near a context boundary. Most of our diagnostics line up nicely. Another potential downside of the new rendering format is its handling of long stretches of `+` or `-` lines: ``` help: Replace with `Literal[...] | None` 21 | ... 22 | 23 | - def func6(arg1: Literal[ - "hello", - None # Comment 1 - , "world" - ]): 24 + def func6(arg1: Literal["hello", "world"] | None): 25 | ... 26 | 27 | note: This is an unsafe fix and may remove comments or change runtime behavior ``` To me it just seems a little hard to tell what's going on with just a long streak of `-`-prefixed lines. I saw an even more exaggerated example at some point, but I think this is also fairly rare. Most of the snapshots seem more like the examples we looked at on Discord with plenty of `|` lines and pairs of `+` and `-` lines. ## Test Plan Existing tests plus one new test in `ruff_db` to isolate a line separator alignment issue --- crates/ruff_db/src/diagnostic/render/full.rs | 287 ++-- crates/ruff_db/src/diagnostic/stylesheet.rs | 9 +- ...airflow__tests__AIR301_AIR301_args.py.snap | 198 ++- ...sts__AIR301_AIR301_class_attribute.py.snap | 600 ++++---- ...flow__tests__AIR301_AIR301_context.py.snap | 18 +- ...irflow__tests__AIR301_AIR301_names.py.snap | 31 +- ...ow__tests__AIR301_AIR301_names_fix.py.snap | 835 +++++------ ...__AIR301_AIR301_provider_names_fix.py.snap | 254 ++-- ...rflow__tests__AIR302_AIR302_amazon.py.snap | 255 ++-- ...rflow__tests__AIR302_AIR302_celery.py.snap | 69 +- ...w__tests__AIR302_AIR302_common_sql.py.snap | 649 ++++---- ..._tests__AIR302_AIR302_daskexecutor.py.snap | 15 +- ...irflow__tests__AIR302_AIR302_druid.py.snap | 106 +- ..._airflow__tests__AIR302_AIR302_fab.py.snap | 434 +++--- ...airflow__tests__AIR302_AIR302_hdfs.py.snap | 38 +- ...airflow__tests__AIR302_AIR302_hive.py.snap | 452 +++--- ...airflow__tests__AIR302_AIR302_http.py.snap | 60 +- ...airflow__tests__AIR302_AIR302_jdbc.py.snap | 44 +- ...w__tests__AIR302_AIR302_kubernetes.py.snap | 1045 +++++++------ ...irflow__tests__AIR302_AIR302_mysql.py.snap | 71 +- ...rflow__tests__AIR302_AIR302_oracle.py.snap | 15 +- ...ow__tests__AIR302_AIR302_papermill.py.snap | 15 +- ..._airflow__tests__AIR302_AIR302_pig.py.snap | 38 +- ...low__tests__AIR302_AIR302_postgres.py.snap | 19 +- ...rflow__tests__AIR302_AIR302_presto.py.snap | 15 +- ...irflow__tests__AIR302_AIR302_samba.py.snap | 15 +- ...irflow__tests__AIR302_AIR302_slack.py.snap | 61 +- ...airflow__tests__AIR302_AIR302_smtp.py.snap | 34 +- ...rflow__tests__AIR302_AIR302_sqlite.py.snap | 15 +- ...low__tests__AIR302_AIR302_standard.py.snap | 498 +++---- ...flow__tests__AIR302_AIR302_zendesk.py.snap | 15 +- ...irflow__tests__AIR311_AIR311_names.py.snap | 874 ++++++----- ...les__airflow__tests__AIR312_AIR312.py.snap | 904 ++++++----- ...s__eradicate__tests__ERA001_ERA001.py.snap | 311 ++-- ...non-annotated-dependency_FAST002_0.py.snap | 396 +++-- ...nnotated-dependency_FAST002_0.py_py38.snap | 396 +++-- ...non-annotated-dependency_FAST002_1.py.snap | 93 +- ...nnotated-dependency_FAST002_1.py_py38.snap | 93 +- ...i-redundant-response-model_FAST001.py.snap | 190 ++- ...-api-unused-path-parameter_FAST003.py.snap | 418 +++--- ..._annotations__tests__auto_return_type.snap | 711 +++++---- ...tations__tests__auto_return_type_py38.snap | 885 ++++++----- ...__flake8_annotations__tests__defaults.snap | 110 +- ...otations__tests__ignore_fully_untyped.snap | 53 +- ..._annotations__tests__mypy_init_return.snap | 72 +- ...otations__tests__simple_magic_methods.snap | 258 ++-- ...tions__tests__suppress_none_returning.snap | 38 +- ...e8_async__tests__ASYNC105_ASYNC105.py.snap | 456 +++--- ...e8_async__tests__ASYNC115_ASYNC115.py.snap | 263 ++-- ...e8_async__tests__ASYNC116_ASYNC116.py.snap | 360 +++-- ...__flake8_bugbear__tests__B004_B004.py.snap | 85 +- ...flake8_bugbear__tests__B006_B006_1.py.snap | 15 +- ...flake8_bugbear__tests__B006_B006_2.py.snap | 17 +- ...flake8_bugbear__tests__B006_B006_3.py.snap | 17 +- ...flake8_bugbear__tests__B006_B006_4.py.snap | 21 +- ...flake8_bugbear__tests__B006_B006_5.py.snap | 339 ++--- ...flake8_bugbear__tests__B006_B006_6.py.snap | 21 +- ...flake8_bugbear__tests__B006_B006_7.py.snap | 21 +- ...flake8_bugbear__tests__B006_B006_8.py.snap | 91 +- ...ke8_bugbear__tests__B006_B006_B008.py.snap | 441 +++--- ...__flake8_bugbear__tests__B007_B007.py.snap | 76 +- ...ke8_bugbear__tests__B009_B009_B010.py.snap | 332 ++--- ...ke8_bugbear__tests__B010_B009_B010.py.snap | 108 +- ...__flake8_bugbear__tests__B011_B011.py.snap | 30 +- ...__flake8_bugbear__tests__B013_B013.py.snap | 36 +- ...__flake8_bugbear__tests__B014_B014.py.snap | 86 +- ...__flake8_bugbear__tests__B028_B028.py.snap | 76 +- ...__flake8_bugbear__tests__B033_B033.py.snap | 158 +- ...rules__flake8_bugbear__tests__B905.py.snap | 174 +-- ...extend_immutable_calls_arg_annotation.snap | 15 +- ...rules__flake8_commas__tests__COM81.py.snap | 810 +++++----- ...commas__tests__preview_diff__COM81.py.snap | 96 +- ...8_comprehensions__tests__C400_C400.py.snap | 189 ++- ...8_comprehensions__tests__C401_C401.py.snap | 493 +++--- ...8_comprehensions__tests__C402_C402.py.snap | 245 ++- ...8_comprehensions__tests__C403_C403.py.snap | 432 +++--- ...8_comprehensions__tests__C404_C404.py.snap | 178 ++- ...8_comprehensions__tests__C405_C405.py.snap | 575 ++++--- ...8_comprehensions__tests__C406_C406.py.snap | 58 +- ...8_comprehensions__tests__C408_C408.py.snap | 540 ++++--- ...low_dict_calls_with_keyword_arguments.snap | 165 +- ...8_comprehensions__tests__C409_C409.py.snap | 225 ++- ...8_comprehensions__tests__C410_C410.py.snap | 112 +- ...8_comprehensions__tests__C411_C411.py.snap | 15 +- ...8_comprehensions__tests__C413_C413.py.snap | 299 ++-- ...8_comprehensions__tests__C414_C414.py.snap | 454 +++--- ...8_comprehensions__tests__C416_C416.py.snap | 133 +- ...8_comprehensions__tests__C417_C417.py.snap | 334 ++--- ...comprehensions__tests__C417_C417_1.py.snap | 19 +- ...8_comprehensions__tests__C418_C418.py.snap | 68 +- ...8_comprehensions__tests__C419_C419.py.snap | 189 ++- ...8_comprehensions__tests__C420_C420.py.snap | 227 ++- ...comprehensions__tests__C420_C420_1.py.snap | 12 +- ...comprehensions__tests__C420_C420_2.py.snap | 12 +- ...ensions__tests__preview__C409_C409.py.snap | 315 ++-- ...sions__tests__preview__C419_C419_1.py.snap | 91 +- ...__rules__flake8_errmsg__tests__custom.snap | 280 ++-- ...rules__flake8_errmsg__tests__defaults.snap | 353 +++-- ..._rules__flake8_errmsg__tests__preview.snap | 32 +- ...flake8_executable__tests__EXE004_1.py.snap | 6 +- ...flake8_executable__tests__EXE004_4.py.snap | 8 +- ...ture_annotations__tests__edge_case.py.snap | 22 +- ...02_no_future_import_uses_lowercase.py.snap | 11 +- ..._fa102_no_future_import_uses_union.py.snap | 22 +- ..._no_future_import_uses_union_inner.py.snap | 22 +- ...tations__tests__from_typing_import.py.snap | 11 +- ...ns__tests__from_typing_import_many.py.snap | 22 +- ..._annotations__tests__import_typing.py.snap | 11 +- ...notations__tests__import_typing_as.py.snap | 11 +- ...icit_str_concat__tests__ISC001_ISC.py.snap | 384 +++-- ...icit_str_concat__tests__ISC003_ISC.py.snap | 306 ++-- ...oncat__tests__multiline_ISC001_ISC.py.snap | 384 +++-- ...8_import_conventions__tests__defaults.snap | 247 ++- ..._import_conventions__tests__same_name.snap | 13 +- ...ke8_import_conventions__tests__tricky.snap | 21 +- ...ake8_logging__tests__LOG001_LOG001.py.snap | 30 +- ...ake8_logging__tests__LOG002_LOG002.py.snap | 76 +- ...e8_logging__tests__LOG004_LOG004_0.py.snap | 114 +- ...e8_logging__tests__LOG004_LOG004_1.py.snap | 13 +- ...ake8_logging__tests__LOG009_LOG009.py.snap | 32 +- ...e8_logging__tests__LOG014_LOG014_0.py.snap | 152 +- ...e8_logging__tests__LOG014_LOG014_1.py.snap | 13 +- ...flake8_logging_format__tests__G010.py.snap | 70 +- ..._format__tests__preview__G004_G004.py.snap | 126 +- ...__flake8_pie__tests__PIE790_PIE790.py.snap | 614 ++++---- ...__flake8_pie__tests__PIE794_PIE794.py.snap | 96 +- ...__flake8_pie__tests__PIE800_PIE800.py.snap | 446 +++--- ...__flake8_pie__tests__PIE804_PIE804.py.snap | 197 ++- ...__flake8_pie__tests__PIE807_PIE807.py.snap | 106 +- ...__flake8_pie__tests__PIE808_PIE808.py.snap | 44 +- ...__flake8_pie__tests__PIE810_PIE810.py.snap | 144 +- ...es__flake8_print__tests__T201_T201.py.snap | 68 +- ...es__flake8_print__tests__T203_T203.py.snap | 30 +- ..._flake8_pyi__tests__PYI009_PYI009.pyi.snap | 28 +- ..._flake8_pyi__tests__PYI010_PYI010.pyi.snap | 54 +- ..._flake8_pyi__tests__PYI011_PYI011.pyi.snap | 384 +++-- ..._flake8_pyi__tests__PYI012_PYI012.pyi.snap | 96 +- ...__flake8_pyi__tests__PYI013_PYI013.py.snap | 144 +- ..._flake8_pyi__tests__PYI013_PYI013.pyi.snap | 176 +-- ..._flake8_pyi__tests__PYI014_PYI014.pyi.snap | 268 ++-- ..._flake8_pyi__tests__PYI015_PYI015.pyi.snap | 198 ++- ...__flake8_pyi__tests__PYI016_PYI016.py.snap | 900 +++++------ ..._flake8_pyi__tests__PYI016_PYI016.pyi.snap | 872 +++++------ ...__flake8_pyi__tests__PYI018_PYI018.py.snap | 85 +- ..._flake8_pyi__tests__PYI018_PYI018.pyi.snap | 85 +- ...flake8_pyi__tests__PYI019_PYI019_0.py.snap | 714 ++++----- ...lake8_pyi__tests__PYI019_PYI019_0.pyi.snap | 723 ++++----- ...lake8_pyi__tests__PYI019_PYI019_1.pyi.snap | 12 +- ..._flake8_pyi__tests__PYI020_PYI020.pyi.snap | 162 +- ..._flake8_pyi__tests__PYI021_PYI021.pyi.snap | 95 +- ...flake8_pyi__tests__PYI025_PYI025_1.py.snap | 44 +- ...lake8_pyi__tests__PYI025_PYI025_1.pyi.snap | 172 +-- ...flake8_pyi__tests__PYI025_PYI025_2.py.snap | 41 +- ...lake8_pyi__tests__PYI025_PYI025_2.pyi.snap | 41 +- ...flake8_pyi__tests__PYI025_PYI025_3.py.snap | 13 +- ...lake8_pyi__tests__PYI025_PYI025_3.pyi.snap | 13 +- ..._flake8_pyi__tests__PYI026_PYI026.pyi.snap | 138 +- ..._flake8_pyi__tests__PYI029_PYI029.pyi.snap | 50 +- ...__flake8_pyi__tests__PYI030_PYI030.py.snap | 537 +++---- ..._flake8_pyi__tests__PYI030_PYI030.pyi.snap | 519 +++---- ...__flake8_pyi__tests__PYI032_PYI032.py.snap | 62 +- ..._flake8_pyi__tests__PYI032_PYI032.pyi.snap | 62 +- ...__flake8_pyi__tests__PYI034_PYI034.py.snap | 450 +++--- ..._flake8_pyi__tests__PYI034_PYI034.pyi.snap | 428 +++--- ...__flake8_pyi__tests__PYI036_PYI036.py.snap | 54 +- ..._flake8_pyi__tests__PYI036_PYI036.pyi.snap | 54 +- ...flake8_pyi__tests__PYI041_PYI041_1.py.snap | 326 ++-- ...lake8_pyi__tests__PYI041_PYI041_1.pyi.snap | 322 ++-- ..._flake8_pyi__tests__PYI044_PYI044.pyi.snap | 28 +- ..._flake8_pyi__tests__PYI053_PYI053.pyi.snap | 144 +- ..._flake8_pyi__tests__PYI054_PYI054.pyi.snap | 132 +- ...__flake8_pyi__tests__PYI055_PYI055.py.snap | 149 +- ..._flake8_pyi__tests__PYI055_PYI055.pyi.snap | 239 ++- ...__flake8_pyi__tests__PYI058_PYI058.py.snap | 156 +- ..._flake8_pyi__tests__PYI058_PYI058.pyi.snap | 174 +-- ...__flake8_pyi__tests__PYI059_PYI059.py.snap | 130 +- ..._flake8_pyi__tests__PYI059_PYI059.pyi.snap | 92 +- ...__flake8_pyi__tests__PYI061_PYI061.py.snap | 338 ++--- ..._flake8_pyi__tests__PYI061_PYI061.pyi.snap | 230 ++- ...__flake8_pyi__tests__PYI062_PYI062.py.snap | 307 ++-- ..._flake8_pyi__tests__PYI062_PYI062.pyi.snap | 307 ++-- ...__flake8_pyi__tests__PYI064_PYI064.py.snap | 74 +- ..._flake8_pyi__tests__PYI064_PYI064.pyi.snap | 70 +- ...pyi__tests__preview__PYI016_PYI016.py.snap | 1098 ++++++-------- ...yi__tests__preview__PYI016_PYI016.pyi.snap | 1060 ++++++------- ...e8_pyi__tests__py38_PYI026_PYI026.pyi.snap | 138 +- ...ke8_pyi__tests__py38_PYI061_PYI061.py.snap | 408 +++-- ...e8_pyi__tests__py38_PYI061_PYI061.pyi.snap | 230 ++- ...e8_pytest_style__tests__PT001_default.snap | 179 +-- ...ytest_style__tests__PT001_parentheses.snap | 54 +- ...es__flake8_pytest_style__tests__PT003.snap | 152 +- ..._pytest_style__tests__PT006_and_PT007.snap | 44 +- ...flake8_pytest_style__tests__PT006_csv.snap | 240 ++- ...e8_pytest_style__tests__PT006_default.snap | 430 +++--- ...lake8_pytest_style__tests__PT006_list.snap | 392 +++-- ...est_style__tests__PT007_list_of_lists.snap | 206 ++- ...st_style__tests__PT007_list_of_tuples.snap | 206 ++- ...st_style__tests__PT007_tuple_of_lists.snap | 317 ++-- ...t_style__tests__PT007_tuple_of_tuples.snap | 317 ++-- ...es__flake8_pytest_style__tests__PT009.snap | 549 ++++--- ...es__flake8_pytest_style__tests__PT014.snap | 165 +- ...es__flake8_pytest_style__tests__PT018.snap | 337 ++--- ...es__flake8_pytest_style__tests__PT022.snap | 60 +- ...e8_pytest_style__tests__PT023_default.snap | 157 +- ...ytest_style__tests__PT023_parentheses.snap | 90 +- ...es__flake8_pytest_style__tests__PT024.snap | 62 +- ...es__flake8_pytest_style__tests__PT025.snap | 30 +- ...es__flake8_pytest_style__tests__PT026.snap | 36 +- ...__flake8_pytest_style__tests__PT027_0.snap | 236 ++- ...__flake8_pytest_style__tests__PT027_1.snap | 164 +- ...es__flake8_pytest_style__tests__PT028.snap | 207 ++- ...8_pytest_style__tests__is_pytest_test.snap | 74 +- ..._tests__only_docstring_doubles_all.py.snap | 12 +- ...es__tests__only_inline_doubles_all.py.snap | 16 +- ..._tests__only_multiline_doubles_all.py.snap | 18 +- ...ing_doubles_over_docstring_doubles.py.snap | 114 +- ...ubles_over_docstring_doubles_class.py.snap | 34 +- ...es_over_docstring_doubles_function.py.snap | 94 +- ...docstring_doubles_module_multiline.py.snap | 42 +- ...ocstring_doubles_module_singleline.py.snap | 26 +- ...ing_doubles_over_docstring_singles.py.snap | 66 +- ...ubles_over_docstring_singles_class.py.snap | 44 +- ...es_over_docstring_singles_function.py.snap | 56 +- ...g_singles_mixed_quotes_class_var_1.py.snap | 44 +- ...g_singles_mixed_quotes_class_var_2.py.snap | 88 +- ...xed_quotes_module_singleline_var_1.py.snap | 24 +- ...xed_quotes_module_singleline_var_2.py.snap | 36 +- ...docstring_singles_module_multiline.py.snap | 18 +- ...ocstring_singles_module_singleline.py.snap | 12 +- ...ing_singles_over_docstring_doubles.py.snap | 66 +- ...ngles_over_docstring_doubles_class.py.snap | 44 +- ...es_over_docstring_doubles_function.py.snap | 56 +- ...g_doubles_mixed_quotes_class_var_2.py.snap | 44 +- ...xed_quotes_module_singleline_var_2.py.snap | 12 +- ...docstring_doubles_module_multiline.py.snap | 18 +- ...ocstring_doubles_module_singleline.py.snap | 12 +- ...ing_singles_over_docstring_singles.py.snap | 138 +- ...ngles_over_docstring_singles_class.py.snap | 34 +- ...es_over_docstring_singles_function.py.snap | 94 +- ...docstring_singles_module_multiline.py.snap | 42 +- ...ocstring_singles_module_singleline.py.snap | 26 +- ...ests__require_doubles_over_singles.py.snap | 42 +- ...quire_doubles_over_singles_escaped.py.snap | 344 ++--- ...re_doubles_over_singles_escaped_py311.snap | 218 ++- ...s_over_singles_escaped_unnecessary.py.snap | 308 ++-- ...uire_doubles_over_singles_implicit.py.snap | 114 +- ...bles_over_singles_multiline_string.py.snap | 18 +- ...ver_singles_would_be_triple_quotes.py.snap | 24 +- ...ests__require_singles_over_doubles.py.snap | 36 +- ...quire_singles_over_doubles_escaped.py.snap | 394 +++-- ...re_singles_over_doubles_escaped_py311.snap | 268 ++-- ...s_over_doubles_escaped_unnecessary.py.snap | 324 ++-- ...uire_singles_over_doubles_implicit.py.snap | 114 +- ...gles_over_doubles_multiline_string.py.snap | 18 +- ...ver_doubles_would_be_triple_quotes.py.snap | 8 +- ...ry-paren-on-raise-exception_RSE102.py.snap | 284 ++-- ...lake8_return__tests__RET501_RET501.py.snap | 53 +- ...lake8_return__tests__RET502_RET502.py.snap | 16 +- ...lake8_return__tests__RET503_RET503.py.snap | 372 +++-- ...lake8_return__tests__RET504_RET504.py.snap | 313 ++-- ...lake8_return__tests__RET505_RET505.py.snap | 478 +++--- ...lake8_return__tests__RET506_RET506.py.snap | 156 +- ...lake8_return__tests__RET507_RET507.py.snap | 152 +- ...lake8_return__tests__RET508_RET508.py.snap | 166 +-- ...ke8_simplify__tests__SIM101_SIM101.py.snap | 161 +- ...ke8_simplify__tests__SIM102_SIM102.py.snap | 362 +++-- ...ke8_simplify__tests__SIM103_SIM103.py.snap | 372 +++-- ...8_simplify__tests__SIM105_SIM105_0.py.snap | 353 +++-- ...8_simplify__tests__SIM105_SIM105_1.py.snap | 23 +- ...8_simplify__tests__SIM105_SIM105_2.py.snap | 19 +- ...8_simplify__tests__SIM105_SIM105_4.py.snap | 15 +- ...ke8_simplify__tests__SIM108_SIM108.py.snap | 315 ++-- ...ke8_simplify__tests__SIM109_SIM109.py.snap | 72 +- ...ke8_simplify__tests__SIM110_SIM110.py.snap | 306 ++-- ...ke8_simplify__tests__SIM110_SIM111.py.snap | 306 ++-- ...ke8_simplify__tests__SIM112_SIM112.py.snap | 57 +- ...ke8_simplify__tests__SIM114_SIM114.py.snap | 410 +++-- ...ke8_simplify__tests__SIM117_SIM117.py.snap | 347 +++-- ...ke8_simplify__tests__SIM118_SIM118.py.snap | 355 ++--- ...ke8_simplify__tests__SIM201_SIM201.py.snap | 53 +- ...ke8_simplify__tests__SIM202_SIM202.py.snap | 53 +- ...ke8_simplify__tests__SIM208_SIM208.py.snap | 80 +- ...ke8_simplify__tests__SIM210_SIM210.py.snap | 66 +- ...ke8_simplify__tests__SIM211_SIM211.py.snap | 47 +- ...ke8_simplify__tests__SIM212_SIM212.py.snap | 30 +- ...ke8_simplify__tests__SIM220_SIM220.py.snap | 51 +- ...ke8_simplify__tests__SIM221_SIM221.py.snap | 51 +- ...ke8_simplify__tests__SIM222_SIM222.py.snap | 982 ++++++------ ...ke8_simplify__tests__SIM223_SIM223.py.snap | 944 ++++++------ ...ke8_simplify__tests__SIM300_SIM300.py.snap | 318 ++-- ...ke8_simplify__tests__SIM401_SIM401.py.snap | 163 +- ...ke8_simplify__tests__SIM905_SIM905.py.snap | 1189 +++++++-------- ...ke8_simplify__tests__SIM910_SIM910.py.snap | 152 +- ...ke8_simplify__tests__SIM911_SIM911.py.snap | 80 +- ...ify__tests__preview__SIM117_SIM117.py.snap | 336 ++--- ...ify__tests__preview__SIM905_SIM905.py.snap | 1323 ++++++++--------- ...ts__tests__ban_parent_imports_package.snap | 106 +- ..._invalid-todo-capitalization_TD006.py.snap | 42 +- ...__TC001-TC002-TC003_TC001-3_future.py.snap | 87 +- ...ts__add_future_import__TC001_TC001.py.snap | 37 +- ..._future_import__TC001_TC001_future.py.snap | 64 +- ...import__TC001_TC001_future_present.py.snap | 23 +- ...ts__add_future_import__TC002_TC002.py.snap | 291 ++-- ...ts__add_future_import__TC003_TC003.py.snap | 31 +- ...s__empty-type-checking-block_TC005.py.snap | 70 +- ..._type_checking__tests__exempt_modules.snap | 29 +- ...g__tests__github_issue_15681_fix_test.snap | 25 +- ...ke8_type_checking__tests__import_from.snap | 33 +- ...ests__import_from_type_checking_block.snap | 31 +- ...ype_checking__tests__multiple_members.snap | 70 +- ...sts__multiple_modules_different_types.snap | 50 +- ...ng__tests__multiple_modules_same_type.snap | 46 +- ...ype_checking__tests__no_typing_import.snap | 25 +- ...alias_TC008_union_syntax_pre_py310.py.snap | 30 +- ...mport-in-type-checking-block_quote.py.snap | 44 +- ...ping-only-third-party-import_quote.py.snap | 523 ++++--- ...ing-only-third-party-import_quote2.py.snap | 323 ++-- ...ing-only-third-party-import_quote3.py.snap | 249 ++-- ...ng__tests__quoted-type-alias_TC008.py.snap | 524 +++---- ...ias_TC008_typing_execution_context.py.snap | 219 ++- ...g__tests__runtime-cast-value_TC006.py.snap | 227 ++- ...ort-in-type-checking-block_TC004_1.py.snap | 17 +- ...rt-in-type-checking-block_TC004_11.py.snap | 19 +- ...rt-in-type-checking-block_TC004_12.py.snap | 23 +- ...rt-in-type-checking-block_TC004_17.py.snap | 25 +- ...ort-in-type-checking-block_TC004_2.py.snap | 21 +- ...ort-in-type-checking-block_TC004_4.py.snap | 21 +- ...ort-in-type-checking-block_TC004_5.py.snap | 63 +- ...ort-in-type-checking-block_TC004_9.py.snap | 42 +- ...in-type-checking-block_module__app.py.snap | 48 +- ...mport-in-type-checking-block_quote.py.snap | 52 +- ...k_runtime_evaluated_base_classes_1.py.snap | 77 +- ...ock_runtime_evaluated_decorators_1.py.snap | 77 +- ...-in-type-checking-block_whitespace.py.snap | 19 +- ...y-standard-library-import_init_var.py.snap | 54 +- ...ly-standard-library-import_kw_only.py.snap | 27 +- ...ing-only-third-party-import_strict.py.snap | 266 ++-- ...g__tests__tc004_precedence_over_tc007.snap | 21 +- ...g__tests__tc010_precedence_over_tc008.snap | 14 +- ...ests__type_checking_block_after_usage.snap | 25 +- ...g__tests__type_checking_block_comment.snap | 25 +- ...ng__tests__type_checking_block_inline.snap | 23 +- ...__tests__type_checking_block_own_line.snap | 23 +- ...ping-only-first-party-import_TC001.py.snap | 37 +- ...only-standard-library-import_TC003.py.snap | 31 +- ...rary-import_exempt_type_checking_1.py.snap | 23 +- ...rary-import_exempt_type_checking_2.py.snap | 23 +- ...rary-import_exempt_type_checking_3.py.snap | 25 +- ...y-standard-library-import_init_var.py.snap | 25 +- ...d-library-import_module__undefined.py.snap | 23 +- ...t_runtime_evaluated_base_classes_3.py.snap | 31 +- ...ort_runtime_evaluated_decorators_3.py.snap | 35 +- ...ibrary-import_singledispatchmethod.py.snap | 29 +- ...ping-only-third-party-import_TC002.py.snap | 291 ++-- ...t_runtime_evaluated_base_classes_2.py.snap | 64 +- ...ort_runtime_evaluated_decorators_2.py.snap | 25 +- ...-third-party-import_singledispatch.py.snap | 23 +- ...ing-only-third-party-import_strict.py.snap | 66 +- ...hird-party-import_typing_modules_1.py.snap | 29 +- ...hird-party-import_typing_modules_2.py.snap | 25 +- ...s__typing_import_after_package_import.snap | 27 +- ...__typing_import_before_package_import.snap | 23 +- ...__tests__unquoted-type-alias_TC007.py.snap | 175 ++- ..._use_pathlib__tests__PTH201_PTH201.py.snap | 332 ++--- ..._use_pathlib__tests__PTH210_PTH210.py.snap | 570 ++++--- ...se_pathlib__tests__PTH210_PTH210_1.py.snap | 456 +++--- ...lib__tests__preview__PTH201_PTH201.py.snap | 410 +++-- ...lib__tests__preview__PTH202_PTH202.py.snap | 623 ++++---- ...b__tests__preview__PTH202_PTH202_2.py.snap | 48 +- ...lib__tests__preview__PTH203_PTH203.py.snap | 257 ++-- ...lib__tests__preview__PTH204_PTH204.py.snap | 96 +- ...lib__tests__preview__PTH205_PTH205.py.snap | 96 +- ...lib__tests__preview__PTH211_PTH211.py.snap | 122 +- ..._pathlib__tests__preview_full_name.py.snap | 664 ++++----- ..._pathlib__tests__preview_import_as.py.snap | 445 +++--- ...athlib__tests__preview_import_from.py.snap | 584 ++++---- ...lib__tests__preview_import_from_as.py.snap | 475 +++--- ...rules__flynt__tests__FLY002_FLY002.py.snap | 127 +- ...kage_first_and_third_party_imports.py.snap | 30 +- ...kage_first_and_third_party_imports.py.snap | 28 +- ...tests__add_newline_before_comments.py.snap | 22 +- ..._isort__tests__as_imports_comments.py.snap | 40 +- ..._rules__isort__tests__bom_unsorted.py.snap | 10 +- ...sts__case_sensitive_case_sensitive.py.snap | 28 +- ...to_furthest_relative_imports_order.py.snap | 12 +- ...__isort__tests__combine_as_imports.py.snap | 12 +- ...bine_as_imports_combine_as_imports.py.snap | 12 +- ..._isort__tests__combine_import_from.py.snap | 28 +- ...ter__rules__isort__tests__comments.py.snap | 92 +- ..._isort__tests__deduplicate_imports.py.snap | 10 +- ...es__isort__tests__detect_same_package.snap | 12 +- ...les__isort__tests__fit_line_length.py.snap | 46 +- ...rt__tests__fit_line_length_comment.py.snap | 36 +- ...orce_single_line_force_single_line.py.snap | 96 +- ..._tests__force_sort_within_sections.py.snap | 40 +- ...ections_force_sort_within_sections.py.snap | 42 +- ..._force_sort_within_sections_future.py.snap | 8 +- ...sort_within_sections_with_as_names.py.snap | 20 +- ..._rules__isort__tests__force_to_top.py.snap | 68 +- ...__tests__force_to_top_force_to_top.py.snap | 74 +- ...__isort__tests__force_wrap_aliases.py.snap | 12 +- ...ce_wrap_aliases_force_wrap_aliases.py.snap | 16 +- ...les__isort__tests__forced_separate.py.snap | 24 +- ...__rules__isort__tests__future_from.py.snap | 8 +- ...kage_first_and_third_party_imports.py.snap | 30 +- ..._rules__isort__tests__if_elif_else.py.snap | 14 +- ...t__tests__import_from_after_import.py.snap | 8 +- ...les__isort__tests__inline_comments.py.snap | 38 +- ...__isort__tests__insert_empty_lines.py.snap | 64 +- ..._isort__tests__insert_empty_lines.pyi.snap | 46 +- ...sest_separate_local_folder_imports.py.snap | 24 +- ...lder_separate_local_folder_imports.py.snap | 26 +- ...gth_sort__length_sort_from_imports.py.snap | 10 +- ...ort__length_sort_non_ascii_members.py.snap | 32 +- ...ort__length_sort_non_ascii_modules.py.snap | 26 +- ...gth_sort_straight_and_from_imports.py.snap | 20 +- ...sort__length_sort_straight_imports.py.snap | 14 +- ..._length_sort_with_relative_imports.py.snap | 22 +- ...straight__length_sort_from_imports.py.snap | 10 +- ...gth_sort_straight_and_from_imports.py.snap | 14 +- ...ight__length_sort_straight_imports.py.snap | 14 +- ...es__isort__tests__line_ending_crlf.py.snap | 20 +- ...ules__isort__tests__line_ending_lf.py.snap | 20 +- ...isort__tests__lines_after_imports.pyi.snap | 30 +- ...s__lines_after_imports_class_after.py.snap | 30 +- ...ts__lines_after_imports_func_after.py.snap | 44 +- ...after_imports_lines_after_imports.pyi.snap | 30 +- ...ts_lines_after_imports_class_after.py.snap | 32 +- ...rts_lines_after_imports_func_after.py.snap | 42 +- ..._lines_after_imports_nothing_after.py.snap | 20 +- ...s_between_typeslines_between_types.py.snap | 20 +- ...isort__tests__magic_trailing_comma.py.snap | 106 +- ...r__rules__isort__tests__match_case.py.snap | 32 +- ...rules__isort__tests__natural_order.py.snap | 40 +- ..._isort__tests__no_detect_same_package.snap | 12 +- ...les__isort__tests__no_lines_before.py.snap | 20 +- ...no_lines_before.py_no_lines_before.py.snap | 22 +- ...o_lines_before_with_empty_sections.py.snap | 10 +- ...andard_library_no_standard_library.py.snap | 24 +- ..._rules__isort__tests__no_wrap_star.py.snap | 6 +- ...rules__isort__tests__order_by_type.py.snap | 38 +- ..._order_by_type_false_order_by_type.py.snap | 36 +- ..._order_by_type_with_custom_classes.py.snap | 20 +- ..._order_by_type_with_custom_classes.py.snap | 20 +- ...rder_by_type_with_custom_constants.py.snap | 12 +- ...rder_by_type_with_custom_constants.py.snap | 12 +- ...rder_by_type_with_custom_variables.py.snap | 12 +- ...rder_by_type_with_custom_variables.py.snap | 12 +- ...s__order_relative_imports_by_level.py.snap | 12 +- ...ort__tests__preserve_comment_order.py.snap | 22 +- ...isort__tests__preserve_import_star.py.snap | 24 +- ...isort__tests__preserve_indentation.py.snap | 30 +- ...comments_propagate_inline_comments.py.snap | 12 +- ...ort__tests__reorder_within_section.py.snap | 8 +- ...rt__tests__required_import_comment.py.snap | 10 +- ...uired_import_comments_and_newlines.py.snap | 14 +- ...__tests__required_import_docstring.py.snap | 10 +- ...docstring_followed_by_continuation.py.snap | 10 +- ...import_docstring_with_continuation.py.snap | 8 +- ...string_with_multiple_continuations.py.snap | 12 +- ...ed_import_docstring_with_semicolon.py.snap | 6 +- ...s__required_import_existing_import.py.snap | 8 +- ...equired_import_multiline_docstring.py.snap | 12 +- ..._isort__tests__required_import_off.py.snap | 12 +- ...ort__tests__required_import_unused.py.snap | 32 +- ..._tests__required_import_whitespace.py.snap | 14 +- ...required_import_with_alias_comment.py.snap | 10 +- ...t_with_alias_comments_and_newlines.py.snap | 14 +- ...quired_import_with_alias_docstring.py.snap | 10 +- ...docstring_followed_by_continuation.py.snap | 10 +- ..._alias_docstring_with_continuation.py.snap | 8 +- ...string_with_multiple_continuations.py.snap | 12 +- ...ith_alias_docstring_with_semicolon.py.snap | 6 +- ..._import_with_alias_existing_import.py.snap | 8 +- ...ort_with_alias_multiline_docstring.py.snap | 12 +- ...ts__required_import_with_alias_off.py.snap | 12 +- ..._tests__required_imports_docstring.py.snap | 20 +- ..._required_imports_multiple_strings.py.snap | 24 +- ...ort__tests__section_order_sections.py.snap | 26 +- ...__tests__sections_main_first_party.py.snap | 20 +- ...s__isort__tests__sections_sections.py.snap | 26 +- ...ests__separate_first_party_imports.py.snap | 20 +- ...rt__tests__separate_future_imports.py.snap | 14 +- ...sts__separate_local_folder_imports.py.snap | 28 +- ...ests__separate_third_party_imports.py.snap | 16 +- ..._linter__rules__isort__tests__skip.py.snap | 54 +- ...isort__tests__sort_similar_imports.py.snap | 82 +- ...linter__rules__isort__tests__split.py.snap | 54 +- ...railing_comma_magic_trailing_comma.py.snap | 94 +- ...__isort__tests__star_before_others.py.snap | 10 +- ...straight_required_import_docstring.py.snap | 10 +- ...traight_required_import_docstring.pyi.snap | 10 +- ...es__isort__tests__trailing_comment.py.snap | 120 +- ...er__rules__isort__tests__two_space.py.snap | 26 +- ...nter__rules__isort__tests__unicode.py.snap | 18 +- ...__numpy-deprecated-function_NPY003.py.snap | 208 ++- ...numpy-deprecated-type-alias_NPY001.py.snap | 142 +- ...__tests__numpy2-deprecation_NPY201.py.snap | 385 +++-- ...tests__numpy2-deprecation_NPY201_2.py.snap | 427 +++--- ...tests__numpy2-deprecation_NPY201_3.py.snap | 167 +-- ...es__pandas_vet__tests__PD002_PD002.py.snap | 137 +- ..._rules__pandas_vet__tests__PD002_fail.snap | 13 +- ...les__pep8_naming__tests__N804_N804.py.snap | 107 +- ...les__pep8_naming__tests__N805_N805.py.snap | 221 ++- ...naming__tests__classmethod_decorators.snap | 164 +- ...ing__tests__ignore_names_N804_N804.py.snap | 91 +- ...ing__tests__ignore_names_N805_N805.py.snap | 152 +- ...aming__tests__staticmethod_decorators.snap | 202 ++- ...__perflint__tests__PERF101_PERF101.py.snap | 262 ++-- ...__perflint__tests__PERF102_PERF102.py.snap | 224 ++- ...t__tests__preview__PERF401_PERF401.py.snap | 695 +++++---- ...t__tests__preview__PERF403_PERF403.py.snap | 419 +++--- ...ules__pycodestyle__tests__E201_E20.py.snap | 176 +-- ...ules__pycodestyle__tests__E202_E20.py.snap | 162 +- ...ules__pycodestyle__tests__E203_E20.py.snap | 320 ++-- ...les__pycodestyle__tests__E204_E204.py.snap | 54 +- ...ules__pycodestyle__tests__E211_E21.py.snap | 122 +- ...ules__pycodestyle__tests__E221_E22.py.snap | 160 +- ...ules__pycodestyle__tests__E222_E22.py.snap | 108 +- ...ules__pycodestyle__tests__E223_E22.py.snap | 18 +- ...ules__pycodestyle__tests__E224_E22.py.snap | 18 +- ...ules__pycodestyle__tests__E225_E22.py.snap | 216 ++- ...ules__pycodestyle__tests__E226_E22.py.snap | 468 +++--- ...ules__pycodestyle__tests__E227_E22.py.snap | 144 +- ...ules__pycodestyle__tests__E228_E22.py.snap | 54 +- ...ules__pycodestyle__tests__E231_E23.py.snap | 818 +++++----- ...ules__pycodestyle__tests__E241_E24.py.snap | 56 +- ...ules__pycodestyle__tests__E242_E24.py.snap | 18 +- ...ules__pycodestyle__tests__E251_E25.py.snap | 194 ++- ...ules__pycodestyle__tests__E252_E25.py.snap | 432 +++--- ...ules__pycodestyle__tests__E261_E26.py.snap | 14 +- ...ules__pycodestyle__tests__E262_E26.py.snap | 118 +- ...ules__pycodestyle__tests__E265_E26.py.snap | 108 +- ...ules__pycodestyle__tests__E266_E26.py.snap | 90 +- ...ules__pycodestyle__tests__E271_E27.py.snap | 180 +-- ...ules__pycodestyle__tests__E272_E27.py.snap | 54 +- ...ules__pycodestyle__tests__E273_E27.py.snap | 108 +- ...ules__pycodestyle__tests__E274_E27.py.snap | 36 +- ...ules__pycodestyle__tests__E275_E27.py.snap | 126 +- ...ules__pycodestyle__tests__E301_E30.py.snap | 80 +- ...ules__pycodestyle__tests__E302_E30.py.snap | 240 ++- ...ts__E302_E302_first_line_docstring.py.snap | 12 +- ...s__E302_E302_first_line_expression.py.snap | 12 +- ...sts__E302_E302_first_line_function.py.snap | 14 +- ...ts__E302_E302_first_line_statement.py.snap | 12 +- ...ules__pycodestyle__tests__E303_E30.py.snap | 224 ++- ...ests__E303_E303_first_line_comment.py.snap | 14 +- ...ts__E303_E303_first_line_docstring.py.snap | 14 +- ...s__E303_E303_first_line_expression.py.snap | 14 +- ...ts__E303_E303_first_line_statement.py.snap | 14 +- ...ules__pycodestyle__tests__E304_E30.py.snap | 54 +- ...ules__pycodestyle__tests__E305_E30.py.snap | 96 +- ...ules__pycodestyle__tests__E306_E30.py.snap | 176 +-- ...ules__pycodestyle__tests__E401_E40.py.snap | 158 +- ...ules__pycodestyle__tests__E703_E70.py.snap | 90 +- ...__pycodestyle__tests__E703_E703.ipynb.snap | 36 +- ...les__pycodestyle__tests__E711_E711.py.snap | 186 ++- ...les__pycodestyle__tests__E712_E712.py.snap | 258 ++-- ...les__pycodestyle__tests__E713_E713.py.snap | 98 +- ...les__pycodestyle__tests__E714_E714.py.snap | 44 +- ...les__pycodestyle__tests__E731_E731.py.snap | 524 ++++--- ...ules__pycodestyle__tests__W291_W29.py.snap | 54 +- ...les__pycodestyle__tests__W291_W291.py.snap | 64 +- ...s__pycodestyle__tests__W292_W292_0.py.snap | 8 +- ...ules__pycodestyle__tests__W293_W29.py.snap | 18 +- ...les__pycodestyle__tests__W293_W293.py.snap | 78 +- ...s__pycodestyle__tests__W605_W605_0.py.snap | 188 ++- ...s__pycodestyle__tests__W605_W605_1.py.snap | 588 ++++---- ...yle__tests__blank_lines_E301_notebook.snap | 16 +- ...yle__tests__blank_lines_E302_notebook.snap | 16 +- ...yle__tests__blank_lines_E303_notebook.snap | 34 +- ...__tests__blank_lines_E303_typing_stub.snap | 64 +- ...yle__tests__blank_lines_E304_notebook.snap | 16 +- ...__tests__blank_lines_E304_typing_stub.snap | 16 +- ...yle__tests__blank_lines_E305_notebook.snap | 16 +- ...yle__tests__blank_lines_E306_notebook.snap | 16 +- ...patibility-lines-after(-1)-between(0).snap | 106 +- ...mpatibility-lines-after(0)-between(0).snap | 100 +- ...mpatibility-lines-after(1)-between(1).snap | 86 +- ...mpatibility-lines-after(4)-between(4).snap | 142 +- ..._tests__blank_lines_typing_stub_isort.snap | 248 ++- ...pycodestyle__tests__constant_literals.snap | 490 +++--- ...destyle__tests__preview__E502_E502.py.snap | 248 ++- ...tyle__tests__preview__W391_W391.ipynb.snap | 58 +- ...style__tests__preview__W391_W391_0.py.snap | 10 +- ...style__tests__preview__W391_W391_2.py.snap | 16 +- ...r__rules__pycodestyle__tests__shebang.snap | 12 +- ...patibility-lines-after(-1)-between(0).snap | 112 +- ...mpatibility-lines-after(0)-between(0).snap | 148 +- ...mpatibility-lines-after(1)-between(1).snap | 120 +- ...mpatibility-lines-after(4)-between(4).snap | 92 +- ...er__rules__pycodestyle__tests__w292_4.snap | 6 +- ...__rules__pydocstyle__tests__D200_D.py.snap | 69 +- ...ules__pydocstyle__tests__D200_D200.py.snap | 21 +- ...__rules__pydocstyle__tests__D201_D.py.snap | 64 +- ...__rules__pydocstyle__tests__D202_D.py.snap | 64 +- ...ules__pydocstyle__tests__D202_D202.py.snap | 52 +- ...__rules__pydocstyle__tests__D203_D.py.snap | 96 +- ...__rules__pydocstyle__tests__D204_D.py.snap | 92 +- ...__rules__pydocstyle__tests__D205_D.py.snap | 16 +- ...__rules__pydocstyle__tests__D207_D.py.snap | 72 +- ...__rules__pydocstyle__tests__D208_D.py.snap | 378 +++-- ...ules__pydocstyle__tests__D208_D208.py.snap | 176 +-- ...__rules__pydocstyle__tests__D209_D.py.snap | 40 +- ...__rules__pydocstyle__tests__D210_D.py.snap | 54 +- ...__rules__pydocstyle__tests__D211_D.py.snap | 32 +- ...__rules__pydocstyle__tests__D212_D.py.snap | 64 +- ...__rules__pydocstyle__tests__D213_D.py.snap | 560 ++++--- ...ydocstyle__tests__D214_D214_module.py.snap | 34 +- ...__pydocstyle__tests__D214_sections.py.snap | 36 +- ...ules__pydocstyle__tests__D215_D215.py.snap | 12 +- ...__pydocstyle__tests__D215_sections.py.snap | 36 +- ...__rules__pydocstyle__tests__D300_D.py.snap | 188 ++- ...ules__pydocstyle__tests__D300_D300.py.snap | 18 +- ...__rules__pydocstyle__tests__D301_D.py.snap | 19 +- ...ules__pydocstyle__tests__D301_D301.py.snap | 51 +- ...__rules__pydocstyle__tests__D400_D.py.snap | 304 ++-- ...ules__pydocstyle__tests__D400_D400.py.snap | 243 ++- ...__pydocstyle__tests__D400_D400_415.py.snap | 15 +- ...ules__pydocstyle__tests__D403_D403.py.snap | 212 ++- ...__pydocstyle__tests__D405_sections.py.snap | 54 +- ...__pydocstyle__tests__D406_sections.py.snap | 54 +- ...__pydocstyle__tests__D407_sections.py.snap | 120 +- ...__pydocstyle__tests__D408_sections.py.snap | 16 +- ...__pydocstyle__tests__D409_sections.py.snap | 54 +- ...ules__pydocstyle__tests__D410_D410.py.snap | 32 +- ...__pydocstyle__tests__D410_sections.py.snap | 32 +- ...__pydocstyle__tests__D411_sections.py.snap | 48 +- ...__pydocstyle__tests__D412_sections.py.snap | 16 +- ...es__pydocstyle__tests__D412_sphinx.py.snap | 68 +- ...ules__pydocstyle__tests__D413_D413.py.snap | 88 +- ...__pydocstyle__tests__D413_sections.py.snap | 150 +- ...__rules__pydocstyle__tests__D415_D.py.snap | 304 ++-- ...__pydocstyle__tests__D415_D400_415.py.snap | 15 +- ...linter__rules__pydocstyle__tests__bom.snap | 6 +- ...__rules__pydocstyle__tests__d209_d400.snap | 23 +- ...ules__pyflakes__tests__F401_F401_0.py.snap | 236 ++- ...les__pyflakes__tests__F401_F401_11.py.snap | 18 +- ...les__pyflakes__tests__F401_F401_15.py.snap | 18 +- ...les__pyflakes__tests__F401_F401_17.py.snap | 32 +- ...les__pyflakes__tests__F401_F401_18.py.snap | 18 +- ...les__pyflakes__tests__F401_F401_23.py.snap | 16 +- ...les__pyflakes__tests__F401_F401_34.py.snap | 32 +- ...ules__pyflakes__tests__F401_F401_5.py.snap | 46 +- ...ules__pyflakes__tests__F401_F401_6.py.snap | 58 +- ...ules__pyflakes__tests__F401_F401_7.py.snap | 40 +- ...ules__pyflakes__tests__F401_F401_9.py.snap | 12 +- ...eprecated_option_F401_24____init__.py.snap | 45 +- ...on_F401_25__all_nonempty____init__.py.snap | 51 +- ...ption_F401_26__all_empty____init__.py.snap | 34 +- ...on_F401_27__all_mistyped____init__.py.snap | 34 +- ...on_F401_28__all_multiple____init__.py.snap | 34 +- ...F401_29__all_conditional____init__.py.snap | 38 +- ...ts__F401_deprecated_option_F401_30.py.snap | 10 +- ..._rules__pyflakes__tests__F504_F504.py.snap | 101 +- ..._rules__pyflakes__tests__F504_F50x.py.snap | 18 +- ..._rules__pyflakes__tests__F522_F522.py.snap | 93 +- ..._rules__pyflakes__tests__F523_F523.py.snap | 245 ++- ..._rules__pyflakes__tests__F541_F541.py.snap | 348 ++--- ..._rules__pyflakes__tests__F601_F601.py.snap | 144 +- ..._rules__pyflakes__tests__F602_F602.py.snap | 96 +- ..._rules__pyflakes__tests__F632_F632.py.snap | 210 ++- ...les__pyflakes__tests__F811_F811_17.py.snap | 16 +- ...les__pyflakes__tests__F811_F811_21.py.snap | 22 +- ...les__pyflakes__tests__F811_F811_32.py.snap | 16 +- ...ules__pyflakes__tests__F811_F811_6.py.snap | 12 +- ...ules__pyflakes__tests__F811_F811_8.py.snap | 16 +- ...ules__pyflakes__tests__F841_F841_0.py.snap | 259 ++-- ...ules__pyflakes__tests__F841_F841_1.py.snap | 128 +- ...ules__pyflakes__tests__F841_F841_3.py.snap | 629 ++++---- ..._rules__pyflakes__tests__F901_F901.py.snap | 52 +- ...hadowed_global_import_in_global_scope.snap | 18 +- ...shadowed_global_import_in_local_scope.snap | 28 +- ...shadowed_import_shadow_in_local_scope.snap | 12 +- ..._shadowed_local_import_in_local_scope.snap | 16 +- ...s__f401_allowed_unused_imports_option.snap | 10 +- ...view_first_party_submodule_dunder_all.snap | 12 +- ...lakes__tests__f841_dummy_variable_rgx.snap | 271 ++-- ...__pyflakes__tests__future_annotations.snap | 16 +- ...er_multiple_unbinds_from_module_scope.snap | 36 +- ...s__load_after_unbind_from_class_scope.snap | 18 +- ...__load_after_unbind_from_module_scope.snap | 18 +- ...after_unbind_from_nested_module_scope.snap | 36 +- ...yflakes__tests__multi_statement_lines.snap | 292 ++-- ...s__preview__F401_F401_24____init__.py.snap | 35 +- ...01_F401_25__all_nonempty____init__.py.snap | 41 +- ..._F401_F401_26__all_empty____init__.py.snap | 24 +- ...01_F401_28__all_multiple____init__.py.snap | 24 +- ...s__preview__F401_F401_33____init__.py.snap | 13 +- ...kes__tests__preview__F401___init__.py.snap | 11 +- ...in_body_after_double_shadowing_except.snap | 36 +- ..._print_in_body_after_shadowing_except.snap | 18 +- ...grep_hooks__tests__PGH004_PGH004_0.py.snap | 38 +- ...ests__PLC0207_missing_maxsplit_arg.py.snap | 648 ++++---- ..._tests__PLC0208_iteration_over_set.py.snap | 148 +- ...nt__tests__PLC0414_import_aliasing.py.snap | 152 +- ...LC0414_import_aliasing_2____init__.py.snap | 13 +- ...t__tests__PLC1802_len_as_condition.py.snap | 517 +++---- ...s__PLC2801_unnecessary_dunder_call.py.snap | 1097 +++++++------- ...nt__tests__PLE0241_duplicate_bases.py.snap | 155 +- ...s__PLE1141_dict_iter_missing_items.py.snap | 38 +- ...sts__PLE1519_singledispatch_method.py.snap | 57 +- ...1520_singledispatchmethod_function.py.snap | 21 +- ..._tests__PLE2510_invalid_characters.py.snap | Bin 3940 -> 3759 bytes ..._tests__PLE2512_invalid_characters.py.snap | Bin 4464 -> 4245 bytes ..._tests__PLE2513_invalid_characters.py.snap | Bin 4956 -> 4699 bytes ..._tests__PLE2514_invalid_characters.py.snap | Bin 1789 -> 1713 bytes ..._tests__PLE2515_invalid_characters.py.snap | Bin 7765 -> 7461 bytes ...ts__PLE4703_modified_iterating_set.py.snap | 114 +- ...tests__PLR0202_no_method_decorator.py.snap | 52 +- ...tests__PLR0203_no_method_decorator.py.snap | 46 +- ...nt__tests__PLR0402_import_aliasing.py.snap | 36 +- ...int__tests__PLR1711_useless_return.py.snap | 90 +- ...R1714_repeated_equality_comparison.py.snap | 406 +++-- ...PLR1716_boolean_chained_comparison.py.snap | 436 +++--- ...t__tests__PLR1722_sys_exit_alias_0.py.snap | 74 +- ...t__tests__PLR1722_sys_exit_alias_1.py.snap | 74 +- ...__tests__PLR1722_sys_exit_alias_11.py.snap | 13 +- ...__tests__PLR1722_sys_exit_alias_12.py.snap | 13 +- ...__tests__PLR1722_sys_exit_alias_13.py.snap | 11 +- ...__tests__PLR1722_sys_exit_alias_15.py.snap | 19 +- ...__tests__PLR1722_sys_exit_alias_16.py.snap | 71 +- ...t__tests__PLR1722_sys_exit_alias_2.py.snap | 64 +- ...t__tests__PLR1722_sys_exit_alias_3.py.snap | 38 +- ...t__tests__PLR1722_sys_exit_alias_4.py.snap | 64 +- ...t__tests__PLR1722_sys_exit_alias_5.py.snap | 88 +- ...t__tests__PLR1722_sys_exit_alias_6.py.snap | 32 +- ...t__tests__PLR1722_sys_exit_alias_7.py.snap | 17 +- ...t__tests__PLR1722_sys_exit_alias_8.py.snap | 13 +- ...t__tests__PLR1722_sys_exit_alias_9.py.snap | 17 +- ...nt__tests__PLR1730_if_stmt_min_max.py.snap | 709 ++++----- ...1733_unnecessary_dict_index_lookup.py.snap | 140 +- ...1736_unnecessary_list_index_lookup.py.snap | 210 ++- ...lint__tests__PLR2044_empty_comment.py.snap | 108 +- ...44_empty_comment_line_continuation.py.snap | 24 +- ...tests__PLR5501_collapsible_else_if.py.snap | 338 ++--- ...__PLR6104_non_augmented_assignment.py.snap | 679 ++++----- ..._tests__PLR6201_literal_membership.py.snap | 76 +- ..._tests__PLW0108_unnecessary_lambda.py.snap | 157 +- ...ests__PLW0120_useless_else_on_loop.py.snap | 178 +-- ...LW0133_useless_exception_statement.py.snap | 239 ++- ...ts__PLW0245_super_without_brackets.py.snap | 18 +- ...ests__PLW1507_shallow_copy_environ.py.snap | 34 +- ...W1510_subprocess_run_without_check.py.snap | 73 +- ...ests__PLW1514_unspecified_encoding.py.snap | 433 +++--- ...int__tests__PLW3301_nested_min_max.py.snap | 327 ++-- crates/ruff_linter/src/rules/pyupgrade/mod.rs | 20 +- ...er__rules__pyupgrade__tests__UP001.py.snap | 30 +- ...er__rules__pyupgrade__tests__UP003.py.snap | 90 +- ...er__rules__pyupgrade__tests__UP004.py.snap | 505 +++---- ...er__rules__pyupgrade__tests__UP005.py.snap | 62 +- ...__rules__pyupgrade__tests__UP006_0.py.snap | 258 ++-- ...__rules__pyupgrade__tests__UP006_1.py.snap | 14 +- ...__rules__pyupgrade__tests__UP006_3.py.snap | 14 +- ...er__rules__pyupgrade__tests__UP007.py.snap | 252 ++-- ...er__rules__pyupgrade__tests__UP008.py.snap | 252 ++-- ...__pyupgrade__tests__UP008.py__preview.snap | 243 ++- ...__rules__pyupgrade__tests__UP009_0.py.snap | 8 +- ...__rules__pyupgrade__tests__UP009_1.py.snap | 10 +- ...__rules__pyupgrade__tests__UP009_6.py.snap | 10 +- ...__rules__pyupgrade__tests__UP009_7.py.snap | 10 +- ...rade__tests__UP009_utf8_code_other.py.snap | 8 +- ..._pyupgrade__tests__UP009_utf8_utf8.py.snap | 6 +- ...rade__tests__UP009_utf8_utf8_other.py.snap | 8 +- ...__rules__pyupgrade__tests__UP010_0.py.snap | 157 +- ...__rules__pyupgrade__tests__UP010_1.py.snap | 76 +- ...er__rules__pyupgrade__tests__UP011.py.snap | 72 +- ...er__rules__pyupgrade__tests__UP012.py.snap | 522 +++---- ...er__rules__pyupgrade__tests__UP013.py.snap | 273 ++-- ...er__rules__pyupgrade__tests__UP014.py.snap | 127 +- ...er__rules__pyupgrade__tests__UP015.py.snap | 852 +++++------ ...__rules__pyupgrade__tests__UP015_1.py.snap | 12 +- ...er__rules__pyupgrade__tests__UP018.py.snap | 629 ++++---- ..._rules__pyupgrade__tests__UP018_CR.py.snap | 8 +- ..._rules__pyupgrade__tests__UP018_LF.py.snap | 30 +- ...er__rules__pyupgrade__tests__UP019.py.snap | 68 +- ...er__rules__pyupgrade__tests__UP020.py.snap | 34 +- ...er__rules__pyupgrade__tests__UP021.py.snap | 54 +- ...er__rules__pyupgrade__tests__UP022.py.snap | 141 +- ...er__rules__pyupgrade__tests__UP023.py.snap | 174 +-- ...__rules__pyupgrade__tests__UP024_0.py.snap | 266 ++-- ...__rules__pyupgrade__tests__UP024_1.py.snap | 58 +- ...__rules__pyupgrade__tests__UP024_2.py.snap | 402 +++-- ...__rules__pyupgrade__tests__UP024_4.py.snap | 14 +- ...er__rules__pyupgrade__tests__UP025.py.snap | 322 ++-- ...er__rules__pyupgrade__tests__UP026.py.snap | 570 ++++--- ...__rules__pyupgrade__tests__UP028_0.py.snap | 396 +++-- ...er__rules__pyupgrade__tests__UP029.py.snap | 62 +- ...__rules__pyupgrade__tests__UP030_0.py.snap | 481 +++--- ...__rules__pyupgrade__tests__UP031_0.py.snap | 1074 +++++++------ ...__rules__pyupgrade__tests__UP032_0.py.snap | 1234 +++++++-------- ...__rules__pyupgrade__tests__UP032_1.py.snap | 6 +- ...__rules__pyupgrade__tests__UP032_2.py.snap | 378 +++-- ...__rules__pyupgrade__tests__UP033_0.py.snap | 54 +- ...__rules__pyupgrade__tests__UP033_1.py.snap | 76 +- ...er__rules__pyupgrade__tests__UP034.py.snap | 182 +-- ...er__rules__pyupgrade__tests__UP035.py.snap | 1022 ++++++------- ...__rules__pyupgrade__tests__UP036_0.py.snap | 1041 +++++++------ ...__rules__pyupgrade__tests__UP036_1.py.snap | 289 ++-- ...__rules__pyupgrade__tests__UP036_2.py.snap | 284 ++-- ...__rules__pyupgrade__tests__UP036_3.py.snap | 87 +- ...__rules__pyupgrade__tests__UP036_4.py.snap | 164 +- ...__rules__pyupgrade__tests__UP036_5.py.snap | 295 ++-- ...__rules__pyupgrade__tests__UP037_0.py.snap | 566 ++++--- ...__rules__pyupgrade__tests__UP037_1.py.snap | 18 +- ..._rules__pyupgrade__tests__UP037_2.pyi.snap | 238 ++- ...er__rules__pyupgrade__tests__UP038.py.snap | 28 +- ...er__rules__pyupgrade__tests__UP039.py.snap | 86 +- ...er__rules__pyupgrade__tests__UP040.py.snap | 437 +++--- ...r__rules__pyupgrade__tests__UP040.pyi.snap | 72 +- ...er__rules__pyupgrade__tests__UP041.py.snap | 126 +- ...er__rules__pyupgrade__tests__UP042.py.snap | 48 +- ...er__rules__pyupgrade__tests__UP043.py.snap | 129 +- ...er__rules__pyupgrade__tests__UP045.py.snap | 210 ++- ...__rules__pyupgrade__tests__UP046_0.py.snap | 247 ++- ...er__rules__pyupgrade__tests__UP047.py.snap | 114 +- ...__rules__pyupgrade__tests__UP049_0.py.snap | 104 +- ...__rules__pyupgrade__tests__UP049_1.py.snap | 296 ++-- ...er__rules__pyupgrade__tests__UP050.py.snap | 234 ++- ...sts__add_future_annotation_UP037_0.py.snap | 566 ++++--- ...sts__add_future_annotation_UP037_1.py.snap | 39 +- ...ts__add_future_annotation_UP037_2.pyi.snap | 238 ++- ...timeout_error_alias_not_applied_py310.snap | 72 +- ...rade__tests__datetime_utc_alias_py311.snap | 82 +- ..._annotations_keep_runtime_typing_p310.snap | 60 +- ...tests__future_annotations_pep_585_p37.snap | 19 +- ...sts__future_annotations_pep_585_py310.snap | 60 +- ...tests__future_annotations_pep_604_p37.snap | 17 +- ...sts__future_annotations_pep_604_py310.snap | 28 +- ...yupgrade__tests__unpack_pep_646_py311.snap | 95 +- ...es__refurb__tests__FURB105_FURB105.py.snap | 323 ++-- ...es__refurb__tests__FURB110_FURB110.py.snap | 175 +-- ...es__refurb__tests__FURB113_FURB113.py.snap | 254 ++-- ...es__refurb__tests__FURB116_FURB116.py.snap | 241 ++- ...es__refurb__tests__FURB118_FURB118.py.snap | 1072 +++++++------ ...es__refurb__tests__FURB122_FURB122.py.snap | 406 +++-- ...es__refurb__tests__FURB129_FURB129.py.snap | 327 ++-- ...es__refurb__tests__FURB131_FURB131.py.snap | 152 +- ...es__refurb__tests__FURB132_FURB132.py.snap | 84 +- ...es__refurb__tests__FURB136_FURB136.py.snap | 162 +- ...es__refurb__tests__FURB140_FURB140.py.snap | 186 ++- ...es__refurb__tests__FURB142_FURB142.py.snap | 363 ++--- ...es__refurb__tests__FURB145_FURB145.py.snap | 108 +- ...es__refurb__tests__FURB148_FURB148.py.snap | 380 +++-- ...es__refurb__tests__FURB152_FURB152.py.snap | 372 +++-- ...es__refurb__tests__FURB154_FURB154.py.snap | 246 ++- ...es__refurb__tests__FURB156_FURB156.py.snap | 368 +++-- ...es__refurb__tests__FURB157_FURB157.py.snap | 474 +++--- ...es__refurb__tests__FURB161_FURB161.py.snap | 184 ++- ...es__refurb__tests__FURB162_FURB162.py.snap | 221 ++- ...es__refurb__tests__FURB163_FURB163.py.snap | 337 ++--- ...es__refurb__tests__FURB164_FURB164.py.snap | 576 ++++--- ...es__refurb__tests__FURB166_FURB166.py.snap | 131 +- ...es__refurb__tests__FURB167_FURB167.py.snap | 40 +- ...es__refurb__tests__FURB168_FURB168.py.snap | 198 ++- ...es__refurb__tests__FURB169_FURB169.py.snap | 305 ++-- ...__refurb__tests__FURB171_FURB171_0.py.snap | 322 ++-- ...__refurb__tests__FURB171_FURB171_1.py.snap | 124 +- ...es__refurb__tests__FURB177_FURB177.py.snap | 190 ++- ...es__refurb__tests__FURB180_FURB180.py.snap | 74 +- ...es__refurb__tests__FURB181_FURB181.py.snap | 270 ++-- ...es__refurb__tests__FURB187_FURB187.py.snap | 57 +- ...es__refurb__tests__FURB188_FURB188.py.snap | 302 ++-- ...es__refurb__tests__FURB189_FURB189.py.snap | 137 +- ...es__refurb__tests__FURB192_FURB192.py.snap | 163 +- ...sts__fstring_number_format_python_311.snap | 180 ++- ..._ruff__tests__PY39_RUF013_RUF013_0.py.snap | 361 +++-- ..._ruff__tests__PY39_RUF013_RUF013_1.py.snap | 17 +- ..._rules__ruff__tests__RUF005_RUF005.py.snap | 287 ++-- ..._ruff__tests__RUF005_RUF005_slices.py.snap | 64 +- ..._rules__ruff__tests__RUF007_RUF007.py.snap | 258 ++-- ..._rules__ruff__tests__RUF010_RUF010.py.snap | 352 ++--- ...ules__ruff__tests__RUF013_RUF013_0.py.snap | 361 +++-- ...ules__ruff__tests__RUF013_RUF013_1.py.snap | 15 +- ...ules__ruff__tests__RUF013_RUF013_3.py.snap | 53 +- ...ules__ruff__tests__RUF013_RUF013_4.py.snap | 19 +- ..._rules__ruff__tests__RUF015_RUF015.py.snap | 445 +++--- ...ules__ruff__tests__RUF017_RUF017_0.py.snap | 183 ++- ...ules__ruff__tests__RUF017_RUF017_1.py.snap | 11 +- ..._rules__ruff__tests__RUF019_RUF019.py.snap | 106 +- ..._rules__ruff__tests__RUF020_RUF020.py.snap | 124 +- ..._rules__ruff__tests__RUF021_RUF021.py.snap | 230 ++- ..._rules__ruff__tests__RUF022_RUF022.py.snap | 982 ++++++------ ..._rules__ruff__tests__RUF023_RUF023.py.snap | 620 ++++---- ..._rules__ruff__tests__RUF024_RUF024.py.snap | 133 +- ..._rules__ruff__tests__RUF026_RUF026.py.snap | 270 ++-- ...ules__ruff__tests__RUF027_RUF027_0.py.snap | 304 ++-- ..._rules__ruff__tests__RUF028_RUF028.py.snap | 189 ++- ..._rules__ruff__tests__RUF030_RUF030.py.snap | 355 +++-- ..._rules__ruff__tests__RUF031_RUF031.py.snap | 166 +-- ..._rules__ruff__tests__RUF032_RUF032.py.snap | 209 ++- ..._rules__ruff__tests__RUF033_RUF033.py.snap | 479 +++--- ..._rules__ruff__tests__RUF037_RUF037.py.snap | 366 ++--- ..._rules__ruff__tests__RUF038_RUF038.py.snap | 95 +- ...rules__ruff__tests__RUF038_RUF038.pyi.snap | 95 +- ..._rules__ruff__tests__RUF041_RUF041.py.snap | 209 ++- ...rules__ruff__tests__RUF041_RUF041.pyi.snap | 209 ++- ..._rules__ruff__tests__RUF046_RUF046.py.snap | 1128 +++++++------- ...les__ruff__tests__RUF046_RUF046_CR.py.snap | 4 +- ...les__ruff__tests__RUF046_RUF046_LF.py.snap | 10 +- ...es__ruff__tests__RUF047_RUF047_for.py.snap | 36 +- ...les__ruff__tests__RUF047_RUF047_if.py.snap | 140 +- ...es__ruff__tests__RUF047_RUF047_try.py.snap | 36 +- ...__ruff__tests__RUF047_RUF047_while.py.snap | 36 +- ..._rules__ruff__tests__RUF051_RUF051.py.snap | 575 ++++--- ..._rules__ruff__tests__RUF052_RUF052.py.snap | 394 +++-- ..._rules__ruff__tests__RUF053_RUF053.py.snap | 285 ++-- ..._rules__ruff__tests__RUF056_RUF056.py.snap | 339 ++--- ..._rules__ruff__tests__RUF057_RUF057.py.snap | 245 ++- ...ules__ruff__tests__RUF058_RUF058_0.py.snap | 219 ++- ...ules__ruff__tests__RUF059_RUF059_0.py.snap | 190 ++- ...ules__ruff__tests__RUF059_RUF059_1.py.snap | 125 +- ...ules__ruff__tests__RUF059_RUF059_2.py.snap | 216 ++- ...ules__ruff__tests__RUF059_RUF059_3.py.snap | 38 +- ...sts__RUF061_RUF061_deprecated_call.py.snap | 57 +- ..._ruff__tests__RUF061_RUF061_raises.py.snap | 120 +- ...__ruff__tests__RUF061_RUF061_warns.py.snap | 57 +- ..._rules__ruff__tests__RUF064_RUF064.py.snap | 340 ++--- ...ules__ruff__tests__RUF101_RUF101_0.py.snap | 98 +- ...ules__ruff__tests__RUF101_RUF101_1.py.snap | 18 +- ..._rules__ruff__tests__RUF102_RUF102.py.snap | 180 +-- ..._tests__add_future_import_RUF013_0.py.snap | 497 +++---- ..._tests__add_future_import_RUF013_1.py.snap | 17 +- ..._tests__add_future_import_RUF013_3.py.snap | 71 +- ..._tests__add_future_import_RUF013_4.py.snap | 29 +- ...var_regexp_preset__RUF052_RUF052.py_1.snap | 394 +++-- ...sts__invalid_rule_code_external_rules.snap | 150 +- ...remove_parentheses_starred_expr_py310.snap | 148 +- ...ruff_linter__rules__ruff__tests__noqa.snap | 13 +- ...sts__prefer_parentheses_getitem_tuple.snap | 114 +- ...uff__tests__preview__RUF039_RUF039.py.snap | 295 ++-- ...sts__preview__RUF039_RUF039_concat.py.snap | 546 +++---- ...f__tests__preview__RUF055_RUF055_0.py.snap | 235 ++- ...f__tests__preview__RUF055_RUF055_1.py.snap | 30 +- ...f__tests__preview__RUF055_RUF055_2.py.snap | 161 +- ...f__tests__preview__RUF055_RUF055_3.py.snap | 72 +- ...RUF039_RUF039_py_version_sensitive.py.snap | 11 +- ...uff__tests__py314__RUF058_RUF058_2.py.snap | 54 +- ..._linter__rules__ruff__tests__ruf100_0.snap | 398 +++-- ...__rules__ruff__tests__ruf100_0_prefix.snap | 380 +++-- ..._linter__rules__ruff__tests__ruf100_1.snap | 128 +- ..._linter__rules__ruff__tests__ruf100_2.snap | 6 +- ..._linter__rules__ruff__tests__ruf100_3.snap | 406 +++-- ..._linter__rules__ruff__tests__ruf100_5.snap | 82 +- ...__rules__ruff__tests__ruff_noqa_codes.snap | 13 +- ...tests__ruff_noqa_filedirective_unused.snap | 6 +- ...oqa_filedirective_unused_last_of_many.snap | 26 +- ...rules__ruff__tests__ruff_noqa_invalid.snap | 23 +- ..._error-instead-of-exception_TRY400.py.snap | 198 ++- ...atops__tests__verbose-raise_TRY201.py.snap | 51 +- ...ensions_pyi019_adds_typing_extensions.snap | 22 +- ..._adds_typing_with_extensions_disabled.snap | 22 +- ...ds_typing_without_extensions_disabled.snap | 22 +- ...linter__linter__tests__import_sorting.snap | 66 +- ...er__linter__tests__ipy_escape_command.snap | 24 +- ...inter__linter__tests__unused_variable.snap | 52 +- ...er__linter__tests__vscode_language_id.snap | 10 +- 957 files changed, 68320 insertions(+), 80093 deletions(-) diff --git a/crates/ruff_db/src/diagnostic/render/full.rs b/crates/ruff_db/src/diagnostic/render/full.rs index 847386a0f5..ecc53bedfa 100644 --- a/crates/ruff_db/src/diagnostic/render/full.rs +++ b/crates/ruff_db/src/diagnostic/render/full.rs @@ -1,12 +1,11 @@ use std::borrow::Cow; use std::num::NonZeroUsize; -use anstyle::Style; -use ruff_notebook::NotebookIndex; use similar::{ChangeTag, TextDiff}; use ruff_annotate_snippets::Renderer as AnnotateRenderer; use ruff_diagnostics::{Applicability, Fix}; +use ruff_notebook::NotebookIndex; use ruff_source_file::OneIndexed; use ruff_text_size::{Ranged, TextLen, TextRange, TextSize}; @@ -58,13 +57,14 @@ impl<'a> FullRenderer<'a> { for diag in renderable.diagnostics.iter() { writeln!(f, "{}", renderer.render(diag.to_annotate()))?; } - writeln!(f)?; if self.config.show_fix_diff { if let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver) { - writeln!(f, "{diff}")?; + write!(f, "{diff}")?; } } + + writeln!(f)?; } Ok(()) @@ -126,19 +126,6 @@ impl std::fmt::Display for Diff<'_> { vec![(None, source_text.text_len())] }; - let message = match self.fix.applicability() { - // TODO(zanieb): Adjust this messaging once it's user-facing - Applicability::Safe => "Safe fix", - Applicability::Unsafe => "Unsafe fix", - Applicability::DisplayOnly => "Display-only fix", - }; - - // TODO(brent) `stylesheet.separator` is cyan rather than blue, as we had before. I think - // we're getting rid of this soon anyway, so I didn't think it was worth adding another - // style to the stylesheet temporarily. The color doesn't appear at all in the snapshot - // tests, which is the only place these are currently used. - writeln!(f, "ℹ {}", fmt_styled(message, self.stylesheet.separator))?; - let mut last_end = TextSize::ZERO; for (cell, offset) in cells { let range = TextRange::new(last_end, offset); @@ -167,64 +154,67 @@ impl std::fmt::Display for Diff<'_> { let diff = TextDiff::from_lines(input, &output); - let (largest_old, largest_new) = diff - .ops() - .last() - .map(|op| (op.old_range().start, op.new_range().start)) - .unwrap_or_default(); + let grouped_ops = diff.grouped_ops(3); - let digit_with = OneIndexed::from_zero_indexed(largest_new.max(largest_old)).digits(); + // Find the new line number with the largest number of digits to align all of the line + // number separators. + let last_op = grouped_ops.last().and_then(|group| group.last()); + let largest_new = last_op.map(|op| op.new_range().end).unwrap_or_default(); + + let digit_with = OneIndexed::new(largest_new).unwrap_or_default().digits(); if let Some(cell) = cell { - // Room for 2 digits, 2 x 1 space before each digit, 1 space, and 1 `|`. This - // centers the three colons on the pipe. - writeln!(f, "{:>1$} cell {cell}", ":::", 2 * digit_with.get() + 4)?; + // Room for 1 digit, 1 space, 1 `|`, and 1 more following space. This centers the + // three colons on the pipe. + writeln!(f, "{:>1$} cell {cell}", ":::", digit_with.get() + 3)?; } - for (idx, group) in diff.grouped_ops(3).iter().enumerate() { + for (idx, group) in grouped_ops.iter().enumerate() { if idx > 0 { writeln!(f, "{:-^1$}", "-", 80)?; } for op in group { for change in diff.iter_inline_changes(op) { - let sign = match change.tag() { - ChangeTag::Delete => "-", - ChangeTag::Insert => "+", - ChangeTag::Equal => " ", + let (sign, style, line_no_style, index) = match change.tag() { + ChangeTag::Delete => ( + "-", + self.stylesheet.deletion, + self.stylesheet.deletion_line_no, + None, + ), + ChangeTag::Insert => ( + "+", + self.stylesheet.insertion, + self.stylesheet.insertion_line_no, + change.new_index(), + ), + ChangeTag::Equal => ( + "|", + self.stylesheet.none, + self.stylesheet.line_no, + change.new_index(), + ), }; - let line_style = LineStyle::from(change.tag(), self.stylesheet); - - let old_index = change.old_index().map(OneIndexed::from_zero_indexed); - let new_index = change.new_index().map(OneIndexed::from_zero_indexed); + let line = Line { + index: index.map(OneIndexed::from_zero_indexed), + width: digit_with, + }; write!( f, - "{} {} |{}", - Line { - index: old_index, - width: digit_with, - }, - Line { - index: new_index, - width: digit_with, - }, - fmt_styled(line_style.apply_to(sign), self.stylesheet.emphasis), + "{line} {sign} ", + line = fmt_styled(line, self.stylesheet.line_no), + sign = fmt_styled(sign, line_no_style), )?; for (emphasized, value) in change.iter_strings_lossy() { let value = show_nonprinting(&value); + let styled = fmt_styled(value, style); if emphasized { - write!( - f, - "{}", - fmt_styled( - line_style.apply_to(&value), - self.stylesheet.underline - ) - )?; + write!(f, "{}", fmt_styled(styled, self.stylesheet.emphasis))?; } else { - write!(f, "{}", line_style.apply_to(&value))?; + write!(f, "{styled}")?; } } if change.missing_newline() { @@ -235,31 +225,35 @@ impl std::fmt::Display for Diff<'_> { } } - Ok(()) - } -} - -struct LineStyle { - style: Style, -} - -impl LineStyle { - fn apply_to(&self, input: &str) -> impl std::fmt::Display { - fmt_styled(input, self.style) - } - - fn from(value: ChangeTag, stylesheet: &DiagnosticStylesheet) -> LineStyle { - match value { - ChangeTag::Equal => LineStyle { - style: stylesheet.none, - }, - ChangeTag::Delete => LineStyle { - style: stylesheet.deletion, - }, - ChangeTag::Insert => LineStyle { - style: stylesheet.insertion, - }, + match self.fix.applicability() { + Applicability::Safe => {} + Applicability::Unsafe => { + writeln!( + f, + "{note}: {msg}", + note = fmt_styled("note", self.stylesheet.warning), + msg = fmt_styled( + "This is an unsafe fix and may change runtime behavior", + self.stylesheet.emphasis + ) + )?; + } + Applicability::DisplayOnly => { + // Note that this is still only used in tests. There's no `--display-only-fixes` + // analog to `--unsafe-fixes` for users to activate this or see the styling. + writeln!( + f, + "{note}: {msg}", + note = fmt_styled("note", self.stylesheet.error), + msg = fmt_styled( + "This is a display-only fix and is likely to be incorrect", + self.stylesheet.emphasis + ) + )?; + } } + + Ok(()) } } @@ -297,7 +291,7 @@ fn show_nonprinting(s: &str) -> Cow<'_, str> { #[cfg(test)] mod tests { - use ruff_diagnostics::{Applicability, Fix}; + use ruff_diagnostics::{Applicability, Edit, Fix}; use ruff_text_size::{TextLen, TextRange, TextSize}; use crate::diagnostic::{ @@ -712,11 +706,9 @@ print() | ^^ | help: Remove unused import: `os` - - ℹ Safe fix - ::: cell 1 - 1 1 | # cell 1 - 2 |-import os + ::: cell 1 + 1 | # cell 1 + - import os error[unused-import][*]: `math` imported but unused --> notebook.ipynb:cell 2:2:8 @@ -728,13 +720,11 @@ print() 4 | print('hello world') | help: Remove unused import: `math` - - ℹ Safe fix - ::: cell 2 - 1 1 | # cell 2 - 2 |-import math - 3 2 | - 4 3 | print('hello world') + ::: cell 2 + 1 | # cell 2 + - import math + 2 | + 3 | print('hello world') error[unused-variable]: Local variable `x` is assigned to but never used --> notebook.ipynb:cell 3:4:5 @@ -745,14 +735,13 @@ print() | ^ | help: Remove assignment to unused variable `x` - - ℹ Unsafe fix - ::: cell 3 - 1 1 | # cell 3 - 2 2 | def foo(): - 3 3 | print() - 4 |- x = 1 - 5 4 | + ::: cell 3 + 1 | # cell 3 + 2 | def foo(): + 3 | print() + - x = 1 + 4 | + note: This is an unsafe fix and may change runtime behavior "); } @@ -780,22 +769,21 @@ print() | ^^ | help: Remove unused import: `os` - - ℹ Unsafe fix - ::: cell 1 - 1 1 | # cell 1 - 2 |-import os - ::: cell 2 - 1 1 | # cell 2 - 2 |-import math - 3 2 | - 4 3 | print('hello world') - ::: cell 3 - 1 1 | # cell 3 - 2 2 | def foo(): - 3 3 | print() - 4 |- x = 1 - 5 4 | + ::: cell 1 + 1 | # cell 1 + - import os + ::: cell 2 + 1 | # cell 2 + - import math + 2 | + 3 | print('hello world') + ::: cell 3 + 1 | # cell 3 + 2 | def foo(): + 3 | print() + - x = 1 + 4 | + note: This is an unsafe fix and may change runtime behavior "); } @@ -901,4 +889,73 @@ print() | "); } + + /// Test that we handle the width calculation for the line number correctly even for context + /// lines at the end of a diff. For example, we want it to render like this: + /// + /// ``` + /// 8 | + /// 9 | + /// 10 | + /// ``` + /// + /// and not like this: + /// + /// ``` + /// 8 | + /// 9 | + /// 10 | + /// ``` + #[test] + fn longer_line_number_end_of_context() { + let mut env = TestEnvironment::new(); + let contents = "\ +line 1 +line 2 +line 3 +line 4 +line 5 +line 6 +line 7 +line 8 +line 9 +line 10 + "; + env.add("example.py", contents); + env.format(DiagnosticFormat::Full); + env.show_fix_diff(true); + + let mut diagnostic = env.err().primary("example.py", "3", "3", "label").build(); + diagnostic.help("Start of diff:"); + let target = "line 7"; + let line9 = contents.find(target).unwrap(); + let range = TextRange::at(TextSize::try_from(line9).unwrap(), target.text_len()); + diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement( + format!("fixed {target}"), + range, + ))); + + insta::assert_snapshot!(env.render(&diagnostic), @r" + error[test-diagnostic]: main diagnostic message + --> example.py:3:1 + | + 1 | line 1 + 2 | line 2 + 3 | line 3 + | ^^^^^^ label + 4 | line 4 + 5 | line 5 + | + help: Start of diff: + 4 | line 4 + 5 | line 5 + 6 | line 6 + - line 7 + 7 + fixed line 7 + 8 | line 8 + 9 | line 9 + 10 | line 10 + note: This is an unsafe fix and may change runtime behavior + "); + } } diff --git a/crates/ruff_db/src/diagnostic/stylesheet.rs b/crates/ruff_db/src/diagnostic/stylesheet.rs index bba985ead3..488e4352c9 100644 --- a/crates/ruff_db/src/diagnostic/stylesheet.rs +++ b/crates/ruff_db/src/diagnostic/stylesheet.rs @@ -40,12 +40,13 @@ pub struct DiagnosticStylesheet { pub(crate) help: Style, pub(crate) line_no: Style, pub(crate) emphasis: Style, - pub(crate) underline: Style, pub(crate) none: Style, pub(crate) separator: Style, pub(crate) secondary_code: Style, pub(crate) insertion: Style, pub(crate) deletion: Style, + pub(crate) insertion_line_no: Style, + pub(crate) deletion_line_no: Style, } impl Default for DiagnosticStylesheet { @@ -66,12 +67,13 @@ impl DiagnosticStylesheet { help: AnsiColor::BrightCyan.on_default().effects(Effects::BOLD), line_no: bright_blue.effects(Effects::BOLD), emphasis: Style::new().effects(Effects::BOLD), - underline: Style::new().effects(Effects::UNDERLINE), none: Style::new(), separator: AnsiColor::Cyan.on_default(), secondary_code: AnsiColor::Red.on_default().effects(Effects::BOLD), insertion: AnsiColor::Green.on_default(), deletion: AnsiColor::Red.on_default(), + insertion_line_no: AnsiColor::Green.on_default().effects(Effects::BOLD), + deletion_line_no: AnsiColor::Red.on_default().effects(Effects::BOLD), } } @@ -84,12 +86,13 @@ impl DiagnosticStylesheet { help: Style::new(), line_no: Style::new(), emphasis: Style::new(), - underline: Style::new(), none: Style::new(), separator: Style::new(), secondary_code: Style::new(), insertion: Style::new(), deletion: Style::new(), + insertion_line_no: Style::new(), + deletion_line_no: Style::new(), } } } diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap index 1142bee4af..6f783edc9f 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_args.py.snap @@ -12,16 +12,14 @@ AIR301 [*] `schedule_interval` is removed in Airflow 3.0 23 | DAG(dag_id="class_timetable", timetable=NullTimetable()) | help: Use `schedule` instead - -ℹ Safe fix -18 18 | -19 19 | DAG(dag_id="class_schedule", schedule="@hourly") -20 20 | -21 |-DAG(dag_id="class_schedule_interval", schedule_interval="@hourly") - 21 |+DAG(dag_id="class_schedule_interval", schedule="@hourly") -22 22 | -23 23 | DAG(dag_id="class_timetable", timetable=NullTimetable()) -24 24 | +18 | +19 | DAG(dag_id="class_schedule", schedule="@hourly") +20 | + - DAG(dag_id="class_schedule_interval", schedule_interval="@hourly") +21 + DAG(dag_id="class_schedule_interval", schedule="@hourly") +22 | +23 | DAG(dag_id="class_timetable", timetable=NullTimetable()) +24 | AIR301 [*] `timetable` is removed in Airflow 3.0 --> AIR301_args.py:23:31 @@ -32,16 +30,14 @@ AIR301 [*] `timetable` is removed in Airflow 3.0 | ^^^^^^^^^ | help: Use `schedule` instead - -ℹ Safe fix -20 20 | -21 21 | DAG(dag_id="class_schedule_interval", schedule_interval="@hourly") -22 22 | -23 |-DAG(dag_id="class_timetable", timetable=NullTimetable()) - 23 |+DAG(dag_id="class_timetable", schedule=NullTimetable()) -24 24 | -25 25 | -26 26 | DAG(dag_id="class_fail_stop", fail_stop=True) +20 | +21 | DAG(dag_id="class_schedule_interval", schedule_interval="@hourly") +22 | + - DAG(dag_id="class_timetable", timetable=NullTimetable()) +23 + DAG(dag_id="class_timetable", schedule=NullTimetable()) +24 | +25 | +26 | DAG(dag_id="class_fail_stop", fail_stop=True) AIR301 [*] `fail_stop` is removed in Airflow 3.0 --> AIR301_args.py:26:31 @@ -52,16 +48,14 @@ AIR301 [*] `fail_stop` is removed in Airflow 3.0 28 | DAG(dag_id="class_default_view", default_view="dag_default_view") | help: Use `fail_fast` instead - -ℹ Safe fix -23 23 | DAG(dag_id="class_timetable", timetable=NullTimetable()) -24 24 | -25 25 | -26 |-DAG(dag_id="class_fail_stop", fail_stop=True) - 26 |+DAG(dag_id="class_fail_stop", fail_fast=True) -27 27 | -28 28 | DAG(dag_id="class_default_view", default_view="dag_default_view") -29 29 | +23 | DAG(dag_id="class_timetable", timetable=NullTimetable()) +24 | +25 | + - DAG(dag_id="class_fail_stop", fail_stop=True) +26 + DAG(dag_id="class_fail_stop", fail_fast=True) +27 | +28 | DAG(dag_id="class_default_view", default_view="dag_default_view") +29 | AIR301 `default_view` is removed in Airflow 3.0 --> AIR301_args.py:28:34 @@ -94,16 +88,14 @@ AIR301 [*] `schedule_interval` is removed in Airflow 3.0 43 | pass | help: Use `schedule` instead - -ℹ Safe fix -38 38 | pass -39 39 | -40 40 | -41 |-@dag(schedule_interval="0 * * * *") - 41 |+@dag(schedule="0 * * * *") -42 42 | def decorator_schedule_interval(): -43 43 | pass -44 44 | +38 | pass +39 | +40 | + - @dag(schedule_interval="0 * * * *") +41 + @dag(schedule="0 * * * *") +42 | def decorator_schedule_interval(): +43 | pass +44 | AIR301 [*] `timetable` is removed in Airflow 3.0 --> AIR301_args.py:46:6 @@ -114,16 +106,14 @@ AIR301 [*] `timetable` is removed in Airflow 3.0 48 | pass | help: Use `schedule` instead - -ℹ Safe fix -43 43 | pass -44 44 | -45 45 | -46 |-@dag(timetable=NullTimetable()) - 46 |+@dag(schedule=NullTimetable()) -47 47 | def decorator_timetable(): -48 48 | pass -49 49 | +43 | pass +44 | +45 | + - @dag(timetable=NullTimetable()) +46 + @dag(schedule=NullTimetable()) +47 | def decorator_timetable(): +48 | pass +49 | AIR301 [*] `execution_date` is removed in Airflow 3.0 --> AIR301_args.py:54:62 @@ -136,16 +126,14 @@ AIR301 [*] `execution_date` is removed in Airflow 3.0 56 | trigger_dagrun_op2 = TriggerDagRunOperator( | help: Use `logical_date` instead - -ℹ Safe fix -51 51 | @dag() -52 52 | def decorator_deprecated_operator_args(): -53 53 | trigger_dagrun_op = trigger_dagrun.TriggerDagRunOperator( -54 |- task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04" - 54 |+ task_id="trigger_dagrun_op1", trigger_dag_id="test", logical_date="2024-12-04" -55 55 | ) -56 56 | trigger_dagrun_op2 = TriggerDagRunOperator( -57 57 | task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04" +51 | @dag() +52 | def decorator_deprecated_operator_args(): +53 | trigger_dagrun_op = trigger_dagrun.TriggerDagRunOperator( + - task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04" +54 + task_id="trigger_dagrun_op1", trigger_dag_id="test", logical_date="2024-12-04" +55 | ) +56 | trigger_dagrun_op2 = TriggerDagRunOperator( +57 | task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04" AIR301 [*] `execution_date` is removed in Airflow 3.0 --> AIR301_args.py:57:62 @@ -157,16 +145,14 @@ AIR301 [*] `execution_date` is removed in Airflow 3.0 58 | ) | help: Use `logical_date` instead - -ℹ Safe fix -54 54 | task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04" -55 55 | ) -56 56 | trigger_dagrun_op2 = TriggerDagRunOperator( -57 |- task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04" - 57 |+ task_id="trigger_dagrun_op2", trigger_dag_id="test", logical_date="2024-12-04" -58 58 | ) -59 59 | -60 60 | branch_dt_op = datetime.BranchDateTimeOperator( +54 | task_id="trigger_dagrun_op1", trigger_dag_id="test", execution_date="2024-12-04" +55 | ) +56 | trigger_dagrun_op2 = TriggerDagRunOperator( + - task_id="trigger_dagrun_op2", trigger_dag_id="test", execution_date="2024-12-04" +57 + task_id="trigger_dagrun_op2", trigger_dag_id="test", logical_date="2024-12-04" +58 | ) +59 | +60 | branch_dt_op = datetime.BranchDateTimeOperator( AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0 --> AIR301_args.py:61:33 @@ -178,16 +164,14 @@ AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0 63 | branch_dt_op2 = BranchDateTimeOperator( | help: Use `use_task_logical_date` instead - -ℹ Safe fix -58 58 | ) -59 59 | -60 60 | branch_dt_op = datetime.BranchDateTimeOperator( -61 |- task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5 - 61 |+ task_id="branch_dt_op", use_task_logical_date=True, task_concurrency=5 -62 62 | ) -63 63 | branch_dt_op2 = BranchDateTimeOperator( -64 64 | task_id="branch_dt_op2", +58 | ) +59 | +60 | branch_dt_op = datetime.BranchDateTimeOperator( + - task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5 +61 + task_id="branch_dt_op", use_task_logical_date=True, task_concurrency=5 +62 | ) +63 | branch_dt_op2 = BranchDateTimeOperator( +64 | task_id="branch_dt_op2", AIR301 [*] `task_concurrency` is removed in Airflow 3.0 --> AIR301_args.py:61:62 @@ -199,16 +183,14 @@ AIR301 [*] `task_concurrency` is removed in Airflow 3.0 63 | branch_dt_op2 = BranchDateTimeOperator( | help: Use `max_active_tis_per_dag` instead - -ℹ Safe fix -58 58 | ) -59 59 | -60 60 | branch_dt_op = datetime.BranchDateTimeOperator( -61 |- task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5 - 61 |+ task_id="branch_dt_op", use_task_execution_day=True, max_active_tis_per_dag=5 -62 62 | ) -63 63 | branch_dt_op2 = BranchDateTimeOperator( -64 64 | task_id="branch_dt_op2", +58 | ) +59 | +60 | branch_dt_op = datetime.BranchDateTimeOperator( + - task_id="branch_dt_op", use_task_execution_day=True, task_concurrency=5 +61 + task_id="branch_dt_op", use_task_execution_day=True, max_active_tis_per_dag=5 +62 | ) +63 | branch_dt_op2 = BranchDateTimeOperator( +64 | task_id="branch_dt_op2", AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0 --> AIR301_args.py:65:9 @@ -221,16 +203,14 @@ AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0 67 | ) | help: Use `use_task_logical_date` instead - -ℹ Safe fix -62 62 | ) -63 63 | branch_dt_op2 = BranchDateTimeOperator( -64 64 | task_id="branch_dt_op2", -65 |- use_task_execution_day=True, - 65 |+ use_task_logical_date=True, -66 66 | sla=timedelta(seconds=10), -67 67 | ) -68 68 | +62 | ) +63 | branch_dt_op2 = BranchDateTimeOperator( +64 | task_id="branch_dt_op2", + - use_task_execution_day=True, +65 + use_task_logical_date=True, +66 | sla=timedelta(seconds=10), +67 | ) +68 | AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0 --> AIR301_args.py:92:9 @@ -242,16 +222,14 @@ AIR301 [*] `use_task_execution_day` is removed in Airflow 3.0 93 | ) | help: Use `use_task_logical_date` instead - -ℹ Safe fix -89 89 | follow_task_ids_if_false=None, -90 90 | follow_task_ids_if_true=None, -91 91 | week_day=1, -92 |- use_task_execution_day=True, - 92 |+ use_task_logical_date=True, -93 93 | ) -94 94 | -95 95 | trigger_dagrun_op >> trigger_dagrun_op2 +89 | follow_task_ids_if_false=None, +90 | follow_task_ids_if_true=None, +91 | week_day=1, + - use_task_execution_day=True, +92 + use_task_logical_date=True, +93 | ) +94 | +95 | trigger_dagrun_op >> trigger_dagrun_op2 AIR301 `filename_template` is removed in Airflow 3.0 --> AIR301_args.py:102:15 diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap index 8bd2cd6bbb..1c235414df 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_class_attribute.py.snap @@ -11,16 +11,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0 26 | dataset_from_root.iter_dataset_aliases() | help: Use `iter_assets` instead - -ℹ Safe fix -22 22 | -23 23 | # airflow.Dataset -24 24 | dataset_from_root = DatasetFromRoot() -25 |-dataset_from_root.iter_datasets() - 25 |+dataset_from_root.iter_assets() -26 26 | dataset_from_root.iter_dataset_aliases() -27 27 | -28 28 | # airflow.datasets +22 | +23 | # airflow.Dataset +24 | dataset_from_root = DatasetFromRoot() + - dataset_from_root.iter_datasets() +25 + dataset_from_root.iter_assets() +26 | dataset_from_root.iter_dataset_aliases() +27 | +28 | # airflow.datasets AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 --> AIR301_class_attribute.py:26:19 @@ -33,16 +31,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 28 | # airflow.datasets | help: Use `iter_asset_aliases` instead - -ℹ Safe fix -23 23 | # airflow.Dataset -24 24 | dataset_from_root = DatasetFromRoot() -25 25 | dataset_from_root.iter_datasets() -26 |-dataset_from_root.iter_dataset_aliases() - 26 |+dataset_from_root.iter_asset_aliases() -27 27 | -28 28 | # airflow.datasets -29 29 | dataset_to_test_method_call = Dataset() +23 | # airflow.Dataset +24 | dataset_from_root = DatasetFromRoot() +25 | dataset_from_root.iter_datasets() + - dataset_from_root.iter_dataset_aliases() +26 + dataset_from_root.iter_asset_aliases() +27 | +28 | # airflow.datasets +29 | dataset_to_test_method_call = Dataset() AIR301 [*] `iter_datasets` is removed in Airflow 3.0 --> AIR301_class_attribute.py:30:29 @@ -54,16 +50,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0 31 | dataset_to_test_method_call.iter_dataset_aliases() | help: Use `iter_assets` instead - -ℹ Safe fix -27 27 | -28 28 | # airflow.datasets -29 29 | dataset_to_test_method_call = Dataset() -30 |-dataset_to_test_method_call.iter_datasets() - 30 |+dataset_to_test_method_call.iter_assets() -31 31 | dataset_to_test_method_call.iter_dataset_aliases() -32 32 | -33 33 | alias_to_test_method_call = DatasetAlias() +27 | +28 | # airflow.datasets +29 | dataset_to_test_method_call = Dataset() + - dataset_to_test_method_call.iter_datasets() +30 + dataset_to_test_method_call.iter_assets() +31 | dataset_to_test_method_call.iter_dataset_aliases() +32 | +33 | alias_to_test_method_call = DatasetAlias() AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 --> AIR301_class_attribute.py:31:29 @@ -76,16 +70,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 33 | alias_to_test_method_call = DatasetAlias() | help: Use `iter_asset_aliases` instead - -ℹ Safe fix -28 28 | # airflow.datasets -29 29 | dataset_to_test_method_call = Dataset() -30 30 | dataset_to_test_method_call.iter_datasets() -31 |-dataset_to_test_method_call.iter_dataset_aliases() - 31 |+dataset_to_test_method_call.iter_asset_aliases() -32 32 | -33 33 | alias_to_test_method_call = DatasetAlias() -34 34 | alias_to_test_method_call.iter_datasets() +28 | # airflow.datasets +29 | dataset_to_test_method_call = Dataset() +30 | dataset_to_test_method_call.iter_datasets() + - dataset_to_test_method_call.iter_dataset_aliases() +31 + dataset_to_test_method_call.iter_asset_aliases() +32 | +33 | alias_to_test_method_call = DatasetAlias() +34 | alias_to_test_method_call.iter_datasets() AIR301 [*] `iter_datasets` is removed in Airflow 3.0 --> AIR301_class_attribute.py:34:27 @@ -96,16 +88,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0 35 | alias_to_test_method_call.iter_dataset_aliases() | help: Use `iter_assets` instead - -ℹ Safe fix -31 31 | dataset_to_test_method_call.iter_dataset_aliases() -32 32 | -33 33 | alias_to_test_method_call = DatasetAlias() -34 |-alias_to_test_method_call.iter_datasets() - 34 |+alias_to_test_method_call.iter_assets() -35 35 | alias_to_test_method_call.iter_dataset_aliases() -36 36 | -37 37 | any_to_test_method_call = DatasetAny() +31 | dataset_to_test_method_call.iter_dataset_aliases() +32 | +33 | alias_to_test_method_call = DatasetAlias() + - alias_to_test_method_call.iter_datasets() +34 + alias_to_test_method_call.iter_assets() +35 | alias_to_test_method_call.iter_dataset_aliases() +36 | +37 | any_to_test_method_call = DatasetAny() AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 --> AIR301_class_attribute.py:35:27 @@ -118,16 +108,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 37 | any_to_test_method_call = DatasetAny() | help: Use `iter_asset_aliases` instead - -ℹ Safe fix -32 32 | -33 33 | alias_to_test_method_call = DatasetAlias() -34 34 | alias_to_test_method_call.iter_datasets() -35 |-alias_to_test_method_call.iter_dataset_aliases() - 35 |+alias_to_test_method_call.iter_asset_aliases() -36 36 | -37 37 | any_to_test_method_call = DatasetAny() -38 38 | any_to_test_method_call.iter_datasets() +32 | +33 | alias_to_test_method_call = DatasetAlias() +34 | alias_to_test_method_call.iter_datasets() + - alias_to_test_method_call.iter_dataset_aliases() +35 + alias_to_test_method_call.iter_asset_aliases() +36 | +37 | any_to_test_method_call = DatasetAny() +38 | any_to_test_method_call.iter_datasets() AIR301 [*] `iter_datasets` is removed in Airflow 3.0 --> AIR301_class_attribute.py:38:25 @@ -138,16 +126,14 @@ AIR301 [*] `iter_datasets` is removed in Airflow 3.0 39 | any_to_test_method_call.iter_dataset_aliases() | help: Use `iter_assets` instead - -ℹ Safe fix -35 35 | alias_to_test_method_call.iter_dataset_aliases() -36 36 | -37 37 | any_to_test_method_call = DatasetAny() -38 |-any_to_test_method_call.iter_datasets() - 38 |+any_to_test_method_call.iter_assets() -39 39 | any_to_test_method_call.iter_dataset_aliases() -40 40 | -41 41 | # airflow.datasets.manager +35 | alias_to_test_method_call.iter_dataset_aliases() +36 | +37 | any_to_test_method_call = DatasetAny() + - any_to_test_method_call.iter_datasets() +38 + any_to_test_method_call.iter_assets() +39 | any_to_test_method_call.iter_dataset_aliases() +40 | +41 | # airflow.datasets.manager AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 --> AIR301_class_attribute.py:39:25 @@ -160,16 +146,14 @@ AIR301 [*] `iter_dataset_aliases` is removed in Airflow 3.0 41 | # airflow.datasets.manager | help: Use `iter_asset_aliases` instead - -ℹ Safe fix -36 36 | -37 37 | any_to_test_method_call = DatasetAny() -38 38 | any_to_test_method_call.iter_datasets() -39 |-any_to_test_method_call.iter_dataset_aliases() - 39 |+any_to_test_method_call.iter_asset_aliases() -40 40 | -41 41 | # airflow.datasets.manager -42 42 | dm = DatasetManager() +36 | +37 | any_to_test_method_call = DatasetAny() +38 | any_to_test_method_call.iter_datasets() + - any_to_test_method_call.iter_dataset_aliases() +39 + any_to_test_method_call.iter_asset_aliases() +40 | +41 | # airflow.datasets.manager +42 | dm = DatasetManager() AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0 --> AIR301_class_attribute.py:42:6 @@ -181,24 +165,22 @@ AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0 44 | dm.create_datasets() | help: Use `AssetManager` from `airflow.assets.manager` instead. - -ℹ Safe fix -19 19 | from airflow.providers_manager import ProvidersManager -20 20 | from airflow.secrets.base_secrets import BaseSecretsBackend -21 21 | from airflow.secrets.local_filesystem import LocalFilesystemBackend - 22 |+from airflow.assets.manager import AssetManager -22 23 | -23 24 | # airflow.Dataset -24 25 | dataset_from_root = DatasetFromRoot() +19 | from airflow.providers_manager import ProvidersManager +20 | from airflow.secrets.base_secrets import BaseSecretsBackend +21 | from airflow.secrets.local_filesystem import LocalFilesystemBackend +22 + from airflow.assets.manager import AssetManager +23 | +24 | # airflow.Dataset +25 | dataset_from_root = DatasetFromRoot() -------------------------------------------------------------------------------- -39 40 | any_to_test_method_call.iter_dataset_aliases() -40 41 | -41 42 | # airflow.datasets.manager -42 |-dm = DatasetManager() - 43 |+dm = AssetManager() -43 44 | dm.register_dataset_change() -44 45 | dm.create_datasets() -45 46 | dm.notify_dataset_created() +40 | any_to_test_method_call.iter_dataset_aliases() +41 | +42 | # airflow.datasets.manager + - dm = DatasetManager() +43 + dm = AssetManager() +44 | dm.register_dataset_change() +45 | dm.create_datasets() +46 | dm.notify_dataset_created() AIR301 [*] `register_dataset_change` is removed in Airflow 3.0 --> AIR301_class_attribute.py:43:4 @@ -211,16 +193,14 @@ AIR301 [*] `register_dataset_change` is removed in Airflow 3.0 45 | dm.notify_dataset_created() | help: Use `register_asset_change` instead - -ℹ Safe fix -40 40 | -41 41 | # airflow.datasets.manager -42 42 | dm = DatasetManager() -43 |-dm.register_dataset_change() - 43 |+dm.register_asset_change() -44 44 | dm.create_datasets() -45 45 | dm.notify_dataset_created() -46 46 | dm.notify_dataset_changed() +40 | +41 | # airflow.datasets.manager +42 | dm = DatasetManager() + - dm.register_dataset_change() +43 + dm.register_asset_change() +44 | dm.create_datasets() +45 | dm.notify_dataset_created() +46 | dm.notify_dataset_changed() AIR301 [*] `create_datasets` is removed in Airflow 3.0 --> AIR301_class_attribute.py:44:4 @@ -233,16 +213,14 @@ AIR301 [*] `create_datasets` is removed in Airflow 3.0 46 | dm.notify_dataset_changed() | help: Use `create_assets` instead - -ℹ Safe fix -41 41 | # airflow.datasets.manager -42 42 | dm = DatasetManager() -43 43 | dm.register_dataset_change() -44 |-dm.create_datasets() - 44 |+dm.create_assets() -45 45 | dm.notify_dataset_created() -46 46 | dm.notify_dataset_changed() -47 47 | dm.notify_dataset_alias_created() +41 | # airflow.datasets.manager +42 | dm = DatasetManager() +43 | dm.register_dataset_change() + - dm.create_datasets() +44 + dm.create_assets() +45 | dm.notify_dataset_created() +46 | dm.notify_dataset_changed() +47 | dm.notify_dataset_alias_created() AIR301 [*] `notify_dataset_created` is removed in Airflow 3.0 --> AIR301_class_attribute.py:45:4 @@ -255,16 +233,14 @@ AIR301 [*] `notify_dataset_created` is removed in Airflow 3.0 47 | dm.notify_dataset_alias_created() | help: Use `notify_asset_created` instead - -ℹ Safe fix -42 42 | dm = DatasetManager() -43 43 | dm.register_dataset_change() -44 44 | dm.create_datasets() -45 |-dm.notify_dataset_created() - 45 |+dm.notify_asset_created() -46 46 | dm.notify_dataset_changed() -47 47 | dm.notify_dataset_alias_created() -48 48 | +42 | dm = DatasetManager() +43 | dm.register_dataset_change() +44 | dm.create_datasets() + - dm.notify_dataset_created() +45 + dm.notify_asset_created() +46 | dm.notify_dataset_changed() +47 | dm.notify_dataset_alias_created() +48 | AIR301 [*] `notify_dataset_changed` is removed in Airflow 3.0 --> AIR301_class_attribute.py:46:4 @@ -276,16 +252,14 @@ AIR301 [*] `notify_dataset_changed` is removed in Airflow 3.0 47 | dm.notify_dataset_alias_created() | help: Use `notify_asset_changed` instead - -ℹ Safe fix -43 43 | dm.register_dataset_change() -44 44 | dm.create_datasets() -45 45 | dm.notify_dataset_created() -46 |-dm.notify_dataset_changed() - 46 |+dm.notify_asset_changed() -47 47 | dm.notify_dataset_alias_created() -48 48 | -49 49 | # airflow.lineage.hook +43 | dm.register_dataset_change() +44 | dm.create_datasets() +45 | dm.notify_dataset_created() + - dm.notify_dataset_changed() +46 + dm.notify_asset_changed() +47 | dm.notify_dataset_alias_created() +48 | +49 | # airflow.lineage.hook AIR301 [*] `notify_dataset_alias_created` is removed in Airflow 3.0 --> AIR301_class_attribute.py:47:4 @@ -298,16 +272,14 @@ AIR301 [*] `notify_dataset_alias_created` is removed in Airflow 3.0 49 | # airflow.lineage.hook | help: Use `notify_asset_alias_created` instead - -ℹ Safe fix -44 44 | dm.create_datasets() -45 45 | dm.notify_dataset_created() -46 46 | dm.notify_dataset_changed() -47 |-dm.notify_dataset_alias_created() - 47 |+dm.notify_asset_alias_created() -48 48 | -49 49 | # airflow.lineage.hook -50 50 | dl_info = DatasetLineageInfo() +44 | dm.create_datasets() +45 | dm.notify_dataset_created() +46 | dm.notify_dataset_changed() + - dm.notify_dataset_alias_created() +47 + dm.notify_asset_alias_created() +48 | +49 | # airflow.lineage.hook +50 | dl_info = DatasetLineageInfo() AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0 --> AIR301_class_attribute.py:50:11 @@ -318,25 +290,23 @@ AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0 51 | dl_info.dataset | help: Use `AssetLineageInfo` from `airflow.lineage.hook` instead. - -ℹ Safe fix -9 9 | DatasetAny, -10 10 | ) -11 11 | from airflow.datasets.manager import DatasetManager -12 |-from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector - 12 |+from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector, AssetLineageInfo -13 13 | from airflow.providers.amazon.aws.auth_manager.aws_auth_manager import AwsAuthManager -14 14 | from airflow.providers.apache.beam.hooks import BeamHook, NotAir302HookError -15 15 | from airflow.providers.google.cloud.secrets.secret_manager import ( +9 | DatasetAny, +10 | ) +11 | from airflow.datasets.manager import DatasetManager + - from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector +12 + from airflow.lineage.hook import DatasetLineageInfo, HookLineageCollector, AssetLineageInfo +13 | from airflow.providers.amazon.aws.auth_manager.aws_auth_manager import AwsAuthManager +14 | from airflow.providers.apache.beam.hooks import BeamHook, NotAir302HookError +15 | from airflow.providers.google.cloud.secrets.secret_manager import ( -------------------------------------------------------------------------------- -47 47 | dm.notify_dataset_alias_created() -48 48 | -49 49 | # airflow.lineage.hook -50 |-dl_info = DatasetLineageInfo() - 50 |+dl_info = AssetLineageInfo() -51 51 | dl_info.dataset -52 52 | -53 53 | hlc = HookLineageCollector() +47 | dm.notify_dataset_alias_created() +48 | +49 | # airflow.lineage.hook + - dl_info = DatasetLineageInfo() +50 + dl_info = AssetLineageInfo() +51 | dl_info.dataset +52 | +53 | hlc = HookLineageCollector() AIR301 [*] `dataset` is removed in Airflow 3.0 --> AIR301_class_attribute.py:51:9 @@ -349,16 +319,14 @@ AIR301 [*] `dataset` is removed in Airflow 3.0 53 | hlc = HookLineageCollector() | help: Use `asset` instead - -ℹ Safe fix -48 48 | -49 49 | # airflow.lineage.hook -50 50 | dl_info = DatasetLineageInfo() -51 |-dl_info.dataset - 51 |+dl_info.asset -52 52 | -53 53 | hlc = HookLineageCollector() -54 54 | hlc.create_dataset() +48 | +49 | # airflow.lineage.hook +50 | dl_info = DatasetLineageInfo() + - dl_info.dataset +51 + dl_info.asset +52 | +53 | hlc = HookLineageCollector() +54 | hlc.create_dataset() AIR301 [*] `create_dataset` is removed in Airflow 3.0 --> AIR301_class_attribute.py:54:5 @@ -370,16 +338,14 @@ AIR301 [*] `create_dataset` is removed in Airflow 3.0 56 | hlc.add_output_dataset() | help: Use `create_asset` instead - -ℹ Safe fix -51 51 | dl_info.dataset -52 52 | -53 53 | hlc = HookLineageCollector() -54 |-hlc.create_dataset() - 54 |+hlc.create_asset() -55 55 | hlc.add_input_dataset() -56 56 | hlc.add_output_dataset() -57 57 | hlc.collected_datasets() +51 | dl_info.dataset +52 | +53 | hlc = HookLineageCollector() + - hlc.create_dataset() +54 + hlc.create_asset() +55 | hlc.add_input_dataset() +56 | hlc.add_output_dataset() +57 | hlc.collected_datasets() AIR301 [*] `add_input_dataset` is removed in Airflow 3.0 --> AIR301_class_attribute.py:55:5 @@ -392,16 +358,14 @@ AIR301 [*] `add_input_dataset` is removed in Airflow 3.0 57 | hlc.collected_datasets() | help: Use `add_input_asset` instead - -ℹ Safe fix -52 52 | -53 53 | hlc = HookLineageCollector() -54 54 | hlc.create_dataset() -55 |-hlc.add_input_dataset() - 55 |+hlc.add_input_asset() -56 56 | hlc.add_output_dataset() -57 57 | hlc.collected_datasets() -58 58 | +52 | +53 | hlc = HookLineageCollector() +54 | hlc.create_dataset() + - hlc.add_input_dataset() +55 + hlc.add_input_asset() +56 | hlc.add_output_dataset() +57 | hlc.collected_datasets() +58 | AIR301 [*] `add_output_dataset` is removed in Airflow 3.0 --> AIR301_class_attribute.py:56:5 @@ -413,16 +377,14 @@ AIR301 [*] `add_output_dataset` is removed in Airflow 3.0 57 | hlc.collected_datasets() | help: Use `add_output_asset` instead - -ℹ Safe fix -53 53 | hlc = HookLineageCollector() -54 54 | hlc.create_dataset() -55 55 | hlc.add_input_dataset() -56 |-hlc.add_output_dataset() - 56 |+hlc.add_output_asset() -57 57 | hlc.collected_datasets() -58 58 | -59 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager +53 | hlc = HookLineageCollector() +54 | hlc.create_dataset() +55 | hlc.add_input_dataset() + - hlc.add_output_dataset() +56 + hlc.add_output_asset() +57 | hlc.collected_datasets() +58 | +59 | # airflow.providers.amazon.auth_manager.aws_auth_manager AIR301 [*] `collected_datasets` is removed in Airflow 3.0 --> AIR301_class_attribute.py:57:5 @@ -435,16 +397,14 @@ AIR301 [*] `collected_datasets` is removed in Airflow 3.0 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager | help: Use `collected_assets` instead - -ℹ Safe fix -54 54 | hlc.create_dataset() -55 55 | hlc.add_input_dataset() -56 56 | hlc.add_output_dataset() -57 |-hlc.collected_datasets() - 57 |+hlc.collected_assets() -58 58 | -59 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager -60 60 | aam = AwsAuthManager() +54 | hlc.create_dataset() +55 | hlc.add_input_dataset() +56 | hlc.add_output_dataset() + - hlc.collected_datasets() +57 + hlc.collected_assets() +58 | +59 | # airflow.providers.amazon.auth_manager.aws_auth_manager +60 | aam = AwsAuthManager() AIR301 [*] `is_authorized_dataset` is removed in Airflow 3.0 --> AIR301_class_attribute.py:61:5 @@ -457,16 +417,14 @@ AIR301 [*] `is_authorized_dataset` is removed in Airflow 3.0 63 | # airflow.providers.apache.beam.hooks | help: Use `is_authorized_asset` instead - -ℹ Safe fix -58 58 | -59 59 | # airflow.providers.amazon.auth_manager.aws_auth_manager -60 60 | aam = AwsAuthManager() -61 |-aam.is_authorized_dataset() - 61 |+aam.is_authorized_asset() -62 62 | -63 63 | # airflow.providers.apache.beam.hooks -64 64 | # check get_conn_uri is caught if the class inherits from an airflow hook +58 | +59 | # airflow.providers.amazon.auth_manager.aws_auth_manager +60 | aam = AwsAuthManager() + - aam.is_authorized_dataset() +61 + aam.is_authorized_asset() +62 | +63 | # airflow.providers.apache.beam.hooks +64 | # check get_conn_uri is caught if the class inherits from an airflow hook AIR301 [*] `get_conn_uri` is removed in Airflow 3.0 --> AIR301_class_attribute.py:73:13 @@ -478,16 +436,14 @@ AIR301 [*] `get_conn_uri` is removed in Airflow 3.0 74 | csm_backend.get_connections() | help: Use `get_conn_value` instead - -ℹ Safe fix -70 70 | -71 71 | # airflow.providers.google.cloud.secrets.secret_manager -72 72 | csm_backend = CloudSecretManagerBackend() -73 |-csm_backend.get_conn_uri() - 73 |+csm_backend.get_conn_value() -74 74 | csm_backend.get_connections() -75 75 | -76 76 | # airflow.providers.hashicorp.secrets.vault +70 | +71 | # airflow.providers.google.cloud.secrets.secret_manager +72 | csm_backend = CloudSecretManagerBackend() + - csm_backend.get_conn_uri() +73 + csm_backend.get_conn_value() +74 | csm_backend.get_connections() +75 | +76 | # airflow.providers.hashicorp.secrets.vault AIR301 [*] `get_connections` is removed in Airflow 3.0 --> AIR301_class_attribute.py:74:13 @@ -500,16 +456,14 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0 76 | # airflow.providers.hashicorp.secrets.vault | help: Use `get_connection` instead - -ℹ Safe fix -71 71 | # airflow.providers.google.cloud.secrets.secret_manager -72 72 | csm_backend = CloudSecretManagerBackend() -73 73 | csm_backend.get_conn_uri() -74 |-csm_backend.get_connections() - 74 |+csm_backend.get_connection() -75 75 | -76 76 | # airflow.providers.hashicorp.secrets.vault -77 77 | vault_backend = VaultBackend() +71 | # airflow.providers.google.cloud.secrets.secret_manager +72 | csm_backend = CloudSecretManagerBackend() +73 | csm_backend.get_conn_uri() + - csm_backend.get_connections() +74 + csm_backend.get_connection() +75 | +76 | # airflow.providers.hashicorp.secrets.vault +77 | vault_backend = VaultBackend() AIR301 [*] `get_conn_uri` is removed in Airflow 3.0 --> AIR301_class_attribute.py:78:15 @@ -521,16 +475,14 @@ AIR301 [*] `get_conn_uri` is removed in Airflow 3.0 79 | vault_backend.get_connections() | help: Use `get_conn_value` instead - -ℹ Safe fix -75 75 | -76 76 | # airflow.providers.hashicorp.secrets.vault -77 77 | vault_backend = VaultBackend() -78 |-vault_backend.get_conn_uri() - 78 |+vault_backend.get_conn_value() -79 79 | vault_backend.get_connections() -80 80 | -81 81 | not_an_error = NotAir302SecretError() +75 | +76 | # airflow.providers.hashicorp.secrets.vault +77 | vault_backend = VaultBackend() + - vault_backend.get_conn_uri() +78 + vault_backend.get_conn_value() +79 | vault_backend.get_connections() +80 | +81 | not_an_error = NotAir302SecretError() AIR301 [*] `get_connections` is removed in Airflow 3.0 --> AIR301_class_attribute.py:79:15 @@ -543,16 +495,14 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0 81 | not_an_error = NotAir302SecretError() | help: Use `get_connection` instead - -ℹ Safe fix -76 76 | # airflow.providers.hashicorp.secrets.vault -77 77 | vault_backend = VaultBackend() -78 78 | vault_backend.get_conn_uri() -79 |-vault_backend.get_connections() - 79 |+vault_backend.get_connection() -80 80 | -81 81 | not_an_error = NotAir302SecretError() -82 82 | not_an_error.get_conn_uri() +76 | # airflow.providers.hashicorp.secrets.vault +77 | vault_backend = VaultBackend() +78 | vault_backend.get_conn_uri() + - vault_backend.get_connections() +79 + vault_backend.get_connection() +80 | +81 | not_an_error = NotAir302SecretError() +82 | not_an_error.get_conn_uri() AIR301 [*] `initialize_providers_dataset_uri_resources` is removed in Airflow 3.0 --> AIR301_class_attribute.py:86:4 @@ -565,16 +515,14 @@ AIR301 [*] `initialize_providers_dataset_uri_resources` is removed in Airflow 3. 88 | pm.dataset_uri_handlers | help: Use `initialize_providers_asset_uri_resources` instead - -ℹ Safe fix -83 83 | -84 84 | # airflow.providers_manager -85 85 | pm = ProvidersManager() -86 |-pm.initialize_providers_dataset_uri_resources() - 86 |+pm.initialize_providers_asset_uri_resources() -87 87 | pm.dataset_factories -88 88 | pm.dataset_uri_handlers -89 89 | pm.dataset_to_openlineage_converters +83 | +84 | # airflow.providers_manager +85 | pm = ProvidersManager() + - pm.initialize_providers_dataset_uri_resources() +86 + pm.initialize_providers_asset_uri_resources() +87 | pm.dataset_factories +88 | pm.dataset_uri_handlers +89 | pm.dataset_to_openlineage_converters AIR301 [*] `dataset_factories` is removed in Airflow 3.0 --> AIR301_class_attribute.py:87:4 @@ -587,16 +535,14 @@ AIR301 [*] `dataset_factories` is removed in Airflow 3.0 89 | pm.dataset_to_openlineage_converters | help: Use `asset_factories` instead - -ℹ Safe fix -84 84 | # airflow.providers_manager -85 85 | pm = ProvidersManager() -86 86 | pm.initialize_providers_dataset_uri_resources() -87 |-pm.dataset_factories - 87 |+pm.asset_factories -88 88 | pm.dataset_uri_handlers -89 89 | pm.dataset_to_openlineage_converters -90 90 | +84 | # airflow.providers_manager +85 | pm = ProvidersManager() +86 | pm.initialize_providers_dataset_uri_resources() + - pm.dataset_factories +87 + pm.asset_factories +88 | pm.dataset_uri_handlers +89 | pm.dataset_to_openlineage_converters +90 | AIR301 [*] `dataset_uri_handlers` is removed in Airflow 3.0 --> AIR301_class_attribute.py:88:4 @@ -608,16 +554,14 @@ AIR301 [*] `dataset_uri_handlers` is removed in Airflow 3.0 89 | pm.dataset_to_openlineage_converters | help: Use `asset_uri_handlers` instead - -ℹ Safe fix -85 85 | pm = ProvidersManager() -86 86 | pm.initialize_providers_dataset_uri_resources() -87 87 | pm.dataset_factories -88 |-pm.dataset_uri_handlers - 88 |+pm.asset_uri_handlers -89 89 | pm.dataset_to_openlineage_converters -90 90 | -91 91 | # airflow.secrets.base_secrets +85 | pm = ProvidersManager() +86 | pm.initialize_providers_dataset_uri_resources() +87 | pm.dataset_factories + - pm.dataset_uri_handlers +88 + pm.asset_uri_handlers +89 | pm.dataset_to_openlineage_converters +90 | +91 | # airflow.secrets.base_secrets AIR301 [*] `dataset_to_openlineage_converters` is removed in Airflow 3.0 --> AIR301_class_attribute.py:89:4 @@ -630,16 +574,14 @@ AIR301 [*] `dataset_to_openlineage_converters` is removed in Airflow 3.0 91 | # airflow.secrets.base_secrets | help: Use `asset_to_openlineage_converters` instead - -ℹ Safe fix -86 86 | pm.initialize_providers_dataset_uri_resources() -87 87 | pm.dataset_factories -88 88 | pm.dataset_uri_handlers -89 |-pm.dataset_to_openlineage_converters - 89 |+pm.asset_to_openlineage_converters -90 90 | -91 91 | # airflow.secrets.base_secrets -92 92 | base_secret_backend = BaseSecretsBackend() +86 | pm.initialize_providers_dataset_uri_resources() +87 | pm.dataset_factories +88 | pm.dataset_uri_handlers + - pm.dataset_to_openlineage_converters +89 + pm.asset_to_openlineage_converters +90 | +91 | # airflow.secrets.base_secrets +92 | base_secret_backend = BaseSecretsBackend() AIR301 [*] `get_conn_uri` is removed in Airflow 3.0 --> AIR301_class_attribute.py:93:21 @@ -651,16 +593,14 @@ AIR301 [*] `get_conn_uri` is removed in Airflow 3.0 94 | base_secret_backend.get_connections() | help: Use `get_conn_value` instead - -ℹ Safe fix -90 90 | -91 91 | # airflow.secrets.base_secrets -92 92 | base_secret_backend = BaseSecretsBackend() -93 |-base_secret_backend.get_conn_uri() - 93 |+base_secret_backend.get_conn_value() -94 94 | base_secret_backend.get_connections() -95 95 | -96 96 | # airflow.secrets.local_filesystem +90 | +91 | # airflow.secrets.base_secrets +92 | base_secret_backend = BaseSecretsBackend() + - base_secret_backend.get_conn_uri() +93 + base_secret_backend.get_conn_value() +94 | base_secret_backend.get_connections() +95 | +96 | # airflow.secrets.local_filesystem AIR301 [*] `get_connections` is removed in Airflow 3.0 --> AIR301_class_attribute.py:94:21 @@ -673,16 +613,14 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0 96 | # airflow.secrets.local_filesystem | help: Use `get_connection` instead - -ℹ Safe fix -91 91 | # airflow.secrets.base_secrets -92 92 | base_secret_backend = BaseSecretsBackend() -93 93 | base_secret_backend.get_conn_uri() -94 |-base_secret_backend.get_connections() - 94 |+base_secret_backend.get_connection() -95 95 | -96 96 | # airflow.secrets.local_filesystem -97 97 | lfb = LocalFilesystemBackend() +91 | # airflow.secrets.base_secrets +92 | base_secret_backend = BaseSecretsBackend() +93 | base_secret_backend.get_conn_uri() + - base_secret_backend.get_connections() +94 + base_secret_backend.get_connection() +95 | +96 | # airflow.secrets.local_filesystem +97 | lfb = LocalFilesystemBackend() AIR301 [*] `get_connections` is removed in Airflow 3.0 --> AIR301_class_attribute.py:98:5 @@ -693,10 +631,8 @@ AIR301 [*] `get_connections` is removed in Airflow 3.0 | ^^^^^^^^^^^^^^^ | help: Use `get_connection` instead - -ℹ Safe fix -95 95 | -96 96 | # airflow.secrets.local_filesystem -97 97 | lfb = LocalFilesystemBackend() -98 |-lfb.get_connections() - 98 |+lfb.get_connection() +95 | +96 | # airflow.secrets.local_filesystem +97 | lfb = LocalFilesystemBackend() + - lfb.get_connections() +98 + lfb.get_connection() diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap index b72ae18913..a6ff6da66e 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_context.py.snap @@ -337,16 +337,14 @@ AIR301 [*] `schedule_interval` is removed in Airflow 3.0 113 | template_searchpath=["/templates"], | help: Use `schedule` instead - -ℹ Safe fix -108 108 | -109 109 | with DAG( -110 110 | dag_id="example_dag", -111 |- schedule_interval="@daily", - 111 |+ schedule="@daily", -112 112 | start_date=datetime(2023, 1, 1), -113 113 | template_searchpath=["/templates"], -114 114 | ) as dag: +108 | +109 | with DAG( +110 | dag_id="example_dag", + - schedule_interval="@daily", +111 + schedule="@daily", +112 | start_date=datetime(2023, 1, 1), +113 | template_searchpath=["/templates"], +114 | ) as dag: AIR301 `next_ds` is removed in Airflow 3.0 --> AIR301_context.py:135:23 diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap index a5b36b1d7d..db6c2744af 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names.py.snap @@ -123,23 +123,22 @@ AIR301 [*] `airflow.secrets.cache.SecretCache` is removed in Airflow 3.0 | ^^^^^^^^^^^ | help: Use `SecretCache` from `airflow.sdk` instead. - -ℹ Unsafe fix -13 13 | from airflow.contrib.aws_athena_hook import AWSAthenaHook -14 14 | from airflow.datasets import DatasetAliasEvent -15 15 | from airflow.operators.subdag import SubDagOperator -16 |-from airflow.secrets.cache import SecretCache -17 16 | from airflow.secrets.local_filesystem import LocalFilesystemBackend -18 17 | from airflow.triggers.external_task import TaskStateTrigger -19 18 | from airflow.utils import dates +13 | from airflow.contrib.aws_athena_hook import AWSAthenaHook +14 | from airflow.datasets import DatasetAliasEvent +15 | from airflow.operators.subdag import SubDagOperator + - from airflow.secrets.cache import SecretCache +16 | from airflow.secrets.local_filesystem import LocalFilesystemBackend +17 | from airflow.triggers.external_task import TaskStateTrigger +18 | from airflow.utils import dates -------------------------------------------------------------------------------- -34 33 | from airflow.utils.trigger_rule import TriggerRule -35 34 | from airflow.www.auth import has_access, has_access_dataset -36 35 | from airflow.www.utils import get_sensitive_variables_fields, should_hide_value_for_key - 36 |+from airflow.sdk import SecretCache -37 37 | -38 38 | # airflow root -39 39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312 +33 | from airflow.utils.trigger_rule import TriggerRule +34 | from airflow.www.auth import has_access, has_access_dataset +35 | from airflow.www.utils import get_sensitive_variables_fields, should_hide_value_for_key +36 + from airflow.sdk import SecretCache +37 | +38 | # airflow root +39 | PY36, PY37, PY38, PY39, PY310, PY311, PY312 +note: This is an unsafe fix and may change runtime behavior AIR301 `airflow.triggers.external_task.TaskStateTrigger` is removed in Airflow 3.0 --> AIR301_names.py:65:1 diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap index 09537f148b..d1a368b70d 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_names_fix.py.snap @@ -12,18 +12,16 @@ AIR301 [*] `airflow.api_connexion.security.requires_access_dataset` is removed i 19 | DatasetDetails() | help: Use `requires_access_asset` from `airflow.api_fastapi.core_api.security` instead. - -ℹ Safe fix -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET - 16 |+from airflow.api_fastapi.core_api.security import requires_access_asset -16 17 | -17 |-requires_access_dataset() - 18 |+requires_access_asset() -18 19 | -19 20 | DatasetDetails() -20 21 | +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET +16 + from airflow.api_fastapi.core_api.security import requires_access_asset +17 | + - requires_access_dataset() +18 + requires_access_asset() +19 | +20 | DatasetDetails() +21 | AIR301 [*] `airflow.auth.managers.models.resource_details.DatasetDetails` is removed in Airflow 3.0 --> AIR301_names_fix.py:19:1 @@ -36,20 +34,18 @@ AIR301 [*] `airflow.auth.managers.models.resource_details.DatasetDetails` is rem 21 | DatasetManager() | help: Use `AssetDetails` from `airflow.api_fastapi.auth.managers.models.resource_details` instead. - -ℹ Safe fix -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET - 16 |+from airflow.api_fastapi.auth.managers.models.resource_details import AssetDetails -16 17 | -17 18 | requires_access_dataset() -18 19 | -19 |-DatasetDetails() - 20 |+AssetDetails() -20 21 | -21 22 | DatasetManager() -22 23 | dataset_manager() +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET +16 + from airflow.api_fastapi.auth.managers.models.resource_details import AssetDetails +17 | +18 | requires_access_dataset() +19 | + - DatasetDetails() +20 + AssetDetails() +21 | +22 | DatasetManager() +23 | dataset_manager() AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0 --> AIR301_names_fix.py:21:1 @@ -62,22 +58,20 @@ AIR301 [*] `airflow.datasets.manager.DatasetManager` is removed in Airflow 3.0 23 | resolve_dataset_manager() | help: Use `AssetManager` from `airflow.assets.manager` instead. - -ℹ Safe fix -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET - 16 |+from airflow.assets.manager import AssetManager -16 17 | -17 18 | requires_access_dataset() -18 19 | -19 20 | DatasetDetails() -20 21 | -21 |-DatasetManager() - 22 |+AssetManager() -22 23 | dataset_manager() -23 24 | resolve_dataset_manager() -24 25 | +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET +16 + from airflow.assets.manager import AssetManager +17 | +18 | requires_access_dataset() +19 | +20 | DatasetDetails() +21 | + - DatasetManager() +22 + AssetManager() +23 | dataset_manager() +24 | resolve_dataset_manager() +25 | AIR301 [*] `airflow.datasets.manager.dataset_manager` is removed in Airflow 3.0 --> AIR301_names_fix.py:22:1 @@ -88,23 +82,21 @@ AIR301 [*] `airflow.datasets.manager.dataset_manager` is removed in Airflow 3.0 23 | resolve_dataset_manager() | help: Use `asset_manager` from `airflow.assets.manager` instead. - -ℹ Safe fix -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET - 16 |+from airflow.assets.manager import asset_manager -16 17 | -17 18 | requires_access_dataset() -18 19 | -19 20 | DatasetDetails() -20 21 | -21 22 | DatasetManager() -22 |-dataset_manager() - 23 |+asset_manager() -23 24 | resolve_dataset_manager() -24 25 | -25 26 | DatasetLineageInfo() +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET +16 + from airflow.assets.manager import asset_manager +17 | +18 | requires_access_dataset() +19 | +20 | DatasetDetails() +21 | +22 | DatasetManager() + - dataset_manager() +23 + asset_manager() +24 | resolve_dataset_manager() +25 | +26 | DatasetLineageInfo() AIR301 [*] `airflow.datasets.manager.resolve_dataset_manager` is removed in Airflow 3.0 --> AIR301_names_fix.py:23:1 @@ -117,24 +109,22 @@ AIR301 [*] `airflow.datasets.manager.resolve_dataset_manager` is removed in Airf 25 | DatasetLineageInfo() | help: Use `resolve_asset_manager` from `airflow.assets.manager` instead. - -ℹ Safe fix -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET - 16 |+from airflow.assets.manager import resolve_asset_manager -16 17 | -17 18 | requires_access_dataset() -18 19 | +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET +16 + from airflow.assets.manager import resolve_asset_manager +17 | +18 | requires_access_dataset() +19 | -------------------------------------------------------------------------------- -20 21 | -21 22 | DatasetManager() -22 23 | dataset_manager() -23 |-resolve_dataset_manager() - 24 |+resolve_asset_manager() -24 25 | -25 26 | DatasetLineageInfo() -26 27 | +21 | +22 | DatasetManager() +23 | dataset_manager() + - resolve_dataset_manager() +24 + resolve_asset_manager() +25 | +26 | DatasetLineageInfo() +27 | AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0 --> AIR301_names_fix.py:25:1 @@ -147,25 +137,23 @@ AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` is removed in Airflow 3.0 27 | AllowListValidator() | help: Use `AssetLineageInfo` from `airflow.lineage.hook` instead. - -ℹ Safe fix -9 9 | dataset_manager, -10 10 | resolve_dataset_manager, -11 11 | ) -12 |-from airflow.lineage.hook import DatasetLineageInfo - 12 |+from airflow.lineage.hook import DatasetLineageInfo, AssetLineageInfo -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET +9 | dataset_manager, +10 | resolve_dataset_manager, +11 | ) + - from airflow.lineage.hook import DatasetLineageInfo +12 + from airflow.lineage.hook import DatasetLineageInfo, AssetLineageInfo +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET -------------------------------------------------------------------------------- -22 22 | dataset_manager() -23 23 | resolve_dataset_manager() -24 24 | -25 |-DatasetLineageInfo() - 25 |+AssetLineageInfo() -26 26 | -27 27 | AllowListValidator() -28 28 | BlockListValidator() +22 | dataset_manager() +23 | resolve_dataset_manager() +24 | + - DatasetLineageInfo() +25 + AssetLineageInfo() +26 | +27 | AllowListValidator() +28 | BlockListValidator() AIR301 [*] `airflow.metrics.validators.AllowListValidator` is removed in Airflow 3.0 --> AIR301_names_fix.py:27:1 @@ -177,25 +165,23 @@ AIR301 [*] `airflow.metrics.validators.AllowListValidator` is removed in Airflow 28 | BlockListValidator() | help: Use `PatternAllowListValidator` from `airflow.metrics.validators` instead. - -ℹ Safe fix -10 10 | resolve_dataset_manager, -11 11 | ) -12 12 | from airflow.lineage.hook import DatasetLineageInfo -13 |-from airflow.metrics.validators import AllowListValidator, BlockListValidator - 13 |+from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternAllowListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET -16 16 | +10 | resolve_dataset_manager, +11 | ) +12 | from airflow.lineage.hook import DatasetLineageInfo + - from airflow.metrics.validators import AllowListValidator, BlockListValidator +13 + from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternAllowListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET +16 | -------------------------------------------------------------------------------- -24 24 | -25 25 | DatasetLineageInfo() -26 26 | -27 |-AllowListValidator() - 27 |+PatternAllowListValidator() -28 28 | BlockListValidator() -29 29 | -30 30 | load_connections() +24 | +25 | DatasetLineageInfo() +26 | + - AllowListValidator() +27 + PatternAllowListValidator() +28 | BlockListValidator() +29 | +30 | load_connections() AIR301 [*] `airflow.metrics.validators.BlockListValidator` is removed in Airflow 3.0 --> AIR301_names_fix.py:28:1 @@ -207,25 +193,23 @@ AIR301 [*] `airflow.metrics.validators.BlockListValidator` is removed in Airflow 30 | load_connections() | help: Use `PatternBlockListValidator` from `airflow.metrics.validators` instead. - -ℹ Safe fix -10 10 | resolve_dataset_manager, -11 11 | ) -12 12 | from airflow.lineage.hook import DatasetLineageInfo -13 |-from airflow.metrics.validators import AllowListValidator, BlockListValidator - 13 |+from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternBlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 15 | from airflow.security.permissions import RESOURCE_DATASET -16 16 | +10 | resolve_dataset_manager, +11 | ) +12 | from airflow.lineage.hook import DatasetLineageInfo + - from airflow.metrics.validators import AllowListValidator, BlockListValidator +13 + from airflow.metrics.validators import AllowListValidator, BlockListValidator, PatternBlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections +15 | from airflow.security.permissions import RESOURCE_DATASET +16 | -------------------------------------------------------------------------------- -25 25 | DatasetLineageInfo() -26 26 | -27 27 | AllowListValidator() -28 |-BlockListValidator() - 28 |+PatternBlockListValidator() -29 29 | -30 30 | load_connections() -31 31 | +25 | DatasetLineageInfo() +26 | +27 | AllowListValidator() + - BlockListValidator() +28 + PatternBlockListValidator() +29 | +30 | load_connections() +31 | AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Airflow 3.0 --> AIR301_names_fix.py:30:1 @@ -238,25 +222,23 @@ AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Air 32 | RESOURCE_DATASET | help: Use `load_connections_dict` from `airflow.secrets.local_filesystem` instead. - -ℹ Safe fix -11 11 | ) -12 12 | from airflow.lineage.hook import DatasetLineageInfo -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 |-from airflow.secrets.local_filesystem import load_connections - 14 |+from airflow.secrets.local_filesystem import load_connections, load_connections_dict -15 15 | from airflow.security.permissions import RESOURCE_DATASET -16 16 | -17 17 | requires_access_dataset() +11 | ) +12 | from airflow.lineage.hook import DatasetLineageInfo +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator + - from airflow.secrets.local_filesystem import load_connections +14 + from airflow.secrets.local_filesystem import load_connections, load_connections_dict +15 | from airflow.security.permissions import RESOURCE_DATASET +16 | +17 | requires_access_dataset() -------------------------------------------------------------------------------- -27 27 | AllowListValidator() -28 28 | BlockListValidator() -29 29 | -30 |-load_connections() - 30 |+load_connections_dict() -31 31 | -32 32 | RESOURCE_DATASET -33 33 | +27 | AllowListValidator() +28 | BlockListValidator() +29 | + - load_connections() +30 + load_connections_dict() +31 | +32 | RESOURCE_DATASET +33 | AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow 3.0 --> AIR301_names_fix.py:32:1 @@ -267,25 +249,23 @@ AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow | ^^^^^^^^^^^^^^^^ | help: Use `RESOURCE_ASSET` from `airflow.security.permissions` instead. - -ℹ Safe fix -12 12 | from airflow.lineage.hook import DatasetLineageInfo -13 13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator -14 14 | from airflow.secrets.local_filesystem import load_connections -15 |-from airflow.security.permissions import RESOURCE_DATASET - 15 |+from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET -16 16 | -17 17 | requires_access_dataset() -18 18 | +12 | from airflow.lineage.hook import DatasetLineageInfo +13 | from airflow.metrics.validators import AllowListValidator, BlockListValidator +14 | from airflow.secrets.local_filesystem import load_connections + - from airflow.security.permissions import RESOURCE_DATASET +15 + from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET +16 | +17 | requires_access_dataset() +18 | -------------------------------------------------------------------------------- -29 29 | -30 30 | load_connections() -31 31 | -32 |-RESOURCE_DATASET - 32 |+RESOURCE_ASSET -33 33 | -34 34 | -35 35 | from airflow.listeners.spec.dataset import ( +29 | +30 | load_connections() +31 | + - RESOURCE_DATASET +32 + RESOURCE_ASSET +33 | +34 | +35 | from airflow.listeners.spec.dataset import ( AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_created` is removed in Airflow 3.0 --> AIR301_names_fix.py:40:1 @@ -297,18 +277,16 @@ AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_created` is removed in Air 41 | on_dataset_changed() | help: Use `on_asset_created` from `airflow.listeners.spec.asset` instead. - -ℹ Safe fix -36 36 | on_dataset_changed, -37 37 | on_dataset_created, -38 38 | ) - 39 |+from airflow.listeners.spec.asset import on_asset_created -39 40 | -40 |-on_dataset_created() - 41 |+on_asset_created() -41 42 | on_dataset_changed() -42 43 | -43 44 | +36 | on_dataset_changed, +37 | on_dataset_created, +38 | ) +39 + from airflow.listeners.spec.asset import on_asset_created +40 | + - on_dataset_created() +41 + on_asset_created() +42 | on_dataset_changed() +43 | +44 | AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_changed` is removed in Airflow 3.0 --> AIR301_names_fix.py:41:1 @@ -318,19 +296,17 @@ AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_changed` is removed in Air | ^^^^^^^^^^^^^^^^^^ | help: Use `on_asset_changed` from `airflow.listeners.spec.asset` instead. - -ℹ Safe fix -36 36 | on_dataset_changed, -37 37 | on_dataset_created, -38 38 | ) - 39 |+from airflow.listeners.spec.asset import on_asset_changed -39 40 | -40 41 | on_dataset_created() -41 |-on_dataset_changed() - 42 |+on_asset_changed() -42 43 | -43 44 | -44 45 | # airflow.operators.python +36 | on_dataset_changed, +37 | on_dataset_created, +38 | ) +39 + from airflow.listeners.spec.asset import on_asset_changed +40 | +41 | on_dataset_created() + - on_dataset_changed() +42 + on_asset_changed() +43 | +44 | +45 | # airflow.operators.python AIR301 [*] `airflow.operators.python.get_current_context` is removed in Airflow 3.0 --> AIR301_names_fix.py:47:1 @@ -343,16 +319,15 @@ AIR301 [*] `airflow.operators.python.get_current_context` is removed in Airflow 49 | # airflow.providers.mysql | help: Use `get_current_context` from `airflow.sdk` instead. - -ℹ Unsafe fix -42 42 | -43 43 | -44 44 | # airflow.operators.python -45 |-from airflow.operators.python import get_current_context - 45 |+from airflow.sdk import get_current_context -46 46 | -47 47 | get_current_context() -48 48 | +42 | +43 | +44 | # airflow.operators.python + - from airflow.operators.python import get_current_context +45 + from airflow.sdk import get_current_context +46 | +47 | get_current_context() +48 | +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.providers.mysql.datasets.mysql.sanitize_uri` is removed in Airflow 3.0 --> AIR301_names_fix.py:52:1 @@ -365,16 +340,15 @@ AIR301 [*] `airflow.providers.mysql.datasets.mysql.sanitize_uri` is removed in A 54 | # airflow.providers.postgres | help: Use `sanitize_uri` from `airflow.providers.mysql.assets.mysql` instead. - -ℹ Unsafe fix -47 47 | get_current_context() -48 48 | -49 49 | # airflow.providers.mysql -50 |-from airflow.providers.mysql.datasets.mysql import sanitize_uri - 50 |+from airflow.providers.mysql.assets.mysql import sanitize_uri -51 51 | -52 52 | sanitize_uri -53 53 | +47 | get_current_context() +48 | +49 | # airflow.providers.mysql + - from airflow.providers.mysql.datasets.mysql import sanitize_uri +50 + from airflow.providers.mysql.assets.mysql import sanitize_uri +51 | +52 | sanitize_uri +53 | +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.providers.postgres.datasets.postgres.sanitize_uri` is removed in Airflow 3.0 --> AIR301_names_fix.py:57:1 @@ -387,16 +361,15 @@ AIR301 [*] `airflow.providers.postgres.datasets.postgres.sanitize_uri` is remove 59 | # airflow.providers.trino | help: Use `sanitize_uri` from `airflow.providers.postgres.assets.postgres` instead. - -ℹ Unsafe fix -52 52 | sanitize_uri -53 53 | -54 54 | # airflow.providers.postgres -55 |-from airflow.providers.postgres.datasets.postgres import sanitize_uri - 55 |+from airflow.providers.postgres.assets.postgres import sanitize_uri -56 56 | -57 57 | sanitize_uri -58 58 | +52 | sanitize_uri +53 | +54 | # airflow.providers.postgres + - from airflow.providers.postgres.datasets.postgres import sanitize_uri +55 + from airflow.providers.postgres.assets.postgres import sanitize_uri +56 | +57 | sanitize_uri +58 | +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.providers.trino.datasets.trino.sanitize_uri` is removed in Airflow 3.0 --> AIR301_names_fix.py:62:1 @@ -409,16 +382,15 @@ AIR301 [*] `airflow.providers.trino.datasets.trino.sanitize_uri` is removed in A 64 | # airflow.notifications.basenotifier | help: Use `sanitize_uri` from `airflow.providers.trino.assets.trino` instead. - -ℹ Unsafe fix -57 57 | sanitize_uri -58 58 | -59 59 | # airflow.providers.trino -60 |-from airflow.providers.trino.datasets.trino import sanitize_uri - 60 |+from airflow.providers.trino.assets.trino import sanitize_uri -61 61 | -62 62 | sanitize_uri -63 63 | +57 | sanitize_uri +58 | +59 | # airflow.providers.trino + - from airflow.providers.trino.datasets.trino import sanitize_uri +60 + from airflow.providers.trino.assets.trino import sanitize_uri +61 | +62 | sanitize_uri +63 | +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.notifications.basenotifier.BaseNotifier` is removed in Airflow 3.0 --> AIR301_names_fix.py:67:1 @@ -431,16 +403,15 @@ AIR301 [*] `airflow.notifications.basenotifier.BaseNotifier` is removed in Airfl 69 | # airflow.auth.manager | help: Use `BaseNotifier` from `airflow.sdk.bases.notifier` instead. - -ℹ Unsafe fix -62 62 | sanitize_uri -63 63 | -64 64 | # airflow.notifications.basenotifier -65 |-from airflow.notifications.basenotifier import BaseNotifier - 65 |+from airflow.sdk.bases.notifier import BaseNotifier -66 66 | -67 67 | BaseNotifier() -68 68 | +62 | sanitize_uri +63 | +64 | # airflow.notifications.basenotifier + - from airflow.notifications.basenotifier import BaseNotifier +65 + from airflow.sdk.bases.notifier import BaseNotifier +66 | +67 | BaseNotifier() +68 | +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.auth.managers.base_auth_manager.BaseAuthManager` is removed in Airflow 3.0 --> AIR301_names_fix.py:72:1 @@ -451,16 +422,15 @@ AIR301 [*] `airflow.auth.managers.base_auth_manager.BaseAuthManager` is removed | ^^^^^^^^^^^^^^^ | help: Use `BaseAuthManager` from `airflow.api_fastapi.auth.managers.base_auth_manager` instead. - -ℹ Unsafe fix -67 67 | BaseNotifier() -68 68 | -69 69 | # airflow.auth.manager -70 |-from airflow.auth.managers.base_auth_manager import BaseAuthManager - 70 |+from airflow.api_fastapi.auth.managers.base_auth_manager import BaseAuthManager -71 71 | -72 72 | BaseAuthManager() -73 73 | +67 | BaseNotifier() +68 | +69 | # airflow.auth.manager + - from airflow.auth.managers.base_auth_manager import BaseAuthManager +70 + from airflow.api_fastapi.auth.managers.base_auth_manager import BaseAuthManager +71 | +72 | BaseAuthManager() +73 | +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.configuration.get` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:1 @@ -471,20 +441,18 @@ AIR301 [*] `airflow.configuration.get` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.get` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+conf, getboolean, getfloat, getint, has_option, remove_option, as_dict, set -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + conf, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.configuration.getboolean` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:6 @@ -495,20 +463,18 @@ AIR301 [*] `airflow.configuration.getboolean` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.getboolean` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+get, conf, getfloat, getint, has_option, remove_option, as_dict, set -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + get, conf, getfloat, getint, has_option, remove_option, as_dict, set +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.configuration.getfloat` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:18 @@ -519,20 +485,18 @@ AIR301 [*] `airflow.configuration.getfloat` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.getfloat` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+get, getboolean, conf, getint, has_option, remove_option, as_dict, set -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + get, getboolean, conf, getint, has_option, remove_option, as_dict, set +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.configuration.getint` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:28 @@ -543,20 +507,18 @@ AIR301 [*] `airflow.configuration.getint` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.getint` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+get, getboolean, getfloat, conf, has_option, remove_option, as_dict, set -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + get, getboolean, getfloat, conf, has_option, remove_option, as_dict, set +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.configuration.has_option` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:36 @@ -567,20 +529,18 @@ AIR301 [*] `airflow.configuration.has_option` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.has_option` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+get, getboolean, getfloat, getint, conf, remove_option, as_dict, set -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + get, getboolean, getfloat, getint, conf, remove_option, as_dict, set +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.configuration.remove_option` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:48 @@ -591,20 +551,18 @@ AIR301 [*] `airflow.configuration.remove_option` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.remove_option` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+get, getboolean, getfloat, getint, has_option, conf, as_dict, set -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + get, getboolean, getfloat, getint, has_option, conf, as_dict, set +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.configuration.as_dict` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:63 @@ -615,20 +573,18 @@ AIR301 [*] `airflow.configuration.as_dict` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.as_dict` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+get, getboolean, getfloat, getint, has_option, remove_option, conf, set -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + get, getboolean, getfloat, getint, has_option, remove_option, conf, set +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.configuration.set` is removed in Airflow 3.0 --> AIR301_names_fix.py:87:72 @@ -639,20 +595,18 @@ AIR301 [*] `airflow.configuration.set` is removed in Airflow 3.0 88 | from airflow.hooks.base_hook import BaseHook | help: Use `conf.set` from `airflow.configuration` instead. - -ℹ Safe fix -81 81 | has_option, -82 82 | remove_option, -83 83 | set, - 84 |+conf, -84 85 | ) -85 86 | -86 87 | # airflow.configuration -87 |-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set - 88 |+get, getboolean, getfloat, getint, has_option, remove_option, as_dict, conf -88 89 | from airflow.hooks.base_hook import BaseHook -89 90 | -90 91 | # airflow.hooks +81 | has_option, +82 | remove_option, +83 | set, +84 + conf, +85 | ) +86 | +87 | # airflow.configuration + - get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set +88 + get, getboolean, getfloat, getint, has_option, remove_option, as_dict, conf +89 | from airflow.hooks.base_hook import BaseHook +90 | +91 | # airflow.hooks AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0 --> AIR301_names_fix.py:91:1 @@ -664,16 +618,15 @@ AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0 93 | from airflow.sensors.base_sensor_operator import BaseSensorOperator | help: Use `BaseHook` from `airflow.hooks.base` instead. - -ℹ Unsafe fix -85 85 | -86 86 | # airflow.configuration -87 87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set -88 |-from airflow.hooks.base_hook import BaseHook - 88 |+from airflow.hooks.base import BaseHook -89 89 | -90 90 | # airflow.hooks -91 91 | BaseHook() +85 | +86 | # airflow.configuration +87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set + - from airflow.hooks.base_hook import BaseHook +88 + from airflow.hooks.base import BaseHook +89 | +90 | # airflow.hooks +91 | BaseHook() +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.sensors.base_sensor_operator.BaseSensorOperator` is removed in Airflow 3.0 --> AIR301_names_fix.py:96:1 @@ -684,16 +637,15 @@ AIR301 [*] `airflow.sensors.base_sensor_operator.BaseSensorOperator` is removed 97 | BaseHook() | help: Use `BaseSensorOperator` from `airflow.sdk.bases.sensor` instead. - -ℹ Unsafe fix -90 90 | # airflow.hooks -91 91 | BaseHook() -92 92 | -93 |-from airflow.sensors.base_sensor_operator import BaseSensorOperator - 93 |+from airflow.sdk.bases.sensor import BaseSensorOperator -94 94 | -95 95 | # airflow.sensors.base_sensor_operator -96 96 | BaseSensorOperator() +90 | # airflow.hooks +91 | BaseHook() +92 | + - from airflow.sensors.base_sensor_operator import BaseSensorOperator +93 + from airflow.sdk.bases.sensor import BaseSensorOperator +94 | +95 | # airflow.sensors.base_sensor_operator +96 | BaseSensorOperator() +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0 --> AIR301_names_fix.py:97:1 @@ -706,21 +658,20 @@ AIR301 [*] `airflow.hooks.base_hook.BaseHook` is removed in Airflow 3.0 99 | from airflow.utils.helpers import chain as helper_chain | help: Use `BaseHook` from `airflow.hooks.base` instead. - -ℹ Unsafe fix -85 85 | -86 86 | # airflow.configuration -87 87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set -88 |-from airflow.hooks.base_hook import BaseHook -89 88 | -90 89 | # airflow.hooks -91 90 | BaseHook() -92 91 | -93 92 | from airflow.sensors.base_sensor_operator import BaseSensorOperator - 93 |+from airflow.hooks.base import BaseHook -94 94 | -95 95 | # airflow.sensors.base_sensor_operator -96 96 | BaseSensorOperator() +85 | +86 | # airflow.configuration +87 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set + - from airflow.hooks.base_hook import BaseHook +88 | +89 | # airflow.hooks +90 | BaseHook() +91 | +92 | from airflow.sensors.base_sensor_operator import BaseSensorOperator +93 + from airflow.hooks.base import BaseHook +94 | +95 | # airflow.sensors.base_sensor_operator +96 | BaseSensorOperator() +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.utils.helpers.chain` is removed in Airflow 3.0 --> AIR301_names_fix.py:103:1 @@ -731,19 +682,17 @@ AIR301 [*] `airflow.utils.helpers.chain` is removed in Airflow 3.0 104 | helper_cross_downstream | help: Use `chain` from `airflow.sdk` instead. - -ℹ Safe fix -98 98 | -99 99 | from airflow.utils.helpers import chain as helper_chain -100 100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream - 101 |+from airflow.sdk import chain -101 102 | -102 103 | # airflow.utils.helpers -103 |-helper_chain - 104 |+chain -104 105 | helper_cross_downstream -105 106 | -106 107 | # airflow.utils.file +98 | +99 | from airflow.utils.helpers import chain as helper_chain +100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream +101 + from airflow.sdk import chain +102 | +103 | # airflow.utils.helpers + - helper_chain +104 + chain +105 | helper_cross_downstream +106 | +107 | # airflow.utils.file AIR301 [*] `airflow.utils.helpers.cross_downstream` is removed in Airflow 3.0 --> AIR301_names_fix.py:104:1 @@ -756,20 +705,18 @@ AIR301 [*] `airflow.utils.helpers.cross_downstream` is removed in Airflow 3.0 106 | # airflow.utils.file | help: Use `cross_downstream` from `airflow.sdk` instead. - -ℹ Safe fix -98 98 | -99 99 | from airflow.utils.helpers import chain as helper_chain -100 100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream - 101 |+from airflow.sdk import cross_downstream -101 102 | -102 103 | # airflow.utils.helpers -103 104 | helper_chain -104 |-helper_cross_downstream - 105 |+cross_downstream -105 106 | -106 107 | # airflow.utils.file -107 108 | from airflow.utils.file import TemporaryDirectory +98 | +99 | from airflow.utils.helpers import chain as helper_chain +100 | from airflow.utils.helpers import cross_downstream as helper_cross_downstream +101 + from airflow.sdk import cross_downstream +102 | +103 | # airflow.utils.helpers +104 | helper_chain + - helper_cross_downstream +105 + cross_downstream +106 | +107 | # airflow.utils.file +108 | from airflow.utils.file import TemporaryDirectory AIR301 [*] `airflow.utils.file.TemporaryDirectory` is removed in Airflow 3.0 --> AIR301_names_fix.py:109:1 @@ -782,16 +729,15 @@ AIR301 [*] `airflow.utils.file.TemporaryDirectory` is removed in Airflow 3.0 111 | from airflow.utils.log import secrets_masker | help: Use `TemporaryDirectory` from `tempfile` instead. - -ℹ Unsafe fix -104 104 | helper_cross_downstream -105 105 | -106 106 | # airflow.utils.file -107 |-from airflow.utils.file import TemporaryDirectory - 107 |+from tempfile import TemporaryDirectory -108 108 | -109 109 | TemporaryDirectory() -110 110 | +104 | helper_cross_downstream +105 | +106 | # airflow.utils.file + - from airflow.utils.file import TemporaryDirectory +107 + from tempfile import TemporaryDirectory +108 | +109 | TemporaryDirectory() +110 | +note: This is an unsafe fix and may change runtime behavior AIR301 [*] `airflow.utils.log.secrets_masker` is removed in Airflow 3.0 --> AIR301_names_fix.py:114:1 @@ -801,13 +747,12 @@ AIR301 [*] `airflow.utils.log.secrets_masker` is removed in Airflow 3.0 | ^^^^^^^^^^^^^^ | help: Use `secrets_masker` from `airflow.sdk.execution_time` instead. - -ℹ Unsafe fix -108 108 | -109 109 | TemporaryDirectory() -110 110 | -111 |-from airflow.utils.log import secrets_masker - 111 |+from airflow.sdk.execution_time import secrets_masker -112 112 | -113 113 | # airflow.utils.log -114 114 | secrets_masker +108 | +109 | TemporaryDirectory() +110 | + - from airflow.utils.log import secrets_masker +111 + from airflow.sdk.execution_time import secrets_masker +112 | +113 | # airflow.utils.log +114 | secrets_masker +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap index 825dad7e21..baba2f5e69 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR301_AIR301_provider_names_fix.py.snap @@ -12,16 +12,14 @@ AIR301 [*] `airflow.providers.amazon.aws.auth_manager.avp.entities.AvpEntities.D 13 | # airflow.providers.openlineage.utils.utils | help: Use `AvpEntities.ASSET` from `airflow.providers.amazon.aws.auth_manager.avp.entities` instead. - -ℹ Safe fix -8 8 | from airflow.secrets.local_filesystem import load_connections -9 9 | from airflow.security.permissions import RESOURCE_DATASET -10 10 | -11 |-AvpEntities.DATASET - 11 |+AvpEntities -12 12 | -13 13 | # airflow.providers.openlineage.utils.utils -14 14 | DatasetInfo() +8 | from airflow.secrets.local_filesystem import load_connections +9 | from airflow.security.permissions import RESOURCE_DATASET +10 | + - AvpEntities.DATASET +11 + AvpEntities +12 | +13 | # airflow.providers.openlineage.utils.utils +14 | DatasetInfo() AIR301 [*] `airflow.providers.openlineage.utils.utils.DatasetInfo` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:14:1 @@ -32,24 +30,22 @@ AIR301 [*] `airflow.providers.openlineage.utils.utils.DatasetInfo` is removed in 15 | translate_airflow_dataset() | help: Use `AssetInfo` from `airflow.providers.openlineage.utils.utils` instead. - -ℹ Safe fix -4 4 | from airflow.providers.openlineage.utils.utils import ( -5 5 | DatasetInfo, -6 6 | translate_airflow_dataset, - 7 |+AssetInfo, -7 8 | ) -8 9 | from airflow.secrets.local_filesystem import load_connections -9 10 | from airflow.security.permissions import RESOURCE_DATASET +4 | from airflow.providers.openlineage.utils.utils import ( +5 | DatasetInfo, +6 | translate_airflow_dataset, +7 + AssetInfo, +8 | ) +9 | from airflow.secrets.local_filesystem import load_connections +10 | from airflow.security.permissions import RESOURCE_DATASET -------------------------------------------------------------------------------- -11 12 | AvpEntities.DATASET -12 13 | -13 14 | # airflow.providers.openlineage.utils.utils -14 |-DatasetInfo() - 15 |+AssetInfo() -15 16 | translate_airflow_dataset() -16 17 | -17 18 | # airflow.secrets.local_filesystem +12 | AvpEntities.DATASET +13 | +14 | # airflow.providers.openlineage.utils.utils + - DatasetInfo() +15 + AssetInfo() +16 | translate_airflow_dataset() +17 | +18 | # airflow.secrets.local_filesystem AIR301 [*] `airflow.providers.openlineage.utils.utils.translate_airflow_dataset` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:15:1 @@ -62,24 +58,22 @@ AIR301 [*] `airflow.providers.openlineage.utils.utils.translate_airflow_dataset` 17 | # airflow.secrets.local_filesystem | help: Use `translate_airflow_asset` from `airflow.providers.openlineage.utils.utils` instead. - -ℹ Safe fix -4 4 | from airflow.providers.openlineage.utils.utils import ( -5 5 | DatasetInfo, -6 6 | translate_airflow_dataset, - 7 |+translate_airflow_asset, -7 8 | ) -8 9 | from airflow.secrets.local_filesystem import load_connections -9 10 | from airflow.security.permissions import RESOURCE_DATASET +4 | from airflow.providers.openlineage.utils.utils import ( +5 | DatasetInfo, +6 | translate_airflow_dataset, +7 + translate_airflow_asset, +8 | ) +9 | from airflow.secrets.local_filesystem import load_connections +10 | from airflow.security.permissions import RESOURCE_DATASET -------------------------------------------------------------------------------- -12 13 | -13 14 | # airflow.providers.openlineage.utils.utils -14 15 | DatasetInfo() -15 |-translate_airflow_dataset() - 16 |+translate_airflow_asset() -16 17 | -17 18 | # airflow.secrets.local_filesystem -18 19 | load_connections() +13 | +14 | # airflow.providers.openlineage.utils.utils +15 | DatasetInfo() + - translate_airflow_dataset() +16 + translate_airflow_asset() +17 | +18 | # airflow.secrets.local_filesystem +19 | load_connections() AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:18:1 @@ -91,25 +85,23 @@ AIR301 [*] `airflow.secrets.local_filesystem.load_connections` is removed in Air 20 | # airflow.security.permissions | help: Use `load_connections_dict` from `airflow.secrets.local_filesystem` instead. - -ℹ Safe fix -5 5 | DatasetInfo, -6 6 | translate_airflow_dataset, -7 7 | ) -8 |-from airflow.secrets.local_filesystem import load_connections - 8 |+from airflow.secrets.local_filesystem import load_connections, load_connections_dict -9 9 | from airflow.security.permissions import RESOURCE_DATASET -10 10 | -11 11 | AvpEntities.DATASET +5 | DatasetInfo, +6 | translate_airflow_dataset, +7 | ) + - from airflow.secrets.local_filesystem import load_connections +8 + from airflow.secrets.local_filesystem import load_connections, load_connections_dict +9 | from airflow.security.permissions import RESOURCE_DATASET +10 | +11 | AvpEntities.DATASET -------------------------------------------------------------------------------- -15 15 | translate_airflow_dataset() -16 16 | -17 17 | # airflow.secrets.local_filesystem -18 |-load_connections() - 18 |+load_connections_dict() -19 19 | -20 20 | # airflow.security.permissions -21 21 | RESOURCE_DATASET +15 | translate_airflow_dataset() +16 | +17 | # airflow.secrets.local_filesystem + - load_connections() +18 + load_connections_dict() +19 | +20 | # airflow.security.permissions +21 | RESOURCE_DATASET AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:21:1 @@ -121,25 +113,23 @@ AIR301 [*] `airflow.security.permissions.RESOURCE_DATASET` is removed in Airflow 23 | from airflow.providers.amazon.aws.datasets.s3 import ( | help: Use `RESOURCE_ASSET` from `airflow.security.permissions` instead. - -ℹ Safe fix -6 6 | translate_airflow_dataset, -7 7 | ) -8 8 | from airflow.secrets.local_filesystem import load_connections -9 |-from airflow.security.permissions import RESOURCE_DATASET - 9 |+from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET -10 10 | -11 11 | AvpEntities.DATASET -12 12 | +6 | translate_airflow_dataset, +7 | ) +8 | from airflow.secrets.local_filesystem import load_connections + - from airflow.security.permissions import RESOURCE_DATASET +9 + from airflow.security.permissions import RESOURCE_DATASET, RESOURCE_ASSET +10 | +11 | AvpEntities.DATASET +12 | -------------------------------------------------------------------------------- -18 18 | load_connections() -19 19 | -20 20 | # airflow.security.permissions -21 |-RESOURCE_DATASET - 21 |+RESOURCE_ASSET -22 22 | -23 23 | from airflow.providers.amazon.aws.datasets.s3 import ( -24 24 | convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage, +18 | load_connections() +19 | +20 | # airflow.security.permissions + - RESOURCE_DATASET +21 + RESOURCE_ASSET +22 | +23 | from airflow.providers.amazon.aws.datasets.s3 import ( +24 | convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage, AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.create_dataset` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:28:1 @@ -151,18 +141,16 @@ AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.create_dataset` is removed 29 | s3_convert_dataset_to_openlineage() | help: Use `create_asset` from `airflow.providers.amazon.aws.assets.s3` instead. - -ℹ Safe fix -24 24 | convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage, -25 25 | ) -26 26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset - 27 |+from airflow.providers.amazon.aws.assets.s3 import create_asset -27 28 | -28 |-s3_create_dataset() - 29 |+create_asset() -29 30 | s3_convert_dataset_to_openlineage() -30 31 | -31 32 | from airflow.providers.common.io.dataset.file import ( +24 | convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage, +25 | ) +26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset +27 + from airflow.providers.amazon.aws.assets.s3 import create_asset +28 | + - s3_create_dataset() +29 + create_asset() +30 | s3_convert_dataset_to_openlineage() +31 | +32 | from airflow.providers.common.io.dataset.file import ( AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.convert_dataset_to_openlineage` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:29:1 @@ -174,19 +162,17 @@ AIR301 [*] `airflow.providers.amazon.aws.datasets.s3.convert_dataset_to_openline 31 | from airflow.providers.common.io.dataset.file import ( | help: Use `convert_asset_to_openlineage` from `airflow.providers.amazon.aws.assets.s3` instead. - -ℹ Safe fix -24 24 | convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage, -25 25 | ) -26 26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset - 27 |+from airflow.providers.amazon.aws.assets.s3 import convert_asset_to_openlineage -27 28 | -28 29 | s3_create_dataset() -29 |-s3_convert_dataset_to_openlineage() - 30 |+convert_asset_to_openlineage() -30 31 | -31 32 | from airflow.providers.common.io.dataset.file import ( -32 33 | convert_dataset_to_openlineage as io_convert_dataset_to_openlineage, +24 | convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage, +25 | ) +26 | from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset +27 + from airflow.providers.amazon.aws.assets.s3 import convert_asset_to_openlineage +28 | +29 | s3_create_dataset() + - s3_convert_dataset_to_openlineage() +30 + convert_asset_to_openlineage() +31 | +32 | from airflow.providers.common.io.dataset.file import ( +33 | convert_dataset_to_openlineage as io_convert_dataset_to_openlineage, AIR301 [*] `airflow.providers.google.datasets.bigquery.create_dataset` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:45:1 @@ -199,18 +185,16 @@ AIR301 [*] `airflow.providers.google.datasets.bigquery.create_dataset` is remove 47 | # airflow.providers.google.datasets.gcs | help: Use `create_asset` from `airflow.providers.google.assets.bigquery` instead. - -ℹ Safe fix -41 41 | from airflow.providers.google.datasets.bigquery import ( -42 42 | create_dataset as bigquery_create_dataset, -43 43 | ) - 44 |+from airflow.providers.google.assets.bigquery import create_asset -44 45 | -45 |-bigquery_create_dataset() - 46 |+create_asset() -46 47 | -47 48 | # airflow.providers.google.datasets.gcs -48 49 | from airflow.providers.google.datasets.gcs import ( +41 | from airflow.providers.google.datasets.bigquery import ( +42 | create_dataset as bigquery_create_dataset, +43 | ) +44 + from airflow.providers.google.assets.bigquery import create_asset +45 | + - bigquery_create_dataset() +46 + create_asset() +47 | +48 | # airflow.providers.google.datasets.gcs +49 | from airflow.providers.google.datasets.gcs import ( AIR301 [*] `airflow.providers.google.datasets.gcs.create_dataset` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:53:1 @@ -222,16 +206,14 @@ AIR301 [*] `airflow.providers.google.datasets.gcs.create_dataset` is removed in 54 | gcs_convert_dataset_to_openlineage() | help: Use `create_asset` from `airflow.providers.google.assets.gcs` instead. - -ℹ Safe fix -49 49 | convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage, -50 50 | ) -51 51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset - 52 |+from airflow.providers.google.assets.gcs import create_asset -52 53 | -53 |-gcs_create_dataset() - 54 |+create_asset() -54 55 | gcs_convert_dataset_to_openlineage() +49 | convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage, +50 | ) +51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset +52 + from airflow.providers.google.assets.gcs import create_asset +53 | + - gcs_create_dataset() +54 + create_asset() +55 | gcs_convert_dataset_to_openlineage() AIR301 [*] `airflow.providers.google.datasets.gcs.convert_dataset_to_openlineage` is removed in Airflow 3.0 --> AIR301_provider_names_fix.py:54:1 @@ -241,13 +223,11 @@ AIR301 [*] `airflow.providers.google.datasets.gcs.convert_dataset_to_openlineage | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `convert_asset_to_openlineage` from `airflow.providers.google.assets.gcs` instead. - -ℹ Safe fix -49 49 | convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage, -50 50 | ) -51 51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset - 52 |+from airflow.providers.google.assets.gcs import convert_asset_to_openlineage -52 53 | -53 54 | gcs_create_dataset() -54 |-gcs_convert_dataset_to_openlineage() - 55 |+convert_asset_to_openlineage() +49 | convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage, +50 | ) +51 | from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset +52 + from airflow.providers.google.assets.gcs import convert_asset_to_openlineage +53 | +54 | gcs_create_dataset() + - gcs_convert_dataset_to_openlineage() +55 + convert_asset_to_openlineage() diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap index f7dd72b481..636c775298 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_amazon.py.snap @@ -11,23 +11,22 @@ AIR302 [*] `airflow.hooks.S3_hook.S3Hook` is moved into `amazon` provider in Air 15 | provide_bucket_name() | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3Hook` from `airflow.providers.amazon.aws.hooks.s3` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.S3_hook import ( -4 |- S3Hook, -5 4 | provide_bucket_name, -6 5 | ) -7 6 | from airflow.operators.gcs_to_s3 import GCSToS3Operator +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.S3_hook import ( + - S3Hook, +4 | provide_bucket_name, +5 | ) +6 | from airflow.operators.gcs_to_s3 import GCSToS3Operator -------------------------------------------------------------------------------- -10 9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.hooks.s3 import S3Hook -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator +10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator +11 | from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.hooks.s3 import S3Hook +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.S3_hook.provide_bucket_name` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:15:1 @@ -39,23 +38,22 @@ AIR302 [*] `airflow.hooks.S3_hook.provide_bucket_name` is moved into `amazon` pr 17 | GCSToS3Operator() | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `provide_bucket_name` from `airflow.providers.amazon.aws.hooks.s3` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.S3_hook import ( -4 4 | S3Hook, -5 |- provide_bucket_name, -6 5 | ) -7 6 | from airflow.operators.gcs_to_s3 import GCSToS3Operator -8 7 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator +2 | +3 | from airflow.hooks.S3_hook import ( +4 | S3Hook, + - provide_bucket_name, +5 | ) +6 | from airflow.operators.gcs_to_s3 import GCSToS3Operator +7 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator -------------------------------------------------------------------------------- -10 9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.hooks.s3 import provide_bucket_name -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator +10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator +11 | from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.hooks.s3 import provide_bucket_name +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.gcs_to_s3.GCSToS3Operator` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:17:1 @@ -68,21 +66,20 @@ AIR302 [*] `airflow.operators.gcs_to_s3.GCSToS3Operator` is moved into `amazon` 19 | RedshiftToS3Operator() | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GCSToS3Operator` from `airflow.providers.amazon.aws.transfers.gcs_to_s3` instead. - -ℹ Unsafe fix -4 4 | S3Hook, -5 5 | provide_bucket_name, -6 6 | ) -7 |-from airflow.operators.gcs_to_s3 import GCSToS3Operator -8 7 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator -9 8 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator -10 9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.transfers.gcs_to_s3 import GCSToS3Operator -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +4 | S3Hook, +5 | provide_bucket_name, +6 | ) + - from airflow.operators.gcs_to_s3 import GCSToS3Operator +7 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator +8 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator +9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator +10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator +11 | from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.transfers.gcs_to_s3 import GCSToS3Operator +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Operator` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:18:1 @@ -94,20 +91,19 @@ AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Operator` i 20 | S3FileTransformOperator() | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GoogleApiToS3Operator` from `airflow.providers.amazon.aws.transfers.google_api_to_s3` instead. - -ℹ Unsafe fix -5 5 | provide_bucket_name, -6 6 | ) -7 7 | from airflow.operators.gcs_to_s3 import GCSToS3Operator -8 |-from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator -9 8 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator -10 9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +5 | provide_bucket_name, +6 | ) +7 | from airflow.operators.gcs_to_s3 import GCSToS3Operator + - from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator +8 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator +9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator +10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator +11 | from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Operator` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:19:1 @@ -120,19 +116,18 @@ AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Operator` is m 21 | S3ToRedshiftOperator() | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `RedshiftToS3Operator` from `airflow.providers.amazon.aws.transfers.redshift_to_s3` instead. - -ℹ Unsafe fix -6 6 | ) -7 7 | from airflow.operators.gcs_to_s3 import GCSToS3Operator -8 8 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator -9 |-from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator -10 9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +6 | ) +7 | from airflow.operators.gcs_to_s3 import GCSToS3Operator +8 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator + - from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator +9 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator +10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator +11 | from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.s3_file_transform_operator.S3FileTransformOperator` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:20:1 @@ -145,18 +140,17 @@ AIR302 [*] `airflow.operators.s3_file_transform_operator.S3FileTransformOperator 22 | S3KeySensor() | help: Install `apache-airflow-providers-amazon>=3.0.0` and use `S3FileTransformOperator` from `airflow.providers.amazon.aws.operators.s3` instead. - -ℹ Unsafe fix -7 7 | from airflow.operators.gcs_to_s3 import GCSToS3Operator -8 8 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator -9 9 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator -10 |-from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.operators.s3 import S3FileTransformOperator -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +7 | from airflow.operators.gcs_to_s3 import GCSToS3Operator +8 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator +9 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator + - from airflow.operators.s3_file_transform_operator import S3FileTransformOperator +10 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator +11 | from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.operators.s3 import S3FileTransformOperator +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftOperator` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:21:1 @@ -168,17 +162,16 @@ AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftOperator` is m 22 | S3KeySensor() | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3ToRedshiftOperator` from `airflow.providers.amazon.aws.transfers.s3_to_redshift` instead. - -ℹ Unsafe fix -8 8 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator -9 9 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator -10 10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 |-from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 11 | from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +8 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator +9 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator +10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator + - from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator +11 | from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.s3_key_sensor.S3KeySensor` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:22:1 @@ -191,16 +184,15 @@ AIR302 [*] `airflow.sensors.s3_key_sensor.S3KeySensor` is moved into `amazon` pr 24 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Transfer | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3KeySensor` from `airflow.providers.amazon.aws.sensors.s3` instead. - -ℹ Unsafe fix -9 9 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator -10 10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator -11 11 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator -12 |-from airflow.sensors.s3_key_sensor import S3KeySensor - 12 |+from airflow.providers.amazon.aws.sensors.s3 import S3KeySensor -13 13 | -14 14 | S3Hook() -15 15 | provide_bucket_name() +9 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator +10 | from airflow.operators.s3_file_transform_operator import S3FileTransformOperator +11 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator + - from airflow.sensors.s3_key_sensor import S3KeySensor +12 + from airflow.providers.amazon.aws.sensors.s3 import S3KeySensor +13 | +14 | S3Hook() +15 | provide_bucket_name() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Transfer` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:26:1 @@ -213,15 +205,14 @@ AIR302 [*] `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Transfer` i 28 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Transfer | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GoogleApiToS3Operator` from `airflow.providers.amazon.aws.transfers.google_api_to_s3` instead. - -ℹ Unsafe fix -22 22 | S3KeySensor() -23 23 | -24 24 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Transfer - 25 |+from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator -25 26 | -26 27 | GoogleApiToS3Transfer() -27 28 | +22 | S3KeySensor() +23 | +24 | from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Transfer +25 + from airflow.providers.amazon.aws.transfers.google_api_to_s3 import GoogleApiToS3Operator +26 | +27 | GoogleApiToS3Transfer() +28 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Transfer` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:30:1 @@ -234,15 +225,14 @@ AIR302 [*] `airflow.operators.redshift_to_s3_operator.RedshiftToS3Transfer` is m 32 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftTransfer | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `RedshiftToS3Operator` from `airflow.providers.amazon.aws.transfers.redshift_to_s3` instead. - -ℹ Unsafe fix -26 26 | GoogleApiToS3Transfer() -27 27 | -28 28 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Transfer - 29 |+from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator -29 30 | -30 31 | RedshiftToS3Transfer() -31 32 | +26 | GoogleApiToS3Transfer() +27 | +28 | from airflow.operators.redshift_to_s3_operator import RedshiftToS3Transfer +29 + from airflow.providers.amazon.aws.transfers.redshift_to_s3 import RedshiftToS3Operator +30 | +31 | RedshiftToS3Transfer() +32 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftTransfer` is moved into `amazon` provider in Airflow 3.0; --> AIR302_amazon.py:34:1 @@ -253,11 +243,10 @@ AIR302 [*] `airflow.operators.s3_to_redshift_operator.S3ToRedshiftTransfer` is m | ^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3ToRedshiftOperator` from `airflow.providers.amazon.aws.transfers.s3_to_redshift` instead. - -ℹ Unsafe fix -30 30 | RedshiftToS3Transfer() -31 31 | -32 32 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftTransfer - 33 |+from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator -33 34 | -34 35 | S3ToRedshiftTransfer() +30 | RedshiftToS3Transfer() +31 | +32 | from airflow.operators.s3_to_redshift_operator import S3ToRedshiftTransfer +33 + from airflow.providers.amazon.aws.transfers.s3_to_redshift import S3ToRedshiftOperator +34 | +35 | S3ToRedshiftTransfer() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap index 8339afac1f..25d9eff300 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_celery.py.snap @@ -12,19 +12,18 @@ AIR302 [*] `airflow.config_templates.default_celery.DEFAULT_CELERY_CONFIG` is mo 11 | app | help: Install `apache-airflow-providers-celery>=3.3.0` and use `DEFAULT_CELERY_CONFIG` from `airflow.providers.celery.executors.default_celery` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG -4 3 | from airflow.executors.celery_executor import ( -5 4 | CeleryExecutor, -6 5 | app, -7 6 | ) - 7 |+from airflow.providers.celery.executors.default_celery import DEFAULT_CELERY_CONFIG -8 8 | -9 9 | DEFAULT_CELERY_CONFIG -10 10 | +1 | from __future__ import annotations +2 | + - from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG +3 | from airflow.executors.celery_executor import ( +4 | CeleryExecutor, +5 | app, +6 | ) +7 + from airflow.providers.celery.executors.default_celery import DEFAULT_CELERY_CONFIG +8 | +9 | DEFAULT_CELERY_CONFIG +10 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.executors.celery_executor.app` is moved into `celery` provider in Airflow 3.0; --> AIR302_celery.py:11:1 @@ -36,17 +35,16 @@ AIR302 [*] `airflow.executors.celery_executor.app` is moved into `celery` provid 12 | CeleryExecutor() | help: Install `apache-airflow-providers-celery>=3.3.0` and use `app` from `airflow.providers.celery.executors.celery_executor_utils` instead. - -ℹ Unsafe fix -3 3 | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG -4 4 | from airflow.executors.celery_executor import ( -5 5 | CeleryExecutor, -6 |- app, -7 6 | ) - 7 |+from airflow.providers.celery.executors.celery_executor_utils import app -8 8 | -9 9 | DEFAULT_CELERY_CONFIG -10 10 | +3 | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG +4 | from airflow.executors.celery_executor import ( +5 | CeleryExecutor, + - app, +6 | ) +7 + from airflow.providers.celery.executors.celery_executor_utils import app +8 | +9 | DEFAULT_CELERY_CONFIG +10 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.executors.celery_executor.CeleryExecutor` is moved into `celery` provider in Airflow 3.0; --> AIR302_celery.py:12:1 @@ -56,15 +54,14 @@ AIR302 [*] `airflow.executors.celery_executor.CeleryExecutor` is moved into `cel | ^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-celery>=3.3.0` and use `CeleryExecutor` from `airflow.providers.celery.executors.celery_executor` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG -4 4 | from airflow.executors.celery_executor import ( -5 |- CeleryExecutor, -6 5 | app, -7 6 | ) - 7 |+from airflow.providers.celery.executors.celery_executor import CeleryExecutor -8 8 | -9 9 | DEFAULT_CELERY_CONFIG -10 10 | +2 | +3 | from airflow.config_templates.default_celery import DEFAULT_CELERY_CONFIG +4 | from airflow.executors.celery_executor import ( + - CeleryExecutor, +5 | app, +6 | ) +7 + from airflow.providers.celery.executors.celery_executor import CeleryExecutor +8 | +9 | DEFAULT_CELERY_CONFIG +10 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap index 992829cd41..dfd39575e6 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_common_sql.py.snap @@ -11,18 +11,17 @@ AIR302 [*] `airflow.hooks.dbapi.ConnectorProtocol` is moved into `common-sql` pr 9 | DbApiHook() | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `ConnectorProtocol` from `airflow.providers.common.sql.hooks.sql` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.dbapi import ( -4 |- ConnectorProtocol, -5 4 | DbApiHook, -6 5 | ) - 6 |+from airflow.providers.common.sql.hooks.sql import ConnectorProtocol -7 7 | -8 8 | ConnectorProtocol() -9 9 | DbApiHook() +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.dbapi import ( + - ConnectorProtocol, +4 | DbApiHook, +5 | ) +6 + from airflow.providers.common.sql.hooks.sql import ConnectorProtocol +7 | +8 | ConnectorProtocol() +9 | DbApiHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.dbapi.DbApiHook` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:9:1 @@ -34,17 +33,16 @@ AIR302 [*] `airflow.hooks.dbapi.DbApiHook` is moved into `common-sql` provider i 11 | from airflow.hooks.dbapi_hook import DbApiHook | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `DbApiHook` from `airflow.providers.common.sql.hooks.sql` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.dbapi import ( -4 4 | ConnectorProtocol, -5 |- DbApiHook, -6 5 | ) - 6 |+from airflow.providers.common.sql.hooks.sql import DbApiHook -7 7 | -8 8 | ConnectorProtocol() -9 9 | DbApiHook() +2 | +3 | from airflow.hooks.dbapi import ( +4 | ConnectorProtocol, + - DbApiHook, +5 | ) +6 + from airflow.providers.common.sql.hooks.sql import DbApiHook +7 | +8 | ConnectorProtocol() +9 | DbApiHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.dbapi_hook.DbApiHook` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:14:1 @@ -56,17 +54,16 @@ AIR302 [*] `airflow.hooks.dbapi_hook.DbApiHook` is moved into `common-sql` provi 15 | SQLCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `DbApiHook` from `airflow.providers.common.sql.hooks.sql` instead. - -ℹ Unsafe fix -8 8 | ConnectorProtocol() -9 9 | DbApiHook() -10 10 | -11 |-from airflow.hooks.dbapi_hook import DbApiHook -12 11 | from airflow.operators.check_operator import SQLCheckOperator - 12 |+from airflow.providers.common.sql.hooks.sql import DbApiHook -13 13 | -14 14 | DbApiHook() -15 15 | SQLCheckOperator() +8 | ConnectorProtocol() +9 | DbApiHook() +10 | + - from airflow.hooks.dbapi_hook import DbApiHook +11 | from airflow.operators.check_operator import SQLCheckOperator +12 + from airflow.providers.common.sql.hooks.sql import DbApiHook +13 | +14 | DbApiHook() +15 | SQLCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.SQLCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:15:1 @@ -76,16 +73,15 @@ AIR302 [*] `airflow.operators.check_operator.SQLCheckOperator` is moved into `co | ^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -9 9 | DbApiHook() -10 10 | -11 11 | from airflow.hooks.dbapi_hook import DbApiHook -12 |-from airflow.operators.check_operator import SQLCheckOperator - 12 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator -13 13 | -14 14 | DbApiHook() -15 15 | SQLCheckOperator() +9 | DbApiHook() +10 | +11 | from airflow.hooks.dbapi_hook import DbApiHook + - from airflow.operators.check_operator import SQLCheckOperator +12 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator +13 | +14 | DbApiHook() +15 | SQLCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.SQLCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:21:1 @@ -97,16 +93,15 @@ AIR302 [*] `airflow.operators.sql.SQLCheckOperator` is moved into `common-sql` p 22 | CheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -16 16 | -17 17 | -18 18 | from airflow.operators.check_operator import CheckOperator -19 |-from airflow.operators.sql import SQLCheckOperator - 19 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator -20 20 | -21 21 | SQLCheckOperator() -22 22 | CheckOperator() +16 | +17 | +18 | from airflow.operators.check_operator import CheckOperator + - from airflow.operators.sql import SQLCheckOperator +19 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator +20 | +21 | SQLCheckOperator() +22 | CheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:22:1 @@ -116,15 +111,14 @@ AIR302 [*] `airflow.operators.check_operator.CheckOperator` is moved into `commo | ^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -17 17 | -18 18 | from airflow.operators.check_operator import CheckOperator -19 19 | from airflow.operators.sql import SQLCheckOperator - 20 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator -20 21 | -21 22 | SQLCheckOperator() -22 23 | CheckOperator() +17 | +18 | from airflow.operators.check_operator import CheckOperator +19 | from airflow.operators.sql import SQLCheckOperator +20 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator +21 | +22 | SQLCheckOperator() +23 | CheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.druid_check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:27:1 @@ -135,15 +129,14 @@ AIR302 [*] `airflow.operators.druid_check_operator.CheckOperator` is moved into | ^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -23 23 | -24 24 | -25 25 | from airflow.operators.druid_check_operator import CheckOperator - 26 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator -26 27 | -27 28 | CheckOperator() -28 29 | +23 | +24 | +25 | from airflow.operators.druid_check_operator import CheckOperator +26 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator +27 | +28 | CheckOperator() +29 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:32:1 @@ -154,15 +147,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.CheckOperator` is moved into | ^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -28 28 | -29 29 | -30 30 | from airflow.operators.presto_check_operator import CheckOperator - 31 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator -31 32 | -32 33 | CheckOperator() -33 34 | +28 | +29 | +30 | from airflow.operators.presto_check_operator import CheckOperator +31 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator +32 | +33 | CheckOperator() +34 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.druid_check_operator.DruidCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:42:1 @@ -175,15 +167,14 @@ AIR302 [*] `airflow.operators.druid_check_operator.DruidCheckOperator` is moved 44 | IntervalCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -38 38 | ) -39 39 | from airflow.operators.druid_check_operator import DruidCheckOperator -40 40 | from airflow.operators.presto_check_operator import PrestoCheckOperator - 41 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator -41 42 | -42 43 | DruidCheckOperator() -43 44 | PrestoCheckOperator() +38 | ) +39 | from airflow.operators.druid_check_operator import DruidCheckOperator +40 | from airflow.operators.presto_check_operator import PrestoCheckOperator +41 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator +42 | +43 | DruidCheckOperator() +44 | PrestoCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_check_operator.PrestoCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:43:1 @@ -195,15 +186,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.PrestoCheckOperator` is move 45 | SQLIntervalCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -38 38 | ) -39 39 | from airflow.operators.druid_check_operator import DruidCheckOperator -40 40 | from airflow.operators.presto_check_operator import PrestoCheckOperator - 41 |+from airflow.providers.common.sql.operators.sql import SQLCheckOperator -41 42 | -42 43 | DruidCheckOperator() -43 44 | PrestoCheckOperator() +38 | ) +39 | from airflow.operators.druid_check_operator import DruidCheckOperator +40 | from airflow.operators.presto_check_operator import PrestoCheckOperator +41 + from airflow.providers.common.sql.operators.sql import SQLCheckOperator +42 | +43 | DruidCheckOperator() +44 | PrestoCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.IntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:44:1 @@ -215,19 +205,18 @@ AIR302 [*] `airflow.operators.check_operator.IntervalCheckOperator` is moved int 45 | SQLIntervalCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -34 34 | -35 35 | from airflow.operators.check_operator import ( -36 36 | IntervalCheckOperator, -37 |- SQLIntervalCheckOperator, -38 37 | ) -39 38 | from airflow.operators.druid_check_operator import DruidCheckOperator -40 39 | from airflow.operators.presto_check_operator import PrestoCheckOperator - 40 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator -41 41 | -42 42 | DruidCheckOperator() -43 43 | PrestoCheckOperator() +34 | +35 | from airflow.operators.check_operator import ( +36 | IntervalCheckOperator, + - SQLIntervalCheckOperator, +37 | ) +38 | from airflow.operators.druid_check_operator import DruidCheckOperator +39 | from airflow.operators.presto_check_operator import PrestoCheckOperator +40 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator +41 | +42 | DruidCheckOperator() +43 | PrestoCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.SQLIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:45:1 @@ -238,19 +227,18 @@ AIR302 [*] `airflow.operators.check_operator.SQLIntervalCheckOperator` is moved | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -34 34 | -35 35 | from airflow.operators.check_operator import ( -36 36 | IntervalCheckOperator, -37 |- SQLIntervalCheckOperator, -38 37 | ) -39 38 | from airflow.operators.druid_check_operator import DruidCheckOperator -40 39 | from airflow.operators.presto_check_operator import PrestoCheckOperator - 40 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator -41 41 | -42 42 | DruidCheckOperator() -43 43 | PrestoCheckOperator() +34 | +35 | from airflow.operators.check_operator import ( +36 | IntervalCheckOperator, + - SQLIntervalCheckOperator, +37 | ) +38 | from airflow.operators.druid_check_operator import DruidCheckOperator +39 | from airflow.operators.presto_check_operator import PrestoCheckOperator +40 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator +41 | +42 | DruidCheckOperator() +43 | PrestoCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_check_operator.IntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:54:1 @@ -263,15 +251,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.IntervalCheckOperator` is mo 56 | PrestoIntervalCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -50 50 | PrestoIntervalCheckOperator, -51 51 | ) -52 52 | from airflow.operators.sql import SQLIntervalCheckOperator - 53 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator -53 54 | -54 55 | IntervalCheckOperator() -55 56 | SQLIntervalCheckOperator() +50 | PrestoIntervalCheckOperator, +51 | ) +52 | from airflow.operators.sql import SQLIntervalCheckOperator +53 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator +54 | +55 | IntervalCheckOperator() +56 | SQLIntervalCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.SQLIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:55:1 @@ -282,16 +269,15 @@ AIR302 [*] `airflow.operators.sql.SQLIntervalCheckOperator` is moved into `commo 56 | PrestoIntervalCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -49 49 | IntervalCheckOperator, -50 50 | PrestoIntervalCheckOperator, -51 51 | ) -52 |-from airflow.operators.sql import SQLIntervalCheckOperator - 52 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator -53 53 | -54 54 | IntervalCheckOperator() -55 55 | SQLIntervalCheckOperator() +49 | IntervalCheckOperator, +50 | PrestoIntervalCheckOperator, +51 | ) + - from airflow.operators.sql import SQLIntervalCheckOperator +52 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator +53 | +54 | IntervalCheckOperator() +55 | SQLIntervalCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_check_operator.PrestoIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:56:1 @@ -302,15 +288,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.PrestoIntervalCheckOperator` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -50 50 | PrestoIntervalCheckOperator, -51 51 | ) -52 52 | from airflow.operators.sql import SQLIntervalCheckOperator - 53 |+from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator -53 54 | -54 55 | IntervalCheckOperator() -55 56 | SQLIntervalCheckOperator() +50 | PrestoIntervalCheckOperator, +51 | ) +52 | from airflow.operators.sql import SQLIntervalCheckOperator +53 + from airflow.providers.common.sql.operators.sql import SQLIntervalCheckOperator +54 | +55 | IntervalCheckOperator() +56 | SQLIntervalCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.SQLThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:64:1 @@ -322,18 +307,17 @@ AIR302 [*] `airflow.operators.check_operator.SQLThresholdCheckOperator` is moved 65 | ThresholdCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -57 57 | -58 58 | -59 59 | from airflow.operators.check_operator import ( -60 |- SQLThresholdCheckOperator, -61 60 | ThresholdCheckOperator, -62 61 | ) - 62 |+from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator -63 63 | -64 64 | SQLThresholdCheckOperator() -65 65 | ThresholdCheckOperator() +57 | +58 | +59 | from airflow.operators.check_operator import ( + - SQLThresholdCheckOperator, +60 | ThresholdCheckOperator, +61 | ) +62 + from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator +63 | +64 | SQLThresholdCheckOperator() +65 | ThresholdCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.ThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:65:1 @@ -343,18 +327,17 @@ AIR302 [*] `airflow.operators.check_operator.ThresholdCheckOperator` is moved in | ^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -57 57 | -58 58 | -59 59 | from airflow.operators.check_operator import ( -60 |- SQLThresholdCheckOperator, -61 60 | ThresholdCheckOperator, -62 61 | ) - 62 |+from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator -63 63 | -64 64 | SQLThresholdCheckOperator() -65 65 | ThresholdCheckOperator() +57 | +58 | +59 | from airflow.operators.check_operator import ( + - SQLThresholdCheckOperator, +60 | ThresholdCheckOperator, +61 | ) +62 + from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator +63 | +64 | SQLThresholdCheckOperator() +65 | ThresholdCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.SQLThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:70:1 @@ -365,16 +348,15 @@ AIR302 [*] `airflow.operators.sql.SQLThresholdCheckOperator` is moved into `comm | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -65 65 | ThresholdCheckOperator() -66 66 | -67 67 | -68 |-from airflow.operators.sql import SQLThresholdCheckOperator - 68 |+from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator -69 69 | -70 70 | SQLThresholdCheckOperator() -71 71 | +65 | ThresholdCheckOperator() +66 | +67 | + - from airflow.operators.sql import SQLThresholdCheckOperator +68 + from airflow.providers.common.sql.operators.sql import SQLThresholdCheckOperator +69 | +70 | SQLThresholdCheckOperator() +71 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.SQLValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:78:1 @@ -386,18 +368,17 @@ AIR302 [*] `airflow.operators.check_operator.SQLValueCheckOperator` is moved int 79 | ValueCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -71 71 | -72 72 | -73 73 | from airflow.operators.check_operator import ( -74 |- SQLValueCheckOperator, -75 74 | ValueCheckOperator, -76 75 | ) - 76 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator -77 77 | -78 78 | SQLValueCheckOperator() -79 79 | ValueCheckOperator() +71 | +72 | +73 | from airflow.operators.check_operator import ( + - SQLValueCheckOperator, +74 | ValueCheckOperator, +75 | ) +76 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator +77 | +78 | SQLValueCheckOperator() +79 | ValueCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.check_operator.ValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:79:1 @@ -407,18 +388,17 @@ AIR302 [*] `airflow.operators.check_operator.ValueCheckOperator` is moved into ` | ^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -71 71 | -72 72 | -73 73 | from airflow.operators.check_operator import ( -74 |- SQLValueCheckOperator, -75 74 | ValueCheckOperator, -76 75 | ) - 76 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator -77 77 | -78 78 | SQLValueCheckOperator() -79 79 | ValueCheckOperator() +71 | +72 | +73 | from airflow.operators.check_operator import ( + - SQLValueCheckOperator, +74 | ValueCheckOperator, +75 | ) +76 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator +77 | +78 | SQLValueCheckOperator() +79 | ValueCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.SQLValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:88:1 @@ -431,16 +411,15 @@ AIR302 [*] `airflow.operators.sql.SQLValueCheckOperator` is moved into `common-s 90 | PrestoValueCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -83 83 | PrestoValueCheckOperator, -84 84 | ValueCheckOperator, -85 85 | ) -86 |-from airflow.operators.sql import SQLValueCheckOperator - 86 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator -87 87 | -88 88 | SQLValueCheckOperator() -89 89 | ValueCheckOperator() +83 | PrestoValueCheckOperator, +84 | ValueCheckOperator, +85 | ) + - from airflow.operators.sql import SQLValueCheckOperator +86 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator +87 | +88 | SQLValueCheckOperator() +89 | ValueCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_check_operator.ValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:89:1 @@ -451,15 +430,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.ValueCheckOperator` is moved 90 | PrestoValueCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -84 84 | ValueCheckOperator, -85 85 | ) -86 86 | from airflow.operators.sql import SQLValueCheckOperator - 87 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator -87 88 | -88 89 | SQLValueCheckOperator() -89 90 | ValueCheckOperator() +84 | ValueCheckOperator, +85 | ) +86 | from airflow.operators.sql import SQLValueCheckOperator +87 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator +88 | +89 | SQLValueCheckOperator() +90 | ValueCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_check_operator.PrestoValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:90:1 @@ -470,15 +448,14 @@ AIR302 [*] `airflow.operators.presto_check_operator.PrestoValueCheckOperator` is | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -84 84 | ValueCheckOperator, -85 85 | ) -86 86 | from airflow.operators.sql import SQLValueCheckOperator - 87 |+from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator -87 88 | -88 89 | SQLValueCheckOperator() -89 90 | ValueCheckOperator() +84 | ValueCheckOperator, +85 | ) +86 | from airflow.operators.sql import SQLValueCheckOperator +87 + from airflow.providers.common.sql.operators.sql import SQLValueCheckOperator +88 | +89 | SQLValueCheckOperator() +90 | ValueCheckOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.BaseSQLOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:102:1 @@ -491,22 +468,21 @@ AIR302 [*] `airflow.operators.sql.BaseSQLOperator` is moved into `common-sql` pr 104 | SQLTableCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `BaseSQLOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -91 91 | -92 92 | -93 93 | from airflow.operators.sql import ( -94 |- BaseSQLOperator, -95 94 | BranchSQLOperator, -96 95 | SQLColumnCheckOperator, -97 96 | SQLTableCheckOperator, -98 97 | _convert_to_float_if_possible, -99 98 | parse_boolean, -100 99 | ) - 100 |+from airflow.providers.common.sql.operators.sql import BaseSQLOperator -101 101 | -102 102 | BaseSQLOperator() -103 103 | BranchSQLOperator() +91 | +92 | +93 | from airflow.operators.sql import ( + - BaseSQLOperator, +94 | BranchSQLOperator, +95 | SQLColumnCheckOperator, +96 | SQLTableCheckOperator, +97 | _convert_to_float_if_possible, +98 | parse_boolean, +99 | ) +100 + from airflow.providers.common.sql.operators.sql import BaseSQLOperator +101 | +102 | BaseSQLOperator() +103 | BranchSQLOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.BranchSQLOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:103:1 @@ -518,21 +494,20 @@ AIR302 [*] `airflow.operators.sql.BranchSQLOperator` is moved into `common-sql` 105 | SQLColumnCheckOperator() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `BranchSQLOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -92 92 | -93 93 | from airflow.operators.sql import ( -94 94 | BaseSQLOperator, -95 |- BranchSQLOperator, -96 95 | SQLColumnCheckOperator, -97 96 | SQLTableCheckOperator, -98 97 | _convert_to_float_if_possible, -99 98 | parse_boolean, -100 99 | ) - 100 |+from airflow.providers.common.sql.operators.sql import BranchSQLOperator -101 101 | -102 102 | BaseSQLOperator() -103 103 | BranchSQLOperator() +92 | +93 | from airflow.operators.sql import ( +94 | BaseSQLOperator, + - BranchSQLOperator, +95 | SQLColumnCheckOperator, +96 | SQLTableCheckOperator, +97 | _convert_to_float_if_possible, +98 | parse_boolean, +99 | ) +100 + from airflow.providers.common.sql.operators.sql import BranchSQLOperator +101 | +102 | BaseSQLOperator() +103 | BranchSQLOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.SQLTableCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:104:1 @@ -545,19 +520,18 @@ AIR302 [*] `airflow.operators.sql.SQLTableCheckOperator` is moved into `common-s 106 | _convert_to_float_if_possible() | help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLTableCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -94 94 | BaseSQLOperator, -95 95 | BranchSQLOperator, -96 96 | SQLColumnCheckOperator, -97 |- SQLTableCheckOperator, -98 97 | _convert_to_float_if_possible, -99 98 | parse_boolean, -100 99 | ) - 100 |+from airflow.providers.common.sql.operators.sql import SQLTableCheckOperator -101 101 | -102 102 | BaseSQLOperator() -103 103 | BranchSQLOperator() +94 | BaseSQLOperator, +95 | BranchSQLOperator, +96 | SQLColumnCheckOperator, + - SQLTableCheckOperator, +97 | _convert_to_float_if_possible, +98 | parse_boolean, +99 | ) +100 + from airflow.providers.common.sql.operators.sql import SQLTableCheckOperator +101 | +102 | BaseSQLOperator() +103 | BranchSQLOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.SQLColumnCheckOperator` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:105:1 @@ -570,20 +544,19 @@ AIR302 [*] `airflow.operators.sql.SQLColumnCheckOperator` is moved into `common- 107 | parse_boolean() | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SQLColumnCheckOperator` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -93 93 | from airflow.operators.sql import ( -94 94 | BaseSQLOperator, -95 95 | BranchSQLOperator, -96 |- SQLColumnCheckOperator, -97 96 | SQLTableCheckOperator, -98 97 | _convert_to_float_if_possible, -99 98 | parse_boolean, -100 99 | ) - 100 |+from airflow.providers.common.sql.operators.sql import SQLColumnCheckOperator -101 101 | -102 102 | BaseSQLOperator() -103 103 | BranchSQLOperator() +93 | from airflow.operators.sql import ( +94 | BaseSQLOperator, +95 | BranchSQLOperator, + - SQLColumnCheckOperator, +96 | SQLTableCheckOperator, +97 | _convert_to_float_if_possible, +98 | parse_boolean, +99 | ) +100 + from airflow.providers.common.sql.operators.sql import SQLColumnCheckOperator +101 | +102 | BaseSQLOperator() +103 | BranchSQLOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql._convert_to_float_if_possible` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:106:1 @@ -595,18 +568,17 @@ AIR302 [*] `airflow.operators.sql._convert_to_float_if_possible` is moved into ` 107 | parse_boolean() | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `_convert_to_float_if_possible` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -95 95 | BranchSQLOperator, -96 96 | SQLColumnCheckOperator, -97 97 | SQLTableCheckOperator, -98 |- _convert_to_float_if_possible, -99 98 | parse_boolean, -100 99 | ) - 100 |+from airflow.providers.common.sql.operators.sql import _convert_to_float_if_possible -101 101 | -102 102 | BaseSQLOperator() -103 103 | BranchSQLOperator() +95 | BranchSQLOperator, +96 | SQLColumnCheckOperator, +97 | SQLTableCheckOperator, + - _convert_to_float_if_possible, +98 | parse_boolean, +99 | ) +100 + from airflow.providers.common.sql.operators.sql import _convert_to_float_if_possible +101 | +102 | BaseSQLOperator() +103 | BranchSQLOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.sql.parse_boolean` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:107:1 @@ -617,17 +589,16 @@ AIR302 [*] `airflow.operators.sql.parse_boolean` is moved into `common-sql` prov | ^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `parse_boolean` from `airflow.providers.common.sql.operators.sql` instead. - -ℹ Unsafe fix -96 96 | SQLColumnCheckOperator, -97 97 | SQLTableCheckOperator, -98 98 | _convert_to_float_if_possible, -99 |- parse_boolean, -100 99 | ) - 100 |+from airflow.providers.common.sql.operators.sql import parse_boolean -101 101 | -102 102 | BaseSQLOperator() -103 103 | BranchSQLOperator() +96 | SQLColumnCheckOperator, +97 | SQLTableCheckOperator, +98 | _convert_to_float_if_possible, + - parse_boolean, +99 | ) +100 + from airflow.providers.common.sql.operators.sql import parse_boolean +101 | +102 | BaseSQLOperator() +103 | BranchSQLOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.sql.SqlSensor` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:112:1 @@ -638,16 +609,15 @@ AIR302 [*] `airflow.sensors.sql.SqlSensor` is moved into `common-sql` provider i | ^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SqlSensor` from `airflow.providers.common.sql.sensors.sql` instead. - -ℹ Unsafe fix -107 107 | parse_boolean() -108 108 | -109 109 | -110 |-from airflow.sensors.sql import SqlSensor - 110 |+from airflow.providers.common.sql.sensors.sql import SqlSensor -111 111 | -112 112 | SqlSensor() -113 113 | +107 | parse_boolean() +108 | +109 | + - from airflow.sensors.sql import SqlSensor +110 + from airflow.providers.common.sql.sensors.sql import SqlSensor +111 | +112 | SqlSensor() +113 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.sql_sensor.SqlSensor` is moved into `common-sql` provider in Airflow 3.0; --> AIR302_common_sql.py:117:1 @@ -658,13 +628,12 @@ AIR302 [*] `airflow.sensors.sql_sensor.SqlSensor` is moved into `common-sql` pro | ^^^^^^^^^ | help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SqlSensor` from `airflow.providers.common.sql.sensors.sql` instead. - -ℹ Unsafe fix -112 112 | SqlSensor() -113 113 | -114 114 | -115 |-from airflow.sensors.sql_sensor import SqlSensor - 115 |+from airflow.providers.common.sql.sensors.sql import SqlSensor -116 116 | -117 117 | SqlSensor() -118 118 | +112 | SqlSensor() +113 | +114 | + - from airflow.sensors.sql_sensor import SqlSensor +115 + from airflow.providers.common.sql.sensors.sql import SqlSensor +116 | +117 | SqlSensor() +118 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap index 2c066e1f07..3adb95a02a 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_daskexecutor.py.snap @@ -10,11 +10,10 @@ AIR302 [*] `airflow.executors.dask_executor.DaskExecutor` is moved into `daskexe | ^^^^^^^^^^^^ | help: Install `apache-airflow-providers-daskexecutor>=1.0.0` and use `DaskExecutor` from `airflow.providers.daskexecutor.executors.dask_executor` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.executors.dask_executor import DaskExecutor - 3 |+from airflow.providers.daskexecutor.executors.dask_executor import DaskExecutor -4 4 | -5 5 | DaskExecutor() +1 | from __future__ import annotations +2 | + - from airflow.executors.dask_executor import DaskExecutor +3 + from airflow.providers.daskexecutor.executors.dask_executor import DaskExecutor +4 | +5 | DaskExecutor() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap index 16512766a5..347cbde113 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_druid.py.snap @@ -11,22 +11,21 @@ AIR302 [*] `airflow.hooks.druid_hook.DruidDbApiHook` is moved into `apache-druid 13 | DruidHook() | help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `DruidDbApiHook` from `airflow.providers.apache.druid.hooks.druid` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.druid_hook import ( -4 |- DruidDbApiHook, -5 4 | DruidHook, -6 5 | ) -7 6 | from airflow.operators.hive_to_druid import ( -8 7 | HiveToDruidOperator, -9 8 | HiveToDruidTransfer, -10 9 | ) - 10 |+from airflow.providers.apache.druid.hooks.druid import DruidDbApiHook -11 11 | -12 12 | DruidDbApiHook() -13 13 | DruidHook() +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.druid_hook import ( + - DruidDbApiHook, +4 | DruidHook, +5 | ) +6 | from airflow.operators.hive_to_druid import ( +7 | HiveToDruidOperator, +8 | HiveToDruidTransfer, +9 | ) +10 + from airflow.providers.apache.druid.hooks.druid import DruidDbApiHook +11 | +12 | DruidDbApiHook() +13 | DruidHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.druid_hook.DruidHook` is moved into `apache-druid` provider in Airflow 3.0; --> AIR302_druid.py:13:1 @@ -38,21 +37,20 @@ AIR302 [*] `airflow.hooks.druid_hook.DruidHook` is moved into `apache-druid` pro 15 | HiveToDruidOperator() | help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `DruidHook` from `airflow.providers.apache.druid.hooks.druid` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.druid_hook import ( -4 4 | DruidDbApiHook, -5 |- DruidHook, -6 5 | ) -7 6 | from airflow.operators.hive_to_druid import ( -8 7 | HiveToDruidOperator, -9 8 | HiveToDruidTransfer, -10 9 | ) - 10 |+from airflow.providers.apache.druid.hooks.druid import DruidHook -11 11 | -12 12 | DruidDbApiHook() -13 13 | DruidHook() +2 | +3 | from airflow.hooks.druid_hook import ( +4 | DruidDbApiHook, + - DruidHook, +5 | ) +6 | from airflow.operators.hive_to_druid import ( +7 | HiveToDruidOperator, +8 | HiveToDruidTransfer, +9 | ) +10 + from airflow.providers.apache.druid.hooks.druid import DruidHook +11 | +12 | DruidDbApiHook() +13 | DruidHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidOperator` is moved into `apache-druid` provider in Airflow 3.0; --> AIR302_druid.py:15:1 @@ -64,18 +62,17 @@ AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidOperator` is moved into ` 16 | HiveToDruidTransfer() | help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `HiveToDruidOperator` from `airflow.providers.apache.druid.transfers.hive_to_druid` instead. - -ℹ Unsafe fix -5 5 | DruidHook, -6 6 | ) -7 7 | from airflow.operators.hive_to_druid import ( -8 |- HiveToDruidOperator, -9 8 | HiveToDruidTransfer, -10 9 | ) - 10 |+from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator -11 11 | -12 12 | DruidDbApiHook() -13 13 | DruidHook() +5 | DruidHook, +6 | ) +7 | from airflow.operators.hive_to_druid import ( + - HiveToDruidOperator, +8 | HiveToDruidTransfer, +9 | ) +10 + from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator +11 | +12 | DruidDbApiHook() +13 | DruidHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidTransfer` is moved into `apache-druid` provider in Airflow 3.0; --> AIR302_druid.py:16:1 @@ -85,15 +82,14 @@ AIR302 [*] `airflow.operators.hive_to_druid.HiveToDruidTransfer` is moved into ` | ^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `HiveToDruidOperator` from `airflow.providers.apache.druid.transfers.hive_to_druid` instead. - -ℹ Unsafe fix -5 5 | DruidHook, -6 6 | ) -7 7 | from airflow.operators.hive_to_druid import ( -8 |- HiveToDruidOperator, -9 8 | HiveToDruidTransfer, -10 9 | ) - 10 |+from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator -11 11 | -12 12 | DruidDbApiHook() -13 13 | DruidHook() +5 | DruidHook, +6 | ) +7 | from airflow.operators.hive_to_druid import ( + - HiveToDruidOperator, +8 | HiveToDruidTransfer, +9 | ) +10 + from airflow.providers.apache.druid.transfers.hive_to_druid import HiveToDruidOperator +11 | +12 | DruidDbApiHook() +13 | DruidHook() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap index 96eaaef6f0..72eef3f204 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_fab.py.snap @@ -12,20 +12,19 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.CLIENT_AUTH` is moved into `fab` 12 | auth_current_user() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.api.auth.backend.basic_auth import ( -4 |- CLIENT_AUTH, -5 4 | auth_current_user, -6 5 | init_app, -7 6 | requires_authentication, -8 7 | ) - 8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import CLIENT_AUTH -9 9 | -10 10 | CLIENT_AUTH -11 11 | init_app() +1 | from __future__ import annotations +2 | +3 | from airflow.api.auth.backend.basic_auth import ( + - CLIENT_AUTH, +4 | auth_current_user, +5 | init_app, +6 | requires_authentication, +7 | ) +8 + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import CLIENT_AUTH +9 | +10 | CLIENT_AUTH +11 | init_app() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.basic_auth.init_app` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:11:1 @@ -37,18 +36,17 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.init_app` is moved into `fab` pr 13 | requires_authentication() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead. - -ℹ Unsafe fix -3 3 | from airflow.api.auth.backend.basic_auth import ( -4 4 | CLIENT_AUTH, -5 5 | auth_current_user, -6 |- init_app, -7 6 | requires_authentication, -8 7 | ) - 8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import init_app -9 9 | -10 10 | CLIENT_AUTH -11 11 | init_app() +3 | from airflow.api.auth.backend.basic_auth import ( +4 | CLIENT_AUTH, +5 | auth_current_user, + - init_app, +6 | requires_authentication, +7 | ) +8 + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import init_app +9 | +10 | CLIENT_AUTH +11 | init_app() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.basic_auth.auth_current_user` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:12:1 @@ -60,19 +58,18 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.auth_current_user` is moved into 13 | requires_authentication() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `auth_current_user` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.api.auth.backend.basic_auth import ( -4 4 | CLIENT_AUTH, -5 |- auth_current_user, -6 5 | init_app, -7 6 | requires_authentication, -8 7 | ) - 8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import auth_current_user -9 9 | -10 10 | CLIENT_AUTH -11 11 | init_app() +2 | +3 | from airflow.api.auth.backend.basic_auth import ( +4 | CLIENT_AUTH, + - auth_current_user, +5 | init_app, +6 | requires_authentication, +7 | ) +8 + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import auth_current_user +9 | +10 | CLIENT_AUTH +11 | init_app() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.basic_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:13:1 @@ -85,17 +82,16 @@ AIR302 [*] `airflow.api.auth.backend.basic_auth.requires_authentication` is move 15 | from airflow.api.auth.backend.kerberos_auth import ( | help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead. - -ℹ Unsafe fix -4 4 | CLIENT_AUTH, -5 5 | auth_current_user, -6 6 | init_app, -7 |- requires_authentication, -8 7 | ) - 8 |+from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import requires_authentication -9 9 | -10 10 | CLIENT_AUTH -11 11 | init_app() +4 | CLIENT_AUTH, +5 | auth_current_user, +6 | init_app, + - requires_authentication, +7 | ) +8 + from airflow.providers.fab.auth_manager.api.auth.backend.basic_auth import requires_authentication +9 | +10 | CLIENT_AUTH +11 | init_app() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.kerberos_auth.log` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:23:1 @@ -108,18 +104,17 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.log` is moved into `fab` prov 25 | find_user() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `log` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -16 16 | CLIENT_AUTH, -17 17 | find_user, -18 18 | init_app, -19 |- log, -20 19 | requires_authentication, -21 20 | ) - 21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log -22 22 | -23 23 | log() -24 24 | CLIENT_AUTH +16 | CLIENT_AUTH, +17 | find_user, +18 | init_app, + - log, +19 | requires_authentication, +20 | ) +21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log +22 | +23 | log() +24 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:24:1 @@ -131,21 +126,20 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `f 26 | init_app() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -13 13 | requires_authentication() -14 14 | -15 15 | from airflow.api.auth.backend.kerberos_auth import ( -16 |- CLIENT_AUTH, -17 16 | find_user, -18 17 | init_app, -19 18 | log, -20 19 | requires_authentication, -21 20 | ) - 21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH -22 22 | -23 23 | log() -24 24 | CLIENT_AUTH +13 | requires_authentication() +14 | +15 | from airflow.api.auth.backend.kerberos_auth import ( + - CLIENT_AUTH, +16 | find_user, +17 | init_app, +18 | log, +19 | requires_authentication, +20 | ) +21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH +22 | +23 | log() +24 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.kerberos_auth.find_user` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:25:1 @@ -158,20 +152,19 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.find_user` is moved into `fab 27 | requires_authentication() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `find_user` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -14 14 | -15 15 | from airflow.api.auth.backend.kerberos_auth import ( -16 16 | CLIENT_AUTH, -17 |- find_user, -18 17 | init_app, -19 18 | log, -20 19 | requires_authentication, -21 20 | ) - 21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user -22 22 | -23 23 | log() -24 24 | CLIENT_AUTH +14 | +15 | from airflow.api.auth.backend.kerberos_auth import ( +16 | CLIENT_AUTH, + - find_user, +17 | init_app, +18 | log, +19 | requires_authentication, +20 | ) +21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user +22 | +23 | log() +24 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.kerberos_auth.init_app` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:26:1 @@ -183,19 +176,18 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.init_app` is moved into `fab` 27 | requires_authentication() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -15 15 | from airflow.api.auth.backend.kerberos_auth import ( -16 16 | CLIENT_AUTH, -17 17 | find_user, -18 |- init_app, -19 18 | log, -20 19 | requires_authentication, -21 20 | ) - 21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app -22 22 | -23 23 | log() -24 24 | CLIENT_AUTH +15 | from airflow.api.auth.backend.kerberos_auth import ( +16 | CLIENT_AUTH, +17 | find_user, + - init_app, +18 | log, +19 | requires_authentication, +20 | ) +21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app +22 | +23 | log() +24 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.api.auth.backend.kerberos_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:27:1 @@ -208,17 +200,16 @@ AIR302 [*] `airflow.api.auth.backend.kerberos_auth.requires_authentication` is m 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import ( | help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -17 17 | find_user, -18 18 | init_app, -19 19 | log, -20 |- requires_authentication, -21 20 | ) - 21 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication -22 22 | -23 23 | log() -24 24 | CLIENT_AUTH +17 | find_user, +18 | init_app, +19 | log, + - requires_authentication, +20 | ) +21 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication +22 | +23 | log() +24 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.log` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:37:1 @@ -231,18 +222,17 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.log` is mov 39 | find_user() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `log` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -30 30 | CLIENT_AUTH, -31 31 | find_user, -32 32 | init_app, -33 |- log, -34 33 | requires_authentication, -35 34 | ) - 35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log -36 36 | -37 37 | log() -38 38 | CLIENT_AUTH +30 | CLIENT_AUTH, +31 | find_user, +32 | init_app, + - log, +33 | requires_authentication, +34 | ) +35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import log +36 | +37 | log() +38 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:38:1 @@ -254,21 +244,20 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.CLIENT_AUTH 40 | init_app() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -27 27 | requires_authentication() -28 28 | -29 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import ( -30 |- CLIENT_AUTH, -31 30 | find_user, -32 31 | init_app, -33 32 | log, -34 33 | requires_authentication, -35 34 | ) - 35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH -36 36 | -37 37 | log() -38 38 | CLIENT_AUTH +27 | requires_authentication() +28 | +29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import ( + - CLIENT_AUTH, +30 | find_user, +31 | init_app, +32 | log, +33 | requires_authentication, +34 | ) +35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import CLIENT_AUTH +36 | +37 | log() +38 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.find_user` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:39:1 @@ -281,20 +270,19 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.find_user` 41 | requires_authentication() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `find_user` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -28 28 | -29 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import ( -30 30 | CLIENT_AUTH, -31 |- find_user, -32 31 | init_app, -33 32 | log, -34 33 | requires_authentication, -35 34 | ) - 35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user -36 36 | -37 37 | log() -38 38 | CLIENT_AUTH +28 | +29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import ( +30 | CLIENT_AUTH, + - find_user, +31 | init_app, +32 | log, +33 | requires_authentication, +34 | ) +35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import find_user +36 | +37 | log() +38 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.init_app` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:40:1 @@ -306,19 +294,18 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.init_app` i 41 | requires_authentication() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -29 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import ( -30 30 | CLIENT_AUTH, -31 31 | find_user, -32 |- init_app, -33 32 | log, -34 33 | requires_authentication, -35 34 | ) - 35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app -36 36 | -37 37 | log() -38 38 | CLIENT_AUTH +29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import ( +30 | CLIENT_AUTH, +31 | find_user, + - init_app, +32 | log, +33 | requires_authentication, +34 | ) +35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import init_app +36 | +37 | log() +38 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:41:1 @@ -331,17 +318,16 @@ AIR302 [*] `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.requires_au 43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager | help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead. - -ℹ Unsafe fix -31 31 | find_user, -32 32 | init_app, -33 33 | log, -34 |- requires_authentication, -35 34 | ) - 35 |+from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication -36 36 | -37 37 | log() -38 38 | CLIENT_AUTH +31 | find_user, +32 | init_app, +33 | log, + - requires_authentication, +34 | ) +35 + from airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth import requires_authentication +36 | +37 | log() +38 | CLIENT_AUTH +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.fab_auth_manager.FabAuthManager` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:49:1 @@ -354,20 +340,19 @@ AIR302 [*] `airflow.auth.managers.fab.fab_auth_manager.FabAuthManager` is moved 51 | FabAirflowSecurityManagerOverride() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAuthManager` from `airflow.providers.fab.auth_manager.fab_auth_manager` instead. - -ℹ Unsafe fix -40 40 | init_app() -41 41 | requires_authentication() -42 42 | -43 |-from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager -44 43 | from airflow.auth.managers.fab.security_manager.override import ( -45 44 | MAX_NUM_DATABASE_USER_SESSIONS, -46 45 | FabAirflowSecurityManagerOverride, -47 46 | ) - 47 |+from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager -48 48 | -49 49 | FabAuthManager() -50 50 | MAX_NUM_DATABASE_USER_SESSIONS +40 | init_app() +41 | requires_authentication() +42 | + - from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager +43 | from airflow.auth.managers.fab.security_manager.override import ( +44 | MAX_NUM_DATABASE_USER_SESSIONS, +45 | FabAirflowSecurityManagerOverride, +46 | ) +47 + from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager +48 | +49 | FabAuthManager() +50 | MAX_NUM_DATABASE_USER_SESSIONS +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.security_manager.override.MAX_NUM_DATABASE_USER_SESSIONS` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:50:1 @@ -378,18 +363,17 @@ AIR302 [*] `airflow.auth.managers.fab.security_manager.override.MAX_NUM_DATABASE 51 | FabAirflowSecurityManagerOverride() | help: Install `apache-airflow-providers-fab>=1.0.0` and use `MAX_NUM_DATABASE_USER_SESSIONS` from `airflow.providers.fab.auth_manager.security_manager.override` instead. - -ℹ Unsafe fix -42 42 | -43 43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager -44 44 | from airflow.auth.managers.fab.security_manager.override import ( -45 |- MAX_NUM_DATABASE_USER_SESSIONS, -46 45 | FabAirflowSecurityManagerOverride, -47 46 | ) - 47 |+from airflow.providers.fab.auth_manager.security_manager.override import MAX_NUM_DATABASE_USER_SESSIONS -48 48 | -49 49 | FabAuthManager() -50 50 | MAX_NUM_DATABASE_USER_SESSIONS +42 | +43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager +44 | from airflow.auth.managers.fab.security_manager.override import ( + - MAX_NUM_DATABASE_USER_SESSIONS, +45 | FabAirflowSecurityManagerOverride, +46 | ) +47 + from airflow.providers.fab.auth_manager.security_manager.override import MAX_NUM_DATABASE_USER_SESSIONS +48 | +49 | FabAuthManager() +50 | MAX_NUM_DATABASE_USER_SESSIONS +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.auth.managers.fab.security_manager.override.FabAirflowSecurityManagerOverride` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:51:1 @@ -402,17 +386,16 @@ AIR302 [*] `airflow.auth.managers.fab.security_manager.override.FabAirflowSecuri 53 | from airflow.www.security import FabAirflowSecurityManagerOverride | help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAirflowSecurityManagerOverride` from `airflow.providers.fab.auth_manager.security_manager.override` instead. - -ℹ Unsafe fix -43 43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager -44 44 | from airflow.auth.managers.fab.security_manager.override import ( -45 45 | MAX_NUM_DATABASE_USER_SESSIONS, -46 |- FabAirflowSecurityManagerOverride, -47 46 | ) - 47 |+from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride -48 48 | -49 49 | FabAuthManager() -50 50 | MAX_NUM_DATABASE_USER_SESSIONS +43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager +44 | from airflow.auth.managers.fab.security_manager.override import ( +45 | MAX_NUM_DATABASE_USER_SESSIONS, + - FabAirflowSecurityManagerOverride, +46 | ) +47 + from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride +48 | +49 | FabAuthManager() +50 | MAX_NUM_DATABASE_USER_SESSIONS +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.www.security.FabAirflowSecurityManagerOverride` is moved into `fab` provider in Airflow 3.0; --> AIR302_fab.py:55:1 @@ -423,12 +406,11 @@ AIR302 [*] `airflow.www.security.FabAirflowSecurityManagerOverride` is moved int | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAirflowSecurityManagerOverride` from `airflow.providers.fab.auth_manager.security_manager.override` instead. - -ℹ Unsafe fix -50 50 | MAX_NUM_DATABASE_USER_SESSIONS -51 51 | FabAirflowSecurityManagerOverride() -52 52 | -53 |-from airflow.www.security import FabAirflowSecurityManagerOverride - 53 |+from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride -54 54 | -55 55 | FabAirflowSecurityManagerOverride() +50 | MAX_NUM_DATABASE_USER_SESSIONS +51 | FabAirflowSecurityManagerOverride() +52 | + - from airflow.www.security import FabAirflowSecurityManagerOverride +53 + from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride +54 | +55 | FabAirflowSecurityManagerOverride() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap index ad7950f7e3..e2e1b7cff2 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hdfs.py.snap @@ -11,16 +11,15 @@ AIR302 [*] `airflow.hooks.webhdfs_hook.WebHDFSHook` is moved into `apache-hdfs` 7 | WebHdfsSensor() | help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `WebHDFSHook` from `airflow.providers.apache.hdfs.hooks.webhdfs` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.webhdfs_hook import WebHDFSHook -4 3 | from airflow.sensors.web_hdfs_sensor import WebHdfsSensor - 4 |+from airflow.providers.apache.hdfs.hooks.webhdfs import WebHDFSHook -5 5 | -6 6 | WebHDFSHook() -7 7 | WebHdfsSensor() +1 | from __future__ import annotations +2 | + - from airflow.hooks.webhdfs_hook import WebHDFSHook +3 | from airflow.sensors.web_hdfs_sensor import WebHdfsSensor +4 + from airflow.providers.apache.hdfs.hooks.webhdfs import WebHDFSHook +5 | +6 | WebHDFSHook() +7 | WebHdfsSensor() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.web_hdfs_sensor.WebHdfsSensor` is moved into `apache-hdfs` provider in Airflow 3.0; --> AIR302_hdfs.py:7:1 @@ -30,13 +29,12 @@ AIR302 [*] `airflow.sensors.web_hdfs_sensor.WebHdfsSensor` is moved into `apache | ^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `WebHdfsSensor` from `airflow.providers.apache.hdfs.sensors.web_hdfs` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.webhdfs_hook import WebHDFSHook -4 |-from airflow.sensors.web_hdfs_sensor import WebHdfsSensor - 4 |+from airflow.providers.apache.hdfs.sensors.web_hdfs import WebHdfsSensor -5 5 | -6 6 | WebHDFSHook() -7 7 | WebHdfsSensor() +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.webhdfs_hook import WebHDFSHook + - from airflow.sensors.web_hdfs_sensor import WebHdfsSensor +4 + from airflow.providers.apache.hdfs.sensors.web_hdfs import WebHdfsSensor +5 | +6 | WebHDFSHook() +7 | WebHdfsSensor() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap index 9783310e59..088c40c560 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_hive.py.snap @@ -12,23 +12,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HIVE_QUEUE_PRIORITIES` is moved into `apach 20 | HiveMetastoreHook() | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HIVE_QUEUE_PRIORITIES` from `airflow.providers.apache.hive.hooks.hive` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.hive_hooks import ( -4 |- HIVE_QUEUE_PRIORITIES, -5 4 | HiveCliHook, -6 5 | HiveMetastoreHook, -7 6 | HiveServer2Hook, +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.hive_hooks import ( + - HIVE_QUEUE_PRIORITIES, +4 | HiveCliHook, +5 | HiveMetastoreHook, +6 | HiveServer2Hook, -------------------------------------------------------------------------------- -14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.hooks.hive import HIVE_QUEUE_PRIORITIES -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.hooks.hive import HIVE_QUEUE_PRIORITIES +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.hive_hooks.HiveCliHook` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:19:1 @@ -40,23 +39,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HiveCliHook` is moved into `apache-hive` pr 21 | HiveServer2Hook() | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveCliHook` from `airflow.providers.apache.hive.hooks.hive` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.hive_hooks import ( -4 4 | HIVE_QUEUE_PRIORITIES, -5 |- HiveCliHook, -6 5 | HiveMetastoreHook, -7 6 | HiveServer2Hook, -8 7 | ) +2 | +3 | from airflow.hooks.hive_hooks import ( +4 | HIVE_QUEUE_PRIORITIES, + - HiveCliHook, +5 | HiveMetastoreHook, +6 | HiveServer2Hook, +7 | ) -------------------------------------------------------------------------------- -14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.hooks.hive import HiveCliHook -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.hooks.hive import HiveCliHook +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.hive_hooks.HiveMetastoreHook` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:20:1 @@ -68,23 +66,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HiveMetastoreHook` is moved into `apache-hi 21 | HiveServer2Hook() | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveMetastoreHook` from `airflow.providers.apache.hive.hooks.hive` instead. - -ℹ Unsafe fix -3 3 | from airflow.hooks.hive_hooks import ( -4 4 | HIVE_QUEUE_PRIORITIES, -5 5 | HiveCliHook, -6 |- HiveMetastoreHook, -7 6 | HiveServer2Hook, -8 7 | ) -9 8 | from airflow.macros.hive import ( +3 | from airflow.hooks.hive_hooks import ( +4 | HIVE_QUEUE_PRIORITIES, +5 | HiveCliHook, + - HiveMetastoreHook, +6 | HiveServer2Hook, +7 | ) +8 | from airflow.macros.hive import ( -------------------------------------------------------------------------------- -14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.hooks.hive import HiveMetastoreHook -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.hooks.hive import HiveMetastoreHook +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.hive_hooks.HiveServer2Hook` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:21:1 @@ -97,23 +94,22 @@ AIR302 [*] `airflow.hooks.hive_hooks.HiveServer2Hook` is moved into `apache-hive 23 | closest_ds_partition() | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveServer2Hook` from `airflow.providers.apache.hive.hooks.hive` instead. - -ℹ Unsafe fix -4 4 | HIVE_QUEUE_PRIORITIES, -5 5 | HiveCliHook, -6 6 | HiveMetastoreHook, -7 |- HiveServer2Hook, -8 7 | ) -9 8 | from airflow.macros.hive import ( -10 9 | closest_ds_partition, +4 | HIVE_QUEUE_PRIORITIES, +5 | HiveCliHook, +6 | HiveMetastoreHook, + - HiveServer2Hook, +7 | ) +8 | from airflow.macros.hive import ( +9 | closest_ds_partition, -------------------------------------------------------------------------------- -14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.hooks.hive import HiveServer2Hook -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.hooks.hive import HiveServer2Hook +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.macros.hive.closest_ds_partition` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:23:1 @@ -125,22 +121,21 @@ AIR302 [*] `airflow.macros.hive.closest_ds_partition` is moved into `apache-hive 24 | max_partition() | help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `closest_ds_partition` from `airflow.providers.apache.hive.macros.hive` instead. - -ℹ Unsafe fix -7 7 | HiveServer2Hook, -8 8 | ) -9 9 | from airflow.macros.hive import ( -10 |- closest_ds_partition, -11 10 | max_partition, -12 11 | ) -13 12 | from airflow.operators.hive_operator import HiveOperator -14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.macros.hive import closest_ds_partition -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +7 | HiveServer2Hook, +8 | ) +9 | from airflow.macros.hive import ( + - closest_ds_partition, +10 | max_partition, +11 | ) +12 | from airflow.operators.hive_operator import HiveOperator +13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.macros.hive import closest_ds_partition +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.macros.hive.max_partition` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:24:1 @@ -152,21 +147,20 @@ AIR302 [*] `airflow.macros.hive.max_partition` is moved into `apache-hive` provi 26 | HiveOperator() | help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `max_partition` from `airflow.providers.apache.hive.macros.hive` instead. - -ℹ Unsafe fix -8 8 | ) -9 9 | from airflow.macros.hive import ( -10 10 | closest_ds_partition, -11 |- max_partition, -12 11 | ) -13 12 | from airflow.operators.hive_operator import HiveOperator -14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.macros.hive import max_partition -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +8 | ) +9 | from airflow.macros.hive import ( +10 | closest_ds_partition, + - max_partition, +11 | ) +12 | from airflow.operators.hive_operator import HiveOperator +13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.macros.hive import max_partition +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.hive_operator.HiveOperator` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:26:1 @@ -179,19 +173,18 @@ AIR302 [*] `airflow.operators.hive_operator.HiveOperator` is moved into `apache- 28 | HiveToMySqlOperator() | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveOperator` from `airflow.providers.apache.hive.operators.hive` instead. - -ℹ Unsafe fix -10 10 | closest_ds_partition, -11 11 | max_partition, -12 12 | ) -13 |-from airflow.operators.hive_operator import HiveOperator -14 13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.operators.hive import HiveOperator -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +10 | closest_ds_partition, +11 | max_partition, +12 | ) + - from airflow.operators.hive_operator import HiveOperator +13 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.operators.hive import HiveOperator +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.hive_stats_operator.HiveStatsCollectionOperator` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:27:1 @@ -203,18 +196,17 @@ AIR302 [*] `airflow.operators.hive_stats_operator.HiveStatsCollectionOperator` i 29 | HiveToSambaOperator() | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveStatsCollectionOperator` from `airflow.providers.apache.hive.operators.hive_stats` instead. - -ℹ Unsafe fix -11 11 | max_partition, -12 12 | ) -13 13 | from airflow.operators.hive_operator import HiveOperator -14 |-from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.operators.hive_stats import HiveStatsCollectionOperator -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +11 | max_partition, +12 | ) +13 | from airflow.operators.hive_operator import HiveOperator + - from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +14 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.operators.hive_stats import HiveStatsCollectionOperator +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlOperator` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:28:1 @@ -226,17 +218,16 @@ AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlOperator` is moved into ` 29 | HiveToSambaOperator() | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToMySqlOperator` from `airflow.providers.apache.hive.transfers.hive_to_mysql` instead. - -ℹ Unsafe fix -12 12 | ) -13 13 | from airflow.operators.hive_operator import HiveOperator -14 14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 |-from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +12 | ) +13 | from airflow.operators.hive_operator import HiveOperator +14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator + - from airflow.operators.hive_to_mysql import HiveToMySqlOperator +15 | from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.hive_to_samba_operator.HiveToSambaOperator` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:29:1 @@ -247,16 +238,15 @@ AIR302 [*] `airflow.operators.hive_to_samba_operator.HiveToSambaOperator` is mov | ^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToSambaOperator` from `airflow.providers.apache.hive.transfers.hive_to_samba` instead. - -ℹ Unsafe fix -13 13 | from airflow.operators.hive_operator import HiveOperator -14 14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator -15 15 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator -16 |-from airflow.operators.hive_to_samba_operator import HiveToSambaOperator - 16 |+from airflow.providers.apache.hive.transfers.hive_to_samba import HiveToSambaOperator -17 17 | -18 18 | HIVE_QUEUE_PRIORITIES -19 19 | HiveCliHook() +13 | from airflow.operators.hive_operator import HiveOperator +14 | from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator +15 | from airflow.operators.hive_to_mysql import HiveToMySqlOperator + - from airflow.operators.hive_to_samba_operator import HiveToSambaOperator +16 + from airflow.providers.apache.hive.transfers.hive_to_samba import HiveToSambaOperator +17 | +18 | HIVE_QUEUE_PRIORITIES +19 | HiveCliHook() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlTransfer` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:34:1 @@ -269,15 +259,14 @@ AIR302 [*] `airflow.operators.hive_to_mysql.HiveToMySqlTransfer` is moved into ` 36 | from airflow.operators.mysql_to_hive import MySqlToHiveOperator | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToMySqlOperator` from `airflow.providers.apache.hive.transfers.hive_to_mysql` instead. - -ℹ Unsafe fix -30 30 | -31 31 | -32 32 | from airflow.operators.hive_to_mysql import HiveToMySqlTransfer - 33 |+from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator -33 34 | -34 35 | HiveToMySqlTransfer() -35 36 | +30 | +31 | +32 | from airflow.operators.hive_to_mysql import HiveToMySqlTransfer +33 + from airflow.providers.apache.hive.transfers.hive_to_mysql import HiveToMySqlOperator +34 | +35 | HiveToMySqlTransfer() +36 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:38:1 @@ -290,16 +279,15 @@ AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveOperator` is moved into ` 40 | from airflow.operators.mysql_to_hive import MySqlToHiveTransfer | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MySqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mysql_to_hive` instead. - -ℹ Unsafe fix -33 33 | -34 34 | HiveToMySqlTransfer() -35 35 | -36 |-from airflow.operators.mysql_to_hive import MySqlToHiveOperator - 36 |+from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator -37 37 | -38 38 | MySqlToHiveOperator() -39 39 | +33 | +34 | HiveToMySqlTransfer() +35 | + - from airflow.operators.mysql_to_hive import MySqlToHiveOperator +36 + from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator +37 | +38 | MySqlToHiveOperator() +39 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:42:1 @@ -312,15 +300,14 @@ AIR302 [*] `airflow.operators.mysql_to_hive.MySqlToHiveTransfer` is moved into ` 44 | from airflow.operators.mssql_to_hive import MsSqlToHiveOperator | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MySqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mysql_to_hive` instead. - -ℹ Unsafe fix -38 38 | MySqlToHiveOperator() -39 39 | -40 40 | from airflow.operators.mysql_to_hive import MySqlToHiveTransfer - 41 |+from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator -41 42 | -42 43 | MySqlToHiveTransfer() -43 44 | +38 | MySqlToHiveOperator() +39 | +40 | from airflow.operators.mysql_to_hive import MySqlToHiveTransfer +41 + from airflow.providers.apache.hive.transfers.mysql_to_hive import MySqlToHiveOperator +42 | +43 | MySqlToHiveTransfer() +44 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:46:1 @@ -333,16 +320,15 @@ AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveOperator` is moved into ` 48 | from airflow.operators.mssql_to_hive import MsSqlToHiveTransfer | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MsSqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mssql_to_hive` instead. - -ℹ Unsafe fix -41 41 | -42 42 | MySqlToHiveTransfer() -43 43 | -44 |-from airflow.operators.mssql_to_hive import MsSqlToHiveOperator - 44 |+from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator -45 45 | -46 46 | MsSqlToHiveOperator() -47 47 | +41 | +42 | MySqlToHiveTransfer() +43 | + - from airflow.operators.mssql_to_hive import MsSqlToHiveOperator +44 + from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator +45 | +46 | MsSqlToHiveOperator() +47 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:50:1 @@ -355,15 +341,14 @@ AIR302 [*] `airflow.operators.mssql_to_hive.MsSqlToHiveTransfer` is moved into ` 52 | from airflow.operators.s3_to_hive_operator import S3ToHiveOperator | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MsSqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mssql_to_hive` instead. - -ℹ Unsafe fix -46 46 | MsSqlToHiveOperator() -47 47 | -48 48 | from airflow.operators.mssql_to_hive import MsSqlToHiveTransfer - 49 |+from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator -49 50 | -50 51 | MsSqlToHiveTransfer() -51 52 | +46 | MsSqlToHiveOperator() +47 | +48 | from airflow.operators.mssql_to_hive import MsSqlToHiveTransfer +49 + from airflow.providers.apache.hive.transfers.mssql_to_hive import MsSqlToHiveOperator +50 | +51 | MsSqlToHiveTransfer() +52 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:54:1 @@ -376,16 +361,15 @@ AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveOperator` is moved int 56 | from airflow.operators.s3_to_hive_operator import S3ToHiveTransfer | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `S3ToHiveOperator` from `airflow.providers.apache.hive.transfers.s3_to_hive` instead. - -ℹ Unsafe fix -49 49 | -50 50 | MsSqlToHiveTransfer() -51 51 | -52 |-from airflow.operators.s3_to_hive_operator import S3ToHiveOperator - 52 |+from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator -53 53 | -54 54 | S3ToHiveOperator() -55 55 | +49 | +50 | MsSqlToHiveTransfer() +51 | + - from airflow.operators.s3_to_hive_operator import S3ToHiveOperator +52 + from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator +53 | +54 | S3ToHiveOperator() +55 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:58:1 @@ -398,15 +382,14 @@ AIR302 [*] `airflow.operators.s3_to_hive_operator.S3ToHiveTransfer` is moved int 60 | from airflow.sensors.hive_partition_sensor import HivePartitionSensor | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `S3ToHiveOperator` from `airflow.providers.apache.hive.transfers.s3_to_hive` instead. - -ℹ Unsafe fix -54 54 | S3ToHiveOperator() -55 55 | -56 56 | from airflow.operators.s3_to_hive_operator import S3ToHiveTransfer - 57 |+from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator -57 58 | -58 59 | S3ToHiveTransfer() -59 60 | +54 | S3ToHiveOperator() +55 | +56 | from airflow.operators.s3_to_hive_operator import S3ToHiveTransfer +57 + from airflow.providers.apache.hive.transfers.s3_to_hive import S3ToHiveOperator +58 | +59 | S3ToHiveTransfer() +60 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.hive_partition_sensor.HivePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:62:1 @@ -419,16 +402,15 @@ AIR302 [*] `airflow.sensors.hive_partition_sensor.HivePartitionSensor` is moved 64 | from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HivePartitionSensor` from `airflow.providers.apache.hive.sensors.hive_partition` instead. - -ℹ Unsafe fix -57 57 | -58 58 | S3ToHiveTransfer() -59 59 | -60 |-from airflow.sensors.hive_partition_sensor import HivePartitionSensor - 60 |+from airflow.providers.apache.hive.sensors.hive_partition import HivePartitionSensor -61 61 | -62 62 | HivePartitionSensor() -63 63 | +57 | +58 | S3ToHiveTransfer() +59 | + - from airflow.sensors.hive_partition_sensor import HivePartitionSensor +60 + from airflow.providers.apache.hive.sensors.hive_partition import HivePartitionSensor +61 | +62 | HivePartitionSensor() +63 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.metastore_partition_sensor.MetastorePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:66:1 @@ -441,16 +423,15 @@ AIR302 [*] `airflow.sensors.metastore_partition_sensor.MetastorePartitionSensor` 68 | from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MetastorePartitionSensor` from `airflow.providers.apache.hive.sensors.metastore_partition` instead. - -ℹ Unsafe fix -61 61 | -62 62 | HivePartitionSensor() -63 63 | -64 |-from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor - 64 |+from airflow.providers.apache.hive.sensors.metastore_partition import MetastorePartitionSensor -65 65 | -66 66 | MetastorePartitionSensor() -67 67 | +61 | +62 | HivePartitionSensor() +63 | + - from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor +64 + from airflow.providers.apache.hive.sensors.metastore_partition import MetastorePartitionSensor +65 | +66 | MetastorePartitionSensor() +67 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.named_hive_partition_sensor.NamedHivePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0; --> AIR302_hive.py:70:1 @@ -461,12 +442,11 @@ AIR302 [*] `airflow.sensors.named_hive_partition_sensor.NamedHivePartitionSensor | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `NamedHivePartitionSensor` from `airflow.providers.apache.hive.sensors.named_hive_partition` instead. - -ℹ Unsafe fix -65 65 | -66 66 | MetastorePartitionSensor() -67 67 | -68 |-from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor - 68 |+from airflow.providers.apache.hive.sensors.named_hive_partition import NamedHivePartitionSensor -69 69 | -70 70 | NamedHivePartitionSensor() +65 | +66 | MetastorePartitionSensor() +67 | + - from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor +68 + from airflow.providers.apache.hive.sensors.named_hive_partition import NamedHivePartitionSensor +69 | +70 | NamedHivePartitionSensor() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap index 0010d981b8..91391eb3ad 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_http.py.snap @@ -12,17 +12,16 @@ AIR302 [*] `airflow.hooks.http_hook.HttpHook` is moved into `http` provider in A 9 | HttpSensor() | help: Install `apache-airflow-providers-http>=1.0.0` and use `HttpHook` from `airflow.providers.http.hooks.http` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.http_hook import HttpHook -4 3 | from airflow.operators.http_operator import SimpleHttpOperator -5 4 | from airflow.sensors.http_sensor import HttpSensor - 5 |+from airflow.providers.http.hooks.http import HttpHook -6 6 | -7 7 | HttpHook() -8 8 | SimpleHttpOperator() +1 | from __future__ import annotations +2 | + - from airflow.hooks.http_hook import HttpHook +3 | from airflow.operators.http_operator import SimpleHttpOperator +4 | from airflow.sensors.http_sensor import HttpSensor +5 + from airflow.providers.http.hooks.http import HttpHook +6 | +7 | HttpHook() +8 | SimpleHttpOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.http_operator.SimpleHttpOperator` is moved into `http` provider in Airflow 3.0; --> AIR302_http.py:8:1 @@ -33,17 +32,15 @@ AIR302 [*] `airflow.operators.http_operator.SimpleHttpOperator` is moved into `h 9 | HttpSensor() | help: Install `apache-airflow-providers-http>=5.0.0` and use `HttpOperator` from `airflow.providers.http.operators.http` instead. - -ℹ Safe fix -3 3 | from airflow.hooks.http_hook import HttpHook -4 4 | from airflow.operators.http_operator import SimpleHttpOperator -5 5 | from airflow.sensors.http_sensor import HttpSensor - 6 |+from airflow.providers.http.operators.http import HttpOperator -6 7 | -7 8 | HttpHook() -8 |-SimpleHttpOperator() - 9 |+HttpOperator() -9 10 | HttpSensor() +3 | from airflow.hooks.http_hook import HttpHook +4 | from airflow.operators.http_operator import SimpleHttpOperator +5 | from airflow.sensors.http_sensor import HttpSensor +6 + from airflow.providers.http.operators.http import HttpOperator +7 | +8 | HttpHook() + - SimpleHttpOperator() +9 + HttpOperator() +10 | HttpSensor() AIR302 [*] `airflow.sensors.http_sensor.HttpSensor` is moved into `http` provider in Airflow 3.0; --> AIR302_http.py:9:1 @@ -54,13 +51,12 @@ AIR302 [*] `airflow.sensors.http_sensor.HttpSensor` is moved into `http` provide | ^^^^^^^^^^ | help: Install `apache-airflow-providers-http>=1.0.0` and use `HttpSensor` from `airflow.providers.http.sensors.http` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.http_hook import HttpHook -4 4 | from airflow.operators.http_operator import SimpleHttpOperator -5 |-from airflow.sensors.http_sensor import HttpSensor - 5 |+from airflow.providers.http.sensors.http import HttpSensor -6 6 | -7 7 | HttpHook() -8 8 | SimpleHttpOperator() +2 | +3 | from airflow.hooks.http_hook import HttpHook +4 | from airflow.operators.http_operator import SimpleHttpOperator + - from airflow.sensors.http_sensor import HttpSensor +5 + from airflow.providers.http.sensors.http import HttpSensor +6 | +7 | HttpHook() +8 | SimpleHttpOperator() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap index 337e988991..0ba1b660b7 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_jdbc.py.snap @@ -11,18 +11,17 @@ AIR302 [*] `airflow.hooks.jdbc_hook.JdbcHook` is moved into `jdbc` provider in A 9 | jaydebeapi() | help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `JdbcHook` from `airflow.providers.jdbc.hooks.jdbc` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.jdbc_hook import ( -4 |- JdbcHook, -5 4 | jaydebeapi, -6 5 | ) - 6 |+from airflow.providers.jdbc.hooks.jdbc import JdbcHook -7 7 | -8 8 | JdbcHook() -9 9 | jaydebeapi() +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.jdbc_hook import ( + - JdbcHook, +4 | jaydebeapi, +5 | ) +6 + from airflow.providers.jdbc.hooks.jdbc import JdbcHook +7 | +8 | JdbcHook() +9 | jaydebeapi() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.jdbc_hook.jaydebeapi` is moved into `jdbc` provider in Airflow 3.0; --> AIR302_jdbc.py:9:1 @@ -32,14 +31,13 @@ AIR302 [*] `airflow.hooks.jdbc_hook.jaydebeapi` is moved into `jdbc` provider in | ^^^^^^^^^^ | help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `jaydebeapi` from `airflow.providers.jdbc.hooks.jdbc` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.jdbc_hook import ( -4 4 | JdbcHook, -5 |- jaydebeapi, -6 5 | ) - 6 |+from airflow.providers.jdbc.hooks.jdbc import jaydebeapi -7 7 | -8 8 | JdbcHook() -9 9 | jaydebeapi() +2 | +3 | from airflow.hooks.jdbc_hook import ( +4 | JdbcHook, + - jaydebeapi, +5 | ) +6 + from airflow.providers.jdbc.hooks.jdbc import jaydebeapi +7 | +8 | JdbcHook() +9 | jaydebeapi() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap index d594255c68..cdd6c814c4 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_kubernetes.py.snap @@ -11,23 +11,22 @@ AIR302 [*] `airflow.executors.kubernetes_executor_types.ALL_NAMESPACES` is moved 23 | POD_EXECUTOR_DONE_KEY | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `ALL_NAMESPACES` from `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.executors.kubernetes_executor_types import ( -4 |- ALL_NAMESPACES, -5 4 | POD_EXECUTOR_DONE_KEY, -6 5 | ) -7 6 | from airflow.kubernetes.k8s_model import ( +1 | from __future__ import annotations +2 | +3 | from airflow.executors.kubernetes_executor_types import ( + - ALL_NAMESPACES, +4 | POD_EXECUTOR_DONE_KEY, +5 | ) +6 | from airflow.kubernetes.k8s_model import ( -------------------------------------------------------------------------------- -18 17 | annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import ALL_NAMESPACES -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +17 | annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import ALL_NAMESPACES +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.executors.kubernetes_executor_types.POD_EXECUTOR_DONE_KEY` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:23:1 @@ -39,23 +38,22 @@ AIR302 [*] `airflow.executors.kubernetes_executor_types.POD_EXECUTOR_DONE_KEY` i 25 | K8SModel() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `POD_EXECUTOR_DONE_KEY` from `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.executors.kubernetes_executor_types import ( -4 4 | ALL_NAMESPACES, -5 |- POD_EXECUTOR_DONE_KEY, -6 5 | ) -7 6 | from airflow.kubernetes.k8s_model import ( -8 7 | K8SModel, +2 | +3 | from airflow.executors.kubernetes_executor_types import ( +4 | ALL_NAMESPACES, + - POD_EXECUTOR_DONE_KEY, +5 | ) +6 | from airflow.kubernetes.k8s_model import ( +7 | K8SModel, -------------------------------------------------------------------------------- -18 17 | annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import POD_EXECUTOR_DONE_KEY -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +17 | annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types import POD_EXECUTOR_DONE_KEY +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.k8s_model.K8SModel` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:25:1 @@ -67,23 +65,22 @@ AIR302 [*] `airflow.kubernetes.k8s_model.K8SModel` is moved into `cncf-kubernete 26 | append_to_pod() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `K8SModel` from `airflow.providers.cncf.kubernetes.k8s_model` instead. - -ℹ Unsafe fix -5 5 | POD_EXECUTOR_DONE_KEY, -6 6 | ) -7 7 | from airflow.kubernetes.k8s_model import ( -8 |- K8SModel, -9 8 | append_to_pod, -10 9 | ) -11 10 | from airflow.kubernetes.kube_client import ( +5 | POD_EXECUTOR_DONE_KEY, +6 | ) +7 | from airflow.kubernetes.k8s_model import ( + - K8SModel, +8 | append_to_pod, +9 | ) +10 | from airflow.kubernetes.kube_client import ( -------------------------------------------------------------------------------- -18 17 | annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.k8s_model import K8SModel -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +17 | annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.k8s_model import K8SModel +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.k8s_model.append_to_pod` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:26:1 @@ -95,23 +92,22 @@ AIR302 [*] `airflow.kubernetes.k8s_model.append_to_pod` is moved into `cncf-kube 28 | _disable_verify_ssl() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `append_to_pod` from `airflow.providers.cncf.kubernetes.k8s_model` instead. - -ℹ Unsafe fix -6 6 | ) -7 7 | from airflow.kubernetes.k8s_model import ( -8 8 | K8SModel, -9 |- append_to_pod, -10 9 | ) -11 10 | from airflow.kubernetes.kube_client import ( -12 11 | _disable_verify_ssl, +6 | ) +7 | from airflow.kubernetes.k8s_model import ( +8 | K8SModel, + - append_to_pod, +9 | ) +10 | from airflow.kubernetes.kube_client import ( +11 | _disable_verify_ssl, -------------------------------------------------------------------------------- -18 17 | annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.k8s_model import append_to_pod -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +17 | annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.k8s_model import append_to_pod +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.kube_client._disable_verify_ssl` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:28:1 @@ -124,23 +120,22 @@ AIR302 [*] `airflow.kubernetes.kube_client._disable_verify_ssl` is moved into `c 30 | get_kube_client() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `_disable_verify_ssl` from `airflow.providers.cncf.kubernetes.kube_client` instead. - -ℹ Unsafe fix -9 9 | append_to_pod, -10 10 | ) -11 11 | from airflow.kubernetes.kube_client import ( -12 |- _disable_verify_ssl, -13 12 | _enable_tcp_keepalive, -14 13 | get_kube_client, -15 14 | ) +9 | append_to_pod, +10 | ) +11 | from airflow.kubernetes.kube_client import ( + - _disable_verify_ssl, +12 | _enable_tcp_keepalive, +13 | get_kube_client, +14 | ) -------------------------------------------------------------------------------- -18 17 | annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.kube_client import _disable_verify_ssl -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +17 | annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.kube_client import _disable_verify_ssl +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.kube_client._enable_tcp_keepalive` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:29:1 @@ -151,23 +146,22 @@ AIR302 [*] `airflow.kubernetes.kube_client._enable_tcp_keepalive` is moved into 30 | get_kube_client() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `_enable_tcp_keepalive` from `airflow.providers.cncf.kubernetes.kube_client` instead. - -ℹ Unsafe fix -10 10 | ) -11 11 | from airflow.kubernetes.kube_client import ( -12 12 | _disable_verify_ssl, -13 |- _enable_tcp_keepalive, -14 13 | get_kube_client, -15 14 | ) -16 15 | from airflow.kubernetes.kubernetes_helper_functions import ( +10 | ) +11 | from airflow.kubernetes.kube_client import ( +12 | _disable_verify_ssl, + - _enable_tcp_keepalive, +13 | get_kube_client, +14 | ) +15 | from airflow.kubernetes.kubernetes_helper_functions import ( -------------------------------------------------------------------------------- -18 17 | annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.kube_client import _enable_tcp_keepalive -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +17 | annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.kube_client import _enable_tcp_keepalive +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.kube_client.get_kube_client` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:30:1 @@ -180,22 +174,21 @@ AIR302 [*] `airflow.kubernetes.kube_client.get_kube_client` is moved into `cncf- 32 | add_pod_suffix() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_kube_client` from `airflow.providers.cncf.kubernetes.kube_client` instead. - -ℹ Unsafe fix -11 11 | from airflow.kubernetes.kube_client import ( -12 12 | _disable_verify_ssl, -13 13 | _enable_tcp_keepalive, -14 |- get_kube_client, -15 14 | ) -16 15 | from airflow.kubernetes.kubernetes_helper_functions import ( -17 16 | add_pod_suffix, -18 17 | annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.kube_client import get_kube_client -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +11 | from airflow.kubernetes.kube_client import ( +12 | _disable_verify_ssl, +13 | _enable_tcp_keepalive, + - get_kube_client, +14 | ) +15 | from airflow.kubernetes.kubernetes_helper_functions import ( +16 | add_pod_suffix, +17 | annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.kube_client import get_kube_client +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.add_pod_suffix` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:32:1 @@ -208,24 +201,22 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.add_pod_suffix` is mo 34 | create_pod_id() | help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `add_unique_suffix` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Safe fix -18 18 | annotations_for_logging_task_metadata, -19 19 | create_pod_id, -20 20 | ) - 21 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix -21 22 | -22 23 | ALL_NAMESPACES -23 24 | POD_EXECUTOR_DONE_KEY +18 | annotations_for_logging_task_metadata, +19 | create_pod_id, +20 | ) +21 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix +22 | +23 | ALL_NAMESPACES +24 | POD_EXECUTOR_DONE_KEY -------------------------------------------------------------------------------- -29 30 | _enable_tcp_keepalive() -30 31 | get_kube_client() -31 32 | -32 |-add_pod_suffix() - 33 |+add_unique_suffix() -33 34 | annotations_for_logging_task_metadata() -34 35 | create_pod_id() -35 36 | +30 | _enable_tcp_keepalive() +31 | get_kube_client() +32 | + - add_pod_suffix() +33 + add_unique_suffix() +34 | annotations_for_logging_task_metadata() +35 | create_pod_id() +36 | AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_for_logging_task_metadata` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:33:1 @@ -236,18 +227,17 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_for_loggi 34 | create_pod_id() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `annotations_for_logging_task_metadata` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Unsafe fix -15 15 | ) -16 16 | from airflow.kubernetes.kubernetes_helper_functions import ( -17 17 | add_pod_suffix, -18 |- annotations_for_logging_task_metadata, -19 18 | create_pod_id, -20 19 | ) - 20 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_for_logging_task_metadata -21 21 | -22 22 | ALL_NAMESPACES -23 23 | POD_EXECUTOR_DONE_KEY +15 | ) +16 | from airflow.kubernetes.kubernetes_helper_functions import ( +17 | add_pod_suffix, + - annotations_for_logging_task_metadata, +18 | create_pod_id, +19 | ) +20 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_for_logging_task_metadata +21 | +22 | ALL_NAMESPACES +23 | POD_EXECUTOR_DONE_KEY +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.create_pod_id` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:34:1 @@ -258,24 +248,22 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.create_pod_id` is mov | ^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `create_unique_id` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Safe fix -18 18 | annotations_for_logging_task_metadata, -19 19 | create_pod_id, -20 20 | ) - 21 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import create_unique_id -21 22 | -22 23 | ALL_NAMESPACES -23 24 | POD_EXECUTOR_DONE_KEY +18 | annotations_for_logging_task_metadata, +19 | create_pod_id, +20 | ) +21 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import create_unique_id +22 | +23 | ALL_NAMESPACES +24 | POD_EXECUTOR_DONE_KEY -------------------------------------------------------------------------------- -31 32 | -32 33 | add_pod_suffix() -33 34 | annotations_for_logging_task_metadata() -34 |-create_pod_id() - 35 |+create_unique_id() -35 36 | -36 37 | -37 38 | from airflow.kubernetes.pod_generator import ( +32 | +33 | add_pod_suffix() +34 | annotations_for_logging_task_metadata() + - create_pod_id() +35 + create_unique_id() +36 | +37 | +38 | from airflow.kubernetes.pod_generator import ( AIR302 [*] `airflow.kubernetes.pod_generator.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:49:1 @@ -288,23 +276,22 @@ AIR302 [*] `airflow.kubernetes.pod_generator.PodDefaults` is moved into `cncf-ku 51 | add_pod_suffix() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead. - -ℹ Unsafe fix -35 35 | -36 36 | -37 37 | from airflow.kubernetes.pod_generator import ( -38 |- PodDefaults, -39 38 | PodGenerator, -40 39 | add_pod_suffix, -41 40 | datetime_to_label_safe_datestring, +35 | +36 | +37 | from airflow.kubernetes.pod_generator import ( + - PodDefaults, +38 | PodGenerator, +39 | add_pod_suffix, +40 | datetime_to_label_safe_datestring, -------------------------------------------------------------------------------- -45 44 | merge_objects, -46 45 | rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +44 | merge_objects, +45 | rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.PodGenerator` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:50:1 @@ -316,23 +303,22 @@ AIR302 [*] `airflow.kubernetes.pod_generator.PodGenerator` is moved into `cncf-k 52 | datetime_to_label_safe_datestring() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -36 36 | -37 37 | from airflow.kubernetes.pod_generator import ( -38 38 | PodDefaults, -39 |- PodGenerator, -40 39 | add_pod_suffix, -41 40 | datetime_to_label_safe_datestring, -42 41 | extend_object_field, +36 | +37 | from airflow.kubernetes.pod_generator import ( +38 | PodDefaults, + - PodGenerator, +39 | add_pod_suffix, +40 | datetime_to_label_safe_datestring, +41 | extend_object_field, -------------------------------------------------------------------------------- -45 44 | merge_objects, -46 45 | rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +44 | merge_objects, +45 | rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.add_pod_suffix` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:51:1 @@ -345,20 +331,18 @@ AIR302 [*] `airflow.kubernetes.pod_generator.add_pod_suffix` is moved into `cncf 53 | extend_object_field() | help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `add_unique_suffix` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Safe fix -45 45 | merge_objects, -46 46 | rand_str, -47 47 | ) - 48 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix -48 49 | -49 50 | PodDefaults() -50 51 | PodGenerator() -51 |-add_pod_suffix() - 52 |+add_unique_suffix() -52 53 | datetime_to_label_safe_datestring() -53 54 | extend_object_field() -54 55 | label_safe_datestring_to_datetime() +45 | merge_objects, +46 | rand_str, +47 | ) +48 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import add_unique_suffix +49 | +50 | PodDefaults() +51 | PodGenerator() + - add_pod_suffix() +52 + add_unique_suffix() +53 | datetime_to_label_safe_datestring() +54 | extend_object_field() +55 | label_safe_datestring_to_datetime() AIR302 [*] `airflow.kubernetes.pod_generator.datetime_to_label_safe_datestring` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:52:1 @@ -371,22 +355,21 @@ AIR302 [*] `airflow.kubernetes.pod_generator.datetime_to_label_safe_datestring` 54 | label_safe_datestring_to_datetime() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `datetime_to_label_safe_datestring` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -38 38 | PodDefaults, -39 39 | PodGenerator, -40 40 | add_pod_suffix, -41 |- datetime_to_label_safe_datestring, -42 41 | extend_object_field, -43 42 | label_safe_datestring_to_datetime, -44 43 | make_safe_label_value, -45 44 | merge_objects, -46 45 | rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.pod_generator import datetime_to_label_safe_datestring -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +38 | PodDefaults, +39 | PodGenerator, +40 | add_pod_suffix, + - datetime_to_label_safe_datestring, +41 | extend_object_field, +42 | label_safe_datestring_to_datetime, +43 | make_safe_label_value, +44 | merge_objects, +45 | rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.pod_generator import datetime_to_label_safe_datestring +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.extend_object_field` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:53:1 @@ -399,21 +382,20 @@ AIR302 [*] `airflow.kubernetes.pod_generator.extend_object_field` is moved into 55 | make_safe_label_value() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `extend_object_field` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -39 39 | PodGenerator, -40 40 | add_pod_suffix, -41 41 | datetime_to_label_safe_datestring, -42 |- extend_object_field, -43 42 | label_safe_datestring_to_datetime, -44 43 | make_safe_label_value, -45 44 | merge_objects, -46 45 | rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.pod_generator import extend_object_field -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +39 | PodGenerator, +40 | add_pod_suffix, +41 | datetime_to_label_safe_datestring, + - extend_object_field, +42 | label_safe_datestring_to_datetime, +43 | make_safe_label_value, +44 | merge_objects, +45 | rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.pod_generator import extend_object_field +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.label_safe_datestring_to_datetime` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:54:1 @@ -426,20 +408,19 @@ AIR302 [*] `airflow.kubernetes.pod_generator.label_safe_datestring_to_datetime` 56 | merge_objects() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `label_safe_datestring_to_datetime` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -40 40 | add_pod_suffix, -41 41 | datetime_to_label_safe_datestring, -42 42 | extend_object_field, -43 |- label_safe_datestring_to_datetime, -44 43 | make_safe_label_value, -45 44 | merge_objects, -46 45 | rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.pod_generator import label_safe_datestring_to_datetime -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +40 | add_pod_suffix, +41 | datetime_to_label_safe_datestring, +42 | extend_object_field, + - label_safe_datestring_to_datetime, +43 | make_safe_label_value, +44 | merge_objects, +45 | rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.pod_generator import label_safe_datestring_to_datetime +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.make_safe_label_value` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:55:1 @@ -452,19 +433,18 @@ AIR302 [*] `airflow.kubernetes.pod_generator.make_safe_label_value` is moved int 57 | rand_str() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `make_safe_label_value` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -41 41 | datetime_to_label_safe_datestring, -42 42 | extend_object_field, -43 43 | label_safe_datestring_to_datetime, -44 |- make_safe_label_value, -45 44 | merge_objects, -46 45 | rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +41 | datetime_to_label_safe_datestring, +42 | extend_object_field, +43 | label_safe_datestring_to_datetime, + - make_safe_label_value, +44 | merge_objects, +45 | rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.merge_objects` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:56:1 @@ -476,18 +456,17 @@ AIR302 [*] `airflow.kubernetes.pod_generator.merge_objects` is moved into `cncf- 57 | rand_str() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `merge_objects` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -42 42 | extend_object_field, -43 43 | label_safe_datestring_to_datetime, -44 44 | make_safe_label_value, -45 |- merge_objects, -46 45 | rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.pod_generator import merge_objects -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +42 | extend_object_field, +43 | label_safe_datestring_to_datetime, +44 | make_safe_label_value, + - merge_objects, +45 | rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.pod_generator import merge_objects +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.rand_str` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:57:1 @@ -500,17 +479,16 @@ AIR302 [*] `airflow.kubernetes.pod_generator.rand_str` is moved into `cncf-kuber 59 | from airflow.kubernetes.pod_generator_deprecated import ( | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `rand_str` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Unsafe fix -43 43 | label_safe_datestring_to_datetime, -44 44 | make_safe_label_value, -45 45 | merge_objects, -46 |- rand_str, -47 46 | ) - 47 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str -48 48 | -49 49 | PodDefaults() -50 50 | PodGenerator() +43 | label_safe_datestring_to_datetime, +44 | make_safe_label_value, +45 | merge_objects, + - rand_str, +46 | ) +47 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str +48 | +49 | PodDefaults() +50 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:69:1 @@ -523,23 +501,22 @@ AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodDefaults` is moved in 71 | make_safe_label_value() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead. - -ℹ Unsafe fix -57 57 | rand_str() -58 58 | -59 59 | from airflow.kubernetes.pod_generator_deprecated import ( -60 |- PodDefaults, -61 60 | PodGenerator, -62 61 | make_safe_label_value, -63 62 | ) +57 | rand_str() +58 | +59 | from airflow.kubernetes.pod_generator_deprecated import ( + - PodDefaults, +60 | PodGenerator, +61 | make_safe_label_value, +62 | ) -------------------------------------------------------------------------------- -65 64 | PodLauncher, -66 65 | PodStatus, -67 66 | ) - 67 |+from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults -68 68 | -69 69 | PodDefaults() -70 70 | PodGenerator() +64 | PodLauncher, +65 | PodStatus, +66 | ) +67 + from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults +68 | +69 | PodDefaults() +70 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodGenerator` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:70:1 @@ -550,22 +527,21 @@ AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.PodGenerator` is moved i 71 | make_safe_label_value() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -58 58 | -59 59 | from airflow.kubernetes.pod_generator_deprecated import ( -60 60 | PodDefaults, -61 |- PodGenerator, -62 61 | make_safe_label_value, -63 62 | ) -64 63 | from airflow.kubernetes.pod_launcher import ( -65 64 | PodLauncher, -66 65 | PodStatus, -67 66 | ) - 67 |+from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator -68 68 | -69 69 | PodDefaults() -70 70 | PodGenerator() +58 | +59 | from airflow.kubernetes.pod_generator_deprecated import ( +60 | PodDefaults, + - PodGenerator, +61 | make_safe_label_value, +62 | ) +63 | from airflow.kubernetes.pod_launcher import ( +64 | PodLauncher, +65 | PodStatus, +66 | ) +67 + from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator +68 | +69 | PodDefaults() +70 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.make_safe_label_value` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:71:1 @@ -578,21 +554,20 @@ AIR302 [*] `airflow.kubernetes.pod_generator_deprecated.make_safe_label_value` i 73 | PodLauncher() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `make_safe_label_value` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -59 59 | from airflow.kubernetes.pod_generator_deprecated import ( -60 60 | PodDefaults, -61 61 | PodGenerator, -62 |- make_safe_label_value, -63 62 | ) -64 63 | from airflow.kubernetes.pod_launcher import ( -65 64 | PodLauncher, -66 65 | PodStatus, -67 66 | ) - 67 |+from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value -68 68 | -69 69 | PodDefaults() -70 70 | PodGenerator() +59 | from airflow.kubernetes.pod_generator_deprecated import ( +60 | PodDefaults, +61 | PodGenerator, + - make_safe_label_value, +62 | ) +63 | from airflow.kubernetes.pod_launcher import ( +64 | PodLauncher, +65 | PodStatus, +66 | ) +67 + from airflow.providers.cncf.kubernetes.pod_generator import make_safe_label_value +68 | +69 | PodDefaults() +70 | PodGenerator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_launcher.PodLauncher` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:73:1 @@ -604,22 +579,20 @@ AIR302 [*] `airflow.kubernetes.pod_launcher.PodLauncher` is moved into `cncf-kub 74 | PodStatus() | help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodManager` from `airflow.providers.cncf.kubernetes.utils.pod_manager` instead. - -ℹ Safe fix -65 65 | PodLauncher, -66 66 | PodStatus, -67 67 | ) - 68 |+from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager -68 69 | -69 70 | PodDefaults() -70 71 | PodGenerator() -71 72 | make_safe_label_value() -72 73 | -73 |-PodLauncher() - 74 |+PodManager() -74 75 | PodStatus() -75 76 | -76 77 | from airflow.kubernetes.pod_launcher_deprecated import ( +65 | PodLauncher, +66 | PodStatus, +67 | ) +68 + from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager +69 | +70 | PodDefaults() +71 | PodGenerator() +72 | make_safe_label_value() +73 | + - PodLauncher() +74 + PodManager() +75 | PodStatus() +76 | +77 | from airflow.kubernetes.pod_launcher_deprecated import ( AIR302 [*] `airflow.kubernetes.pod_launcher.PodStatus` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:74:1 @@ -631,23 +604,21 @@ AIR302 [*] `airflow.kubernetes.pod_launcher.PodStatus` is moved into `cncf-kuber 76 | from airflow.kubernetes.pod_launcher_deprecated import ( | help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodPhase` from ` airflow.providers.cncf.kubernetes.utils.pod_manager` instead. - -ℹ Safe fix -65 65 | PodLauncher, -66 66 | PodStatus, -67 67 | ) - 68 |+from airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase -68 69 | -69 70 | PodDefaults() -70 71 | PodGenerator() -71 72 | make_safe_label_value() -72 73 | -73 74 | PodLauncher() -74 |-PodStatus() - 75 |+PodPhase() -75 76 | -76 77 | from airflow.kubernetes.pod_launcher_deprecated import ( -77 78 | PodDefaults, +65 | PodLauncher, +66 | PodStatus, +67 | ) +68 + from airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase +69 | +70 | PodDefaults() +71 | PodGenerator() +72 | make_safe_label_value() +73 | +74 | PodLauncher() + - PodStatus() +75 + PodPhase() +76 | +77 | from airflow.kubernetes.pod_launcher_deprecated import ( +78 | PodDefaults, AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:90:1 @@ -660,23 +631,22 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodDefaults` is moved int 92 | PodStatus() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead. - -ℹ Unsafe fix -74 74 | PodStatus() -75 75 | -76 76 | from airflow.kubernetes.pod_launcher_deprecated import ( -77 |- PodDefaults, -78 77 | PodLauncher, -79 78 | PodStatus, -80 79 | get_kube_client, +74 | PodStatus() +75 | +76 | from airflow.kubernetes.pod_launcher_deprecated import ( + - PodDefaults, +77 | PodLauncher, +78 | PodStatus, +79 | get_kube_client, -------------------------------------------------------------------------------- -86 85 | ) -87 86 | from airflow.kubernetes.volume import Volume -88 87 | from airflow.kubernetes.volume_mount import VolumeMount - 88 |+from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults -89 89 | -90 90 | PodDefaults() -91 91 | PodLauncher() +85 | ) +86 | from airflow.kubernetes.volume import Volume +87 | from airflow.kubernetes.volume_mount import VolumeMount +88 + from airflow.providers.cncf.kubernetes.utils.xcom_sidecar import PodDefaults +89 | +90 | PodDefaults() +91 | PodLauncher() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodLauncher` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:91:1 @@ -688,19 +658,17 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodLauncher` is moved int 93 | get_kube_client() | help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodManager` from `airflow.providers.cncf.kubernetes.utils.pod_manager` instead. - -ℹ Safe fix -86 86 | ) -87 87 | from airflow.kubernetes.volume import Volume -88 88 | from airflow.kubernetes.volume_mount import VolumeMount - 89 |+from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager -89 90 | -90 91 | PodDefaults() -91 |-PodLauncher() - 92 |+PodManager() -92 93 | PodStatus() -93 94 | get_kube_client() -94 95 | +86 | ) +87 | from airflow.kubernetes.volume import Volume +88 | from airflow.kubernetes.volume_mount import VolumeMount +89 + from airflow.providers.cncf.kubernetes.utils.pod_manager import PodManager +90 | +91 | PodDefaults() + - PodLauncher() +92 + PodManager() +93 | PodStatus() +94 | get_kube_client() +95 | AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodStatus` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:92:1 @@ -712,20 +680,18 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodStatus` is moved into 93 | get_kube_client() | help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodPhase` from ` airflow.providers.cncf.kubernetes.utils.pod_manager` instead. - -ℹ Safe fix -86 86 | ) -87 87 | from airflow.kubernetes.volume import Volume -88 88 | from airflow.kubernetes.volume_mount import VolumeMount - 89 |+from airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase -89 90 | -90 91 | PodDefaults() -91 92 | PodLauncher() -92 |-PodStatus() - 93 |+PodPhase() -93 94 | get_kube_client() -94 95 | -95 96 | PodRuntimeInfoEnv() +86 | ) +87 | from airflow.kubernetes.volume import Volume +88 | from airflow.kubernetes.volume_mount import VolumeMount +89 + from airflow.providers.cncf.kubernetes.utils.pod_manager import PodPhase +90 | +91 | PodDefaults() +92 | PodLauncher() + - PodStatus() +93 + PodPhase() +94 | get_kube_client() +95 | +96 | PodRuntimeInfoEnv() AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.get_kube_client` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:93:1 @@ -738,23 +704,22 @@ AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.get_kube_client` is moved 95 | PodRuntimeInfoEnv() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_kube_client` from `airflow.providers.cncf.kubernetes.kube_client` instead. - -ℹ Unsafe fix -77 77 | PodDefaults, -78 78 | PodLauncher, -79 79 | PodStatus, -80 |- get_kube_client, -81 80 | ) -82 81 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv -83 82 | from airflow.kubernetes.secret import ( +77 | PodDefaults, +78 | PodLauncher, +79 | PodStatus, + - get_kube_client, +80 | ) +81 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv +82 | from airflow.kubernetes.secret import ( -------------------------------------------------------------------------------- -86 85 | ) -87 86 | from airflow.kubernetes.volume import Volume -88 87 | from airflow.kubernetes.volume_mount import VolumeMount - 88 |+from airflow.providers.cncf.kubernetes.kube_client import get_kube_client -89 89 | -90 90 | PodDefaults() -91 91 | PodLauncher() +85 | ) +86 | from airflow.kubernetes.volume import Volume +87 | from airflow.kubernetes.volume_mount import VolumeMount +88 + from airflow.providers.cncf.kubernetes.kube_client import get_kube_client +89 | +90 | PodDefaults() +91 | PodLauncher() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_runtime_info_env.PodRuntimeInfoEnv` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:95:1 @@ -767,23 +732,21 @@ AIR302 [*] `airflow.kubernetes.pod_runtime_info_env.PodRuntimeInfoEnv` is moved 97 | Secret() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1EnvVar` from `kubernetes.client.models` instead. - -ℹ Safe fix -86 86 | ) -87 87 | from airflow.kubernetes.volume import Volume -88 88 | from airflow.kubernetes.volume_mount import VolumeMount - 89 |+from kubernetes.client.models import V1EnvVar -89 90 | -90 91 | PodDefaults() -91 92 | PodLauncher() -92 93 | PodStatus() -93 94 | get_kube_client() -94 95 | -95 |-PodRuntimeInfoEnv() - 96 |+V1EnvVar() -96 97 | K8SModel() -97 98 | Secret() -98 99 | Volume() +86 | ) +87 | from airflow.kubernetes.volume import Volume +88 | from airflow.kubernetes.volume_mount import VolumeMount +89 + from kubernetes.client.models import V1EnvVar +90 | +91 | PodDefaults() +92 | PodLauncher() +93 | PodStatus() +94 | get_kube_client() +95 | + - PodRuntimeInfoEnv() +96 + V1EnvVar() +97 | K8SModel() +98 | Secret() +99 | Volume() AIR302 [*] `airflow.kubernetes.secret.K8SModel` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:96:1 @@ -795,20 +758,19 @@ AIR302 [*] `airflow.kubernetes.secret.K8SModel` is moved into `cncf-kubernetes` 98 | Volume() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `K8SModel` from `airflow.providers.cncf.kubernetes.k8s_model` instead. - -ℹ Unsafe fix -81 81 | ) -82 82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv -83 83 | from airflow.kubernetes.secret import ( -84 |- K8SModel, -85 84 | Secret, -86 85 | ) -87 86 | from airflow.kubernetes.volume import Volume -88 87 | from airflow.kubernetes.volume_mount import VolumeMount - 88 |+from airflow.providers.cncf.kubernetes.k8s_model import K8SModel -89 89 | -90 90 | PodDefaults() -91 91 | PodLauncher() +81 | ) +82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv +83 | from airflow.kubernetes.secret import ( + - K8SModel, +84 | Secret, +85 | ) +86 | from airflow.kubernetes.volume import Volume +87 | from airflow.kubernetes.volume_mount import VolumeMount +88 + from airflow.providers.cncf.kubernetes.k8s_model import K8SModel +89 | +90 | PodDefaults() +91 | PodLauncher() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.secret.Secret` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:97:1 @@ -821,19 +783,18 @@ AIR302 [*] `airflow.kubernetes.secret.Secret` is moved into `cncf-kubernetes` pr 99 | VolumeMount() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `Secret` from `airflow.providers.cncf.kubernetes.secret` instead. - -ℹ Unsafe fix -82 82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv -83 83 | from airflow.kubernetes.secret import ( -84 84 | K8SModel, -85 |- Secret, -86 85 | ) -87 86 | from airflow.kubernetes.volume import Volume -88 87 | from airflow.kubernetes.volume_mount import VolumeMount - 88 |+from airflow.providers.cncf.kubernetes.secret import Secret -89 89 | -90 90 | PodDefaults() -91 91 | PodLauncher() +82 | from airflow.kubernetes.pod_runtime_info_env import PodRuntimeInfoEnv +83 | from airflow.kubernetes.secret import ( +84 | K8SModel, + - Secret, +85 | ) +86 | from airflow.kubernetes.volume import Volume +87 | from airflow.kubernetes.volume_mount import VolumeMount +88 + from airflow.providers.cncf.kubernetes.secret import Secret +89 | +90 | PodDefaults() +91 | PodLauncher() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.volume.Volume` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:98:1 @@ -845,24 +806,22 @@ AIR302 [*] `airflow.kubernetes.volume.Volume` is moved into `cncf-kubernetes` pr 99 | VolumeMount() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1Volume` from `kubernetes.client.models` instead. - -ℹ Safe fix -86 86 | ) -87 87 | from airflow.kubernetes.volume import Volume -88 88 | from airflow.kubernetes.volume_mount import VolumeMount - 89 |+from kubernetes.client.models import V1Volume -89 90 | -90 91 | PodDefaults() -91 92 | PodLauncher() +86 | ) +87 | from airflow.kubernetes.volume import Volume +88 | from airflow.kubernetes.volume_mount import VolumeMount +89 + from kubernetes.client.models import V1Volume +90 | +91 | PodDefaults() +92 | PodLauncher() -------------------------------------------------------------------------------- -95 96 | PodRuntimeInfoEnv() -96 97 | K8SModel() -97 98 | Secret() -98 |-Volume() - 99 |+V1Volume() -99 100 | VolumeMount() -100 101 | -101 102 | from airflow.kubernetes.kubernetes_helper_functions import ( +96 | PodRuntimeInfoEnv() +97 | K8SModel() +98 | Secret() + - Volume() +99 + V1Volume() +100 | VolumeMount() +101 | +102 | from airflow.kubernetes.kubernetes_helper_functions import ( AIR302 [*] `airflow.kubernetes.volume_mount.VolumeMount` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:99:1 @@ -875,24 +834,22 @@ AIR302 [*] `airflow.kubernetes.volume_mount.VolumeMount` is moved into `cncf-kub 101 | from airflow.kubernetes.kubernetes_helper_functions import ( | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1VolumeMount` from `kubernetes.client.models` instead. - -ℹ Safe fix -86 86 | ) -87 87 | from airflow.kubernetes.volume import Volume -88 88 | from airflow.kubernetes.volume_mount import VolumeMount - 89 |+from kubernetes.client.models import V1VolumeMount -89 90 | -90 91 | PodDefaults() -91 92 | PodLauncher() +86 | ) +87 | from airflow.kubernetes.volume import Volume +88 | from airflow.kubernetes.volume_mount import VolumeMount +89 + from kubernetes.client.models import V1VolumeMount +90 | +91 | PodDefaults() +92 | PodLauncher() -------------------------------------------------------------------------------- -96 97 | K8SModel() -97 98 | Secret() -98 99 | Volume() -99 |-VolumeMount() - 100 |+V1VolumeMount() -100 101 | -101 102 | from airflow.kubernetes.kubernetes_helper_functions import ( -102 103 | annotations_to_key, +97 | K8SModel() +98 | Secret() +99 | Volume() + - VolumeMount() +100 + V1VolumeMount() +101 | +102 | from airflow.kubernetes.kubernetes_helper_functions import ( +103 | annotations_to_key, AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_to_key` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:107:1 @@ -905,19 +862,18 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.annotations_to_key` i 109 | rand_str() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `annotations_to_key` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Unsafe fix -99 99 | VolumeMount() -100 100 | -101 101 | from airflow.kubernetes.kubernetes_helper_functions import ( -102 |- annotations_to_key, -103 102 | get_logs_task_metadata, -104 103 | rand_str, -105 104 | ) - 105 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_to_key -106 106 | -107 107 | annotations_to_key() -108 108 | get_logs_task_metadata() +99 | VolumeMount() +100 | +101 | from airflow.kubernetes.kubernetes_helper_functions import ( + - annotations_to_key, +102 | get_logs_task_metadata, +103 | rand_str, +104 | ) +105 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_to_key +106 | +107 | annotations_to_key() +108 | get_logs_task_metadata() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.get_logs_task_metadata` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:108:1 @@ -928,18 +884,17 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.get_logs_task_metadat 109 | rand_str() | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_logs_task_metadata` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Unsafe fix -100 100 | -101 101 | from airflow.kubernetes.kubernetes_helper_functions import ( -102 102 | annotations_to_key, -103 |- get_logs_task_metadata, -104 103 | rand_str, -105 104 | ) - 105 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import get_logs_task_metadata -106 106 | -107 107 | annotations_to_key() -108 108 | get_logs_task_metadata() +100 | +101 | from airflow.kubernetes.kubernetes_helper_functions import ( +102 | annotations_to_key, + - get_logs_task_metadata, +103 | rand_str, +104 | ) +105 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import get_logs_task_metadata +106 | +107 | annotations_to_key() +108 | get_logs_task_metadata() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.rand_str` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:109:1 @@ -952,17 +907,16 @@ AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.rand_str` is moved in 111 | from airflow.kubernetes.pod_generator import PodGeneratorDeprecated | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `rand_str` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead. - -ℹ Unsafe fix -101 101 | from airflow.kubernetes.kubernetes_helper_functions import ( -102 102 | annotations_to_key, -103 103 | get_logs_task_metadata, -104 |- rand_str, -105 104 | ) - 105 |+from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str -106 106 | -107 107 | annotations_to_key() -108 108 | get_logs_task_metadata() +101 | from airflow.kubernetes.kubernetes_helper_functions import ( +102 | annotations_to_key, +103 | get_logs_task_metadata, + - rand_str, +104 | ) +105 + from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import rand_str +106 | +107 | annotations_to_key() +108 | get_logs_task_metadata() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.kubernetes.pod_generator.PodGeneratorDeprecated` is moved into `cncf-kubernetes` provider in Airflow 3.0; --> AIR302_kubernetes.py:113:1 @@ -973,11 +927,10 @@ AIR302 [*] `airflow.kubernetes.pod_generator.PodGeneratorDeprecated` is moved in | ^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead. - -ℹ Unsafe fix -109 109 | rand_str() -110 110 | -111 111 | from airflow.kubernetes.pod_generator import PodGeneratorDeprecated - 112 |+from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator -112 113 | -113 114 | PodGeneratorDeprecated() +109 | rand_str() +110 | +111 | from airflow.kubernetes.pod_generator import PodGeneratorDeprecated +112 + from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator +113 | +114 | PodGeneratorDeprecated() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap index be6bb3af6c..2cc5b98f2b 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_mysql.py.snap @@ -12,19 +12,18 @@ AIR302 [*] `airflow.hooks.mysql_hook.MySqlHook` is moved into `mysql` provider i 11 | PrestoToMySqlTransfer() | help: Install `apache-airflow-providers-mysql>=1.0.0` and use `MySqlHook` from `airflow.providers.mysql.hooks.mysql` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.mysql_hook import MySqlHook -4 3 | from airflow.operators.presto_to_mysql import ( -5 4 | PrestoToMySqlOperator, -6 5 | PrestoToMySqlTransfer, -7 6 | ) - 7 |+from airflow.providers.mysql.hooks.mysql import MySqlHook -8 8 | -9 9 | MySqlHook() -10 10 | PrestoToMySqlOperator() +1 | from __future__ import annotations +2 | + - from airflow.hooks.mysql_hook import MySqlHook +3 | from airflow.operators.presto_to_mysql import ( +4 | PrestoToMySqlOperator, +5 | PrestoToMySqlTransfer, +6 | ) +7 + from airflow.providers.mysql.hooks.mysql import MySqlHook +8 | +9 | MySqlHook() +10 | PrestoToMySqlOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlOperator` is moved into `mysql` provider in Airflow 3.0; --> AIR302_mysql.py:10:1 @@ -35,18 +34,17 @@ AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlOperator` is moved in 11 | PrestoToMySqlTransfer() | help: Install `apache-airflow-providers-mysql>=1.0.0` and use `PrestoToMySqlOperator` from `airflow.providers.mysql.transfers.presto_to_mysql` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.mysql_hook import MySqlHook -4 4 | from airflow.operators.presto_to_mysql import ( -5 |- PrestoToMySqlOperator, -6 5 | PrestoToMySqlTransfer, -7 6 | ) - 7 |+from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator -8 8 | -9 9 | MySqlHook() -10 10 | PrestoToMySqlOperator() +2 | +3 | from airflow.hooks.mysql_hook import MySqlHook +4 | from airflow.operators.presto_to_mysql import ( + - PrestoToMySqlOperator, +5 | PrestoToMySqlTransfer, +6 | ) +7 + from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator +8 | +9 | MySqlHook() +10 | PrestoToMySqlOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlTransfer` is moved into `mysql` provider in Airflow 3.0; --> AIR302_mysql.py:11:1 @@ -57,15 +55,14 @@ AIR302 [*] `airflow.operators.presto_to_mysql.PrestoToMySqlTransfer` is moved in | ^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-mysql>=1.0.0` and use `PrestoToMySqlOperator` from `airflow.providers.mysql.transfers.presto_to_mysql` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.mysql_hook import MySqlHook -4 4 | from airflow.operators.presto_to_mysql import ( -5 |- PrestoToMySqlOperator, -6 5 | PrestoToMySqlTransfer, -7 6 | ) - 7 |+from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator -8 8 | -9 9 | MySqlHook() -10 10 | PrestoToMySqlOperator() +2 | +3 | from airflow.hooks.mysql_hook import MySqlHook +4 | from airflow.operators.presto_to_mysql import ( + - PrestoToMySqlOperator, +5 | PrestoToMySqlTransfer, +6 | ) +7 + from airflow.providers.mysql.transfers.presto_to_mysql import PrestoToMySqlOperator +8 | +9 | MySqlHook() +10 | PrestoToMySqlOperator() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap index 8dc85d21cc..fc2e27d763 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_oracle.py.snap @@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.oracle_hook.OracleHook` is moved into `oracle` provide | ^^^^^^^^^^ | help: Install `apache-airflow-providers-oracle>=1.0.0` and use `OracleHook` from `airflow.providers.oracle.hooks.oracle` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.oracle_hook import OracleHook - 3 |+from airflow.providers.oracle.hooks.oracle import OracleHook -4 4 | -5 5 | OracleHook() +1 | from __future__ import annotations +2 | + - from airflow.hooks.oracle_hook import OracleHook +3 + from airflow.providers.oracle.hooks.oracle import OracleHook +4 | +5 | OracleHook() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap index 52fdb8d0c4..6373853d33 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_papermill.py.snap @@ -10,11 +10,10 @@ AIR302 [*] `airflow.operators.papermill_operator.PapermillOperator` is moved int | ^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-papermill>=1.0.0` and use `PapermillOperator` from `airflow.providers.papermill.operators.papermill` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.operators.papermill_operator import PapermillOperator - 3 |+from airflow.providers.papermill.operators.papermill import PapermillOperator -4 4 | -5 5 | PapermillOperator() +1 | from __future__ import annotations +2 | + - from airflow.operators.papermill_operator import PapermillOperator +3 + from airflow.providers.papermill.operators.papermill import PapermillOperator +4 | +5 | PapermillOperator() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap index 7f3d08abfd..51e77b1fa0 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_pig.py.snap @@ -11,16 +11,15 @@ AIR302 [*] `airflow.hooks.pig_hook.PigCliHook` is moved into `apache-pig` provid 7 | PigOperator() | help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `PigCliHook` from `airflow.providers.apache.pig.hooks.pig` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.pig_hook import PigCliHook -4 3 | from airflow.operators.pig_operator import PigOperator - 4 |+from airflow.providers.apache.pig.hooks.pig import PigCliHook -5 5 | -6 6 | PigCliHook() -7 7 | PigOperator() +1 | from __future__ import annotations +2 | + - from airflow.hooks.pig_hook import PigCliHook +3 | from airflow.operators.pig_operator import PigOperator +4 + from airflow.providers.apache.pig.hooks.pig import PigCliHook +5 | +6 | PigCliHook() +7 | PigOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.pig_operator.PigOperator` is moved into `apache-pig` provider in Airflow 3.0; --> AIR302_pig.py:7:1 @@ -30,13 +29,12 @@ AIR302 [*] `airflow.operators.pig_operator.PigOperator` is moved into `apache-pi | ^^^^^^^^^^^ | help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `PigOperator` from `airflow.providers.apache.pig.operators.pig` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.pig_hook import PigCliHook -4 |-from airflow.operators.pig_operator import PigOperator - 4 |+from airflow.providers.apache.pig.operators.pig import PigOperator -5 5 | -6 6 | PigCliHook() -7 7 | PigOperator() +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.pig_hook import PigCliHook + - from airflow.operators.pig_operator import PigOperator +4 + from airflow.providers.apache.pig.operators.pig import PigOperator +5 | +6 | PigCliHook() +7 | PigOperator() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap index a3fc68d859..e2397c6bbe 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_postgres.py.snap @@ -11,16 +11,15 @@ AIR302 [*] `airflow.hooks.postgres_hook.PostgresHook` is moved into `postgres` p 7 | Mapping() | help: Install `apache-airflow-providers-postgres>=1.0.0` and use `PostgresHook` from `airflow.providers.postgres.hooks.postgres` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.postgres_hook import PostgresHook -4 3 | from airflow.operators.postgres_operator import Mapping - 4 |+from airflow.providers.postgres.hooks.postgres import PostgresHook -5 5 | -6 6 | PostgresHook() -7 7 | Mapping() +1 | from __future__ import annotations +2 | + - from airflow.hooks.postgres_hook import PostgresHook +3 | from airflow.operators.postgres_operator import Mapping +4 + from airflow.providers.postgres.hooks.postgres import PostgresHook +5 | +6 | PostgresHook() +7 | Mapping() +note: This is an unsafe fix and may change runtime behavior AIR302 `airflow.operators.postgres_operator.Mapping` is removed in Airflow 3.0 --> AIR302_postgres.py:7:1 diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap index fcf52b13db..9058a08c77 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_presto.py.snap @@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.presto_hook.PrestoHook` is moved into `presto` provide | ^^^^^^^^^^ | help: Install `apache-airflow-providers-presto>=1.0.0` and use `PrestoHook` from `airflow.providers.presto.hooks.presto` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.presto_hook import PrestoHook - 3 |+from airflow.providers.presto.hooks.presto import PrestoHook -4 4 | -5 5 | PrestoHook() +1 | from __future__ import annotations +2 | + - from airflow.hooks.presto_hook import PrestoHook +3 + from airflow.providers.presto.hooks.presto import PrestoHook +4 | +5 | PrestoHook() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap index 715985d795..5ca5ae1c9a 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_samba.py.snap @@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.samba_hook.SambaHook` is moved into `samba` provider i | ^^^^^^^^^ | help: Install `apache-airflow-providers-samba>=1.0.0` and use `SambaHook` from `airflow.providers.samba.hooks.samba` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.samba_hook import SambaHook - 3 |+from airflow.providers.samba.hooks.samba import SambaHook -4 4 | -5 5 | SambaHook() +1 | from __future__ import annotations +2 | + - from airflow.hooks.samba_hook import SambaHook +3 + from airflow.providers.samba.hooks.samba import SambaHook +4 | +5 | SambaHook() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap index 018cc38991..b275aeab0e 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_slack.py.snap @@ -12,16 +12,15 @@ AIR302 [*] `airflow.hooks.slack_hook.SlackHook` is moved into `slack` provider i 8 | SlackAPIPostOperator() | help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackHook` from `airflow.providers.slack.hooks.slack` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.slack_hook import SlackHook -4 3 | from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator - 4 |+from airflow.providers.slack.hooks.slack import SlackHook -5 5 | -6 6 | SlackHook() -7 7 | SlackAPIOperator() +1 | from __future__ import annotations +2 | + - from airflow.hooks.slack_hook import SlackHook +3 | from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator +4 + from airflow.providers.slack.hooks.slack import SlackHook +5 | +6 | SlackHook() +7 | SlackAPIOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.slack_operator.SlackAPIOperator` is moved into `slack` provider in Airflow 3.0; --> AIR302_slack.py:7:1 @@ -32,17 +31,16 @@ AIR302 [*] `airflow.operators.slack_operator.SlackAPIOperator` is moved into `sl 8 | SlackAPIPostOperator() | help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackAPIOperator` from `airflow.providers.slack.operators.slack` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.slack_hook import SlackHook -4 |-from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator - 4 |+from airflow.operators.slack_operator import SlackAPIPostOperator - 5 |+from airflow.providers.slack.operators.slack import SlackAPIOperator -5 6 | -6 7 | SlackHook() -7 8 | SlackAPIOperator() +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.slack_hook import SlackHook + - from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator +4 + from airflow.operators.slack_operator import SlackAPIPostOperator +5 + from airflow.providers.slack.operators.slack import SlackAPIOperator +6 | +7 | SlackHook() +8 | SlackAPIOperator() +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.slack_operator.SlackAPIPostOperator` is moved into `slack` provider in Airflow 3.0; --> AIR302_slack.py:8:1 @@ -53,14 +51,13 @@ AIR302 [*] `airflow.operators.slack_operator.SlackAPIPostOperator` is moved into | ^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackAPIPostOperator` from `airflow.providers.slack.operators.slack` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.slack_hook import SlackHook -4 |-from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator - 4 |+from airflow.operators.slack_operator import SlackAPIOperator - 5 |+from airflow.providers.slack.operators.slack import SlackAPIPostOperator -5 6 | -6 7 | SlackHook() -7 8 | SlackAPIOperator() +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.slack_hook import SlackHook + - from airflow.operators.slack_operator import SlackAPIOperator, SlackAPIPostOperator +4 + from airflow.operators.slack_operator import SlackAPIOperator +5 + from airflow.providers.slack.operators.slack import SlackAPIPostOperator +6 | +7 | SlackHook() +8 | SlackAPIOperator() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap index 14e55dc53c..0103600d16 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_smtp.py.snap @@ -12,15 +12,14 @@ AIR302 [*] `airflow.operators.email_operator.EmailOperator` is moved into `smtp` 7 | from airflow.operators.email import EmailOperator | help: Install `apache-airflow-providers-smtp>=1.0.0` and use `EmailOperator` from `airflow.providers.smtp.operators.smtp` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.operators.email_operator import EmailOperator - 3 |+from airflow.providers.smtp.operators.smtp import EmailOperator -4 4 | -5 5 | EmailOperator() -6 6 | +1 | from __future__ import annotations +2 | + - from airflow.operators.email_operator import EmailOperator +3 + from airflow.providers.smtp.operators.smtp import EmailOperator +4 | +5 | EmailOperator() +6 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.email.EmailOperator` is moved into `smtp` provider in Airflow 3.0; --> AIR302_smtp.py:9:1 @@ -31,12 +30,11 @@ AIR302 [*] `airflow.operators.email.EmailOperator` is moved into `smtp` provider | ^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-smtp>=1.0.0` and use `EmailOperator` from `airflow.providers.smtp.operators.smtp` instead. - -ℹ Unsafe fix -4 4 | -5 5 | EmailOperator() -6 6 | -7 |-from airflow.operators.email import EmailOperator - 7 |+from airflow.providers.smtp.operators.smtp import EmailOperator -8 8 | -9 9 | EmailOperator() +4 | +5 | EmailOperator() +6 | + - from airflow.operators.email import EmailOperator +7 + from airflow.providers.smtp.operators.smtp import EmailOperator +8 | +9 | EmailOperator() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap index 114f5101a3..029ff88d86 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_sqlite.py.snap @@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.sqlite_hook.SqliteHook` is moved into `sqlite` provide | ^^^^^^^^^^ | help: Install `apache-airflow-providers-sqlite>=1.0.0` and use `SqliteHook` from `airflow.providers.sqlite.hooks.sqlite` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.sqlite_hook import SqliteHook - 3 |+from airflow.providers.sqlite.hooks.sqlite import SqliteHook -4 4 | -5 5 | SqliteHook() +1 | from __future__ import annotations +2 | + - from airflow.hooks.sqlite_hook import SqliteHook +3 + from airflow.providers.sqlite.hooks.sqlite import SqliteHook +4 | +5 | SqliteHook() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap index 5b3da4538e..fe0d17fe54 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_standard.py.snap @@ -12,22 +12,21 @@ AIR302 [*] `airflow.operators.bash_operator.BashOperator` is moved into `standar 22 | TriggerDagRunLink() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashOperator` from `airflow.providers.standard.operators.bash` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.operators.bash_operator import BashOperator -4 3 | from airflow.operators.dagrun_operator import ( -5 4 | TriggerDagRunLink, -6 5 | TriggerDagRunOperator, +1 | from __future__ import annotations +2 | + - from airflow.operators.bash_operator import BashOperator +3 | from airflow.operators.dagrun_operator import ( +4 | TriggerDagRunLink, +5 | TriggerDagRunOperator, -------------------------------------------------------------------------------- -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.bash import BashOperator -19 19 | -20 20 | BashOperator() -21 21 | +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.bash import BashOperator +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunLink` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:22:1 @@ -39,23 +38,22 @@ AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunLink` is moved into ` 23 | TriggerDagRunOperator() | help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunLink` from `airflow.providers.standard.operators.trigger_dagrun` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.operators.bash_operator import BashOperator -4 4 | from airflow.operators.dagrun_operator import ( -5 |- TriggerDagRunLink, -6 5 | TriggerDagRunOperator, -7 6 | ) -8 7 | from airflow.operators.latest_only_operator import LatestOnlyOperator +2 | +3 | from airflow.operators.bash_operator import BashOperator +4 | from airflow.operators.dagrun_operator import ( + - TriggerDagRunLink, +5 | TriggerDagRunOperator, +6 | ) +7 | from airflow.operators.latest_only_operator import LatestOnlyOperator -------------------------------------------------------------------------------- -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink -19 19 | -20 20 | BashOperator() -21 21 | +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:23:1 @@ -67,23 +65,22 @@ AIR302 [*] `airflow.operators.dagrun_operator.TriggerDagRunOperator` is moved in 25 | LatestOnlyOperator() | help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunOperator` from `airflow.providers.standard.operators.trigger_dagrun` instead. - -ℹ Unsafe fix -3 3 | from airflow.operators.bash_operator import BashOperator -4 4 | from airflow.operators.dagrun_operator import ( -5 5 | TriggerDagRunLink, -6 |- TriggerDagRunOperator, -7 6 | ) -8 7 | from airflow.operators.latest_only_operator import LatestOnlyOperator -9 8 | from airflow.operators.python_operator import ( +3 | from airflow.operators.bash_operator import BashOperator +4 | from airflow.operators.dagrun_operator import ( +5 | TriggerDagRunLink, + - TriggerDagRunOperator, +6 | ) +7 | from airflow.operators.latest_only_operator import LatestOnlyOperator +8 | from airflow.operators.python_operator import ( -------------------------------------------------------------------------------- -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator -19 19 | -20 20 | BashOperator() -21 21 | +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.latest_only_operator.LatestOnlyOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:25:1 @@ -96,23 +93,22 @@ AIR302 [*] `airflow.operators.latest_only_operator.LatestOnlyOperator` is moved 27 | BranchPythonOperator() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `LatestOnlyOperator` from `airflow.providers.standard.operators.latest_only` instead. - -ℹ Unsafe fix -5 5 | TriggerDagRunLink, -6 6 | TriggerDagRunOperator, -7 7 | ) -8 |-from airflow.operators.latest_only_operator import LatestOnlyOperator -9 8 | from airflow.operators.python_operator import ( -10 9 | BranchPythonOperator, -11 10 | PythonOperator, +5 | TriggerDagRunLink, +6 | TriggerDagRunOperator, +7 | ) + - from airflow.operators.latest_only_operator import LatestOnlyOperator +8 | from airflow.operators.python_operator import ( +9 | BranchPythonOperator, +10 | PythonOperator, -------------------------------------------------------------------------------- -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.latest_only import LatestOnlyOperator -19 19 | -20 20 | BashOperator() -21 21 | +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.latest_only import LatestOnlyOperator +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.python_operator.BranchPythonOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:27:1 @@ -125,23 +121,22 @@ AIR302 [*] `airflow.operators.python_operator.BranchPythonOperator` is moved int 29 | PythonVirtualenvOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -7 7 | ) -8 8 | from airflow.operators.latest_only_operator import LatestOnlyOperator -9 9 | from airflow.operators.python_operator import ( -10 |- BranchPythonOperator, -11 10 | PythonOperator, -12 11 | PythonVirtualenvOperator, -13 12 | ShortCircuitOperator, +7 | ) +8 | from airflow.operators.latest_only_operator import LatestOnlyOperator +9 | from airflow.operators.python_operator import ( + - BranchPythonOperator, +10 | PythonOperator, +11 | PythonVirtualenvOperator, +12 | ShortCircuitOperator, -------------------------------------------------------------------------------- -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.python import BranchPythonOperator -19 19 | -20 20 | BashOperator() -21 21 | +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.python import BranchPythonOperator +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.python_operator.PythonOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:28:1 @@ -153,23 +148,22 @@ AIR302 [*] `airflow.operators.python_operator.PythonOperator` is moved into `sta 30 | ShortCircuitOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -8 8 | from airflow.operators.latest_only_operator import LatestOnlyOperator -9 9 | from airflow.operators.python_operator import ( -10 10 | BranchPythonOperator, -11 |- PythonOperator, -12 11 | PythonVirtualenvOperator, -13 12 | ShortCircuitOperator, -14 13 | ) +8 | from airflow.operators.latest_only_operator import LatestOnlyOperator +9 | from airflow.operators.python_operator import ( +10 | BranchPythonOperator, + - PythonOperator, +11 | PythonVirtualenvOperator, +12 | ShortCircuitOperator, +13 | ) -------------------------------------------------------------------------------- -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.python import PythonOperator -19 19 | -20 20 | BashOperator() -21 21 | +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.python import PythonOperator +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.python_operator.PythonVirtualenvOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:29:1 @@ -181,22 +175,21 @@ AIR302 [*] `airflow.operators.python_operator.PythonVirtualenvOperator` is moved 30 | ShortCircuitOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -9 9 | from airflow.operators.python_operator import ( -10 10 | BranchPythonOperator, -11 11 | PythonOperator, -12 |- PythonVirtualenvOperator, -13 12 | ShortCircuitOperator, -14 13 | ) -15 14 | from airflow.sensors.external_task_sensor import ( -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.python import PythonVirtualenvOperator -19 19 | -20 20 | BashOperator() -21 21 | +9 | from airflow.operators.python_operator import ( +10 | BranchPythonOperator, +11 | PythonOperator, + - PythonVirtualenvOperator, +12 | ShortCircuitOperator, +13 | ) +14 | from airflow.sensors.external_task_sensor import ( +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.python import PythonVirtualenvOperator +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.python_operator.ShortCircuitOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:30:1 @@ -209,21 +202,20 @@ AIR302 [*] `airflow.operators.python_operator.ShortCircuitOperator` is moved int 32 | ExternalTaskMarker() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -10 10 | BranchPythonOperator, -11 11 | PythonOperator, -12 12 | PythonVirtualenvOperator, -13 |- ShortCircuitOperator, -14 13 | ) -15 14 | from airflow.sensors.external_task_sensor import ( -16 15 | ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.operators.python import ShortCircuitOperator -19 19 | -20 20 | BashOperator() -21 21 | +10 | BranchPythonOperator, +11 | PythonOperator, +12 | PythonVirtualenvOperator, + - ShortCircuitOperator, +13 | ) +14 | from airflow.sensors.external_task_sensor import ( +15 | ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.operators.python import ShortCircuitOperator +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskMarker` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:32:1 @@ -235,18 +227,17 @@ AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskMarker` is moved in 33 | ExternalTaskSensor() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskMarker` from `airflow.providers.standard.sensors.external_task` instead. - -ℹ Unsafe fix -13 13 | ShortCircuitOperator, -14 14 | ) -15 15 | from airflow.sensors.external_task_sensor import ( -16 |- ExternalTaskMarker, -17 16 | ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.sensors.external_task import ExternalTaskMarker -19 19 | -20 20 | BashOperator() -21 21 | +13 | ShortCircuitOperator, +14 | ) +15 | from airflow.sensors.external_task_sensor import ( + - ExternalTaskMarker, +16 | ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.sensors.external_task import ExternalTaskMarker +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensor` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:33:1 @@ -256,17 +247,16 @@ AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensor` is moved in | ^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensor` from `airflow.providers.standard.sensors.external_task` instead. - -ℹ Unsafe fix -14 14 | ) -15 15 | from airflow.sensors.external_task_sensor import ( -16 16 | ExternalTaskMarker, -17 |- ExternalTaskSensor, -18 17 | ) - 18 |+from airflow.providers.standard.sensors.external_task import ExternalTaskSensor -19 19 | -20 20 | BashOperator() -21 21 | +14 | ) +15 | from airflow.sensors.external_task_sensor import ( +16 | ExternalTaskMarker, + - ExternalTaskSensor, +17 | ) +18 + from airflow.providers.standard.sensors.external_task import ExternalTaskSensor +19 | +20 | BashOperator() +21 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.subprocess.SubprocessResult` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:38:1 @@ -279,16 +269,15 @@ AIR302 [*] `airflow.hooks.subprocess.SubprocessResult` is moved into `standard` 40 | from airflow.hooks.subprocess import working_directory | help: Install `apache-airflow-providers-standard>=0.0.3` and use `SubprocessResult` from `airflow.providers.standard.hooks.subprocess` instead. - -ℹ Unsafe fix -33 33 | ExternalTaskSensor() -34 34 | -35 35 | -36 |-from airflow.hooks.subprocess import SubprocessResult - 36 |+from airflow.providers.standard.hooks.subprocess import SubprocessResult -37 37 | -38 38 | SubprocessResult() -39 39 | +33 | ExternalTaskSensor() +34 | +35 | + - from airflow.hooks.subprocess import SubprocessResult +36 + from airflow.providers.standard.hooks.subprocess import SubprocessResult +37 | +38 | SubprocessResult() +39 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.hooks.subprocess.working_directory` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:42:1 @@ -301,16 +290,15 @@ AIR302 [*] `airflow.hooks.subprocess.working_directory` is moved into `standard` 44 | from airflow.operators.datetime import target_times_as_dates | help: Install `apache-airflow-providers-standard>=0.0.3` and use `working_directory` from `airflow.providers.standard.hooks.subprocess` instead. - -ℹ Unsafe fix -37 37 | -38 38 | SubprocessResult() -39 39 | -40 |-from airflow.hooks.subprocess import working_directory - 40 |+from airflow.providers.standard.hooks.subprocess import working_directory -41 41 | -42 42 | working_directory() -43 43 | +37 | +38 | SubprocessResult() +39 | + - from airflow.hooks.subprocess import working_directory +40 + from airflow.providers.standard.hooks.subprocess import working_directory +41 | +42 | working_directory() +43 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.datetime.target_times_as_dates` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:46:1 @@ -323,16 +311,15 @@ AIR302 [*] `airflow.operators.datetime.target_times_as_dates` is moved into `sta 48 | from airflow.operators.trigger_dagrun import TriggerDagRunLink | help: Install `apache-airflow-providers-standard>=0.0.1` and use `target_times_as_dates` from `airflow.providers.standard.operators.datetime` instead. - -ℹ Unsafe fix -41 41 | -42 42 | working_directory() -43 43 | -44 |-from airflow.operators.datetime import target_times_as_dates - 44 |+from airflow.providers.standard.operators.datetime import target_times_as_dates -45 45 | -46 46 | target_times_as_dates() -47 47 | +41 | +42 | working_directory() +43 | + - from airflow.operators.datetime import target_times_as_dates +44 + from airflow.providers.standard.operators.datetime import target_times_as_dates +45 | +46 | target_times_as_dates() +47 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.trigger_dagrun.TriggerDagRunLink` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:50:1 @@ -345,16 +332,15 @@ AIR302 [*] `airflow.operators.trigger_dagrun.TriggerDagRunLink` is moved into `s 52 | from airflow.sensors.external_task import ExternalTaskSensorLink | help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunLink` from `airflow.providers.standard.operators.trigger_dagrun` instead. - -ℹ Unsafe fix -45 45 | -46 46 | target_times_as_dates() -47 47 | -48 |-from airflow.operators.trigger_dagrun import TriggerDagRunLink - 48 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink -49 49 | -50 50 | TriggerDagRunLink() -51 51 | +45 | +46 | target_times_as_dates() +47 | + - from airflow.operators.trigger_dagrun import TriggerDagRunLink +48 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunLink +49 | +50 | TriggerDagRunLink() +51 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.external_task.ExternalTaskSensorLink` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:54:1 @@ -367,18 +353,16 @@ AIR302 [*] `airflow.sensors.external_task.ExternalTaskSensorLink` is moved into 56 | from airflow.sensors.time_delta import WaitSensor | help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalDagLink` from `airflow.providers.standard.sensors.external_task` instead. - -ℹ Safe fix -50 50 | TriggerDagRunLink() -51 51 | -52 52 | from airflow.sensors.external_task import ExternalTaskSensorLink - 53 |+from airflow.providers.standard.sensors.external_task import ExternalDagLink -53 54 | -54 |-ExternalTaskSensorLink() - 55 |+ExternalDagLink() -55 56 | -56 57 | from airflow.sensors.time_delta import WaitSensor -57 58 | +50 | TriggerDagRunLink() +51 | +52 | from airflow.sensors.external_task import ExternalTaskSensorLink +53 + from airflow.providers.standard.sensors.external_task import ExternalDagLink +54 | + - ExternalTaskSensorLink() +55 + ExternalDagLink() +56 | +57 | from airflow.sensors.time_delta import WaitSensor +58 | AIR302 [*] `airflow.sensors.time_delta.WaitSensor` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:58:1 @@ -391,16 +375,15 @@ AIR302 [*] `airflow.sensors.time_delta.WaitSensor` is moved into `standard` prov 60 | from airflow.operators.dummy import DummyOperator | help: Install `apache-airflow-providers-standard>=0.0.1` and use `WaitSensor` from `airflow.providers.standard.sensors.time_delta` instead. - -ℹ Unsafe fix -53 53 | -54 54 | ExternalTaskSensorLink() -55 55 | -56 |-from airflow.sensors.time_delta import WaitSensor - 56 |+from airflow.providers.standard.sensors.time_delta import WaitSensor -57 57 | -58 58 | WaitSensor() -59 59 | +53 | +54 | ExternalTaskSensorLink() +55 | + - from airflow.sensors.time_delta import WaitSensor +56 + from airflow.providers.standard.sensors.time_delta import WaitSensor +57 | +58 | WaitSensor() +59 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.dummy.DummyOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:62:1 @@ -413,18 +396,16 @@ AIR302 [*] `airflow.operators.dummy.DummyOperator` is moved into `standard` prov 64 | from airflow.operators.dummy import EmptyOperator | help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead. - -ℹ Safe fix -58 58 | WaitSensor() -59 59 | -60 60 | from airflow.operators.dummy import DummyOperator - 61 |+from airflow.providers.standard.operators.empty import EmptyOperator -61 62 | -62 |-DummyOperator() - 63 |+EmptyOperator() -63 64 | -64 65 | from airflow.operators.dummy import EmptyOperator -65 66 | +58 | WaitSensor() +59 | +60 | from airflow.operators.dummy import DummyOperator +61 + from airflow.providers.standard.operators.empty import EmptyOperator +62 | + - DummyOperator() +63 + EmptyOperator() +64 | +65 | from airflow.operators.dummy import EmptyOperator +66 | AIR302 [*] `airflow.operators.dummy.EmptyOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:66:1 @@ -437,16 +418,15 @@ AIR302 [*] `airflow.operators.dummy.EmptyOperator` is moved into `standard` prov 68 | from airflow.operators.dummy_operator import DummyOperator | help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead. - -ℹ Unsafe fix -61 61 | -62 62 | DummyOperator() -63 63 | -64 |-from airflow.operators.dummy import EmptyOperator - 64 |+from airflow.providers.standard.operators.empty import EmptyOperator -65 65 | -66 66 | EmptyOperator() -67 67 | +61 | +62 | DummyOperator() +63 | + - from airflow.operators.dummy import EmptyOperator +64 + from airflow.providers.standard.operators.empty import EmptyOperator +65 | +66 | EmptyOperator() +67 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.dummy_operator.DummyOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:70:1 @@ -459,15 +439,14 @@ AIR302 [*] `airflow.operators.dummy_operator.DummyOperator` is moved into `stand 72 | from airflow.operators.dummy_operator import EmptyOperator | help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead. - -ℹ Unsafe fix -66 66 | EmptyOperator() -67 67 | -68 68 | from airflow.operators.dummy_operator import DummyOperator - 69 |+from airflow.providers.standard.operators.empty import EmptyOperator -69 70 | -70 71 | DummyOperator() -71 72 | +66 | EmptyOperator() +67 | +68 | from airflow.operators.dummy_operator import DummyOperator +69 + from airflow.providers.standard.operators.empty import EmptyOperator +70 | +71 | DummyOperator() +72 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.operators.dummy_operator.EmptyOperator` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:74:1 @@ -480,16 +459,15 @@ AIR302 [*] `airflow.operators.dummy_operator.EmptyOperator` is moved into `stand 76 | from airflow.sensors.external_task_sensor import ExternalTaskSensorLink | help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead. - -ℹ Unsafe fix -69 69 | -70 70 | DummyOperator() -71 71 | -72 |-from airflow.operators.dummy_operator import EmptyOperator - 72 |+from airflow.providers.standard.operators.empty import EmptyOperator -73 73 | -74 74 | EmptyOperator() -75 75 | +69 | +70 | DummyOperator() +71 | + - from airflow.operators.dummy_operator import EmptyOperator +72 + from airflow.providers.standard.operators.empty import EmptyOperator +73 | +74 | EmptyOperator() +75 | +note: This is an unsafe fix and may change runtime behavior AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensorLink` is moved into `standard` provider in Airflow 3.0; --> AIR302_standard.py:78:1 @@ -500,12 +478,10 @@ AIR302 [*] `airflow.sensors.external_task_sensor.ExternalTaskSensorLink` is move | ^^^^^^^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalDagLink` from `airflow.providers.standard.sensors.external_task` instead. - -ℹ Safe fix -74 74 | EmptyOperator() -75 75 | -76 76 | from airflow.sensors.external_task_sensor import ExternalTaskSensorLink - 77 |+from airflow.providers.standard.sensors.external_task import ExternalDagLink -77 78 | -78 |-ExternalTaskSensorLink() - 79 |+ExternalDagLink() +74 | EmptyOperator() +75 | +76 | from airflow.sensors.external_task_sensor import ExternalTaskSensorLink +77 + from airflow.providers.standard.sensors.external_task import ExternalDagLink +78 | + - ExternalTaskSensorLink() +79 + ExternalDagLink() diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap index c6213da3a5..746c5f28b9 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR302_AIR302_zendesk.py.snap @@ -10,11 +10,10 @@ AIR302 [*] `airflow.hooks.zendesk_hook.ZendeskHook` is moved into `zendesk` prov | ^^^^^^^^^^^ | help: Install `apache-airflow-providers-zendesk>=1.0.0` and use `ZendeskHook` from `airflow.providers.zendesk.hooks.zendesk` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.zendesk_hook import ZendeskHook - 3 |+from airflow.providers.zendesk.hooks.zendesk import ZendeskHook -4 4 | -5 5 | ZendeskHook() +1 | from __future__ import annotations +2 | + - from airflow.hooks.zendesk_hook import ZendeskHook +3 + from airflow.providers.zendesk.hooks.zendesk import ZendeskHook +4 | +5 | ZendeskHook() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap index 5db2299127..3fcbf77530 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap @@ -11,19 +11,17 @@ AIR311 [*] `airflow.Dataset` is removed in Airflow 3.0; It still works in Airflo 22 | # airflow.datasets | help: Use `Asset` from `airflow.sdk` instead. - -ℹ Safe fix -15 15 | task, -16 16 | task_group, -17 17 | ) - 18 |+from airflow.sdk import Asset -18 19 | -19 20 | # airflow -20 |-DatasetFromRoot() - 21 |+Asset() -21 22 | -22 23 | # airflow.datasets -23 24 | Dataset() +15 | task, +16 | task_group, +17 | ) +18 + from airflow.sdk import Asset +19 | +20 | # airflow + - DatasetFromRoot() +21 + Asset() +22 | +23 | # airflow.datasets +24 | Dataset() AIR311 [*] `airflow.datasets.Dataset` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:23:1 @@ -35,22 +33,20 @@ AIR311 [*] `airflow.datasets.Dataset` is removed in Airflow 3.0; It still works 25 | DatasetAll() | help: Use `Asset` from `airflow.sdk` instead. - -ℹ Safe fix -15 15 | task, -16 16 | task_group, -17 17 | ) - 18 |+from airflow.sdk import Asset -18 19 | -19 20 | # airflow -20 21 | DatasetFromRoot() -21 22 | -22 23 | # airflow.datasets -23 |-Dataset() - 24 |+Asset() -24 25 | DatasetAlias() -25 26 | DatasetAll() -26 27 | DatasetAny() +15 | task, +16 | task_group, +17 | ) +18 + from airflow.sdk import Asset +19 | +20 | # airflow +21 | DatasetFromRoot() +22 | +23 | # airflow.datasets + - Dataset() +24 + Asset() +25 | DatasetAlias() +26 | DatasetAll() +27 | DatasetAny() AIR311 [*] `airflow.datasets.DatasetAlias` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:24:1 @@ -63,23 +59,21 @@ AIR311 [*] `airflow.datasets.DatasetAlias` is removed in Airflow 3.0; It still w 26 | DatasetAny() | help: Use `AssetAlias` from `airflow.sdk` instead. - -ℹ Safe fix -15 15 | task, -16 16 | task_group, -17 17 | ) - 18 |+from airflow.sdk import AssetAlias -18 19 | -19 20 | # airflow -20 21 | DatasetFromRoot() -21 22 | -22 23 | # airflow.datasets -23 24 | Dataset() -24 |-DatasetAlias() - 25 |+AssetAlias() -25 26 | DatasetAll() -26 27 | DatasetAny() -27 28 | Metadata() +15 | task, +16 | task_group, +17 | ) +18 + from airflow.sdk import AssetAlias +19 | +20 | # airflow +21 | DatasetFromRoot() +22 | +23 | # airflow.datasets +24 | Dataset() + - DatasetAlias() +25 + AssetAlias() +26 | DatasetAll() +27 | DatasetAny() +28 | Metadata() AIR311 [*] `airflow.datasets.DatasetAll` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:25:1 @@ -92,24 +86,22 @@ AIR311 [*] `airflow.datasets.DatasetAll` is removed in Airflow 3.0; It still wor 27 | Metadata() | help: Use `AssetAll` from `airflow.sdk` instead. - -ℹ Safe fix -15 15 | task, -16 16 | task_group, -17 17 | ) - 18 |+from airflow.sdk import AssetAll -18 19 | -19 20 | # airflow -20 21 | DatasetFromRoot() +15 | task, +16 | task_group, +17 | ) +18 + from airflow.sdk import AssetAll +19 | +20 | # airflow +21 | DatasetFromRoot() -------------------------------------------------------------------------------- -22 23 | # airflow.datasets -23 24 | Dataset() -24 25 | DatasetAlias() -25 |-DatasetAll() - 26 |+AssetAll() -26 27 | DatasetAny() -27 28 | Metadata() -28 29 | expand_alias_to_datasets() +23 | # airflow.datasets +24 | Dataset() +25 | DatasetAlias() + - DatasetAll() +26 + AssetAll() +27 | DatasetAny() +28 | Metadata() +29 | expand_alias_to_datasets() AIR311 [*] `airflow.datasets.DatasetAny` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:26:1 @@ -122,24 +114,22 @@ AIR311 [*] `airflow.datasets.DatasetAny` is removed in Airflow 3.0; It still wor 28 | expand_alias_to_datasets() | help: Use `AssetAny` from `airflow.sdk` instead. - -ℹ Safe fix -15 15 | task, -16 16 | task_group, -17 17 | ) - 18 |+from airflow.sdk import AssetAny -18 19 | -19 20 | # airflow -20 21 | DatasetFromRoot() +15 | task, +16 | task_group, +17 | ) +18 + from airflow.sdk import AssetAny +19 | +20 | # airflow +21 | DatasetFromRoot() -------------------------------------------------------------------------------- -23 24 | Dataset() -24 25 | DatasetAlias() -25 26 | DatasetAll() -26 |-DatasetAny() - 27 |+AssetAny() -27 28 | Metadata() -28 29 | expand_alias_to_datasets() -29 30 | +24 | Dataset() +25 | DatasetAlias() +26 | DatasetAll() + - DatasetAny() +27 + AssetAny() +28 | Metadata() +29 | expand_alias_to_datasets() +30 | AIR311 [*] `airflow.datasets.metadata.Metadata` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:27:1 @@ -151,22 +141,21 @@ AIR311 [*] `airflow.datasets.metadata.Metadata` is removed in Airflow 3.0; It st 28 | expand_alias_to_datasets() | help: Use `Metadata` from `airflow.sdk` instead. - -ℹ Unsafe fix -8 8 | DatasetAny, -9 9 | expand_alias_to_datasets, -10 10 | ) -11 |-from airflow.datasets.metadata import Metadata -12 11 | from airflow.decorators import ( -13 12 | dag, -14 13 | setup, -15 14 | task, -16 15 | task_group, -17 16 | ) - 17 |+from airflow.sdk import Metadata -18 18 | -19 19 | # airflow -20 20 | DatasetFromRoot() +8 | DatasetAny, +9 | expand_alias_to_datasets, +10 | ) + - from airflow.datasets.metadata import Metadata +11 | from airflow.decorators import ( +12 | dag, +13 | setup, +14 | task, +15 | task_group, +16 | ) +17 + from airflow.sdk import Metadata +18 | +19 | # airflow +20 | DatasetFromRoot() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.datasets.expand_alias_to_datasets` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:28:1 @@ -179,24 +168,22 @@ AIR311 [*] `airflow.datasets.expand_alias_to_datasets` is removed in Airflow 3.0 30 | # airflow.decorators | help: Use `expand_alias_to_assets` from `airflow.models.asset` instead. - -ℹ Safe fix -15 15 | task, -16 16 | task_group, -17 17 | ) - 18 |+from airflow.models.asset import expand_alias_to_assets -18 19 | -19 20 | # airflow -20 21 | DatasetFromRoot() +15 | task, +16 | task_group, +17 | ) +18 + from airflow.models.asset import expand_alias_to_assets +19 | +20 | # airflow +21 | DatasetFromRoot() -------------------------------------------------------------------------------- -25 26 | DatasetAll() -26 27 | DatasetAny() -27 28 | Metadata() -28 |-expand_alias_to_datasets() - 29 |+expand_alias_to_assets() -29 30 | -30 31 | # airflow.decorators -31 32 | dag() +26 | DatasetAll() +27 | DatasetAny() +28 | Metadata() + - expand_alias_to_datasets() +29 + expand_alias_to_assets() +30 | +31 | # airflow.decorators +32 | dag() AIR311 [*] `airflow.decorators.dag` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:31:1 @@ -208,20 +195,19 @@ AIR311 [*] `airflow.decorators.dag` is removed in Airflow 3.0; It still works in 33 | task_group() | help: Use `dag` from `airflow.sdk` instead. - -ℹ Unsafe fix -10 10 | ) -11 11 | from airflow.datasets.metadata import Metadata -12 12 | from airflow.decorators import ( -13 |- dag, -14 13 | setup, -15 14 | task, -16 15 | task_group, -17 16 | ) - 17 |+from airflow.sdk import dag -18 18 | -19 19 | # airflow -20 20 | DatasetFromRoot() +10 | ) +11 | from airflow.datasets.metadata import Metadata +12 | from airflow.decorators import ( + - dag, +13 | setup, +14 | task, +15 | task_group, +16 | ) +17 + from airflow.sdk import dag +18 | +19 | # airflow +20 | DatasetFromRoot() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.task` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:32:1 @@ -234,18 +220,17 @@ AIR311 [*] `airflow.decorators.task` is removed in Airflow 3.0; It still works i 34 | setup() | help: Use `task` from `airflow.sdk` instead. - -ℹ Unsafe fix -12 12 | from airflow.decorators import ( -13 13 | dag, -14 14 | setup, -15 |- task, -16 15 | task_group, -17 16 | ) - 17 |+from airflow.sdk import task -18 18 | -19 19 | # airflow -20 20 | DatasetFromRoot() +12 | from airflow.decorators import ( +13 | dag, +14 | setup, + - task, +15 | task_group, +16 | ) +17 + from airflow.sdk import task +18 | +19 | # airflow +20 | DatasetFromRoot() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.task_group` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:33:1 @@ -258,17 +243,16 @@ AIR311 [*] `airflow.decorators.task_group` is removed in Airflow 3.0; It still w 35 | from airflow.decorators import teardown | help: Use `task_group` from `airflow.sdk` instead. - -ℹ Unsafe fix -13 13 | dag, -14 14 | setup, -15 15 | task, -16 |- task_group, -17 16 | ) - 17 |+from airflow.sdk import task_group -18 18 | -19 19 | # airflow -20 20 | DatasetFromRoot() +13 | dag, +14 | setup, +15 | task, + - task_group, +16 | ) +17 + from airflow.sdk import task_group +18 | +19 | # airflow +20 | DatasetFromRoot() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.setup` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:34:1 @@ -281,19 +265,18 @@ AIR311 [*] `airflow.decorators.setup` is removed in Airflow 3.0; It still works 36 | from airflow.io.path import ObjectStoragePath | help: Use `setup` from `airflow.sdk` instead. - -ℹ Unsafe fix -11 11 | from airflow.datasets.metadata import Metadata -12 12 | from airflow.decorators import ( -13 13 | dag, -14 |- setup, -15 14 | task, -16 15 | task_group, -17 16 | ) - 17 |+from airflow.sdk import setup -18 18 | -19 19 | # airflow -20 20 | DatasetFromRoot() +11 | from airflow.datasets.metadata import Metadata +12 | from airflow.decorators import ( +13 | dag, + - setup, +14 | task, +15 | task_group, +16 | ) +17 + from airflow.sdk import setup +18 | +19 | # airflow +20 | DatasetFromRoot() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.teardown` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:48:1 @@ -305,23 +288,22 @@ AIR311 [*] `airflow.decorators.teardown` is removed in Airflow 3.0; It still wor 50 | # # airflow.io | help: Use `teardown` from `airflow.sdk` instead. - -ℹ Unsafe fix -32 32 | task() -33 33 | task_group() -34 34 | setup() -35 |-from airflow.decorators import teardown -36 35 | from airflow.io.path import ObjectStoragePath -37 36 | from airflow.io.store import attach -38 37 | from airflow.models import DAG as DAGFromModel +32 | task() +33 | task_group() +34 | setup() + - from airflow.decorators import teardown +35 | from airflow.io.path import ObjectStoragePath +36 | from airflow.io.store import attach +37 | from airflow.models import DAG as DAGFromModel -------------------------------------------------------------------------------- -43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 44 | from airflow.models.dag import DAG as DAGFromDag - 45 |+from airflow.sdk import teardown -46 46 | -47 47 | # airflow.decorators -48 48 | teardown() +42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 | from airflow.models.baseoperatorlink import BaseOperatorLink +44 | from airflow.models.dag import DAG as DAGFromDag +45 + from airflow.sdk import teardown +46 | +47 | # airflow.decorators +48 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.io.path.ObjectStoragePath` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:51:1 @@ -332,23 +314,22 @@ AIR311 [*] `airflow.io.path.ObjectStoragePath` is removed in Airflow 3.0; It sti 52 | attach() | help: Use `ObjectStoragePath` from `airflow.sdk` instead. - -ℹ Unsafe fix -33 33 | task_group() -34 34 | setup() -35 35 | from airflow.decorators import teardown -36 |-from airflow.io.path import ObjectStoragePath -37 36 | from airflow.io.store import attach -38 37 | from airflow.models import DAG as DAGFromModel -39 38 | from airflow.models import ( +33 | task_group() +34 | setup() +35 | from airflow.decorators import teardown + - from airflow.io.path import ObjectStoragePath +36 | from airflow.io.store import attach +37 | from airflow.models import DAG as DAGFromModel +38 | from airflow.models import ( -------------------------------------------------------------------------------- -43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 44 | from airflow.models.dag import DAG as DAGFromDag - 45 |+from airflow.sdk import ObjectStoragePath -46 46 | -47 47 | # airflow.decorators -48 48 | teardown() +42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 | from airflow.models.baseoperatorlink import BaseOperatorLink +44 | from airflow.models.dag import DAG as DAGFromDag +45 + from airflow.sdk import ObjectStoragePath +46 | +47 | # airflow.decorators +48 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.io.store.attach` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:52:1 @@ -361,23 +342,22 @@ AIR311 [*] `airflow.io.store.attach` is removed in Airflow 3.0; It still works i 54 | # airflow.models | help: Use `attach` from `airflow.sdk.io` instead. - -ℹ Unsafe fix -34 34 | setup() -35 35 | from airflow.decorators import teardown -36 36 | from airflow.io.path import ObjectStoragePath -37 |-from airflow.io.store import attach -38 37 | from airflow.models import DAG as DAGFromModel -39 38 | from airflow.models import ( -40 39 | Connection, +34 | setup() +35 | from airflow.decorators import teardown +36 | from airflow.io.path import ObjectStoragePath + - from airflow.io.store import attach +37 | from airflow.models import DAG as DAGFromModel +38 | from airflow.models import ( +39 | Connection, -------------------------------------------------------------------------------- -43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 44 | from airflow.models.dag import DAG as DAGFromDag - 45 |+from airflow.sdk.io import attach -46 46 | -47 47 | # airflow.decorators -48 48 | teardown() +42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 | from airflow.models.baseoperatorlink import BaseOperatorLink +44 | from airflow.models.dag import DAG as DAGFromDag +45 + from airflow.sdk.io import attach +46 | +47 | # airflow.decorators +48 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.Connection` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:55:1 @@ -389,21 +369,20 @@ AIR311 [*] `airflow.models.Connection` is removed in Airflow 3.0; It still works 57 | Variable() | help: Use `Connection` from `airflow.sdk` instead. - -ℹ Unsafe fix -37 37 | from airflow.io.store import attach -38 38 | from airflow.models import DAG as DAGFromModel -39 39 | from airflow.models import ( -40 |- Connection, -41 40 | Variable, -42 41 | ) -43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 44 | from airflow.models.dag import DAG as DAGFromDag - 45 |+from airflow.sdk import Connection -46 46 | -47 47 | # airflow.decorators -48 48 | teardown() +37 | from airflow.io.store import attach +38 | from airflow.models import DAG as DAGFromModel +39 | from airflow.models import ( + - Connection, +40 | Variable, +41 | ) +42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 | from airflow.models.baseoperatorlink import BaseOperatorLink +44 | from airflow.models.dag import DAG as DAGFromDag +45 + from airflow.sdk import Connection +46 | +47 | # airflow.decorators +48 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.DAG` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:56:1 @@ -415,24 +394,22 @@ AIR311 [*] `airflow.models.DAG` is removed in Airflow 3.0; It still works in Air 57 | Variable() | help: Use `DAG` from `airflow.sdk` instead. - -ℹ Safe fix -43 43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 45 | from airflow.models.dag import DAG as DAGFromDag - 46 |+from airflow.sdk import DAG -46 47 | -47 48 | # airflow.decorators -48 49 | teardown() +43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream +44 | from airflow.models.baseoperatorlink import BaseOperatorLink +45 | from airflow.models.dag import DAG as DAGFromDag +46 + from airflow.sdk import DAG +47 | +48 | # airflow.decorators +49 | teardown() -------------------------------------------------------------------------------- -53 54 | -54 55 | # airflow.models -55 56 | Connection() -56 |-DAGFromModel() - 57 |+DAG() -57 58 | Variable() -58 59 | -59 60 | # airflow.models.baseoperator +54 | +55 | # airflow.models +56 | Connection() + - DAGFromModel() +57 + DAG() +58 | Variable() +59 | +60 | # airflow.models.baseoperator AIR311 [*] `airflow.models.Variable` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:57:1 @@ -445,20 +422,19 @@ AIR311 [*] `airflow.models.Variable` is removed in Airflow 3.0; It still works i 59 | # airflow.models.baseoperator | help: Use `Variable` from `airflow.sdk` instead. - -ℹ Unsafe fix -38 38 | from airflow.models import DAG as DAGFromModel -39 39 | from airflow.models import ( -40 40 | Connection, -41 |- Variable, -42 41 | ) -43 42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 43 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 44 | from airflow.models.dag import DAG as DAGFromDag - 45 |+from airflow.sdk import Variable -46 46 | -47 47 | # airflow.decorators -48 48 | teardown() +38 | from airflow.models import DAG as DAGFromModel +39 | from airflow.models import ( +40 | Connection, + - Variable, +41 | ) +42 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 | from airflow.models.baseoperatorlink import BaseOperatorLink +44 | from airflow.models.dag import DAG as DAGFromDag +45 + from airflow.sdk import Variable +46 | +47 | # airflow.decorators +48 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.baseoperator.chain` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:60:1 @@ -470,19 +446,18 @@ AIR311 [*] `airflow.models.baseoperator.chain` is removed in Airflow 3.0; It sti 62 | cross_downstream() | help: Use `chain` from `airflow.sdk` instead. - -ℹ Unsafe fix -40 40 | Connection, -41 41 | Variable, -42 42 | ) -43 |-from airflow.models.baseoperator import chain, chain_linear, cross_downstream - 43 |+from airflow.models.baseoperator import chain_linear, cross_downstream -44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 45 | from airflow.models.dag import DAG as DAGFromDag - 46 |+from airflow.sdk import chain -46 47 | -47 48 | # airflow.decorators -48 49 | teardown() +40 | Connection, +41 | Variable, +42 | ) + - from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 + from airflow.models.baseoperator import chain_linear, cross_downstream +44 | from airflow.models.baseoperatorlink import BaseOperatorLink +45 | from airflow.models.dag import DAG as DAGFromDag +46 + from airflow.sdk import chain +47 | +48 | # airflow.decorators +49 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.baseoperator.chain_linear` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:61:1 @@ -494,19 +469,18 @@ AIR311 [*] `airflow.models.baseoperator.chain_linear` is removed in Airflow 3.0; 62 | cross_downstream() | help: Use `chain_linear` from `airflow.sdk` instead. - -ℹ Unsafe fix -40 40 | Connection, -41 41 | Variable, -42 42 | ) -43 |-from airflow.models.baseoperator import chain, chain_linear, cross_downstream - 43 |+from airflow.models.baseoperator import chain, cross_downstream -44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 45 | from airflow.models.dag import DAG as DAGFromDag - 46 |+from airflow.sdk import chain_linear -46 47 | -47 48 | # airflow.decorators -48 49 | teardown() +40 | Connection, +41 | Variable, +42 | ) + - from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 + from airflow.models.baseoperator import chain, cross_downstream +44 | from airflow.models.baseoperatorlink import BaseOperatorLink +45 | from airflow.models.dag import DAG as DAGFromDag +46 + from airflow.sdk import chain_linear +47 | +48 | # airflow.decorators +49 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.baseoperator.cross_downstream` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:62:1 @@ -519,19 +493,18 @@ AIR311 [*] `airflow.models.baseoperator.cross_downstream` is removed in Airflow 64 | # airflow.models.baseoperatolinker | help: Use `cross_downstream` from `airflow.sdk` instead. - -ℹ Unsafe fix -40 40 | Connection, -41 41 | Variable, -42 42 | ) -43 |-from airflow.models.baseoperator import chain, chain_linear, cross_downstream - 43 |+from airflow.models.baseoperator import chain, chain_linear -44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 45 | from airflow.models.dag import DAG as DAGFromDag - 46 |+from airflow.sdk import cross_downstream -46 47 | -47 48 | # airflow.decorators -48 49 | teardown() +40 | Connection, +41 | Variable, +42 | ) + - from airflow.models.baseoperator import chain, chain_linear, cross_downstream +43 + from airflow.models.baseoperator import chain, chain_linear +44 | from airflow.models.baseoperatorlink import BaseOperatorLink +45 | from airflow.models.dag import DAG as DAGFromDag +46 + from airflow.sdk import cross_downstream +47 | +48 | # airflow.decorators +49 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.baseoperatorlink.BaseOperatorLink` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:65:1 @@ -543,17 +516,16 @@ AIR311 [*] `airflow.models.baseoperatorlink.BaseOperatorLink` is removed in Airf 67 | # airflow.models.dag | help: Use `BaseOperatorLink` from `airflow.sdk` instead. - -ℹ Unsafe fix -41 41 | Variable, -42 42 | ) -43 43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 |-from airflow.models.baseoperatorlink import BaseOperatorLink -45 44 | from airflow.models.dag import DAG as DAGFromDag - 45 |+from airflow.sdk import BaseOperatorLink -46 46 | -47 47 | # airflow.decorators -48 48 | teardown() +41 | Variable, +42 | ) +43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream + - from airflow.models.baseoperatorlink import BaseOperatorLink +44 | from airflow.models.dag import DAG as DAGFromDag +45 + from airflow.sdk import BaseOperatorLink +46 | +47 | # airflow.decorators +48 | teardown() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.dag.DAG` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:68:1 @@ -565,24 +537,22 @@ AIR311 [*] `airflow.models.dag.DAG` is removed in Airflow 3.0; It still works in 70 | from airflow.utils.dag_parsing_context import get_parsing_context | help: Use `DAG` from `airflow.sdk` instead. - -ℹ Safe fix -43 43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream -44 44 | from airflow.models.baseoperatorlink import BaseOperatorLink -45 45 | from airflow.models.dag import DAG as DAGFromDag - 46 |+from airflow.sdk import DAG -46 47 | -47 48 | # airflow.decorators -48 49 | teardown() +43 | from airflow.models.baseoperator import chain, chain_linear, cross_downstream +44 | from airflow.models.baseoperatorlink import BaseOperatorLink +45 | from airflow.models.dag import DAG as DAGFromDag +46 + from airflow.sdk import DAG +47 | +48 | # airflow.decorators +49 | teardown() -------------------------------------------------------------------------------- -65 66 | BaseOperatorLink() -66 67 | -67 68 | # airflow.models.dag -68 |-DAGFromDag() - 69 |+DAG() -69 70 | from airflow.timetables.datasets import DatasetOrTimeSchedule -70 71 | from airflow.utils.dag_parsing_context import get_parsing_context -71 72 | +66 | BaseOperatorLink() +67 | +68 | # airflow.models.dag + - DAGFromDag() +69 + DAG() +70 | from airflow.timetables.datasets import DatasetOrTimeSchedule +71 | from airflow.utils.dag_parsing_context import get_parsing_context +72 | AIR311 [*] `airflow.timetables.datasets.DatasetOrTimeSchedule` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:73:1 @@ -594,19 +564,17 @@ AIR311 [*] `airflow.timetables.datasets.DatasetOrTimeSchedule` is removed in Air 75 | # airflow.utils.dag_parsing_context | help: Use `AssetOrTimeSchedule` from `airflow.timetables.assets` instead. - -ℹ Safe fix -68 68 | DAGFromDag() -69 69 | from airflow.timetables.datasets import DatasetOrTimeSchedule -70 70 | from airflow.utils.dag_parsing_context import get_parsing_context - 71 |+from airflow.timetables.assets import AssetOrTimeSchedule -71 72 | -72 73 | # airflow.timetables.datasets -73 |-DatasetOrTimeSchedule() - 74 |+AssetOrTimeSchedule() -74 75 | -75 76 | # airflow.utils.dag_parsing_context -76 77 | get_parsing_context() +68 | DAGFromDag() +69 | from airflow.timetables.datasets import DatasetOrTimeSchedule +70 | from airflow.utils.dag_parsing_context import get_parsing_context +71 + from airflow.timetables.assets import AssetOrTimeSchedule +72 | +73 | # airflow.timetables.datasets + - DatasetOrTimeSchedule() +74 + AssetOrTimeSchedule() +75 | +76 | # airflow.utils.dag_parsing_context +77 | get_parsing_context() AIR311 [*] `airflow.utils.dag_parsing_context.get_parsing_context` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:76:1 @@ -618,16 +586,15 @@ AIR311 [*] `airflow.utils.dag_parsing_context.get_parsing_context` is removed in 78 | from airflow.decorators.base import ( | help: Use `get_parsing_context` from `airflow.sdk` instead. - -ℹ Unsafe fix -67 67 | # airflow.models.dag -68 68 | DAGFromDag() -69 69 | from airflow.timetables.datasets import DatasetOrTimeSchedule -70 |-from airflow.utils.dag_parsing_context import get_parsing_context - 70 |+from airflow.sdk import get_parsing_context -71 71 | -72 72 | # airflow.timetables.datasets -73 73 | DatasetOrTimeSchedule() +67 | # airflow.models.dag +68 | DAGFromDag() +69 | from airflow.timetables.datasets import DatasetOrTimeSchedule + - from airflow.utils.dag_parsing_context import get_parsing_context +70 + from airflow.sdk import get_parsing_context +71 | +72 | # airflow.timetables.datasets +73 | DatasetOrTimeSchedule() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.base.DecoratedMappedOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:87:1 @@ -639,21 +606,20 @@ AIR311 [*] `airflow.decorators.base.DecoratedMappedOperator` is removed in Airfl 89 | TaskDecorator() | help: Use `DecoratedMappedOperator` from `airflow.sdk.bases.decorator` instead. - -ℹ Unsafe fix -76 76 | get_parsing_context() -77 77 | -78 78 | from airflow.decorators.base import ( -79 |- DecoratedMappedOperator, -80 79 | DecoratedOperator, -81 80 | TaskDecorator, -82 81 | get_unique_task_id, -83 82 | task_decorator_factory, -84 83 | ) - 84 |+from airflow.sdk.bases.decorator import DecoratedMappedOperator -85 85 | -86 86 | # airflow.decorators.base -87 87 | DecoratedMappedOperator() +76 | get_parsing_context() +77 | +78 | from airflow.decorators.base import ( + - DecoratedMappedOperator, +79 | DecoratedOperator, +80 | TaskDecorator, +81 | get_unique_task_id, +82 | task_decorator_factory, +83 | ) +84 + from airflow.sdk.bases.decorator import DecoratedMappedOperator +85 | +86 | # airflow.decorators.base +87 | DecoratedMappedOperator() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.base.DecoratedOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:88:1 @@ -666,20 +632,19 @@ AIR311 [*] `airflow.decorators.base.DecoratedOperator` is removed in Airflow 3.0 90 | get_unique_task_id() | help: Use `DecoratedOperator` from `airflow.sdk.bases.decorator` instead. - -ℹ Unsafe fix -77 77 | -78 78 | from airflow.decorators.base import ( -79 79 | DecoratedMappedOperator, -80 |- DecoratedOperator, -81 80 | TaskDecorator, -82 81 | get_unique_task_id, -83 82 | task_decorator_factory, -84 83 | ) - 84 |+from airflow.sdk.bases.decorator import DecoratedOperator -85 85 | -86 86 | # airflow.decorators.base -87 87 | DecoratedMappedOperator() +77 | +78 | from airflow.decorators.base import ( +79 | DecoratedMappedOperator, + - DecoratedOperator, +80 | TaskDecorator, +81 | get_unique_task_id, +82 | task_decorator_factory, +83 | ) +84 + from airflow.sdk.bases.decorator import DecoratedOperator +85 | +86 | # airflow.decorators.base +87 | DecoratedMappedOperator() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.base.TaskDecorator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:89:1 @@ -692,19 +657,18 @@ AIR311 [*] `airflow.decorators.base.TaskDecorator` is removed in Airflow 3.0; It 91 | task_decorator_factory() | help: Use `TaskDecorator` from `airflow.sdk.bases.decorator` instead. - -ℹ Unsafe fix -78 78 | from airflow.decorators.base import ( -79 79 | DecoratedMappedOperator, -80 80 | DecoratedOperator, -81 |- TaskDecorator, -82 81 | get_unique_task_id, -83 82 | task_decorator_factory, -84 83 | ) - 84 |+from airflow.sdk.bases.decorator import TaskDecorator -85 85 | -86 86 | # airflow.decorators.base -87 87 | DecoratedMappedOperator() +78 | from airflow.decorators.base import ( +79 | DecoratedMappedOperator, +80 | DecoratedOperator, + - TaskDecorator, +81 | get_unique_task_id, +82 | task_decorator_factory, +83 | ) +84 + from airflow.sdk.bases.decorator import TaskDecorator +85 | +86 | # airflow.decorators.base +87 | DecoratedMappedOperator() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.base.get_unique_task_id` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:90:1 @@ -716,18 +680,17 @@ AIR311 [*] `airflow.decorators.base.get_unique_task_id` is removed in Airflow 3. 91 | task_decorator_factory() | help: Use `get_unique_task_id` from `airflow.sdk.bases.decorator` instead. - -ℹ Unsafe fix -79 79 | DecoratedMappedOperator, -80 80 | DecoratedOperator, -81 81 | TaskDecorator, -82 |- get_unique_task_id, -83 82 | task_decorator_factory, -84 83 | ) - 84 |+from airflow.sdk.bases.decorator import get_unique_task_id -85 85 | -86 86 | # airflow.decorators.base -87 87 | DecoratedMappedOperator() +79 | DecoratedMappedOperator, +80 | DecoratedOperator, +81 | TaskDecorator, + - get_unique_task_id, +82 | task_decorator_factory, +83 | ) +84 + from airflow.sdk.bases.decorator import get_unique_task_id +85 | +86 | # airflow.decorators.base +87 | DecoratedMappedOperator() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.decorators.base.task_decorator_factory` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:91:1 @@ -738,17 +701,16 @@ AIR311 [*] `airflow.decorators.base.task_decorator_factory` is removed in Airflo | ^^^^^^^^^^^^^^^^^^^^^^ | help: Use `task_decorator_factory` from `airflow.sdk.bases.decorator` instead. - -ℹ Unsafe fix -80 80 | DecoratedOperator, -81 81 | TaskDecorator, -82 82 | get_unique_task_id, -83 |- task_decorator_factory, -84 83 | ) - 84 |+from airflow.sdk.bases.decorator import task_decorator_factory -85 85 | -86 86 | # airflow.decorators.base -87 87 | DecoratedMappedOperator() +80 | DecoratedOperator, +81 | TaskDecorator, +82 | get_unique_task_id, + - task_decorator_factory, +83 | ) +84 + from airflow.sdk.bases.decorator import task_decorator_factory +85 | +86 | # airflow.decorators.base +87 | DecoratedMappedOperator() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.models.Param` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:97:1 @@ -758,16 +720,15 @@ AIR311 [*] `airflow.models.Param` is removed in Airflow 3.0; It still works in A | ^^^^^ | help: Use `Param` from `airflow.sdk.definitions.param` instead. - -ℹ Unsafe fix -91 91 | task_decorator_factory() -92 92 | -93 93 | -94 |-from airflow.models import Param - 94 |+from airflow.sdk.definitions.param import Param -95 95 | -96 96 | # airflow.models -97 97 | Param() +91 | task_decorator_factory() +92 | +93 | + - from airflow.models import Param +94 + from airflow.sdk.definitions.param import Param +95 | +96 | # airflow.models +97 | Param() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.sensors.base.BaseSensorOperator` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:107:1 @@ -779,19 +740,18 @@ AIR311 [*] `airflow.sensors.base.BaseSensorOperator` is removed in Airflow 3.0; 109 | poke_mode_only() | help: Use `BaseSensorOperator` from `airflow.sdk` instead. - -ℹ Unsafe fix -98 98 | -99 99 | -100 100 | from airflow.sensors.base import ( -101 |- BaseSensorOperator, -102 101 | PokeReturnValue, -103 102 | poke_mode_only, -104 103 | ) - 104 |+from airflow.sdk import BaseSensorOperator -105 105 | -106 106 | # airflow.sensors.base -107 107 | BaseSensorOperator() +98 | +99 | +100 | from airflow.sensors.base import ( + - BaseSensorOperator, +101 | PokeReturnValue, +102 | poke_mode_only, +103 | ) +104 + from airflow.sdk import BaseSensorOperator +105 | +106 | # airflow.sensors.base +107 | BaseSensorOperator() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.sensors.base.PokeReturnValue` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:108:1 @@ -803,18 +763,17 @@ AIR311 [*] `airflow.sensors.base.PokeReturnValue` is removed in Airflow 3.0; It 109 | poke_mode_only() | help: Use `PokeReturnValue` from `airflow.sdk` instead. - -ℹ Unsafe fix -99 99 | -100 100 | from airflow.sensors.base import ( -101 101 | BaseSensorOperator, -102 |- PokeReturnValue, -103 102 | poke_mode_only, -104 103 | ) - 104 |+from airflow.sdk import PokeReturnValue -105 105 | -106 106 | # airflow.sensors.base -107 107 | BaseSensorOperator() +99 | +100 | from airflow.sensors.base import ( +101 | BaseSensorOperator, + - PokeReturnValue, +102 | poke_mode_only, +103 | ) +104 + from airflow.sdk import PokeReturnValue +105 | +106 | # airflow.sensors.base +107 | BaseSensorOperator() +note: This is an unsafe fix and may change runtime behavior AIR311 [*] `airflow.sensors.base.poke_mode_only` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR311_names.py:109:1 @@ -825,14 +784,13 @@ AIR311 [*] `airflow.sensors.base.poke_mode_only` is removed in Airflow 3.0; It s | ^^^^^^^^^^^^^^ | help: Use `poke_mode_only` from `airflow.sdk` instead. - -ℹ Unsafe fix -100 100 | from airflow.sensors.base import ( -101 101 | BaseSensorOperator, -102 102 | PokeReturnValue, -103 |- poke_mode_only, -104 103 | ) - 104 |+from airflow.sdk import poke_mode_only -105 105 | -106 106 | # airflow.sensors.base -107 107 | BaseSensorOperator() +100 | from airflow.sensors.base import ( +101 | BaseSensorOperator, +102 | PokeReturnValue, + - poke_mode_only, +103 | ) +104 + from airflow.sdk import poke_mode_only +105 | +106 | # airflow.sensors.base +107 | BaseSensorOperator() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap index 14276da4c4..cbc9c30010 100644 --- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap +++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR312_AIR312.py.snap @@ -12,22 +12,21 @@ AIR312 [*] `airflow.hooks.filesystem.FSHook` is deprecated and moved into `stand 15 | SubprocessHook() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `FSHook` from `airflow.providers.standard.hooks.filesystem` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from airflow.hooks.filesystem import FSHook -4 3 | from airflow.hooks.package_index import PackageIndexHook -5 4 | from airflow.hooks.subprocess import SubprocessHook -6 5 | from airflow.operators.bash import BashOperator +1 | from __future__ import annotations +2 | + - from airflow.hooks.filesystem import FSHook +3 | from airflow.hooks.package_index import PackageIndexHook +4 | from airflow.hooks.subprocess import SubprocessHook +5 | from airflow.operators.bash import BashOperator -------------------------------------------------------------------------------- -9 8 | from airflow.operators.latest_only import LatestOnlyOperator -10 9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.hooks.filesystem import FSHook -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +8 | from airflow.operators.latest_only import LatestOnlyOperator +9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.hooks.filesystem import FSHook +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.hooks.package_index.PackageIndexHook` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:14:1 @@ -38,23 +37,22 @@ AIR312 [*] `airflow.hooks.package_index.PackageIndexHook` is deprecated and move 15 | SubprocessHook() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PackageIndexHook` from `airflow.providers.standard.hooks.package_index` instead. - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from airflow.hooks.filesystem import FSHook -4 |-from airflow.hooks.package_index import PackageIndexHook -5 4 | from airflow.hooks.subprocess import SubprocessHook -6 5 | from airflow.operators.bash import BashOperator -7 6 | from airflow.operators.datetime import BranchDateTimeOperator +1 | from __future__ import annotations +2 | +3 | from airflow.hooks.filesystem import FSHook + - from airflow.hooks.package_index import PackageIndexHook +4 | from airflow.hooks.subprocess import SubprocessHook +5 | from airflow.operators.bash import BashOperator +6 | from airflow.operators.datetime import BranchDateTimeOperator -------------------------------------------------------------------------------- -9 8 | from airflow.operators.latest_only import LatestOnlyOperator -10 9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.hooks.package_index import PackageIndexHook -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +8 | from airflow.operators.latest_only import LatestOnlyOperator +9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.hooks.package_index import PackageIndexHook +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.hooks.subprocess.SubprocessHook` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:15:1 @@ -67,22 +65,21 @@ AIR312 [*] `airflow.hooks.subprocess.SubprocessHook` is deprecated and moved int 17 | BashOperator() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `SubprocessHook` from `airflow.providers.standard.hooks.subprocess` instead. - -ℹ Unsafe fix -2 2 | -3 3 | from airflow.hooks.filesystem import FSHook -4 4 | from airflow.hooks.package_index import PackageIndexHook -5 |-from airflow.hooks.subprocess import SubprocessHook -6 5 | from airflow.operators.bash import BashOperator -7 6 | from airflow.operators.datetime import BranchDateTimeOperator -8 7 | from airflow.operators.empty import EmptyOperator -9 8 | from airflow.operators.latest_only import LatestOnlyOperator -10 9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.hooks.subprocess import SubprocessHook -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +2 | +3 | from airflow.hooks.filesystem import FSHook +4 | from airflow.hooks.package_index import PackageIndexHook + - from airflow.hooks.subprocess import SubprocessHook +5 | from airflow.operators.bash import BashOperator +6 | from airflow.operators.datetime import BranchDateTimeOperator +7 | from airflow.operators.empty import EmptyOperator +8 | from airflow.operators.latest_only import LatestOnlyOperator +9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.hooks.subprocess import SubprocessHook +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.bash.BashOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:17:1 @@ -95,21 +92,20 @@ AIR312 [*] `airflow.operators.bash.BashOperator` is deprecated and moved into `s 19 | TriggerDagRunOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashOperator` from `airflow.providers.standard.operators.bash` instead. - -ℹ Unsafe fix -3 3 | from airflow.hooks.filesystem import FSHook -4 4 | from airflow.hooks.package_index import PackageIndexHook -5 5 | from airflow.hooks.subprocess import SubprocessHook -6 |-from airflow.operators.bash import BashOperator -7 6 | from airflow.operators.datetime import BranchDateTimeOperator -8 7 | from airflow.operators.empty import EmptyOperator -9 8 | from airflow.operators.latest_only import LatestOnlyOperator -10 9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.operators.bash import BashOperator -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +3 | from airflow.hooks.filesystem import FSHook +4 | from airflow.hooks.package_index import PackageIndexHook +5 | from airflow.hooks.subprocess import SubprocessHook + - from airflow.operators.bash import BashOperator +6 | from airflow.operators.datetime import BranchDateTimeOperator +7 | from airflow.operators.empty import EmptyOperator +8 | from airflow.operators.latest_only import LatestOnlyOperator +9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.operators.bash import BashOperator +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.datetime.BranchDateTimeOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:18:1 @@ -121,20 +117,19 @@ AIR312 [*] `airflow.operators.datetime.BranchDateTimeOperator` is deprecated and 20 | EmptyOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchDateTimeOperator` from `airflow.providers.standard.operators.datetime` instead. - -ℹ Unsafe fix -4 4 | from airflow.hooks.package_index import PackageIndexHook -5 5 | from airflow.hooks.subprocess import SubprocessHook -6 6 | from airflow.operators.bash import BashOperator -7 |-from airflow.operators.datetime import BranchDateTimeOperator -8 7 | from airflow.operators.empty import EmptyOperator -9 8 | from airflow.operators.latest_only import LatestOnlyOperator -10 9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.operators.datetime import BranchDateTimeOperator -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +4 | from airflow.hooks.package_index import PackageIndexHook +5 | from airflow.hooks.subprocess import SubprocessHook +6 | from airflow.operators.bash import BashOperator + - from airflow.operators.datetime import BranchDateTimeOperator +7 | from airflow.operators.empty import EmptyOperator +8 | from airflow.operators.latest_only import LatestOnlyOperator +9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.operators.datetime import BranchDateTimeOperator +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.trigger_dagrun.TriggerDagRunOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:19:1 @@ -146,17 +141,16 @@ AIR312 [*] `airflow.operators.trigger_dagrun.TriggerDagRunOperator` is deprecate 20 | EmptyOperator() | help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunOperator` from `airflow.providers.standard.operators.trigger_dagrun` instead. - -ℹ Unsafe fix -7 7 | from airflow.operators.datetime import BranchDateTimeOperator -8 8 | from airflow.operators.empty import EmptyOperator -9 9 | from airflow.operators.latest_only import LatestOnlyOperator -10 |-from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +7 | from airflow.operators.datetime import BranchDateTimeOperator +8 | from airflow.operators.empty import EmptyOperator +9 | from airflow.operators.latest_only import LatestOnlyOperator + - from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.empty.EmptyOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:20:1 @@ -169,19 +163,18 @@ AIR312 [*] `airflow.operators.empty.EmptyOperator` is deprecated and moved into 22 | LatestOnlyOperator() | help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead. - -ℹ Unsafe fix -5 5 | from airflow.hooks.subprocess import SubprocessHook -6 6 | from airflow.operators.bash import BashOperator -7 7 | from airflow.operators.datetime import BranchDateTimeOperator -8 |-from airflow.operators.empty import EmptyOperator -9 8 | from airflow.operators.latest_only import LatestOnlyOperator -10 9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.operators.empty import EmptyOperator -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +5 | from airflow.hooks.subprocess import SubprocessHook +6 | from airflow.operators.bash import BashOperator +7 | from airflow.operators.datetime import BranchDateTimeOperator + - from airflow.operators.empty import EmptyOperator +8 | from airflow.operators.latest_only import LatestOnlyOperator +9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.operators.empty import EmptyOperator +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.latest_only.LatestOnlyOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:22:1 @@ -193,18 +186,17 @@ AIR312 [*] `airflow.operators.latest_only.LatestOnlyOperator` is deprecated and 23 | BranchDayOfWeekOperator() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `LatestOnlyOperator` from `airflow.providers.standard.operators.latest_only` instead. - -ℹ Unsafe fix -6 6 | from airflow.operators.bash import BashOperator -7 7 | from airflow.operators.datetime import BranchDateTimeOperator -8 8 | from airflow.operators.empty import EmptyOperator -9 |-from airflow.operators.latest_only import LatestOnlyOperator -10 9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 10 | from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.operators.latest_only import LatestOnlyOperator -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +6 | from airflow.operators.bash import BashOperator +7 | from airflow.operators.datetime import BranchDateTimeOperator +8 | from airflow.operators.empty import EmptyOperator + - from airflow.operators.latest_only import LatestOnlyOperator +9 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator +10 | from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.operators.latest_only import LatestOnlyOperator +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.weekday.BranchDayOfWeekOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:23:1 @@ -216,16 +208,15 @@ AIR312 [*] `airflow.operators.weekday.BranchDayOfWeekOperator` is deprecated and 25 | from airflow.operators.python import ( | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchDayOfWeekOperator` from `airflow.providers.standard.operators.weekday` instead. - -ℹ Unsafe fix -8 8 | from airflow.operators.empty import EmptyOperator -9 9 | from airflow.operators.latest_only import LatestOnlyOperator -10 10 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator -11 |-from airflow.operators.weekday import BranchDayOfWeekOperator - 11 |+from airflow.providers.standard.operators.weekday import BranchDayOfWeekOperator -12 12 | -13 13 | FSHook() -14 14 | PackageIndexHook() +8 | from airflow.operators.empty import EmptyOperator +9 | from airflow.operators.latest_only import LatestOnlyOperator +10 | from airflow.operators.trigger_dagrun import TriggerDagRunOperator + - from airflow.operators.weekday import BranchDayOfWeekOperator +11 + from airflow.providers.standard.operators.weekday import BranchDayOfWeekOperator +12 | +13 | FSHook() +14 | PackageIndexHook() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.BranchPythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:34:1 @@ -238,22 +229,21 @@ AIR312 [*] `airflow.operators.python.BranchPythonOperator` is deprecated and mov 36 | PythonVirtualenvOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -23 23 | BranchDayOfWeekOperator() -24 24 | -25 25 | from airflow.operators.python import ( -26 |- BranchPythonOperator, -27 26 | PythonOperator, -28 27 | PythonVirtualenvOperator, -29 28 | ShortCircuitOperator, -30 29 | ) -31 30 | from airflow.sensors.bash import BashSensor -32 31 | from airflow.sensors.date_time import DateTimeSensor - 32 |+from airflow.providers.standard.operators.python import BranchPythonOperator -33 33 | -34 34 | BranchPythonOperator() -35 35 | PythonOperator() +23 | BranchDayOfWeekOperator() +24 | +25 | from airflow.operators.python import ( + - BranchPythonOperator, +26 | PythonOperator, +27 | PythonVirtualenvOperator, +28 | ShortCircuitOperator, +29 | ) +30 | from airflow.sensors.bash import BashSensor +31 | from airflow.sensors.date_time import DateTimeSensor +32 + from airflow.providers.standard.operators.python import BranchPythonOperator +33 | +34 | BranchPythonOperator() +35 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.PythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:35:1 @@ -265,21 +255,20 @@ AIR312 [*] `airflow.operators.python.PythonOperator` is deprecated and moved int 37 | ShortCircuitOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -24 24 | -25 25 | from airflow.operators.python import ( -26 26 | BranchPythonOperator, -27 |- PythonOperator, -28 27 | PythonVirtualenvOperator, -29 28 | ShortCircuitOperator, -30 29 | ) -31 30 | from airflow.sensors.bash import BashSensor -32 31 | from airflow.sensors.date_time import DateTimeSensor - 32 |+from airflow.providers.standard.operators.python import PythonOperator -33 33 | -34 34 | BranchPythonOperator() -35 35 | PythonOperator() +24 | +25 | from airflow.operators.python import ( +26 | BranchPythonOperator, + - PythonOperator, +27 | PythonVirtualenvOperator, +28 | ShortCircuitOperator, +29 | ) +30 | from airflow.sensors.bash import BashSensor +31 | from airflow.sensors.date_time import DateTimeSensor +32 + from airflow.providers.standard.operators.python import PythonOperator +33 | +34 | BranchPythonOperator() +35 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.PythonVirtualenvOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:36:1 @@ -291,20 +280,19 @@ AIR312 [*] `airflow.operators.python.PythonVirtualenvOperator` is deprecated and 37 | ShortCircuitOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -25 25 | from airflow.operators.python import ( -26 26 | BranchPythonOperator, -27 27 | PythonOperator, -28 |- PythonVirtualenvOperator, -29 28 | ShortCircuitOperator, -30 29 | ) -31 30 | from airflow.sensors.bash import BashSensor -32 31 | from airflow.sensors.date_time import DateTimeSensor - 32 |+from airflow.providers.standard.operators.python import PythonVirtualenvOperator -33 33 | -34 34 | BranchPythonOperator() -35 35 | PythonOperator() +25 | from airflow.operators.python import ( +26 | BranchPythonOperator, +27 | PythonOperator, + - PythonVirtualenvOperator, +28 | ShortCircuitOperator, +29 | ) +30 | from airflow.sensors.bash import BashSensor +31 | from airflow.sensors.date_time import DateTimeSensor +32 + from airflow.providers.standard.operators.python import PythonVirtualenvOperator +33 | +34 | BranchPythonOperator() +35 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.ShortCircuitOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:37:1 @@ -317,19 +305,18 @@ AIR312 [*] `airflow.operators.python.ShortCircuitOperator` is deprecated and mov 39 | BashSensor() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -26 26 | BranchPythonOperator, -27 27 | PythonOperator, -28 28 | PythonVirtualenvOperator, -29 |- ShortCircuitOperator, -30 29 | ) -31 30 | from airflow.sensors.bash import BashSensor -32 31 | from airflow.sensors.date_time import DateTimeSensor - 32 |+from airflow.providers.standard.operators.python import ShortCircuitOperator -33 33 | -34 34 | BranchPythonOperator() -35 35 | PythonOperator() +26 | BranchPythonOperator, +27 | PythonOperator, +28 | PythonVirtualenvOperator, + - ShortCircuitOperator, +29 | ) +30 | from airflow.sensors.bash import BashSensor +31 | from airflow.sensors.date_time import DateTimeSensor +32 + from airflow.providers.standard.operators.python import ShortCircuitOperator +33 | +34 | BranchPythonOperator() +35 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.bash.BashSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:39:1 @@ -342,17 +329,16 @@ AIR312 [*] `airflow.sensors.bash.BashSensor` is deprecated and moved into `stand 41 | from airflow.sensors.date_time import DateTimeSensorAsync | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashSensor` from `airflow.providers.standard.sensor.bash` instead. - -ℹ Unsafe fix -28 28 | PythonVirtualenvOperator, -29 29 | ShortCircuitOperator, -30 30 | ) -31 |-from airflow.sensors.bash import BashSensor -32 31 | from airflow.sensors.date_time import DateTimeSensor - 32 |+from airflow.providers.standard.sensor.bash import BashSensor -33 33 | -34 34 | BranchPythonOperator() -35 35 | PythonOperator() +28 | PythonVirtualenvOperator, +29 | ShortCircuitOperator, +30 | ) + - from airflow.sensors.bash import BashSensor +31 | from airflow.sensors.date_time import DateTimeSensor +32 + from airflow.providers.standard.sensor.bash import BashSensor +33 | +34 | BranchPythonOperator() +35 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.date_time.DateTimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:40:1 @@ -364,16 +350,15 @@ AIR312 [*] `airflow.sensors.date_time.DateTimeSensor` is deprecated and moved in 42 | from airflow.sensors.external_task import ( | help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensor` from `airflow.providers.standard.sensors.date_time` instead. - -ℹ Unsafe fix -29 29 | ShortCircuitOperator, -30 30 | ) -31 31 | from airflow.sensors.bash import BashSensor -32 |-from airflow.sensors.date_time import DateTimeSensor - 32 |+from airflow.providers.standard.sensors.date_time import DateTimeSensor -33 33 | -34 34 | BranchPythonOperator() -35 35 | PythonOperator() +29 | ShortCircuitOperator, +30 | ) +31 | from airflow.sensors.bash import BashSensor + - from airflow.sensors.date_time import DateTimeSensor +32 + from airflow.providers.standard.sensors.date_time import DateTimeSensor +33 | +34 | BranchPythonOperator() +35 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.BranchPythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:49:1 @@ -386,23 +371,22 @@ AIR312 [*] `airflow.operators.python.BranchPythonOperator` is deprecated and mov 51 | PythonVirtualenvOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -23 23 | BranchDayOfWeekOperator() -24 24 | -25 25 | from airflow.operators.python import ( -26 |- BranchPythonOperator, -27 26 | PythonOperator, -28 27 | PythonVirtualenvOperator, -29 28 | ShortCircuitOperator, +23 | BranchDayOfWeekOperator() +24 | +25 | from airflow.operators.python import ( + - BranchPythonOperator, +26 | PythonOperator, +27 | PythonVirtualenvOperator, +28 | ShortCircuitOperator, -------------------------------------------------------------------------------- -45 44 | ) -46 45 | from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.operators.python import BranchPythonOperator -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +44 | ) +45 | from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.operators.python import BranchPythonOperator +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.PythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:50:1 @@ -414,23 +398,22 @@ AIR312 [*] `airflow.operators.python.PythonOperator` is deprecated and moved int 52 | ShortCircuitOperator() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -24 24 | -25 25 | from airflow.operators.python import ( -26 26 | BranchPythonOperator, -27 |- PythonOperator, -28 27 | PythonVirtualenvOperator, -29 28 | ShortCircuitOperator, -30 29 | ) +24 | +25 | from airflow.operators.python import ( +26 | BranchPythonOperator, + - PythonOperator, +27 | PythonVirtualenvOperator, +28 | ShortCircuitOperator, +29 | ) -------------------------------------------------------------------------------- -45 44 | ) -46 45 | from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.operators.python import PythonOperator -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +44 | ) +45 | from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.operators.python import PythonOperator +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.PythonVirtualenvOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:51:1 @@ -443,23 +426,22 @@ AIR312 [*] `airflow.operators.python.PythonVirtualenvOperator` is deprecated and 53 | DateTimeSensorAsync() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -25 25 | from airflow.operators.python import ( -26 26 | BranchPythonOperator, -27 27 | PythonOperator, -28 |- PythonVirtualenvOperator, -29 28 | ShortCircuitOperator, -30 29 | ) -31 30 | from airflow.sensors.bash import BashSensor +25 | from airflow.operators.python import ( +26 | BranchPythonOperator, +27 | PythonOperator, + - PythonVirtualenvOperator, +28 | ShortCircuitOperator, +29 | ) +30 | from airflow.sensors.bash import BashSensor -------------------------------------------------------------------------------- -45 44 | ) -46 45 | from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.operators.python import PythonVirtualenvOperator -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +44 | ) +45 | from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.operators.python import PythonVirtualenvOperator +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.operators.python.ShortCircuitOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:52:1 @@ -472,23 +454,22 @@ AIR312 [*] `airflow.operators.python.ShortCircuitOperator` is deprecated and mov 54 | ExternalTaskMarker() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead. - -ℹ Unsafe fix -26 26 | BranchPythonOperator, -27 27 | PythonOperator, -28 28 | PythonVirtualenvOperator, -29 |- ShortCircuitOperator, -30 29 | ) -31 30 | from airflow.sensors.bash import BashSensor -32 31 | from airflow.sensors.date_time import DateTimeSensor +26 | BranchPythonOperator, +27 | PythonOperator, +28 | PythonVirtualenvOperator, + - ShortCircuitOperator, +29 | ) +30 | from airflow.sensors.bash import BashSensor +31 | from airflow.sensors.date_time import DateTimeSensor -------------------------------------------------------------------------------- -45 44 | ) -46 45 | from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.operators.python import ShortCircuitOperator -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +44 | ) +45 | from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.operators.python import ShortCircuitOperator +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.date_time.DateTimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:53:1 @@ -501,22 +482,21 @@ AIR312 [*] `airflow.sensors.date_time.DateTimeSensorAsync` is deprecated and mov 55 | ExternalTaskSensor() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensorAsync` from `airflow.providers.standard.sensors.date_time` instead. - -ℹ Unsafe fix -38 38 | -39 39 | BashSensor() -40 40 | DateTimeSensor() -41 |-from airflow.sensors.date_time import DateTimeSensorAsync -42 41 | from airflow.sensors.external_task import ( -43 42 | ExternalTaskMarker, -44 43 | ExternalTaskSensor, -45 44 | ) -46 45 | from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.sensors.date_time import DateTimeSensorAsync -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +38 | +39 | BashSensor() +40 | DateTimeSensor() + - from airflow.sensors.date_time import DateTimeSensorAsync +41 | from airflow.sensors.external_task import ( +42 | ExternalTaskMarker, +43 | ExternalTaskSensor, +44 | ) +45 | from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.sensors.date_time import DateTimeSensorAsync +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.external_task.ExternalTaskMarker` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:54:1 @@ -529,20 +509,19 @@ AIR312 [*] `airflow.sensors.external_task.ExternalTaskMarker` is deprecated and 56 | FileSensor() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskMarker` from `airflow.providers.standard.sensors.external_task` instead. - -ℹ Unsafe fix -40 40 | DateTimeSensor() -41 41 | from airflow.sensors.date_time import DateTimeSensorAsync -42 42 | from airflow.sensors.external_task import ( -43 |- ExternalTaskMarker, -44 43 | ExternalTaskSensor, -45 44 | ) -46 45 | from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.sensors.external_task import ExternalTaskMarker -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +40 | DateTimeSensor() +41 | from airflow.sensors.date_time import DateTimeSensorAsync +42 | from airflow.sensors.external_task import ( + - ExternalTaskMarker, +43 | ExternalTaskSensor, +44 | ) +45 | from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.sensors.external_task import ExternalTaskMarker +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.external_task.ExternalTaskSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:55:1 @@ -555,19 +534,18 @@ AIR312 [*] `airflow.sensors.external_task.ExternalTaskSensor` is deprecated and 57 | PythonSensor() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensor` from `airflow.providers.standard.sensors.external_task` instead. - -ℹ Unsafe fix -41 41 | from airflow.sensors.date_time import DateTimeSensorAsync -42 42 | from airflow.sensors.external_task import ( -43 43 | ExternalTaskMarker, -44 |- ExternalTaskSensor, -45 44 | ) -46 45 | from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.sensors.external_task import ExternalTaskSensor -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +41 | from airflow.sensors.date_time import DateTimeSensorAsync +42 | from airflow.sensors.external_task import ( +43 | ExternalTaskMarker, + - ExternalTaskSensor, +44 | ) +45 | from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.sensors.external_task import ExternalTaskSensor +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.filesystem.FileSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:56:1 @@ -579,17 +557,16 @@ AIR312 [*] `airflow.sensors.filesystem.FileSensor` is deprecated and moved into 57 | PythonSensor() | help: Install `apache-airflow-providers-standard>=0.0.2` and use `FileSensor` from `airflow.providers.standard.sensors.filesystem` instead. - -ℹ Unsafe fix -43 43 | ExternalTaskMarker, -44 44 | ExternalTaskSensor, -45 45 | ) -46 |-from airflow.sensors.filesystem import FileSensor -47 46 | from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.sensors.filesystem import FileSensor -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +43 | ExternalTaskMarker, +44 | ExternalTaskSensor, +45 | ) + - from airflow.sensors.filesystem import FileSensor +46 | from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.sensors.filesystem import FileSensor +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.python.PythonSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:57:1 @@ -602,16 +579,15 @@ AIR312 [*] `airflow.sensors.python.PythonSensor` is deprecated and moved into `s 59 | from airflow.sensors.time_sensor import ( | help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonSensor` from `airflow.providers.standard.sensors.python` instead. - -ℹ Unsafe fix -44 44 | ExternalTaskSensor, -45 45 | ) -46 46 | from airflow.sensors.filesystem import FileSensor -47 |-from airflow.sensors.python import PythonSensor - 47 |+from airflow.providers.standard.sensors.python import PythonSensor -48 48 | -49 49 | BranchPythonOperator() -50 50 | PythonOperator() +44 | ExternalTaskSensor, +45 | ) +46 | from airflow.sensors.filesystem import FileSensor + - from airflow.sensors.python import PythonSensor +47 + from airflow.providers.standard.sensors.python import PythonSensor +48 | +49 | BranchPythonOperator() +50 | PythonOperator() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.time_sensor.TimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:64:1 @@ -623,18 +599,17 @@ AIR312 [*] `airflow.sensors.time_sensor.TimeSensor` is deprecated and moved into 65 | TimeSensorAsync() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeSensor` from `airflow.providers.standard.sensors.time` instead. - -ℹ Unsafe fix -57 57 | PythonSensor() -58 58 | -59 59 | from airflow.sensors.time_sensor import ( -60 |- TimeSensor, -61 60 | TimeSensorAsync, -62 61 | ) - 62 |+from airflow.providers.standard.sensors.time import TimeSensor -63 63 | -64 64 | TimeSensor() -65 65 | TimeSensorAsync() +57 | PythonSensor() +58 | +59 | from airflow.sensors.time_sensor import ( + - TimeSensor, +60 | TimeSensorAsync, +61 | ) +62 + from airflow.providers.standard.sensors.time import TimeSensor +63 | +64 | TimeSensor() +65 | TimeSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.time_sensor.TimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:65:1 @@ -646,17 +621,16 @@ AIR312 [*] `airflow.sensors.time_sensor.TimeSensorAsync` is deprecated and moved 67 | from airflow.sensors.time_delta import ( | help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeSensorAsync` from `airflow.providers.standard.sensors.time` instead. - -ℹ Unsafe fix -58 58 | -59 59 | from airflow.sensors.time_sensor import ( -60 60 | TimeSensor, -61 |- TimeSensorAsync, -62 61 | ) - 62 |+from airflow.providers.standard.sensors.time import TimeSensorAsync -63 63 | -64 64 | TimeSensor() -65 65 | TimeSensorAsync() +58 | +59 | from airflow.sensors.time_sensor import ( +60 | TimeSensor, + - TimeSensorAsync, +61 | ) +62 + from airflow.providers.standard.sensors.time import TimeSensorAsync +63 | +64 | TimeSensor() +65 | TimeSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.time_delta.TimeDeltaSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:82:1 @@ -669,23 +643,22 @@ AIR312 [*] `airflow.sensors.time_delta.TimeDeltaSensor` is deprecated and moved 84 | DayOfWeekSensor() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeDeltaSensor` from `airflow.providers.standard.sensors.time_delta` instead. - -ℹ Unsafe fix -65 65 | TimeSensorAsync() -66 66 | -67 67 | from airflow.sensors.time_delta import ( -68 |- TimeDeltaSensor, -69 68 | TimeDeltaSensorAsync, -70 69 | ) -71 70 | from airflow.sensors.weekday import DayOfWeekSensor +65 | TimeSensorAsync() +66 | +67 | from airflow.sensors.time_delta import ( + - TimeDeltaSensor, +68 | TimeDeltaSensorAsync, +69 | ) +70 | from airflow.sensors.weekday import DayOfWeekSensor -------------------------------------------------------------------------------- -78 77 | DateTimeTrigger, -79 78 | TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.sensors.time_delta import TimeDeltaSensor -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +77 | DateTimeTrigger, +78 | TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.sensors.time_delta import TimeDeltaSensor +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.time_delta.TimeDeltaSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:83:1 @@ -697,23 +670,22 @@ AIR312 [*] `airflow.sensors.time_delta.TimeDeltaSensorAsync` is deprecated and m 85 | DagStateTrigger() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeDeltaSensorAsync` from `airflow.providers.standard.sensors.time_delta` instead. - -ℹ Unsafe fix -66 66 | -67 67 | from airflow.sensors.time_delta import ( -68 68 | TimeDeltaSensor, -69 |- TimeDeltaSensorAsync, -70 69 | ) -71 70 | from airflow.sensors.weekday import DayOfWeekSensor -72 71 | from airflow.triggers.external_task import ( +66 | +67 | from airflow.sensors.time_delta import ( +68 | TimeDeltaSensor, + - TimeDeltaSensorAsync, +69 | ) +70 | from airflow.sensors.weekday import DayOfWeekSensor +71 | from airflow.triggers.external_task import ( -------------------------------------------------------------------------------- -78 77 | DateTimeTrigger, -79 78 | TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.sensors.time_delta import TimeDeltaSensorAsync -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +77 | DateTimeTrigger, +78 | TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.sensors.time_delta import TimeDeltaSensorAsync +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.sensors.weekday.DayOfWeekSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:84:1 @@ -726,23 +698,22 @@ AIR312 [*] `airflow.sensors.weekday.DayOfWeekSensor` is deprecated and moved int 86 | WorkflowTrigger() | help: Install `apache-airflow-providers-standard>=0.0.1` and use `DayOfWeekSensor` from `airflow.providers.standard.sensors.weekday` instead. - -ℹ Unsafe fix -68 68 | TimeDeltaSensor, -69 69 | TimeDeltaSensorAsync, -70 70 | ) -71 |-from airflow.sensors.weekday import DayOfWeekSensor -72 71 | from airflow.triggers.external_task import ( -73 72 | DagStateTrigger, -74 73 | WorkflowTrigger, +68 | TimeDeltaSensor, +69 | TimeDeltaSensorAsync, +70 | ) + - from airflow.sensors.weekday import DayOfWeekSensor +71 | from airflow.triggers.external_task import ( +72 | DagStateTrigger, +73 | WorkflowTrigger, -------------------------------------------------------------------------------- -78 77 | DateTimeTrigger, -79 78 | TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.sensors.weekday import DayOfWeekSensor -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +77 | DateTimeTrigger, +78 | TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.sensors.weekday import DayOfWeekSensor +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.triggers.external_task.DagStateTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:85:1 @@ -755,23 +726,22 @@ AIR312 [*] `airflow.triggers.external_task.DagStateTrigger` is deprecated and mo 87 | FileTrigger() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `DagStateTrigger` from `airflow.providers.standard.triggers.external_task` instead. - -ℹ Unsafe fix -70 70 | ) -71 71 | from airflow.sensors.weekday import DayOfWeekSensor -72 72 | from airflow.triggers.external_task import ( -73 |- DagStateTrigger, -74 73 | WorkflowTrigger, -75 74 | ) -76 75 | from airflow.triggers.file import FileTrigger +70 | ) +71 | from airflow.sensors.weekday import DayOfWeekSensor +72 | from airflow.triggers.external_task import ( + - DagStateTrigger, +73 | WorkflowTrigger, +74 | ) +75 | from airflow.triggers.file import FileTrigger -------------------------------------------------------------------------------- -78 77 | DateTimeTrigger, -79 78 | TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.triggers.external_task import DagStateTrigger -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +77 | DateTimeTrigger, +78 | TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.triggers.external_task import DagStateTrigger +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.triggers.external_task.WorkflowTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:86:1 @@ -784,22 +754,21 @@ AIR312 [*] `airflow.triggers.external_task.WorkflowTrigger` is deprecated and mo 88 | DateTimeTrigger() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `WorkflowTrigger` from `airflow.providers.standard.triggers.external_task` instead. - -ℹ Unsafe fix -71 71 | from airflow.sensors.weekday import DayOfWeekSensor -72 72 | from airflow.triggers.external_task import ( -73 73 | DagStateTrigger, -74 |- WorkflowTrigger, -75 74 | ) -76 75 | from airflow.triggers.file import FileTrigger -77 76 | from airflow.triggers.temporal import ( -78 77 | DateTimeTrigger, -79 78 | TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.triggers.external_task import WorkflowTrigger -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +71 | from airflow.sensors.weekday import DayOfWeekSensor +72 | from airflow.triggers.external_task import ( +73 | DagStateTrigger, + - WorkflowTrigger, +74 | ) +75 | from airflow.triggers.file import FileTrigger +76 | from airflow.triggers.temporal import ( +77 | DateTimeTrigger, +78 | TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.triggers.external_task import WorkflowTrigger +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.triggers.file.FileTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:87:1 @@ -812,20 +781,19 @@ AIR312 [*] `airflow.triggers.file.FileTrigger` is deprecated and moved into `sta 89 | TimeDeltaTrigger() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `FileTrigger` from `airflow.providers.standard.triggers.file` instead. - -ℹ Unsafe fix -73 73 | DagStateTrigger, -74 74 | WorkflowTrigger, -75 75 | ) -76 |-from airflow.triggers.file import FileTrigger -77 76 | from airflow.triggers.temporal import ( -78 77 | DateTimeTrigger, -79 78 | TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.triggers.file import FileTrigger -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +73 | DagStateTrigger, +74 | WorkflowTrigger, +75 | ) + - from airflow.triggers.file import FileTrigger +76 | from airflow.triggers.temporal import ( +77 | DateTimeTrigger, +78 | TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.triggers.file import FileTrigger +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.triggers.temporal.DateTimeTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:88:1 @@ -837,18 +805,17 @@ AIR312 [*] `airflow.triggers.temporal.DateTimeTrigger` is deprecated and moved i 89 | TimeDeltaTrigger() | help: Install `apache-airflow-providers-standard>=0.0.3` and use `DateTimeTrigger` from `airflow.providers.standard.triggers.temporal` instead. - -ℹ Unsafe fix -75 75 | ) -76 76 | from airflow.triggers.file import FileTrigger -77 77 | from airflow.triggers.temporal import ( -78 |- DateTimeTrigger, -79 78 | TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.triggers.temporal import DateTimeTrigger -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +75 | ) +76 | from airflow.triggers.file import FileTrigger +77 | from airflow.triggers.temporal import ( + - DateTimeTrigger, +78 | TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.triggers.temporal import DateTimeTrigger +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior AIR312 [*] `airflow.triggers.temporal.TimeDeltaTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version. --> AIR312.py:89:1 @@ -859,14 +826,13 @@ AIR312 [*] `airflow.triggers.temporal.TimeDeltaTrigger` is deprecated and moved | ^^^^^^^^^^^^^^^^ | help: Install `apache-airflow-providers-standard>=0.0.3` and use `TimeDeltaTrigger` from `airflow.providers.standard.triggers.temporal` instead. - -ℹ Unsafe fix -76 76 | from airflow.triggers.file import FileTrigger -77 77 | from airflow.triggers.temporal import ( -78 78 | DateTimeTrigger, -79 |- TimeDeltaTrigger, -80 79 | ) - 80 |+from airflow.providers.standard.triggers.temporal import TimeDeltaTrigger -81 81 | -82 82 | TimeDeltaSensor() -83 83 | TimeDeltaSensorAsync() +76 | from airflow.triggers.file import FileTrigger +77 | from airflow.triggers.temporal import ( +78 | DateTimeTrigger, + - TimeDeltaTrigger, +79 | ) +80 + from airflow.providers.standard.triggers.temporal import TimeDeltaTrigger +81 | +82 | TimeDeltaSensor() +83 | TimeDeltaSensorAsync() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap b/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap index 395f946062..26fd9af4b2 100644 --- a/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap +++ b/crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap @@ -10,12 +10,11 @@ ERA001 Found commented-out code 3 | #a = 3 | help: Remove commented-out code - -ℹ Display-only fix -1 |-#import os -2 1 | # from foo import junk -3 2 | #a = 3 -4 3 | a = 4 + - #import os +1 | # from foo import junk +2 | #a = 3 +3 | a = 4 +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:2:1 @@ -27,13 +26,12 @@ ERA001 Found commented-out code 4 | a = 4 | help: Remove commented-out code - -ℹ Display-only fix -1 1 | #import os -2 |-# from foo import junk -3 2 | #a = 3 -4 3 | a = 4 -5 4 | #foo(1, 2, 3) +1 | #import os + - # from foo import junk +2 | #a = 3 +3 | a = 4 +4 | #foo(1, 2, 3) +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:3:1 @@ -46,14 +44,13 @@ ERA001 Found commented-out code 5 | #foo(1, 2, 3) | help: Remove commented-out code - -ℹ Display-only fix -1 1 | #import os -2 2 | # from foo import junk -3 |-#a = 3 -4 3 | a = 4 -5 4 | #foo(1, 2, 3) -6 5 | +1 | #import os +2 | # from foo import junk + - #a = 3 +3 | a = 4 +4 | #foo(1, 2, 3) +5 | +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:5:1 @@ -66,15 +63,14 @@ ERA001 Found commented-out code 7 | def foo(x, y, z): | help: Remove commented-out code - -ℹ Display-only fix -2 2 | # from foo import junk -3 3 | #a = 3 -4 4 | a = 4 -5 |-#foo(1, 2, 3) -6 5 | -7 6 | def foo(x, y, z): -8 7 | content = 1 # print('hello') +2 | # from foo import junk +3 | #a = 3 +4 | a = 4 + - #foo(1, 2, 3) +5 | +6 | def foo(x, y, z): +7 | content = 1 # print('hello') +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:13:5 @@ -86,15 +82,14 @@ ERA001 Found commented-out code 14 | return False | help: Remove commented-out code - -ℹ Display-only fix -10 10 | -11 11 | # This is a real comment. -12 12 | # # This is a (nested) comment. -13 |- #return True -14 13 | return False -15 14 | -16 15 | #import os # noqa: ERA001 +10 | +11 | # This is a real comment. +12 | # # This is a (nested) comment. + - #return True +13 | return False +14 | +15 | #import os # noqa: ERA001 +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:21:5 @@ -105,15 +100,14 @@ ERA001 Found commented-out code | ^^^^^^^ | help: Remove commented-out code - -ℹ Display-only fix -18 18 | -19 19 | class A(): -20 20 | pass -21 |- # b = c -22 21 | -23 22 | -24 23 | dictionary = { +18 | +19 | class A(): +20 | pass + - # b = c +21 | +22 | +23 | dictionary = { +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:26:5 @@ -126,15 +120,14 @@ ERA001 Found commented-out code 28 | } | help: Remove commented-out code - -ℹ Display-only fix -23 23 | -24 24 | dictionary = { -25 25 | # "key1": 123, # noqa: ERA001 -26 |- # "key2": 456, -27 26 | # "key3": 789, # test -28 27 | } -29 28 | +23 | +24 | dictionary = { +25 | # "key1": 123, # noqa: ERA001 + - # "key2": 456, +26 | # "key3": 789, # test +27 | } +28 | +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:27:5 @@ -146,15 +139,14 @@ ERA001 Found commented-out code 28 | } | help: Remove commented-out code - -ℹ Display-only fix -24 24 | dictionary = { -25 25 | # "key1": 123, # noqa: ERA001 -26 26 | # "key2": 456, -27 |- # "key3": 789, # test -28 27 | } -29 28 | -30 29 | #import os # noqa +24 | dictionary = { +25 | # "key1": 123, # noqa: ERA001 +26 | # "key2": 456, + - # "key3": 789, # test +27 | } +28 | +29 | #import os # noqa +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:32:1 @@ -167,15 +159,14 @@ ERA001 Found commented-out code 34 | # try: # with comment | help: Remove commented-out code - -ℹ Display-only fix -29 29 | -30 30 | #import os # noqa -31 31 | -32 |-# case 1: -33 32 | # try: -34 33 | # try: # with comment -35 34 | # try: print() +29 | +30 | #import os # noqa +31 | + - # case 1: +32 | # try: +33 | # try: # with comment +34 | # try: print() +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:33:1 @@ -187,15 +178,14 @@ ERA001 Found commented-out code 35 | # try: print() | help: Remove commented-out code - -ℹ Display-only fix -30 30 | #import os # noqa -31 31 | -32 32 | # case 1: -33 |-# try: -34 33 | # try: # with comment -35 34 | # try: print() -36 35 | # except: +30 | #import os # noqa +31 | +32 | # case 1: + - # try: +33 | # try: # with comment +34 | # try: print() +35 | # except: +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:34:1 @@ -208,15 +198,14 @@ ERA001 Found commented-out code 36 | # except: | help: Remove commented-out code - -ℹ Display-only fix -31 31 | -32 32 | # case 1: -33 33 | # try: -34 |-# try: # with comment -35 34 | # try: print() -36 35 | # except: -37 36 | # except Foo: +31 | +32 | # case 1: +33 | # try: + - # try: # with comment +34 | # try: print() +35 | # except: +36 | # except Foo: +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:35:1 @@ -229,15 +218,14 @@ ERA001 Found commented-out code 37 | # except Foo: | help: Remove commented-out code - -ℹ Display-only fix -32 32 | # case 1: -33 33 | # try: -34 34 | # try: # with comment -35 |-# try: print() -36 35 | # except: -37 36 | # except Foo: -38 37 | # except Exception as e: print(e) +32 | # case 1: +33 | # try: +34 | # try: # with comment + - # try: print() +35 | # except: +36 | # except Foo: +37 | # except Exception as e: print(e) +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:36:1 @@ -250,15 +238,14 @@ ERA001 Found commented-out code 38 | # except Exception as e: print(e) | help: Remove commented-out code - -ℹ Display-only fix -33 33 | # try: -34 34 | # try: # with comment -35 35 | # try: print() -36 |-# except: -37 36 | # except Foo: -38 37 | # except Exception as e: print(e) -39 38 | +33 | # try: +34 | # try: # with comment +35 | # try: print() + - # except: +36 | # except Foo: +37 | # except Exception as e: print(e) +38 | +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:37:1 @@ -270,15 +257,14 @@ ERA001 Found commented-out code 38 | # except Exception as e: print(e) | help: Remove commented-out code - -ℹ Display-only fix -34 34 | # try: # with comment -35 35 | # try: print() -36 36 | # except: -37 |-# except Foo: -38 37 | # except Exception as e: print(e) -39 38 | -40 39 | +34 | # try: # with comment +35 | # try: print() +36 | # except: + - # except Foo: +37 | # except Exception as e: print(e) +38 | +39 | +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:38:1 @@ -289,15 +275,14 @@ ERA001 Found commented-out code | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove commented-out code - -ℹ Display-only fix -35 35 | # try: print() -36 36 | # except: -37 37 | # except Foo: -38 |-# except Exception as e: print(e) -39 38 | -40 39 | -41 40 | # Script tag without an opening tag (Error) +35 | # try: print() +36 | # except: +37 | # except Foo: + - # except Exception as e: print(e) +38 | +39 | +40 | # Script tag without an opening tag (Error) +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:44:1 @@ -309,15 +294,14 @@ ERA001 Found commented-out code 46 | # "rich", | help: Remove commented-out code - -ℹ Display-only fix -41 41 | # Script tag without an opening tag (Error) -42 42 | -43 43 | # requires-python = ">=3.11" -44 |-# dependencies = [ -45 44 | # "requests<3", -46 45 | # "rich", -47 46 | # ] +41 | # Script tag without an opening tag (Error) +42 | +43 | # requires-python = ">=3.11" + - # dependencies = [ +44 | # "requests<3", +45 | # "rich", +46 | # ] +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:47:1 @@ -329,15 +313,14 @@ ERA001 Found commented-out code 48 | # /// | help: Remove commented-out code - -ℹ Display-only fix -44 44 | # dependencies = [ -45 45 | # "requests<3", -46 46 | # "rich", -47 |-# ] -48 47 | # /// -49 48 | -50 49 | # Script tag (OK) +44 | # dependencies = [ +45 | # "requests<3", +46 | # "rich", + - # ] +47 | # /// +48 | +49 | # Script tag (OK) +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:75:1 @@ -350,15 +333,14 @@ ERA001 Found commented-out code 77 | # "rich", | help: Remove commented-out code - -ℹ Display-only fix -72 72 | -73 73 | # /// script -74 74 | # requires-python = ">=3.11" -75 |-# dependencies = [ -76 75 | # "requests<3", -77 76 | # "rich", -78 77 | # ] +72 | +73 | # /// script +74 | # requires-python = ">=3.11" + - # dependencies = [ +75 | # "requests<3", +76 | # "rich", +77 | # ] +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> ERA001.py:78:1 @@ -371,12 +353,11 @@ ERA001 Found commented-out code 80 | # Script tag block followed by normal block (Ok) | help: Remove commented-out code - -ℹ Display-only fix -75 75 | # dependencies = [ -76 76 | # "requests<3", -77 77 | # "rich", -78 |-# ] -79 78 | -80 79 | # Script tag block followed by normal block (Ok) -81 80 | +75 | # dependencies = [ +76 | # "requests<3", +77 | # "rich", + - # ] +78 | +79 | # Script tag block followed by normal block (Ok) +80 | +note: This is a display-only fix and is likely to be incorrect diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap index cc586b5dad..6ef955da5a 100644 --- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap +++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py.snap @@ -12,24 +12,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 26 | ): | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -21 22 | -22 23 | @app.get("/items/") -23 24 | def get_items( -24 |- current_user: User = Depends(get_current_user), - 25 |+ current_user: Annotated[User, Depends(get_current_user)], -25 26 | some_security_param: str = Security(get_oauth2_user), -26 27 | ): -27 28 | pass +22 | +23 | @app.get("/items/") +24 | def get_items( + - current_user: User = Depends(get_current_user), +25 + current_user: Annotated[User, Depends(get_current_user)], +26 | some_security_param: str = Security(get_oauth2_user), +27 | ): +28 | pass +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:25:5 @@ -42,24 +41,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 27 | pass | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -22 23 | @app.get("/items/") -23 24 | def get_items( -24 25 | current_user: User = Depends(get_current_user), -25 |- some_security_param: str = Security(get_oauth2_user), - 26 |+ some_security_param: Annotated[str, Security(get_oauth2_user)], -26 27 | ): -27 28 | pass -28 29 | +23 | @app.get("/items/") +24 | def get_items( +25 | current_user: User = Depends(get_current_user), + - some_security_param: str = Security(get_oauth2_user), +26 + some_security_param: Annotated[str, Security(get_oauth2_user)], +27 | ): +28 | pass +29 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:32:5 @@ -72,24 +70,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 34 | some_file_param: UploadFile = File(), | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -29 30 | -30 31 | @app.post("/stuff/") -31 32 | def do_stuff( -32 |- some_path_param: str = Path(), - 33 |+ some_path_param: Annotated[str, Path()], -33 34 | some_cookie_param: str = Cookie(), -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), +30 | +31 | @app.post("/stuff/") +32 | def do_stuff( + - some_path_param: str = Path(), +33 + some_path_param: Annotated[str, Path()], +34 | some_cookie_param: str = Cookie(), +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:33:5 @@ -102,24 +99,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 35 | some_form_param: str = Form(), | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -30 31 | @app.post("/stuff/") -31 32 | def do_stuff( -32 33 | some_path_param: str = Path(), -33 |- some_cookie_param: str = Cookie(), - 34 |+ some_cookie_param: Annotated[str, Cookie()], -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), +31 | @app.post("/stuff/") +32 | def do_stuff( +33 | some_path_param: str = Path(), + - some_cookie_param: str = Cookie(), +34 + some_cookie_param: Annotated[str, Cookie()], +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:34:5 @@ -132,24 +128,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 36 | some_query_param: str | None = Query(default=None), | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -31 32 | def do_stuff( -32 33 | some_path_param: str = Path(), -33 34 | some_cookie_param: str = Cookie(), -34 |- some_file_param: UploadFile = File(), - 35 |+ some_file_param: Annotated[UploadFile, File()], -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), -37 38 | some_body_param: str = Body("foo"), +32 | def do_stuff( +33 | some_path_param: str = Path(), +34 | some_cookie_param: str = Cookie(), + - some_file_param: UploadFile = File(), +35 + some_file_param: Annotated[UploadFile, File()], +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), +38 | some_body_param: str = Body("foo"), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:35:5 @@ -162,24 +157,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 37 | some_body_param: str = Body("foo"), | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -32 33 | some_path_param: str = Path(), -33 34 | some_cookie_param: str = Cookie(), -34 35 | some_file_param: UploadFile = File(), -35 |- some_form_param: str = Form(), - 36 |+ some_form_param: Annotated[str, Form()], -36 37 | some_query_param: str | None = Query(default=None), -37 38 | some_body_param: str = Body("foo"), -38 39 | some_header_param: int = Header(default=5), +33 | some_path_param: str = Path(), +34 | some_cookie_param: str = Cookie(), +35 | some_file_param: UploadFile = File(), + - some_form_param: str = Form(), +36 + some_form_param: Annotated[str, Form()], +37 | some_query_param: str | None = Query(default=None), +38 | some_body_param: str = Body("foo"), +39 | some_header_param: int = Header(default=5), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:36:5 @@ -192,24 +186,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 38 | some_header_param: int = Header(default=5), | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -33 34 | some_cookie_param: str = Cookie(), -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), -36 |- some_query_param: str | None = Query(default=None), - 37 |+ some_query_param: Annotated[str | None, Query()] = None, -37 38 | some_body_param: str = Body("foo"), -38 39 | some_header_param: int = Header(default=5), -39 40 | ): +34 | some_cookie_param: str = Cookie(), +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), + - some_query_param: str | None = Query(default=None), +37 + some_query_param: Annotated[str | None, Query()] = None, +38 | some_body_param: str = Body("foo"), +39 | some_header_param: int = Header(default=5), +40 | ): +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:37:5 @@ -222,24 +215,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 39 | ): | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), -37 |- some_body_param: str = Body("foo"), - 38 |+ some_body_param: Annotated[str, Body()] = "foo", -38 39 | some_header_param: int = Header(default=5), -39 40 | ): -40 41 | # do stuff +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), + - some_body_param: str = Body("foo"), +38 + some_body_param: Annotated[str, Body()] = "foo", +39 | some_header_param: int = Header(default=5), +40 | ): +41 | # do stuff +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:38:5 @@ -252,24 +244,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 40 | # do stuff | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), -37 38 | some_body_param: str = Body("foo"), -38 |- some_header_param: int = Header(default=5), - 39 |+ some_header_param: Annotated[int, Header()] = 5, -39 40 | ): -40 41 | # do stuff -41 42 | pass +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), +38 | some_body_param: str = Body("foo"), + - some_header_param: int = Header(default=5), +39 + some_header_param: Annotated[int, Header()] = 5, +40 | ): +41 | # do stuff +42 | pass +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:47:5 @@ -282,24 +273,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 49 | pass | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -44 45 | def get_users( -45 46 | skip: int, -46 47 | limit: int, -47 |- current_user: User = Depends(get_current_user), - 48 |+ current_user: Annotated[User, Depends(get_current_user)], -48 49 | ): -49 50 | pass -50 51 | +45 | def get_users( +46 | skip: int, +47 | limit: int, + - current_user: User = Depends(get_current_user), +48 + current_user: Annotated[User, Depends(get_current_user)], +49 | ): +50 | pass +51 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:53:5 @@ -312,24 +302,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 55 | limit: int = 10, | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -50 51 | -51 52 | @app.get("/users/") -52 53 | def get_users( -53 |- current_user: User = Depends(get_current_user), - 54 |+ current_user: Annotated[User, Depends(get_current_user)], -54 55 | skip: int = 0, -55 56 | limit: int = 10, -56 57 | ): +51 | +52 | @app.get("/users/") +53 | def get_users( + - current_user: User = Depends(get_current_user), +54 + current_user: Annotated[User, Depends(get_current_user)], +55 | skip: int = 0, +56 | limit: int = 10, +57 | ): +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:61:25 @@ -340,24 +329,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 62 | pass | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -58 59 | -59 60 | -60 61 | @app.get("/items/{item_id}") -61 |-async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str): - 62 |+async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str): -62 63 | pass -63 64 | -64 65 | # Non fixable errors +59 | +60 | +61 | @app.get("/items/{item_id}") + - async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str): +62 + async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str): +63 | pass +64 | +65 | # Non fixable errors +note: This is an unsafe fix and may change runtime behavior FAST002 FastAPI dependency without `Annotated` --> FAST002_0.py:70:5 diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap index 31a2121a47..140f353c19 100644 --- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap +++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_0.py_py38.snap @@ -12,24 +12,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 26 | ): | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -21 22 | -22 23 | @app.get("/items/") -23 24 | def get_items( -24 |- current_user: User = Depends(get_current_user), - 25 |+ current_user: Annotated[User, Depends(get_current_user)], -25 26 | some_security_param: str = Security(get_oauth2_user), -26 27 | ): -27 28 | pass +22 | +23 | @app.get("/items/") +24 | def get_items( + - current_user: User = Depends(get_current_user), +25 + current_user: Annotated[User, Depends(get_current_user)], +26 | some_security_param: str = Security(get_oauth2_user), +27 | ): +28 | pass +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:25:5 @@ -42,24 +41,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 27 | pass | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -22 23 | @app.get("/items/") -23 24 | def get_items( -24 25 | current_user: User = Depends(get_current_user), -25 |- some_security_param: str = Security(get_oauth2_user), - 26 |+ some_security_param: Annotated[str, Security(get_oauth2_user)], -26 27 | ): -27 28 | pass -28 29 | +23 | @app.get("/items/") +24 | def get_items( +25 | current_user: User = Depends(get_current_user), + - some_security_param: str = Security(get_oauth2_user), +26 + some_security_param: Annotated[str, Security(get_oauth2_user)], +27 | ): +28 | pass +29 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:32:5 @@ -72,24 +70,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 34 | some_file_param: UploadFile = File(), | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -29 30 | -30 31 | @app.post("/stuff/") -31 32 | def do_stuff( -32 |- some_path_param: str = Path(), - 33 |+ some_path_param: Annotated[str, Path()], -33 34 | some_cookie_param: str = Cookie(), -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), +30 | +31 | @app.post("/stuff/") +32 | def do_stuff( + - some_path_param: str = Path(), +33 + some_path_param: Annotated[str, Path()], +34 | some_cookie_param: str = Cookie(), +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:33:5 @@ -102,24 +99,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 35 | some_form_param: str = Form(), | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -30 31 | @app.post("/stuff/") -31 32 | def do_stuff( -32 33 | some_path_param: str = Path(), -33 |- some_cookie_param: str = Cookie(), - 34 |+ some_cookie_param: Annotated[str, Cookie()], -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), +31 | @app.post("/stuff/") +32 | def do_stuff( +33 | some_path_param: str = Path(), + - some_cookie_param: str = Cookie(), +34 + some_cookie_param: Annotated[str, Cookie()], +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:34:5 @@ -132,24 +128,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 36 | some_query_param: str | None = Query(default=None), | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -31 32 | def do_stuff( -32 33 | some_path_param: str = Path(), -33 34 | some_cookie_param: str = Cookie(), -34 |- some_file_param: UploadFile = File(), - 35 |+ some_file_param: Annotated[UploadFile, File()], -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), -37 38 | some_body_param: str = Body("foo"), +32 | def do_stuff( +33 | some_path_param: str = Path(), +34 | some_cookie_param: str = Cookie(), + - some_file_param: UploadFile = File(), +35 + some_file_param: Annotated[UploadFile, File()], +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), +38 | some_body_param: str = Body("foo"), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:35:5 @@ -162,24 +157,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 37 | some_body_param: str = Body("foo"), | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -32 33 | some_path_param: str = Path(), -33 34 | some_cookie_param: str = Cookie(), -34 35 | some_file_param: UploadFile = File(), -35 |- some_form_param: str = Form(), - 36 |+ some_form_param: Annotated[str, Form()], -36 37 | some_query_param: str | None = Query(default=None), -37 38 | some_body_param: str = Body("foo"), -38 39 | some_header_param: int = Header(default=5), +33 | some_path_param: str = Path(), +34 | some_cookie_param: str = Cookie(), +35 | some_file_param: UploadFile = File(), + - some_form_param: str = Form(), +36 + some_form_param: Annotated[str, Form()], +37 | some_query_param: str | None = Query(default=None), +38 | some_body_param: str = Body("foo"), +39 | some_header_param: int = Header(default=5), +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:36:5 @@ -192,24 +186,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 38 | some_header_param: int = Header(default=5), | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -33 34 | some_cookie_param: str = Cookie(), -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), -36 |- some_query_param: str | None = Query(default=None), - 37 |+ some_query_param: Annotated[str | None, Query()] = None, -37 38 | some_body_param: str = Body("foo"), -38 39 | some_header_param: int = Header(default=5), -39 40 | ): +34 | some_cookie_param: str = Cookie(), +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), + - some_query_param: str | None = Query(default=None), +37 + some_query_param: Annotated[str | None, Query()] = None, +38 | some_body_param: str = Body("foo"), +39 | some_header_param: int = Header(default=5), +40 | ): +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:37:5 @@ -222,24 +215,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 39 | ): | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -34 35 | some_file_param: UploadFile = File(), -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), -37 |- some_body_param: str = Body("foo"), - 38 |+ some_body_param: Annotated[str, Body()] = "foo", -38 39 | some_header_param: int = Header(default=5), -39 40 | ): -40 41 | # do stuff +35 | some_file_param: UploadFile = File(), +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), + - some_body_param: str = Body("foo"), +38 + some_body_param: Annotated[str, Body()] = "foo", +39 | some_header_param: int = Header(default=5), +40 | ): +41 | # do stuff +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:38:5 @@ -252,24 +244,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 40 | # do stuff | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -35 36 | some_form_param: str = Form(), -36 37 | some_query_param: str | None = Query(default=None), -37 38 | some_body_param: str = Body("foo"), -38 |- some_header_param: int = Header(default=5), - 39 |+ some_header_param: Annotated[int, Header()] = 5, -39 40 | ): -40 41 | # do stuff -41 42 | pass +36 | some_form_param: str = Form(), +37 | some_query_param: str | None = Query(default=None), +38 | some_body_param: str = Body("foo"), + - some_header_param: int = Header(default=5), +39 + some_header_param: Annotated[int, Header()] = 5, +40 | ): +41 | # do stuff +42 | pass +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:47:5 @@ -282,24 +273,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 49 | pass | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -44 45 | def get_users( -45 46 | skip: int, -46 47 | limit: int, -47 |- current_user: User = Depends(get_current_user), - 48 |+ current_user: Annotated[User, Depends(get_current_user)], -48 49 | ): -49 50 | pass -50 51 | +45 | def get_users( +46 | skip: int, +47 | limit: int, + - current_user: User = Depends(get_current_user), +48 + current_user: Annotated[User, Depends(get_current_user)], +49 | ): +50 | pass +51 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:53:5 @@ -312,24 +302,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 55 | limit: int = 10, | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -50 51 | -51 52 | @app.get("/users/") -52 53 | def get_users( -53 |- current_user: User = Depends(get_current_user), - 54 |+ current_user: Annotated[User, Depends(get_current_user)], -54 55 | skip: int = 0, -55 56 | limit: int = 10, -56 57 | ): +51 | +52 | @app.get("/users/") +53 | def get_users( + - current_user: User = Depends(get_current_user), +54 + current_user: Annotated[User, Depends(get_current_user)], +55 | skip: int = 0, +56 | limit: int = 10, +57 | ): +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_0.py:61:25 @@ -340,24 +329,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 62 | pass | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -12 12 | Security, -13 13 | ) -14 14 | from pydantic import BaseModel - 15 |+from typing_extensions import Annotated -15 16 | -16 17 | app = FastAPI() -17 18 | router = APIRouter() +12 | Security, +13 | ) +14 | from pydantic import BaseModel +15 + from typing_extensions import Annotated +16 | +17 | app = FastAPI() +18 | router = APIRouter() -------------------------------------------------------------------------------- -58 59 | -59 60 | -60 61 | @app.get("/items/{item_id}") -61 |-async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str): - 62 |+async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str): -62 63 | pass -63 64 | -64 65 | # Non fixable errors +59 | +60 | +61 | @app.get("/items/{item_id}") + - async def read_items(*, item_id: int = Path(title="The ID of the item to get"), q: str): +62 + async def read_items(*, item_id: Annotated[int, Path(title="The ID of the item to get")], q: str): +63 | pass +64 | +65 | # Non fixable errors +note: This is an unsafe fix and may change runtime behavior FAST002 FastAPI dependency without `Annotated` --> FAST002_0.py:70:5 diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap index 90cef9a1a3..27e4efefd5 100644 --- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap +++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py.snap @@ -10,22 +10,21 @@ FAST002 [*] FastAPI dependency without `Annotated` 11 | return echo | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -2 2 | values. See #15043 for more details.""" -3 3 | -4 4 | from fastapi import FastAPI, Query - 5 |+from typing import Annotated -5 6 | -6 7 | app = FastAPI() -7 8 | -8 9 | -9 10 | @app.get("/test") -10 |-def handler(echo: str = Query("")): - 11 |+def handler(echo: Annotated[str, Query()] = ""): -11 12 | return echo -12 13 | -13 14 | +2 | values. See #15043 for more details.""" +3 | +4 | from fastapi import FastAPI, Query +5 + from typing import Annotated +6 | +7 | app = FastAPI() +8 | +9 | +10 | @app.get("/test") + - def handler(echo: str = Query("")): +11 + def handler(echo: Annotated[str, Query()] = ""): +12 | return echo +13 | +14 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_1.py:15:14 @@ -36,24 +35,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 16 | return echo | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -2 2 | values. See #15043 for more details.""" -3 3 | -4 4 | from fastapi import FastAPI, Query - 5 |+from typing import Annotated -5 6 | -6 7 | app = FastAPI() -7 8 | +2 | values. See #15043 for more details.""" +3 | +4 | from fastapi import FastAPI, Query +5 + from typing import Annotated +6 | +7 | app = FastAPI() +8 | -------------------------------------------------------------------------------- -12 13 | -13 14 | -14 15 | @app.get("/test") -15 |-def handler2(echo: str = Query(default="")): - 16 |+def handler2(echo: Annotated[str, Query()] = ""): -16 17 | return echo -17 18 | -18 19 | +13 | +14 | +15 | @app.get("/test") + - def handler2(echo: str = Query(default="")): +16 + def handler2(echo: Annotated[str, Query()] = ""): +17 | return echo +18 | +19 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_1.py:20:14 @@ -64,19 +62,18 @@ FAST002 [*] FastAPI dependency without `Annotated` 21 | return echo | help: Replace with `typing.Annotated` - -ℹ Unsafe fix -2 2 | values. See #15043 for more details.""" -3 3 | -4 4 | from fastapi import FastAPI, Query - 5 |+from typing import Annotated -5 6 | -6 7 | app = FastAPI() -7 8 | +2 | values. See #15043 for more details.""" +3 | +4 | from fastapi import FastAPI, Query +5 + from typing import Annotated +6 | +7 | app = FastAPI() +8 | -------------------------------------------------------------------------------- -17 18 | -18 19 | -19 20 | @app.get("/test") -20 |-def handler3(echo: str = Query("123", min_length=3, max_length=50)): - 21 |+def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"): -21 22 | return echo +18 | +19 | +20 | @app.get("/test") + - def handler3(echo: str = Query("123", min_length=3, max_length=50)): +21 + def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"): +22 | return echo +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap index d67640cbc7..b254e53376 100644 --- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap +++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-non-annotated-dependency_FAST002_1.py_py38.snap @@ -10,22 +10,21 @@ FAST002 [*] FastAPI dependency without `Annotated` 11 | return echo | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -2 2 | values. See #15043 for more details.""" -3 3 | -4 4 | from fastapi import FastAPI, Query - 5 |+from typing_extensions import Annotated -5 6 | -6 7 | app = FastAPI() -7 8 | -8 9 | -9 10 | @app.get("/test") -10 |-def handler(echo: str = Query("")): - 11 |+def handler(echo: Annotated[str, Query()] = ""): -11 12 | return echo -12 13 | -13 14 | +2 | values. See #15043 for more details.""" +3 | +4 | from fastapi import FastAPI, Query +5 + from typing_extensions import Annotated +6 | +7 | app = FastAPI() +8 | +9 | +10 | @app.get("/test") + - def handler(echo: str = Query("")): +11 + def handler(echo: Annotated[str, Query()] = ""): +12 | return echo +13 | +14 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_1.py:15:14 @@ -36,24 +35,23 @@ FAST002 [*] FastAPI dependency without `Annotated` 16 | return echo | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -2 2 | values. See #15043 for more details.""" -3 3 | -4 4 | from fastapi import FastAPI, Query - 5 |+from typing_extensions import Annotated -5 6 | -6 7 | app = FastAPI() -7 8 | +2 | values. See #15043 for more details.""" +3 | +4 | from fastapi import FastAPI, Query +5 + from typing_extensions import Annotated +6 | +7 | app = FastAPI() +8 | -------------------------------------------------------------------------------- -12 13 | -13 14 | -14 15 | @app.get("/test") -15 |-def handler2(echo: str = Query(default="")): - 16 |+def handler2(echo: Annotated[str, Query()] = ""): -16 17 | return echo -17 18 | -18 19 | +13 | +14 | +15 | @app.get("/test") + - def handler2(echo: str = Query(default="")): +16 + def handler2(echo: Annotated[str, Query()] = ""): +17 | return echo +18 | +19 | +note: This is an unsafe fix and may change runtime behavior FAST002 [*] FastAPI dependency without `Annotated` --> FAST002_1.py:20:14 @@ -64,19 +62,18 @@ FAST002 [*] FastAPI dependency without `Annotated` 21 | return echo | help: Replace with `typing_extensions.Annotated` - -ℹ Unsafe fix -2 2 | values. See #15043 for more details.""" -3 3 | -4 4 | from fastapi import FastAPI, Query - 5 |+from typing_extensions import Annotated -5 6 | -6 7 | app = FastAPI() -7 8 | +2 | values. See #15043 for more details.""" +3 | +4 | from fastapi import FastAPI, Query +5 + from typing_extensions import Annotated +6 | +7 | app = FastAPI() +8 | -------------------------------------------------------------------------------- -17 18 | -18 19 | -19 20 | @app.get("/test") -20 |-def handler3(echo: str = Query("123", min_length=3, max_length=50)): - 21 |+def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"): -21 22 | return echo +18 | +19 | +20 | @app.get("/test") + - def handler3(echo: str = Query("123", min_length=3, max_length=50)): +21 + def handler3(echo: Annotated[str, Query(min_length=3, max_length=50)] = "123"): +22 | return echo +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap index 16221a6d45..f1c5682ef4 100644 --- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap +++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-redundant-response-model_FAST001.py.snap @@ -10,16 +10,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 19 | return item | help: Remove argument - -ℹ Unsafe fix -14 14 | # Errors -15 15 | -16 16 | -17 |-@app.post("/items/", response_model=Item) - 17 |+@app.post("/items/") -18 18 | async def create_item(item: Item) -> Item: -19 19 | return item -20 20 | +14 | # Errors +15 | +16 | + - @app.post("/items/", response_model=Item) +17 + @app.post("/items/") +18 | async def create_item(item: Item) -> Item: +19 | return item +20 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:22:22 @@ -30,16 +29,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 24 | return item | help: Remove argument - -ℹ Unsafe fix -19 19 | return item -20 20 | -21 21 | -22 |-@app.post("/items/", response_model=list[Item]) - 22 |+@app.post("/items/") -23 23 | async def create_item(item: Item) -> list[Item]: -24 24 | return item -25 25 | +19 | return item +20 | +21 | + - @app.post("/items/", response_model=list[Item]) +22 + @app.post("/items/") +23 | async def create_item(item: Item) -> list[Item]: +24 | return item +25 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:27:22 @@ -50,16 +48,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 29 | return item | help: Remove argument - -ℹ Unsafe fix -24 24 | return item -25 25 | -26 26 | -27 |-@app.post("/items/", response_model=List[Item]) - 27 |+@app.post("/items/") -28 28 | async def create_item(item: Item) -> List[Item]: -29 29 | return item -30 30 | +24 | return item +25 | +26 | + - @app.post("/items/", response_model=List[Item]) +27 + @app.post("/items/") +28 | async def create_item(item: Item) -> List[Item]: +29 | return item +30 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:32:22 @@ -70,16 +67,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 34 | return item | help: Remove argument - -ℹ Unsafe fix -29 29 | return item -30 30 | -31 31 | -32 |-@app.post("/items/", response_model=Dict[str, Item]) - 32 |+@app.post("/items/") -33 33 | async def create_item(item: Item) -> Dict[str, Item]: -34 34 | return item -35 35 | +29 | return item +30 | +31 | + - @app.post("/items/", response_model=Dict[str, Item]) +32 + @app.post("/items/") +33 | async def create_item(item: Item) -> Dict[str, Item]: +34 | return item +35 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:37:22 @@ -90,16 +86,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 39 | return item | help: Remove argument - -ℹ Unsafe fix -34 34 | return item -35 35 | -36 36 | -37 |-@app.post("/items/", response_model=str) - 37 |+@app.post("/items/") -38 38 | async def create_item(item: Item) -> str: -39 39 | return item -40 40 | +34 | return item +35 | +36 | + - @app.post("/items/", response_model=str) +37 + @app.post("/items/") +38 | async def create_item(item: Item) -> str: +39 | return item +40 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:42:21 @@ -110,16 +105,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 44 | return item | help: Remove argument - -ℹ Unsafe fix -39 39 | return item -40 40 | -41 41 | -42 |-@app.get("/items/", response_model=Item) - 42 |+@app.get("/items/") -43 43 | async def create_item(item: Item) -> Item: -44 44 | return item -45 45 | +39 | return item +40 | +41 | + - @app.get("/items/", response_model=Item) +42 + @app.get("/items/") +43 | async def create_item(item: Item) -> Item: +44 | return item +45 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:47:21 @@ -130,16 +124,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 49 | async def create_item(item: Item) -> Item: | help: Remove argument - -ℹ Unsafe fix -44 44 | return item -45 45 | -46 46 | -47 |-@app.get("/items/", response_model=Item) - 47 |+@app.get("/items/") -48 48 | @app.post("/items/", response_model=Item) -49 49 | async def create_item(item: Item) -> Item: -50 50 | return item +44 | return item +45 | +46 | + - @app.get("/items/", response_model=Item) +47 + @app.get("/items/") +48 | @app.post("/items/", response_model=Item) +49 | async def create_item(item: Item) -> Item: +50 | return item +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:48:22 @@ -151,16 +144,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 50 | return item | help: Remove argument - -ℹ Unsafe fix -45 45 | -46 46 | -47 47 | @app.get("/items/", response_model=Item) -48 |-@app.post("/items/", response_model=Item) - 48 |+@app.post("/items/") -49 49 | async def create_item(item: Item) -> Item: -50 50 | return item -51 51 | +45 | +46 | +47 | @app.get("/items/", response_model=Item) + - @app.post("/items/", response_model=Item) +48 + @app.post("/items/") +49 | async def create_item(item: Item) -> Item: +50 | return item +51 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:53:24 @@ -171,16 +163,15 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 55 | return item | help: Remove argument - -ℹ Unsafe fix -50 50 | return item -51 51 | -52 52 | -53 |-@router.get("/items/", response_model=Item) - 53 |+@router.get("/items/") -54 54 | async def create_item(item: Item) -> Item: -55 55 | return item -56 56 | +50 | return item +51 | +52 | + - @router.get("/items/", response_model=Item) +53 + @router.get("/items/") +54 | async def create_item(item: Item) -> Item: +55 | return item +56 | +note: This is an unsafe fix and may change runtime behavior FAST001 [*] FastAPI route with redundant `response_model` argument --> FAST001.py:118:23 @@ -193,13 +184,12 @@ FAST001 [*] FastAPI route with redundant `response_model` argument 120 | return "Hello World!" | help: Remove argument - -ℹ Unsafe fix -115 115 | -116 116 | def setup_app(app_arg: FastAPI, non_app: str) -> None: -117 117 | # Error -118 |- @app_arg.get("/", response_model=str) - 118 |+ @app_arg.get("/") -119 119 | async def get_root() -> str: -120 120 | return "Hello World!" -121 121 | +115 | +116 | def setup_app(app_arg: FastAPI, non_app: str) -> None: +117 | # Error + - @app_arg.get("/", response_model=str) +118 + @app_arg.get("/") +119 | async def get_root() -> str: +120 | return "Hello World!" +121 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap index bbd030304c..62ca78ce45 100644 --- a/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap +++ b/crates/ruff_linter/src/rules/fastapi/snapshots/ruff_linter__rules__fastapi__tests__fast-api-unused-path-parameter_FAST003.py.snap @@ -11,16 +11,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` 11 | return {"query": query} | help: Add `thing_id` to function signature - -ℹ Unsafe fix -7 7 | -8 8 | # Errors -9 9 | @app.get("/things/{thing_id}") -10 |-async def read_thing(query: str): - 10 |+async def read_thing(query: str, thing_id): -11 11 | return {"query": query} -12 12 | -13 13 | +7 | +8 | # Errors +9 | @app.get("/things/{thing_id}") + - async def read_thing(query: str): +10 + async def read_thing(query: str, thing_id): +11 | return {"query": query} +12 | +13 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `isbn` appears in route path, but not in `read_thing` signature --> FAST003.py:14:23 @@ -31,16 +30,15 @@ FAST003 [*] Parameter `isbn` appears in route path, but not in `read_thing` sign 16 | ... | help: Add `isbn` to function signature - -ℹ Unsafe fix -12 12 | -13 13 | -14 14 | @app.get("/books/isbn-{isbn}") -15 |-async def read_thing(): - 15 |+async def read_thing(isbn): -16 16 | ... -17 17 | -18 18 | +12 | +13 | +14 | @app.get("/books/isbn-{isbn}") + - async def read_thing(): +15 + async def read_thing(isbn): +16 | ... +17 | +18 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature --> FAST003.py:19:19 @@ -51,16 +49,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` 21 | return {"query": query} | help: Add `thing_id` to function signature - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | @app.get("/things/{thing_id:path}") -20 |-async def read_thing(query: str): - 20 |+async def read_thing(query: str, thing_id): -21 21 | return {"query": query} -22 22 | -23 23 | +17 | +18 | +19 | @app.get("/things/{thing_id:path}") + - async def read_thing(query: str): +20 + async def read_thing(query: str, thing_id): +21 | return {"query": query} +22 | +23 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature --> FAST003.py:24:19 @@ -71,16 +68,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` 26 | return {"query": query} | help: Add `thing_id` to function signature - -ℹ Unsafe fix -22 22 | -23 23 | -24 24 | @app.get("/things/{thing_id : path}") -25 |-async def read_thing(query: str): - 25 |+async def read_thing(query: str, thing_id): -26 26 | return {"query": query} -27 27 | -28 28 | +22 | +23 | +24 | @app.get("/things/{thing_id : path}") + - async def read_thing(query: str): +25 + async def read_thing(query: str, thing_id): +26 | return {"query": query} +27 | +28 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature --> FAST003.py:29:27 @@ -91,16 +87,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig 31 | return {"author": author} | help: Add `title` to function signature - -ℹ Unsafe fix -27 27 | -28 28 | -29 29 | @app.get("/books/{author}/{title}") -30 |-async def read_thing(author: str): - 30 |+async def read_thing(author: str, title): -31 31 | return {"author": author} -32 32 | -33 33 | +27 | +28 | +29 | @app.get("/books/{author}/{title}") + - async def read_thing(author: str): +30 + async def read_thing(author: str, title): +31 | return {"author": author} +32 | +33 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `author_name` appears in route path, but not in `read_thing` signature --> FAST003.py:34:18 @@ -111,16 +106,15 @@ FAST003 [*] Parameter `author_name` appears in route path, but not in `read_thin 36 | ... | help: Add `author_name` to function signature - -ℹ Unsafe fix -32 32 | -33 33 | -34 34 | @app.get("/books/{author_name}/{title}") -35 |-async def read_thing(): - 35 |+async def read_thing(author_name): -36 36 | ... -37 37 | -38 38 | +32 | +33 | +34 | @app.get("/books/{author_name}/{title}") + - async def read_thing(): +35 + async def read_thing(author_name): +36 | ... +37 | +38 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature --> FAST003.py:34:32 @@ -131,16 +125,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig 36 | ... | help: Add `title` to function signature - -ℹ Unsafe fix -32 32 | -33 33 | -34 34 | @app.get("/books/{author_name}/{title}") -35 |-async def read_thing(): - 35 |+async def read_thing(title): -36 36 | ... -37 37 | -38 38 | +32 | +33 | +34 | @app.get("/books/{author_name}/{title}") + - async def read_thing(): +35 + async def read_thing(title): +36 | ... +37 | +38 | +note: This is an unsafe fix and may change runtime behavior FAST003 Parameter `author` appears in route path, but only as a positional-only argument in `read_thing` signature --> FAST003.py:39:18 @@ -169,16 +162,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig 46 | author: str, | help: Add `title` to function signature - -ℹ Unsafe fix -44 44 | @app.get("/books/{author}/{title}/{page}") -45 45 | async def read_thing( -46 46 | author: str, -47 |- query: str, - 47 |+ query: str, title, -48 48 | ): ... -49 49 | -50 50 | +44 | @app.get("/books/{author}/{title}/{page}") +45 | async def read_thing( +46 | author: str, + - query: str, +47 + query: str, title, +48 | ): ... +49 | +50 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `page` appears in route path, but not in `read_thing` signature --> FAST003.py:44:35 @@ -189,16 +181,15 @@ FAST003 [*] Parameter `page` appears in route path, but not in `read_thing` sign 46 | author: str, | help: Add `page` to function signature - -ℹ Unsafe fix -44 44 | @app.get("/books/{author}/{title}/{page}") -45 45 | async def read_thing( -46 46 | author: str, -47 |- query: str, - 47 |+ query: str, page, -48 48 | ): ... -49 49 | -50 50 | +44 | @app.get("/books/{author}/{title}/{page}") +45 | async def read_thing( +46 | author: str, + - query: str, +47 + query: str, page, +48 | ): ... +49 | +50 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `author` appears in route path, but not in `read_thing` signature --> FAST003.py:51:18 @@ -209,16 +200,15 @@ FAST003 [*] Parameter `author` appears in route path, but not in `read_thing` si 53 | ... | help: Add `author` to function signature - -ℹ Unsafe fix -49 49 | -50 50 | -51 51 | @app.get("/books/{author}/{title}") -52 |-async def read_thing(): - 52 |+async def read_thing(author): -53 53 | ... -54 54 | -55 55 | +49 | +50 | +51 | @app.get("/books/{author}/{title}") + - async def read_thing(): +52 + async def read_thing(author): +53 | ... +54 | +55 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature --> FAST003.py:51:27 @@ -229,16 +219,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig 53 | ... | help: Add `title` to function signature - -ℹ Unsafe fix -49 49 | -50 50 | -51 51 | @app.get("/books/{author}/{title}") -52 |-async def read_thing(): - 52 |+async def read_thing(title): -53 53 | ... -54 54 | -55 55 | +49 | +50 | +51 | @app.get("/books/{author}/{title}") + - async def read_thing(): +52 + async def read_thing(title): +53 | ... +54 | +55 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature --> FAST003.py:56:27 @@ -249,16 +238,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig 58 | ... | help: Add `title` to function signature - -ℹ Unsafe fix -54 54 | -55 55 | -56 56 | @app.get("/books/{author}/{title}") -57 |-async def read_thing(*, author: str): - 57 |+async def read_thing(title, *, author: str): -58 58 | ... -59 59 | -60 60 | +54 | +55 | +56 | @app.get("/books/{author}/{title}") + - async def read_thing(*, author: str): +57 + async def read_thing(title, *, author: str): +58 | ... +59 | +60 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` signature --> FAST003.py:61:27 @@ -269,16 +257,15 @@ FAST003 [*] Parameter `title` appears in route path, but not in `read_thing` sig 63 | ... | help: Add `title` to function signature - -ℹ Unsafe fix -59 59 | -60 60 | -61 61 | @app.get("/books/{author}/{title}") -62 |-async def read_thing(hello, /, *, author: str): - 62 |+async def read_thing(hello, /, title, *, author: str): -63 63 | ... -64 64 | -65 65 | +59 | +60 | +61 | @app.get("/books/{author}/{title}") + - async def read_thing(hello, /, *, author: str): +62 + async def read_thing(hello, /, title, *, author: str): +63 | ... +64 | +65 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature --> FAST003.py:66:19 @@ -289,16 +276,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` 68 | query: str, | help: Add `thing_id` to function signature - -ℹ Unsafe fix -65 65 | -66 66 | @app.get("/things/{thing_id}") -67 67 | async def read_thing( -68 |- query: str, - 68 |+ query: str, thing_id, -69 69 | ): -70 70 | return {"query": query} -71 71 | +65 | +66 | @app.get("/things/{thing_id}") +67 | async def read_thing( + - query: str, +68 + query: str, thing_id, +69 | ): +70 | return {"query": query} +71 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature --> FAST003.py:73:19 @@ -309,16 +295,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` 75 | query: str = "default", | help: Add `thing_id` to function signature - -ℹ Unsafe fix -72 72 | -73 73 | @app.get("/things/{thing_id}") -74 74 | async def read_thing( -75 |- query: str = "default", - 75 |+ thing_id, query: str = "default", -76 76 | ): -77 77 | return {"query": query} -78 78 | +72 | +73 | @app.get("/things/{thing_id}") +74 | async def read_thing( + - query: str = "default", +75 + thing_id, query: str = "default", +76 | ): +77 | return {"query": query} +78 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` signature --> FAST003.py:80:19 @@ -329,16 +314,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `read_thing` 82 | *, query: str = "default", | help: Add `thing_id` to function signature - -ℹ Unsafe fix -79 79 | -80 80 | @app.get("/things/{thing_id}") -81 81 | async def read_thing( -82 |- *, query: str = "default", - 82 |+ thing_id, *, query: str = "default", -83 83 | ): -84 84 | return {"query": query} -85 85 | +79 | +80 | @app.get("/things/{thing_id}") +81 | async def read_thing( + - *, query: str = "default", +82 + thing_id, *, query: str = "default", +83 | ): +84 | return {"query": query} +85 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `name` appears in route path, but not in `read_thing` signature --> FAST003.py:87:18 @@ -349,16 +333,15 @@ FAST003 [*] Parameter `name` appears in route path, but not in `read_thing` sign 89 | return {"author": author, "title": title} | help: Add `name` to function signature - -ℹ Unsafe fix -85 85 | -86 86 | -87 87 | @app.get("/books/{name}/{title}") -88 |-async def read_thing(*, author: Annotated[str, Path(alias="author_name")], title: str): - 88 |+async def read_thing(name, *, author: Annotated[str, Path(alias="author_name")], title: str): -89 89 | return {"author": author, "title": title} -90 90 | -91 91 | +85 | +86 | +87 | @app.get("/books/{name}/{title}") + - async def read_thing(*, author: Annotated[str, Path(alias="author_name")], title: str): +88 + async def read_thing(name, *, author: Annotated[str, Path(alias="author_name")], title: str): +89 | return {"author": author, "title": title} +90 | +91 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `thing_id` appears in route path, but not in `single` signature --> FAST003.py:158:19 @@ -370,16 +353,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `single` sign 160 | @app.get("/things/{thing_id}") | help: Add `thing_id` to function signature - -ℹ Unsafe fix -156 156 | -157 157 | ### Errors -158 158 | @app.get("/things/{thing_id}") -159 |-async def single(other: Annotated[str, Depends(something_else)]): ... - 159 |+async def single(other: Annotated[str, Depends(something_else)], thing_id): ... -160 160 | @app.get("/things/{thing_id}") -161 161 | async def default(other: str = Depends(something_else)): ... -162 162 | +156 | +157 | ### Errors +158 | @app.get("/things/{thing_id}") + - async def single(other: Annotated[str, Depends(something_else)]): ... +159 + async def single(other: Annotated[str, Depends(something_else)], thing_id): ... +160 | @app.get("/things/{thing_id}") +161 | async def default(other: str = Depends(something_else)): ... +162 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `thing_id` appears in route path, but not in `default` signature --> FAST003.py:160:19 @@ -391,16 +373,15 @@ FAST003 [*] Parameter `thing_id` appears in route path, but not in `default` sig 161 | async def default(other: str = Depends(something_else)): ... | help: Add `thing_id` to function signature - -ℹ Unsafe fix -158 158 | @app.get("/things/{thing_id}") -159 159 | async def single(other: Annotated[str, Depends(something_else)]): ... -160 160 | @app.get("/things/{thing_id}") -161 |-async def default(other: str = Depends(something_else)): ... - 161 |+async def default(thing_id, other: str = Depends(something_else)): ... -162 162 | -163 163 | -164 164 | ### No errors +158 | @app.get("/things/{thing_id}") +159 | async def single(other: Annotated[str, Depends(something_else)]): ... +160 | @app.get("/things/{thing_id}") + - async def default(other: str = Depends(something_else)): ... +161 + async def default(thing_id, other: str = Depends(something_else)): ... +162 | +163 | +164 | ### No errors +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_full` signature --> FAST003.py:197:12 @@ -412,16 +393,15 @@ FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_fu 199 | params: Annotated[PydanticParams, Depends(PydanticParams)], | help: Add `id` to function signature - -ℹ Unsafe fix -196 196 | # Errors -197 197 | @app.get("/{id}") -198 198 | async def get_id_pydantic_full( -199 |- params: Annotated[PydanticParams, Depends(PydanticParams)], - 199 |+ params: Annotated[PydanticParams, Depends(PydanticParams)], id, -200 200 | ): ... -201 201 | @app.get("/{id}") -202 202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ... +196 | # Errors +197 | @app.get("/{id}") +198 | async def get_id_pydantic_full( + - params: Annotated[PydanticParams, Depends(PydanticParams)], +199 + params: Annotated[PydanticParams, Depends(PydanticParams)], id, +200 | ): ... +201 | @app.get("/{id}") +202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ... +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_short` signature --> FAST003.py:201:12 @@ -434,16 +414,15 @@ FAST003 [*] Parameter `id` appears in route path, but not in `get_id_pydantic_sh 203 | @app.get("/{id}") | help: Add `id` to function signature - -ℹ Unsafe fix -199 199 | params: Annotated[PydanticParams, Depends(PydanticParams)], -200 200 | ): ... -201 201 | @app.get("/{id}") -202 |-async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ... - 202 |+async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()], id): ... -203 203 | @app.get("/{id}") -204 204 | async def get_id_init_not_annotated(params = Depends(InitParams)): ... -205 205 | +199 | params: Annotated[PydanticParams, Depends(PydanticParams)], +200 | ): ... +201 | @app.get("/{id}") + - async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ... +202 + async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()], id): ... +203 | @app.get("/{id}") +204 | async def get_id_init_not_annotated(params = Depends(InitParams)): ... +205 | +note: This is an unsafe fix and may change runtime behavior FAST003 [*] Parameter `id` appears in route path, but not in `get_id_init_not_annotated` signature --> FAST003.py:203:12 @@ -455,13 +434,12 @@ FAST003 [*] Parameter `id` appears in route path, but not in `get_id_init_not_an 204 | async def get_id_init_not_annotated(params = Depends(InitParams)): ... | help: Add `id` to function signature - -ℹ Unsafe fix -201 201 | @app.get("/{id}") -202 202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ... -203 203 | @app.get("/{id}") -204 |-async def get_id_init_not_annotated(params = Depends(InitParams)): ... - 204 |+async def get_id_init_not_annotated(id, params = Depends(InitParams)): ... -205 205 | -206 206 | -207 207 | # No errors +201 | @app.get("/{id}") +202 | async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ... +203 | @app.get("/{id}") + - async def get_id_init_not_annotated(params = Depends(InitParams)): ... +204 + async def get_id_init_not_annotated(id, params = Depends(InitParams)): ... +205 | +206 | +207 | # No errors +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap index b3ddc0faa2..5fd1020126 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap +++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type.snap @@ -9,13 +9,12 @@ ANN201 [*] Missing return type annotation for public function `func` 2 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -1 |-def func(): - 1 |+def func() -> int: -2 2 | return 1 -3 3 | -4 4 | + - def func(): +1 + def func() -> int: +2 | return 1 +3 | +4 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:5:5 @@ -25,16 +24,15 @@ ANN201 [*] Missing return type annotation for public function `func` 6 | return 1.5 | help: Add return type annotation: `float` - -ℹ Unsafe fix -2 2 | return 1 -3 3 | -4 4 | -5 |-def func(): - 5 |+def func() -> float: -6 6 | return 1.5 -7 7 | -8 8 | +2 | return 1 +3 | +4 | + - def func(): +5 + def func() -> float: +6 | return 1.5 +7 | +8 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:9:5 @@ -45,16 +43,15 @@ ANN201 [*] Missing return type annotation for public function `func` 11 | return 1 | help: Add return type annotation: `float` - -ℹ Unsafe fix -6 6 | return 1.5 -7 7 | -8 8 | -9 |-def func(x: int): - 9 |+def func(x: int) -> float: -10 10 | if x > 0: -11 11 | return 1 -12 12 | else: +6 | return 1.5 +7 | +8 | + - def func(x: int): +9 + def func(x: int) -> float: +10 | if x > 0: +11 | return 1 +12 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:16:5 @@ -64,16 +61,15 @@ ANN201 [*] Missing return type annotation for public function `func` 17 | return True | help: Add return type annotation: `bool` - -ℹ Unsafe fix -13 13 | return 1.5 -14 14 | -15 15 | -16 |-def func(): - 16 |+def func() -> bool: -17 17 | return True -18 18 | -19 19 | +13 | return 1.5 +14 | +15 | + - def func(): +16 + def func() -> bool: +17 | return True +18 | +19 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:20:5 @@ -84,16 +80,15 @@ ANN201 [*] Missing return type annotation for public function `func` 22 | return None | help: Add return type annotation: `None` - -ℹ Unsafe fix -17 17 | return True -18 18 | -19 19 | -20 |-def func(x: int): - 20 |+def func(x: int) -> None: -21 21 | if x > 0: -22 22 | return None -23 23 | else: +17 | return True +18 | +19 | + - def func(x: int): +20 + def func(x: int) -> None: +21 | if x > 0: +22 | return None +23 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:27:5 @@ -103,16 +98,15 @@ ANN201 [*] Missing return type annotation for public function `func` 28 | return 1 or 2.5 if x > 0 else 1.5 or "str" | help: Add return type annotation: `str | float` - -ℹ Unsafe fix -24 24 | return -25 25 | -26 26 | -27 |-def func(x: int): - 27 |+def func(x: int) -> str | float: -28 28 | return 1 or 2.5 if x > 0 else 1.5 or "str" -29 29 | -30 30 | +24 | return +25 | +26 | + - def func(x: int): +27 + def func(x: int) -> str | float: +28 | return 1 or 2.5 if x > 0 else 1.5 or "str" +29 | +30 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:31:5 @@ -122,16 +116,15 @@ ANN201 [*] Missing return type annotation for public function `func` 32 | return 1 + 2.5 if x > 0 else 1.5 or "str" | help: Add return type annotation: `str | float` - -ℹ Unsafe fix -28 28 | return 1 or 2.5 if x > 0 else 1.5 or "str" -29 29 | -30 30 | -31 |-def func(x: int): - 31 |+def func(x: int) -> str | float: -32 32 | return 1 + 2.5 if x > 0 else 1.5 or "str" -33 33 | -34 34 | +28 | return 1 or 2.5 if x > 0 else 1.5 or "str" +29 | +30 | + - def func(x: int): +31 + def func(x: int) -> str | float: +32 | return 1 + 2.5 if x > 0 else 1.5 or "str" +33 | +34 | +note: This is an unsafe fix and may change runtime behavior ANN201 Missing return type annotation for public function `func` --> auto_return_type.py:35:5 @@ -161,16 +154,15 @@ ANN201 [*] Missing return type annotation for public function `func` 47 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -42 42 | return {"foo": 1} -43 43 | -44 44 | -45 |-def func(x: int): - 45 |+def func(x: int) -> int: -46 46 | if not x: -47 47 | return 1 -48 48 | else: +42 | return {"foo": 1} +43 | +44 | + - def func(x: int): +45 + def func(x: int) -> int: +46 | if not x: +47 | return 1 +48 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:52:5 @@ -181,16 +173,15 @@ ANN201 [*] Missing return type annotation for public function `func` 54 | return 1 | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -49 49 | return True -50 50 | -51 51 | -52 |-def func(x: int): - 52 |+def func(x: int) -> int | None: -53 53 | if not x: -54 54 | return 1 -55 55 | else: +49 | return True +50 | +51 | + - def func(x: int): +52 + def func(x: int) -> int | None: +53 | if not x: +54 | return 1 +55 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:59:5 @@ -201,16 +192,15 @@ ANN201 [*] Missing return type annotation for public function `func` 61 | return 1 | help: Add return type annotation: `str | int | None` - -ℹ Unsafe fix -56 56 | return None -57 57 | -58 58 | -59 |-def func(x: int): - 59 |+def func(x: int) -> str | int | None: -60 60 | if not x: -61 61 | return 1 -62 62 | elif x > 5: +56 | return None +57 | +58 | + - def func(x: int): +59 + def func(x: int) -> str | int | None: +60 | if not x: +61 | return 1 +62 | elif x > 5: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:68:5 @@ -221,16 +211,15 @@ ANN201 [*] Missing return type annotation for public function `func` 70 | return 1 | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -65 65 | return None -66 66 | -67 67 | -68 |-def func(x: int): - 68 |+def func(x: int) -> int | None: -69 69 | if x: -70 70 | return 1 -71 71 | +65 | return None +66 | +67 | + - def func(x: int): +68 + def func(x: int) -> int | None: +69 | if x: +70 | return 1 +71 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:73:5 @@ -240,16 +229,15 @@ ANN201 [*] Missing return type annotation for public function `func` 74 | x = 1 | help: Add return type annotation: `None` - -ℹ Unsafe fix -70 70 | return 1 -71 71 | -72 72 | -73 |-def func(): - 73 |+def func() -> None: -74 74 | x = 1 -75 75 | -76 76 | +70 | return 1 +71 | +72 | + - def func(): +73 + def func() -> None: +74 | x = 1 +75 | +76 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:77:5 @@ -260,16 +248,15 @@ ANN201 [*] Missing return type annotation for public function `func` 79 | return 1 | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -74 74 | x = 1 -75 75 | -76 76 | -77 |-def func(x: int): - 77 |+def func(x: int) -> int | None: -78 78 | if x > 0: -79 79 | return 1 -80 80 | +74 | x = 1 +75 | +76 | + - def func(x: int): +77 + def func(x: int) -> int | None: +78 | if x > 0: +79 | return 1 +80 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:82:5 @@ -280,16 +267,15 @@ ANN201 [*] Missing return type annotation for public function `func` 84 | case [1, 2, 3]: | help: Add return type annotation: `str | int | None` - -ℹ Unsafe fix -79 79 | return 1 -80 80 | -81 81 | -82 |-def func(x: int): - 82 |+def func(x: int) -> str | int | None: -83 83 | match x: -84 84 | case [1, 2, 3]: -85 85 | return 1 +79 | return 1 +80 | +81 | + - def func(x: int): +82 + def func(x: int) -> str | int | None: +83 | match x: +84 | case [1, 2, 3]: +85 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:90:5 @@ -300,16 +286,15 @@ ANN201 [*] Missing return type annotation for public function `func` 92 | if i > 0: | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -87 87 | return "foo" -88 88 | -89 89 | -90 |-def func(x: int): - 90 |+def func(x: int) -> int | None: -91 91 | for i in range(5): -92 92 | if i > 0: -93 93 | return 1 +87 | return "foo" +88 | +89 | + - def func(x: int): +90 + def func(x: int) -> int | None: +91 | for i in range(5): +92 | if i > 0: +93 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:96:5 @@ -320,16 +305,15 @@ ANN201 [*] Missing return type annotation for public function `func` 98 | if i > 0: | help: Add return type annotation: `int` - -ℹ Unsafe fix -93 93 | return 1 -94 94 | -95 95 | -96 |-def func(x: int): - 96 |+def func(x: int) -> int: -97 97 | for i in range(5): -98 98 | if i > 0: -99 99 | return 1 +93 | return 1 +94 | +95 | + - def func(x: int): +96 + def func(x: int) -> int: +97 | for i in range(5): +98 | if i > 0: +99 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:104:5 @@ -340,16 +324,15 @@ ANN201 [*] Missing return type annotation for public function `func` 106 | if i > 0: | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -101 101 | return 4 -102 102 | -103 103 | -104 |-def func(x: int): - 104 |+def func(x: int) -> int | None: -105 105 | for i in range(5): -106 106 | if i > 0: -107 107 | break +101 | return 4 +102 | +103 | + - def func(x: int): +104 + def func(x: int) -> int | None: +105 | for i in range(5): +106 | if i > 0: +107 | break +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:112:5 @@ -360,16 +343,15 @@ ANN201 [*] Missing return type annotation for public function `func` 114 | pass | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -109 109 | return 4 -110 110 | -111 111 | -112 |-def func(x: int): - 112 |+def func(x: int) -> int | None: -113 113 | try: -114 114 | pass -115 115 | except: +109 | return 4 +110 | +111 | + - def func(x: int): +112 + def func(x: int) -> int | None: +113 | try: +114 | pass +115 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:119:5 @@ -380,16 +362,15 @@ ANN201 [*] Missing return type annotation for public function `func` 121 | pass | help: Add return type annotation: `int` - -ℹ Unsafe fix -116 116 | return 1 -117 117 | -118 118 | -119 |-def func(x: int): - 119 |+def func(x: int) -> int: -120 120 | try: -121 121 | pass -122 122 | except: +116 | return 1 +117 | +118 | + - def func(x: int): +119 + def func(x: int) -> int: +120 | try: +121 | pass +122 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:128:5 @@ -400,16 +381,15 @@ ANN201 [*] Missing return type annotation for public function `func` 130 | pass | help: Add return type annotation: `int` - -ℹ Unsafe fix -125 125 | return 2 -126 126 | -127 127 | -128 |-def func(x: int): - 128 |+def func(x: int) -> int: -129 129 | try: -130 130 | pass -131 131 | except: +125 | return 2 +126 | +127 | + - def func(x: int): +128 + def func(x: int) -> int: +129 | try: +130 | pass +131 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:137:5 @@ -420,16 +400,15 @@ ANN201 [*] Missing return type annotation for public function `func` 139 | return 1 | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -134 134 | return 2 -135 135 | -136 136 | -137 |-def func(x: int): - 137 |+def func(x: int) -> int | None: -138 138 | try: -139 139 | return 1 -140 140 | except: +134 | return 2 +135 | +136 | + - def func(x: int): +137 + def func(x: int) -> int | None: +138 | try: +139 | return 1 +140 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:146:5 @@ -440,16 +419,15 @@ ANN201 [*] Missing return type annotation for public function `func` 148 | break | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -143 143 | pass -144 144 | -145 145 | -146 |-def func(x: int): - 146 |+def func(x: int) -> int | None: -147 147 | while x > 0: -148 148 | break -149 149 | return 1 +143 | pass +144 | +145 | + - def func(x: int): +146 + def func(x: int) -> int | None: +147 | while x > 0: +148 | break +149 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 Missing return type annotation for public function `method` --> auto_return_type.py:158:9 @@ -514,16 +492,15 @@ ANN201 [*] Missing return type annotation for public function `method` 182 | return 1 | help: Add return type annotation: `float` - -ℹ Unsafe fix -177 177 | pass -178 178 | -179 179 | @abstractmethod -180 |- def method(self): - 180 |+ def method(self) -> float: -181 181 | if self.x > 0: -182 182 | return 1 -183 183 | else: +177 | pass +178 | +179 | @abstractmethod + - def method(self): +180 + def method(self) -> float: +181 | if self.x > 0: +182 | return 1 +183 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:187:5 @@ -534,16 +511,15 @@ ANN201 [*] Missing return type annotation for public function `func` 189 | pass | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -184 184 | return 1.5 -185 185 | -186 186 | -187 |-def func(x: int): - 187 |+def func(x: int) -> int | None: -188 188 | try: -189 189 | pass -190 190 | except: +184 | return 1.5 +185 | +186 | + - def func(x: int): +187 + def func(x: int) -> int | None: +188 | try: +189 | pass +190 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:194:5 @@ -554,16 +530,15 @@ ANN201 [*] Missing return type annotation for public function `func` 196 | pass | help: Add return type annotation: `int` - -ℹ Unsafe fix -191 191 | return 2 -192 192 | -193 193 | -194 |-def func(x: int): - 194 |+def func(x: int) -> int: -195 195 | try: -196 196 | pass -197 197 | except: +191 | return 2 +192 | +193 | + - def func(x: int): +194 + def func(x: int) -> int: +195 | try: +196 | pass +197 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:203:5 @@ -574,24 +549,23 @@ ANN201 [*] Missing return type annotation for public function `func` 205 | raise ValueError | help: Add return type annotation: `Never` - -ℹ Unsafe fix -151 151 | -152 152 | import abc -153 153 | from abc import abstractmethod - 154 |+from typing import Never -154 155 | -155 156 | -156 157 | class Foo(abc.ABC): +151 | +152 | import abc +153 | from abc import abstractmethod +154 + from typing import Never +155 | +156 | +157 | class Foo(abc.ABC): -------------------------------------------------------------------------------- -200 201 | return 3 -201 202 | -202 203 | -203 |-def func(x: int): - 204 |+def func(x: int) -> Never: -204 205 | if not x: -205 206 | raise ValueError -206 207 | else: +201 | return 3 +202 | +203 | + - def func(x: int): +204 + def func(x: int) -> Never: +205 | if not x: +206 | raise ValueError +207 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:210:5 @@ -602,16 +576,15 @@ ANN201 [*] Missing return type annotation for public function `func` 212 | raise ValueError | help: Add return type annotation: `int` - -ℹ Unsafe fix -207 207 | raise TypeError -208 208 | -209 209 | -210 |-def func(x: int): - 210 |+def func(x: int) -> int: -211 211 | if not x: -212 212 | raise ValueError -213 213 | else: +207 | raise TypeError +208 | +209 | + - def func(x: int): +210 + def func(x: int) -> int: +211 | if not x: +212 | raise ValueError +213 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:234:5 @@ -622,16 +595,15 @@ ANN201 [*] Missing return type annotation for public function `func` 236 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -231 231 | return i -232 232 | -233 233 | -234 |-def func(x: int): - 234 |+def func(x: int) -> int: -235 235 | if not x: -236 236 | return 1 -237 237 | raise ValueError +231 | return i +232 | +233 | + - def func(x: int): +234 + def func(x: int) -> int: +235 | if not x: +236 | return 1 +237 | raise ValueError +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:240:5 @@ -642,16 +614,15 @@ ANN201 [*] Missing return type annotation for public function `func` 242 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -237 237 | raise ValueError -238 238 | -239 239 | -240 |-def func(x: int): - 240 |+def func(x: int) -> int: -241 241 | if not x: -242 242 | return 1 -243 243 | else: +237 | raise ValueError +238 | +239 | + - def func(x: int): +240 + def func(x: int) -> int: +241 | if not x: +242 | return 1 +243 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:248:5 @@ -662,16 +633,15 @@ ANN201 [*] Missing return type annotation for public function `func` 250 | raise ValueError | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -245 245 | raise ValueError -246 246 | -247 247 | -248 |-def func(): - 248 |+def func() -> int | None: -249 249 | try: -250 250 | raise ValueError -251 251 | except: +245 | raise ValueError +246 | +247 | + - def func(): +248 + def func() -> int | None: +249 | try: +250 | raise ValueError +251 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:255:5 @@ -682,16 +652,15 @@ ANN201 [*] Missing return type annotation for public function `func` 257 | return 1 | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -252 252 | return 2 -253 253 | -254 254 | -255 |-def func(): - 255 |+def func() -> int | None: -256 256 | try: -257 257 | return 1 -258 258 | except: +252 | return 2 +253 | +254 | + - def func(): +255 + def func() -> int | None: +256 | try: +257 | return 1 +258 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:262:5 @@ -702,16 +671,15 @@ ANN201 [*] Missing return type annotation for public function `func` 264 | if x > 0: | help: Add return type annotation: `int` - -ℹ Unsafe fix -259 259 | pass -260 260 | -261 261 | -262 |-def func(x: int): - 262 |+def func(x: int) -> int: -263 263 | for _ in range(3): -264 264 | if x > 0: -265 265 | return 1 +259 | pass +260 | +261 | + - def func(x: int): +262 + def func(x: int) -> int: +263 | for _ in range(3): +264 | if x > 0: +265 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:269:5 @@ -722,16 +690,15 @@ ANN201 [*] Missing return type annotation for public function `func` 271 | raise ValueError | help: Add return type annotation: `None` - -ℹ Unsafe fix -266 266 | raise ValueError -267 267 | -268 268 | -269 |-def func(x: int): - 269 |+def func(x: int) -> None: -270 270 | if x > 5: -271 271 | raise ValueError -272 272 | else: +266 | raise ValueError +267 | +268 | + - def func(x: int): +269 + def func(x: int) -> None: +270 | if x > 5: +271 | raise ValueError +272 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:276:5 @@ -742,16 +709,15 @@ ANN201 [*] Missing return type annotation for public function `func` 278 | raise ValueError | help: Add return type annotation: `None` - -ℹ Unsafe fix -273 273 | pass -274 274 | -275 275 | -276 |-def func(x: int): - 276 |+def func(x: int) -> None: -277 277 | if x > 5: -278 278 | raise ValueError -279 279 | elif x > 10: +273 | pass +274 | +275 | + - def func(x: int): +276 + def func(x: int) -> None: +277 | if x > 5: +278 | raise ValueError +279 | elif x > 10: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:283:5 @@ -762,16 +728,15 @@ ANN201 [*] Missing return type annotation for public function `func` 285 | raise ValueError | help: Add return type annotation: `int | None` - -ℹ Unsafe fix -280 280 | pass -281 281 | -282 282 | -283 |-def func(x: int): - 283 |+def func(x: int) -> int | None: -284 284 | if x > 5: -285 285 | raise ValueError -286 286 | elif x > 10: +280 | pass +281 | +282 | + - def func(x: int): +283 + def func(x: int) -> int | None: +284 | if x > 5: +285 | raise ValueError +286 | elif x > 10: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:290:5 @@ -782,16 +747,15 @@ ANN201 [*] Missing return type annotation for public function `func` 292 | return 5 | help: Add return type annotation: `int` - -ℹ Unsafe fix -287 287 | return 5 -288 288 | -289 289 | -290 |-def func(): - 290 |+def func() -> int: -291 291 | try: -292 292 | return 5 -293 293 | except: +287 | return 5 +288 | +289 | + - def func(): +290 + def func() -> int: +291 | try: +292 | return 5 +293 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:299:5 @@ -802,13 +766,12 @@ ANN201 [*] Missing return type annotation for public function `func` 301 | case [1, 2, 3]: | help: Add return type annotation: `str | int` - -ℹ Unsafe fix -296 296 | raise ValueError -297 297 | -298 298 | -299 |-def func(x: int): - 299 |+def func(x: int) -> str | int: -300 300 | match x: -301 301 | case [1, 2, 3]: -302 302 | return 1 +296 | raise ValueError +297 | +298 | + - def func(x: int): +299 + def func(x: int) -> str | int: +300 | match x: +301 | case [1, 2, 3]: +302 | return 1 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap index 1e30ffef69..65f71dd345 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap +++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__auto_return_type_py38.snap @@ -9,13 +9,12 @@ ANN201 [*] Missing return type annotation for public function `func` 2 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -1 |-def func(): - 1 |+def func() -> int: -2 2 | return 1 -3 3 | -4 4 | + - def func(): +1 + def func() -> int: +2 | return 1 +3 | +4 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:5:5 @@ -25,16 +24,15 @@ ANN201 [*] Missing return type annotation for public function `func` 6 | return 1.5 | help: Add return type annotation: `float` - -ℹ Unsafe fix -2 2 | return 1 -3 3 | -4 4 | -5 |-def func(): - 5 |+def func() -> float: -6 6 | return 1.5 -7 7 | -8 8 | +2 | return 1 +3 | +4 | + - def func(): +5 + def func() -> float: +6 | return 1.5 +7 | +8 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:9:5 @@ -45,16 +43,15 @@ ANN201 [*] Missing return type annotation for public function `func` 11 | return 1 | help: Add return type annotation: `float` - -ℹ Unsafe fix -6 6 | return 1.5 -7 7 | -8 8 | -9 |-def func(x: int): - 9 |+def func(x: int) -> float: -10 10 | if x > 0: -11 11 | return 1 -12 12 | else: +6 | return 1.5 +7 | +8 | + - def func(x: int): +9 + def func(x: int) -> float: +10 | if x > 0: +11 | return 1 +12 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:16:5 @@ -64,16 +61,15 @@ ANN201 [*] Missing return type annotation for public function `func` 17 | return True | help: Add return type annotation: `bool` - -ℹ Unsafe fix -13 13 | return 1.5 -14 14 | -15 15 | -16 |-def func(): - 16 |+def func() -> bool: -17 17 | return True -18 18 | -19 19 | +13 | return 1.5 +14 | +15 | + - def func(): +16 + def func() -> bool: +17 | return True +18 | +19 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:20:5 @@ -84,16 +80,15 @@ ANN201 [*] Missing return type annotation for public function `func` 22 | return None | help: Add return type annotation: `None` - -ℹ Unsafe fix -17 17 | return True -18 18 | -19 19 | -20 |-def func(x: int): - 20 |+def func(x: int) -> None: -21 21 | if x > 0: -22 22 | return None -23 23 | else: +17 | return True +18 | +19 | + - def func(x: int): +20 + def func(x: int) -> None: +21 | if x > 0: +22 | return None +23 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:27:5 @@ -103,21 +98,20 @@ ANN201 [*] Missing return type annotation for public function `func` 28 | return 1 or 2.5 if x > 0 else 1.5 or "str" | help: Add return type annotation: `Union[str, float]` - -ℹ Unsafe fix - 1 |+from typing import Union -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Union +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -24 25 | return -25 26 | -26 27 | -27 |-def func(x: int): - 28 |+def func(x: int) -> Union[str, float]: -28 29 | return 1 or 2.5 if x > 0 else 1.5 or "str" -29 30 | -30 31 | +25 | return +26 | +27 | + - def func(x: int): +28 + def func(x: int) -> Union[str, float]: +29 | return 1 or 2.5 if x > 0 else 1.5 or "str" +30 | +31 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:31:5 @@ -127,21 +121,20 @@ ANN201 [*] Missing return type annotation for public function `func` 32 | return 1 + 2.5 if x > 0 else 1.5 or "str" | help: Add return type annotation: `Union[str, float]` - -ℹ Unsafe fix - 1 |+from typing import Union -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Union +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -28 29 | return 1 or 2.5 if x > 0 else 1.5 or "str" -29 30 | -30 31 | -31 |-def func(x: int): - 32 |+def func(x: int) -> Union[str, float]: -32 33 | return 1 + 2.5 if x > 0 else 1.5 or "str" -33 34 | -34 35 | +29 | return 1 or 2.5 if x > 0 else 1.5 or "str" +30 | +31 | + - def func(x: int): +32 + def func(x: int) -> Union[str, float]: +33 | return 1 + 2.5 if x > 0 else 1.5 or "str" +34 | +35 | +note: This is an unsafe fix and may change runtime behavior ANN201 Missing return type annotation for public function `func` --> auto_return_type.py:35:5 @@ -171,16 +164,15 @@ ANN201 [*] Missing return type annotation for public function `func` 47 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -42 42 | return {"foo": 1} -43 43 | -44 44 | -45 |-def func(x: int): - 45 |+def func(x: int) -> int: -46 46 | if not x: -47 47 | return 1 -48 48 | else: +42 | return {"foo": 1} +43 | +44 | + - def func(x: int): +45 + def func(x: int) -> int: +46 | if not x: +47 | return 1 +48 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:52:5 @@ -191,21 +183,20 @@ ANN201 [*] Missing return type annotation for public function `func` 54 | return 1 | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -49 50 | return True -50 51 | -51 52 | -52 |-def func(x: int): - 53 |+def func(x: int) -> Optional[int]: -53 54 | if not x: -54 55 | return 1 -55 56 | else: +50 | return True +51 | +52 | + - def func(x: int): +53 + def func(x: int) -> Optional[int]: +54 | if not x: +55 | return 1 +56 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:59:5 @@ -216,21 +207,20 @@ ANN201 [*] Missing return type annotation for public function `func` 61 | return 1 | help: Add return type annotation: `Union[str, int, None]` - -ℹ Unsafe fix - 1 |+from typing import Union -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Union +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -56 57 | return None -57 58 | -58 59 | -59 |-def func(x: int): - 60 |+def func(x: int) -> Union[str, int, None]: -60 61 | if not x: -61 62 | return 1 -62 63 | elif x > 5: +57 | return None +58 | +59 | + - def func(x: int): +60 + def func(x: int) -> Union[str, int, None]: +61 | if not x: +62 | return 1 +63 | elif x > 5: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:68:5 @@ -241,21 +231,20 @@ ANN201 [*] Missing return type annotation for public function `func` 70 | return 1 | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -65 66 | return None -66 67 | -67 68 | -68 |-def func(x: int): - 69 |+def func(x: int) -> Optional[int]: -69 70 | if x: -70 71 | return 1 -71 72 | +66 | return None +67 | +68 | + - def func(x: int): +69 + def func(x: int) -> Optional[int]: +70 | if x: +71 | return 1 +72 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:73:5 @@ -265,16 +254,15 @@ ANN201 [*] Missing return type annotation for public function `func` 74 | x = 1 | help: Add return type annotation: `None` - -ℹ Unsafe fix -70 70 | return 1 -71 71 | -72 72 | -73 |-def func(): - 73 |+def func() -> None: -74 74 | x = 1 -75 75 | -76 76 | +70 | return 1 +71 | +72 | + - def func(): +73 + def func() -> None: +74 | x = 1 +75 | +76 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:77:5 @@ -285,21 +273,20 @@ ANN201 [*] Missing return type annotation for public function `func` 79 | return 1 | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -74 75 | x = 1 -75 76 | -76 77 | -77 |-def func(x: int): - 78 |+def func(x: int) -> Optional[int]: -78 79 | if x > 0: -79 80 | return 1 -80 81 | +75 | x = 1 +76 | +77 | + - def func(x: int): +78 + def func(x: int) -> Optional[int]: +79 | if x > 0: +80 | return 1 +81 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:82:5 @@ -310,21 +297,20 @@ ANN201 [*] Missing return type annotation for public function `func` 84 | case [1, 2, 3]: | help: Add return type annotation: `Union[str, int, None]` - -ℹ Unsafe fix - 1 |+from typing import Union -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Union +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -79 80 | return 1 -80 81 | -81 82 | -82 |-def func(x: int): - 83 |+def func(x: int) -> Union[str, int, None]: -83 84 | match x: -84 85 | case [1, 2, 3]: -85 86 | return 1 +80 | return 1 +81 | +82 | + - def func(x: int): +83 + def func(x: int) -> Union[str, int, None]: +84 | match x: +85 | case [1, 2, 3]: +86 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:90:5 @@ -335,21 +321,20 @@ ANN201 [*] Missing return type annotation for public function `func` 92 | if i > 0: | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -87 88 | return "foo" -88 89 | -89 90 | -90 |-def func(x: int): - 91 |+def func(x: int) -> Optional[int]: -91 92 | for i in range(5): -92 93 | if i > 0: -93 94 | return 1 +88 | return "foo" +89 | +90 | + - def func(x: int): +91 + def func(x: int) -> Optional[int]: +92 | for i in range(5): +93 | if i > 0: +94 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:96:5 @@ -360,16 +345,15 @@ ANN201 [*] Missing return type annotation for public function `func` 98 | if i > 0: | help: Add return type annotation: `int` - -ℹ Unsafe fix -93 93 | return 1 -94 94 | -95 95 | -96 |-def func(x: int): - 96 |+def func(x: int) -> int: -97 97 | for i in range(5): -98 98 | if i > 0: -99 99 | return 1 +93 | return 1 +94 | +95 | + - def func(x: int): +96 + def func(x: int) -> int: +97 | for i in range(5): +98 | if i > 0: +99 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:104:5 @@ -380,21 +364,20 @@ ANN201 [*] Missing return type annotation for public function `func` 106 | if i > 0: | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -101 102 | return 4 -102 103 | -103 104 | -104 |-def func(x: int): - 105 |+def func(x: int) -> Optional[int]: -105 106 | for i in range(5): -106 107 | if i > 0: -107 108 | break +102 | return 4 +103 | +104 | + - def func(x: int): +105 + def func(x: int) -> Optional[int]: +106 | for i in range(5): +107 | if i > 0: +108 | break +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:112:5 @@ -405,21 +388,20 @@ ANN201 [*] Missing return type annotation for public function `func` 114 | pass | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -109 110 | return 4 -110 111 | -111 112 | -112 |-def func(x: int): - 113 |+def func(x: int) -> Optional[int]: -113 114 | try: -114 115 | pass -115 116 | except: +110 | return 4 +111 | +112 | + - def func(x: int): +113 + def func(x: int) -> Optional[int]: +114 | try: +115 | pass +116 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:119:5 @@ -430,16 +412,15 @@ ANN201 [*] Missing return type annotation for public function `func` 121 | pass | help: Add return type annotation: `int` - -ℹ Unsafe fix -116 116 | return 1 -117 117 | -118 118 | -119 |-def func(x: int): - 119 |+def func(x: int) -> int: -120 120 | try: -121 121 | pass -122 122 | except: +116 | return 1 +117 | +118 | + - def func(x: int): +119 + def func(x: int) -> int: +120 | try: +121 | pass +122 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:128:5 @@ -450,16 +431,15 @@ ANN201 [*] Missing return type annotation for public function `func` 130 | pass | help: Add return type annotation: `int` - -ℹ Unsafe fix -125 125 | return 2 -126 126 | -127 127 | -128 |-def func(x: int): - 128 |+def func(x: int) -> int: -129 129 | try: -130 130 | pass -131 131 | except: +125 | return 2 +126 | +127 | + - def func(x: int): +128 + def func(x: int) -> int: +129 | try: +130 | pass +131 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:137:5 @@ -470,21 +450,20 @@ ANN201 [*] Missing return type annotation for public function `func` 139 | return 1 | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -134 135 | return 2 -135 136 | -136 137 | -137 |-def func(x: int): - 138 |+def func(x: int) -> Optional[int]: -138 139 | try: -139 140 | return 1 -140 141 | except: +135 | return 2 +136 | +137 | + - def func(x: int): +138 + def func(x: int) -> Optional[int]: +139 | try: +140 | return 1 +141 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:146:5 @@ -495,21 +474,20 @@ ANN201 [*] Missing return type annotation for public function `func` 148 | break | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix - 1 |+from typing import Optional -1 2 | def func(): -2 3 | return 1 -3 4 | +1 + from typing import Optional +2 | def func(): +3 | return 1 +4 | -------------------------------------------------------------------------------- -143 144 | pass -144 145 | -145 146 | -146 |-def func(x: int): - 147 |+def func(x: int) -> Optional[int]: -147 148 | while x > 0: -148 149 | break -149 150 | return 1 +144 | pass +145 | +146 | + - def func(x: int): +147 + def func(x: int) -> Optional[int]: +148 | while x > 0: +149 | break +150 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 Missing return type annotation for public function `method` --> auto_return_type.py:158:9 @@ -574,16 +552,15 @@ ANN201 [*] Missing return type annotation for public function `method` 182 | return 1 | help: Add return type annotation: `float` - -ℹ Unsafe fix -177 177 | pass -178 178 | -179 179 | @abstractmethod -180 |- def method(self): - 180 |+ def method(self) -> float: -181 181 | if self.x > 0: -182 182 | return 1 -183 183 | else: +177 | pass +178 | +179 | @abstractmethod + - def method(self): +180 + def method(self) -> float: +181 | if self.x > 0: +182 | return 1 +183 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:187:5 @@ -594,24 +571,23 @@ ANN201 [*] Missing return type annotation for public function `func` 189 | pass | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix -151 151 | -152 152 | import abc -153 153 | from abc import abstractmethod - 154 |+from typing import Optional -154 155 | -155 156 | -156 157 | class Foo(abc.ABC): +151 | +152 | import abc +153 | from abc import abstractmethod +154 + from typing import Optional +155 | +156 | +157 | class Foo(abc.ABC): -------------------------------------------------------------------------------- -184 185 | return 1.5 -185 186 | -186 187 | -187 |-def func(x: int): - 188 |+def func(x: int) -> Optional[int]: -188 189 | try: -189 190 | pass -190 191 | except: +185 | return 1.5 +186 | +187 | + - def func(x: int): +188 + def func(x: int) -> Optional[int]: +189 | try: +190 | pass +191 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:194:5 @@ -622,16 +598,15 @@ ANN201 [*] Missing return type annotation for public function `func` 196 | pass | help: Add return type annotation: `int` - -ℹ Unsafe fix -191 191 | return 2 -192 192 | -193 193 | -194 |-def func(x: int): - 194 |+def func(x: int) -> int: -195 195 | try: -196 196 | pass -197 197 | except: +191 | return 2 +192 | +193 | + - def func(x: int): +194 + def func(x: int) -> int: +195 | try: +196 | pass +197 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:203:5 @@ -642,24 +617,23 @@ ANN201 [*] Missing return type annotation for public function `func` 205 | raise ValueError | help: Add return type annotation: `NoReturn` - -ℹ Unsafe fix -151 151 | -152 152 | import abc -153 153 | from abc import abstractmethod - 154 |+from typing import NoReturn -154 155 | -155 156 | -156 157 | class Foo(abc.ABC): +151 | +152 | import abc +153 | from abc import abstractmethod +154 + from typing import NoReturn +155 | +156 | +157 | class Foo(abc.ABC): -------------------------------------------------------------------------------- -200 201 | return 3 -201 202 | -202 203 | -203 |-def func(x: int): - 204 |+def func(x: int) -> NoReturn: -204 205 | if not x: -205 206 | raise ValueError -206 207 | else: +201 | return 3 +202 | +203 | + - def func(x: int): +204 + def func(x: int) -> NoReturn: +205 | if not x: +206 | raise ValueError +207 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:210:5 @@ -670,16 +644,15 @@ ANN201 [*] Missing return type annotation for public function `func` 212 | raise ValueError | help: Add return type annotation: `int` - -ℹ Unsafe fix -207 207 | raise TypeError -208 208 | -209 209 | -210 |-def func(x: int): - 210 |+def func(x: int) -> int: -211 211 | if not x: -212 212 | raise ValueError -213 213 | else: +207 | raise TypeError +208 | +209 | + - def func(x: int): +210 + def func(x: int) -> int: +211 | if not x: +212 | raise ValueError +213 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:234:5 @@ -690,16 +663,15 @@ ANN201 [*] Missing return type annotation for public function `func` 236 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -231 231 | return i -232 232 | -233 233 | -234 |-def func(x: int): - 234 |+def func(x: int) -> int: -235 235 | if not x: -236 236 | return 1 -237 237 | raise ValueError +231 | return i +232 | +233 | + - def func(x: int): +234 + def func(x: int) -> int: +235 | if not x: +236 | return 1 +237 | raise ValueError +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:240:5 @@ -710,16 +682,15 @@ ANN201 [*] Missing return type annotation for public function `func` 242 | return 1 | help: Add return type annotation: `int` - -ℹ Unsafe fix -237 237 | raise ValueError -238 238 | -239 239 | -240 |-def func(x: int): - 240 |+def func(x: int) -> int: -241 241 | if not x: -242 242 | return 1 -243 243 | else: +237 | raise ValueError +238 | +239 | + - def func(x: int): +240 + def func(x: int) -> int: +241 | if not x: +242 | return 1 +243 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:248:5 @@ -730,25 +701,24 @@ ANN201 [*] Missing return type annotation for public function `func` 250 | raise ValueError | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix -214 214 | return 1 -215 215 | -216 216 | -217 |-from typing import overload - 217 |+from typing import overload, Optional -218 218 | -219 219 | -220 220 | @overload +214 | return 1 +215 | +216 | + - from typing import overload +217 + from typing import overload, Optional +218 | +219 | +220 | @overload -------------------------------------------------------------------------------- -245 245 | raise ValueError -246 246 | -247 247 | -248 |-def func(): - 248 |+def func() -> Optional[int]: -249 249 | try: -250 250 | raise ValueError -251 251 | except: +245 | raise ValueError +246 | +247 | + - def func(): +248 + def func() -> Optional[int]: +249 | try: +250 | raise ValueError +251 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:255:5 @@ -759,25 +729,24 @@ ANN201 [*] Missing return type annotation for public function `func` 257 | return 1 | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix -214 214 | return 1 -215 215 | -216 216 | -217 |-from typing import overload - 217 |+from typing import overload, Optional -218 218 | -219 219 | -220 220 | @overload +214 | return 1 +215 | +216 | + - from typing import overload +217 + from typing import overload, Optional +218 | +219 | +220 | @overload -------------------------------------------------------------------------------- -252 252 | return 2 -253 253 | -254 254 | -255 |-def func(): - 255 |+def func() -> Optional[int]: -256 256 | try: -257 257 | return 1 -258 258 | except: +252 | return 2 +253 | +254 | + - def func(): +255 + def func() -> Optional[int]: +256 | try: +257 | return 1 +258 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:262:5 @@ -788,16 +757,15 @@ ANN201 [*] Missing return type annotation for public function `func` 264 | if x > 0: | help: Add return type annotation: `int` - -ℹ Unsafe fix -259 259 | pass -260 260 | -261 261 | -262 |-def func(x: int): - 262 |+def func(x: int) -> int: -263 263 | for _ in range(3): -264 264 | if x > 0: -265 265 | return 1 +259 | pass +260 | +261 | + - def func(x: int): +262 + def func(x: int) -> int: +263 | for _ in range(3): +264 | if x > 0: +265 | return 1 +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:269:5 @@ -808,16 +776,15 @@ ANN201 [*] Missing return type annotation for public function `func` 271 | raise ValueError | help: Add return type annotation: `None` - -ℹ Unsafe fix -266 266 | raise ValueError -267 267 | -268 268 | -269 |-def func(x: int): - 269 |+def func(x: int) -> None: -270 270 | if x > 5: -271 271 | raise ValueError -272 272 | else: +266 | raise ValueError +267 | +268 | + - def func(x: int): +269 + def func(x: int) -> None: +270 | if x > 5: +271 | raise ValueError +272 | else: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:276:5 @@ -828,16 +795,15 @@ ANN201 [*] Missing return type annotation for public function `func` 278 | raise ValueError | help: Add return type annotation: `None` - -ℹ Unsafe fix -273 273 | pass -274 274 | -275 275 | -276 |-def func(x: int): - 276 |+def func(x: int) -> None: -277 277 | if x > 5: -278 278 | raise ValueError -279 279 | elif x > 10: +273 | pass +274 | +275 | + - def func(x: int): +276 + def func(x: int) -> None: +277 | if x > 5: +278 | raise ValueError +279 | elif x > 10: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:283:5 @@ -848,25 +814,24 @@ ANN201 [*] Missing return type annotation for public function `func` 285 | raise ValueError | help: Add return type annotation: `Optional[int]` - -ℹ Unsafe fix -214 214 | return 1 -215 215 | -216 216 | -217 |-from typing import overload - 217 |+from typing import overload, Optional -218 218 | -219 219 | -220 220 | @overload +214 | return 1 +215 | +216 | + - from typing import overload +217 + from typing import overload, Optional +218 | +219 | +220 | @overload -------------------------------------------------------------------------------- -280 280 | pass -281 281 | -282 282 | -283 |-def func(x: int): - 283 |+def func(x: int) -> Optional[int]: -284 284 | if x > 5: -285 285 | raise ValueError -286 286 | elif x > 10: +280 | pass +281 | +282 | + - def func(x: int): +283 + def func(x: int) -> Optional[int]: +284 | if x > 5: +285 | raise ValueError +286 | elif x > 10: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:290:5 @@ -877,16 +842,15 @@ ANN201 [*] Missing return type annotation for public function `func` 292 | return 5 | help: Add return type annotation: `int` - -ℹ Unsafe fix -287 287 | return 5 -288 288 | -289 289 | -290 |-def func(): - 290 |+def func() -> int: -291 291 | try: -292 292 | return 5 -293 293 | except: +287 | return 5 +288 | +289 | + - def func(): +290 + def func() -> int: +291 | try: +292 | return 5 +293 | except: +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `func` --> auto_return_type.py:299:5 @@ -897,22 +861,21 @@ ANN201 [*] Missing return type annotation for public function `func` 301 | case [1, 2, 3]: | help: Add return type annotation: `Union[str, int]` - -ℹ Unsafe fix -214 214 | return 1 -215 215 | -216 216 | -217 |-from typing import overload - 217 |+from typing import overload, Union -218 218 | -219 219 | -220 220 | @overload +214 | return 1 +215 | +216 | + - from typing import overload +217 + from typing import overload, Union +218 | +219 | +220 | @overload -------------------------------------------------------------------------------- -296 296 | raise ValueError -297 297 | -298 298 | -299 |-def func(x: int): - 299 |+def func(x: int) -> Union[str, int]: -300 300 | match x: -301 301 | case [1, 2, 3]: -302 302 | return 1 +296 | raise ValueError +297 | +298 | + - def func(x: int): +299 + def func(x: int) -> Union[str, int]: +300 | match x: +301 | case [1, 2, 3]: +302 | return 1 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap index a9b1798e2e..80b35c0a76 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap +++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap @@ -10,16 +10,15 @@ ANN201 [*] Missing return type annotation for public function `foo` 6 | pass | help: Add return type annotation: `None` - -ℹ Unsafe fix -2 2 | from typing_extensions import override -3 3 | -4 4 | # Error -5 |-def foo(a, b): - 5 |+def foo(a, b) -> None: -6 6 | pass -7 7 | -8 8 | +2 | from typing_extensions import override +3 | +4 | # Error + - def foo(a, b): +5 + def foo(a, b) -> None: +6 | pass +7 | +8 | +note: This is an unsafe fix and may change runtime behavior ANN001 Missing type annotation for function argument `a` --> annotation_presence.py:5:9 @@ -48,16 +47,15 @@ ANN201 [*] Missing return type annotation for public function `foo` 11 | pass | help: Add return type annotation: `None` - -ℹ Unsafe fix -7 7 | -8 8 | -9 9 | # Error -10 |-def foo(a: int, b): - 10 |+def foo(a: int, b) -> None: -11 11 | pass -12 12 | -13 13 | +7 | +8 | +9 | # Error + - def foo(a: int, b): +10 + def foo(a: int, b) -> None: +11 | pass +12 | +13 | +note: This is an unsafe fix and may change runtime behavior ANN001 Missing type annotation for function argument `b` --> annotation_presence.py:10:17 @@ -86,16 +84,15 @@ ANN201 [*] Missing return type annotation for public function `foo` 21 | pass | help: Add return type annotation: `None` - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | # Error -20 |-def foo(a: int, b: int): - 20 |+def foo(a: int, b: int) -> None: -21 21 | pass -22 22 | -23 23 | +17 | +18 | +19 | # Error + - def foo(a: int, b: int): +20 + def foo(a: int, b: int) -> None: +21 | pass +22 | +23 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `foo` --> annotation_presence.py:25:5 @@ -106,16 +103,15 @@ ANN201 [*] Missing return type annotation for public function `foo` 26 | pass | help: Add return type annotation: `None` - -ℹ Unsafe fix -22 22 | -23 23 | -24 24 | # Error -25 |-def foo(): - 25 |+def foo() -> None: -26 26 | pass -27 27 | -28 28 | +22 | +23 | +24 | # Error + - def foo(): +25 + def foo() -> None: +26 | pass +27 | +28 | +note: This is an unsafe fix and may change runtime behavior ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a` --> annotation_presence.py:45:12 @@ -297,16 +293,15 @@ ANN204 [*] Missing return type annotation for special method `__init__` 160 | ... | help: Add return type annotation: `None` - -ℹ Unsafe fix -156 156 | -157 157 | class Foo: -158 158 | @decorator() -159 |- def __init__(self: "Foo", foo: int): - 159 |+ def __init__(self: "Foo", foo: int) -> None: -160 160 | ... -161 161 | -162 162 | +156 | +157 | class Foo: +158 | @decorator() + - def __init__(self: "Foo", foo: int): +159 + def __init__(self: "Foo", foo: int) -> None: +160 | ... +161 | +162 | +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__init__` --> annotation_presence.py:165:9 @@ -318,11 +313,10 @@ ANN204 [*] Missing return type annotation for special method `__init__` 166 | print(f"{self.attr=}") | help: Add return type annotation: `None` - -ℹ Unsafe fix -162 162 | -163 163 | # Regression test for: https://github.com/astral-sh/ruff/issues/7711 -164 164 | class Class: -165 |- def __init__(self): - 165 |+ def __init__(self) -> None: -166 166 | print(f"{self.attr=}") +162 | +163 | # Regression test for: https://github.com/astral-sh/ruff/issues/7711 +164 | class Class: + - def __init__(self): +165 + def __init__(self) -> None: +166 | print(f"{self.attr=}") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap index b6f926aa7a..2205211101 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap +++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__ignore_fully_untyped.snap @@ -9,16 +9,15 @@ ANN201 [*] Missing return type annotation for public function `error_partially_t 25 | pass | help: Add return type annotation: `None` - -ℹ Unsafe fix -21 21 | pass -22 22 | -23 23 | -24 |-def error_partially_typed_1(a: int, b): - 24 |+def error_partially_typed_1(a: int, b) -> None: -25 25 | pass -26 26 | -27 27 | +21 | pass +22 | +23 | + - def error_partially_typed_1(a: int, b): +24 + def error_partially_typed_1(a: int, b) -> None: +25 | pass +26 | +27 | +note: This is an unsafe fix and may change runtime behavior ANN001 Missing type annotation for function argument `b` --> ignore_fully_untyped.py:24:37 @@ -44,16 +43,15 @@ ANN201 [*] Missing return type annotation for public function `error_partially_t 33 | pass | help: Add return type annotation: `None` - -ℹ Unsafe fix -29 29 | pass -30 30 | -31 31 | -32 |-def error_partially_typed_3(a: int, b: int): - 32 |+def error_partially_typed_3(a: int, b: int) -> None: -33 33 | pass -34 34 | -35 35 | +29 | pass +30 | +31 | + - def error_partially_typed_3(a: int, b: int): +32 + def error_partially_typed_3(a: int, b: int) -> None: +33 | pass +34 | +35 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `error_typed_self` --> ignore_fully_untyped.py:43:9 @@ -65,11 +63,10 @@ ANN201 [*] Missing return type annotation for public function `error_typed_self` 44 | pass | help: Add return type annotation: `None` - -ℹ Unsafe fix -40 40 | def ok_untyped_method(self): -41 41 | pass -42 42 | -43 |- def error_typed_self(self: X): - 43 |+ def error_typed_self(self: X) -> None: -44 44 | pass +40 | def ok_untyped_method(self): +41 | pass +42 | + - def error_typed_self(self: X): +43 + def error_typed_self(self: X) -> None: +44 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap index 5a937ee087..0e8165797c 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap +++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap @@ -11,16 +11,15 @@ ANN204 [*] Missing return type annotation for special method `__init__` 6 | ... | help: Add return type annotation: `None` - -ℹ Unsafe fix -2 2 | -3 3 | # Error -4 4 | class Foo: -5 |- def __init__(self): - 5 |+ def __init__(self) -> None: -6 6 | ... -7 7 | -8 8 | +2 | +3 | # Error +4 | class Foo: + - def __init__(self): +5 + def __init__(self) -> None: +6 | ... +7 | +8 | +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__init__` --> mypy_init_return.py:11:9 @@ -32,16 +31,15 @@ ANN204 [*] Missing return type annotation for special method `__init__` 12 | ... | help: Add return type annotation: `None` - -ℹ Unsafe fix -8 8 | -9 9 | # Error -10 10 | class Foo: -11 |- def __init__(self, foo): - 11 |+ def __init__(self, foo) -> None: -12 12 | ... -13 13 | -14 14 | +8 | +9 | # Error +10 | class Foo: + - def __init__(self, foo): +11 + def __init__(self, foo) -> None: +12 | ... +13 | +14 | +note: This is an unsafe fix and may change runtime behavior ANN202 [*] Missing return type annotation for private function `__init__` --> mypy_init_return.py:40:5 @@ -52,16 +50,15 @@ ANN202 [*] Missing return type annotation for private function `__init__` 41 | ... | help: Add return type annotation: `None` - -ℹ Unsafe fix -37 37 | -38 38 | -39 39 | # Error -40 |-def __init__(self, foo: int): - 40 |+def __init__(self, foo: int) -> None: -41 41 | ... -42 42 | -43 43 | +37 | +38 | +39 | # Error + - def __init__(self, foo: int): +40 + def __init__(self, foo: int) -> None: +41 | ... +42 | +43 | +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__init__` --> mypy_init_return.py:47:9 @@ -73,11 +70,10 @@ ANN204 [*] Missing return type annotation for special method `__init__` 48 | ... | help: Add return type annotation: `None` - -ℹ Unsafe fix -44 44 | # Error – used to be ok for a moment since the mere presence -45 45 | # of a vararg falsely indicated that the function has a typed argument. -46 46 | class Foo: -47 |- def __init__(self, *arg): - 47 |+ def __init__(self, *arg) -> None: -48 48 | ... +44 | # Error – used to be ok for a moment since the mere presence +45 | # of a vararg falsely indicated that the function has a typed argument. +46 | class Foo: + - def __init__(self, *arg): +47 + def __init__(self, *arg) -> None: +48 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap index b824397f1a..031e4e7524 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap +++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap @@ -10,14 +10,13 @@ ANN204 [*] Missing return type annotation for special method `__str__` 3 | ... | help: Add return type annotation: `str` - -ℹ Unsafe fix -1 1 | class Foo: -2 |- def __str__(self): - 2 |+ def __str__(self) -> str: -3 3 | ... -4 4 | -5 5 | def __repr__(self): +1 | class Foo: + - def __str__(self): +2 + def __str__(self) -> str: +3 | ... +4 | +5 | def __repr__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__repr__` --> simple_magic_methods.py:5:9 @@ -29,16 +28,15 @@ ANN204 [*] Missing return type annotation for special method `__repr__` 6 | ... | help: Add return type annotation: `str` - -ℹ Unsafe fix -2 2 | def __str__(self): -3 3 | ... -4 4 | -5 |- def __repr__(self): - 5 |+ def __repr__(self) -> str: -6 6 | ... -7 7 | -8 8 | def __len__(self): +2 | def __str__(self): +3 | ... +4 | + - def __repr__(self): +5 + def __repr__(self) -> str: +6 | ... +7 | +8 | def __len__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__len__` --> simple_magic_methods.py:8:9 @@ -50,16 +48,15 @@ ANN204 [*] Missing return type annotation for special method `__len__` 9 | ... | help: Add return type annotation: `int` - -ℹ Unsafe fix -5 5 | def __repr__(self): -6 6 | ... -7 7 | -8 |- def __len__(self): - 8 |+ def __len__(self) -> int: -9 9 | ... -10 10 | -11 11 | def __length_hint__(self): +5 | def __repr__(self): +6 | ... +7 | + - def __len__(self): +8 + def __len__(self) -> int: +9 | ... +10 | +11 | def __length_hint__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__length_hint__` --> simple_magic_methods.py:11:9 @@ -71,16 +68,15 @@ ANN204 [*] Missing return type annotation for special method `__length_hint__` 12 | ... | help: Add return type annotation: `int` - -ℹ Unsafe fix -8 8 | def __len__(self): -9 9 | ... -10 10 | -11 |- def __length_hint__(self): - 11 |+ def __length_hint__(self) -> int: -12 12 | ... -13 13 | -14 14 | def __init__(self): +8 | def __len__(self): +9 | ... +10 | + - def __length_hint__(self): +11 + def __length_hint__(self) -> int: +12 | ... +13 | +14 | def __init__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__init__` --> simple_magic_methods.py:14:9 @@ -92,16 +88,15 @@ ANN204 [*] Missing return type annotation for special method `__init__` 15 | ... | help: Add return type annotation: `None` - -ℹ Unsafe fix -11 11 | def __length_hint__(self): -12 12 | ... -13 13 | -14 |- def __init__(self): - 14 |+ def __init__(self) -> None: -15 15 | ... -16 16 | -17 17 | def __del__(self): +11 | def __length_hint__(self): +12 | ... +13 | + - def __init__(self): +14 + def __init__(self) -> None: +15 | ... +16 | +17 | def __del__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__del__` --> simple_magic_methods.py:17:9 @@ -113,16 +108,15 @@ ANN204 [*] Missing return type annotation for special method `__del__` 18 | ... | help: Add return type annotation: `None` - -ℹ Unsafe fix -14 14 | def __init__(self): -15 15 | ... -16 16 | -17 |- def __del__(self): - 17 |+ def __del__(self) -> None: -18 18 | ... -19 19 | -20 20 | def __bool__(self): +14 | def __init__(self): +15 | ... +16 | + - def __del__(self): +17 + def __del__(self) -> None: +18 | ... +19 | +20 | def __bool__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__bool__` --> simple_magic_methods.py:20:9 @@ -134,16 +128,15 @@ ANN204 [*] Missing return type annotation for special method `__bool__` 21 | ... | help: Add return type annotation: `bool` - -ℹ Unsafe fix -17 17 | def __del__(self): -18 18 | ... -19 19 | -20 |- def __bool__(self): - 20 |+ def __bool__(self) -> bool: -21 21 | ... -22 22 | -23 23 | def __bytes__(self): +17 | def __del__(self): +18 | ... +19 | + - def __bool__(self): +20 + def __bool__(self) -> bool: +21 | ... +22 | +23 | def __bytes__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__bytes__` --> simple_magic_methods.py:23:9 @@ -155,16 +148,15 @@ ANN204 [*] Missing return type annotation for special method `__bytes__` 24 | ... | help: Add return type annotation: `bytes` - -ℹ Unsafe fix -20 20 | def __bool__(self): -21 21 | ... -22 22 | -23 |- def __bytes__(self): - 23 |+ def __bytes__(self) -> bytes: -24 24 | ... -25 25 | -26 26 | def __format__(self, format_spec): +20 | def __bool__(self): +21 | ... +22 | + - def __bytes__(self): +23 + def __bytes__(self) -> bytes: +24 | ... +25 | +26 | def __format__(self, format_spec): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__format__` --> simple_magic_methods.py:26:9 @@ -176,16 +168,15 @@ ANN204 [*] Missing return type annotation for special method `__format__` 27 | ... | help: Add return type annotation: `str` - -ℹ Unsafe fix -23 23 | def __bytes__(self): -24 24 | ... -25 25 | -26 |- def __format__(self, format_spec): - 26 |+ def __format__(self, format_spec) -> str: -27 27 | ... -28 28 | -29 29 | def __contains__(self, item): +23 | def __bytes__(self): +24 | ... +25 | + - def __format__(self, format_spec): +26 + def __format__(self, format_spec) -> str: +27 | ... +28 | +29 | def __contains__(self, item): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__contains__` --> simple_magic_methods.py:29:9 @@ -197,16 +188,15 @@ ANN204 [*] Missing return type annotation for special method `__contains__` 30 | ... | help: Add return type annotation: `bool` - -ℹ Unsafe fix -26 26 | def __format__(self, format_spec): -27 27 | ... -28 28 | -29 |- def __contains__(self, item): - 29 |+ def __contains__(self, item) -> bool: -30 30 | ... -31 31 | -32 32 | def __complex__(self): +26 | def __format__(self, format_spec): +27 | ... +28 | + - def __contains__(self, item): +29 + def __contains__(self, item) -> bool: +30 | ... +31 | +32 | def __complex__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__complex__` --> simple_magic_methods.py:32:9 @@ -218,16 +208,15 @@ ANN204 [*] Missing return type annotation for special method `__complex__` 33 | ... | help: Add return type annotation: `complex` - -ℹ Unsafe fix -29 29 | def __contains__(self, item): -30 30 | ... -31 31 | -32 |- def __complex__(self): - 32 |+ def __complex__(self) -> complex: -33 33 | ... -34 34 | -35 35 | def __int__(self): +29 | def __contains__(self, item): +30 | ... +31 | + - def __complex__(self): +32 + def __complex__(self) -> complex: +33 | ... +34 | +35 | def __int__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__int__` --> simple_magic_methods.py:35:9 @@ -239,16 +228,15 @@ ANN204 [*] Missing return type annotation for special method `__int__` 36 | ... | help: Add return type annotation: `int` - -ℹ Unsafe fix -32 32 | def __complex__(self): -33 33 | ... -34 34 | -35 |- def __int__(self): - 35 |+ def __int__(self) -> int: -36 36 | ... -37 37 | -38 38 | def __float__(self): +32 | def __complex__(self): +33 | ... +34 | + - def __int__(self): +35 + def __int__(self) -> int: +36 | ... +37 | +38 | def __float__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__float__` --> simple_magic_methods.py:38:9 @@ -260,16 +248,15 @@ ANN204 [*] Missing return type annotation for special method `__float__` 39 | ... | help: Add return type annotation: `float` - -ℹ Unsafe fix -35 35 | def __int__(self): -36 36 | ... -37 37 | -38 |- def __float__(self): - 38 |+ def __float__(self) -> float: -39 39 | ... -40 40 | -41 41 | def __index__(self): +35 | def __int__(self): +36 | ... +37 | + - def __float__(self): +38 + def __float__(self) -> float: +39 | ... +40 | +41 | def __index__(self): +note: This is an unsafe fix and may change runtime behavior ANN204 [*] Missing return type annotation for special method `__index__` --> simple_magic_methods.py:41:9 @@ -281,11 +268,10 @@ ANN204 [*] Missing return type annotation for special method `__index__` 42 | ... | help: Add return type annotation: `int` - -ℹ Unsafe fix -38 38 | def __float__(self): -39 39 | ... -40 40 | -41 |- def __index__(self): - 41 |+ def __index__(self) -> int: -42 42 | ... +38 | def __float__(self): +39 | ... +40 | + - def __index__(self): +41 + def __index__(self) -> int: +42 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap index ee8a25dae0..236339d126 100644 --- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap +++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__suppress_none_returning.snap @@ -10,16 +10,15 @@ ANN201 [*] Missing return type annotation for public function `foo` 46 | return True | help: Add return type annotation: `bool` - -ℹ Unsafe fix -42 42 | -43 43 | -44 44 | # Error -45 |-def foo(): - 45 |+def foo() -> bool: -46 46 | return True -47 47 | -48 48 | +42 | +43 | +44 | # Error + - def foo(): +45 + def foo() -> bool: +46 | return True +47 | +48 | +note: This is an unsafe fix and may change runtime behavior ANN201 [*] Missing return type annotation for public function `foo` --> suppress_none_returning.py:50:5 @@ -31,16 +30,15 @@ ANN201 [*] Missing return type annotation for public function `foo` 52 | if a == 4: | help: Add return type annotation: `bool | None` - -ℹ Unsafe fix -47 47 | -48 48 | -49 49 | # Error -50 |-def foo(): - 50 |+def foo() -> bool | None: -51 51 | a = 2 + 2 -52 52 | if a == 4: -53 53 | return True +47 | +48 | +49 | # Error + - def foo(): +50 + def foo() -> bool | None: +51 | a = 2 + 2 +52 | if a == 4: +53 | return True +note: This is an unsafe fix and may change runtime behavior ANN001 Missing type annotation for function argument `a` --> suppress_none_returning.py:59:9 diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap index 74bfb836ba..eff490466c 100644 --- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap +++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC105_ASYNC105.py.snap @@ -11,16 +11,15 @@ ASYNC105 [*] Call to `trio.aclose_forcefully` is not immediately awaited 32 | trio.open_ssl_over_tcp_listeners(foo, foo) | help: Add `await` - -ℹ Unsafe fix -27 27 | await trio.lowlevel.wait_writable(foo) -28 28 | -29 29 | # ASYNC105 -30 |- trio.aclose_forcefully(foo) - 30 |+ await trio.aclose_forcefully(foo) -31 31 | trio.open_file(foo) -32 32 | trio.open_ssl_over_tcp_listeners(foo, foo) -33 33 | trio.open_ssl_over_tcp_stream(foo, foo) +27 | await trio.lowlevel.wait_writable(foo) +28 | +29 | # ASYNC105 + - trio.aclose_forcefully(foo) +30 + await trio.aclose_forcefully(foo) +31 | trio.open_file(foo) +32 | trio.open_ssl_over_tcp_listeners(foo, foo) +33 | trio.open_ssl_over_tcp_stream(foo, foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.open_file` is not immediately awaited --> ASYNC105.py:31:5 @@ -33,16 +32,15 @@ ASYNC105 [*] Call to `trio.open_file` is not immediately awaited 33 | trio.open_ssl_over_tcp_stream(foo, foo) | help: Add `await` - -ℹ Unsafe fix -28 28 | -29 29 | # ASYNC105 -30 30 | trio.aclose_forcefully(foo) -31 |- trio.open_file(foo) - 31 |+ await trio.open_file(foo) -32 32 | trio.open_ssl_over_tcp_listeners(foo, foo) -33 33 | trio.open_ssl_over_tcp_stream(foo, foo) -34 34 | trio.open_tcp_listeners(foo) +28 | +29 | # ASYNC105 +30 | trio.aclose_forcefully(foo) + - trio.open_file(foo) +31 + await trio.open_file(foo) +32 | trio.open_ssl_over_tcp_listeners(foo, foo) +33 | trio.open_ssl_over_tcp_stream(foo, foo) +34 | trio.open_tcp_listeners(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.open_ssl_over_tcp_listeners` is not immediately awaited --> ASYNC105.py:32:5 @@ -55,16 +53,15 @@ ASYNC105 [*] Call to `trio.open_ssl_over_tcp_listeners` is not immediately await 34 | trio.open_tcp_listeners(foo) | help: Add `await` - -ℹ Unsafe fix -29 29 | # ASYNC105 -30 30 | trio.aclose_forcefully(foo) -31 31 | trio.open_file(foo) -32 |- trio.open_ssl_over_tcp_listeners(foo, foo) - 32 |+ await trio.open_ssl_over_tcp_listeners(foo, foo) -33 33 | trio.open_ssl_over_tcp_stream(foo, foo) -34 34 | trio.open_tcp_listeners(foo) -35 35 | trio.open_tcp_stream(foo, foo) +29 | # ASYNC105 +30 | trio.aclose_forcefully(foo) +31 | trio.open_file(foo) + - trio.open_ssl_over_tcp_listeners(foo, foo) +32 + await trio.open_ssl_over_tcp_listeners(foo, foo) +33 | trio.open_ssl_over_tcp_stream(foo, foo) +34 | trio.open_tcp_listeners(foo) +35 | trio.open_tcp_stream(foo, foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.open_ssl_over_tcp_stream` is not immediately awaited --> ASYNC105.py:33:5 @@ -77,16 +74,15 @@ ASYNC105 [*] Call to `trio.open_ssl_over_tcp_stream` is not immediately awaited 35 | trio.open_tcp_stream(foo, foo) | help: Add `await` - -ℹ Unsafe fix -30 30 | trio.aclose_forcefully(foo) -31 31 | trio.open_file(foo) -32 32 | trio.open_ssl_over_tcp_listeners(foo, foo) -33 |- trio.open_ssl_over_tcp_stream(foo, foo) - 33 |+ await trio.open_ssl_over_tcp_stream(foo, foo) -34 34 | trio.open_tcp_listeners(foo) -35 35 | trio.open_tcp_stream(foo, foo) -36 36 | trio.open_unix_socket(foo) +30 | trio.aclose_forcefully(foo) +31 | trio.open_file(foo) +32 | trio.open_ssl_over_tcp_listeners(foo, foo) + - trio.open_ssl_over_tcp_stream(foo, foo) +33 + await trio.open_ssl_over_tcp_stream(foo, foo) +34 | trio.open_tcp_listeners(foo) +35 | trio.open_tcp_stream(foo, foo) +36 | trio.open_unix_socket(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.open_tcp_listeners` is not immediately awaited --> ASYNC105.py:34:5 @@ -99,16 +95,15 @@ ASYNC105 [*] Call to `trio.open_tcp_listeners` is not immediately awaited 36 | trio.open_unix_socket(foo) | help: Add `await` - -ℹ Unsafe fix -31 31 | trio.open_file(foo) -32 32 | trio.open_ssl_over_tcp_listeners(foo, foo) -33 33 | trio.open_ssl_over_tcp_stream(foo, foo) -34 |- trio.open_tcp_listeners(foo) - 34 |+ await trio.open_tcp_listeners(foo) -35 35 | trio.open_tcp_stream(foo, foo) -36 36 | trio.open_unix_socket(foo) -37 37 | trio.run_process(foo) +31 | trio.open_file(foo) +32 | trio.open_ssl_over_tcp_listeners(foo, foo) +33 | trio.open_ssl_over_tcp_stream(foo, foo) + - trio.open_tcp_listeners(foo) +34 + await trio.open_tcp_listeners(foo) +35 | trio.open_tcp_stream(foo, foo) +36 | trio.open_unix_socket(foo) +37 | trio.run_process(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.open_tcp_stream` is not immediately awaited --> ASYNC105.py:35:5 @@ -121,16 +116,15 @@ ASYNC105 [*] Call to `trio.open_tcp_stream` is not immediately awaited 37 | trio.run_process(foo) | help: Add `await` - -ℹ Unsafe fix -32 32 | trio.open_ssl_over_tcp_listeners(foo, foo) -33 33 | trio.open_ssl_over_tcp_stream(foo, foo) -34 34 | trio.open_tcp_listeners(foo) -35 |- trio.open_tcp_stream(foo, foo) - 35 |+ await trio.open_tcp_stream(foo, foo) -36 36 | trio.open_unix_socket(foo) -37 37 | trio.run_process(foo) -38 38 | trio.serve_listeners(foo, foo) +32 | trio.open_ssl_over_tcp_listeners(foo, foo) +33 | trio.open_ssl_over_tcp_stream(foo, foo) +34 | trio.open_tcp_listeners(foo) + - trio.open_tcp_stream(foo, foo) +35 + await trio.open_tcp_stream(foo, foo) +36 | trio.open_unix_socket(foo) +37 | trio.run_process(foo) +38 | trio.serve_listeners(foo, foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.open_unix_socket` is not immediately awaited --> ASYNC105.py:36:5 @@ -143,16 +137,15 @@ ASYNC105 [*] Call to `trio.open_unix_socket` is not immediately awaited 38 | trio.serve_listeners(foo, foo) | help: Add `await` - -ℹ Unsafe fix -33 33 | trio.open_ssl_over_tcp_stream(foo, foo) -34 34 | trio.open_tcp_listeners(foo) -35 35 | trio.open_tcp_stream(foo, foo) -36 |- trio.open_unix_socket(foo) - 36 |+ await trio.open_unix_socket(foo) -37 37 | trio.run_process(foo) -38 38 | trio.serve_listeners(foo, foo) -39 39 | trio.serve_ssl_over_tcp(foo, foo, foo) +33 | trio.open_ssl_over_tcp_stream(foo, foo) +34 | trio.open_tcp_listeners(foo) +35 | trio.open_tcp_stream(foo, foo) + - trio.open_unix_socket(foo) +36 + await trio.open_unix_socket(foo) +37 | trio.run_process(foo) +38 | trio.serve_listeners(foo, foo) +39 | trio.serve_ssl_over_tcp(foo, foo, foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.run_process` is not immediately awaited --> ASYNC105.py:37:5 @@ -165,16 +158,15 @@ ASYNC105 [*] Call to `trio.run_process` is not immediately awaited 39 | trio.serve_ssl_over_tcp(foo, foo, foo) | help: Add `await` - -ℹ Unsafe fix -34 34 | trio.open_tcp_listeners(foo) -35 35 | trio.open_tcp_stream(foo, foo) -36 36 | trio.open_unix_socket(foo) -37 |- trio.run_process(foo) - 37 |+ await trio.run_process(foo) -38 38 | trio.serve_listeners(foo, foo) -39 39 | trio.serve_ssl_over_tcp(foo, foo, foo) -40 40 | trio.serve_tcp(foo, foo) +34 | trio.open_tcp_listeners(foo) +35 | trio.open_tcp_stream(foo, foo) +36 | trio.open_unix_socket(foo) + - trio.run_process(foo) +37 + await trio.run_process(foo) +38 | trio.serve_listeners(foo, foo) +39 | trio.serve_ssl_over_tcp(foo, foo, foo) +40 | trio.serve_tcp(foo, foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.serve_listeners` is not immediately awaited --> ASYNC105.py:38:5 @@ -187,16 +179,15 @@ ASYNC105 [*] Call to `trio.serve_listeners` is not immediately awaited 40 | trio.serve_tcp(foo, foo) | help: Add `await` - -ℹ Unsafe fix -35 35 | trio.open_tcp_stream(foo, foo) -36 36 | trio.open_unix_socket(foo) -37 37 | trio.run_process(foo) -38 |- trio.serve_listeners(foo, foo) - 38 |+ await trio.serve_listeners(foo, foo) -39 39 | trio.serve_ssl_over_tcp(foo, foo, foo) -40 40 | trio.serve_tcp(foo, foo) -41 41 | trio.sleep(foo) +35 | trio.open_tcp_stream(foo, foo) +36 | trio.open_unix_socket(foo) +37 | trio.run_process(foo) + - trio.serve_listeners(foo, foo) +38 + await trio.serve_listeners(foo, foo) +39 | trio.serve_ssl_over_tcp(foo, foo, foo) +40 | trio.serve_tcp(foo, foo) +41 | trio.sleep(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.serve_ssl_over_tcp` is not immediately awaited --> ASYNC105.py:39:5 @@ -209,16 +200,15 @@ ASYNC105 [*] Call to `trio.serve_ssl_over_tcp` is not immediately awaited 41 | trio.sleep(foo) | help: Add `await` - -ℹ Unsafe fix -36 36 | trio.open_unix_socket(foo) -37 37 | trio.run_process(foo) -38 38 | trio.serve_listeners(foo, foo) -39 |- trio.serve_ssl_over_tcp(foo, foo, foo) - 39 |+ await trio.serve_ssl_over_tcp(foo, foo, foo) -40 40 | trio.serve_tcp(foo, foo) -41 41 | trio.sleep(foo) -42 42 | trio.sleep_forever() +36 | trio.open_unix_socket(foo) +37 | trio.run_process(foo) +38 | trio.serve_listeners(foo, foo) + - trio.serve_ssl_over_tcp(foo, foo, foo) +39 + await trio.serve_ssl_over_tcp(foo, foo, foo) +40 | trio.serve_tcp(foo, foo) +41 | trio.sleep(foo) +42 | trio.sleep_forever() +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.serve_tcp` is not immediately awaited --> ASYNC105.py:40:5 @@ -231,16 +221,15 @@ ASYNC105 [*] Call to `trio.serve_tcp` is not immediately awaited 42 | trio.sleep_forever() | help: Add `await` - -ℹ Unsafe fix -37 37 | trio.run_process(foo) -38 38 | trio.serve_listeners(foo, foo) -39 39 | trio.serve_ssl_over_tcp(foo, foo, foo) -40 |- trio.serve_tcp(foo, foo) - 40 |+ await trio.serve_tcp(foo, foo) -41 41 | trio.sleep(foo) -42 42 | trio.sleep_forever() -43 43 | trio.sleep_until(foo) +37 | trio.run_process(foo) +38 | trio.serve_listeners(foo, foo) +39 | trio.serve_ssl_over_tcp(foo, foo, foo) + - trio.serve_tcp(foo, foo) +40 + await trio.serve_tcp(foo, foo) +41 | trio.sleep(foo) +42 | trio.sleep_forever() +43 | trio.sleep_until(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.sleep` is not immediately awaited --> ASYNC105.py:41:5 @@ -253,16 +242,15 @@ ASYNC105 [*] Call to `trio.sleep` is not immediately awaited 43 | trio.sleep_until(foo) | help: Add `await` - -ℹ Unsafe fix -38 38 | trio.serve_listeners(foo, foo) -39 39 | trio.serve_ssl_over_tcp(foo, foo, foo) -40 40 | trio.serve_tcp(foo, foo) -41 |- trio.sleep(foo) - 41 |+ await trio.sleep(foo) -42 42 | trio.sleep_forever() -43 43 | trio.sleep_until(foo) -44 44 | trio.lowlevel.cancel_shielded_checkpoint() +38 | trio.serve_listeners(foo, foo) +39 | trio.serve_ssl_over_tcp(foo, foo, foo) +40 | trio.serve_tcp(foo, foo) + - trio.sleep(foo) +41 + await trio.sleep(foo) +42 | trio.sleep_forever() +43 | trio.sleep_until(foo) +44 | trio.lowlevel.cancel_shielded_checkpoint() +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.sleep_forever` is not immediately awaited --> ASYNC105.py:42:5 @@ -275,16 +263,15 @@ ASYNC105 [*] Call to `trio.sleep_forever` is not immediately awaited 44 | trio.lowlevel.cancel_shielded_checkpoint() | help: Add `await` - -ℹ Unsafe fix -39 39 | trio.serve_ssl_over_tcp(foo, foo, foo) -40 40 | trio.serve_tcp(foo, foo) -41 41 | trio.sleep(foo) -42 |- trio.sleep_forever() - 42 |+ await trio.sleep_forever() -43 43 | trio.sleep_until(foo) -44 44 | trio.lowlevel.cancel_shielded_checkpoint() -45 45 | trio.lowlevel.checkpoint() +39 | trio.serve_ssl_over_tcp(foo, foo, foo) +40 | trio.serve_tcp(foo, foo) +41 | trio.sleep(foo) + - trio.sleep_forever() +42 + await trio.sleep_forever() +43 | trio.sleep_until(foo) +44 | trio.lowlevel.cancel_shielded_checkpoint() +45 | trio.lowlevel.checkpoint() +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.cancel_shielded_checkpoint` is not immediately awaited --> ASYNC105.py:44:5 @@ -297,16 +284,15 @@ ASYNC105 [*] Call to `trio.lowlevel.cancel_shielded_checkpoint` is not immediate 46 | trio.lowlevel.checkpoint_if_cancelled() | help: Add `await` - -ℹ Unsafe fix -41 41 | trio.sleep(foo) -42 42 | trio.sleep_forever() -43 43 | trio.sleep_until(foo) -44 |- trio.lowlevel.cancel_shielded_checkpoint() - 44 |+ await trio.lowlevel.cancel_shielded_checkpoint() -45 45 | trio.lowlevel.checkpoint() -46 46 | trio.lowlevel.checkpoint_if_cancelled() -47 47 | trio.lowlevel.open_process() +41 | trio.sleep(foo) +42 | trio.sleep_forever() +43 | trio.sleep_until(foo) + - trio.lowlevel.cancel_shielded_checkpoint() +44 + await trio.lowlevel.cancel_shielded_checkpoint() +45 | trio.lowlevel.checkpoint() +46 | trio.lowlevel.checkpoint_if_cancelled() +47 | trio.lowlevel.open_process() +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.checkpoint` is not immediately awaited --> ASYNC105.py:45:5 @@ -319,16 +305,15 @@ ASYNC105 [*] Call to `trio.lowlevel.checkpoint` is not immediately awaited 47 | trio.lowlevel.open_process() | help: Add `await` - -ℹ Unsafe fix -42 42 | trio.sleep_forever() -43 43 | trio.sleep_until(foo) -44 44 | trio.lowlevel.cancel_shielded_checkpoint() -45 |- trio.lowlevel.checkpoint() - 45 |+ await trio.lowlevel.checkpoint() -46 46 | trio.lowlevel.checkpoint_if_cancelled() -47 47 | trio.lowlevel.open_process() -48 48 | trio.lowlevel.permanently_detach_coroutine_object(foo) +42 | trio.sleep_forever() +43 | trio.sleep_until(foo) +44 | trio.lowlevel.cancel_shielded_checkpoint() + - trio.lowlevel.checkpoint() +45 + await trio.lowlevel.checkpoint() +46 | trio.lowlevel.checkpoint_if_cancelled() +47 | trio.lowlevel.open_process() +48 | trio.lowlevel.permanently_detach_coroutine_object(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.checkpoint_if_cancelled` is not immediately awaited --> ASYNC105.py:46:5 @@ -341,16 +326,15 @@ ASYNC105 [*] Call to `trio.lowlevel.checkpoint_if_cancelled` is not immediately 48 | trio.lowlevel.permanently_detach_coroutine_object(foo) | help: Add `await` - -ℹ Unsafe fix -43 43 | trio.sleep_until(foo) -44 44 | trio.lowlevel.cancel_shielded_checkpoint() -45 45 | trio.lowlevel.checkpoint() -46 |- trio.lowlevel.checkpoint_if_cancelled() - 46 |+ await trio.lowlevel.checkpoint_if_cancelled() -47 47 | trio.lowlevel.open_process() -48 48 | trio.lowlevel.permanently_detach_coroutine_object(foo) -49 49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +43 | trio.sleep_until(foo) +44 | trio.lowlevel.cancel_shielded_checkpoint() +45 | trio.lowlevel.checkpoint() + - trio.lowlevel.checkpoint_if_cancelled() +46 + await trio.lowlevel.checkpoint_if_cancelled() +47 | trio.lowlevel.open_process() +48 | trio.lowlevel.permanently_detach_coroutine_object(foo) +49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.open_process` is not immediately awaited --> ASYNC105.py:47:5 @@ -363,16 +347,15 @@ ASYNC105 [*] Call to `trio.lowlevel.open_process` is not immediately awaited 49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) | help: Add `await` - -ℹ Unsafe fix -44 44 | trio.lowlevel.cancel_shielded_checkpoint() -45 45 | trio.lowlevel.checkpoint() -46 46 | trio.lowlevel.checkpoint_if_cancelled() -47 |- trio.lowlevel.open_process() - 47 |+ await trio.lowlevel.open_process() -48 48 | trio.lowlevel.permanently_detach_coroutine_object(foo) -49 49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) -50 50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) +44 | trio.lowlevel.cancel_shielded_checkpoint() +45 | trio.lowlevel.checkpoint() +46 | trio.lowlevel.checkpoint_if_cancelled() + - trio.lowlevel.open_process() +47 + await trio.lowlevel.open_process() +48 | trio.lowlevel.permanently_detach_coroutine_object(foo) +49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.permanently_detach_coroutine_object` is not immediately awaited --> ASYNC105.py:48:5 @@ -385,16 +368,15 @@ ASYNC105 [*] Call to `trio.lowlevel.permanently_detach_coroutine_object` is not 50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) | help: Add `await` - -ℹ Unsafe fix -45 45 | trio.lowlevel.checkpoint() -46 46 | trio.lowlevel.checkpoint_if_cancelled() -47 47 | trio.lowlevel.open_process() -48 |- trio.lowlevel.permanently_detach_coroutine_object(foo) - 48 |+ await trio.lowlevel.permanently_detach_coroutine_object(foo) -49 49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) -50 50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) -51 51 | trio.lowlevel.wait_readable(foo) +45 | trio.lowlevel.checkpoint() +46 | trio.lowlevel.checkpoint_if_cancelled() +47 | trio.lowlevel.open_process() + - trio.lowlevel.permanently_detach_coroutine_object(foo) +48 + await trio.lowlevel.permanently_detach_coroutine_object(foo) +49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) +51 | trio.lowlevel.wait_readable(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.reattach_detached_coroutine_object` is not immediately awaited --> ASYNC105.py:49:5 @@ -407,16 +389,15 @@ ASYNC105 [*] Call to `trio.lowlevel.reattach_detached_coroutine_object` is not i 51 | trio.lowlevel.wait_readable(foo) | help: Add `await` - -ℹ Unsafe fix -46 46 | trio.lowlevel.checkpoint_if_cancelled() -47 47 | trio.lowlevel.open_process() -48 48 | trio.lowlevel.permanently_detach_coroutine_object(foo) -49 |- trio.lowlevel.reattach_detached_coroutine_object(foo, foo) - 49 |+ await trio.lowlevel.reattach_detached_coroutine_object(foo, foo) -50 50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) -51 51 | trio.lowlevel.wait_readable(foo) -52 52 | trio.lowlevel.wait_task_rescheduled(foo) +46 | trio.lowlevel.checkpoint_if_cancelled() +47 | trio.lowlevel.open_process() +48 | trio.lowlevel.permanently_detach_coroutine_object(foo) + - trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +49 + await trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) +51 | trio.lowlevel.wait_readable(foo) +52 | trio.lowlevel.wait_task_rescheduled(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.temporarily_detach_coroutine_object` is not immediately awaited --> ASYNC105.py:50:5 @@ -429,16 +410,15 @@ ASYNC105 [*] Call to `trio.lowlevel.temporarily_detach_coroutine_object` is not 52 | trio.lowlevel.wait_task_rescheduled(foo) | help: Add `await` - -ℹ Unsafe fix -47 47 | trio.lowlevel.open_process() -48 48 | trio.lowlevel.permanently_detach_coroutine_object(foo) -49 49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) -50 |- trio.lowlevel.temporarily_detach_coroutine_object(foo) - 50 |+ await trio.lowlevel.temporarily_detach_coroutine_object(foo) -51 51 | trio.lowlevel.wait_readable(foo) -52 52 | trio.lowlevel.wait_task_rescheduled(foo) -53 53 | trio.lowlevel.wait_writable(foo) +47 | trio.lowlevel.open_process() +48 | trio.lowlevel.permanently_detach_coroutine_object(foo) +49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) + - trio.lowlevel.temporarily_detach_coroutine_object(foo) +50 + await trio.lowlevel.temporarily_detach_coroutine_object(foo) +51 | trio.lowlevel.wait_readable(foo) +52 | trio.lowlevel.wait_task_rescheduled(foo) +53 | trio.lowlevel.wait_writable(foo) +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.wait_readable` is not immediately awaited --> ASYNC105.py:51:5 @@ -451,16 +431,15 @@ ASYNC105 [*] Call to `trio.lowlevel.wait_readable` is not immediately awaited 53 | trio.lowlevel.wait_writable(foo) | help: Add `await` - -ℹ Unsafe fix -48 48 | trio.lowlevel.permanently_detach_coroutine_object(foo) -49 49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) -50 50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) -51 |- trio.lowlevel.wait_readable(foo) - 51 |+ await trio.lowlevel.wait_readable(foo) -52 52 | trio.lowlevel.wait_task_rescheduled(foo) -53 53 | trio.lowlevel.wait_writable(foo) -54 54 | +48 | trio.lowlevel.permanently_detach_coroutine_object(foo) +49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) + - trio.lowlevel.wait_readable(foo) +51 + await trio.lowlevel.wait_readable(foo) +52 | trio.lowlevel.wait_task_rescheduled(foo) +53 | trio.lowlevel.wait_writable(foo) +54 | +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.wait_task_rescheduled` is not immediately awaited --> ASYNC105.py:52:5 @@ -472,16 +451,15 @@ ASYNC105 [*] Call to `trio.lowlevel.wait_task_rescheduled` is not immediately aw 53 | trio.lowlevel.wait_writable(foo) | help: Add `await` - -ℹ Unsafe fix -49 49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) -50 50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) -51 51 | trio.lowlevel.wait_readable(foo) -52 |- trio.lowlevel.wait_task_rescheduled(foo) - 52 |+ await trio.lowlevel.wait_task_rescheduled(foo) -53 53 | trio.lowlevel.wait_writable(foo) -54 54 | -55 55 | async with await trio.open_file(foo): # Ok +49 | trio.lowlevel.reattach_detached_coroutine_object(foo, foo) +50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) +51 | trio.lowlevel.wait_readable(foo) + - trio.lowlevel.wait_task_rescheduled(foo) +52 + await trio.lowlevel.wait_task_rescheduled(foo) +53 | trio.lowlevel.wait_writable(foo) +54 | +55 | async with await trio.open_file(foo): # Ok +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.lowlevel.wait_writable` is not immediately awaited --> ASYNC105.py:53:5 @@ -494,16 +472,15 @@ ASYNC105 [*] Call to `trio.lowlevel.wait_writable` is not immediately awaited 55 | async with await trio.open_file(foo): # Ok | help: Add `await` - -ℹ Unsafe fix -50 50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) -51 51 | trio.lowlevel.wait_readable(foo) -52 52 | trio.lowlevel.wait_task_rescheduled(foo) -53 |- trio.lowlevel.wait_writable(foo) - 53 |+ await trio.lowlevel.wait_writable(foo) -54 54 | -55 55 | async with await trio.open_file(foo): # Ok -56 56 | pass +50 | trio.lowlevel.temporarily_detach_coroutine_object(foo) +51 | trio.lowlevel.wait_readable(foo) +52 | trio.lowlevel.wait_task_rescheduled(foo) + - trio.lowlevel.wait_writable(foo) +53 + await trio.lowlevel.wait_writable(foo) +54 | +55 | async with await trio.open_file(foo): # Ok +56 | pass +note: This is an unsafe fix and may change runtime behavior ASYNC105 [*] Call to `trio.open_file` is not immediately awaited --> ASYNC105.py:58:16 @@ -515,16 +492,15 @@ ASYNC105 [*] Call to `trio.open_file` is not immediately awaited 59 | pass | help: Add `await` - -ℹ Unsafe fix -55 55 | async with await trio.open_file(foo): # Ok -56 56 | pass -57 57 | -58 |- async with trio.open_file(foo): # ASYNC105 - 58 |+ async with await trio.open_file(foo): # ASYNC105 -59 59 | pass -60 60 | -61 61 | +55 | async with await trio.open_file(foo): # Ok +56 | pass +57 | + - async with trio.open_file(foo): # ASYNC105 +58 + async with await trio.open_file(foo): # ASYNC105 +59 | pass +60 | +61 | +note: This is an unsafe fix and may change runtime behavior ASYNC105 Call to `trio.open_file` is not immediately awaited --> ASYNC105.py:64:5 diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap index 89ff8a9eaf..32607804bd 100644 --- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap +++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC115_ASYNC115.py.snap @@ -12,16 +12,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` 7 | await trio.sleep(0, 1) # OK | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Safe fix -2 2 | import trio -3 3 | from trio import sleep -4 4 | -5 |- await trio.sleep(0) # ASYNC115 - 5 |+ await trio.lowlevel.checkpoint() # ASYNC115 -6 6 | await trio.sleep(1) # OK -7 7 | await trio.sleep(0, 1) # OK -8 8 | await trio.sleep(...) # OK +2 | import trio +3 | from trio import sleep +4 | + - await trio.sleep(0) # ASYNC115 +5 + await trio.lowlevel.checkpoint() # ASYNC115 +6 | await trio.sleep(1) # OK +7 | await trio.sleep(0, 1) # OK +8 | await trio.sleep(...) # OK ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` --> ASYNC115.py:11:5 @@ -34,16 +32,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` 13 | trio.sleep(foo) # OK | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Safe fix -8 8 | await trio.sleep(...) # OK -9 9 | await trio.sleep() # OK -10 10 | -11 |- trio.sleep(0) # ASYNC115 - 11 |+ trio.lowlevel.checkpoint() # ASYNC115 -12 12 | foo = 0 -13 13 | trio.sleep(foo) # OK -14 14 | trio.sleep(1) # OK +8 | await trio.sleep(...) # OK +9 | await trio.sleep() # OK +10 | + - trio.sleep(0) # ASYNC115 +11 + trio.lowlevel.checkpoint() # ASYNC115 +12 | foo = 0 +13 | trio.sleep(foo) # OK +14 | trio.sleep(1) # OK ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` --> ASYNC115.py:17:5 @@ -56,16 +52,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` 19 | bar = "bar" | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Safe fix -14 14 | trio.sleep(1) # OK -15 15 | time.sleep(0) # OK -16 16 | -17 |- sleep(0) # ASYNC115 - 17 |+ trio.lowlevel.checkpoint() # ASYNC115 -18 18 | -19 19 | bar = "bar" -20 20 | trio.sleep(bar) +14 | trio.sleep(1) # OK +15 | time.sleep(0) # OK +16 | + - sleep(0) # ASYNC115 +17 + trio.lowlevel.checkpoint() # ASYNC115 +18 | +19 | bar = "bar" +20 | trio.sleep(bar) ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` --> ASYNC115.py:48:14 @@ -76,16 +70,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` | ^^^^^^^^^^^^^ | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Safe fix -45 45 | def func(): -46 46 | import trio -47 47 | -48 |- trio.run(trio.sleep(0)) # ASYNC115 - 48 |+ trio.run(trio.lowlevel.checkpoint()) # ASYNC115 -49 49 | -50 50 | -51 51 | from trio import Event, sleep +45 | def func(): +46 | import trio +47 | + - trio.run(trio.sleep(0)) # ASYNC115 +48 + trio.run(trio.lowlevel.checkpoint()) # ASYNC115 +49 | +50 | +51 | from trio import Event, sleep ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` --> ASYNC115.py:55:5 @@ -95,21 +87,19 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` | ^^^^^^^^ | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Safe fix -48 48 | trio.run(trio.sleep(0)) # ASYNC115 -49 49 | -50 50 | -51 |-from trio import Event, sleep - 51 |+from trio import Event, sleep, lowlevel -52 52 | -53 53 | -54 54 | def func(): -55 |- sleep(0) # ASYNC115 - 55 |+ lowlevel.checkpoint() # ASYNC115 -56 56 | -57 57 | -58 58 | async def func(): +48 | trio.run(trio.sleep(0)) # ASYNC115 +49 | +50 | + - from trio import Event, sleep +51 + from trio import Event, sleep, lowlevel +52 | +53 | +54 | def func(): + - sleep(0) # ASYNC115 +55 + lowlevel.checkpoint() # ASYNC115 +56 | +57 | +58 | async def func(): ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` --> ASYNC115.py:59:11 @@ -119,25 +109,23 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` | ^^^^^^^^^^^^^^^^ | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Safe fix -48 48 | trio.run(trio.sleep(0)) # ASYNC115 -49 49 | -50 50 | -51 |-from trio import Event, sleep - 51 |+from trio import Event, sleep, lowlevel -52 52 | -53 53 | -54 54 | def func(): +48 | trio.run(trio.sleep(0)) # ASYNC115 +49 | +50 | + - from trio import Event, sleep +51 + from trio import Event, sleep, lowlevel +52 | +53 | +54 | def func(): -------------------------------------------------------------------------------- -56 56 | -57 57 | -58 58 | async def func(): -59 |- await sleep(seconds=0) # ASYNC115 - 59 |+ await lowlevel.checkpoint() # ASYNC115 -60 60 | -61 61 | -62 62 | def func(): +56 | +57 | +58 | async def func(): + - await sleep(seconds=0) # ASYNC115 +59 + await lowlevel.checkpoint() # ASYNC115 +60 | +61 | +62 | def func(): ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` --> ASYNC115.py:85:11 @@ -150,16 +138,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` 87 | await anyio.sleep(0, 1) # OK | help: Replace with `anyio.lowlevel.checkpoint()` - -ℹ Safe fix -82 82 | import anyio -83 83 | from anyio import sleep -84 84 | -85 |- await anyio.sleep(0) # ASYNC115 - 85 |+ await anyio.lowlevel.checkpoint() # ASYNC115 -86 86 | await anyio.sleep(1) # OK -87 87 | await anyio.sleep(0, 1) # OK -88 88 | await anyio.sleep(...) # OK +82 | import anyio +83 | from anyio import sleep +84 | + - await anyio.sleep(0) # ASYNC115 +85 + await anyio.lowlevel.checkpoint() # ASYNC115 +86 | await anyio.sleep(1) # OK +87 | await anyio.sleep(0, 1) # OK +88 | await anyio.sleep(...) # OK ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` --> ASYNC115.py:91:5 @@ -172,16 +158,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` 93 | anyio.sleep(foo) # OK | help: Replace with `anyio.lowlevel.checkpoint()` - -ℹ Safe fix -88 88 | await anyio.sleep(...) # OK -89 89 | await anyio.sleep() # OK -90 90 | -91 |- anyio.sleep(0) # ASYNC115 - 91 |+ anyio.lowlevel.checkpoint() # ASYNC115 -92 92 | foo = 0 -93 93 | anyio.sleep(foo) # OK -94 94 | anyio.sleep(1) # OK +88 | await anyio.sleep(...) # OK +89 | await anyio.sleep() # OK +90 | + - anyio.sleep(0) # ASYNC115 +91 + anyio.lowlevel.checkpoint() # ASYNC115 +92 | foo = 0 +93 | anyio.sleep(foo) # OK +94 | anyio.sleep(1) # OK ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` --> ASYNC115.py:97:5 @@ -194,16 +178,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` 99 | bar = "bar" | help: Replace with `anyio.lowlevel.checkpoint()` - -ℹ Safe fix -94 94 | anyio.sleep(1) # OK -95 95 | time.sleep(0) # OK -96 96 | -97 |- sleep(0) # ASYNC115 - 97 |+ anyio.lowlevel.checkpoint() # ASYNC115 -98 98 | -99 99 | bar = "bar" -100 100 | anyio.sleep(bar) +94 | anyio.sleep(1) # OK +95 | time.sleep(0) # OK +96 | + - sleep(0) # ASYNC115 +97 + anyio.lowlevel.checkpoint() # ASYNC115 +98 | +99 | bar = "bar" +100 | anyio.sleep(bar) ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` --> ASYNC115.py:128:15 @@ -214,16 +196,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` | ^^^^^^^^^^^^^^ | help: Replace with `anyio.lowlevel.checkpoint()` - -ℹ Safe fix -125 125 | def func(): -126 126 | import anyio -127 127 | -128 |- anyio.run(anyio.sleep(0)) # ASYNC115 - 128 |+ anyio.run(anyio.lowlevel.checkpoint()) # ASYNC115 -129 129 | -130 130 | -131 131 | def func(): +125 | def func(): +126 | import anyio +127 | + - anyio.run(anyio.sleep(0)) # ASYNC115 +128 + anyio.run(anyio.lowlevel.checkpoint()) # ASYNC115 +129 | +130 | +131 | def func(): ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` --> ASYNC115.py:156:11 @@ -235,16 +215,14 @@ ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)` 157 | await anyio.sleep(seconds=0) # OK | help: Replace with `anyio.lowlevel.checkpoint()` - -ℹ Safe fix -153 153 | await anyio.sleep(delay=1) # OK -154 154 | await anyio.sleep(seconds=1) # OK -155 155 | -156 |- await anyio.sleep(delay=0) # ASYNC115 - 156 |+ await anyio.lowlevel.checkpoint() # ASYNC115 -157 157 | await anyio.sleep(seconds=0) # OK -158 158 | -159 159 | +153 | await anyio.sleep(delay=1) # OK +154 | await anyio.sleep(seconds=1) # OK +155 | + - await anyio.sleep(delay=0) # ASYNC115 +156 + await anyio.lowlevel.checkpoint() # ASYNC115 +157 | await anyio.sleep(seconds=0) # OK +158 | +159 | ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` --> ASYNC115.py:166:11 @@ -256,16 +234,14 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` 167 | await trio.sleep(delay=0) # OK | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Safe fix -163 163 | await trio.sleep(seconds=1) # OK -164 164 | await trio.sleep(delay=1) # OK -165 165 | -166 |- await trio.sleep(seconds=0) # ASYNC115 - 166 |+ await trio.lowlevel.checkpoint() # ASYNC115 -167 167 | await trio.sleep(delay=0) # OK -168 168 | -169 169 | # https://github.com/astral-sh/ruff/issues/18740 +163 | await trio.sleep(seconds=1) # OK +164 | await trio.sleep(delay=1) # OK +165 | + - await trio.sleep(seconds=0) # ASYNC115 +166 + await trio.lowlevel.checkpoint() # ASYNC115 +167 | await trio.sleep(delay=0) # OK +168 | +169 | # https://github.com/astral-sh/ruff/issues/18740 ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` --> ASYNC115.py:175:5 @@ -279,14 +255,13 @@ ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)` 179 | ) | help: Replace with `trio.lowlevel.checkpoint()` - -ℹ Unsafe fix -172 172 | import trio -173 173 | -174 174 | await ( -175 |- trio # comment -176 |- .sleep( # comment -177 |- 0 # comment -178 |- ) - 175 |+ trio.lowlevel.checkpoint() -179 176 | ) +172 | import trio +173 | +174 | await ( + - trio # comment + - .sleep( # comment + - 0 # comment + - ) +175 + trio.lowlevel.checkpoint() +176 | ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap index 12e4d43158..cf190cf8a0 100644 --- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap +++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC116_ASYNC116.py.snap @@ -11,16 +11,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep 13 | # 'inf literal' overflow trick | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -8 8 | import trio -9 9 | -10 10 | # These examples are probably not meant to ever wake up: -11 |- await trio.sleep(100000) # error: 116, "async" - 11 |+ await trio.sleep_forever() # error: 116, "async" -12 12 | -13 13 | # 'inf literal' overflow trick -14 14 | await trio.sleep(1e999) # error: 116, "async" +8 | import trio +9 | +10 | # These examples are probably not meant to ever wake up: + - await trio.sleep(100000) # error: 116, "async" +11 + await trio.sleep_forever() # error: 116, "async" +12 | +13 | # 'inf literal' overflow trick +14 | await trio.sleep(1e999) # error: 116, "async" +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:14:11 @@ -32,16 +31,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep 16 | await trio.sleep(86399) | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -11 11 | await trio.sleep(100000) # error: 116, "async" -12 12 | -13 13 | # 'inf literal' overflow trick -14 |- await trio.sleep(1e999) # error: 116, "async" - 14 |+ await trio.sleep_forever() # error: 116, "async" -15 15 | -16 16 | await trio.sleep(86399) -17 17 | await trio.sleep(86400) +11 | await trio.sleep(100000) # error: 116, "async" +12 | +13 | # 'inf literal' overflow trick + - await trio.sleep(1e999) # error: 116, "async" +14 + await trio.sleep_forever() # error: 116, "async" +15 | +16 | await trio.sleep(86399) +17 | await trio.sleep(86400) +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:18:11 @@ -53,16 +51,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep 19 | await trio.sleep(86401) # error: 116, "async" | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -15 15 | -16 16 | await trio.sleep(86399) -17 17 | await trio.sleep(86400) -18 |- await trio.sleep(86400.01) # error: 116, "async" - 18 |+ await trio.sleep_forever() # error: 116, "async" -19 19 | await trio.sleep(86401) # error: 116, "async" -20 20 | -21 21 | await trio.sleep(-1) # will raise a runtime error +15 | +16 | await trio.sleep(86399) +17 | await trio.sleep(86400) + - await trio.sleep(86400.01) # error: 116, "async" +18 + await trio.sleep_forever() # error: 116, "async" +19 | await trio.sleep(86401) # error: 116, "async" +20 | +21 | await trio.sleep(-1) # will raise a runtime error +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:19:11 @@ -75,16 +72,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep 21 | await trio.sleep(-1) # will raise a runtime error | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -16 16 | await trio.sleep(86399) -17 17 | await trio.sleep(86400) -18 18 | await trio.sleep(86400.01) # error: 116, "async" -19 |- await trio.sleep(86401) # error: 116, "async" - 19 |+ await trio.sleep_forever() # error: 116, "async" -20 20 | -21 21 | await trio.sleep(-1) # will raise a runtime error -22 22 | await trio.sleep(0) # handled by different check +16 | await trio.sleep(86399) +17 | await trio.sleep(86400) +18 | await trio.sleep(86400.01) # error: 116, "async" + - await trio.sleep(86401) # error: 116, "async" +19 + await trio.sleep_forever() # error: 116, "async" +20 | +21 | await trio.sleep(-1) # will raise a runtime error +22 | await trio.sleep(0) # handled by different check +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:48:5 @@ -96,16 +92,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep 50 | trio.run(trio.sleep(86401)) # error: 116, "async" | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -45 45 | import trio -46 46 | -47 47 | # does not require the call to be awaited, nor in an async fun -48 |- trio.sleep(86401) # error: 116, "async" - 48 |+ trio.sleep_forever() # error: 116, "async" -49 49 | # also checks that we don't break visit_Call -50 50 | trio.run(trio.sleep(86401)) # error: 116, "async" -51 51 | +45 | import trio +46 | +47 | # does not require the call to be awaited, nor in an async fun + - trio.sleep(86401) # error: 116, "async" +48 + trio.sleep_forever() # error: 116, "async" +49 | # also checks that we don't break visit_Call +50 | trio.run(trio.sleep(86401)) # error: 116, "async" +51 | +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:50:14 @@ -116,16 +111,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep | ^^^^^^^^^^^^^^^^^ | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -47 47 | # does not require the call to be awaited, nor in an async fun -48 48 | trio.sleep(86401) # error: 116, "async" -49 49 | # also checks that we don't break visit_Call -50 |- trio.run(trio.sleep(86401)) # error: 116, "async" - 50 |+ trio.run(trio.sleep_forever()) # error: 116, "async" -51 51 | -52 52 | -53 53 | async def import_from_trio(): +47 | # does not require the call to be awaited, nor in an async fun +48 | trio.sleep(86401) # error: 116, "async" +49 | # also checks that we don't break visit_Call + - trio.run(trio.sleep(86401)) # error: 116, "async" +50 + trio.run(trio.sleep_forever()) # error: 116, "async" +51 | +52 | +53 | async def import_from_trio(): +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:57:11 @@ -135,24 +129,23 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep | ^^^^^^^^^^^^ | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -2 2 | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger. -3 3 | import math -4 4 | from math import inf - 5 |+from trio import sleep_forever -5 6 | -6 7 | -7 8 | async def import_trio(): +2 | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger. +3 | import math +4 | from math import inf +5 + from trio import sleep_forever +6 | +7 | +8 | async def import_trio(): -------------------------------------------------------------------------------- -54 55 | from trio import sleep -55 56 | -56 57 | # catch from import -57 |- await sleep(86401) # error: 116, "async" - 58 |+ await sleep_forever() # error: 116, "async" -58 59 | -59 60 | -60 61 | async def import_anyio(): +55 | from trio import sleep +56 | +57 | # catch from import + - await sleep(86401) # error: 116, "async" +58 + await sleep_forever() # error: 116, "async" +59 | +60 | +61 | async def import_anyio(): +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:64:11 @@ -164,16 +157,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle 66 | # 'inf literal' overflow trick | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -61 61 | import anyio -62 62 | -63 63 | # These examples are probably not meant to ever wake up: -64 |- await anyio.sleep(100000) # error: 116, "async" - 64 |+ await anyio.sleep_forever() # error: 116, "async" -65 65 | -66 66 | # 'inf literal' overflow trick -67 67 | await anyio.sleep(1e999) # error: 116, "async" +61 | import anyio +62 | +63 | # These examples are probably not meant to ever wake up: + - await anyio.sleep(100000) # error: 116, "async" +64 + await anyio.sleep_forever() # error: 116, "async" +65 | +66 | # 'inf literal' overflow trick +67 | await anyio.sleep(1e999) # error: 116, "async" +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:67:11 @@ -185,16 +177,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle 69 | await anyio.sleep(86399) | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -64 64 | await anyio.sleep(100000) # error: 116, "async" -65 65 | -66 66 | # 'inf literal' overflow trick -67 |- await anyio.sleep(1e999) # error: 116, "async" - 67 |+ await anyio.sleep_forever() # error: 116, "async" -68 68 | -69 69 | await anyio.sleep(86399) -70 70 | await anyio.sleep(86400) +64 | await anyio.sleep(100000) # error: 116, "async" +65 | +66 | # 'inf literal' overflow trick + - await anyio.sleep(1e999) # error: 116, "async" +67 + await anyio.sleep_forever() # error: 116, "async" +68 | +69 | await anyio.sleep(86399) +70 | await anyio.sleep(86400) +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:71:11 @@ -206,16 +197,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle 72 | await anyio.sleep(86401) # error: 116, "async" | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -68 68 | -69 69 | await anyio.sleep(86399) -70 70 | await anyio.sleep(86400) -71 |- await anyio.sleep(86400.01) # error: 116, "async" - 71 |+ await anyio.sleep_forever() # error: 116, "async" -72 72 | await anyio.sleep(86401) # error: 116, "async" -73 73 | -74 74 | await anyio.sleep(-1) # will raise a runtime error +68 | +69 | await anyio.sleep(86399) +70 | await anyio.sleep(86400) + - await anyio.sleep(86400.01) # error: 116, "async" +71 + await anyio.sleep_forever() # error: 116, "async" +72 | await anyio.sleep(86401) # error: 116, "async" +73 | +74 | await anyio.sleep(-1) # will raise a runtime error +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:72:11 @@ -228,16 +218,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle 74 | await anyio.sleep(-1) # will raise a runtime error | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -69 69 | await anyio.sleep(86399) -70 70 | await anyio.sleep(86400) -71 71 | await anyio.sleep(86400.01) # error: 116, "async" -72 |- await anyio.sleep(86401) # error: 116, "async" - 72 |+ await anyio.sleep_forever() # error: 116, "async" -73 73 | -74 74 | await anyio.sleep(-1) # will raise a runtime error -75 75 | await anyio.sleep(0) # handled by different check +69 | await anyio.sleep(86399) +70 | await anyio.sleep(86400) +71 | await anyio.sleep(86400.01) # error: 116, "async" + - await anyio.sleep(86401) # error: 116, "async" +72 + await anyio.sleep_forever() # error: 116, "async" +73 | +74 | await anyio.sleep(-1) # will raise a runtime error +75 | await anyio.sleep(0) # handled by different check +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:101:5 @@ -249,16 +238,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle 103 | anyio.run(anyio.sleep(86401)) # error: 116, "async" | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -98 98 | import anyio -99 99 | -100 100 | # does not require the call to be awaited, nor in an async fun -101 |- anyio.sleep(86401) # error: 116, "async" - 101 |+ anyio.sleep_forever() # error: 116, "async" -102 102 | # also checks that we don't break visit_Call -103 103 | anyio.run(anyio.sleep(86401)) # error: 116, "async" -104 104 | +98 | import anyio +99 | +100 | # does not require the call to be awaited, nor in an async fun + - anyio.sleep(86401) # error: 116, "async" +101 + anyio.sleep_forever() # error: 116, "async" +102 | # also checks that we don't break visit_Call +103 | anyio.run(anyio.sleep(86401)) # error: 116, "async" +104 | +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:103:15 @@ -269,16 +257,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle | ^^^^^^^^^^^^^^^^^^ | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -100 100 | # does not require the call to be awaited, nor in an async fun -101 101 | anyio.sleep(86401) # error: 116, "async" -102 102 | # also checks that we don't break visit_Call -103 |- anyio.run(anyio.sleep(86401)) # error: 116, "async" - 103 |+ anyio.run(anyio.sleep_forever()) # error: 116, "async" -104 104 | -105 105 | -106 106 | async def import_from_anyio(): +100 | # does not require the call to be awaited, nor in an async fun +101 | anyio.sleep(86401) # error: 116, "async" +102 | # also checks that we don't break visit_Call + - anyio.run(anyio.sleep(86401)) # error: 116, "async" +103 + anyio.run(anyio.sleep_forever()) # error: 116, "async" +104 | +105 | +106 | async def import_from_anyio(): +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:110:11 @@ -288,24 +275,23 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle | ^^^^^^^^^^^^ | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -2 2 | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger. -3 3 | import math -4 4 | from math import inf - 5 |+from anyio import sleep_forever -5 6 | -6 7 | -7 8 | async def import_trio(): +2 | # ASYNCIO_NO_ERROR - no asyncio.sleep_forever, so check intentionally doesn't trigger. +3 | import math +4 | from math import inf +5 + from anyio import sleep_forever +6 | +7 | +8 | async def import_trio(): -------------------------------------------------------------------------------- -107 108 | from anyio import sleep -108 109 | -109 110 | # catch from import -110 |- await sleep(86401) # error: 116, "async" - 111 |+ await sleep_forever() # error: 116, "async" -111 112 | -112 113 | -113 114 | async def test_anyio_async116_helpers(): +108 | from anyio import sleep +109 | +110 | # catch from import + - await sleep(86401) # error: 116, "async" +111 + await sleep_forever() # error: 116, "async" +112 | +113 | +114 | async def test_anyio_async116_helpers(): +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()` --> ASYNC116.py:119:11 @@ -317,16 +303,15 @@ ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sle 120 | await anyio.sleep(seconds=86401) # OK | help: Replace with `anyio.sleep_forever()` - -ℹ Unsafe fix -116 116 | await anyio.sleep(delay=1) # OK -117 117 | await anyio.sleep(seconds=1) # OK -118 118 | -119 |- await anyio.sleep(delay=86401) # ASYNC116 - 119 |+ await anyio.sleep_forever() # ASYNC116 -120 120 | await anyio.sleep(seconds=86401) # OK -121 121 | -122 122 | +116 | await anyio.sleep(delay=1) # OK +117 | await anyio.sleep(seconds=1) # OK +118 | + - await anyio.sleep(delay=86401) # ASYNC116 +119 + await anyio.sleep_forever() # ASYNC116 +120 | await anyio.sleep(seconds=86401) # OK +121 | +122 | +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:129:11 @@ -338,16 +323,15 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep 130 | await trio.sleep(delay=86401) # OK | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -126 126 | await trio.sleep(seconds=1) # OK -127 127 | await trio.sleep(delay=1) # OK -128 128 | -129 |- await trio.sleep(seconds=86401) # ASYNC116 - 129 |+ await trio.sleep_forever() # ASYNC116 -130 130 | await trio.sleep(delay=86401) # OK -131 131 | -132 132 | +126 | await trio.sleep(seconds=1) # OK +127 | await trio.sleep(delay=1) # OK +128 | + - await trio.sleep(seconds=86401) # ASYNC116 +129 + await trio.sleep_forever() # ASYNC116 +130 | await trio.sleep(delay=86401) # OK +131 | +132 | +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:137:11 @@ -359,14 +343,13 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep 138 | await trio.sleep(99999999999999999999) | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -134 134 | import trio -135 135 | from trio import sleep -136 136 | -137 |- await sleep(18446744073709551616) - 137 |+ await trio.sleep_forever() -138 138 | await trio.sleep(99999999999999999999) +134 | import trio +135 | from trio import sleep +136 | + - await sleep(18446744073709551616) +137 + await trio.sleep_forever() +138 | await trio.sleep(99999999999999999999) +note: This is an unsafe fix and may change runtime behavior ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()` --> ASYNC116.py:138:11 @@ -376,10 +359,9 @@ ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `trio.sleep_forever()` - -ℹ Unsafe fix -135 135 | from trio import sleep -136 136 | -137 137 | await sleep(18446744073709551616) -138 |- await trio.sleep(99999999999999999999) - 138 |+ await trio.sleep_forever() +135 | from trio import sleep +136 | +137 | await sleep(18446744073709551616) + - await trio.sleep(99999999999999999999) +138 + await trio.sleep_forever() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap index 38f99c7fd6..45fa6d7593 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap @@ -12,15 +12,13 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. 5 | if getattr(o, "__call__", False): | help: Replace with `callable()` - -ℹ Safe fix -1 1 | def this_is_a_bug(): -2 2 | o = object() -3 |- if hasattr(o, "__call__"): - 3 |+ if callable(o): -4 4 | print("Ooh, callable! Or is it?") -5 5 | if getattr(o, "__call__", False): -6 6 | print("Ooh, callable! Or is it?") +1 | def this_is_a_bug(): +2 | o = object() + - if hasattr(o, "__call__"): +3 + if callable(o): +4 | print("Ooh, callable! Or is it?") +5 | if getattr(o, "__call__", False): +6 | print("Ooh, callable! Or is it?") B004 Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results. --> B004.py:5:8 @@ -44,16 +42,14 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. 14 | if builtins.getattr(o, "__call__", False): | help: Replace with `callable()` - -ℹ Safe fix -9 9 | def still_a_bug(): -10 10 | import builtins -11 11 | o = object() -12 |- if builtins.hasattr(o, "__call__"): - 12 |+ if callable(o): -13 13 | print("B U G") -14 14 | if builtins.getattr(o, "__call__", False): -15 15 | print("B U G") +9 | def still_a_bug(): +10 | import builtins +11 | o = object() + - if builtins.hasattr(o, "__call__"): +12 + if callable(o): +13 | print("B U G") +14 | if builtins.getattr(o, "__call__", False): +15 | print("B U G") B004 Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results. --> B004.py:14:8 @@ -76,21 +72,19 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. 25 | print("STILL a bug!") | help: Replace with `callable()` - -ℹ Safe fix - 1 |+import builtins -1 2 | def this_is_a_bug(): -2 3 | o = object() -3 4 | if hasattr(o, "__call__"): +1 + import builtins +2 | def this_is_a_bug(): +3 | o = object() +4 | if hasattr(o, "__call__"): -------------------------------------------------------------------------------- -21 22 | def callable(x): -22 23 | return True -23 24 | -24 |- if hasattr(o, "__call__"): - 25 |+ if builtins.callable(o): -25 26 | print("STILL a bug!") -26 27 | -27 28 | +22 | def callable(x): +23 | return True +24 | + - if hasattr(o, "__call__"): +25 + if builtins.callable(o): +26 | print("STILL a bug!") +27 | +28 | B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. Use `callable(x)` for consistent results. --> B004.py:35:1 @@ -107,16 +101,15 @@ B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is unreliable. | |_^ | help: Replace with `callable()` - -ℹ Unsafe fix -32 32 | -33 33 | # https://github.com/astral-sh/ruff/issues/18741 -34 34 | # The autofix for this is unsafe due to the comments. -35 |-hasattr( -36 |- # comment 1 -37 |- obj, # comment 2 -38 |- # comment 3 -39 |- "__call__", # comment 4 -40 |- # comment 5 -41 |-) - 35 |+callable(obj) +32 | +33 | # https://github.com/astral-sh/ruff/issues/18741 +34 | # The autofix for this is unsafe due to the comments. + - hasattr( + - # comment 1 + - obj, # comment 2 + - # comment 3 + - "__call__", # comment 4 + - # comment 5 + - ) +35 + callable(obj) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap index 8f30bc0137..af07dc5476 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap @@ -12,11 +12,10 @@ B006 [*] Do not use mutable data structures for argument defaults 5 | """ | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -1 1 | # Docstring followed by a newline -2 2 | -3 |-def foobar(foor, bar={}): - 3 |+def foobar(foor, bar=None): -4 4 | """ -5 5 | """ +1 | # Docstring followed by a newline +2 | + - def foobar(foor, bar={}): +3 + def foobar(foor, bar=None): +4 | """ +5 | """ +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap index 0ec81d0153..9c1184adae 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap @@ -12,12 +12,11 @@ B006 [*] Do not use mutable data structures for argument defaults 6 | """ | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -1 1 | # Docstring followed by whitespace with no newline -2 2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155 -3 3 | -4 |-def foobar(foor, bar={}): - 4 |+def foobar(foor, bar=None): -5 5 | """ -6 6 | """ +1 | # Docstring followed by whitespace with no newline +2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155 +3 | + - def foobar(foor, bar={}): +4 + def foobar(foor, bar=None): +5 | """ +6 | """ +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap index 5887696daa..acf948afd7 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap @@ -10,12 +10,11 @@ B006 [*] Do not use mutable data structures for argument defaults 6 | """ | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -1 1 | # Docstring with no newline -2 2 | -3 3 | -4 |-def foobar(foor, bar={}): - 4 |+def foobar(foor, bar=None): -5 5 | """ -6 6 | """ +1 | # Docstring with no newline +2 | +3 | + - def foobar(foor, bar={}): +4 + def foobar(foor, bar=None): +5 | """ +6 | """ +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap index 8ba3e00cc1..98d4e56b34 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap @@ -10,14 +10,13 @@ B006 [*] Do not use mutable data structures for argument defaults 8 | print(a) | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | class FormFeedIndent: -7 |- def __init__(self, a=[]): - 7 |+ def __init__(self, a=None): - 8 |+ if a is None: - 9 |+ a = [] -8 10 | print(a) -9 11 | +4 | +5 | +6 | class FormFeedIndent: + - def __init__(self, a=[]): +7 + def __init__(self, a=None): +8 + if a is None: +9 + a = [] +10 | print(a) +11 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap index 1be1295fe3..b1e6c26783 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap @@ -9,19 +9,18 @@ B006 [*] Do not use mutable data structures for argument defaults 6 | import os | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -2 2 | # https://github.com/astral-sh/ruff/issues/7616 -3 3 | -4 4 | -5 |-def import_module_wrong(value: dict[str, str] = {}): - 5 |+def import_module_wrong(value: dict[str, str] = None): -6 6 | import os - 7 |+ if value is None: - 8 |+ value = {} -7 9 | -8 10 | -9 11 | def import_module_with_values_wrong(value: dict[str, str] = {}): +2 | # https://github.com/astral-sh/ruff/issues/7616 +3 | +4 | + - def import_module_wrong(value: dict[str, str] = {}): +5 + def import_module_wrong(value: dict[str, str] = None): +6 | import os +7 + if value is None: +8 + value = {} +9 | +10 | +11 | def import_module_with_values_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:9:61 @@ -31,20 +30,19 @@ B006 [*] Do not use mutable data structures for argument defaults 10 | import os | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -6 6 | import os -7 7 | -8 8 | -9 |-def import_module_with_values_wrong(value: dict[str, str] = {}): - 9 |+def import_module_with_values_wrong(value: dict[str, str] = None): -10 10 | import os -11 11 | - 12 |+ if value is None: - 13 |+ value = {} -12 14 | return 2 -13 15 | -14 16 | +6 | import os +7 | +8 | + - def import_module_with_values_wrong(value: dict[str, str] = {}): +9 + def import_module_with_values_wrong(value: dict[str, str] = None): +10 | import os +11 | +12 + if value is None: +13 + value = {} +14 | return 2 +15 | +16 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:15:50 @@ -55,21 +53,20 @@ B006 [*] Do not use mutable data structures for argument defaults 17 | import sys | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -12 12 | return 2 -13 13 | -14 14 | -15 |-def import_modules_wrong(value: dict[str, str] = {}): - 15 |+def import_modules_wrong(value: dict[str, str] = None): -16 16 | import os -17 17 | import sys -18 18 | import itertools - 19 |+ if value is None: - 20 |+ value = {} -19 21 | -20 22 | -21 23 | def from_import_module_wrong(value: dict[str, str] = {}): +12 | return 2 +13 | +14 | + - def import_modules_wrong(value: dict[str, str] = {}): +15 + def import_modules_wrong(value: dict[str, str] = None): +16 | import os +17 | import sys +18 | import itertools +19 + if value is None: +20 + value = {} +21 | +22 | +23 | def from_import_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:21:54 @@ -79,19 +76,18 @@ B006 [*] Do not use mutable data structures for argument defaults 22 | from os import path | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -18 18 | import itertools -19 19 | -20 20 | -21 |-def from_import_module_wrong(value: dict[str, str] = {}): - 21 |+def from_import_module_wrong(value: dict[str, str] = None): -22 22 | from os import path - 23 |+ if value is None: - 24 |+ value = {} -23 25 | -24 26 | -25 27 | def from_imports_module_wrong(value: dict[str, str] = {}): +18 | import itertools +19 | +20 | + - def from_import_module_wrong(value: dict[str, str] = {}): +21 + def from_import_module_wrong(value: dict[str, str] = None): +22 | from os import path +23 + if value is None: +24 + value = {} +25 | +26 | +27 | def from_imports_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:25:55 @@ -102,20 +98,19 @@ B006 [*] Do not use mutable data structures for argument defaults 27 | from sys import version_info | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -22 22 | from os import path -23 23 | -24 24 | -25 |-def from_imports_module_wrong(value: dict[str, str] = {}): - 25 |+def from_imports_module_wrong(value: dict[str, str] = None): -26 26 | from os import path -27 27 | from sys import version_info - 28 |+ if value is None: - 29 |+ value = {} -28 30 | -29 31 | -30 32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}): +22 | from os import path +23 | +24 | + - def from_imports_module_wrong(value: dict[str, str] = {}): +25 + def from_imports_module_wrong(value: dict[str, str] = None): +26 | from os import path +27 | from sys import version_info +28 + if value is None: +29 + value = {} +30 | +31 | +32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:30:66 @@ -126,20 +121,19 @@ B006 [*] Do not use mutable data structures for argument defaults 32 | from sys import version_info | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -27 27 | from sys import version_info -28 28 | -29 29 | -30 |-def import_and_from_imports_module_wrong(value: dict[str, str] = {}): - 30 |+def import_and_from_imports_module_wrong(value: dict[str, str] = None): -31 31 | import os -32 32 | from sys import version_info - 33 |+ if value is None: - 34 |+ value = {} -33 35 | -34 36 | -35 37 | def import_docstring_module_wrong(value: dict[str, str] = {}): +27 | from sys import version_info +28 | +29 | + - def import_and_from_imports_module_wrong(value: dict[str, str] = {}): +30 + def import_and_from_imports_module_wrong(value: dict[str, str] = None): +31 | import os +32 | from sys import version_info +33 + if value is None: +34 + value = {} +35 | +36 | +37 | def import_docstring_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:35:59 @@ -150,20 +144,19 @@ B006 [*] Do not use mutable data structures for argument defaults 37 | import os | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -32 32 | from sys import version_info -33 33 | -34 34 | -35 |-def import_docstring_module_wrong(value: dict[str, str] = {}): - 35 |+def import_docstring_module_wrong(value: dict[str, str] = None): -36 36 | """Docstring""" -37 37 | import os - 38 |+ if value is None: - 39 |+ value = {} -38 40 | -39 41 | -40 42 | def import_module_wrong(value: dict[str, str] = {}): +32 | from sys import version_info +33 | +34 | + - def import_docstring_module_wrong(value: dict[str, str] = {}): +35 + def import_docstring_module_wrong(value: dict[str, str] = None): +36 | """Docstring""" +37 | import os +38 + if value is None: +39 + value = {} +40 | +41 | +42 | def import_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:40:49 @@ -174,20 +167,19 @@ B006 [*] Do not use mutable data structures for argument defaults 42 | import os; import sys | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -37 37 | import os -38 38 | -39 39 | -40 |-def import_module_wrong(value: dict[str, str] = {}): - 40 |+def import_module_wrong(value: dict[str, str] = None): -41 41 | """Docstring""" -42 42 | import os; import sys - 43 |+ if value is None: - 44 |+ value = {} -43 45 | -44 46 | -45 47 | def import_module_wrong(value: dict[str, str] = {}): +37 | import os +38 | +39 | + - def import_module_wrong(value: dict[str, str] = {}): +40 + def import_module_wrong(value: dict[str, str] = None): +41 | """Docstring""" +42 | import os; import sys +43 + if value is None: +44 + value = {} +45 | +46 | +47 | def import_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:45:49 @@ -198,19 +190,18 @@ B006 [*] Do not use mutable data structures for argument defaults 47 | import os; import sys; x = 1 | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -42 42 | import os; import sys -43 43 | -44 44 | -45 |-def import_module_wrong(value: dict[str, str] = {}): - 45 |+def import_module_wrong(value: dict[str, str] = None): -46 46 | """Docstring""" - 47 |+ if value is None: - 48 |+ value = {} -47 49 | import os; import sys; x = 1 -48 50 | -49 51 | +42 | import os; import sys +43 | +44 | + - def import_module_wrong(value: dict[str, str] = {}): +45 + def import_module_wrong(value: dict[str, str] = None): +46 | """Docstring""" +47 + if value is None: +48 + value = {} +49 | import os; import sys; x = 1 +50 | +51 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:50:49 @@ -221,20 +212,19 @@ B006 [*] Do not use mutable data structures for argument defaults 52 | import os; import sys | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -47 47 | import os; import sys; x = 1 -48 48 | -49 49 | -50 |-def import_module_wrong(value: dict[str, str] = {}): - 50 |+def import_module_wrong(value: dict[str, str] = None): -51 51 | """Docstring""" -52 52 | import os; import sys - 53 |+ if value is None: - 54 |+ value = {} -53 55 | -54 56 | -55 57 | def import_module_wrong(value: dict[str, str] = {}): +47 | import os; import sys; x = 1 +48 | +49 | + - def import_module_wrong(value: dict[str, str] = {}): +50 + def import_module_wrong(value: dict[str, str] = None): +51 | """Docstring""" +52 | import os; import sys +53 + if value is None: +54 + value = {} +55 | +56 | +57 | def import_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:55:49 @@ -244,19 +234,18 @@ B006 [*] Do not use mutable data structures for argument defaults 56 | import os; import sys | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -52 52 | import os; import sys -53 53 | -54 54 | -55 |-def import_module_wrong(value: dict[str, str] = {}): - 55 |+def import_module_wrong(value: dict[str, str] = None): -56 56 | import os; import sys - 57 |+ if value is None: - 58 |+ value = {} -57 59 | -58 60 | -59 61 | def import_module_wrong(value: dict[str, str] = {}): +52 | import os; import sys +53 | +54 | + - def import_module_wrong(value: dict[str, str] = {}): +55 + def import_module_wrong(value: dict[str, str] = None): +56 | import os; import sys +57 + if value is None: +58 + value = {} +59 | +60 | +61 | def import_module_wrong(value: dict[str, str] = {}): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:59:49 @@ -266,18 +255,17 @@ B006 [*] Do not use mutable data structures for argument defaults 60 | import os; import sys; x = 1 | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -56 56 | import os; import sys -57 57 | -58 58 | -59 |-def import_module_wrong(value: dict[str, str] = {}): - 59 |+def import_module_wrong(value: dict[str, str] = None): - 60 |+ if value is None: - 61 |+ value = {} -60 62 | import os; import sys; x = 1 -61 63 | -62 64 | +56 | import os; import sys +57 | +58 | + - def import_module_wrong(value: dict[str, str] = {}): +59 + def import_module_wrong(value: dict[str, str] = None): +60 + if value is None: +61 + value = {} +62 | import os; import sys; x = 1 +63 | +64 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_5.py:63:49 @@ -287,19 +275,18 @@ B006 [*] Do not use mutable data structures for argument defaults 64 | import os; import sys | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -60 60 | import os; import sys; x = 1 -61 61 | -62 62 | -63 |-def import_module_wrong(value: dict[str, str] = {}): - 63 |+def import_module_wrong(value: dict[str, str] = None): -64 64 | import os; import sys - 65 |+ if value is None: - 66 |+ value = {} -65 67 | -66 68 | -67 69 | def import_module_wrong(value: dict[str, str] = {}): import os +60 | import os; import sys; x = 1 +61 | +62 | + - def import_module_wrong(value: dict[str, str] = {}): +63 + def import_module_wrong(value: dict[str, str] = None): +64 | import os; import sys +65 + if value is None: +66 + value = {} +67 | +68 | +69 | def import_module_wrong(value: dict[str, str] = {}): import os +note: This is an unsafe fix and may change runtime behavior B006 Do not use mutable data structures for argument defaults --> B006_5.py:67:49 diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap index 0a8c9fc903..40e631db6c 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap @@ -11,14 +11,13 @@ B006 [*] Do not use mutable data structures for argument defaults 5 | import os | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -1 1 | # Import followed by whitespace with no newline -2 2 | # Same as B006_2.py, but import instead of docstring -3 3 | -4 |-def foobar(foor, bar={}): -5 |- import os - 4 |+def foobar(foor, bar=None): - 5 |+ import os - 6 |+ if bar is None: - 7 |+ bar = {} +1 | # Import followed by whitespace with no newline +2 | # Same as B006_2.py, but import instead of docstring +3 | + - def foobar(foor, bar={}): + - import os +4 + def foobar(foor, bar=None): +5 + import os +6 + if bar is None: +7 + bar = {} +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap index ab308b3660..b5dc7a5d76 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap @@ -11,14 +11,13 @@ B006 [*] Do not use mutable data structures for argument defaults 5 | import os | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -1 1 | # Import with no newline -2 2 | # Same as B006_3.py, but import instead of docstring -3 3 | -4 |-def foobar(foor, bar={}): -5 |- import os - 4 |+def foobar(foor, bar=None): - 5 |+ import os - 6 |+ if bar is None: - 7 |+ bar = {} +1 | # Import with no newline +2 | # Same as B006_3.py, but import instead of docstring +3 | + - def foobar(foor, bar={}): + - import os +4 + def foobar(foor, bar=None): +5 + import os +6 + if bar is None: +7 + bar = {} +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap index 7528607254..f06b24cbab 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_8.py.snap @@ -9,13 +9,12 @@ B006 [*] Do not use mutable data structures for argument defaults 2 | raise NotImplementedError("") | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -1 |-def foo(a: list = []): - 1 |+def foo(a: list = None): -2 2 | raise NotImplementedError("") -3 3 | -4 4 | + - def foo(a: list = []): +1 + def foo(a: list = None): +2 | raise NotImplementedError("") +3 | +4 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_8.py:5:19 @@ -26,16 +25,15 @@ B006 [*] Do not use mutable data structures for argument defaults 7 | raise NotImplementedError("and has some text in here") | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -2 2 | raise NotImplementedError("") -3 3 | -4 4 | -5 |-def bar(a: dict = {}): - 5 |+def bar(a: dict = None): -6 6 | """ This one also has a docstring""" -7 7 | raise NotImplementedError("and has some text in here") -8 8 | +2 | raise NotImplementedError("") +3 | +4 | + - def bar(a: dict = {}): +5 + def bar(a: dict = None): +6 | """ This one also has a docstring""" +7 | raise NotImplementedError("and has some text in here") +8 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_8.py:10:19 @@ -46,19 +44,18 @@ B006 [*] Do not use mutable data structures for argument defaults 12 | raise IndexError() | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -7 7 | raise NotImplementedError("and has some text in here") -8 8 | -9 9 | -10 |-def baz(a: list = []): - 10 |+def baz(a: list = None): -11 11 | """This one raises a different exception""" - 12 |+ if a is None: - 13 |+ a = [] -12 14 | raise IndexError() -13 15 | -14 16 | +7 | raise NotImplementedError("and has some text in here") +8 | +9 | + - def baz(a: list = []): +10 + def baz(a: list = None): +11 | """This one raises a different exception""" +12 + if a is None: +13 + a = [] +14 | raise IndexError() +15 | +16 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_8.py:15:19 @@ -68,16 +65,15 @@ B006 [*] Do not use mutable data structures for argument defaults 16 | raise NotImplementedError | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -12 12 | raise IndexError() -13 13 | -14 14 | -15 |-def qux(a: list = []): - 15 |+def qux(a: list = None): -16 16 | raise NotImplementedError -17 17 | -18 18 | +12 | raise IndexError() +13 | +14 | + - def qux(a: list = []): +15 + def qux(a: list = None): +16 | raise NotImplementedError +17 | +18 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_8.py:19:20 @@ -87,11 +83,10 @@ B006 [*] Do not use mutable data structures for argument defaults 20 | raise NotImplemented | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -16 16 | raise NotImplementedError -17 17 | -18 18 | -19 |-def quux(a: list = []): - 19 |+def quux(a: list = None): -20 20 | raise NotImplemented +16 | raise NotImplementedError +17 | +18 | + - def quux(a: list = []): +19 + def quux(a: list = None): +20 | raise NotImplemented +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap index f73a7920c6..e3f42e2da7 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap @@ -9,16 +9,15 @@ B006 [*] Do not use mutable data structures for argument defaults 64 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -60 60 | # Flag mutable literals/comprehensions -61 61 | -62 62 | -63 |-def this_is_wrong(value=[1, 2, 3]): - 63 |+def this_is_wrong(value=None): -64 64 | ... -65 65 | -66 66 | +60 | # Flag mutable literals/comprehensions +61 | +62 | + - def this_is_wrong(value=[1, 2, 3]): +63 + def this_is_wrong(value=None): +64 | ... +65 | +66 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:67:30 @@ -28,16 +27,15 @@ B006 [*] Do not use mutable data structures for argument defaults 68 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -64 64 | ... -65 65 | -66 66 | -67 |-def this_is_also_wrong(value={}): - 67 |+def this_is_also_wrong(value=None): -68 68 | ... -69 69 | -70 70 | +64 | ... +65 | +66 | + - def this_is_also_wrong(value={}): +67 + def this_is_also_wrong(value=None): +68 | ... +69 | +70 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:73:52 @@ -49,16 +47,15 @@ B006 [*] Do not use mutable data structures for argument defaults 74 | pass | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -70 70 | -71 71 | class Foo: -72 72 | @staticmethod -73 |- def this_is_also_wrong_and_more_indented(value={}): - 73 |+ def this_is_also_wrong_and_more_indented(value=None): -74 74 | pass -75 75 | -76 76 | +70 | +71 | class Foo: +72 | @staticmethod + - def this_is_also_wrong_and_more_indented(value={}): +73 + def this_is_also_wrong_and_more_indented(value=None): +74 | pass +75 | +76 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:77:31 @@ -71,18 +68,17 @@ B006 [*] Do not use mutable data structures for argument defaults 80 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -74 74 | pass -75 75 | -76 76 | -77 |-def multiline_arg_wrong(value={ -78 |- -79 |-}): - 77 |+def multiline_arg_wrong(value=None): -80 78 | ... -81 79 | -82 80 | def single_line_func_wrong(value = {}): ... +74 | pass +75 | +76 | + - def multiline_arg_wrong(value={ + - + - }): +77 + def multiline_arg_wrong(value=None): +78 | ... +79 | +80 | def single_line_func_wrong(value = {}): ... +note: This is an unsafe fix and may change runtime behavior B006 Do not use mutable data structures for argument defaults --> B006_B008.py:82:36 @@ -102,16 +98,15 @@ B006 [*] Do not use mutable data structures for argument defaults 86 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -82 82 | def single_line_func_wrong(value = {}): ... -83 83 | -84 84 | -85 |-def and_this(value=set()): - 85 |+def and_this(value=None): -86 86 | ... -87 87 | -88 88 | +82 | def single_line_func_wrong(value = {}): ... +83 | +84 | + - def and_this(value=set()): +85 + def and_this(value=None): +86 | ... +87 | +88 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:89:20 @@ -121,16 +116,15 @@ B006 [*] Do not use mutable data structures for argument defaults 90 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -86 86 | ... -87 87 | -88 88 | -89 |-def this_too(value=collections.OrderedDict()): - 89 |+def this_too(value=None): -90 90 | ... -91 91 | -92 92 | +86 | ... +87 | +88 | + - def this_too(value=collections.OrderedDict()): +89 + def this_too(value=None): +90 | ... +91 | +92 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:93:32 @@ -140,16 +134,15 @@ B006 [*] Do not use mutable data structures for argument defaults 94 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -90 90 | ... -91 91 | -92 92 | -93 |-async def async_this_too(value=collections.defaultdict()): - 93 |+async def async_this_too(value=None): -94 94 | ... -95 95 | -96 96 | +90 | ... +91 | +92 | + - async def async_this_too(value=collections.defaultdict()): +93 + async def async_this_too(value=None): +94 | ... +95 | +96 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:97:26 @@ -159,16 +152,15 @@ B006 [*] Do not use mutable data structures for argument defaults 98 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -94 94 | ... -95 95 | -96 96 | -97 |-def dont_forget_me(value=collections.deque()): - 97 |+def dont_forget_me(value=None): -98 98 | ... -99 99 | -100 100 | +94 | ... +95 | +96 | + - def dont_forget_me(value=collections.deque()): +97 + def dont_forget_me(value=None): +98 | ... +99 | +100 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:102:46 @@ -179,16 +171,15 @@ B006 [*] Do not use mutable data structures for argument defaults 103 | pass | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -99 99 | -100 100 | -101 101 | # N.B. we're also flagging the function call in the comprehension -102 |-def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]): - 102 |+def list_comprehension_also_not_okay(default=None): -103 103 | pass -104 104 | -105 105 | +99 | +100 | +101 | # N.B. we're also flagging the function call in the comprehension + - def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]): +102 + def list_comprehension_also_not_okay(default=None): +103 | pass +104 | +105 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:106:46 @@ -198,16 +189,15 @@ B006 [*] Do not use mutable data structures for argument defaults 107 | pass | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -103 103 | pass -104 104 | -105 105 | -106 |-def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}): - 106 |+def dict_comprehension_also_not_okay(default=None): -107 107 | pass -108 108 | -109 109 | +103 | pass +104 | +105 | + - def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}): +106 + def dict_comprehension_also_not_okay(default=None): +107 | pass +108 | +109 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:110:45 @@ -217,16 +207,15 @@ B006 [*] Do not use mutable data structures for argument defaults 111 | pass | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -107 107 | pass -108 108 | -109 109 | -110 |-def set_comprehension_also_not_okay(default={i**2 for i in range(3)}): - 110 |+def set_comprehension_also_not_okay(default=None): -111 111 | pass -112 112 | -113 113 | +107 | pass +108 | +109 | + - def set_comprehension_also_not_okay(default={i**2 for i in range(3)}): +110 + def set_comprehension_also_not_okay(default=None): +111 | pass +112 | +113 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:114:33 @@ -236,16 +225,15 @@ B006 [*] Do not use mutable data structures for argument defaults 115 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -111 111 | pass -112 112 | -113 113 | -114 |-def kwonlyargs_mutable(*, value=[]): - 114 |+def kwonlyargs_mutable(*, value=None): -115 115 | ... -116 116 | -117 117 | +111 | pass +112 | +113 | + - def kwonlyargs_mutable(*, value=[]): +114 + def kwonlyargs_mutable(*, value=None): +115 | ... +116 | +117 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:239:20 @@ -257,16 +245,15 @@ B006 [*] Do not use mutable data structures for argument defaults 240 | pass | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -236 236 | -237 237 | # B006 and B008 -238 238 | # We should handle arbitrary nesting of these B008. -239 |-def nested_combo(a=[float(3), dt.datetime.now()]): - 239 |+def nested_combo(a=None): -240 240 | pass -241 241 | -242 242 | +236 | +237 | # B006 and B008 +238 | # We should handle arbitrary nesting of these B008. + - def nested_combo(a=[float(3), dt.datetime.now()]): +239 + def nested_combo(a=None): +240 | pass +241 | +242 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:276:27 @@ -278,16 +265,15 @@ B006 [*] Do not use mutable data structures for argument defaults 278 | c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -273 273 | -274 274 | -275 275 | def mutable_annotations( -276 |- a: list[int] | None = [], - 276 |+ a: list[int] | None = None, -277 277 | b: Optional[Dict[int, int]] = {}, -278 278 | c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), -279 279 | d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +273 | +274 | +275 | def mutable_annotations( + - a: list[int] | None = [], +276 + a: list[int] | None = None, +277 | b: Optional[Dict[int, int]] = {}, +278 | c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +279 | d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:277:35 @@ -300,16 +286,15 @@ B006 [*] Do not use mutable data structures for argument defaults 279 | d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -274 274 | -275 275 | def mutable_annotations( -276 276 | a: list[int] | None = [], -277 |- b: Optional[Dict[int, int]] = {}, - 277 |+ b: Optional[Dict[int, int]] = None, -278 278 | c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), -279 279 | d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), -280 280 | ): +274 | +275 | def mutable_annotations( +276 | a: list[int] | None = [], + - b: Optional[Dict[int, int]] = {}, +277 + b: Optional[Dict[int, int]] = None, +278 | c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +279 | d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +280 | ): +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:278:62 @@ -322,16 +307,15 @@ B006 [*] Do not use mutable data structures for argument defaults 280 | ): | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -275 275 | def mutable_annotations( -276 276 | a: list[int] | None = [], -277 277 | b: Optional[Dict[int, int]] = {}, -278 |- c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), - 278 |+ c: Annotated[Union[Set[str], abc.Sized], "annotation"] = None, -279 279 | d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), -280 280 | ): -281 281 | pass +275 | def mutable_annotations( +276 | a: list[int] | None = [], +277 | b: Optional[Dict[int, int]] = {}, + - c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +278 + c: Annotated[Union[Set[str], abc.Sized], "annotation"] = None, +279 | d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +280 | ): +281 | pass +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:279:80 @@ -344,16 +328,15 @@ B006 [*] Do not use mutable data structures for argument defaults 281 | pass | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -276 276 | a: list[int] | None = [], -277 277 | b: Optional[Dict[int, int]] = {}, -278 278 | c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), -279 |- d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), - 279 |+ d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = None, -280 280 | ): -281 281 | pass -282 282 | +276 | a: list[int] | None = [], +277 | b: Optional[Dict[int, int]] = {}, +278 | c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), + - d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(), +279 + d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = None, +280 | ): +281 | pass +282 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:284:52 @@ -363,16 +346,15 @@ B006 [*] Do not use mutable data structures for argument defaults 285 | """Docstring""" | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -281 281 | pass -282 282 | -283 283 | -284 |-def single_line_func_wrong(value: dict[str, str] = {}): - 284 |+def single_line_func_wrong(value: dict[str, str] = None): -285 285 | """Docstring""" -286 286 | -287 287 | +281 | pass +282 | +283 | + - def single_line_func_wrong(value: dict[str, str] = {}): +284 + def single_line_func_wrong(value: dict[str, str] = None): +285 | """Docstring""" +286 | +287 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:288:52 @@ -383,16 +365,15 @@ B006 [*] Do not use mutable data structures for argument defaults 290 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -285 285 | """Docstring""" -286 286 | -287 287 | -288 |-def single_line_func_wrong(value: dict[str, str] = {}): - 288 |+def single_line_func_wrong(value: dict[str, str] = None): -289 289 | """Docstring""" -290 290 | ... -291 291 | +285 | """Docstring""" +286 | +287 | + - def single_line_func_wrong(value: dict[str, str] = {}): +288 + def single_line_func_wrong(value: dict[str, str] = None): +289 | """Docstring""" +290 | ... +291 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:293:52 @@ -402,16 +383,15 @@ B006 [*] Do not use mutable data structures for argument defaults 294 | """Docstring"""; ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -290 290 | ... -291 291 | -292 292 | -293 |-def single_line_func_wrong(value: dict[str, str] = {}): - 293 |+def single_line_func_wrong(value: dict[str, str] = None): -294 294 | """Docstring"""; ... -295 295 | -296 296 | +290 | ... +291 | +292 | + - def single_line_func_wrong(value: dict[str, str] = {}): +293 + def single_line_func_wrong(value: dict[str, str] = None): +294 | """Docstring"""; ... +295 | +296 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:297:52 @@ -422,16 +402,15 @@ B006 [*] Do not use mutable data structures for argument defaults 299 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -294 294 | """Docstring"""; ... -295 295 | -296 296 | -297 |-def single_line_func_wrong(value: dict[str, str] = {}): - 297 |+def single_line_func_wrong(value: dict[str, str] = None): -298 298 | """Docstring"""; \ -299 299 | ... -300 300 | +294 | """Docstring"""; ... +295 | +296 | + - def single_line_func_wrong(value: dict[str, str] = {}): +297 + def single_line_func_wrong(value: dict[str, str] = None): +298 | """Docstring"""; \ +299 | ... +300 | +note: This is an unsafe fix and may change runtime behavior B006 [*] Do not use mutable data structures for argument defaults --> B006_B008.py:302:52 @@ -444,18 +423,17 @@ B006 [*] Do not use mutable data structures for argument defaults 305 | """Docstring""" | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -299 299 | ... -300 300 | -301 301 | -302 |-def single_line_func_wrong(value: dict[str, str] = { -303 |- # This is a comment -304 |-}): - 302 |+def single_line_func_wrong(value: dict[str, str] = None): -305 303 | """Docstring""" -306 304 | -307 305 | +299 | ... +300 | +301 | + - def single_line_func_wrong(value: dict[str, str] = { + - # This is a comment + - }): +302 + def single_line_func_wrong(value: dict[str, str] = None): +303 | """Docstring""" +304 | +305 | +note: This is an unsafe fix and may change runtime behavior B006 Do not use mutable data structures for argument defaults --> B006_B008.py:308:52 @@ -475,11 +453,10 @@ B006 [*] Do not use mutable data structures for argument defaults 314 | """Docstring without newline""" | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -310 310 | """Docstring""" -311 311 | -312 312 | -313 |-def single_line_func_wrong(value: dict[str, str] = {}): - 313 |+def single_line_func_wrong(value: dict[str, str] = None): -314 314 | """Docstring without newline""" +310 | """Docstring""" +311 | +312 | + - def single_line_func_wrong(value: dict[str, str] = {}): +313 + def single_line_func_wrong(value: dict[str, str] = None): +314 | """Docstring without newline""" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap index 3deddf5fb4..159d6978d3 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap @@ -22,16 +22,15 @@ B007 [*] Loop control variable `k` not used within loop body 19 | print(i + j) | help: Rename unused `k` to `_k` - -ℹ Unsafe fix -15 15 | -16 16 | for i in range(10): -17 17 | for j in range(10): -18 |- for k in range(10): # k not used, i and j used transitively - 18 |+ for _k in range(10): # k not used, i and j used transitively -19 19 | print(i + j) -20 20 | -21 21 | +15 | +16 | for i in range(10): +17 | for j in range(10): + - for k in range(10): # k not used, i and j used transitively +18 + for _k in range(10): # k not used, i and j used transitively +19 | print(i + j) +20 | +21 | +note: This is an unsafe fix and may change runtime behavior B007 Loop control variable `i` not used within loop body --> B007.py:30:5 @@ -50,16 +49,15 @@ B007 [*] Loop control variable `k` not used within loop body 31 | print(j, l) | help: Rename unused `k` to `_k` - -ℹ Unsafe fix -27 27 | yield i, (j, (k, l)) -28 28 | -29 29 | -30 |-for i, (j, (k, l)) in strange_generator(): # i, k not used - 30 |+for i, (j, (_k, l)) in strange_generator(): # i, k not used -31 31 | print(j, l) -32 32 | -33 33 | FMT = "{foo} {bar}" +27 | yield i, (j, (k, l)) +28 | +29 | + - for i, (j, (k, l)) in strange_generator(): # i, k not used +30 + for i, (j, (_k, l)) in strange_generator(): # i, k not used +31 | print(j, l) +32 | +33 | FMT = "{foo} {bar}" +note: This is an unsafe fix and may change runtime behavior B007 Loop control variable `bar` may not be used within loop body --> B007.py:34:10 @@ -118,16 +116,15 @@ B007 [*] Loop control variable `bar` not used within loop body 54 | break | help: Rename unused `bar` to `_bar` - -ℹ Unsafe fix -49 49 | -50 50 | def f(): -51 51 | # Fixable. -52 |- for foo, bar, baz in (["1", "2", "3"],): - 52 |+ for foo, _bar, baz in (["1", "2", "3"],): -53 53 | if foo or baz: -54 54 | break -55 55 | +49 | +50 | def f(): +51 | # Fixable. + - for foo, bar, baz in (["1", "2", "3"],): +52 + for foo, _bar, baz in (["1", "2", "3"],): +53 | if foo or baz: +54 | break +55 | +note: This is an unsafe fix and may change runtime behavior B007 Loop control variable `bar` not used within loop body --> B007.py:59:14 @@ -152,16 +149,15 @@ B007 [*] Loop control variable `bar` not used within loop body 70 | break | help: Rename unused `bar` to `_bar` - -ℹ Unsafe fix -65 65 | -66 66 | def f(): -67 67 | # Fixable. -68 |- for foo, bar, baz in (["1", "2", "3"],): - 68 |+ for foo, _bar, baz in (["1", "2", "3"],): -69 69 | if foo or baz: -70 70 | break -71 71 | +65 | +66 | def f(): +67 | # Fixable. + - for foo, bar, baz in (["1", "2", "3"],): +68 + for foo, _bar, baz in (["1", "2", "3"],): +69 | if foo or baz: +70 | break +71 | +note: This is an unsafe fix and may change runtime behavior B007 Loop control variable `bar` not used within loop body --> B007.py:77:14 diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap index e733defa73..ab05bd0966 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap @@ -11,16 +11,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 21 | getattr(foo, "__123abc__") | help: Replace `getattr` with attribute access - -ℹ Safe fix -16 16 | getattr(foo, "__123abc") -17 17 | -18 18 | # Invalid usage -19 |-getattr(foo, "bar") - 19 |+foo.bar -20 20 | getattr(foo, "_123abc") -21 21 | getattr(foo, "__123abc__") -22 22 | getattr(foo, "abc123") +16 | getattr(foo, "__123abc") +17 | +18 | # Invalid usage + - getattr(foo, "bar") +19 + foo.bar +20 | getattr(foo, "_123abc") +21 | getattr(foo, "__123abc__") +22 | getattr(foo, "abc123") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:20:1 @@ -33,16 +31,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 22 | getattr(foo, "abc123") | help: Replace `getattr` with attribute access - -ℹ Safe fix -17 17 | -18 18 | # Invalid usage -19 19 | getattr(foo, "bar") -20 |-getattr(foo, "_123abc") - 20 |+foo._123abc -21 21 | getattr(foo, "__123abc__") -22 22 | getattr(foo, "abc123") -23 23 | getattr(foo, r"abc123") +17 | +18 | # Invalid usage +19 | getattr(foo, "bar") + - getattr(foo, "_123abc") +20 + foo._123abc +21 | getattr(foo, "__123abc__") +22 | getattr(foo, "abc123") +23 | getattr(foo, r"abc123") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:21:1 @@ -55,16 +51,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 23 | getattr(foo, r"abc123") | help: Replace `getattr` with attribute access - -ℹ Safe fix -18 18 | # Invalid usage -19 19 | getattr(foo, "bar") -20 20 | getattr(foo, "_123abc") -21 |-getattr(foo, "__123abc__") - 21 |+foo.__123abc__ -22 22 | getattr(foo, "abc123") -23 23 | getattr(foo, r"abc123") -24 24 | _ = lambda x: getattr(x, "bar") +18 | # Invalid usage +19 | getattr(foo, "bar") +20 | getattr(foo, "_123abc") + - getattr(foo, "__123abc__") +21 + foo.__123abc__ +22 | getattr(foo, "abc123") +23 | getattr(foo, r"abc123") +24 | _ = lambda x: getattr(x, "bar") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:22:1 @@ -77,16 +71,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 24 | _ = lambda x: getattr(x, "bar") | help: Replace `getattr` with attribute access - -ℹ Safe fix -19 19 | getattr(foo, "bar") -20 20 | getattr(foo, "_123abc") -21 21 | getattr(foo, "__123abc__") -22 |-getattr(foo, "abc123") - 22 |+foo.abc123 -23 23 | getattr(foo, r"abc123") -24 24 | _ = lambda x: getattr(x, "bar") -25 25 | if getattr(x, "bar"): +19 | getattr(foo, "bar") +20 | getattr(foo, "_123abc") +21 | getattr(foo, "__123abc__") + - getattr(foo, "abc123") +22 + foo.abc123 +23 | getattr(foo, r"abc123") +24 | _ = lambda x: getattr(x, "bar") +25 | if getattr(x, "bar"): B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:23:1 @@ -99,16 +91,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 25 | if getattr(x, "bar"): | help: Replace `getattr` with attribute access - -ℹ Safe fix -20 20 | getattr(foo, "_123abc") -21 21 | getattr(foo, "__123abc__") -22 22 | getattr(foo, "abc123") -23 |-getattr(foo, r"abc123") - 23 |+foo.abc123 -24 24 | _ = lambda x: getattr(x, "bar") -25 25 | if getattr(x, "bar"): -26 26 | pass +20 | getattr(foo, "_123abc") +21 | getattr(foo, "__123abc__") +22 | getattr(foo, "abc123") + - getattr(foo, r"abc123") +23 + foo.abc123 +24 | _ = lambda x: getattr(x, "bar") +25 | if getattr(x, "bar"): +26 | pass B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:24:15 @@ -121,16 +111,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 26 | pass | help: Replace `getattr` with attribute access - -ℹ Safe fix -21 21 | getattr(foo, "__123abc__") -22 22 | getattr(foo, "abc123") -23 23 | getattr(foo, r"abc123") -24 |-_ = lambda x: getattr(x, "bar") - 24 |+_ = lambda x: x.bar -25 25 | if getattr(x, "bar"): -26 26 | pass -27 27 | getattr(1, "real") +21 | getattr(foo, "__123abc__") +22 | getattr(foo, "abc123") +23 | getattr(foo, r"abc123") + - _ = lambda x: getattr(x, "bar") +24 + _ = lambda x: x.bar +25 | if getattr(x, "bar"): +26 | pass +27 | getattr(1, "real") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:25:4 @@ -143,16 +131,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 27 | getattr(1, "real") | help: Replace `getattr` with attribute access - -ℹ Safe fix -22 22 | getattr(foo, "abc123") -23 23 | getattr(foo, r"abc123") -24 24 | _ = lambda x: getattr(x, "bar") -25 |-if getattr(x, "bar"): - 25 |+if x.bar: -26 26 | pass -27 27 | getattr(1, "real") -28 28 | getattr(1., "real") +22 | getattr(foo, "abc123") +23 | getattr(foo, r"abc123") +24 | _ = lambda x: getattr(x, "bar") + - if getattr(x, "bar"): +25 + if x.bar: +26 | pass +27 | getattr(1, "real") +28 | getattr(1., "real") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:27:1 @@ -165,16 +151,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 29 | getattr(1.0, "real") | help: Replace `getattr` with attribute access - -ℹ Safe fix -24 24 | _ = lambda x: getattr(x, "bar") -25 25 | if getattr(x, "bar"): -26 26 | pass -27 |-getattr(1, "real") - 27 |+(1).real -28 28 | getattr(1., "real") -29 29 | getattr(1.0, "real") -30 30 | getattr(1j, "real") +24 | _ = lambda x: getattr(x, "bar") +25 | if getattr(x, "bar"): +26 | pass + - getattr(1, "real") +27 + (1).real +28 | getattr(1., "real") +29 | getattr(1.0, "real") +30 | getattr(1j, "real") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:28:1 @@ -187,16 +171,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 30 | getattr(1j, "real") | help: Replace `getattr` with attribute access - -ℹ Safe fix -25 25 | if getattr(x, "bar"): -26 26 | pass -27 27 | getattr(1, "real") -28 |-getattr(1., "real") - 28 |+(1.).real -29 29 | getattr(1.0, "real") -30 30 | getattr(1j, "real") -31 31 | getattr(True, "real") +25 | if getattr(x, "bar"): +26 | pass +27 | getattr(1, "real") + - getattr(1., "real") +28 + (1.).real +29 | getattr(1.0, "real") +30 | getattr(1j, "real") +31 | getattr(True, "real") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:29:1 @@ -209,16 +191,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 31 | getattr(True, "real") | help: Replace `getattr` with attribute access - -ℹ Safe fix -26 26 | pass -27 27 | getattr(1, "real") -28 28 | getattr(1., "real") -29 |-getattr(1.0, "real") - 29 |+(1.0).real -30 30 | getattr(1j, "real") -31 31 | getattr(True, "real") -32 32 | getattr(x := 1, "real") +26 | pass +27 | getattr(1, "real") +28 | getattr(1., "real") + - getattr(1.0, "real") +29 + (1.0).real +30 | getattr(1j, "real") +31 | getattr(True, "real") +32 | getattr(x := 1, "real") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:30:1 @@ -231,16 +211,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 32 | getattr(x := 1, "real") | help: Replace `getattr` with attribute access - -ℹ Safe fix -27 27 | getattr(1, "real") -28 28 | getattr(1., "real") -29 29 | getattr(1.0, "real") -30 |-getattr(1j, "real") - 30 |+(1j).real -31 31 | getattr(True, "real") -32 32 | getattr(x := 1, "real") -33 33 | getattr(x + y, "real") +27 | getattr(1, "real") +28 | getattr(1., "real") +29 | getattr(1.0, "real") + - getattr(1j, "real") +30 + (1j).real +31 | getattr(True, "real") +32 | getattr(x := 1, "real") +33 | getattr(x + y, "real") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:31:1 @@ -253,16 +231,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 33 | getattr(x + y, "real") | help: Replace `getattr` with attribute access - -ℹ Safe fix -28 28 | getattr(1., "real") -29 29 | getattr(1.0, "real") -30 30 | getattr(1j, "real") -31 |-getattr(True, "real") - 31 |+(True).real -32 32 | getattr(x := 1, "real") -33 33 | getattr(x + y, "real") -34 34 | getattr("foo" +28 | getattr(1., "real") +29 | getattr(1.0, "real") +30 | getattr(1j, "real") + - getattr(True, "real") +31 + (True).real +32 | getattr(x := 1, "real") +33 | getattr(x + y, "real") +34 | getattr("foo" B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:32:1 @@ -275,16 +251,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 34 | getattr("foo" | help: Replace `getattr` with attribute access - -ℹ Safe fix -29 29 | getattr(1.0, "real") -30 30 | getattr(1j, "real") -31 31 | getattr(True, "real") -32 |-getattr(x := 1, "real") - 32 |+(x := 1).real -33 33 | getattr(x + y, "real") -34 34 | getattr("foo" -35 35 | "bar", "real") +29 | getattr(1.0, "real") +30 | getattr(1j, "real") +31 | getattr(True, "real") + - getattr(x := 1, "real") +32 + (x := 1).real +33 | getattr(x + y, "real") +34 | getattr("foo" +35 | "bar", "real") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:33:1 @@ -297,16 +271,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 35 | "bar", "real") | help: Replace `getattr` with attribute access - -ℹ Safe fix -30 30 | getattr(1j, "real") -31 31 | getattr(True, "real") -32 32 | getattr(x := 1, "real") -33 |-getattr(x + y, "real") - 33 |+(x + y).real -34 34 | getattr("foo" -35 35 | "bar", "real") -36 36 | +30 | getattr(1j, "real") +31 | getattr(True, "real") +32 | getattr(x := 1, "real") + - getattr(x + y, "real") +33 + (x + y).real +34 | getattr("foo" +35 | "bar", "real") +36 | B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:34:1 @@ -318,18 +290,16 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa | |______________________^ | help: Replace `getattr` with attribute access - -ℹ Safe fix -31 31 | getattr(True, "real") -32 32 | getattr(x := 1, "real") -33 33 | getattr(x + y, "real") -34 |-getattr("foo" -35 |- "bar", "real") - 34 |+("foo" - 35 |+ "bar").real -36 36 | -37 37 | -38 38 | # Valid setattr usage +31 | getattr(True, "real") +32 | getattr(x := 1, "real") +33 | getattr(x + y, "real") + - getattr("foo" + - "bar", "real") +34 + ("foo" +35 + "bar").real +36 | +37 | +38 | # Valid setattr usage B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:58:8 @@ -341,16 +311,14 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 60 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387247 | help: Replace `getattr` with attribute access - -ℹ Safe fix -55 55 | setattr(foo.bar, r"baz", None) -56 56 | -57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885 -58 |-assert getattr(func, '_rpc')is True - 58 |+assert func._rpc is True -59 59 | -60 60 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387247 -61 61 | getattr(*foo, "bar") +55 | setattr(foo.bar, r"baz", None) +56 | +57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885 + - assert getattr(func, '_rpc')is True +58 + assert func._rpc is True +59 | +60 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387247 +61 | getattr(*foo, "bar") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:65:1 @@ -363,18 +331,16 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 68 | import builtins | help: Replace `getattr` with attribute access - -ℹ Safe fix -62 62 | setattr(*foo, "bar", None) -63 63 | -64 64 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739800901 -65 |-getattr(self. -66 |- registration.registry, '__name__') - 65 |+(self. - 66 |+ registration.registry).__name__ -67 67 | -68 68 | import builtins -69 69 | builtins.getattr(foo, "bar") +62 | setattr(*foo, "bar", None) +63 | +64 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739800901 + - getattr(self. + - registration.registry, '__name__') +65 + (self. +66 + registration.registry).__name__ +67 | +68 | import builtins +69 | builtins.getattr(foo, "bar") B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:69:1 @@ -386,13 +352,11 @@ B009 [*] Do not call `getattr` with a constant attribute value. It is not any sa 71 | # Regression test for: https://github.com/astral-sh/ruff/issues/18353 | help: Replace `getattr` with attribute access - -ℹ Safe fix -66 66 | registration.registry, '__name__') -67 67 | -68 68 | import builtins -69 |-builtins.getattr(foo, "bar") - 69 |+foo.bar -70 70 | -71 71 | # Regression test for: https://github.com/astral-sh/ruff/issues/18353 -72 72 | setattr(foo, "__debug__", 0) +66 | registration.registry, '__name__') +67 | +68 | import builtins + - builtins.getattr(foo, "bar") +69 + foo.bar +70 | +71 | # Regression test for: https://github.com/astral-sh/ruff/issues/18353 +72 | setattr(foo, "__debug__", 0) diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap index 59365d0da4..87c2f01bfe 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap @@ -11,16 +11,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa 52 | setattr(foo, "__123abc__", None) | help: Replace `setattr` with assignment - -ℹ Safe fix -47 47 | pass -48 48 | -49 49 | # Invalid usage -50 |-setattr(foo, "bar", None) - 50 |+foo.bar = None -51 51 | setattr(foo, "_123abc", None) -52 52 | setattr(foo, "__123abc__", None) -53 53 | setattr(foo, "abc123", None) +47 | pass +48 | +49 | # Invalid usage + - setattr(foo, "bar", None) +50 + foo.bar = None +51 | setattr(foo, "_123abc", None) +52 | setattr(foo, "__123abc__", None) +53 | setattr(foo, "abc123", None) B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:51:1 @@ -33,16 +31,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa 53 | setattr(foo, "abc123", None) | help: Replace `setattr` with assignment - -ℹ Safe fix -48 48 | -49 49 | # Invalid usage -50 50 | setattr(foo, "bar", None) -51 |-setattr(foo, "_123abc", None) - 51 |+foo._123abc = None -52 52 | setattr(foo, "__123abc__", None) -53 53 | setattr(foo, "abc123", None) -54 54 | setattr(foo, r"abc123", None) +48 | +49 | # Invalid usage +50 | setattr(foo, "bar", None) + - setattr(foo, "_123abc", None) +51 + foo._123abc = None +52 | setattr(foo, "__123abc__", None) +53 | setattr(foo, "abc123", None) +54 | setattr(foo, r"abc123", None) B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:52:1 @@ -55,16 +51,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa 54 | setattr(foo, r"abc123", None) | help: Replace `setattr` with assignment - -ℹ Safe fix -49 49 | # Invalid usage -50 50 | setattr(foo, "bar", None) -51 51 | setattr(foo, "_123abc", None) -52 |-setattr(foo, "__123abc__", None) - 52 |+foo.__123abc__ = None -53 53 | setattr(foo, "abc123", None) -54 54 | setattr(foo, r"abc123", None) -55 55 | setattr(foo.bar, r"baz", None) +49 | # Invalid usage +50 | setattr(foo, "bar", None) +51 | setattr(foo, "_123abc", None) + - setattr(foo, "__123abc__", None) +52 + foo.__123abc__ = None +53 | setattr(foo, "abc123", None) +54 | setattr(foo, r"abc123", None) +55 | setattr(foo.bar, r"baz", None) B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:53:1 @@ -77,16 +71,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa 55 | setattr(foo.bar, r"baz", None) | help: Replace `setattr` with assignment - -ℹ Safe fix -50 50 | setattr(foo, "bar", None) -51 51 | setattr(foo, "_123abc", None) -52 52 | setattr(foo, "__123abc__", None) -53 |-setattr(foo, "abc123", None) - 53 |+foo.abc123 = None -54 54 | setattr(foo, r"abc123", None) -55 55 | setattr(foo.bar, r"baz", None) -56 56 | +50 | setattr(foo, "bar", None) +51 | setattr(foo, "_123abc", None) +52 | setattr(foo, "__123abc__", None) + - setattr(foo, "abc123", None) +53 + foo.abc123 = None +54 | setattr(foo, r"abc123", None) +55 | setattr(foo.bar, r"baz", None) +56 | B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:54:1 @@ -98,16 +90,14 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa 55 | setattr(foo.bar, r"baz", None) | help: Replace `setattr` with assignment - -ℹ Safe fix -51 51 | setattr(foo, "_123abc", None) -52 52 | setattr(foo, "__123abc__", None) -53 53 | setattr(foo, "abc123", None) -54 |-setattr(foo, r"abc123", None) - 54 |+foo.abc123 = None -55 55 | setattr(foo.bar, r"baz", None) -56 56 | -57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885 +51 | setattr(foo, "_123abc", None) +52 | setattr(foo, "__123abc__", None) +53 | setattr(foo, "abc123", None) + - setattr(foo, r"abc123", None) +54 + foo.abc123 = None +55 | setattr(foo.bar, r"baz", None) +56 | +57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885 B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access. --> B009_B010.py:55:1 @@ -120,13 +110,11 @@ B010 [*] Do not call `setattr` with a constant attribute value. It is not any sa 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885 | help: Replace `setattr` with assignment - -ℹ Safe fix -52 52 | setattr(foo, "__123abc__", None) -53 53 | setattr(foo, "abc123", None) -54 54 | setattr(foo, r"abc123", None) -55 |-setattr(foo.bar, r"baz", None) - 55 |+foo.bar.baz = None -56 56 | -57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885 -58 58 | assert getattr(func, '_rpc')is True +52 | setattr(foo, "__123abc__", None) +53 | setattr(foo, "abc123", None) +54 | setattr(foo, r"abc123", None) + - setattr(foo.bar, r"baz", None) +55 + foo.bar.baz = None +56 | +57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885 +58 | assert getattr(func, '_rpc')is True diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap index 3af2078bac..57d6992e70 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B011_B011.py.snap @@ -11,15 +11,14 @@ B011 [*] Do not `assert False` (`python -O` removes these calls), raise `Asserti 10 | assert False, "message" | help: Replace `assert False` - -ℹ Unsafe fix -5 5 | """ -6 6 | -7 7 | assert 1 != 2 -8 |-assert False - 8 |+raise AssertionError() -9 9 | assert 1 != 2, "message" -10 10 | assert False, "message" +5 | """ +6 | +7 | assert 1 != 2 + - assert False +8 + raise AssertionError() +9 | assert 1 != 2, "message" +10 | assert False, "message" +note: This is an unsafe fix and may change runtime behavior B011 [*] Do not `assert False` (`python -O` removes these calls), raise `AssertionError()` --> B011.py:10:8 @@ -30,10 +29,9 @@ B011 [*] Do not `assert False` (`python -O` removes these calls), raise `Asserti | ^^^^^ | help: Replace `assert False` - -ℹ Unsafe fix -7 7 | assert 1 != 2 -8 8 | assert False -9 9 | assert 1 != 2, "message" -10 |-assert False, "message" - 10 |+raise AssertionError("message") +7 | assert 1 != 2 +8 | assert False +9 | assert 1 != 2, "message" + - assert False, "message" +10 + raise AssertionError("message") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap index a1443d6b03..558df83a88 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B013_B013.py.snap @@ -12,16 +12,14 @@ B013 [*] A length-one tuple literal is redundant in exception handlers 7 | except AttributeError: | help: Replace with `except ValueError` - -ℹ Safe fix -2 2 | -3 3 | try: -4 4 | pass -5 |-except (ValueError,): - 5 |+except ValueError: -6 6 | pass -7 7 | except AttributeError: -8 8 | pass +2 | +3 | try: +4 | pass + - except (ValueError,): +5 + except ValueError: +6 | pass +7 | except AttributeError: +8 | pass B013 [*] A length-one tuple literal is redundant in exception handlers --> B013.py:13:7 @@ -33,13 +31,11 @@ B013 [*] A length-one tuple literal is redundant in exception handlers 14 | pass | help: Replace with `except ValueError` - -ℹ Safe fix -10 10 | pass -11 11 | except (*retriable_exceptions,): -12 12 | pass -13 |-except(ValueError,): - 13 |+except ValueError: -14 14 | pass -15 15 | -16 16 | list_exceptions = [FileExistsError, FileNotFoundError] +10 | pass +11 | except (*retriable_exceptions,): +12 | pass + - except(ValueError,): +13 + except ValueError: +14 | pass +15 | +16 | list_exceptions = [FileExistsError, FileNotFoundError] diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap index fd18e4d076..e4bd89d12e 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B014_B014.py.snap @@ -12,16 +12,14 @@ B014 [*] Exception handler with duplicate exception: `OSError` 19 | pass | help: De-duplicate exceptions - -ℹ Safe fix -14 14 | -15 15 | try: -16 16 | pass -17 |-except (OSError, OSError) as err: - 17 |+except OSError as err: -18 18 | # Duplicate exception types are useless -19 19 | pass -20 20 | +14 | +15 | try: +16 | pass + - except (OSError, OSError) as err: +17 + except OSError as err: +18 | # Duplicate exception types are useless +19 | pass +20 | B014 [*] Exception handler with duplicate exception: `MyError` --> B014.py:28:8 @@ -34,16 +32,14 @@ B014 [*] Exception handler with duplicate exception: `MyError` 30 | pass | help: De-duplicate exceptions - -ℹ Safe fix -25 25 | -26 26 | try: -27 27 | pass -28 |-except (MyError, MyError): - 28 |+except MyError: -29 29 | # Detect duplicate non-builtin errors -30 30 | pass -31 31 | +25 | +26 | try: +27 | pass + - except (MyError, MyError): +28 + except MyError: +29 | # Detect duplicate non-builtin errors +30 | pass +31 | B014 [*] Exception handler with duplicate exception: `re.error` --> B014.py:49:8 @@ -56,16 +52,14 @@ B014 [*] Exception handler with duplicate exception: `re.error` 51 | pass | help: De-duplicate exceptions - -ℹ Safe fix -46 46 | -47 47 | try: -48 48 | pass -49 |-except (re.error, re.error): - 49 |+except re.error: -50 50 | # Duplicate exception types as attributes -51 51 | pass -52 52 | +46 | +47 | try: +48 | pass + - except (re.error, re.error): +49 + except re.error: +50 | # Duplicate exception types as attributes +51 | pass +52 | B014 [*] Exception handler with duplicate exception: `ValueError` --> B014.py:82:8 @@ -77,16 +71,14 @@ B014 [*] Exception handler with duplicate exception: `ValueError` 83 | pass | help: De-duplicate exceptions - -ℹ Safe fix -79 79 | # Regression test for: https://github.com/astral-sh/ruff/issues/6412 -80 80 | try: -81 81 | pass -82 |-except (ValueError, ValueError, TypeError): - 82 |+except (ValueError, TypeError): -83 83 | pass -84 84 | -85 85 | +79 | # Regression test for: https://github.com/astral-sh/ruff/issues/6412 +80 | try: +81 | pass + - except (ValueError, ValueError, TypeError): +82 + except (ValueError, TypeError): +83 | pass +84 | +85 | B014 [*] Exception handler with duplicate exception: `re.error` --> B014.py:89:7 @@ -98,11 +90,9 @@ B014 [*] Exception handler with duplicate exception: `re.error` 90 | p | help: De-duplicate exceptions - -ℹ Safe fix -86 86 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739801758 -87 87 | try: -88 88 | pas -89 |-except(re.error, re.error): - 89 |+except re.error: -90 90 | p +86 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739801758 +87 | try: +88 | pas + - except(re.error, re.error): +89 + except re.error: +90 | p diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap index 30b4edf861..c31af3bf6d 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B028_B028.py.snap @@ -12,16 +12,15 @@ B028 [*] No explicit `stacklevel` keyword argument found 10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2) | help: Set `stacklevel=2` - -ℹ Unsafe fix -5 5 | B028 - on lines 8 and 9 -6 6 | """ -7 7 | -8 |-warnings.warn("test", DeprecationWarning) - 8 |+warnings.warn("test", DeprecationWarning, stacklevel=2) -9 9 | warnings.warn("test", DeprecationWarning, source=None) -10 10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2) -11 11 | warnings.warn("test", DeprecationWarning, stacklevel=1) +5 | B028 - on lines 8 and 9 +6 | """ +7 | + - warnings.warn("test", DeprecationWarning) +8 + warnings.warn("test", DeprecationWarning, stacklevel=2) +9 | warnings.warn("test", DeprecationWarning, source=None) +10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2) +11 | warnings.warn("test", DeprecationWarning, stacklevel=1) +note: This is an unsafe fix and may change runtime behavior B028 [*] No explicit `stacklevel` keyword argument found --> B028.py:9:1 @@ -33,16 +32,15 @@ B028 [*] No explicit `stacklevel` keyword argument found 11 | warnings.warn("test", DeprecationWarning, stacklevel=1) | help: Set `stacklevel=2` - -ℹ Unsafe fix -6 6 | """ -7 7 | -8 8 | warnings.warn("test", DeprecationWarning) -9 |-warnings.warn("test", DeprecationWarning, source=None) - 9 |+warnings.warn("test", DeprecationWarning, stacklevel=2, source=None) -10 10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2) -11 11 | warnings.warn("test", DeprecationWarning, stacklevel=1) -12 12 | warnings.warn("test", DeprecationWarning, 1) +6 | """ +7 | +8 | warnings.warn("test", DeprecationWarning) + - warnings.warn("test", DeprecationWarning, source=None) +9 + warnings.warn("test", DeprecationWarning, stacklevel=2, source=None) +10 | warnings.warn("test", DeprecationWarning, source=None, stacklevel=2) +11 | warnings.warn("test", DeprecationWarning, stacklevel=1) +12 | warnings.warn("test", DeprecationWarning, 1) +note: This is an unsafe fix and may change runtime behavior B028 [*] No explicit `stacklevel` keyword argument found --> B028.py:22:1 @@ -55,16 +53,15 @@ B028 [*] No explicit `stacklevel` keyword argument found 24 | DeprecationWarning, | help: Set `stacklevel=2` - -ℹ Unsafe fix -23 23 | "test", -24 24 | DeprecationWarning, -25 25 | # some comments here -26 |- source = None # no trailing comma - 26 |+ stacklevel=2, source = None # no trailing comma -27 27 | ) -28 28 | -29 29 | # https://github.com/astral-sh/ruff/issues/18011 +23 | "test", +24 | DeprecationWarning, +25 | # some comments here + - source = None # no trailing comma +26 + stacklevel=2, source = None # no trailing comma +27 | ) +28 | +29 | # https://github.com/astral-sh/ruff/issues/18011 +note: This is an unsafe fix and may change runtime behavior B028 [*] No explicit `stacklevel` keyword argument found --> B028.py:32:1 @@ -77,13 +74,12 @@ B028 [*] No explicit `stacklevel` keyword argument found 34 | _my_prefixes = ("this","that") | help: Set `stacklevel=2` - -ℹ Unsafe fix -29 29 | # https://github.com/astral-sh/ruff/issues/18011 -30 30 | warnings.warn("test", skip_file_prefixes=(os.path.dirname(__file__),)) -31 31 | # trigger diagnostic if `skip_file_prefixes` is present and set to the default value -32 |-warnings.warn("test", skip_file_prefixes=()) - 32 |+warnings.warn("test", stacklevel=2, skip_file_prefixes=()) -33 33 | -34 34 | _my_prefixes = ("this","that") -35 35 | warnings.warn("test", skip_file_prefixes = _my_prefixes) +29 | # https://github.com/astral-sh/ruff/issues/18011 +30 | warnings.warn("test", skip_file_prefixes=(os.path.dirname(__file__),)) +31 | # trigger diagnostic if `skip_file_prefixes` is present and set to the default value + - warnings.warn("test", skip_file_prefixes=()) +32 + warnings.warn("test", stacklevel=2, skip_file_prefixes=()) +33 | +34 | _my_prefixes = ("this","that") +35 | warnings.warn("test", skip_file_prefixes = _my_prefixes) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap index 78dde5f27a..817a97b1b3 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap @@ -12,16 +12,14 @@ B033 [*] Sets should not contain duplicate item `"value1"` 6 | incorrect_set_multiline = { | help: Remove duplicate item - -ℹ Safe fix -1 1 | ### -2 2 | # Errors. -3 3 | ### -4 |-incorrect_set = {"value1", 23, 5, "value1"} - 4 |+incorrect_set = {"value1", 23, 5} -5 5 | incorrect_set = {1, 1, 2} -6 6 | incorrect_set_multiline = { -7 7 | "value1", +1 | ### +2 | # Errors. +3 | ### + - incorrect_set = {"value1", 23, 5, "value1"} +4 + incorrect_set = {"value1", 23, 5} +5 | incorrect_set = {1, 1, 2} +6 | incorrect_set_multiline = { +7 | "value1", B033 [*] Sets should not contain duplicate item `1` --> B033.py:5:21 @@ -34,16 +32,14 @@ B033 [*] Sets should not contain duplicate item `1` 7 | "value1", | help: Remove duplicate item - -ℹ Safe fix -2 2 | # Errors. -3 3 | ### -4 4 | incorrect_set = {"value1", 23, 5, "value1"} -5 |-incorrect_set = {1, 1, 2} - 5 |+incorrect_set = {1, 2} -6 6 | incorrect_set_multiline = { -7 7 | "value1", -8 8 | 23, +2 | # Errors. +3 | ### +4 | incorrect_set = {"value1", 23, 5, "value1"} + - incorrect_set = {1, 1, 2} +5 + incorrect_set = {1, 2} +6 | incorrect_set_multiline = { +7 | "value1", +8 | 23, B033 [*] Sets should not contain duplicate item `"value1"` --> B033.py:10:5 @@ -56,15 +52,13 @@ B033 [*] Sets should not contain duplicate item `"value1"` 12 | } | help: Remove duplicate item - -ℹ Safe fix -7 7 | "value1", -8 8 | 23, -9 9 | 5, -10 |- "value1", -11 10 | # B033 -12 11 | } -13 12 | incorrect_set = {1, 1} +7 | "value1", +8 | 23, +9 | 5, + - "value1", +10 | # B033 +11 | } +12 | incorrect_set = {1, 1} B033 [*] Sets should not contain duplicate item `1` --> B033.py:13:21 @@ -77,16 +71,14 @@ B033 [*] Sets should not contain duplicate item `1` 15 | incorrect_set = {0, 1, 1,} | help: Remove duplicate item - -ℹ Safe fix -10 10 | "value1", -11 11 | # B033 -12 12 | } -13 |-incorrect_set = {1, 1} - 13 |+incorrect_set = {1} -14 14 | incorrect_set = {1, 1,} -15 15 | incorrect_set = {0, 1, 1,} -16 16 | incorrect_set = {0, 1, 1} +10 | "value1", +11 | # B033 +12 | } + - incorrect_set = {1, 1} +13 + incorrect_set = {1} +14 | incorrect_set = {1, 1,} +15 | incorrect_set = {0, 1, 1,} +16 | incorrect_set = {0, 1, 1} B033 [*] Sets should not contain duplicate item `1` --> B033.py:14:21 @@ -99,16 +91,14 @@ B033 [*] Sets should not contain duplicate item `1` 16 | incorrect_set = {0, 1, 1} | help: Remove duplicate item - -ℹ Safe fix -11 11 | # B033 -12 12 | } -13 13 | incorrect_set = {1, 1} -14 |-incorrect_set = {1, 1,} - 14 |+incorrect_set = {1,} -15 15 | incorrect_set = {0, 1, 1,} -16 16 | incorrect_set = {0, 1, 1} -17 17 | incorrect_set = { +11 | # B033 +12 | } +13 | incorrect_set = {1, 1} + - incorrect_set = {1, 1,} +14 + incorrect_set = {1,} +15 | incorrect_set = {0, 1, 1,} +16 | incorrect_set = {0, 1, 1} +17 | incorrect_set = { B033 [*] Sets should not contain duplicate item `1` --> B033.py:15:24 @@ -121,16 +111,14 @@ B033 [*] Sets should not contain duplicate item `1` 17 | incorrect_set = { | help: Remove duplicate item - -ℹ Safe fix -12 12 | } -13 13 | incorrect_set = {1, 1} -14 14 | incorrect_set = {1, 1,} -15 |-incorrect_set = {0, 1, 1,} - 15 |+incorrect_set = {0, 1,} -16 16 | incorrect_set = {0, 1, 1} -17 17 | incorrect_set = { -18 18 | 0, +12 | } +13 | incorrect_set = {1, 1} +14 | incorrect_set = {1, 1,} + - incorrect_set = {0, 1, 1,} +15 + incorrect_set = {0, 1,} +16 | incorrect_set = {0, 1, 1} +17 | incorrect_set = { +18 | 0, B033 [*] Sets should not contain duplicate item `1` --> B033.py:16:24 @@ -143,16 +131,14 @@ B033 [*] Sets should not contain duplicate item `1` 18 | 0, | help: Remove duplicate item - -ℹ Safe fix -13 13 | incorrect_set = {1, 1} -14 14 | incorrect_set = {1, 1,} -15 15 | incorrect_set = {0, 1, 1,} -16 |-incorrect_set = {0, 1, 1} - 16 |+incorrect_set = {0, 1} -17 17 | incorrect_set = { -18 18 | 0, -19 19 | 1, +13 | incorrect_set = {1, 1} +14 | incorrect_set = {1, 1,} +15 | incorrect_set = {0, 1, 1,} + - incorrect_set = {0, 1, 1} +16 + incorrect_set = {0, 1} +17 | incorrect_set = { +18 | 0, +19 | 1, B033 [*] Sets should not contain duplicate item `1` --> B033.py:20:5 @@ -165,15 +151,13 @@ B033 [*] Sets should not contain duplicate item `1` 22 | incorrect_set = {False, 1, 0} | help: Remove duplicate item - -ℹ Safe fix -17 17 | incorrect_set = { -18 18 | 0, -19 19 | 1, -20 |- 1, -21 20 | } -22 21 | incorrect_set = {False, 1, 0} -23 22 | +17 | incorrect_set = { +18 | 0, +19 | 1, + - 1, +20 | } +21 | incorrect_set = {False, 1, 0} +22 | B033 [*] Sets should not contain duplicate items, but `False` and `0` has the same value --> B033.py:22:28 @@ -186,13 +170,11 @@ B033 [*] Sets should not contain duplicate items, but `False` and `0` has the sa 24 | ### | help: Remove duplicate item - -ℹ Safe fix -19 19 | 1, -20 20 | 1, -21 21 | } -22 |-incorrect_set = {False, 1, 0} - 22 |+incorrect_set = {False, 1} -23 23 | -24 24 | ### -25 25 | # Non-errors. +19 | 1, +20 | 1, +21 | } + - incorrect_set = {False, 1, 0} +22 + incorrect_set = {False, 1} +23 | +24 | ### +25 | # Non-errors. diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap index c3b396af36..0682f5c526 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B905.py.snap @@ -11,16 +11,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 6 | zip("a", "b") | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -1 1 | from itertools import count, cycle, repeat -2 2 | -3 3 | # Errors -4 |-zip() - 4 |+zip(strict=False) -5 5 | zip(range(3)) -6 6 | zip("a", "b") -7 7 | zip("a", "b", *zip("c")) +1 | from itertools import count, cycle, repeat +2 | +3 | # Errors + - zip() +4 + zip(strict=False) +5 | zip(range(3)) +6 | zip("a", "b") +7 | zip("a", "b", *zip("c")) B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:5:1 @@ -33,16 +31,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 7 | zip("a", "b", *zip("c")) | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -2 2 | -3 3 | # Errors -4 4 | zip() -5 |-zip(range(3)) - 5 |+zip(range(3), strict=False) -6 6 | zip("a", "b") -7 7 | zip("a", "b", *zip("c")) -8 8 | zip(zip("a"), strict=False) +2 | +3 | # Errors +4 | zip() + - zip(range(3)) +5 + zip(range(3), strict=False) +6 | zip("a", "b") +7 | zip("a", "b", *zip("c")) +8 | zip(zip("a"), strict=False) B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:6:1 @@ -55,16 +51,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 8 | zip(zip("a"), strict=False) | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -3 3 | # Errors -4 4 | zip() -5 5 | zip(range(3)) -6 |-zip("a", "b") - 6 |+zip("a", "b", strict=False) -7 7 | zip("a", "b", *zip("c")) -8 8 | zip(zip("a"), strict=False) -9 9 | zip(zip("a", strict=True)) +3 | # Errors +4 | zip() +5 | zip(range(3)) + - zip("a", "b") +6 + zip("a", "b", strict=False) +7 | zip("a", "b", *zip("c")) +8 | zip(zip("a"), strict=False) +9 | zip(zip("a", strict=True)) B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:7:1 @@ -77,16 +71,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 9 | zip(zip("a", strict=True)) | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -4 4 | zip() -5 5 | zip(range(3)) -6 6 | zip("a", "b") -7 |-zip("a", "b", *zip("c")) - 7 |+zip("a", "b", *zip("c"), strict=False) -8 8 | zip(zip("a"), strict=False) -9 9 | zip(zip("a", strict=True)) -10 10 | +4 | zip() +5 | zip(range(3)) +6 | zip("a", "b") + - zip("a", "b", *zip("c")) +7 + zip("a", "b", *zip("c"), strict=False) +8 | zip(zip("a"), strict=False) +9 | zip(zip("a", strict=True)) +10 | B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:7:16 @@ -99,16 +91,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 9 | zip(zip("a", strict=True)) | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -4 4 | zip() -5 5 | zip(range(3)) -6 6 | zip("a", "b") -7 |-zip("a", "b", *zip("c")) - 7 |+zip("a", "b", *zip("c", strict=False)) -8 8 | zip(zip("a"), strict=False) -9 9 | zip(zip("a", strict=True)) -10 10 | +4 | zip() +5 | zip(range(3)) +6 | zip("a", "b") + - zip("a", "b", *zip("c")) +7 + zip("a", "b", *zip("c", strict=False)) +8 | zip(zip("a"), strict=False) +9 | zip(zip("a", strict=True)) +10 | B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:8:5 @@ -120,16 +110,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 9 | zip(zip("a", strict=True)) | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -5 5 | zip(range(3)) -6 6 | zip("a", "b") -7 7 | zip("a", "b", *zip("c")) -8 |-zip(zip("a"), strict=False) - 8 |+zip(zip("a", strict=False), strict=False) -9 9 | zip(zip("a", strict=True)) -10 10 | -11 11 | # OK +5 | zip(range(3)) +6 | zip("a", "b") +7 | zip("a", "b", *zip("c")) + - zip(zip("a"), strict=False) +8 + zip(zip("a", strict=False), strict=False) +9 | zip(zip("a", strict=True)) +10 | +11 | # OK B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:9:1 @@ -142,16 +130,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 11 | # OK | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -6 6 | zip("a", "b") -7 7 | zip("a", "b", *zip("c")) -8 8 | zip(zip("a"), strict=False) -9 |-zip(zip("a", strict=True)) - 9 |+zip(zip("a", strict=True), strict=False) -10 10 | -11 11 | # OK -12 12 | zip(range(3), strict=True) +6 | zip("a", "b") +7 | zip("a", "b", *zip("c")) +8 | zip(zip("a"), strict=False) + - zip(zip("a", strict=True)) +9 + zip(zip("a", strict=True), strict=False) +10 | +11 | # OK +12 | zip(range(3), strict=True) B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:24:1 @@ -162,16 +148,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 25 | zip([1, 2, 3], repeat(1, times=4)) | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -21 21 | zip([1, 2, 3], repeat(1, times=None)) -22 22 | -23 23 | # Errors (limited iterators). -24 |-zip([1, 2, 3], repeat(1, 1)) - 24 |+zip([1, 2, 3], repeat(1, 1), strict=False) -25 25 | zip([1, 2, 3], repeat(1, times=4)) -26 26 | -27 27 | import builtins +21 | zip([1, 2, 3], repeat(1, times=None)) +22 | +23 | # Errors (limited iterators). + - zip([1, 2, 3], repeat(1, 1)) +24 + zip([1, 2, 3], repeat(1, 1), strict=False) +25 | zip([1, 2, 3], repeat(1, times=4)) +26 | +27 | import builtins B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:25:1 @@ -184,16 +168,14 @@ B905 [*] `zip()` without an explicit `strict=` parameter 27 | import builtins | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -22 22 | -23 23 | # Errors (limited iterators). -24 24 | zip([1, 2, 3], repeat(1, 1)) -25 |-zip([1, 2, 3], repeat(1, times=4)) - 25 |+zip([1, 2, 3], repeat(1, times=4), strict=False) -26 26 | -27 27 | import builtins -28 28 | # Still an error even though it uses the qualified name +22 | +23 | # Errors (limited iterators). +24 | zip([1, 2, 3], repeat(1, 1)) + - zip([1, 2, 3], repeat(1, times=4)) +25 + zip([1, 2, 3], repeat(1, times=4), strict=False) +26 | +27 | import builtins +28 | # Still an error even though it uses the qualified name B905 [*] `zip()` without an explicit `strict=` parameter --> B905.py:29:1 @@ -204,10 +186,8 @@ B905 [*] `zip()` without an explicit `strict=` parameter | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Add explicit value for parameter `strict=` - -ℹ Safe fix -26 26 | -27 27 | import builtins -28 28 | # Still an error even though it uses the qualified name -29 |-builtins.zip([1, 2, 3]) - 29 |+builtins.zip([1, 2, 3], strict=False) +26 | +27 | import builtins +28 | # Still an error even though it uses the qualified name + - builtins.zip([1, 2, 3]) +29 + builtins.zip([1, 2, 3], strict=False) diff --git a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap index 9de5085c02..f03aa73f1f 100644 --- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap +++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__extend_immutable_calls_arg_annotation.snap @@ -9,11 +9,10 @@ B006 [*] Do not use mutable data structures for argument defaults 18 | ... | help: Replace with `None`; initialize within function - -ℹ Unsafe fix -14 14 | ... -15 15 | -16 16 | -17 |-def error_due_to_missing_import(foo: ImmutableTypeA = []): - 17 |+def error_due_to_missing_import(foo: ImmutableTypeA = None): -18 18 | ... +14 | ... +15 | +16 | + - def error_due_to_missing_import(foo: ImmutableTypeA = []): +17 + def error_due_to_missing_import(foo: ImmutableTypeA = None): +18 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap index f34fdab573..52489d3e69 100644 --- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap +++ b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__COM81.py.snap @@ -12,16 +12,14 @@ COM812 [*] Trailing comma missing 6 | # ==> bad_list.py <== | help: Add trailing comma - -ℹ Safe fix -1 1 | # ==> bad_function_call.py <== -2 2 | bad_function_call( -3 3 | param1='test', -4 |- param2='test' - 4 |+ param2='test', -5 5 | ) -6 6 | # ==> bad_list.py <== -7 7 | bad_list = [ +1 | # ==> bad_function_call.py <== +2 | bad_function_call( +3 | param1='test', + - param2='test' +4 + param2='test', +5 | ) +6 | # ==> bad_list.py <== +7 | bad_list = [ COM812 [*] Trailing comma missing --> COM81.py:10:6 @@ -33,16 +31,14 @@ COM812 [*] Trailing comma missing 11 | ] | help: Add trailing comma - -ℹ Safe fix -7 7 | bad_list = [ -8 8 | 1, -9 9 | 2, -10 |- 3 - 10 |+ 3, -11 11 | ] -12 12 | -13 13 | bad_list_with_comment = [ +7 | bad_list = [ +8 | 1, +9 | 2, + - 3 +10 + 3, +11 | ] +12 | +13 | bad_list_with_comment = [ COM812 [*] Trailing comma missing --> COM81.py:16:6 @@ -55,16 +51,14 @@ COM812 [*] Trailing comma missing 18 | ] | help: Add trailing comma - -ℹ Safe fix -13 13 | bad_list_with_comment = [ -14 14 | 1, -15 15 | 2, -16 |- 3 - 16 |+ 3, -17 17 | # still needs a comma! -18 18 | ] -19 19 | +13 | bad_list_with_comment = [ +14 | 1, +15 | 2, + - 3 +16 + 3, +17 | # still needs a comma! +18 | ] +19 | COM812 [*] Trailing comma missing --> COM81.py:23:6 @@ -75,16 +69,14 @@ COM812 [*] Trailing comma missing | ^ | help: Add trailing comma - -ℹ Safe fix -20 20 | bad_list_with_extra_empty = [ -21 21 | 1, -22 22 | 2, -23 |- 3 - 23 |+ 3, -24 24 | -25 25 | -26 26 | +20 | bad_list_with_extra_empty = [ +21 | 1, +22 | 2, + - 3 +23 + 3, +24 | +25 | +26 | COM818 Trailing comma on bare tuple prohibited --> COM81.py:36:8 @@ -170,16 +162,14 @@ COM812 [*] Trailing comma missing 71 | ) | help: Add trailing comma - -ℹ Safe fix -67 67 | pass -68 68 | -69 69 | {'foo': foo}['foo']( -70 |- bar - 70 |+ bar, -71 71 | ) -72 72 | -73 73 | {'foo': foo}['foo']( +67 | pass +68 | +69 | {'foo': foo}['foo']( + - bar +70 + bar, +71 | ) +72 | +73 | {'foo': foo}['foo']( COM812 [*] Trailing comma missing --> COM81.py:78:8 @@ -190,16 +180,14 @@ COM812 [*] Trailing comma missing 79 | ) | help: Add trailing comma - -ℹ Safe fix -75 75 | ) -76 76 | -77 77 | (foo)( -78 |- bar - 78 |+ bar, -79 79 | ) -80 80 | -81 81 | (foo)[0]( +75 | ) +76 | +77 | (foo)( + - bar +78 + bar, +79 | ) +80 | +81 | (foo)[0]( COM812 [*] Trailing comma missing --> COM81.py:86:8 @@ -210,16 +198,14 @@ COM812 [*] Trailing comma missing 87 | ) | help: Add trailing comma - -ℹ Safe fix -83 83 | ) -84 84 | -85 85 | [foo][0]( -86 |- bar - 86 |+ bar, -87 87 | ) -88 88 | -89 89 | [foo][0]( +83 | ) +84 | +85 | [foo][0]( + - bar +86 + bar, +87 | ) +88 | +89 | [foo][0]( COM812 [*] Trailing comma missing --> COM81.py:152:6 @@ -231,16 +217,14 @@ COM812 [*] Trailing comma missing 153 | ) | help: Add trailing comma - -ℹ Safe fix -149 149 | -150 150 | # ==> keyword_before_parenth_form/base_bad.py <== -151 151 | from x import ( -152 |- y - 152 |+ y, -153 153 | ) -154 154 | -155 155 | assert( +149 | +150 | # ==> keyword_before_parenth_form/base_bad.py <== +151 | from x import ( + - y +152 + y, +153 | ) +154 | +155 | assert( COM812 [*] Trailing comma missing --> COM81.py:158:11 @@ -252,16 +236,14 @@ COM812 [*] Trailing comma missing 159 | ) | help: Add trailing comma - -ℹ Safe fix -155 155 | assert( -156 156 | SyntaxWarning, -157 157 | ThrownHere, -158 |- Anyway - 158 |+ Anyway, -159 159 | ) -160 160 | -161 161 | # async await is fine outside an async def +155 | assert( +156 | SyntaxWarning, +157 | ThrownHere, + - Anyway +158 + Anyway, +159 | ) +160 | +161 | # async await is fine outside an async def COM812 [*] Trailing comma missing --> COM81.py:293:15 @@ -274,16 +256,14 @@ COM812 [*] Trailing comma missing 295 | # ==> multiline_bad_function_def.py <== | help: Add trailing comma - -ℹ Safe fix -290 290 | -291 291 | # ==> multiline_bad_dict.py <== -292 292 | multiline_bad_dict = { -293 |- "bad": 123 - 293 |+ "bad": 123, -294 294 | } -295 295 | # ==> multiline_bad_function_def.py <== -296 296 | def func_good( +290 | +291 | # ==> multiline_bad_dict.py <== +292 | multiline_bad_dict = { + - "bad": 123 +293 + "bad": 123, +294 | } +295 | # ==> multiline_bad_function_def.py <== +296 | def func_good( COM812 [*] Trailing comma missing --> COM81.py:304:14 @@ -296,16 +276,14 @@ COM812 [*] Trailing comma missing 306 | pass | help: Add trailing comma - -ℹ Safe fix -301 301 | -302 302 | def func_bad( -303 303 | a = 3, -304 |- b = 2 - 304 |+ b = 2, -305 305 | ): -306 306 | pass -307 307 | +301 | +302 | def func_bad( +303 | a = 3, + - b = 2 +304 + b = 2, +305 | ): +306 | pass +307 | COM812 [*] Trailing comma missing --> COM81.py:310:14 @@ -318,16 +296,14 @@ COM812 [*] Trailing comma missing 312 | pass | help: Add trailing comma - -ℹ Safe fix -307 307 | -308 308 | # ==> multiline_bad_function_one_param.py <== -309 309 | def func( -310 |- a = 3 - 310 |+ a = 3, -311 311 | ): -312 312 | pass -313 313 | +307 | +308 | # ==> multiline_bad_function_one_param.py <== +309 | def func( + - a = 3 +310 + a = 3, +311 | ): +312 | pass +313 | COM812 [*] Trailing comma missing --> COM81.py:316:10 @@ -338,16 +314,14 @@ COM812 [*] Trailing comma missing 317 | ) | help: Add trailing comma - -ℹ Safe fix -313 313 | -314 314 | -315 315 | func( -316 |- a = 3 - 316 |+ a = 3, -317 317 | ) -318 318 | -319 319 | # ==> multiline_bad_or_dict.py <== +313 | +314 | +315 | func( + - a = 3 +316 + a = 3, +317 | ) +318 | +319 | # ==> multiline_bad_or_dict.py <== COM812 [*] Trailing comma missing --> COM81.py:322:15 @@ -359,16 +333,14 @@ COM812 [*] Trailing comma missing 323 | } | help: Add trailing comma - -ℹ Safe fix -319 319 | # ==> multiline_bad_or_dict.py <== -320 320 | multiline_bad_or_dict = { -321 321 | "good": True or False, -322 |- "bad": 123 - 322 |+ "bad": 123, -323 323 | } -324 324 | -325 325 | # ==> multiline_good_dict.py <== +319 | # ==> multiline_bad_or_dict.py <== +320 | multiline_bad_or_dict = { +321 | "good": True or False, + - "bad": 123 +322 + "bad": 123, +323 | } +324 | +325 | # ==> multiline_good_dict.py <== COM812 [*] Trailing comma missing --> COM81.py:368:15 @@ -380,16 +352,14 @@ COM812 [*] Trailing comma missing 369 | ] | help: Add trailing comma - -ℹ Safe fix -365 365 | -366 366 | multiline_index_access[ -367 367 | "probably fine", -368 |- "not good" - 368 |+ "not good", -369 369 | ] -370 370 | -371 371 | multiline_index_access[ +365 | +366 | multiline_index_access[ +367 | "probably fine", + - "not good" +368 + "not good", +369 | ] +370 | +371 | multiline_index_access[ COM812 [*] Trailing comma missing --> COM81.py:375:15 @@ -401,16 +371,14 @@ COM812 [*] Trailing comma missing 376 | ] | help: Add trailing comma - -ℹ Safe fix -372 372 | "fine", -373 373 | "fine", -374 374 | : -375 |- "not good" - 375 |+ "not good", -376 376 | ] -377 377 | -378 378 | # ==> multiline_string.py <== +372 | "fine", +373 | "fine", +374 | : + - "not good" +375 + "not good", +376 | ] +377 | +378 | # ==> multiline_string.py <== COM812 [*] Trailing comma missing --> COM81.py:404:15 @@ -422,16 +390,14 @@ COM812 [*] Trailing comma missing 405 | ] | help: Add trailing comma - -ℹ Safe fix -401 401 | "fine", -402 402 | "fine" -403 403 | : -404 |- "not fine" - 404 |+ "not fine", -405 405 | ] -406 406 | -407 407 | multiline_index_access[ +401 | "fine", +402 | "fine" +403 | : + - "not fine" +404 + "not fine", +405 | ] +406 | +407 | multiline_index_access[ COM812 [*] Trailing comma missing --> COM81.py:432:15 @@ -443,16 +409,14 @@ COM812 [*] Trailing comma missing 433 | ] | help: Add trailing comma - -ℹ Safe fix -429 429 | "fine" -430 430 | : -431 431 | "fine", -432 |- "not fine" - 432 |+ "not fine", -433 433 | ] -434 434 | -435 435 | multiline_index_access[ +429 | "fine" +430 | : +431 | "fine", + - "not fine" +432 + "not fine", +433 | ] +434 | +435 | multiline_index_access[ COM819 [*] Trailing comma prohibited --> COM81.py:485:21 @@ -464,16 +428,14 @@ COM819 [*] Trailing comma prohibited 487 | bar = { a: b,} | help: Remove trailing comma - -ℹ Safe fix -482 482 | ) -483 483 | -484 484 | # ==> prohibited.py <== -485 |-foo = ['a', 'b', 'c',] - 485 |+foo = ['a', 'b', 'c'] -486 486 | -487 487 | bar = { a: b,} -488 488 | +482 | ) +483 | +484 | # ==> prohibited.py <== + - foo = ['a', 'b', 'c',] +485 + foo = ['a', 'b', 'c'] +486 | +487 | bar = { a: b,} +488 | COM819 [*] Trailing comma prohibited --> COM81.py:487:13 @@ -486,16 +448,14 @@ COM819 [*] Trailing comma prohibited 489 | def bah(ham, spam,): | help: Remove trailing comma - -ℹ Safe fix -484 484 | # ==> prohibited.py <== -485 485 | foo = ['a', 'b', 'c',] -486 486 | -487 |-bar = { a: b,} - 487 |+bar = { a: b} -488 488 | -489 489 | def bah(ham, spam,): -490 490 | pass +484 | # ==> prohibited.py <== +485 | foo = ['a', 'b', 'c',] +486 | + - bar = { a: b,} +487 + bar = { a: b} +488 | +489 | def bah(ham, spam,): +490 | pass COM819 [*] Trailing comma prohibited --> COM81.py:489:18 @@ -507,16 +467,14 @@ COM819 [*] Trailing comma prohibited 490 | pass | help: Remove trailing comma - -ℹ Safe fix -486 486 | -487 487 | bar = { a: b,} -488 488 | -489 |-def bah(ham, spam,): - 489 |+def bah(ham, spam): -490 490 | pass -491 491 | -492 492 | (0,) +486 | +487 | bar = { a: b,} +488 | + - def bah(ham, spam,): +489 + def bah(ham, spam): +490 | pass +491 | +492 | (0,) COM819 [*] Trailing comma prohibited --> COM81.py:494:6 @@ -529,16 +487,14 @@ COM819 [*] Trailing comma prohibited 496 | foo = ['a', 'b', 'c', ] | help: Remove trailing comma - -ℹ Safe fix -491 491 | -492 492 | (0,) -493 493 | -494 |-(0, 1,) - 494 |+(0, 1) -495 495 | -496 496 | foo = ['a', 'b', 'c', ] -497 497 | +491 | +492 | (0,) +493 | + - (0, 1,) +494 + (0, 1) +495 | +496 | foo = ['a', 'b', 'c', ] +497 | COM819 [*] Trailing comma prohibited --> COM81.py:496:21 @@ -551,16 +507,14 @@ COM819 [*] Trailing comma prohibited 498 | bar = { a: b, } | help: Remove trailing comma - -ℹ Safe fix -493 493 | -494 494 | (0, 1,) -495 495 | -496 |-foo = ['a', 'b', 'c', ] - 496 |+foo = ['a', 'b', 'c' ] -497 497 | -498 498 | bar = { a: b, } -499 499 | +493 | +494 | (0, 1,) +495 | + - foo = ['a', 'b', 'c', ] +496 + foo = ['a', 'b', 'c' ] +497 | +498 | bar = { a: b, } +499 | COM819 [*] Trailing comma prohibited --> COM81.py:498:13 @@ -573,16 +527,14 @@ COM819 [*] Trailing comma prohibited 500 | def bah(ham, spam, ): | help: Remove trailing comma - -ℹ Safe fix -495 495 | -496 496 | foo = ['a', 'b', 'c', ] -497 497 | -498 |-bar = { a: b, } - 498 |+bar = { a: b } -499 499 | -500 500 | def bah(ham, spam, ): -501 501 | pass +495 | +496 | foo = ['a', 'b', 'c', ] +497 | + - bar = { a: b, } +498 + bar = { a: b } +499 | +500 | def bah(ham, spam, ): +501 | pass COM819 [*] Trailing comma prohibited --> COM81.py:500:18 @@ -594,16 +546,14 @@ COM819 [*] Trailing comma prohibited 501 | pass | help: Remove trailing comma - -ℹ Safe fix -497 497 | -498 498 | bar = { a: b, } -499 499 | -500 |-def bah(ham, spam, ): - 500 |+def bah(ham, spam ): -501 501 | pass -502 502 | -503 503 | (0, ) +497 | +498 | bar = { a: b, } +499 | + - def bah(ham, spam, ): +500 + def bah(ham, spam ): +501 | pass +502 | +503 | (0, ) COM819 [*] Trailing comma prohibited --> COM81.py:505:6 @@ -616,16 +566,14 @@ COM819 [*] Trailing comma prohibited 507 | image[:, :, 0] | help: Remove trailing comma - -ℹ Safe fix -502 502 | -503 503 | (0, ) -504 504 | -505 |-(0, 1, ) - 505 |+(0, 1 ) -506 506 | -507 507 | image[:, :, 0] -508 508 | +502 | +503 | (0, ) +504 | + - (0, 1, ) +505 + (0, 1 ) +506 | +507 | image[:, :, 0] +508 | COM819 [*] Trailing comma prohibited --> COM81.py:511:10 @@ -638,16 +586,14 @@ COM819 [*] Trailing comma prohibited 513 | lambda x, : x | help: Remove trailing comma - -ℹ Safe fix -508 508 | -509 509 | image[:,] -510 510 | -511 |-image[:,:,] - 511 |+image[:,:] -512 512 | -513 513 | lambda x, : x -514 514 | +508 | +509 | image[:,] +510 | + - image[:,:,] +511 + image[:,:] +512 | +513 | lambda x, : x +514 | COM819 [*] Trailing comma prohibited --> COM81.py:513:9 @@ -660,16 +606,14 @@ COM819 [*] Trailing comma prohibited 515 | # ==> unpack.py <== | help: Remove trailing comma - -ℹ Safe fix -510 510 | -511 511 | image[:,:,] -512 512 | -513 |-lambda x, : x - 513 |+lambda x : x -514 514 | -515 515 | # ==> unpack.py <== -516 516 | def function( +510 | +511 | image[:,:,] +512 | + - lambda x, : x +513 + lambda x : x +514 | +515 | # ==> unpack.py <== +516 | def function( COM812 [*] Trailing comma missing --> COM81.py:519:13 @@ -682,16 +626,14 @@ COM812 [*] Trailing comma missing 521 | pass | help: Add trailing comma - -ℹ Safe fix -516 516 | def function( -517 517 | foo, -518 518 | bar, -519 |- **kwargs - 519 |+ **kwargs, -520 520 | ): -521 521 | pass -522 522 | +516 | def function( +517 | foo, +518 | bar, + - **kwargs +519 + **kwargs, +520 | ): +521 | pass +522 | COM812 [*] Trailing comma missing --> COM81.py:526:10 @@ -704,16 +646,14 @@ COM812 [*] Trailing comma missing 528 | pass | help: Add trailing comma - -ℹ Safe fix -523 523 | def function( -524 524 | foo, -525 525 | bar, -526 |- *args - 526 |+ *args, -527 527 | ): -528 528 | pass -529 529 | +523 | def function( +524 | foo, +525 | bar, + - *args +526 + *args, +527 | ): +528 | pass +529 | COM812 [*] Trailing comma missing --> COM81.py:534:16 @@ -726,16 +666,14 @@ COM812 [*] Trailing comma missing 536 | pass | help: Add trailing comma - -ℹ Safe fix -531 531 | foo, -532 532 | bar, -533 533 | *args, -534 |- extra_kwarg - 534 |+ extra_kwarg, -535 535 | ): -536 536 | pass -537 537 | +531 | foo, +532 | bar, +533 | *args, + - extra_kwarg +534 + extra_kwarg, +535 | ): +536 | pass +537 | COM812 [*] Trailing comma missing --> COM81.py:541:13 @@ -747,16 +685,14 @@ COM812 [*] Trailing comma missing 542 | ) | help: Add trailing comma - -ℹ Safe fix -538 538 | result = function( -539 539 | foo, -540 540 | bar, -541 |- **kwargs - 541 |+ **kwargs, -542 542 | ) -543 543 | -544 544 | result = function( +538 | result = function( +539 | foo, +540 | bar, + - **kwargs +541 + **kwargs, +542 | ) +543 | +544 | result = function( COM812 [*] Trailing comma missing --> COM81.py:547:24 @@ -768,16 +704,14 @@ COM812 [*] Trailing comma missing 548 | ) | help: Add trailing comma - -ℹ Safe fix -544 544 | result = function( -545 545 | foo, -546 546 | bar, -547 |- **not_called_kwargs - 547 |+ **not_called_kwargs, -548 548 | ) -549 549 | -550 550 | def foo( +544 | result = function( +545 | foo, +546 | bar, + - **not_called_kwargs +547 + **not_called_kwargs, +548 | ) +549 | +550 | def foo( COM812 [*] Trailing comma missing --> COM81.py:554:15 @@ -790,16 +724,14 @@ COM812 [*] Trailing comma missing 556 | pass | help: Add trailing comma - -ℹ Safe fix -551 551 | ham, -552 552 | spam, -553 553 | *args, -554 |- kwarg_only - 554 |+ kwarg_only, -555 555 | ): -556 556 | pass -557 557 | +551 | ham, +552 | spam, +553 | *args, + - kwarg_only +554 + kwarg_only, +555 | ): +556 | pass +557 | COM812 [*] Trailing comma missing --> COM81.py:561:13 @@ -810,16 +742,14 @@ COM812 [*] Trailing comma missing 562 | ) | help: Add trailing comma - -ℹ Safe fix -558 558 | # In python 3.5 if it's not a function def, commas are mandatory. -559 559 | -560 560 | foo( -561 |- **kwargs - 561 |+ **kwargs, -562 562 | ) -563 563 | -564 564 | { +558 | # In python 3.5 if it's not a function def, commas are mandatory. +559 | +560 | foo( + - **kwargs +561 + **kwargs, +562 | ) +563 | +564 | { COM812 [*] Trailing comma missing --> COM81.py:565:13 @@ -830,16 +760,14 @@ COM812 [*] Trailing comma missing 566 | } | help: Add trailing comma - -ℹ Safe fix -562 562 | ) -563 563 | -564 564 | { -565 |- **kwargs - 565 |+ **kwargs, -566 566 | } -567 567 | -568 568 | { +562 | ) +563 | +564 | { + - **kwargs +565 + **kwargs, +566 | } +567 | +568 | { COM812 [*] Trailing comma missing --> COM81.py:569:10 @@ -850,16 +778,14 @@ COM812 [*] Trailing comma missing 570 | } | help: Add trailing comma - -ℹ Safe fix -566 566 | } -567 567 | -568 568 | { -569 |- *args - 569 |+ *args, -570 570 | } -571 571 | -572 572 | [ +566 | } +567 | +568 | { + - *args +569 + *args, +570 | } +571 | +572 | [ COM812 [*] Trailing comma missing --> COM81.py:573:10 @@ -870,16 +796,14 @@ COM812 [*] Trailing comma missing 574 | ] | help: Add trailing comma - -ℹ Safe fix -570 570 | } -571 571 | -572 572 | [ -573 |- *args - 573 |+ *args, -574 574 | ] -575 575 | -576 576 | def foo( +570 | } +571 | +572 | [ + - *args +573 + *args, +574 | ] +575 | +576 | def foo( COM812 [*] Trailing comma missing --> COM81.py:579:10 @@ -892,16 +816,14 @@ COM812 [*] Trailing comma missing 581 | pass | help: Add trailing comma - -ℹ Safe fix -576 576 | def foo( -577 577 | ham, -578 578 | spam, -579 |- *args - 579 |+ *args, -580 580 | ): -581 581 | pass -582 582 | +576 | def foo( +577 | ham, +578 | spam, + - *args +579 + *args, +580 | ): +581 | pass +582 | COM812 [*] Trailing comma missing --> COM81.py:586:13 @@ -914,16 +836,14 @@ COM812 [*] Trailing comma missing 588 | pass | help: Add trailing comma - -ℹ Safe fix -583 583 | def foo( -584 584 | ham, -585 585 | spam, -586 |- **kwargs - 586 |+ **kwargs, -587 587 | ): -588 588 | pass -589 589 | +583 | def foo( +584 | ham, +585 | spam, + - **kwargs +586 + **kwargs, +587 | ): +588 | pass +589 | COM812 [*] Trailing comma missing --> COM81.py:594:15 @@ -936,16 +856,14 @@ COM812 [*] Trailing comma missing 596 | pass | help: Add trailing comma - -ℹ Safe fix -591 591 | ham, -592 592 | spam, -593 593 | *args, -594 |- kwarg_only - 594 |+ kwarg_only, -595 595 | ): -596 596 | pass -597 597 | +591 | ham, +592 | spam, +593 | *args, + - kwarg_only +594 + kwarg_only, +595 | ): +596 | pass +597 | COM812 [*] Trailing comma missing --> COM81.py:623:20 @@ -957,16 +875,14 @@ COM812 [*] Trailing comma missing 624 | ) | help: Add trailing comma - -ℹ Safe fix -620 620 | result = function( -621 621 | foo, -622 622 | bar, -623 |- **{'ham': spam} - 623 |+ **{'ham': spam}, -624 624 | ) -625 625 | -626 626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error. +620 | result = function( +621 | foo, +622 | bar, + - **{'ham': spam} +623 + **{'ham': spam}, +624 | ) +625 | +626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error. COM812 [*] Trailing comma missing --> COM81.py:628:42 @@ -978,16 +894,14 @@ COM812 [*] Trailing comma missing 629 | ) | help: Add trailing comma - -ℹ Safe fix -625 625 | -626 626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error. -627 627 | the_first_one = next( -628 |- (i for i in range(10) if i // 2 == 0) # COM812 fix should include the final bracket - 628 |+ (i for i in range(10) if i // 2 == 0), # COM812 fix should include the final bracket -629 629 | ) -630 630 | -631 631 | foo = namedtuple( +625 | +626 | # Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error. +627 | the_first_one = next( + - (i for i in range(10) if i // 2 == 0) # COM812 fix should include the final bracket +628 + (i for i in range(10) if i // 2 == 0), # COM812 fix should include the final bracket +629 | ) +630 | +631 | foo = namedtuple( COM819 [*] Trailing comma prohibited --> COM81.py:640:46 @@ -999,16 +913,14 @@ COM819 [*] Trailing comma prohibited 642 | raise Exception( | help: Remove trailing comma - -ℹ Safe fix -637 637 | ) -638 638 | -639 639 | # F-strings -640 |-kwargs.pop("remove", f"this {trailing_comma}",) - 640 |+kwargs.pop("remove", f"this {trailing_comma}") -641 641 | -642 642 | raise Exception( -643 643 | "first", extra=f"Add trailing comma here ->" +637 | ) +638 | +639 | # F-strings + - kwargs.pop("remove", f"this {trailing_comma}",) +640 + kwargs.pop("remove", f"this {trailing_comma}") +641 | +642 | raise Exception( +643 | "first", extra=f"Add trailing comma here ->" COM812 [*] Trailing comma missing --> COM81.py:643:49 @@ -1019,13 +931,11 @@ COM812 [*] Trailing comma missing 644 | ) | help: Add trailing comma - -ℹ Safe fix -640 640 | kwargs.pop("remove", f"this {trailing_comma}",) -641 641 | -642 642 | raise Exception( -643 |- "first", extra=f"Add trailing comma here ->" - 643 |+ "first", extra=f"Add trailing comma here ->", -644 644 | ) -645 645 | -646 646 | assert False, f"<- This is not a trailing comma" +640 | kwargs.pop("remove", f"this {trailing_comma}",) +641 | +642 | raise Exception( + - "first", extra=f"Add trailing comma here ->" +643 + "first", extra=f"Add trailing comma here ->", +644 | ) +645 | +646 | assert False, f"<- This is not a trailing comma" diff --git a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview_diff__COM81.py.snap b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview_diff__COM81.py.snap index 22eb0587e6..713b28ad66 100644 --- a/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview_diff__COM81.py.snap +++ b/crates/ruff_linter/src/rules/flake8_commas/snapshots/ruff_linter__rules__flake8_commas__tests__preview_diff__COM81.py.snap @@ -20,16 +20,14 @@ COM812 [*] Trailing comma missing 657 | def f[ | help: Add trailing comma - -ℹ Safe fix -652 652 | }""" -653 653 | -654 654 | type X[ -655 |- T - 655 |+ T, -656 656 | ] = T -657 657 | def f[ -658 658 | T +652 | }""" +653 | +654 | type X[ + - T +655 + T, +656 | ] = T +657 | def f[ +658 | T COM812 [*] Trailing comma missing @@ -43,16 +41,14 @@ COM812 [*] Trailing comma missing 660 | class C[ | help: Add trailing comma - -ℹ Safe fix -655 655 | T -656 656 | ] = T -657 657 | def f[ -658 |- T - 658 |+ T, -659 659 | ](): pass -660 660 | class C[ -661 661 | T +655 | T +656 | ] = T +657 | def f[ + - T +658 + T, +659 | ](): pass +660 | class C[ +661 | T COM812 [*] Trailing comma missing @@ -65,16 +61,14 @@ COM812 [*] Trailing comma missing 662 | ]: pass | help: Add trailing comma - -ℹ Safe fix -658 658 | T -659 659 | ](): pass -660 660 | class C[ -661 |- T - 661 |+ T, -662 662 | ]: pass -663 663 | -664 664 | type X[T,] = T +658 | T +659 | ](): pass +660 | class C[ + - T +661 + T, +662 | ]: pass +663 | +664 | type X[T,] = T COM819 [*] Trailing comma prohibited @@ -88,15 +82,13 @@ COM819 [*] Trailing comma prohibited 666 | class C[T,]: pass | help: Remove trailing comma - -ℹ Safe fix -661 661 | T -662 662 | ]: pass -663 663 | -664 |-type X[T,] = T - 664 |+type X[T] = T -665 665 | def f[T,](): pass -666 666 | class C[T,]: pass +661 | T +662 | ]: pass +663 | + - type X[T,] = T +664 + type X[T] = T +665 | def f[T,](): pass +666 | class C[T,]: pass COM819 [*] Trailing comma prohibited @@ -108,14 +100,12 @@ COM819 [*] Trailing comma prohibited 666 | class C[T,]: pass | help: Remove trailing comma - -ℹ Safe fix -662 662 | ]: pass -663 663 | -664 664 | type X[T,] = T -665 |-def f[T,](): pass - 665 |+def f[T](): pass -666 666 | class C[T,]: pass +662 | ]: pass +663 | +664 | type X[T,] = T + - def f[T,](): pass +665 + def f[T](): pass +666 | class C[T,]: pass COM819 [*] Trailing comma prohibited @@ -127,10 +117,8 @@ COM819 [*] Trailing comma prohibited | ^ | help: Remove trailing comma - -ℹ Safe fix -663 663 | -664 664 | type X[T,] = T -665 665 | def f[T,](): pass -666 |-class C[T,]: pass - 666 |+class C[T]: pass +663 | +664 | type X[T,] = T +665 | def f[T,](): pass + - class C[T,]: pass +666 + class C[T]: pass diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap index 1be1ac0752..3933a74ae0 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C400_C400.py.snap @@ -11,14 +11,13 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension) 4 | 2 * x + 1 for x in range(3) | help: Rewrite as a list comprehension - -ℹ Unsafe fix -1 1 | # Cannot combine with C416. Should use list comprehension here. -2 |-even_nums = list(2 * x for x in range(3)) - 2 |+even_nums = [2 * x for x in range(3)] -3 3 | odd_nums = list( -4 4 | 2 * x + 1 for x in range(3) -5 5 | ) +1 | # Cannot combine with C416. Should use list comprehension here. + - even_nums = list(2 * x for x in range(3)) +2 + even_nums = [2 * x for x in range(3)] +3 | odd_nums = list( +4 | 2 * x + 1 for x in range(3) +5 | ) +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite as a list comprehension) --> C400.py:3:12 @@ -32,18 +31,17 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension) | |_^ | help: Rewrite as a list comprehension - -ℹ Unsafe fix -1 1 | # Cannot combine with C416. Should use list comprehension here. -2 2 | even_nums = list(2 * x for x in range(3)) -3 |-odd_nums = list( - 3 |+odd_nums = [ -4 4 | 2 * x + 1 for x in range(3) -5 |-) - 5 |+] -6 6 | -7 7 | -8 8 | # Short-circuit case, combine with C416 and should produce x = list(range(3)) +1 | # Cannot combine with C416. Should use list comprehension here. +2 | even_nums = list(2 * x for x in range(3)) + - odd_nums = list( +3 + odd_nums = [ +4 | 2 * x + 1 for x in range(3) + - ) +5 + ] +6 | +7 | +8 | # Short-circuit case, combine with C416 and should produce x = list(range(3)) +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite using `list()`) --> C400.py:9:5 @@ -55,16 +53,15 @@ C400 [*] Unnecessary generator (rewrite using `list()`) 11 | x for x in range(3) | help: Rewrite using `list()` - -ℹ Unsafe fix -6 6 | -7 7 | -8 8 | # Short-circuit case, combine with C416 and should produce x = list(range(3)) -9 |-x = list(x for x in range(3)) - 9 |+x = list(range(3)) -10 10 | x = list( -11 11 | x for x in range(3) -12 12 | ) +6 | +7 | +8 | # Short-circuit case, combine with C416 and should produce x = list(range(3)) + - x = list(x for x in range(3)) +9 + x = list(range(3)) +10 | x = list( +11 | x for x in range(3) +12 | ) +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite using `list()`) --> C400.py:10:5 @@ -80,18 +77,17 @@ C400 [*] Unnecessary generator (rewrite using `list()`) 14 | # Strip parentheses from inner generators. | help: Rewrite using `list()` - -ℹ Unsafe fix -7 7 | -8 8 | # Short-circuit case, combine with C416 and should produce x = list(range(3)) -9 9 | x = list(x for x in range(3)) -10 |-x = list( -11 |- x for x in range(3) -12 |-) - 10 |+x = list(range(3)) -13 11 | -14 12 | # Strip parentheses from inner generators. -15 13 | list((2 * x for x in range(3))) +7 | +8 | # Short-circuit case, combine with C416 and should produce x = list(range(3)) +9 | x = list(x for x in range(3)) + - x = list( + - x for x in range(3) + - ) +10 + x = list(range(3)) +11 | +12 | # Strip parentheses from inner generators. +13 | list((2 * x for x in range(3))) +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite as a list comprehension) --> C400.py:15:1 @@ -103,16 +99,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension) 17 | list((((2 * x for x in range(3))))) | help: Rewrite as a list comprehension - -ℹ Unsafe fix -12 12 | ) -13 13 | -14 14 | # Strip parentheses from inner generators. -15 |-list((2 * x for x in range(3))) - 15 |+[2 * x for x in range(3)] -16 16 | list(((2 * x for x in range(3)))) -17 17 | list((((2 * x for x in range(3))))) -18 18 | +12 | ) +13 | +14 | # Strip parentheses from inner generators. + - list((2 * x for x in range(3))) +15 + [2 * x for x in range(3)] +16 | list(((2 * x for x in range(3)))) +17 | list((((2 * x for x in range(3))))) +18 | +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite as a list comprehension) --> C400.py:16:1 @@ -124,16 +119,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension) 17 | list((((2 * x for x in range(3))))) | help: Rewrite as a list comprehension - -ℹ Unsafe fix -13 13 | -14 14 | # Strip parentheses from inner generators. -15 15 | list((2 * x for x in range(3))) -16 |-list(((2 * x for x in range(3)))) - 16 |+[2 * x for x in range(3)] -17 17 | list((((2 * x for x in range(3))))) -18 18 | -19 19 | # Account for trailing comma in fix +13 | +14 | # Strip parentheses from inner generators. +15 | list((2 * x for x in range(3))) + - list(((2 * x for x in range(3)))) +16 + [2 * x for x in range(3)] +17 | list((((2 * x for x in range(3))))) +18 | +19 | # Account for trailing comma in fix +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite as a list comprehension) --> C400.py:17:1 @@ -146,16 +140,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension) 19 | # Account for trailing comma in fix | help: Rewrite as a list comprehension - -ℹ Unsafe fix -14 14 | # Strip parentheses from inner generators. -15 15 | list((2 * x for x in range(3))) -16 16 | list(((2 * x for x in range(3)))) -17 |-list((((2 * x for x in range(3))))) - 17 |+[2 * x for x in range(3)] -18 18 | -19 19 | # Account for trailing comma in fix -20 20 | # See https://github.com/astral-sh/ruff/issues/15852 +14 | # Strip parentheses from inner generators. +15 | list((2 * x for x in range(3))) +16 | list(((2 * x for x in range(3)))) + - list((((2 * x for x in range(3))))) +17 + [2 * x for x in range(3)] +18 | +19 | # Account for trailing comma in fix +20 | # See https://github.com/astral-sh/ruff/issues/15852 +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite as a list comprehension) --> C400.py:21:1 @@ -168,16 +161,15 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension) 23 | (0 for _ in []) | help: Rewrite as a list comprehension - -ℹ Unsafe fix -18 18 | -19 19 | # Account for trailing comma in fix -20 20 | # See https://github.com/astral-sh/ruff/issues/15852 -21 |-list((0 for _ in []),) - 21 |+[0 for _ in []] -22 22 | list( -23 23 | (0 for _ in []) -24 24 | # some comments +18 | +19 | # Account for trailing comma in fix +20 | # See https://github.com/astral-sh/ruff/issues/15852 + - list((0 for _ in []),) +21 + [0 for _ in []] +22 | list( +23 | (0 for _ in []) +24 | # some comments +note: This is an unsafe fix and may change runtime behavior C400 [*] Unnecessary generator (rewrite as a list comprehension) --> C400.py:22:1 @@ -193,20 +185,19 @@ C400 [*] Unnecessary generator (rewrite as a list comprehension) | |__^ | help: Rewrite as a list comprehension - -ℹ Unsafe fix -19 19 | # Account for trailing comma in fix -20 20 | # See https://github.com/astral-sh/ruff/issues/15852 -21 21 | list((0 for _ in []),) -22 |-list( -23 |- (0 for _ in []) - 22 |+[ - 23 |+ 0 for _ in [] -24 24 | # some comments -25 |- , -26 |- # some more -27 |- ) - 25 |+ ] -28 26 | -29 27 | -30 28 | # Not built-in list. +19 | # Account for trailing comma in fix +20 | # See https://github.com/astral-sh/ruff/issues/15852 +21 | list((0 for _ in []),) + - list( + - (0 for _ in []) +22 + [ +23 + 0 for _ in [] +24 | # some comments + - , + - # some more + - ) +25 + ] +26 | +27 | +28 | # Not built-in list. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap index 32db38fff8..64851d0563 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C401_C401.py.snap @@ -11,14 +11,13 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 4 | 2 * x + 1 for x in range(3) | help: Rewrite as a set comprehension - -ℹ Unsafe fix -1 1 | # Cannot combine with C416. Should use set comprehension here. -2 |-even_nums = set(2 * x for x in range(3)) - 2 |+even_nums = {2 * x for x in range(3)} -3 3 | odd_nums = set( -4 4 | 2 * x + 1 for x in range(3) -5 5 | ) +1 | # Cannot combine with C416. Should use set comprehension here. + - even_nums = set(2 * x for x in range(3)) +2 + even_nums = {2 * x for x in range(3)} +3 | odd_nums = set( +4 | 2 * x + 1 for x in range(3) +5 | ) +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:3:12 @@ -33,18 +32,17 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 6 | small_nums = f"{set(a if a < 6 else 0 for a in range(3))}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -1 1 | # Cannot combine with C416. Should use set comprehension here. -2 2 | even_nums = set(2 * x for x in range(3)) -3 |-odd_nums = set( - 3 |+odd_nums = { -4 4 | 2 * x + 1 for x in range(3) -5 |-) - 5 |+} -6 6 | small_nums = f"{set(a if a < 6 else 0 for a in range(3))}" -7 7 | -8 8 | def f(x): +1 | # Cannot combine with C416. Should use set comprehension here. +2 | even_nums = set(2 * x for x in range(3)) + - odd_nums = set( +3 + odd_nums = { +4 | 2 * x + 1 for x in range(3) + - ) +5 + } +6 | small_nums = f"{set(a if a < 6 else 0 for a in range(3))}" +7 | +8 | def f(x): +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:6:17 @@ -57,16 +55,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 8 | def f(x): | help: Rewrite as a set comprehension - -ℹ Unsafe fix -3 3 | odd_nums = set( -4 4 | 2 * x + 1 for x in range(3) -5 5 | ) -6 |-small_nums = f"{set(a if a < 6 else 0 for a in range(3))}" - 6 |+small_nums = f"{ {a if a < 6 else 0 for a in range(3)} }" -7 7 | -8 8 | def f(x): -9 9 | return x +3 | odd_nums = set( +4 | 2 * x + 1 for x in range(3) +5 | ) + - small_nums = f"{set(a if a < 6 else 0 for a in range(3))}" +6 + small_nums = f"{ {a if a < 6 else 0 for a in range(3)} }" +7 | +8 | def f(x): +9 | return x +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:11:16 @@ -78,16 +75,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 12 | print(f"Hello { set(f(a) for a in 'abc') } World") | help: Rewrite as a set comprehension - -ℹ Unsafe fix -8 8 | def f(x): -9 9 | return x -10 10 | -11 |-print(f"Hello {set(f(a) for a in 'abc')} World") - 11 |+print(f"Hello { {f(a) for a in 'abc'} } World") -12 12 | print(f"Hello { set(f(a) for a in 'abc') } World") -13 13 | -14 14 | +8 | def f(x): +9 | return x +10 | + - print(f"Hello {set(f(a) for a in 'abc')} World") +11 + print(f"Hello { {f(a) for a in 'abc'} } World") +12 | print(f"Hello { set(f(a) for a in 'abc') } World") +13 | +14 | +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:12:17 @@ -97,16 +93,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite as a set comprehension - -ℹ Unsafe fix -9 9 | return x -10 10 | -11 11 | print(f"Hello {set(f(a) for a in 'abc')} World") -12 |-print(f"Hello { set(f(a) for a in 'abc') } World") - 12 |+print(f"Hello { {f(a) for a in 'abc'} } World") -13 13 | -14 14 | -15 15 | # Short-circuit case, combine with C416 and should produce x = set(range(3)) +9 | return x +10 | +11 | print(f"Hello {set(f(a) for a in 'abc')} World") + - print(f"Hello { set(f(a) for a in 'abc') } World") +12 + print(f"Hello { {f(a) for a in 'abc'} } World") +13 | +14 | +15 | # Short-circuit case, combine with C416 and should produce x = set(range(3)) +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:16:5 @@ -118,16 +113,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 18 | x for x in range(3) | help: Rewrite using `set()` - -ℹ Unsafe fix -13 13 | -14 14 | -15 15 | # Short-circuit case, combine with C416 and should produce x = set(range(3)) -16 |-x = set(x for x in range(3)) - 16 |+x = set(range(3)) -17 17 | x = set( -18 18 | x for x in range(3) -19 19 | ) +13 | +14 | +15 | # Short-circuit case, combine with C416 and should produce x = set(range(3)) + - x = set(x for x in range(3)) +16 + x = set(range(3)) +17 | x = set( +18 | x for x in range(3) +19 | ) +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:17:5 @@ -143,18 +137,17 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") | help: Rewrite using `set()` - -ℹ Unsafe fix -14 14 | -15 15 | # Short-circuit case, combine with C416 and should produce x = set(range(3)) -16 16 | x = set(x for x in range(3)) -17 |-x = set( -18 |- x for x in range(3) -19 |-) - 17 |+x = set(range(3)) -20 18 | print(f"Hello {set(a for a in range(3))} World") -21 19 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") -22 20 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +14 | +15 | # Short-circuit case, combine with C416 and should produce x = set(range(3)) +16 | x = set(x for x in range(3)) + - x = set( + - x for x in range(3) + - ) +17 + x = set(range(3)) +18 | print(f"Hello {set(a for a in range(3))} World") +19 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") +20 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:20:16 @@ -167,16 +160,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") | help: Rewrite using `set()` - -ℹ Unsafe fix -17 17 | x = set( -18 18 | x for x in range(3) -19 19 | ) -20 |-print(f"Hello {set(a for a in range(3))} World") - 20 |+print(f"Hello {set(range(3))} World") -21 21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") -22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") -23 23 | +17 | x = set( +18 | x for x in range(3) +19 | ) + - print(f"Hello {set(a for a in range(3))} World") +20 + print(f"Hello {set(range(3))} World") +21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") +22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +23 | +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:21:10 @@ -188,16 +180,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") | help: Rewrite using `set()` - -ℹ Unsafe fix -18 18 | x for x in range(3) -19 19 | ) -20 20 | print(f"Hello {set(a for a in range(3))} World") -21 |-print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") - 21 |+print(f"{set('abc') - set(a for a in 'ab')}") -22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") -23 23 | -24 24 | # Strip parentheses from inner generators. +18 | x for x in range(3) +19 | ) +20 | print(f"Hello {set(a for a in range(3))} World") + - print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") +21 + print(f"{set('abc') - set(a for a in 'ab')}") +22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +23 | +24 | # Strip parentheses from inner generators. +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:21:34 @@ -209,16 +200,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") | help: Rewrite using `set()` - -ℹ Unsafe fix -18 18 | x for x in range(3) -19 19 | ) -20 20 | print(f"Hello {set(a for a in range(3))} World") -21 |-print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") - 21 |+print(f"{set(a for a in 'abc') - set('ab')}") -22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") -23 23 | -24 24 | # Strip parentheses from inner generators. +18 | x for x in range(3) +19 | ) +20 | print(f"Hello {set(a for a in range(3))} World") + - print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") +21 + print(f"{set(a for a in 'abc') - set('ab')}") +22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +23 | +24 | # Strip parentheses from inner generators. +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:22:11 @@ -231,16 +221,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 24 | # Strip parentheses from inner generators. | help: Rewrite using `set()` - -ℹ Unsafe fix -19 19 | ) -20 20 | print(f"Hello {set(a for a in range(3))} World") -21 21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") -22 |-print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") - 22 |+print(f"{ set('abc') - set(a for a in 'ab') }") -23 23 | -24 24 | # Strip parentheses from inner generators. -25 25 | set((2 * x for x in range(3))) +19 | ) +20 | print(f"Hello {set(a for a in range(3))} World") +21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") + - print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +22 + print(f"{ set('abc') - set(a for a in 'ab') }") +23 | +24 | # Strip parentheses from inner generators. +25 | set((2 * x for x in range(3))) +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:22:35 @@ -253,16 +242,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 24 | # Strip parentheses from inner generators. | help: Rewrite using `set()` - -ℹ Unsafe fix -19 19 | ) -20 20 | print(f"Hello {set(a for a in range(3))} World") -21 21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") -22 |-print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") - 22 |+print(f"{ set(a for a in 'abc') - set('ab') }") -23 23 | -24 24 | # Strip parentheses from inner generators. -25 25 | set((2 * x for x in range(3))) +19 | ) +20 | print(f"Hello {set(a for a in range(3))} World") +21 | print(f"{set(a for a in 'abc') - set(a for a in 'ab')}") + - print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +22 + print(f"{ set(a for a in 'abc') - set('ab') }") +23 | +24 | # Strip parentheses from inner generators. +25 | set((2 * x for x in range(3))) +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:25:1 @@ -274,16 +262,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 27 | set((((2 * x for x in range(3))))) | help: Rewrite as a set comprehension - -ℹ Unsafe fix -22 22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") -23 23 | -24 24 | # Strip parentheses from inner generators. -25 |-set((2 * x for x in range(3))) - 25 |+{2 * x for x in range(3)} -26 26 | set(((2 * x for x in range(3)))) -27 27 | set((((2 * x for x in range(3))))) -28 28 | +22 | print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }") +23 | +24 | # Strip parentheses from inner generators. + - set((2 * x for x in range(3))) +25 + {2 * x for x in range(3)} +26 | set(((2 * x for x in range(3)))) +27 | set((((2 * x for x in range(3))))) +28 | +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:26:1 @@ -295,16 +282,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 27 | set((((2 * x for x in range(3))))) | help: Rewrite as a set comprehension - -ℹ Unsafe fix -23 23 | -24 24 | # Strip parentheses from inner generators. -25 25 | set((2 * x for x in range(3))) -26 |-set(((2 * x for x in range(3)))) - 26 |+{2 * x for x in range(3)} -27 27 | set((((2 * x for x in range(3))))) -28 28 | -29 29 | # Account for trailing comma in fix +23 | +24 | # Strip parentheses from inner generators. +25 | set((2 * x for x in range(3))) + - set(((2 * x for x in range(3)))) +26 + {2 * x for x in range(3)} +27 | set((((2 * x for x in range(3))))) +28 | +29 | # Account for trailing comma in fix +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:27:1 @@ -317,16 +303,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 29 | # Account for trailing comma in fix | help: Rewrite as a set comprehension - -ℹ Unsafe fix -24 24 | # Strip parentheses from inner generators. -25 25 | set((2 * x for x in range(3))) -26 26 | set(((2 * x for x in range(3)))) -27 |-set((((2 * x for x in range(3))))) - 27 |+{2 * x for x in range(3)} -28 28 | -29 29 | # Account for trailing comma in fix -30 30 | # See https://github.com/astral-sh/ruff/issues/15852 +24 | # Strip parentheses from inner generators. +25 | set((2 * x for x in range(3))) +26 | set(((2 * x for x in range(3)))) + - set((((2 * x for x in range(3))))) +27 + {2 * x for x in range(3)} +28 | +29 | # Account for trailing comma in fix +30 | # See https://github.com/astral-sh/ruff/issues/15852 +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:31:1 @@ -339,16 +324,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 33 | (0 for _ in []) | help: Rewrite as a set comprehension - -ℹ Unsafe fix -28 28 | -29 29 | # Account for trailing comma in fix -30 30 | # See https://github.com/astral-sh/ruff/issues/15852 -31 |-set((0 for _ in []),) - 31 |+{0 for _ in []} -32 32 | set( -33 33 | (0 for _ in []) -34 34 | # some comments +28 | +29 | # Account for trailing comma in fix +30 | # See https://github.com/astral-sh/ruff/issues/15852 + - set((0 for _ in []),) +31 + {0 for _ in []} +32 | set( +33 | (0 for _ in []) +34 | # some comments +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:32:1 @@ -366,23 +350,22 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 39 | # t-strings | help: Rewrite as a set comprehension - -ℹ Unsafe fix -29 29 | # Account for trailing comma in fix -30 30 | # See https://github.com/astral-sh/ruff/issues/15852 -31 31 | set((0 for _ in []),) -32 |-set( -33 |- (0 for _ in []) - 32 |+{ - 33 |+ 0 for _ in [] -34 34 | # some comments -35 |- , -36 |- # some more -37 |-) - 35 |+ } -38 36 | -39 37 | # t-strings -40 38 | print(t"Hello {set(f(a) for a in 'abc')} World") +29 | # Account for trailing comma in fix +30 | # See https://github.com/astral-sh/ruff/issues/15852 +31 | set((0 for _ in []),) + - set( + - (0 for _ in []) +32 + { +33 + 0 for _ in [] +34 | # some comments + - , + - # some more + - ) +35 + } +36 | +37 | # t-strings +38 | print(t"Hello {set(f(a) for a in 'abc')} World") +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:40:16 @@ -394,16 +377,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -37 37 | ) -38 38 | -39 39 | # t-strings -40 |-print(t"Hello {set(f(a) for a in 'abc')} World") - 40 |+print(t"Hello { {f(a) for a in 'abc'} } World") -41 41 | print(t"Hello { set(f(a) for a in 'abc') } World") -42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" -43 43 | print(t"Hello {set(a for a in range(3))} World") +37 | ) +38 | +39 | # t-strings + - print(t"Hello {set(f(a) for a in 'abc')} World") +40 + print(t"Hello { {f(a) for a in 'abc'} } World") +41 | print(t"Hello { set(f(a) for a in 'abc') } World") +42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" +43 | print(t"Hello {set(a for a in range(3))} World") +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:41:17 @@ -416,16 +398,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 43 | print(t"Hello {set(a for a in range(3))} World") | help: Rewrite as a set comprehension - -ℹ Unsafe fix -38 38 | -39 39 | # t-strings -40 40 | print(t"Hello {set(f(a) for a in 'abc')} World") -41 |-print(t"Hello { set(f(a) for a in 'abc') } World") - 41 |+print(t"Hello { {f(a) for a in 'abc'} } World") -42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" -43 43 | print(t"Hello {set(a for a in range(3))} World") -44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") +38 | +39 | # t-strings +40 | print(t"Hello {set(f(a) for a in 'abc')} World") + - print(t"Hello { set(f(a) for a in 'abc') } World") +41 + print(t"Hello { {f(a) for a in 'abc'} } World") +42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" +43 | print(t"Hello {set(a for a in range(3))} World") +44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite as a set comprehension) --> C401.py:42:17 @@ -438,16 +419,15 @@ C401 [*] Unnecessary generator (rewrite as a set comprehension) 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") | help: Rewrite as a set comprehension - -ℹ Unsafe fix -39 39 | # t-strings -40 40 | print(t"Hello {set(f(a) for a in 'abc')} World") -41 41 | print(t"Hello { set(f(a) for a in 'abc') } World") -42 |-small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" - 42 |+small_nums = t"{ {a if a < 6 else 0 for a in range(3)} }" -43 43 | print(t"Hello {set(a for a in range(3))} World") -44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") -45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") +39 | # t-strings +40 | print(t"Hello {set(f(a) for a in 'abc')} World") +41 | print(t"Hello { set(f(a) for a in 'abc') } World") + - small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" +42 + small_nums = t"{ {a if a < 6 else 0 for a in range(3)} }" +43 | print(t"Hello {set(a for a in range(3))} World") +44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") +45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:43:16 @@ -460,16 +440,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") | help: Rewrite using `set()` - -ℹ Unsafe fix -40 40 | print(t"Hello {set(f(a) for a in 'abc')} World") -41 41 | print(t"Hello { set(f(a) for a in 'abc') } World") -42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" -43 |-print(t"Hello {set(a for a in range(3))} World") - 43 |+print(t"Hello {set(range(3))} World") -44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") -45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") -46 46 | +40 | print(t"Hello {set(f(a) for a in 'abc')} World") +41 | print(t"Hello { set(f(a) for a in 'abc') } World") +42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" + - print(t"Hello {set(a for a in range(3))} World") +43 + print(t"Hello {set(range(3))} World") +44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") +45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") +46 | +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:44:10 @@ -481,16 +460,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") | help: Rewrite using `set()` - -ℹ Unsafe fix -41 41 | print(t"Hello { set(f(a) for a in 'abc') } World") -42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" -43 43 | print(t"Hello {set(a for a in range(3))} World") -44 |-print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") - 44 |+print(t"{set('abc') - set(a for a in 'ab')}") -45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") -46 46 | -47 47 | +41 | print(t"Hello { set(f(a) for a in 'abc') } World") +42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" +43 | print(t"Hello {set(a for a in range(3))} World") + - print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") +44 + print(t"{set('abc') - set(a for a in 'ab')}") +45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") +46 | +47 | +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:44:34 @@ -502,16 +480,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") | help: Rewrite using `set()` - -ℹ Unsafe fix -41 41 | print(t"Hello { set(f(a) for a in 'abc') } World") -42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" -43 43 | print(t"Hello {set(a for a in range(3))} World") -44 |-print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") - 44 |+print(t"{set(a for a in 'abc') - set('ab')}") -45 45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") -46 46 | -47 47 | +41 | print(t"Hello { set(f(a) for a in 'abc') } World") +42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" +43 | print(t"Hello {set(a for a in range(3))} World") + - print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") +44 + print(t"{set(a for a in 'abc') - set('ab')}") +45 | print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") +46 | +47 | +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:45:11 @@ -522,16 +499,15 @@ C401 [*] Unnecessary generator (rewrite using `set()`) | ^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite using `set()` - -ℹ Unsafe fix -42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" -43 43 | print(t"Hello {set(a for a in range(3))} World") -44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") -45 |-print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") - 45 |+print(t"{ set('abc') - set(a for a in 'ab') }") -46 46 | -47 47 | -48 48 | # Not built-in set. +42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" +43 | print(t"Hello {set(a for a in range(3))} World") +44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") + - print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") +45 + print(t"{ set('abc') - set(a for a in 'ab') }") +46 | +47 | +48 | # Not built-in set. +note: This is an unsafe fix and may change runtime behavior C401 [*] Unnecessary generator (rewrite using `set()`) --> C401.py:45:35 @@ -542,13 +518,12 @@ C401 [*] Unnecessary generator (rewrite using `set()`) | ^^^^^^^^^^^^^^^^^^^^ | help: Rewrite using `set()` - -ℹ Unsafe fix -42 42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" -43 43 | print(t"Hello {set(a for a in range(3))} World") -44 44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") -45 |-print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") - 45 |+print(t"{ set(a for a in 'abc') - set('ab') }") -46 46 | -47 47 | -48 48 | # Not built-in set. +42 | small_nums = t"{set(a if a < 6 else 0 for a in range(3))}" +43 | print(t"Hello {set(a for a in range(3))} World") +44 | print(t"{set(a for a in 'abc') - set(a for a in 'ab')}") + - print(t"{ set(a for a in 'abc') - set(a for a in 'ab') }") +45 + print(t"{ set(a for a in 'abc') - set('ab') }") +46 | +47 | +48 | # Not built-in set. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap index 749545c7fc..38cda40530 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C402_C402.py.snap @@ -10,13 +10,12 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 3 | (x, x) for x in range(3) | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -1 |-dict((x, x) for x in range(3)) - 1 |+{x: x for x in range(3)} -2 2 | dict( -3 3 | (x, x) for x in range(3) -4 4 | ) + - dict((x, x) for x in range(3)) +1 + {x: x for x in range(3)} +2 | dict( +3 | (x, x) for x in range(3) +4 | ) +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:2:1 @@ -30,18 +29,17 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 6 | y = f'{dict((x, x) for x in range(3))}' | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -1 1 | dict((x, x) for x in range(3)) -2 |-dict( -3 |- (x, x) for x in range(3) -4 |-) - 2 |+{ - 3 |+ x: x for x in range(3) - 4 |+} -5 5 | dict(((x, x) for x in range(3)), z=3) -6 6 | y = f'{dict((x, x) for x in range(3))}' -7 7 | print(f'Hello {dict((x, x) for x in range(3))} World') +1 | dict((x, x) for x in range(3)) + - dict( + - (x, x) for x in range(3) + - ) +2 + { +3 + x: x for x in range(3) +4 + } +5 | dict(((x, x) for x in range(3)), z=3) +6 | y = f'{dict((x, x) for x in range(3))}' +7 | print(f'Hello {dict((x, x) for x in range(3))} World') +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:6:8 @@ -54,16 +52,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 8 | print(f"Hello {dict((x, x) for x in 'abc')} World") | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -3 3 | (x, x) for x in range(3) -4 4 | ) -5 5 | dict(((x, x) for x in range(3)), z=3) -6 |-y = f'{dict((x, x) for x in range(3))}' - 6 |+y = f'{ {x: x for x in range(3)} }' -7 7 | print(f'Hello {dict((x, x) for x in range(3))} World') -8 8 | print(f"Hello {dict((x, x) for x in 'abc')} World") -9 9 | print(f'Hello {dict((x, x) for x in "abc")} World') +3 | (x, x) for x in range(3) +4 | ) +5 | dict(((x, x) for x in range(3)), z=3) + - y = f'{dict((x, x) for x in range(3))}' +6 + y = f'{ {x: x for x in range(3)} }' +7 | print(f'Hello {dict((x, x) for x in range(3))} World') +8 | print(f"Hello {dict((x, x) for x in 'abc')} World") +9 | print(f'Hello {dict((x, x) for x in "abc")} World') +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:7:16 @@ -76,16 +73,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 9 | print(f'Hello {dict((x, x) for x in "abc")} World') | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -4 4 | ) -5 5 | dict(((x, x) for x in range(3)), z=3) -6 6 | y = f'{dict((x, x) for x in range(3))}' -7 |-print(f'Hello {dict((x, x) for x in range(3))} World') - 7 |+print(f'Hello { {x: x for x in range(3)} } World') -8 8 | print(f"Hello {dict((x, x) for x in 'abc')} World") -9 9 | print(f'Hello {dict((x, x) for x in "abc")} World') -10 10 | print(f'Hello {dict((x,x) for x in "abc")} World') +4 | ) +5 | dict(((x, x) for x in range(3)), z=3) +6 | y = f'{dict((x, x) for x in range(3))}' + - print(f'Hello {dict((x, x) for x in range(3))} World') +7 + print(f'Hello { {x: x for x in range(3)} } World') +8 | print(f"Hello {dict((x, x) for x in 'abc')} World") +9 | print(f'Hello {dict((x, x) for x in "abc")} World') +10 | print(f'Hello {dict((x,x) for x in "abc")} World') +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:8:16 @@ -98,16 +94,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 10 | print(f'Hello {dict((x,x) for x in "abc")} World') | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -5 5 | dict(((x, x) for x in range(3)), z=3) -6 6 | y = f'{dict((x, x) for x in range(3))}' -7 7 | print(f'Hello {dict((x, x) for x in range(3))} World') -8 |-print(f"Hello {dict((x, x) for x in 'abc')} World") - 8 |+print(f"Hello { {x: x for x in 'abc'} } World") -9 9 | print(f'Hello {dict((x, x) for x in "abc")} World') -10 10 | print(f'Hello {dict((x,x) for x in "abc")} World') -11 11 | +5 | dict(((x, x) for x in range(3)), z=3) +6 | y = f'{dict((x, x) for x in range(3))}' +7 | print(f'Hello {dict((x, x) for x in range(3))} World') + - print(f"Hello {dict((x, x) for x in 'abc')} World") +8 + print(f"Hello { {x: x for x in 'abc'} } World") +9 | print(f'Hello {dict((x, x) for x in "abc")} World') +10 | print(f'Hello {dict((x,x) for x in "abc")} World') +11 | +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:9:16 @@ -119,16 +114,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 10 | print(f'Hello {dict((x,x) for x in "abc")} World') | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -6 6 | y = f'{dict((x, x) for x in range(3))}' -7 7 | print(f'Hello {dict((x, x) for x in range(3))} World') -8 8 | print(f"Hello {dict((x, x) for x in 'abc')} World") -9 |-print(f'Hello {dict((x, x) for x in "abc")} World') - 9 |+print(f'Hello { {x: x for x in "abc"} } World') -10 10 | print(f'Hello {dict((x,x) for x in "abc")} World') -11 11 | -12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' +6 | y = f'{dict((x, x) for x in range(3))}' +7 | print(f'Hello {dict((x, x) for x in range(3))} World') +8 | print(f"Hello {dict((x, x) for x in 'abc')} World") + - print(f'Hello {dict((x, x) for x in "abc")} World') +9 + print(f'Hello { {x: x for x in "abc"} } World') +10 | print(f'Hello {dict((x,x) for x in "abc")} World') +11 | +12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:10:16 @@ -141,16 +135,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -7 7 | print(f'Hello {dict((x, x) for x in range(3))} World') -8 8 | print(f"Hello {dict((x, x) for x in 'abc')} World") -9 9 | print(f'Hello {dict((x, x) for x in "abc")} World') -10 |-print(f'Hello {dict((x,x) for x in "abc")} World') - 10 |+print(f'Hello { {x: x for x in "abc"} } World') -11 11 | -12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' -13 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' +7 | print(f'Hello {dict((x, x) for x in range(3))} World') +8 | print(f"Hello {dict((x, x) for x in 'abc')} World") +9 | print(f'Hello {dict((x, x) for x in "abc")} World') + - print(f'Hello {dict((x,x) for x in "abc")} World') +10 + print(f'Hello { {x: x for x in "abc"} } World') +11 | +12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' +13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:12:4 @@ -162,16 +155,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -9 9 | print(f'Hello {dict((x, x) for x in "abc")} World') -10 10 | print(f'Hello {dict((x,x) for x in "abc")} World') -11 11 | -12 |-f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' - 12 |+f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3))}' -13 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' -14 14 | -15 15 | def f(x): +9 | print(f'Hello {dict((x, x) for x in "abc")} World') +10 | print(f'Hello {dict((x,x) for x in "abc")} World') +11 | + - f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' +12 + f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3))}' +13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' +14 | +15 | def f(x): +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:12:37 @@ -183,16 +175,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -9 9 | print(f'Hello {dict((x, x) for x in "abc")} World') -10 10 | print(f'Hello {dict((x,x) for x in "abc")} World') -11 11 | -12 |-f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' - 12 |+f'{dict((x, x) for x in range(3)) | {x: x for x in range(3)} }' -13 13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' -14 14 | -15 15 | def f(x): +9 | print(f'Hello {dict((x, x) for x in "abc")} World') +10 | print(f'Hello {dict((x,x) for x in "abc")} World') +11 | + - f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' +12 + f'{dict((x, x) for x in range(3)) | {x: x for x in range(3)} }' +13 | f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' +14 | +15 | def f(x): +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:13:5 @@ -204,16 +195,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 15 | def f(x): | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -10 10 | print(f'Hello {dict((x,x) for x in "abc")} World') -11 11 | -12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' -13 |-f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' - 13 |+f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3)) }' -14 14 | -15 15 | def f(x): -16 16 | return x +10 | print(f'Hello {dict((x,x) for x in "abc")} World') +11 | +12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' + - f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' +13 + f'{ {x: x for x in range(3)} | dict((x, x) for x in range(3)) }' +14 | +15 | def f(x): +16 | return x +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:13:38 @@ -225,16 +215,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 15 | def f(x): | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -10 10 | print(f'Hello {dict((x,x) for x in "abc")} World') -11 11 | -12 12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' -13 |-f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' - 13 |+f'{ dict((x, x) for x in range(3)) | {x: x for x in range(3)} }' -14 14 | -15 15 | def f(x): -16 16 | return x +10 | print(f'Hello {dict((x,x) for x in "abc")} World') +11 | +12 | f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}' + - f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }' +13 + f'{ dict((x, x) for x in range(3)) | {x: x for x in range(3)} }' +14 | +15 | def f(x): +16 | return x +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:18:16 @@ -247,16 +236,15 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086 | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -15 15 | def f(x): -16 16 | return x -17 17 | -18 |-print(f'Hello {dict((x,f(x)) for x in "abc")} World') - 18 |+print(f'Hello { {x: f(x) for x in "abc"} } World') -19 19 | -20 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086 -21 21 | dict((k,v)for k,v in d.iteritems() if k in only_args) +15 | def f(x): +16 | return x +17 | + - print(f'Hello {dict((x,f(x)) for x in "abc")} World') +18 + print(f'Hello { {x: f(x) for x in "abc"} } World') +19 | +20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086 +21 | dict((k,v)for k,v in d.iteritems() if k in only_args) +note: This is an unsafe fix and may change runtime behavior C402 [*] Unnecessary generator (rewrite as a dict comprehension) --> C402.py:21:1 @@ -268,13 +256,12 @@ C402 [*] Unnecessary generator (rewrite as a dict comprehension) 23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940 | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -18 18 | print(f'Hello {dict((x,f(x)) for x in "abc")} World') -19 19 | -20 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086 -21 |-dict((k,v)for k,v in d.iteritems() if k in only_args) - 21 |+{k: v for k,v in d.iteritems() if k in only_args} -22 22 | -23 23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940 -24 24 | dict((*v, k) for k, v in enumerate(calendar.month_abbr)) +18 | print(f'Hello {dict((x,f(x)) for x in "abc")} World') +19 | +20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086 + - dict((k,v)for k,v in d.iteritems() if k in only_args) +21 + {k: v for k,v in d.iteritems() if k in only_args} +22 | +23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940 +24 | dict((*v, k) for k, v in enumerate(calendar.month_abbr)) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap index 531b3168cf..f6e5ec6c53 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C403_C403.py.snap @@ -10,13 +10,12 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 3 | [x for x in range(3)] | help: Rewrite as a set comprehension - -ℹ Unsafe fix -1 |-s = set([x for x in range(3)]) - 1 |+s = {x for x in range(3)} -2 2 | s = set( -3 3 | [x for x in range(3)] -4 4 | ) + - s = set([x for x in range(3)]) +1 + s = {x for x in range(3)} +2 | s = set( +3 | [x for x in range(3)] +4 | ) +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:2:5 @@ -31,18 +30,17 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 6 | s = f"{set([x for x in 'ab'])}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -1 1 | s = set([x for x in range(3)]) -2 |-s = set( -3 |- [x for x in range(3)] -4 |-) - 2 |+s = { - 3 |+ x for x in range(3) - 4 |+} -5 5 | -6 6 | s = f"{set([x for x in 'ab'])}" -7 7 | s = f'{set([x for x in "ab"])}' +1 | s = set([x for x in range(3)]) + - s = set( + - [x for x in range(3)] + - ) +2 + s = { +3 + x for x in range(3) +4 + } +5 | +6 | s = f"{set([x for x in 'ab'])}" +7 | s = f'{set([x for x in "ab"])}' +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:6:8 @@ -54,16 +52,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 7 | s = f'{set([x for x in "ab"])}' | help: Rewrite as a set comprehension - -ℹ Unsafe fix -3 3 | [x for x in range(3)] -4 4 | ) -5 5 | -6 |-s = f"{set([x for x in 'ab'])}" - 6 |+s = f"{ {x for x in 'ab'} }" -7 7 | s = f'{set([x for x in "ab"])}' -8 8 | -9 9 | def f(x): +3 | [x for x in range(3)] +4 | ) +5 | + - s = f"{set([x for x in 'ab'])}" +6 + s = f"{ {x for x in 'ab'} }" +7 | s = f'{set([x for x in "ab"])}' +8 | +9 | def f(x): +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:7:8 @@ -75,16 +72,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 9 | def f(x): | help: Rewrite as a set comprehension - -ℹ Unsafe fix -4 4 | ) -5 5 | -6 6 | s = f"{set([x for x in 'ab'])}" -7 |-s = f'{set([x for x in "ab"])}' - 7 |+s = f'{ {x for x in "ab"} }' -8 8 | -9 9 | def f(x): -10 10 | return x +4 | ) +5 | +6 | s = f"{set([x for x in 'ab'])}" + - s = f'{set([x for x in "ab"])}' +7 + s = f'{ {x for x in "ab"} }' +8 | +9 | def f(x): +10 | return x +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:12:8 @@ -97,16 +93,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -9 9 | def f(x): -10 10 | return x -11 11 | -12 |-s = f"{set([f(x) for x in 'ab'])}" - 12 |+s = f"{ {f(x) for x in 'ab'} }" -13 13 | -14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" -15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +9 | def f(x): +10 | return x +11 | + - s = f"{set([f(x) for x in 'ab'])}" +12 + s = f"{ {f(x) for x in 'ab'} }" +13 | +14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" +15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:14:9 @@ -118,16 +113,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -11 11 | -12 12 | s = f"{set([f(x) for x in 'ab'])}" -13 13 | -14 |-s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" - 14 |+s = f"{ {x for x in 'ab'} | set([x for x in 'ab']) }" -15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" -16 16 | -17 17 | s = set( # comment +11 | +12 | s = f"{set([f(x) for x in 'ab'])}" +13 | + - s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" +14 + s = f"{ {x for x in 'ab'} | set([x for x in 'ab']) }" +15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +16 | +17 | s = set( # comment +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:14:34 @@ -139,16 +133,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -11 11 | -12 12 | s = f"{set([f(x) for x in 'ab'])}" -13 13 | -14 |-s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" - 14 |+s = f"{ set([x for x in 'ab']) | {x for x in 'ab'} }" -15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" -16 16 | -17 17 | s = set( # comment +11 | +12 | s = f"{set([f(x) for x in 'ab'])}" +13 | + - s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" +14 + s = f"{ set([x for x in 'ab']) | {x for x in 'ab'} }" +15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +16 | +17 | s = set( # comment +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:15:8 @@ -160,16 +153,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 17 | s = set( # comment | help: Rewrite as a set comprehension - -ℹ Unsafe fix -12 12 | s = f"{set([f(x) for x in 'ab'])}" -13 13 | -14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" -15 |-s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" - 15 |+s = f"{ {x for x in 'ab'} | set([x for x in 'ab'])}" -16 16 | -17 17 | s = set( # comment -18 18 | [x for x in range(3)] +12 | s = f"{set([f(x) for x in 'ab'])}" +13 | +14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" + - s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +15 + s = f"{ {x for x in 'ab'} | set([x for x in 'ab'])}" +16 | +17 | s = set( # comment +18 | [x for x in range(3)] +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:15:33 @@ -181,16 +173,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 17 | s = set( # comment | help: Rewrite as a set comprehension - -ℹ Unsafe fix -12 12 | s = f"{set([f(x) for x in 'ab'])}" -13 13 | -14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" -15 |-s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" - 15 |+s = f"{set([x for x in 'ab']) | {x for x in 'ab'} }" -16 16 | -17 17 | s = set( # comment -18 18 | [x for x in range(3)] +12 | s = f"{set([f(x) for x in 'ab'])}" +13 | +14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" + - s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +15 + s = f"{set([x for x in 'ab']) | {x for x in 'ab'} }" +16 | +17 | s = set( # comment +18 | [x for x in range(3)] +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:17:5 @@ -206,20 +197,19 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 21 | s = set([ # comment | help: Rewrite as a set comprehension - -ℹ Unsafe fix -14 14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" -15 15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" -16 16 | -17 |-s = set( # comment -18 |- [x for x in range(3)] -19 |-) - 17 |+s = { # comment - 18 |+ x for x in range(3) - 19 |+} -20 20 | -21 21 | s = set([ # comment -22 22 | x for x in range(3) +14 | s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" +15 | s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +16 | + - s = set( # comment + - [x for x in range(3)] + - ) +17 + s = { # comment +18 + x for x in range(3) +19 + } +20 | +21 | s = set([ # comment +22 | x for x in range(3) +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:21:5 @@ -235,19 +225,18 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 25 | s = set(([x for x in range(3)])) | help: Rewrite as a set comprehension - -ℹ Unsafe fix -18 18 | [x for x in range(3)] -19 19 | ) -20 20 | -21 |-s = set([ # comment - 21 |+s = { # comment -22 22 | x for x in range(3) -23 |-]) - 23 |+} -24 24 | -25 25 | s = set(([x for x in range(3)])) -26 26 | +18 | [x for x in range(3)] +19 | ) +20 | + - s = set([ # comment +21 + s = { # comment +22 | x for x in range(3) + - ]) +23 + } +24 | +25 | s = set(([x for x in range(3)])) +26 | +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:25:5 @@ -260,16 +249,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 27 | s = set(((([x for x in range(3)])))) | help: Rewrite as a set comprehension - -ℹ Unsafe fix -22 22 | x for x in range(3) -23 23 | ]) -24 24 | -25 |-s = set(([x for x in range(3)])) - 25 |+s = {x for x in range(3)} -26 26 | -27 27 | s = set(((([x for x in range(3)])))) -28 28 | +22 | x for x in range(3) +23 | ]) +24 | + - s = set(([x for x in range(3)])) +25 + s = {x for x in range(3)} +26 | +27 | s = set(((([x for x in range(3)])))) +28 | +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:27:5 @@ -282,16 +270,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 29 | s = set( # outer set comment | help: Rewrite as a set comprehension - -ℹ Unsafe fix -24 24 | -25 25 | s = set(([x for x in range(3)])) -26 26 | -27 |-s = set(((([x for x in range(3)])))) - 27 |+s = {x for x in range(3)} -28 28 | -29 29 | s = set( # outer set comment -30 30 | ( # inner paren comment - not preserved +24 | +25 | s = set(([x for x in range(3)])) +26 | + - s = set(((([x for x in range(3)])))) +27 + s = {x for x in range(3)} +28 | +29 | s = set( # outer set comment +30 | ( # inner paren comment - not preserved +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:29:5 @@ -310,23 +297,22 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 36 | # Test trailing comma case | help: Rewrite as a set comprehension - -ℹ Unsafe fix -26 26 | -27 27 | s = set(((([x for x in range(3)])))) -28 28 | -29 |-s = set( # outer set comment -30 |-( # inner paren comment - not preserved -31 |-(( -32 |-[ # comprehension comment -33 |- x for x in range(3)] -34 |- )))) - 29 |+s = { # outer set comment - 30 |+ # comprehension comment - 31 |+ x for x in range(3)} -35 32 | -36 33 | # Test trailing comma case -37 34 | s = set([x for x in range(3)],) +26 | +27 | s = set(((([x for x in range(3)])))) +28 | + - s = set( # outer set comment + - ( # inner paren comment - not preserved + - (( + - [ # comprehension comment + - x for x in range(3)] + - )))) +29 + s = { # outer set comment +30 + # comprehension comment +31 + x for x in range(3)} +32 | +33 | # Test trailing comma case +34 | s = set([x for x in range(3)],) +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:37:5 @@ -338,16 +324,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 39 | s = t"{set([x for x in 'ab'])}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -34 34 | )))) -35 35 | -36 36 | # Test trailing comma case -37 |-s = set([x for x in range(3)],) - 37 |+s = {x for x in range(3)} -38 38 | -39 39 | s = t"{set([x for x in 'ab'])}" -40 40 | s = t'{set([x for x in "ab"])}' +34 | )))) +35 | +36 | # Test trailing comma case + - s = set([x for x in range(3)],) +37 + s = {x for x in range(3)} +38 | +39 | s = t"{set([x for x in 'ab'])}" +40 | s = t'{set([x for x in "ab"])}' +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:39:8 @@ -359,16 +344,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 40 | s = t'{set([x for x in "ab"])}' | help: Rewrite as a set comprehension - -ℹ Unsafe fix -36 36 | # Test trailing comma case -37 37 | s = set([x for x in range(3)],) -38 38 | -39 |-s = t"{set([x for x in 'ab'])}" - 39 |+s = t"{ {x for x in 'ab'} }" -40 40 | s = t'{set([x for x in "ab"])}' -41 41 | -42 42 | def f(x): +36 | # Test trailing comma case +37 | s = set([x for x in range(3)],) +38 | + - s = t"{set([x for x in 'ab'])}" +39 + s = t"{ {x for x in 'ab'} }" +40 | s = t'{set([x for x in "ab"])}' +41 | +42 | def f(x): +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:40:8 @@ -380,16 +364,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 42 | def f(x): | help: Rewrite as a set comprehension - -ℹ Unsafe fix -37 37 | s = set([x for x in range(3)],) -38 38 | -39 39 | s = t"{set([x for x in 'ab'])}" -40 |-s = t'{set([x for x in "ab"])}' - 40 |+s = t'{ {x for x in "ab"} }' -41 41 | -42 42 | def f(x): -43 43 | return x +37 | s = set([x for x in range(3)],) +38 | +39 | s = t"{set([x for x in 'ab'])}" + - s = t'{set([x for x in "ab"])}' +40 + s = t'{ {x for x in "ab"} }' +41 | +42 | def f(x): +43 | return x +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:45:8 @@ -402,16 +385,15 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -42 42 | def f(x): -43 43 | return x -44 44 | -45 |-s = t"{set([f(x) for x in 'ab'])}" - 45 |+s = t"{ {f(x) for x in 'ab'} }" -46 46 | -47 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" -48 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +42 | def f(x): +43 | return x +44 | + - s = t"{set([f(x) for x in 'ab'])}" +45 + s = t"{ {f(x) for x in 'ab'} }" +46 | +47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" +48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:47:9 @@ -423,15 +405,14 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -44 44 | -45 45 | s = t"{set([f(x) for x in 'ab'])}" -46 46 | -47 |-s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" - 47 |+s = t"{ {x for x in 'ab'} | set([x for x in 'ab']) }" -48 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" -49 49 | +44 | +45 | s = t"{set([f(x) for x in 'ab'])}" +46 | + - s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" +47 + s = t"{ {x for x in 'ab'} | set([x for x in 'ab']) }" +48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +49 | +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:47:34 @@ -443,15 +424,14 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" | help: Rewrite as a set comprehension - -ℹ Unsafe fix -44 44 | -45 45 | s = t"{set([f(x) for x in 'ab'])}" -46 46 | -47 |-s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" - 47 |+s = t"{ set([x for x in 'ab']) | {x for x in 'ab'} }" -48 48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" -49 49 | +44 | +45 | s = t"{set([f(x) for x in 'ab'])}" +46 | + - s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" +47 + s = t"{ set([x for x in 'ab']) | {x for x in 'ab'} }" +48 | s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +49 | +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:48:8 @@ -461,14 +441,13 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) | ^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite as a set comprehension - -ℹ Unsafe fix -45 45 | s = t"{set([f(x) for x in 'ab'])}" -46 46 | -47 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" -48 |-s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" - 48 |+s = t"{ {x for x in 'ab'} | set([x for x in 'ab'])}" -49 49 | +45 | s = t"{set([f(x) for x in 'ab'])}" +46 | +47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" + - s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +48 + s = t"{ {x for x in 'ab'} | set([x for x in 'ab'])}" +49 | +note: This is an unsafe fix and may change runtime behavior C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) --> C403.py:48:33 @@ -478,11 +457,10 @@ C403 [*] Unnecessary list comprehension (rewrite as a set comprehension) | ^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite as a set comprehension - -ℹ Unsafe fix -45 45 | s = t"{set([f(x) for x in 'ab'])}" -46 46 | -47 47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" -48 |-s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" - 48 |+s = t"{set([x for x in 'ab']) | {x for x in 'ab'} }" -49 49 | +45 | s = t"{set([f(x) for x in 'ab'])}" +46 | +47 | s = t"{ set([x for x in 'ab']) | set([x for x in 'ab']) }" + - s = t"{set([x for x in 'ab']) | set([x for x in 'ab'])}" +48 + s = t"{set([x for x in 'ab']) | {x for x in 'ab'} }" +49 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap index efc2bb6328..a913b6fbe7 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C404_C404.py.snap @@ -9,13 +9,12 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 2 | dict([(i, i) for i in range(3)], z=4) | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -1 |-dict([(i, i) for i in range(3)]) - 1 |+{i: i for i in range(3)} -2 2 | dict([(i, i) for i in range(3)], z=4) -3 3 | -4 4 | def f(x): + - dict([(i, i) for i in range(3)]) +1 + {i: i for i in range(3)} +2 | dict([(i, i) for i in range(3)], z=4) +3 | +4 | def f(x): +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:7:4 @@ -28,16 +27,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 9 | f"{dict([(s, s) for s in 'ab'])}" | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -4 4 | def f(x): -5 5 | return x -6 6 | -7 |-f'{dict([(s,s) for s in "ab"])}' - 7 |+f'{ {s: s for s in "ab"} }' -8 8 | f"{dict([(s,s) for s in 'ab'])}" -9 9 | f"{dict([(s, s) for s in 'ab'])}" -10 10 | f"{dict([(s,f(s)) for s in 'ab'])}" +4 | def f(x): +5 | return x +6 | + - f'{dict([(s,s) for s in "ab"])}' +7 + f'{ {s: s for s in "ab"} }' +8 | f"{dict([(s,s) for s in 'ab'])}" +9 | f"{dict([(s, s) for s in 'ab'])}" +10 | f"{dict([(s,f(s)) for s in 'ab'])}" +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:8:4 @@ -49,16 +47,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 10 | f"{dict([(s,f(s)) for s in 'ab'])}" | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -5 5 | return x -6 6 | -7 7 | f'{dict([(s,s) for s in "ab"])}' -8 |-f"{dict([(s,s) for s in 'ab'])}" - 8 |+f"{ {s: s for s in 'ab'} }" -9 9 | f"{dict([(s, s) for s in 'ab'])}" -10 10 | f"{dict([(s,f(s)) for s in 'ab'])}" -11 11 | +5 | return x +6 | +7 | f'{dict([(s,s) for s in "ab"])}' + - f"{dict([(s,s) for s in 'ab'])}" +8 + f"{ {s: s for s in 'ab'} }" +9 | f"{dict([(s, s) for s in 'ab'])}" +10 | f"{dict([(s,f(s)) for s in 'ab'])}" +11 | +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:9:4 @@ -70,16 +67,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 10 | f"{dict([(s,f(s)) for s in 'ab'])}" | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -6 6 | -7 7 | f'{dict([(s,s) for s in "ab"])}' -8 8 | f"{dict([(s,s) for s in 'ab'])}" -9 |-f"{dict([(s, s) for s in 'ab'])}" - 9 |+f"{ {s: s for s in 'ab'} }" -10 10 | f"{dict([(s,f(s)) for s in 'ab'])}" -11 11 | -12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' +6 | +7 | f'{dict([(s,s) for s in "ab"])}' +8 | f"{dict([(s,s) for s in 'ab'])}" + - f"{dict([(s, s) for s in 'ab'])}" +9 + f"{ {s: s for s in 'ab'} }" +10 | f"{dict([(s,f(s)) for s in 'ab'])}" +11 | +12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:10:4 @@ -92,16 +88,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -7 7 | f'{dict([(s,s) for s in "ab"])}' -8 8 | f"{dict([(s,s) for s in 'ab'])}" -9 9 | f"{dict([(s, s) for s in 'ab'])}" -10 |-f"{dict([(s,f(s)) for s in 'ab'])}" - 10 |+f"{ {s: f(s) for s in 'ab'} }" -11 11 | -12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' -13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' +7 | f'{dict([(s,s) for s in "ab"])}' +8 | f"{dict([(s,s) for s in 'ab'])}" +9 | f"{dict([(s, s) for s in 'ab'])}" + - f"{dict([(s,f(s)) for s in 'ab'])}" +10 + f"{ {s: f(s) for s in 'ab'} }" +11 | +12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' +13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:12:4 @@ -113,16 +108,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -9 9 | f"{dict([(s, s) for s in 'ab'])}" -10 10 | f"{dict([(s,f(s)) for s in 'ab'])}" -11 11 | -12 |-f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' - 12 |+f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"])}' -13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' -14 14 | -15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 +9 | f"{dict([(s, s) for s in 'ab'])}" +10 | f"{dict([(s,f(s)) for s in 'ab'])}" +11 | + - f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' +12 + f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"])}' +13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' +14 | +15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:12:34 @@ -134,16 +128,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -9 9 | f"{dict([(s, s) for s in 'ab'])}" -10 10 | f"{dict([(s,f(s)) for s in 'ab'])}" -11 11 | -12 |-f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' - 12 |+f'{dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }' -13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' -14 14 | -15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 +9 | f"{dict([(s, s) for s in 'ab'])}" +10 | f"{dict([(s,f(s)) for s in 'ab'])}" +11 | + - f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' +12 + f'{dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }' +13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' +14 | +15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:13:5 @@ -155,16 +148,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -10 10 | f"{dict([(s,f(s)) for s in 'ab'])}" -11 11 | -12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' -13 |-f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' - 13 |+f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"]) }' -14 14 | -15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 -16 16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]])) +10 | f"{dict([(s,f(s)) for s in 'ab'])}" +11 | +12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' + - f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' +13 + f'{ {s: s for s in "ab"} | dict([(s,s) for s in "ab"]) }' +14 | +15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 +16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]])) +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:13:35 @@ -176,16 +168,15 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -10 10 | f"{dict([(s,f(s)) for s in 'ab'])}" -11 11 | -12 12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' -13 |-f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' - 13 |+f'{ dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }' -14 14 | -15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 -16 16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]])) +10 | f"{dict([(s,f(s)) for s in 'ab'])}" +11 | +12 | f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}' + - f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' +13 + f'{ dict([(s,s) for s in "ab"]) | {s: s for s in "ab"} }' +14 | +15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 +16 | saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]])) +note: This is an unsafe fix and may change runtime behavior C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) --> C404.py:16:14 @@ -195,10 +186,9 @@ C404 [*] Unnecessary list comprehension (rewrite as a dict comprehension) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite as a dict comprehension - -ℹ Unsafe fix -13 13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' -14 14 | -15 15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 -16 |-saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]])) - 16 |+saved.append({k: v for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]}) +13 | f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }' +14 | +15 | # Regression test for: https://github.com/astral-sh/ruff/issues/7087 + - saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]])) +16 + saved.append({k: v for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]}) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap index 5dbd827589..aac9c50c1f 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C405_C405.py.snap @@ -10,13 +10,12 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 3 | set([]) | help: Rewrite as a set literal - -ℹ Unsafe fix -1 |-set([1, 2]) - 1 |+{1, 2} -2 2 | set((1, 2)) -3 3 | set([]) -4 4 | set(()) + - set([1, 2]) +1 + {1, 2} +2 | set((1, 2)) +3 | set([]) +4 | set(()) +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary tuple literal (rewrite as a set literal) --> C405.py:2:1 @@ -28,14 +27,13 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal) 4 | set(()) | help: Rewrite as a set literal - -ℹ Unsafe fix -1 1 | set([1, 2]) -2 |-set((1, 2)) - 2 |+{1, 2} -3 3 | set([]) -4 4 | set(()) -5 5 | set() +1 | set([1, 2]) + - set((1, 2)) +2 + {1, 2} +3 | set([]) +4 | set(()) +5 | set() +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:3:1 @@ -48,15 +46,14 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 5 | set() | help: Rewrite as a set literal - -ℹ Unsafe fix -1 1 | set([1, 2]) -2 2 | set((1, 2)) -3 |-set([]) - 3 |+set() -4 4 | set(()) -5 5 | set() -6 6 | set((1,)) +1 | set([1, 2]) +2 | set((1, 2)) + - set([]) +3 + set() +4 | set(()) +5 | set() +6 | set((1,)) +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary tuple literal (rewrite as a set literal) --> C405.py:4:1 @@ -69,17 +66,16 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal) 6 | set((1,)) | help: Rewrite as a set literal - -ℹ Unsafe fix -1 1 | set([1, 2]) -2 2 | set((1, 2)) -3 3 | set([]) -4 |-set(()) -5 4 | set() - 5 |+set() -6 6 | set((1,)) -7 7 | set(( -8 8 | 1, +1 | set([1, 2]) +2 | set((1, 2)) +3 | set([]) + - set(()) +4 | set() +5 + set() +6 | set((1,)) +7 | set(( +8 | 1, +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary tuple literal (rewrite as a set literal) --> C405.py:6:1 @@ -92,16 +88,15 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal) 8 | 1, | help: Rewrite as a set literal - -ℹ Unsafe fix -3 3 | set([]) -4 4 | set(()) -5 5 | set() -6 |-set((1,)) - 6 |+{1} -7 7 | set(( -8 8 | 1, -9 9 | )) +3 | set([]) +4 | set(()) +5 | set() + - set((1,)) +6 + {1} +7 | set(( +8 | 1, +9 | )) +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary tuple literal (rewrite as a set literal) --> C405.py:7:1 @@ -116,19 +111,18 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal) 11 | 1, | help: Rewrite as a set literal - -ℹ Unsafe fix -4 4 | set(()) -5 5 | set() -6 6 | set((1,)) -7 |-set(( - 7 |+{ -8 8 | 1, -9 |-)) - 9 |+} -10 10 | set([ -11 11 | 1, -12 12 | ]) +4 | set(()) +5 | set() +6 | set((1,)) + - set(( +7 + { +8 | 1, + - )) +9 + } +10 | set([ +11 | 1, +12 | ]) +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:10:1 @@ -143,19 +137,18 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 14 | (1,) | help: Rewrite as a set literal - -ℹ Unsafe fix -7 7 | set(( -8 8 | 1, -9 9 | )) -10 |-set([ - 10 |+{ -11 11 | 1, -12 |-]) - 12 |+} -13 13 | set( -14 14 | (1,) -15 15 | ) +7 | set(( +8 | 1, +9 | )) + - set([ +10 + { +11 | 1, + - ]) +12 + } +13 | set( +14 | (1,) +15 | ) +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary tuple literal (rewrite as a set literal) --> C405.py:13:1 @@ -170,18 +163,17 @@ C405 [*] Unnecessary tuple literal (rewrite as a set literal) 17 | [1,] | help: Rewrite as a set literal - -ℹ Unsafe fix -10 10 | set([ -11 11 | 1, -12 12 | ]) -13 |-set( -14 |- (1,) -15 |-) - 13 |+{1} -16 14 | set( -17 15 | [1,] -18 16 | ) +10 | set([ +11 | 1, +12 | ]) + - set( + - (1,) + - ) +13 + {1} +14 | set( +15 | [1,] +16 | ) +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:16:1 @@ -196,18 +188,17 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 20 | f"{set(['a', 'b'])}" | help: Rewrite as a set literal - -ℹ Unsafe fix -13 13 | set( -14 14 | (1,) -15 15 | ) -16 |-set( -17 |- [1,] -18 |-) - 16 |+{1,} -19 17 | f"{set([1,2,3])}" -20 18 | f"{set(['a', 'b'])}" -21 19 | f'{set(["a", "b"])}' +13 | set( +14 | (1,) +15 | ) + - set( + - [1,] + - ) +16 + {1,} +17 | f"{set([1,2,3])}" +18 | f"{set(['a', 'b'])}" +19 | f'{set(["a", "b"])}' +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:19:4 @@ -220,16 +211,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 21 | f'{set(["a", "b"])}' | help: Rewrite as a set literal - -ℹ Unsafe fix -16 16 | set( -17 17 | [1,] -18 18 | ) -19 |-f"{set([1,2,3])}" - 19 |+f"{ {1,2,3} }" -20 20 | f"{set(['a', 'b'])}" -21 21 | f'{set(["a", "b"])}' -22 22 | +16 | set( +17 | [1,] +18 | ) + - f"{set([1,2,3])}" +19 + f"{ {1,2,3} }" +20 | f"{set(['a', 'b'])}" +21 | f'{set(["a", "b"])}' +22 | +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:20:4 @@ -241,16 +231,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 21 | f'{set(["a", "b"])}' | help: Rewrite as a set literal - -ℹ Unsafe fix -17 17 | [1,] -18 18 | ) -19 19 | f"{set([1,2,3])}" -20 |-f"{set(['a', 'b'])}" - 20 |+f"{ {'a', 'b'} }" -21 21 | f'{set(["a", "b"])}' -22 22 | -23 23 | f"{set(['a', 'b']) - set(['a'])}" +17 | [1,] +18 | ) +19 | f"{set([1,2,3])}" + - f"{set(['a', 'b'])}" +20 + f"{ {'a', 'b'} }" +21 | f'{set(["a", "b"])}' +22 | +23 | f"{set(['a', 'b']) - set(['a'])}" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:21:4 @@ -263,16 +252,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 23 | f"{set(['a', 'b']) - set(['a'])}" | help: Rewrite as a set literal - -ℹ Unsafe fix -18 18 | ) -19 19 | f"{set([1,2,3])}" -20 20 | f"{set(['a', 'b'])}" -21 |-f'{set(["a", "b"])}' - 21 |+f'{ {"a", "b"} }' -22 22 | -23 23 | f"{set(['a', 'b']) - set(['a'])}" -24 24 | f"{ set(['a', 'b']) - set(['a']) }" +18 | ) +19 | f"{set([1,2,3])}" +20 | f"{set(['a', 'b'])}" + - f'{set(["a", "b"])}' +21 + f'{ {"a", "b"} }' +22 | +23 | f"{set(['a', 'b']) - set(['a'])}" +24 | f"{ set(['a', 'b']) - set(['a']) }" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:23:4 @@ -285,16 +273,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 25 | f"a {set(['a', 'b']) - set(['a'])} b" | help: Rewrite as a set literal - -ℹ Unsafe fix -20 20 | f"{set(['a', 'b'])}" -21 21 | f'{set(["a", "b"])}' -22 22 | -23 |-f"{set(['a', 'b']) - set(['a'])}" - 23 |+f"{ {'a', 'b'} - set(['a'])}" -24 24 | f"{ set(['a', 'b']) - set(['a']) }" -25 25 | f"a {set(['a', 'b']) - set(['a'])} b" -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" +20 | f"{set(['a', 'b'])}" +21 | f'{set(["a", "b"])}' +22 | + - f"{set(['a', 'b']) - set(['a'])}" +23 + f"{ {'a', 'b'} - set(['a'])}" +24 | f"{ set(['a', 'b']) - set(['a']) }" +25 | f"a {set(['a', 'b']) - set(['a'])} b" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:23:22 @@ -307,16 +294,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 25 | f"a {set(['a', 'b']) - set(['a'])} b" | help: Rewrite as a set literal - -ℹ Unsafe fix -20 20 | f"{set(['a', 'b'])}" -21 21 | f'{set(["a", "b"])}' -22 22 | -23 |-f"{set(['a', 'b']) - set(['a'])}" - 23 |+f"{set(['a', 'b']) - {'a'} }" -24 24 | f"{ set(['a', 'b']) - set(['a']) }" -25 25 | f"a {set(['a', 'b']) - set(['a'])} b" -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" +20 | f"{set(['a', 'b'])}" +21 | f'{set(["a", "b"])}' +22 | + - f"{set(['a', 'b']) - set(['a'])}" +23 + f"{set(['a', 'b']) - {'a'} }" +24 | f"{ set(['a', 'b']) - set(['a']) }" +25 | f"a {set(['a', 'b']) - set(['a'])} b" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:24:5 @@ -328,16 +314,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 26 | f"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -21 21 | f'{set(["a", "b"])}' -22 22 | -23 23 | f"{set(['a', 'b']) - set(['a'])}" -24 |-f"{ set(['a', 'b']) - set(['a']) }" - 24 |+f"{ {'a', 'b'} - set(['a']) }" -25 25 | f"a {set(['a', 'b']) - set(['a'])} b" -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" -27 27 | +21 | f'{set(["a", "b"])}' +22 | +23 | f"{set(['a', 'b']) - set(['a'])}" + - f"{ set(['a', 'b']) - set(['a']) }" +24 + f"{ {'a', 'b'} - set(['a']) }" +25 | f"a {set(['a', 'b']) - set(['a'])} b" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +27 | +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:24:23 @@ -349,16 +334,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 26 | f"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -21 21 | f'{set(["a", "b"])}' -22 22 | -23 23 | f"{set(['a', 'b']) - set(['a'])}" -24 |-f"{ set(['a', 'b']) - set(['a']) }" - 24 |+f"{ set(['a', 'b']) - {'a'} }" -25 25 | f"a {set(['a', 'b']) - set(['a'])} b" -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" -27 27 | +21 | f'{set(["a", "b"])}' +22 | +23 | f"{set(['a', 'b']) - set(['a'])}" + - f"{ set(['a', 'b']) - set(['a']) }" +24 + f"{ set(['a', 'b']) - {'a'} }" +25 | f"a {set(['a', 'b']) - set(['a'])} b" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +27 | +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:25:6 @@ -370,16 +354,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 26 | f"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -22 22 | -23 23 | f"{set(['a', 'b']) - set(['a'])}" -24 24 | f"{ set(['a', 'b']) - set(['a']) }" -25 |-f"a {set(['a', 'b']) - set(['a'])} b" - 25 |+f"a { {'a', 'b'} - set(['a'])} b" -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" -27 27 | -28 28 | t"{set([1,2,3])}" +22 | +23 | f"{set(['a', 'b']) - set(['a'])}" +24 | f"{ set(['a', 'b']) - set(['a']) }" + - f"a {set(['a', 'b']) - set(['a'])} b" +25 + f"a { {'a', 'b'} - set(['a'])} b" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +27 | +28 | t"{set([1,2,3])}" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:25:24 @@ -391,16 +374,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 26 | f"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -22 22 | -23 23 | f"{set(['a', 'b']) - set(['a'])}" -24 24 | f"{ set(['a', 'b']) - set(['a']) }" -25 |-f"a {set(['a', 'b']) - set(['a'])} b" - 25 |+f"a {set(['a', 'b']) - {'a'} } b" -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" -27 27 | -28 28 | t"{set([1,2,3])}" +22 | +23 | f"{set(['a', 'b']) - set(['a'])}" +24 | f"{ set(['a', 'b']) - set(['a']) }" + - f"a {set(['a', 'b']) - set(['a'])} b" +25 + f"a {set(['a', 'b']) - {'a'} } b" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +27 | +28 | t"{set([1,2,3])}" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:26:7 @@ -413,16 +395,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 28 | t"{set([1,2,3])}" | help: Rewrite as a set literal - -ℹ Unsafe fix -23 23 | f"{set(['a', 'b']) - set(['a'])}" -24 24 | f"{ set(['a', 'b']) - set(['a']) }" -25 25 | f"a {set(['a', 'b']) - set(['a'])} b" -26 |-f"a { set(['a', 'b']) - set(['a']) } b" - 26 |+f"a { {'a', 'b'} - set(['a']) } b" -27 27 | -28 28 | t"{set([1,2,3])}" -29 29 | t"{set(['a', 'b'])}" +23 | f"{set(['a', 'b']) - set(['a'])}" +24 | f"{ set(['a', 'b']) - set(['a']) }" +25 | f"a {set(['a', 'b']) - set(['a'])} b" + - f"a { set(['a', 'b']) - set(['a']) } b" +26 + f"a { {'a', 'b'} - set(['a']) } b" +27 | +28 | t"{set([1,2,3])}" +29 | t"{set(['a', 'b'])}" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:26:25 @@ -435,16 +416,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 28 | t"{set([1,2,3])}" | help: Rewrite as a set literal - -ℹ Unsafe fix -23 23 | f"{set(['a', 'b']) - set(['a'])}" -24 24 | f"{ set(['a', 'b']) - set(['a']) }" -25 25 | f"a {set(['a', 'b']) - set(['a'])} b" -26 |-f"a { set(['a', 'b']) - set(['a']) } b" - 26 |+f"a { set(['a', 'b']) - {'a'} } b" -27 27 | -28 28 | t"{set([1,2,3])}" -29 29 | t"{set(['a', 'b'])}" +23 | f"{set(['a', 'b']) - set(['a'])}" +24 | f"{ set(['a', 'b']) - set(['a']) }" +25 | f"a {set(['a', 'b']) - set(['a'])} b" + - f"a { set(['a', 'b']) - set(['a']) } b" +26 + f"a { set(['a', 'b']) - {'a'} } b" +27 | +28 | t"{set([1,2,3])}" +29 | t"{set(['a', 'b'])}" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:28:4 @@ -457,16 +437,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 30 | t'{set(["a", "b"])}' | help: Rewrite as a set literal - -ℹ Unsafe fix -25 25 | f"a {set(['a', 'b']) - set(['a'])} b" -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" -27 27 | -28 |-t"{set([1,2,3])}" - 28 |+t"{ {1,2,3} }" -29 29 | t"{set(['a', 'b'])}" -30 30 | t'{set(["a", "b"])}' -31 31 | +25 | f"a {set(['a', 'b']) - set(['a'])} b" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +27 | + - t"{set([1,2,3])}" +28 + t"{ {1,2,3} }" +29 | t"{set(['a', 'b'])}" +30 | t'{set(["a", "b"])}' +31 | +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:29:4 @@ -477,16 +456,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 30 | t'{set(["a", "b"])}' | help: Rewrite as a set literal - -ℹ Unsafe fix -26 26 | f"a { set(['a', 'b']) - set(['a']) } b" -27 27 | -28 28 | t"{set([1,2,3])}" -29 |-t"{set(['a', 'b'])}" - 29 |+t"{ {'a', 'b'} }" -30 30 | t'{set(["a", "b"])}' -31 31 | -32 32 | t"{set(['a', 'b']) - set(['a'])}" +26 | f"a { set(['a', 'b']) - set(['a']) } b" +27 | +28 | t"{set([1,2,3])}" + - t"{set(['a', 'b'])}" +29 + t"{ {'a', 'b'} }" +30 | t'{set(["a", "b"])}' +31 | +32 | t"{set(['a', 'b']) - set(['a'])}" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:30:4 @@ -499,16 +477,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 32 | t"{set(['a', 'b']) - set(['a'])}" | help: Rewrite as a set literal - -ℹ Unsafe fix -27 27 | -28 28 | t"{set([1,2,3])}" -29 29 | t"{set(['a', 'b'])}" -30 |-t'{set(["a", "b"])}' - 30 |+t'{ {"a", "b"} }' -31 31 | -32 32 | t"{set(['a', 'b']) - set(['a'])}" -33 33 | t"{ set(['a', 'b']) - set(['a']) }" +27 | +28 | t"{set([1,2,3])}" +29 | t"{set(['a', 'b'])}" + - t'{set(["a", "b"])}' +30 + t'{ {"a", "b"} }' +31 | +32 | t"{set(['a', 'b']) - set(['a'])}" +33 | t"{ set(['a', 'b']) - set(['a']) }" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:32:4 @@ -521,16 +498,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 34 | t"a {set(['a', 'b']) - set(['a'])} b" | help: Rewrite as a set literal - -ℹ Unsafe fix -29 29 | t"{set(['a', 'b'])}" -30 30 | t'{set(["a", "b"])}' -31 31 | -32 |-t"{set(['a', 'b']) - set(['a'])}" - 32 |+t"{ {'a', 'b'} - set(['a'])}" -33 33 | t"{ set(['a', 'b']) - set(['a']) }" -34 34 | t"a {set(['a', 'b']) - set(['a'])} b" -35 35 | t"a { set(['a', 'b']) - set(['a']) } b" +29 | t"{set(['a', 'b'])}" +30 | t'{set(["a", "b"])}' +31 | + - t"{set(['a', 'b']) - set(['a'])}" +32 + t"{ {'a', 'b'} - set(['a'])}" +33 | t"{ set(['a', 'b']) - set(['a']) }" +34 | t"a {set(['a', 'b']) - set(['a'])} b" +35 | t"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:32:22 @@ -543,16 +519,15 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 34 | t"a {set(['a', 'b']) - set(['a'])} b" | help: Rewrite as a set literal - -ℹ Unsafe fix -29 29 | t"{set(['a', 'b'])}" -30 30 | t'{set(["a", "b"])}' -31 31 | -32 |-t"{set(['a', 'b']) - set(['a'])}" - 32 |+t"{set(['a', 'b']) - {'a'} }" -33 33 | t"{ set(['a', 'b']) - set(['a']) }" -34 34 | t"a {set(['a', 'b']) - set(['a'])} b" -35 35 | t"a { set(['a', 'b']) - set(['a']) } b" +29 | t"{set(['a', 'b'])}" +30 | t'{set(["a", "b"])}' +31 | + - t"{set(['a', 'b']) - set(['a'])}" +32 + t"{set(['a', 'b']) - {'a'} }" +33 | t"{ set(['a', 'b']) - set(['a']) }" +34 | t"a {set(['a', 'b']) - set(['a'])} b" +35 | t"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:33:5 @@ -564,15 +539,14 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 35 | t"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -30 30 | t'{set(["a", "b"])}' -31 31 | -32 32 | t"{set(['a', 'b']) - set(['a'])}" -33 |-t"{ set(['a', 'b']) - set(['a']) }" - 33 |+t"{ {'a', 'b'} - set(['a']) }" -34 34 | t"a {set(['a', 'b']) - set(['a'])} b" -35 35 | t"a { set(['a', 'b']) - set(['a']) } b" +30 | t'{set(["a", "b"])}' +31 | +32 | t"{set(['a', 'b']) - set(['a'])}" + - t"{ set(['a', 'b']) - set(['a']) }" +33 + t"{ {'a', 'b'} - set(['a']) }" +34 | t"a {set(['a', 'b']) - set(['a'])} b" +35 | t"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:33:23 @@ -584,15 +558,14 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 35 | t"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -30 30 | t'{set(["a", "b"])}' -31 31 | -32 32 | t"{set(['a', 'b']) - set(['a'])}" -33 |-t"{ set(['a', 'b']) - set(['a']) }" - 33 |+t"{ set(['a', 'b']) - {'a'} }" -34 34 | t"a {set(['a', 'b']) - set(['a'])} b" -35 35 | t"a { set(['a', 'b']) - set(['a']) } b" +30 | t'{set(["a", "b"])}' +31 | +32 | t"{set(['a', 'b']) - set(['a'])}" + - t"{ set(['a', 'b']) - set(['a']) }" +33 + t"{ set(['a', 'b']) - {'a'} }" +34 | t"a {set(['a', 'b']) - set(['a'])} b" +35 | t"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:34:6 @@ -604,14 +577,13 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 35 | t"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -31 31 | -32 32 | t"{set(['a', 'b']) - set(['a'])}" -33 33 | t"{ set(['a', 'b']) - set(['a']) }" -34 |-t"a {set(['a', 'b']) - set(['a'])} b" - 34 |+t"a { {'a', 'b'} - set(['a'])} b" -35 35 | t"a { set(['a', 'b']) - set(['a']) } b" +31 | +32 | t"{set(['a', 'b']) - set(['a'])}" +33 | t"{ set(['a', 'b']) - set(['a']) }" + - t"a {set(['a', 'b']) - set(['a'])} b" +34 + t"a { {'a', 'b'} - set(['a'])} b" +35 | t"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:34:24 @@ -623,14 +595,13 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) 35 | t"a { set(['a', 'b']) - set(['a']) } b" | help: Rewrite as a set literal - -ℹ Unsafe fix -31 31 | -32 32 | t"{set(['a', 'b']) - set(['a'])}" -33 33 | t"{ set(['a', 'b']) - set(['a']) }" -34 |-t"a {set(['a', 'b']) - set(['a'])} b" - 34 |+t"a {set(['a', 'b']) - {'a'} } b" -35 35 | t"a { set(['a', 'b']) - set(['a']) } b" +31 | +32 | t"{set(['a', 'b']) - set(['a'])}" +33 | t"{ set(['a', 'b']) - set(['a']) }" + - t"a {set(['a', 'b']) - set(['a'])} b" +34 + t"a {set(['a', 'b']) - {'a'} } b" +35 | t"a { set(['a', 'b']) - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:35:7 @@ -641,13 +612,12 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) | ^^^^^^^^^^^^^^^ | help: Rewrite as a set literal - -ℹ Unsafe fix -32 32 | t"{set(['a', 'b']) - set(['a'])}" -33 33 | t"{ set(['a', 'b']) - set(['a']) }" -34 34 | t"a {set(['a', 'b']) - set(['a'])} b" -35 |-t"a { set(['a', 'b']) - set(['a']) } b" - 35 |+t"a { {'a', 'b'} - set(['a']) } b" +32 | t"{set(['a', 'b']) - set(['a'])}" +33 | t"{ set(['a', 'b']) - set(['a']) }" +34 | t"a {set(['a', 'b']) - set(['a'])} b" + - t"a { set(['a', 'b']) - set(['a']) } b" +35 + t"a { {'a', 'b'} - set(['a']) } b" +note: This is an unsafe fix and may change runtime behavior C405 [*] Unnecessary list literal (rewrite as a set literal) --> C405.py:35:25 @@ -658,10 +628,9 @@ C405 [*] Unnecessary list literal (rewrite as a set literal) | ^^^^^^^^^^ | help: Rewrite as a set literal - -ℹ Unsafe fix -32 32 | t"{set(['a', 'b']) - set(['a'])}" -33 33 | t"{ set(['a', 'b']) - set(['a']) }" -34 34 | t"a {set(['a', 'b']) - set(['a'])} b" -35 |-t"a { set(['a', 'b']) - set(['a']) } b" - 35 |+t"a { set(['a', 'b']) - {'a'} } b" +32 | t"{set(['a', 'b']) - set(['a'])}" +33 | t"{ set(['a', 'b']) - set(['a']) }" +34 | t"a {set(['a', 'b']) - set(['a'])} b" + - t"a { set(['a', 'b']) - set(['a']) } b" +35 + t"a { set(['a', 'b']) - {'a'} } b" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap index f5bbcf7cab..a2a29e2483 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C406_C406.py.snap @@ -10,13 +10,12 @@ C406 [*] Unnecessary list literal (rewrite as a dict literal) 3 | d3 = dict([]) | help: Rewrite as a dict literal - -ℹ Unsafe fix -1 |-d1 = dict([(1, 2)]) - 1 |+d1 = {1: 2} -2 2 | d2 = dict(((1, 2),)) -3 3 | d3 = dict([]) -4 4 | d4 = dict(()) + - d1 = dict([(1, 2)]) +1 + d1 = {1: 2} +2 | d2 = dict(((1, 2),)) +3 | d3 = dict([]) +4 | d4 = dict(()) +note: This is an unsafe fix and may change runtime behavior C406 [*] Unnecessary tuple literal (rewrite as a dict literal) --> C406.py:2:6 @@ -28,14 +27,13 @@ C406 [*] Unnecessary tuple literal (rewrite as a dict literal) 4 | d4 = dict(()) | help: Rewrite as a dict literal - -ℹ Unsafe fix -1 1 | d1 = dict([(1, 2)]) -2 |-d2 = dict(((1, 2),)) - 2 |+d2 = {1: 2,} -3 3 | d3 = dict([]) -4 4 | d4 = dict(()) -5 5 | d5 = dict() +1 | d1 = dict([(1, 2)]) + - d2 = dict(((1, 2),)) +2 + d2 = {1: 2,} +3 | d3 = dict([]) +4 | d4 = dict(()) +5 | d5 = dict() +note: This is an unsafe fix and may change runtime behavior C406 [*] Unnecessary list literal (rewrite as a dict literal) --> C406.py:3:6 @@ -48,14 +46,13 @@ C406 [*] Unnecessary list literal (rewrite as a dict literal) 5 | d5 = dict() | help: Rewrite as a dict literal - -ℹ Unsafe fix -1 1 | d1 = dict([(1, 2)]) -2 2 | d2 = dict(((1, 2),)) -3 |-d3 = dict([]) - 3 |+d3 = {} -4 4 | d4 = dict(()) -5 5 | d5 = dict() +1 | d1 = dict([(1, 2)]) +2 | d2 = dict(((1, 2),)) + - d3 = dict([]) +3 + d3 = {} +4 | d4 = dict(()) +5 | d5 = dict() +note: This is an unsafe fix and may change runtime behavior C406 [*] Unnecessary tuple literal (rewrite as a dict literal) --> C406.py:4:6 @@ -67,11 +64,10 @@ C406 [*] Unnecessary tuple literal (rewrite as a dict literal) 5 | d5 = dict() | help: Rewrite as a dict literal - -ℹ Unsafe fix -1 1 | d1 = dict([(1, 2)]) -2 2 | d2 = dict(((1, 2),)) -3 3 | d3 = dict([]) -4 |-d4 = dict(()) - 4 |+d4 = {} -5 5 | d5 = dict() +1 | d1 = dict([(1, 2)]) +2 | d2 = dict(((1, 2),)) +3 | d3 = dict([]) + - d4 = dict(()) +4 + d4 = {} +5 | d5 = dict() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap index 7b3de16c91..1c79c52fb3 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py.snap @@ -10,13 +10,12 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal) 3 | d1 = dict() | help: Rewrite as a literal - -ℹ Unsafe fix -1 |-t = tuple() - 1 |+t = () -2 2 | l = list() -3 3 | d1 = dict() -4 4 | d2 = dict(a=1) + - t = tuple() +1 + t = () +2 | l = list() +3 | d1 = dict() +4 | d2 = dict(a=1) +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `list()` call (rewrite as a literal) --> C408.py:2:5 @@ -28,14 +27,13 @@ C408 [*] Unnecessary `list()` call (rewrite as a literal) 4 | d2 = dict(a=1) | help: Rewrite as a literal - -ℹ Unsafe fix -1 1 | t = tuple() -2 |-l = list() - 2 |+l = [] -3 3 | d1 = dict() -4 4 | d2 = dict(a=1) -5 5 | d3 = dict(**d2) +1 | t = tuple() + - l = list() +2 + l = [] +3 | d1 = dict() +4 | d2 = dict(a=1) +5 | d3 = dict(**d2) +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:3:6 @@ -48,15 +46,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 5 | d3 = dict(**d2) | help: Rewrite as a literal - -ℹ Unsafe fix -1 1 | t = tuple() -2 2 | l = list() -3 |-d1 = dict() - 3 |+d1 = {} -4 4 | d2 = dict(a=1) -5 5 | d3 = dict(**d2) -6 6 | +1 | t = tuple() +2 | l = list() + - d1 = dict() +3 + d1 = {} +4 | d2 = dict(a=1) +5 | d3 = dict(**d2) +6 | +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:4:6 @@ -68,16 +65,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 5 | d3 = dict(**d2) | help: Rewrite as a literal - -ℹ Unsafe fix -1 1 | t = tuple() -2 2 | l = list() -3 3 | d1 = dict() -4 |-d2 = dict(a=1) - 4 |+d2 = {"a": 1} -5 5 | d3 = dict(**d2) -6 6 | -7 7 | +1 | t = tuple() +2 | l = list() +3 | d1 = dict() + - d2 = dict(a=1) +4 + d2 = {"a": 1} +5 | d3 = dict(**d2) +6 | +7 | +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:14:4 @@ -90,16 +86,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 16 | f"{dict()}" | help: Rewrite as a literal - -ℹ Unsafe fix -11 11 | -12 12 | a = list() -13 13 | -14 |-f"{dict(x='y')}" - 14 |+f"{ {'x': 'y'} }" -15 15 | f'{dict(x="y")}' -16 16 | f"{dict()}" -17 17 | f"a {dict()} b" +11 | +12 | a = list() +13 | + - f"{dict(x='y')}" +14 + f"{ {'x': 'y'} }" +15 | f'{dict(x="y")}' +16 | f"{dict()}" +17 | f"a {dict()} b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:15:4 @@ -111,16 +106,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 17 | f"a {dict()} b" | help: Rewrite as a literal - -ℹ Unsafe fix -12 12 | a = list() -13 13 | -14 14 | f"{dict(x='y')}" -15 |-f'{dict(x="y")}' - 15 |+f'{ {"x": "y"} }' -16 16 | f"{dict()}" -17 17 | f"a {dict()} b" -18 18 | +12 | a = list() +13 | +14 | f"{dict(x='y')}" + - f'{dict(x="y")}' +15 + f'{ {"x": "y"} }' +16 | f"{dict()}" +17 | f"a {dict()} b" +18 | +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:16:4 @@ -132,16 +126,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 17 | f"a {dict()} b" | help: Rewrite as a literal - -ℹ Unsafe fix -13 13 | -14 14 | f"{dict(x='y')}" -15 15 | f'{dict(x="y")}' -16 |-f"{dict()}" - 16 |+f"{ {} }" -17 17 | f"a {dict()} b" -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" +13 | +14 | f"{dict(x='y')}" +15 | f'{dict(x="y")}' + - f"{dict()}" +16 + f"{ {} }" +17 | f"a {dict()} b" +18 | +19 | f"{dict(x='y') | dict(y='z')}" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:17:6 @@ -154,16 +147,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 19 | f"{dict(x='y') | dict(y='z')}" | help: Rewrite as a literal - -ℹ Unsafe fix -14 14 | f"{dict(x='y')}" -15 15 | f'{dict(x="y")}' -16 16 | f"{dict()}" -17 |-f"a {dict()} b" - 17 |+f"a { {} } b" -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" -20 20 | f"{ dict(x='y') | dict(y='z') }" +14 | f"{dict(x='y')}" +15 | f'{dict(x="y")}' +16 | f"{dict()}" + - f"a {dict()} b" +17 + f"a { {} } b" +18 | +19 | f"{dict(x='y') | dict(y='z')}" +20 | f"{ dict(x='y') | dict(y='z') }" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:19:4 @@ -176,16 +168,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 21 | f"a {dict(x='y') | dict(y='z')} b" | help: Rewrite as a literal - -ℹ Unsafe fix -16 16 | f"{dict()}" -17 17 | f"a {dict()} b" -18 18 | -19 |-f"{dict(x='y') | dict(y='z')}" - 19 |+f"{ {'x': 'y'} | dict(y='z')}" -20 20 | f"{ dict(x='y') | dict(y='z') }" -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" +16 | f"{dict()}" +17 | f"a {dict()} b" +18 | + - f"{dict(x='y') | dict(y='z')}" +19 + f"{ {'x': 'y'} | dict(y='z')}" +20 | f"{ dict(x='y') | dict(y='z') }" +21 | f"a {dict(x='y') | dict(y='z')} b" +22 | f"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:19:18 @@ -198,16 +189,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 21 | f"a {dict(x='y') | dict(y='z')} b" | help: Rewrite as a literal - -ℹ Unsafe fix -16 16 | f"{dict()}" -17 17 | f"a {dict()} b" -18 18 | -19 |-f"{dict(x='y') | dict(y='z')}" - 19 |+f"{dict(x='y') | {'y': 'z'} }" -20 20 | f"{ dict(x='y') | dict(y='z') }" -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" +16 | f"{dict()}" +17 | f"a {dict()} b" +18 | + - f"{dict(x='y') | dict(y='z')}" +19 + f"{dict(x='y') | {'y': 'z'} }" +20 | f"{ dict(x='y') | dict(y='z') }" +21 | f"a {dict(x='y') | dict(y='z')} b" +22 | f"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:20:5 @@ -219,16 +209,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 22 | f"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -17 17 | f"a {dict()} b" -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" -20 |-f"{ dict(x='y') | dict(y='z') }" - 20 |+f"{ {'x': 'y'} | dict(y='z') }" -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" -23 23 | +17 | f"a {dict()} b" +18 | +19 | f"{dict(x='y') | dict(y='z')}" + - f"{ dict(x='y') | dict(y='z') }" +20 + f"{ {'x': 'y'} | dict(y='z') }" +21 | f"a {dict(x='y') | dict(y='z')} b" +22 | f"a { dict(x='y') | dict(y='z') } b" +23 | +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:20:19 @@ -240,16 +229,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 22 | f"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -17 17 | f"a {dict()} b" -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" -20 |-f"{ dict(x='y') | dict(y='z') }" - 20 |+f"{ dict(x='y') | {'y': 'z'} }" -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" -23 23 | +17 | f"a {dict()} b" +18 | +19 | f"{dict(x='y') | dict(y='z')}" + - f"{ dict(x='y') | dict(y='z') }" +20 + f"{ dict(x='y') | {'y': 'z'} }" +21 | f"a {dict(x='y') | dict(y='z')} b" +22 | f"a { dict(x='y') | dict(y='z') } b" +23 | +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:21:6 @@ -261,16 +249,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 22 | f"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" -20 20 | f"{ dict(x='y') | dict(y='z') }" -21 |-f"a {dict(x='y') | dict(y='z')} b" - 21 |+f"a { {'x': 'y'} | dict(y='z')} b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" -23 23 | -24 24 | dict( +18 | +19 | f"{dict(x='y') | dict(y='z')}" +20 | f"{ dict(x='y') | dict(y='z') }" + - f"a {dict(x='y') | dict(y='z')} b" +21 + f"a { {'x': 'y'} | dict(y='z')} b" +22 | f"a { dict(x='y') | dict(y='z') } b" +23 | +24 | dict( +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:21:20 @@ -282,16 +269,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 22 | f"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" -20 20 | f"{ dict(x='y') | dict(y='z') }" -21 |-f"a {dict(x='y') | dict(y='z')} b" - 21 |+f"a {dict(x='y') | {'y': 'z'} } b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" -23 23 | -24 24 | dict( +18 | +19 | f"{dict(x='y') | dict(y='z')}" +20 | f"{ dict(x='y') | dict(y='z') }" + - f"a {dict(x='y') | dict(y='z')} b" +21 + f"a {dict(x='y') | {'y': 'z'} } b" +22 | f"a { dict(x='y') | dict(y='z') } b" +23 | +24 | dict( +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:22:7 @@ -304,16 +290,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 24 | dict( | help: Rewrite as a literal - -ℹ Unsafe fix -19 19 | f"{dict(x='y') | dict(y='z')}" -20 20 | f"{ dict(x='y') | dict(y='z') }" -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 |-f"a { dict(x='y') | dict(y='z') } b" - 22 |+f"a { {'x': 'y'} | dict(y='z') } b" -23 23 | -24 24 | dict( -25 25 | # comment +19 | f"{dict(x='y') | dict(y='z')}" +20 | f"{ dict(x='y') | dict(y='z') }" +21 | f"a {dict(x='y') | dict(y='z')} b" + - f"a { dict(x='y') | dict(y='z') } b" +22 + f"a { {'x': 'y'} | dict(y='z') } b" +23 | +24 | dict( +25 | # comment +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:22:21 @@ -326,16 +311,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 24 | dict( | help: Rewrite as a literal - -ℹ Unsafe fix -19 19 | f"{dict(x='y') | dict(y='z')}" -20 20 | f"{ dict(x='y') | dict(y='z') }" -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 |-f"a { dict(x='y') | dict(y='z') } b" - 22 |+f"a { dict(x='y') | {'y': 'z'} } b" -23 23 | -24 24 | dict( -25 25 | # comment +19 | f"{dict(x='y') | dict(y='z')}" +20 | f"{ dict(x='y') | dict(y='z') }" +21 | f"a {dict(x='y') | dict(y='z')} b" + - f"a { dict(x='y') | dict(y='z') } b" +22 + f"a { dict(x='y') | {'y': 'z'} } b" +23 | +24 | dict( +25 | # comment +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:24:1 @@ -350,19 +334,18 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 28 | tuple( # comment | help: Rewrite as a literal - -ℹ Unsafe fix -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" -23 23 | -24 |-dict( - 24 |+{ -25 25 | # comment -26 |-) - 26 |+} -27 27 | -28 28 | tuple( # comment -29 29 | ) +21 | f"a {dict(x='y') | dict(y='z')} b" +22 | f"a { dict(x='y') | dict(y='z') } b" +23 | + - dict( +24 + { +25 | # comment + - ) +26 + } +27 | +28 | tuple( # comment +29 | ) +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `tuple()` call (rewrite as a literal) --> C408.py:28:1 @@ -376,16 +359,15 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal) 31 | t"{dict(x='y')}" | help: Rewrite as a literal - -ℹ Unsafe fix -25 25 | # comment -26 26 | ) -27 27 | -28 |-tuple( # comment - 28 |+( # comment -29 29 | ) -30 30 | -31 31 | t"{dict(x='y')}" +25 | # comment +26 | ) +27 | + - tuple( # comment +28 + ( # comment +29 | ) +30 | +31 | t"{dict(x='y')}" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:31:4 @@ -398,16 +380,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 33 | t"{dict()}" | help: Rewrite as a literal - -ℹ Unsafe fix -28 28 | tuple( # comment -29 29 | ) -30 30 | -31 |-t"{dict(x='y')}" - 31 |+t"{ {'x': 'y'} }" -32 32 | t'{dict(x="y")}' -33 33 | t"{dict()}" -34 34 | t"a {dict()} b" +28 | tuple( # comment +29 | ) +30 | + - t"{dict(x='y')}" +31 + t"{ {'x': 'y'} }" +32 | t'{dict(x="y")}' +33 | t"{dict()}" +34 | t"a {dict()} b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:32:4 @@ -419,16 +400,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 34 | t"a {dict()} b" | help: Rewrite as a literal - -ℹ Unsafe fix -29 29 | ) -30 30 | -31 31 | t"{dict(x='y')}" -32 |-t'{dict(x="y")}' - 32 |+t'{ {"x": "y"} }' -33 33 | t"{dict()}" -34 34 | t"a {dict()} b" -35 35 | +29 | ) +30 | +31 | t"{dict(x='y')}" + - t'{dict(x="y")}' +32 + t'{ {"x": "y"} }' +33 | t"{dict()}" +34 | t"a {dict()} b" +35 | +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:33:4 @@ -440,16 +420,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 34 | t"a {dict()} b" | help: Rewrite as a literal - -ℹ Unsafe fix -30 30 | -31 31 | t"{dict(x='y')}" -32 32 | t'{dict(x="y")}' -33 |-t"{dict()}" - 33 |+t"{ {} }" -34 34 | t"a {dict()} b" -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" +30 | +31 | t"{dict(x='y')}" +32 | t'{dict(x="y")}' + - t"{dict()}" +33 + t"{ {} }" +34 | t"a {dict()} b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:34:6 @@ -462,16 +441,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 36 | t"{dict(x='y') | dict(y='z')}" | help: Rewrite as a literal - -ℹ Unsafe fix -31 31 | t"{dict(x='y')}" -32 32 | t'{dict(x="y")}' -33 33 | t"{dict()}" -34 |-t"a {dict()} b" - 34 |+t"a { {} } b" -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" -37 37 | t"{ dict(x='y') | dict(y='z') }" +31 | t"{dict(x='y')}" +32 | t'{dict(x="y")}' +33 | t"{dict()}" + - t"a {dict()} b" +34 + t"a { {} } b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" +37 | t"{ dict(x='y') | dict(y='z') }" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:36:4 @@ -484,16 +462,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 38 | t"a {dict(x='y') | dict(y='z')} b" | help: Rewrite as a literal - -ℹ Unsafe fix -33 33 | t"{dict()}" -34 34 | t"a {dict()} b" -35 35 | -36 |-t"{dict(x='y') | dict(y='z')}" - 36 |+t"{ {'x': 'y'} | dict(y='z')}" -37 37 | t"{ dict(x='y') | dict(y='z') }" -38 38 | t"a {dict(x='y') | dict(y='z')} b" -39 39 | t"a { dict(x='y') | dict(y='z') } b" +33 | t"{dict()}" +34 | t"a {dict()} b" +35 | + - t"{dict(x='y') | dict(y='z')}" +36 + t"{ {'x': 'y'} | dict(y='z')}" +37 | t"{ dict(x='y') | dict(y='z') }" +38 | t"a {dict(x='y') | dict(y='z')} b" +39 | t"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:36:18 @@ -506,16 +483,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 38 | t"a {dict(x='y') | dict(y='z')} b" | help: Rewrite as a literal - -ℹ Unsafe fix -33 33 | t"{dict()}" -34 34 | t"a {dict()} b" -35 35 | -36 |-t"{dict(x='y') | dict(y='z')}" - 36 |+t"{dict(x='y') | {'y': 'z'} }" -37 37 | t"{ dict(x='y') | dict(y='z') }" -38 38 | t"a {dict(x='y') | dict(y='z')} b" -39 39 | t"a { dict(x='y') | dict(y='z') } b" +33 | t"{dict()}" +34 | t"a {dict()} b" +35 | + - t"{dict(x='y') | dict(y='z')}" +36 + t"{dict(x='y') | {'y': 'z'} }" +37 | t"{ dict(x='y') | dict(y='z') }" +38 | t"a {dict(x='y') | dict(y='z')} b" +39 | t"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:37:5 @@ -527,15 +503,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 39 | t"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -34 34 | t"a {dict()} b" -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" -37 |-t"{ dict(x='y') | dict(y='z') }" - 37 |+t"{ {'x': 'y'} | dict(y='z') }" -38 38 | t"a {dict(x='y') | dict(y='z')} b" -39 39 | t"a { dict(x='y') | dict(y='z') } b" +34 | t"a {dict()} b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" + - t"{ dict(x='y') | dict(y='z') }" +37 + t"{ {'x': 'y'} | dict(y='z') }" +38 | t"a {dict(x='y') | dict(y='z')} b" +39 | t"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:37:19 @@ -547,15 +522,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 39 | t"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -34 34 | t"a {dict()} b" -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" -37 |-t"{ dict(x='y') | dict(y='z') }" - 37 |+t"{ dict(x='y') | {'y': 'z'} }" -38 38 | t"a {dict(x='y') | dict(y='z')} b" -39 39 | t"a { dict(x='y') | dict(y='z') } b" +34 | t"a {dict()} b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" + - t"{ dict(x='y') | dict(y='z') }" +37 + t"{ dict(x='y') | {'y': 'z'} }" +38 | t"a {dict(x='y') | dict(y='z')} b" +39 | t"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:38:6 @@ -567,14 +541,13 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 39 | t"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" -37 37 | t"{ dict(x='y') | dict(y='z') }" -38 |-t"a {dict(x='y') | dict(y='z')} b" - 38 |+t"a { {'x': 'y'} | dict(y='z')} b" -39 39 | t"a { dict(x='y') | dict(y='z') } b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" +37 | t"{ dict(x='y') | dict(y='z') }" + - t"a {dict(x='y') | dict(y='z')} b" +38 + t"a { {'x': 'y'} | dict(y='z')} b" +39 | t"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:38:20 @@ -586,14 +559,13 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 39 | t"a { dict(x='y') | dict(y='z') } b" | help: Rewrite as a literal - -ℹ Unsafe fix -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" -37 37 | t"{ dict(x='y') | dict(y='z') }" -38 |-t"a {dict(x='y') | dict(y='z')} b" - 38 |+t"a {dict(x='y') | {'y': 'z'} } b" -39 39 | t"a { dict(x='y') | dict(y='z') } b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" +37 | t"{ dict(x='y') | dict(y='z') }" + - t"a {dict(x='y') | dict(y='z')} b" +38 + t"a {dict(x='y') | {'y': 'z'} } b" +39 | t"a { dict(x='y') | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:39:7 @@ -604,13 +576,12 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) | ^^^^^^^^^^^ | help: Rewrite as a literal - -ℹ Unsafe fix -36 36 | t"{dict(x='y') | dict(y='z')}" -37 37 | t"{ dict(x='y') | dict(y='z') }" -38 38 | t"a {dict(x='y') | dict(y='z')} b" -39 |-t"a { dict(x='y') | dict(y='z') } b" - 39 |+t"a { {'x': 'y'} | dict(y='z') } b" +36 | t"{dict(x='y') | dict(y='z')}" +37 | t"{ dict(x='y') | dict(y='z') }" +38 | t"a {dict(x='y') | dict(y='z')} b" + - t"a { dict(x='y') | dict(y='z') } b" +39 + t"a { {'x': 'y'} | dict(y='z') } b" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:39:21 @@ -621,10 +592,9 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) | ^^^^^^^^^^^ | help: Rewrite as a literal - -ℹ Unsafe fix -36 36 | t"{dict(x='y') | dict(y='z')}" -37 37 | t"{ dict(x='y') | dict(y='z') }" -38 38 | t"a {dict(x='y') | dict(y='z')} b" -39 |-t"a { dict(x='y') | dict(y='z') } b" - 39 |+t"a { dict(x='y') | {'y': 'z'} } b" +36 | t"{dict(x='y') | dict(y='z')}" +37 | t"{ dict(x='y') | dict(y='z') }" +38 | t"a {dict(x='y') | dict(y='z')} b" + - t"a { dict(x='y') | dict(y='z') } b" +39 + t"a { dict(x='y') | {'y': 'z'} } b" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap index 463e737348..ce243f6faa 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C408_C408.py_allow_dict_calls_with_keyword_arguments.snap @@ -10,13 +10,12 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal) 3 | d1 = dict() | help: Rewrite as a literal - -ℹ Unsafe fix -1 |-t = tuple() - 1 |+t = () -2 2 | l = list() -3 3 | d1 = dict() -4 4 | d2 = dict(a=1) + - t = tuple() +1 + t = () +2 | l = list() +3 | d1 = dict() +4 | d2 = dict(a=1) +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `list()` call (rewrite as a literal) --> C408.py:2:5 @@ -28,14 +27,13 @@ C408 [*] Unnecessary `list()` call (rewrite as a literal) 4 | d2 = dict(a=1) | help: Rewrite as a literal - -ℹ Unsafe fix -1 1 | t = tuple() -2 |-l = list() - 2 |+l = [] -3 3 | d1 = dict() -4 4 | d2 = dict(a=1) -5 5 | d3 = dict(**d2) +1 | t = tuple() + - l = list() +2 + l = [] +3 | d1 = dict() +4 | d2 = dict(a=1) +5 | d3 = dict(**d2) +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:3:6 @@ -48,15 +46,14 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 5 | d3 = dict(**d2) | help: Rewrite as a literal - -ℹ Unsafe fix -1 1 | t = tuple() -2 2 | l = list() -3 |-d1 = dict() - 3 |+d1 = {} -4 4 | d2 = dict(a=1) -5 5 | d3 = dict(**d2) -6 6 | +1 | t = tuple() +2 | l = list() + - d1 = dict() +3 + d1 = {} +4 | d2 = dict(a=1) +5 | d3 = dict(**d2) +6 | +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:16:4 @@ -68,16 +65,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 17 | f"a {dict()} b" | help: Rewrite as a literal - -ℹ Unsafe fix -13 13 | -14 14 | f"{dict(x='y')}" -15 15 | f'{dict(x="y")}' -16 |-f"{dict()}" - 16 |+f"{ {} }" -17 17 | f"a {dict()} b" -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" +13 | +14 | f"{dict(x='y')}" +15 | f'{dict(x="y")}' + - f"{dict()}" +16 + f"{ {} }" +17 | f"a {dict()} b" +18 | +19 | f"{dict(x='y') | dict(y='z')}" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:17:6 @@ -90,16 +86,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 19 | f"{dict(x='y') | dict(y='z')}" | help: Rewrite as a literal - -ℹ Unsafe fix -14 14 | f"{dict(x='y')}" -15 15 | f'{dict(x="y")}' -16 16 | f"{dict()}" -17 |-f"a {dict()} b" - 17 |+f"a { {} } b" -18 18 | -19 19 | f"{dict(x='y') | dict(y='z')}" -20 20 | f"{ dict(x='y') | dict(y='z') }" +14 | f"{dict(x='y')}" +15 | f'{dict(x="y")}' +16 | f"{dict()}" + - f"a {dict()} b" +17 + f"a { {} } b" +18 | +19 | f"{dict(x='y') | dict(y='z')}" +20 | f"{ dict(x='y') | dict(y='z') }" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:24:1 @@ -114,19 +109,18 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 28 | tuple( # comment | help: Rewrite as a literal - -ℹ Unsafe fix -21 21 | f"a {dict(x='y') | dict(y='z')} b" -22 22 | f"a { dict(x='y') | dict(y='z') } b" -23 23 | -24 |-dict( - 24 |+{ -25 25 | # comment -26 |-) - 26 |+} -27 27 | -28 28 | tuple( # comment -29 29 | ) +21 | f"a {dict(x='y') | dict(y='z')} b" +22 | f"a { dict(x='y') | dict(y='z') } b" +23 | + - dict( +24 + { +25 | # comment + - ) +26 + } +27 | +28 | tuple( # comment +29 | ) +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `tuple()` call (rewrite as a literal) --> C408.py:28:1 @@ -140,16 +134,15 @@ C408 [*] Unnecessary `tuple()` call (rewrite as a literal) 31 | t"{dict(x='y')}" | help: Rewrite as a literal - -ℹ Unsafe fix -25 25 | # comment -26 26 | ) -27 27 | -28 |-tuple( # comment - 28 |+( # comment -29 29 | ) -30 30 | -31 31 | t"{dict(x='y')}" +25 | # comment +26 | ) +27 | + - tuple( # comment +28 + ( # comment +29 | ) +30 | +31 | t"{dict(x='y')}" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:33:4 @@ -161,16 +154,15 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 34 | t"a {dict()} b" | help: Rewrite as a literal - -ℹ Unsafe fix -30 30 | -31 31 | t"{dict(x='y')}" -32 32 | t'{dict(x="y")}' -33 |-t"{dict()}" - 33 |+t"{ {} }" -34 34 | t"a {dict()} b" -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" +30 | +31 | t"{dict(x='y')}" +32 | t'{dict(x="y")}' + - t"{dict()}" +33 + t"{ {} }" +34 | t"a {dict()} b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" +note: This is an unsafe fix and may change runtime behavior C408 [*] Unnecessary `dict()` call (rewrite as a literal) --> C408.py:34:6 @@ -183,13 +175,12 @@ C408 [*] Unnecessary `dict()` call (rewrite as a literal) 36 | t"{dict(x='y') | dict(y='z')}" | help: Rewrite as a literal - -ℹ Unsafe fix -31 31 | t"{dict(x='y')}" -32 32 | t'{dict(x="y")}' -33 33 | t"{dict()}" -34 |-t"a {dict()} b" - 34 |+t"a { {} } b" -35 35 | -36 36 | t"{dict(x='y') | dict(y='z')}" -37 37 | t"{ dict(x='y') | dict(y='z') }" +31 | t"{dict(x='y')}" +32 | t'{dict(x="y")}' +33 | t"{dict()}" + - t"a {dict()} b" +34 + t"a { {} } b" +35 | +36 | t"{dict(x='y') | dict(y='z')}" +37 | t"{ dict(x='y') | dict(y='z') }" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap index c4b3f267d2..f05149dffd 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C409_C409.py.snap @@ -10,13 +10,12 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 3 | t3 = tuple((1, 2)) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -1 |-t1 = tuple([]) - 1 |+t1 = () -2 2 | t2 = tuple([1, 2]) -3 3 | t3 = tuple((1, 2)) -4 4 | t4 = tuple([ + - t1 = tuple([]) +1 + t1 = () +2 | t2 = tuple([1, 2]) +3 | t3 = tuple((1, 2)) +4 | t4 = tuple([ +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:2:6 @@ -28,14 +27,13 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 4 | t4 = tuple([ | help: Rewrite as a tuple literal - -ℹ Unsafe fix -1 1 | t1 = tuple([]) -2 |-t2 = tuple([1, 2]) - 2 |+t2 = (1, 2) -3 3 | t3 = tuple((1, 2)) -4 4 | t4 = tuple([ -5 5 | 1, +1 | t1 = tuple([]) + - t2 = tuple([1, 2]) +2 + t2 = (1, 2) +3 | t3 = tuple((1, 2)) +4 | t4 = tuple([ +5 | 1, +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:3:6 @@ -48,15 +46,14 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 5 | 1, | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -1 1 | t1 = tuple([]) -2 2 | t2 = tuple([1, 2]) -3 |-t3 = tuple((1, 2)) - 3 |+t3 = (1, 2) -4 4 | t4 = tuple([ -5 5 | 1, -6 6 | 2 +1 | t1 = tuple([]) +2 | t2 = tuple([1, 2]) + - t3 = tuple((1, 2)) +3 + t3 = (1, 2) +4 | t4 = tuple([ +5 | 1, +6 | 2 +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:4:6 @@ -73,20 +70,19 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 9 | (1, 2) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -1 1 | t1 = tuple([]) -2 2 | t2 = tuple([1, 2]) -3 3 | t3 = tuple((1, 2)) -4 |-t4 = tuple([ - 4 |+t4 = ( -5 5 | 1, -6 6 | 2 -7 |-]) - 7 |+) -8 8 | t5 = tuple( -9 9 | (1, 2) -10 10 | ) +1 | t1 = tuple([]) +2 | t2 = tuple([1, 2]) +3 | t3 = tuple((1, 2)) + - t4 = tuple([ +4 + t4 = ( +5 | 1, +6 | 2 + - ]) +7 + ) +8 | t5 = tuple( +9 | (1, 2) +10 | ) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:8:6 @@ -102,18 +98,17 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 12 | tuple( # comment | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -5 5 | 1, -6 6 | 2 -7 7 | ]) -8 |-t5 = tuple( -9 |- (1, 2) -10 |-) - 8 |+t5 = (1, 2) -11 9 | -12 10 | tuple( # comment -13 11 | [1, 2] +5 | 1, +6 | 2 +7 | ]) + - t5 = tuple( + - (1, 2) + - ) +8 + t5 = (1, 2) +9 | +10 | tuple( # comment +11 | [1, 2] +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:12:1 @@ -128,18 +123,17 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 16 | tuple([ # comment | help: Rewrite as a tuple literal - -ℹ Unsafe fix -9 9 | (1, 2) -10 10 | ) -11 11 | -12 |-tuple( # comment -13 |- [1, 2] -14 |-) - 12 |+(1, 2) -15 13 | -16 14 | tuple([ # comment -17 15 | 1, 2 +9 | (1, 2) +10 | ) +11 | + - tuple( # comment + - [1, 2] + - ) +12 + (1, 2) +13 | +14 | tuple([ # comment +15 | 1, 2 +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:16:1 @@ -154,19 +148,18 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 20 | tuple(( | help: Rewrite as a tuple literal - -ℹ Unsafe fix -13 13 | [1, 2] -14 14 | ) -15 15 | -16 |-tuple([ # comment - 16 |+( # comment -17 17 | 1, 2 -18 |-]) - 18 |+) -19 19 | -20 20 | tuple(( -21 21 | 1, +13 | [1, 2] +14 | ) +15 | + - tuple([ # comment +16 + ( # comment +17 | 1, 2 + - ]) +18 + ) +19 | +20 | tuple(( +21 | 1, +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:20:1 @@ -181,19 +174,18 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 24 | t6 = tuple([1]) | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -17 17 | 1, 2 -18 18 | ]) -19 19 | -20 |-tuple(( - 20 |+( -21 21 | 1, -22 |-)) - 22 |+) -23 23 | -24 24 | t6 = tuple([1]) -25 25 | t7 = tuple((1,)) +17 | 1, 2 +18 | ]) +19 | + - tuple(( +20 + ( +21 | 1, + - )) +22 + ) +23 | +24 | t6 = tuple([1]) +25 | t7 = tuple((1,)) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:24:6 @@ -206,16 +198,15 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 26 | t8 = tuple([1,]) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -21 21 | 1, -22 22 | )) -23 23 | -24 |-t6 = tuple([1]) - 24 |+t6 = (1,) -25 25 | t7 = tuple((1,)) -26 26 | t8 = tuple([1,]) -27 27 | +21 | 1, +22 | )) +23 | + - t6 = tuple([1]) +24 + t6 = (1,) +25 | t7 = tuple((1,)) +26 | t8 = tuple([1,]) +27 | +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:25:6 @@ -226,16 +217,15 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 26 | t8 = tuple([1,]) | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -22 22 | )) -23 23 | -24 24 | t6 = tuple([1]) -25 |-t7 = tuple((1,)) - 25 |+t7 = (1,) -26 26 | t8 = tuple([1,]) -27 27 | -28 28 | tuple([x for x in range(5)]) +22 | )) +23 | +24 | t6 = tuple([1]) + - t7 = tuple((1,)) +25 + t7 = (1,) +26 | t8 = tuple([1,]) +27 | +28 | tuple([x for x in range(5)]) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:26:6 @@ -248,13 +238,12 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 28 | tuple([x for x in range(5)]) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -23 23 | -24 24 | t6 = tuple([1]) -25 25 | t7 = tuple((1,)) -26 |-t8 = tuple([1,]) - 26 |+t8 = (1,) -27 27 | -28 28 | tuple([x for x in range(5)]) -29 29 | tuple({x for x in range(10)}) +23 | +24 | t6 = tuple([1]) +25 | t7 = tuple((1,)) + - t8 = tuple([1,]) +26 + t8 = (1,) +27 | +28 | tuple([x for x in range(5)]) +29 | tuple({x for x in range(10)}) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap index 007c0a28f3..a8f904bd5f 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C410_C410.py.snap @@ -10,13 +10,12 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to ` 3 | l3 = list([]) | help: Remove outer `list()` call - -ℹ Unsafe fix -1 |-l1 = list([1, 2]) - 1 |+l1 = [1, 2] -2 2 | l2 = list((1, 2)) -3 3 | l3 = list([]) -4 4 | l4 = list(()) + - l1 = list([1, 2]) +1 + l1 = [1, 2] +2 | l2 = list((1, 2)) +3 | l3 = list([]) +4 | l4 = list(()) +note: This is an unsafe fix and may change runtime behavior C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list literal) --> C410.py:2:6 @@ -28,14 +27,13 @@ C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list 4 | l4 = list(()) | help: Rewrite as a single list literal - -ℹ Unsafe fix -1 1 | l1 = list([1, 2]) -2 |-l2 = list((1, 2)) - 2 |+l2 = [1, 2] -3 3 | l3 = list([]) -4 4 | l4 = list(()) -5 5 | +1 | l1 = list([1, 2]) + - l2 = list((1, 2)) +2 + l2 = [1, 2] +3 | l3 = list([]) +4 | l4 = list(()) +5 | +note: This is an unsafe fix and may change runtime behavior C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `list()`) --> C410.py:3:6 @@ -47,15 +45,14 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to ` 4 | l4 = list(()) | help: Remove outer `list()` call - -ℹ Unsafe fix -1 1 | l1 = list([1, 2]) -2 2 | l2 = list((1, 2)) -3 |-l3 = list([]) - 3 |+l3 = [] -4 4 | l4 = list(()) -5 5 | -6 6 | +1 | l1 = list([1, 2]) +2 | l2 = list((1, 2)) + - l3 = list([]) +3 + l3 = [] +4 | l4 = list(()) +5 | +6 | +note: This is an unsafe fix and may change runtime behavior C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list literal) --> C410.py:4:6 @@ -66,16 +63,15 @@ C410 [*] Unnecessary tuple literal passed to `list()` (rewrite as a single list | ^^^^^^^^ | help: Rewrite as a single list literal - -ℹ Unsafe fix -1 1 | l1 = list([1, 2]) -2 2 | l2 = list((1, 2)) -3 3 | l3 = list([]) -4 |-l4 = list(()) - 4 |+l4 = [] -5 5 | -6 6 | -7 7 | list( # comment +1 | l1 = list([1, 2]) +2 | l2 = list((1, 2)) +3 | l3 = list([]) + - l4 = list(()) +4 + l4 = [] +5 | +6 | +7 | list( # comment +note: This is an unsafe fix and may change runtime behavior C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `list()`) --> C410.py:7:1 @@ -88,18 +84,17 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to ` 11 | list([ # comment | help: Remove outer `list()` call - -ℹ Unsafe fix -4 4 | l4 = list(()) -5 5 | -6 6 | -7 |-list( # comment -8 |- [1, 2] -9 |-) - 7 |+[1, 2] -10 8 | -11 9 | list([ # comment -12 10 | 1, 2 +4 | l4 = list(()) +5 | +6 | + - list( # comment + - [1, 2] + - ) +7 + [1, 2] +8 | +9 | list([ # comment +10 | 1, 2 +note: This is an unsafe fix and may change runtime behavior C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to `list()`) --> C410.py:11:1 @@ -114,16 +109,15 @@ C410 [*] Unnecessary list literal passed to `list()` (remove the outer call to ` 15 | # Skip when too many positional arguments | help: Remove outer `list()` call - -ℹ Unsafe fix -8 8 | [1, 2] -9 9 | ) -10 10 | -11 |-list([ # comment - 11 |+[ # comment -12 12 | 1, 2 -13 |-]) - 13 |+] -14 14 | -15 15 | # Skip when too many positional arguments -16 16 | # See https://github.com/astral-sh/ruff/issues/15810 +8 | [1, 2] +9 | ) +10 | + - list([ # comment +11 + [ # comment +12 | 1, 2 + - ]) +13 + ] +14 | +15 | # Skip when too many positional arguments +16 | # See https://github.com/astral-sh/ruff/issues/15810 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap index 97a9e26e57..dc3353fefd 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C411_C411.py.snap @@ -11,11 +11,10 @@ C411 [*] Unnecessary `list()` call (remove the outer call to `list()`) 4 | # Skip when too many positional arguments | help: Remove outer `list()` call - -ℹ Unsafe fix -1 1 | x = [1, 2, 3] -2 |-list([i for i in x]) - 2 |+[i for i in x] -3 3 | -4 4 | # Skip when too many positional arguments -5 5 | # or keyword argument present. +1 | x = [1, 2, 3] + - list([i for i in x]) +2 + [i for i in x] +3 | +4 | # Skip when too many positional arguments +5 | # or keyword argument present. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap index ac89c788b0..e52995335c 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C413_C413.py.snap @@ -12,15 +12,13 @@ C413 [*] Unnecessary `list()` call around `sorted()` 5 | reversed(sorted(x, key=lambda e: e)) | help: Remove unnecessary `list()` call - -ℹ Safe fix -1 1 | x = [2, 3, 1] -2 2 | list(x) -3 |-list(sorted(x)) - 3 |+sorted(x) -4 4 | reversed(sorted(x)) -5 5 | reversed(sorted(x, key=lambda e: e)) -6 6 | reversed(sorted(x, reverse=True)) +1 | x = [2, 3, 1] +2 | list(x) + - list(sorted(x)) +3 + sorted(x) +4 | reversed(sorted(x)) +5 | reversed(sorted(x, key=lambda e: e)) +6 | reversed(sorted(x, reverse=True)) C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:4:1 @@ -33,16 +31,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 6 | reversed(sorted(x, reverse=True)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -1 1 | x = [2, 3, 1] -2 2 | list(x) -3 3 | list(sorted(x)) -4 |-reversed(sorted(x)) - 4 |+sorted(x, reverse=True) -5 5 | reversed(sorted(x, key=lambda e: e)) -6 6 | reversed(sorted(x, reverse=True)) -7 7 | reversed(sorted(x, key=lambda e: e, reverse=True)) +1 | x = [2, 3, 1] +2 | list(x) +3 | list(sorted(x)) + - reversed(sorted(x)) +4 + sorted(x, reverse=True) +5 | reversed(sorted(x, key=lambda e: e)) +6 | reversed(sorted(x, reverse=True)) +7 | reversed(sorted(x, key=lambda e: e, reverse=True)) +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:5:1 @@ -55,16 +52,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 7 | reversed(sorted(x, key=lambda e: e, reverse=True)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -2 2 | list(x) -3 3 | list(sorted(x)) -4 4 | reversed(sorted(x)) -5 |-reversed(sorted(x, key=lambda e: e)) - 5 |+sorted(x, key=lambda e: e, reverse=True) -6 6 | reversed(sorted(x, reverse=True)) -7 7 | reversed(sorted(x, key=lambda e: e, reverse=True)) -8 8 | reversed(sorted(x, reverse=True, key=lambda e: e)) +2 | list(x) +3 | list(sorted(x)) +4 | reversed(sorted(x)) + - reversed(sorted(x, key=lambda e: e)) +5 + sorted(x, key=lambda e: e, reverse=True) +6 | reversed(sorted(x, reverse=True)) +7 | reversed(sorted(x, key=lambda e: e, reverse=True)) +8 | reversed(sorted(x, reverse=True, key=lambda e: e)) +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:6:1 @@ -77,16 +73,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 8 | reversed(sorted(x, reverse=True, key=lambda e: e)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -3 3 | list(sorted(x)) -4 4 | reversed(sorted(x)) -5 5 | reversed(sorted(x, key=lambda e: e)) -6 |-reversed(sorted(x, reverse=True)) - 6 |+sorted(x, reverse=False) -7 7 | reversed(sorted(x, key=lambda e: e, reverse=True)) -8 8 | reversed(sorted(x, reverse=True, key=lambda e: e)) -9 9 | reversed(sorted(x, reverse=False)) +3 | list(sorted(x)) +4 | reversed(sorted(x)) +5 | reversed(sorted(x, key=lambda e: e)) + - reversed(sorted(x, reverse=True)) +6 + sorted(x, reverse=False) +7 | reversed(sorted(x, key=lambda e: e, reverse=True)) +8 | reversed(sorted(x, reverse=True, key=lambda e: e)) +9 | reversed(sorted(x, reverse=False)) +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:7:1 @@ -99,16 +94,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 9 | reversed(sorted(x, reverse=False)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -4 4 | reversed(sorted(x)) -5 5 | reversed(sorted(x, key=lambda e: e)) -6 6 | reversed(sorted(x, reverse=True)) -7 |-reversed(sorted(x, key=lambda e: e, reverse=True)) - 7 |+sorted(x, key=lambda e: e, reverse=False) -8 8 | reversed(sorted(x, reverse=True, key=lambda e: e)) -9 9 | reversed(sorted(x, reverse=False)) -10 10 | reversed(sorted(x, reverse=x)) +4 | reversed(sorted(x)) +5 | reversed(sorted(x, key=lambda e: e)) +6 | reversed(sorted(x, reverse=True)) + - reversed(sorted(x, key=lambda e: e, reverse=True)) +7 + sorted(x, key=lambda e: e, reverse=False) +8 | reversed(sorted(x, reverse=True, key=lambda e: e)) +9 | reversed(sorted(x, reverse=False)) +10 | reversed(sorted(x, reverse=x)) +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:8:1 @@ -121,16 +115,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 10 | reversed(sorted(x, reverse=x)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -5 5 | reversed(sorted(x, key=lambda e: e)) -6 6 | reversed(sorted(x, reverse=True)) -7 7 | reversed(sorted(x, key=lambda e: e, reverse=True)) -8 |-reversed(sorted(x, reverse=True, key=lambda e: e)) - 8 |+sorted(x, reverse=False, key=lambda e: e) -9 9 | reversed(sorted(x, reverse=False)) -10 10 | reversed(sorted(x, reverse=x)) -11 11 | reversed(sorted(x, reverse=not x)) +5 | reversed(sorted(x, key=lambda e: e)) +6 | reversed(sorted(x, reverse=True)) +7 | reversed(sorted(x, key=lambda e: e, reverse=True)) + - reversed(sorted(x, reverse=True, key=lambda e: e)) +8 + sorted(x, reverse=False, key=lambda e: e) +9 | reversed(sorted(x, reverse=False)) +10 | reversed(sorted(x, reverse=x)) +11 | reversed(sorted(x, reverse=not x)) +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:9:1 @@ -143,16 +136,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 11 | reversed(sorted(x, reverse=not x)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -6 6 | reversed(sorted(x, reverse=True)) -7 7 | reversed(sorted(x, key=lambda e: e, reverse=True)) -8 8 | reversed(sorted(x, reverse=True, key=lambda e: e)) -9 |-reversed(sorted(x, reverse=False)) - 9 |+sorted(x, reverse=True) -10 10 | reversed(sorted(x, reverse=x)) -11 11 | reversed(sorted(x, reverse=not x)) -12 12 | +6 | reversed(sorted(x, reverse=True)) +7 | reversed(sorted(x, key=lambda e: e, reverse=True)) +8 | reversed(sorted(x, reverse=True, key=lambda e: e)) + - reversed(sorted(x, reverse=False)) +9 + sorted(x, reverse=True) +10 | reversed(sorted(x, reverse=x)) +11 | reversed(sorted(x, reverse=not x)) +12 | +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:10:1 @@ -164,16 +156,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 11 | reversed(sorted(x, reverse=not x)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -7 7 | reversed(sorted(x, key=lambda e: e, reverse=True)) -8 8 | reversed(sorted(x, reverse=True, key=lambda e: e)) -9 9 | reversed(sorted(x, reverse=False)) -10 |-reversed(sorted(x, reverse=x)) - 10 |+sorted(x, reverse=not x) -11 11 | reversed(sorted(x, reverse=not x)) -12 12 | -13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 +7 | reversed(sorted(x, key=lambda e: e, reverse=True)) +8 | reversed(sorted(x, reverse=True, key=lambda e: e)) +9 | reversed(sorted(x, reverse=False)) + - reversed(sorted(x, reverse=x)) +10 + sorted(x, reverse=not x) +11 | reversed(sorted(x, reverse=not x)) +12 | +13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:11:1 @@ -186,16 +177,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -8 8 | reversed(sorted(x, reverse=True, key=lambda e: e)) -9 9 | reversed(sorted(x, reverse=False)) -10 10 | reversed(sorted(x, reverse=x)) -11 |-reversed(sorted(x, reverse=not x)) - 11 |+sorted(x, reverse=x) -12 12 | -13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 -14 14 | reversed(sorted(i for i in range(42))) +8 | reversed(sorted(x, reverse=True, key=lambda e: e)) +9 | reversed(sorted(x, reverse=False)) +10 | reversed(sorted(x, reverse=x)) + - reversed(sorted(x, reverse=not x)) +11 + sorted(x, reverse=x) +12 | +13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 +14 | reversed(sorted(i for i in range(42))) +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:14:1 @@ -206,16 +196,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 15 | reversed(sorted((i for i in range(42)), reverse=True)) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -11 11 | reversed(sorted(x, reverse=not x)) -12 12 | -13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 -14 |-reversed(sorted(i for i in range(42))) - 14 |+sorted((i for i in range(42)), reverse=True) -15 15 | reversed(sorted((i for i in range(42)), reverse=True)) -16 16 | -17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 +11 | reversed(sorted(x, reverse=not x)) +12 | +13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 + - reversed(sorted(i for i in range(42))) +14 + sorted((i for i in range(42)), reverse=True) +15 | reversed(sorted((i for i in range(42)), reverse=True)) +16 | +17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:15:1 @@ -228,16 +217,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -12 12 | -13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 -14 14 | reversed(sorted(i for i in range(42))) -15 |-reversed(sorted((i for i in range(42)), reverse=True)) - 15 |+sorted((i for i in range(42)), reverse=False) -16 16 | -17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 -18 18 | reversed(sorted([1, 2, 3], reverse=False or True)) +12 | +13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7289 +14 | reversed(sorted(i for i in range(42))) + - reversed(sorted((i for i in range(42)), reverse=True)) +15 + sorted((i for i in range(42)), reverse=False) +16 | +17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 +18 | reversed(sorted([1, 2, 3], reverse=False or True)) +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:18:1 @@ -248,16 +236,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 19 | reversed(sorted([1, 2, 3], reverse=(False or True))) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -15 15 | reversed(sorted((i for i in range(42)), reverse=True)) -16 16 | -17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 -18 |-reversed(sorted([1, 2, 3], reverse=False or True)) - 18 |+sorted([1, 2, 3], reverse=not (False or True)) -19 19 | reversed(sorted([1, 2, 3], reverse=(False or True))) -20 20 | -21 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior +15 | reversed(sorted((i for i in range(42)), reverse=True)) +16 | +17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 + - reversed(sorted([1, 2, 3], reverse=False or True)) +18 + sorted([1, 2, 3], reverse=not (False or True)) +19 | reversed(sorted([1, 2, 3], reverse=(False or True))) +20 | +21 | # These fixes need to be parenthesized to avoid syntax errors and behavior +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:19:1 @@ -270,16 +257,15 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -16 16 | -17 17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 -18 18 | reversed(sorted([1, 2, 3], reverse=False or True)) -19 |-reversed(sorted([1, 2, 3], reverse=(False or True))) - 19 |+sorted([1, 2, 3], reverse=not (False or True)) -20 20 | -21 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior -22 22 | # changes. +16 | +17 | # Regression test for: https://github.com/astral-sh/ruff/issues/10335 +18 | reversed(sorted([1, 2, 3], reverse=False or True)) + - reversed(sorted([1, 2, 3], reverse=(False or True))) +19 + sorted([1, 2, 3], reverse=not (False or True)) +20 | +21 | # These fixes need to be parenthesized to avoid syntax errors and behavior +22 | # changes. +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `reversed()` call around `sorted()` --> C413.py:24:1 @@ -293,18 +279,17 @@ C413 [*] Unnecessary `reversed()` call around `sorted()` 27 | ("")) | help: Remove unnecessary `reversed()` call - -ℹ Unsafe fix -21 21 | # These fixes need to be parenthesized to avoid syntax errors and behavior -22 22 | # changes. -23 23 | # See https://github.com/astral-sh/ruff/issues/15789 -24 |-reversed(sorted -25 |-("")) - 24 |+(sorted - 25 |+("", reverse=True)) -26 26 | list(sorted -27 27 | ("")) -28 28 | list(sorted +21 | # These fixes need to be parenthesized to avoid syntax errors and behavior +22 | # changes. +23 | # See https://github.com/astral-sh/ruff/issues/15789 + - reversed(sorted + - ("")) +24 + (sorted +25 + ("", reverse=True)) +26 | list(sorted +27 | ("")) +28 | list(sorted +note: This is an unsafe fix and may change runtime behavior C413 [*] Unnecessary `list()` call around `sorted()` --> C413.py:26:1 @@ -318,16 +303,14 @@ C413 [*] Unnecessary `list()` call around `sorted()` 29 | ("xy")) | help: Remove unnecessary `list()` call - -ℹ Safe fix -23 23 | # See https://github.com/astral-sh/ruff/issues/15789 -24 24 | reversed(sorted -25 25 | ("")) -26 |-list(sorted - 26 |+(sorted -27 27 | ("")) -28 28 | list(sorted -29 29 | ("xy")) +23 | # See https://github.com/astral-sh/ruff/issues/15789 +24 | reversed(sorted +25 | ("")) + - list(sorted +26 + (sorted +27 | ("")) +28 | list(sorted +29 | ("xy")) C413 [*] Unnecessary `list()` call around `sorted()` --> C413.py:28:1 @@ -339,11 +322,9 @@ C413 [*] Unnecessary `list()` call around `sorted()` | |_______^ | help: Remove unnecessary `list()` call - -ℹ Safe fix -25 25 | ("")) -26 26 | list(sorted -27 27 | ("")) -28 |-list(sorted - 28 |+(sorted -29 29 | ("xy")) +25 | ("")) +26 | list(sorted +27 | ("")) + - list(sorted +28 + (sorted +29 | ("xy")) diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap index 322fd197f9..8205a3921d 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C414_C414.py.snap @@ -11,14 +11,13 @@ C414 [*] Unnecessary `list()` call within `list()` 4 | tuple(list(x)) | help: Remove the inner `list()` call - -ℹ Unsafe fix -1 1 | x = [1, 2, 3] -2 |-list(list(x)) - 2 |+list(x) -3 3 | list(tuple(x)) -4 4 | tuple(list(x)) -5 5 | tuple(tuple(x)) +1 | x = [1, 2, 3] + - list(list(x)) +2 + list(x) +3 | list(tuple(x)) +4 | tuple(list(x)) +5 | tuple(tuple(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `tuple()` call within `list()` --> C414.py:3:1 @@ -31,15 +30,14 @@ C414 [*] Unnecessary `tuple()` call within `list()` 5 | tuple(tuple(x)) | help: Remove the inner `tuple()` call - -ℹ Unsafe fix -1 1 | x = [1, 2, 3] -2 2 | list(list(x)) -3 |-list(tuple(x)) - 3 |+list(x) -4 4 | tuple(list(x)) -5 5 | tuple(tuple(x)) -6 6 | set(set(x)) +1 | x = [1, 2, 3] +2 | list(list(x)) + - list(tuple(x)) +3 + list(x) +4 | tuple(list(x)) +5 | tuple(tuple(x)) +6 | set(set(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `tuple()` --> C414.py:4:1 @@ -52,16 +50,15 @@ C414 [*] Unnecessary `list()` call within `tuple()` 6 | set(set(x)) | help: Remove the inner `list()` call - -ℹ Unsafe fix -1 1 | x = [1, 2, 3] -2 2 | list(list(x)) -3 3 | list(tuple(x)) -4 |-tuple(list(x)) - 4 |+tuple(x) -5 5 | tuple(tuple(x)) -6 6 | set(set(x)) -7 7 | set(list(x)) +1 | x = [1, 2, 3] +2 | list(list(x)) +3 | list(tuple(x)) + - tuple(list(x)) +4 + tuple(x) +5 | tuple(tuple(x)) +6 | set(set(x)) +7 | set(list(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `tuple()` call within `tuple()` --> C414.py:5:1 @@ -74,16 +71,15 @@ C414 [*] Unnecessary `tuple()` call within `tuple()` 7 | set(list(x)) | help: Remove the inner `tuple()` call - -ℹ Unsafe fix -2 2 | list(list(x)) -3 3 | list(tuple(x)) -4 4 | tuple(list(x)) -5 |-tuple(tuple(x)) - 5 |+tuple(x) -6 6 | set(set(x)) -7 7 | set(list(x)) -8 8 | set(tuple(x)) +2 | list(list(x)) +3 | list(tuple(x)) +4 | tuple(list(x)) + - tuple(tuple(x)) +5 + tuple(x) +6 | set(set(x)) +7 | set(list(x)) +8 | set(tuple(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `set()` call within `set()` --> C414.py:6:1 @@ -96,16 +92,15 @@ C414 [*] Unnecessary `set()` call within `set()` 8 | set(tuple(x)) | help: Remove the inner `set()` call - -ℹ Unsafe fix -3 3 | list(tuple(x)) -4 4 | tuple(list(x)) -5 5 | tuple(tuple(x)) -6 |-set(set(x)) - 6 |+set(x) -7 7 | set(list(x)) -8 8 | set(tuple(x)) -9 9 | set(sorted(x)) +3 | list(tuple(x)) +4 | tuple(list(x)) +5 | tuple(tuple(x)) + - set(set(x)) +6 + set(x) +7 | set(list(x)) +8 | set(tuple(x)) +9 | set(sorted(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `set()` --> C414.py:7:1 @@ -118,16 +113,15 @@ C414 [*] Unnecessary `list()` call within `set()` 9 | set(sorted(x)) | help: Remove the inner `list()` call - -ℹ Unsafe fix -4 4 | tuple(list(x)) -5 5 | tuple(tuple(x)) -6 6 | set(set(x)) -7 |-set(list(x)) - 7 |+set(x) -8 8 | set(tuple(x)) -9 9 | set(sorted(x)) -10 10 | set(sorted(x, key=lambda y: y)) +4 | tuple(list(x)) +5 | tuple(tuple(x)) +6 | set(set(x)) + - set(list(x)) +7 + set(x) +8 | set(tuple(x)) +9 | set(sorted(x)) +10 | set(sorted(x, key=lambda y: y)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `tuple()` call within `set()` --> C414.py:8:1 @@ -140,16 +134,15 @@ C414 [*] Unnecessary `tuple()` call within `set()` 10 | set(sorted(x, key=lambda y: y)) | help: Remove the inner `tuple()` call - -ℹ Unsafe fix -5 5 | tuple(tuple(x)) -6 6 | set(set(x)) -7 7 | set(list(x)) -8 |-set(tuple(x)) - 8 |+set(x) -9 9 | set(sorted(x)) -10 10 | set(sorted(x, key=lambda y: y)) -11 11 | set(reversed(x)) +5 | tuple(tuple(x)) +6 | set(set(x)) +7 | set(list(x)) + - set(tuple(x)) +8 + set(x) +9 | set(sorted(x)) +10 | set(sorted(x, key=lambda y: y)) +11 | set(reversed(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `sorted()` call within `set()` --> C414.py:9:1 @@ -162,16 +155,15 @@ C414 [*] Unnecessary `sorted()` call within `set()` 11 | set(reversed(x)) | help: Remove the inner `sorted()` call - -ℹ Unsafe fix -6 6 | set(set(x)) -7 7 | set(list(x)) -8 8 | set(tuple(x)) -9 |-set(sorted(x)) - 9 |+set(x) -10 10 | set(sorted(x, key=lambda y: y)) -11 11 | set(reversed(x)) -12 12 | sorted(list(x)) +6 | set(set(x)) +7 | set(list(x)) +8 | set(tuple(x)) + - set(sorted(x)) +9 + set(x) +10 | set(sorted(x, key=lambda y: y)) +11 | set(reversed(x)) +12 | sorted(list(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `sorted()` call within `set()` --> C414.py:10:1 @@ -184,16 +176,15 @@ C414 [*] Unnecessary `sorted()` call within `set()` 12 | sorted(list(x)) | help: Remove the inner `sorted()` call - -ℹ Unsafe fix -7 7 | set(list(x)) -8 8 | set(tuple(x)) -9 9 | set(sorted(x)) -10 |-set(sorted(x, key=lambda y: y)) - 10 |+set(x) -11 11 | set(reversed(x)) -12 12 | sorted(list(x)) -13 13 | sorted(tuple(x)) +7 | set(list(x)) +8 | set(tuple(x)) +9 | set(sorted(x)) + - set(sorted(x, key=lambda y: y)) +10 + set(x) +11 | set(reversed(x)) +12 | sorted(list(x)) +13 | sorted(tuple(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `reversed()` call within `set()` --> C414.py:11:1 @@ -206,16 +197,15 @@ C414 [*] Unnecessary `reversed()` call within `set()` 13 | sorted(tuple(x)) | help: Remove the inner `reversed()` call - -ℹ Unsafe fix -8 8 | set(tuple(x)) -9 9 | set(sorted(x)) -10 10 | set(sorted(x, key=lambda y: y)) -11 |-set(reversed(x)) - 11 |+set(x) -12 12 | sorted(list(x)) -13 13 | sorted(tuple(x)) -14 14 | sorted(sorted(x)) +8 | set(tuple(x)) +9 | set(sorted(x)) +10 | set(sorted(x, key=lambda y: y)) + - set(reversed(x)) +11 + set(x) +12 | sorted(list(x)) +13 | sorted(tuple(x)) +14 | sorted(sorted(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `sorted()` --> C414.py:12:1 @@ -228,16 +218,15 @@ C414 [*] Unnecessary `list()` call within `sorted()` 14 | sorted(sorted(x)) | help: Remove the inner `list()` call - -ℹ Unsafe fix -9 9 | set(sorted(x)) -10 10 | set(sorted(x, key=lambda y: y)) -11 11 | set(reversed(x)) -12 |-sorted(list(x)) - 12 |+sorted(x) -13 13 | sorted(tuple(x)) -14 14 | sorted(sorted(x)) -15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) +9 | set(sorted(x)) +10 | set(sorted(x, key=lambda y: y)) +11 | set(reversed(x)) + - sorted(list(x)) +12 + sorted(x) +13 | sorted(tuple(x)) +14 | sorted(sorted(x)) +15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `tuple()` call within `sorted()` --> C414.py:13:1 @@ -250,16 +239,15 @@ C414 [*] Unnecessary `tuple()` call within `sorted()` 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) | help: Remove the inner `tuple()` call - -ℹ Unsafe fix -10 10 | set(sorted(x, key=lambda y: y)) -11 11 | set(reversed(x)) -12 12 | sorted(list(x)) -13 |-sorted(tuple(x)) - 13 |+sorted(x) -14 14 | sorted(sorted(x)) -15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) -16 16 | sorted(sorted(x, reverse=True), reverse=True) +10 | set(sorted(x, key=lambda y: y)) +11 | set(reversed(x)) +12 | sorted(list(x)) + - sorted(tuple(x)) +13 + sorted(x) +14 | sorted(sorted(x)) +15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) +16 | sorted(sorted(x, reverse=True), reverse=True) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `sorted()` call within `sorted()` --> C414.py:14:1 @@ -272,16 +260,15 @@ C414 [*] Unnecessary `sorted()` call within `sorted()` 16 | sorted(sorted(x, reverse=True), reverse=True) | help: Remove the inner `sorted()` call - -ℹ Unsafe fix -11 11 | set(reversed(x)) -12 12 | sorted(list(x)) -13 13 | sorted(tuple(x)) -14 |-sorted(sorted(x)) - 14 |+sorted(x) -15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) -16 16 | sorted(sorted(x, reverse=True), reverse=True) -17 17 | sorted(reversed(x)) +11 | set(reversed(x)) +12 | sorted(list(x)) +13 | sorted(tuple(x)) + - sorted(sorted(x)) +14 + sorted(x) +15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) +16 | sorted(sorted(x, reverse=True), reverse=True) +17 | sorted(reversed(x)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `sorted()` call within `sorted()` --> C414.py:15:1 @@ -294,16 +281,15 @@ C414 [*] Unnecessary `sorted()` call within `sorted()` 17 | sorted(reversed(x)) | help: Remove the inner `sorted()` call - -ℹ Unsafe fix -12 12 | sorted(list(x)) -13 13 | sorted(tuple(x)) -14 14 | sorted(sorted(x)) -15 |-sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) - 15 |+sorted(x, reverse=False, key=foo) -16 16 | sorted(sorted(x, reverse=True), reverse=True) -17 17 | sorted(reversed(x)) -18 18 | sorted(list(x), key=lambda y: y) +12 | sorted(list(x)) +13 | sorted(tuple(x)) +14 | sorted(sorted(x)) + - sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) +15 + sorted(x, reverse=False, key=foo) +16 | sorted(sorted(x, reverse=True), reverse=True) +17 | sorted(reversed(x)) +18 | sorted(list(x), key=lambda y: y) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `sorted()` call within `sorted()` --> C414.py:16:1 @@ -316,16 +302,15 @@ C414 [*] Unnecessary `sorted()` call within `sorted()` 18 | sorted(list(x), key=lambda y: y) | help: Remove the inner `sorted()` call - -ℹ Unsafe fix -13 13 | sorted(tuple(x)) -14 14 | sorted(sorted(x)) -15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) -16 |-sorted(sorted(x, reverse=True), reverse=True) - 16 |+sorted(x, reverse=True) -17 17 | sorted(reversed(x)) -18 18 | sorted(list(x), key=lambda y: y) -19 19 | tuple( +13 | sorted(tuple(x)) +14 | sorted(sorted(x)) +15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) + - sorted(sorted(x, reverse=True), reverse=True) +16 + sorted(x, reverse=True) +17 | sorted(reversed(x)) +18 | sorted(list(x), key=lambda y: y) +19 | tuple( +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `reversed()` call within `sorted()` --> C414.py:17:1 @@ -338,16 +323,15 @@ C414 [*] Unnecessary `reversed()` call within `sorted()` 19 | tuple( | help: Remove the inner `reversed()` call - -ℹ Unsafe fix -14 14 | sorted(sorted(x)) -15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) -16 16 | sorted(sorted(x, reverse=True), reverse=True) -17 |-sorted(reversed(x)) - 17 |+sorted(x) -18 18 | sorted(list(x), key=lambda y: y) -19 19 | tuple( -20 20 | list( +14 | sorted(sorted(x)) +15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) +16 | sorted(sorted(x, reverse=True), reverse=True) + - sorted(reversed(x)) +17 + sorted(x) +18 | sorted(list(x), key=lambda y: y) +19 | tuple( +20 | list( +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `sorted()` --> C414.py:18:1 @@ -360,16 +344,15 @@ C414 [*] Unnecessary `list()` call within `sorted()` 20 | list( | help: Remove the inner `list()` call - -ℹ Unsafe fix -15 15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) -16 16 | sorted(sorted(x, reverse=True), reverse=True) -17 17 | sorted(reversed(x)) -18 |-sorted(list(x), key=lambda y: y) - 18 |+sorted(x, key=lambda y: y) -19 19 | tuple( -20 20 | list( -21 21 | [x, 3, "hell"\ +15 | sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo) +16 | sorted(sorted(x, reverse=True), reverse=True) +17 | sorted(reversed(x)) + - sorted(list(x), key=lambda y: y) +18 + sorted(x, key=lambda y: y) +19 | tuple( +20 | list( +21 | [x, 3, "hell"\ +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `tuple()` --> C414.py:19:1 @@ -387,19 +370,18 @@ C414 [*] Unnecessary `list()` call within `tuple()` 26 | set(list()) | help: Remove the inner `list()` call - -ℹ Unsafe fix -17 17 | sorted(reversed(x)) -18 18 | sorted(list(x), key=lambda y: y) -19 19 | tuple( -20 |- list( -21 |- [x, 3, "hell"\ - 20 |+ [x, 3, "hell"\ -22 21 | "o"] -23 |- ) -24 22 | ) -25 23 | set(set()) -26 24 | set(list()) +17 | sorted(reversed(x)) +18 | sorted(list(x), key=lambda y: y) +19 | tuple( + - list( + - [x, 3, "hell"\ +20 + [x, 3, "hell"\ +21 | "o"] + - ) +22 | ) +23 | set(set()) +24 | set(list()) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `set()` call within `set()` --> C414.py:25:1 @@ -412,16 +394,15 @@ C414 [*] Unnecessary `set()` call within `set()` 27 | set(tuple()) | help: Remove the inner `set()` call - -ℹ Unsafe fix -22 22 | "o"] -23 23 | ) -24 24 | ) -25 |-set(set()) - 25 |+set() -26 26 | set(list()) -27 27 | set(tuple()) -28 28 | sorted(reversed()) +22 | "o"] +23 | ) +24 | ) + - set(set()) +25 + set() +26 | set(list()) +27 | set(tuple()) +28 | sorted(reversed()) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `set()` --> C414.py:26:1 @@ -434,16 +415,15 @@ C414 [*] Unnecessary `list()` call within `set()` 28 | sorted(reversed()) | help: Remove the inner `list()` call - -ℹ Unsafe fix -23 23 | ) -24 24 | ) -25 25 | set(set()) -26 |-set(list()) - 26 |+set() -27 27 | set(tuple()) -28 28 | sorted(reversed()) -29 29 | +23 | ) +24 | ) +25 | set(set()) + - set(list()) +26 + set() +27 | set(tuple()) +28 | sorted(reversed()) +29 | +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `tuple()` call within `set()` --> C414.py:27:1 @@ -455,16 +435,15 @@ C414 [*] Unnecessary `tuple()` call within `set()` 28 | sorted(reversed()) | help: Remove the inner `tuple()` call - -ℹ Unsafe fix -24 24 | ) -25 25 | set(set()) -26 26 | set(list()) -27 |-set(tuple()) - 27 |+set() -28 28 | sorted(reversed()) -29 29 | -30 30 | # Nested sorts with differing keyword arguments. Not flagged. +24 | ) +25 | set(set()) +26 | set(list()) + - set(tuple()) +27 + set() +28 | sorted(reversed()) +29 | +30 | # Nested sorts with differing keyword arguments. Not flagged. +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `reversed()` call within `sorted()` --> C414.py:28:1 @@ -477,16 +456,15 @@ C414 [*] Unnecessary `reversed()` call within `sorted()` 30 | # Nested sorts with differing keyword arguments. Not flagged. | help: Remove the inner `reversed()` call - -ℹ Unsafe fix -25 25 | set(set()) -26 26 | set(list()) -27 27 | set(tuple()) -28 |-sorted(reversed()) - 28 |+sorted() -29 29 | -30 30 | # Nested sorts with differing keyword arguments. Not flagged. -31 31 | sorted(sorted(x, key=lambda y: y)) +25 | set(set()) +26 | set(list()) +27 | set(tuple()) + - sorted(reversed()) +28 + sorted() +29 | +30 | # Nested sorts with differing keyword arguments. Not flagged. +31 | sorted(sorted(x, key=lambda y: y)) +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `sorted()` --> C414.py:37:27 @@ -504,16 +482,15 @@ C414 [*] Unnecessary `list()` call within `sorted()` 44 | xxxxxxxxxxx_xxxxx_xxxxx = sorted( | help: Remove the inner `list()` call - -ℹ Unsafe fix -35 35 | -36 36 | # Preserve trailing comments. -37 37 | xxxxxxxxxxx_xxxxx_xxxxx = sorted( -38 |- list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()), - 38 |+ x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(), -39 39 | # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx, xxx xxxxxx3 xxxxxxxxx xx -40 40 | # xx xxxx xxxxxxx xxxx xxx xxxxxxxx Nxxx -41 41 | key=lambda xxxxx: xxxxx or "", +35 | +36 | # Preserve trailing comments. +37 | xxxxxxxxxxx_xxxxx_xxxxx = sorted( + - list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()), +38 + x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(), +39 | # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx, xxx xxxxxx3 xxxxxxxxx xx +40 | # xx xxxx xxxxxxx xxxx xxx xxxxxxxx Nxxx +41 | key=lambda xxxxx: xxxxx or "", +note: This is an unsafe fix and may change runtime behavior C414 [*] Unnecessary `list()` call within `sorted()` --> C414.py:44:27 @@ -528,12 +505,11 @@ C414 [*] Unnecessary `list()` call within `sorted()` | |_^ | help: Remove the inner `list()` call - -ℹ Unsafe fix -42 42 | ) -43 43 | -44 44 | xxxxxxxxxxx_xxxxx_xxxxx = sorted( -45 |- list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()), # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx - 45 |+ x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(), # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx -46 46 | key=lambda xxxxx: xxxxx or "", -47 47 | ) +42 | ) +43 | +44 | xxxxxxxxxxx_xxxxx_xxxxx = sorted( + - list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()), # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx +45 + x_xxxx_xxxxxxxxxxx_xxxxx.xxxx(), # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx +46 | key=lambda xxxxx: xxxxx or "", +47 | ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap index 71cbe567e4..49fde775dc 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C416_C416.py.snap @@ -12,16 +12,15 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`) 8 | {k: v for k, v in y} | help: Rewrite using `list()` - -ℹ Unsafe fix -3 3 | z = [(1,), (2,), (3,)] -4 4 | d = {"a": 1, "b": 2, "c": 3} -5 5 | -6 |-[i for i in x] - 6 |+list(x) -7 7 | {i for i in x} -8 8 | {k: v for k, v in y} -9 9 | {k: v for k, v in d.items()} +3 | z = [(1,), (2,), (3,)] +4 | d = {"a": 1, "b": 2, "c": 3} +5 | + - [i for i in x] +6 + list(x) +7 | {i for i in x} +8 | {k: v for k, v in y} +9 | {k: v for k, v in d.items()} +note: This is an unsafe fix and may change runtime behavior C416 [*] Unnecessary set comprehension (rewrite using `set()`) --> C416.py:7:1 @@ -33,16 +32,15 @@ C416 [*] Unnecessary set comprehension (rewrite using `set()`) 9 | {k: v for k, v in d.items()} | help: Rewrite using `set()` - -ℹ Unsafe fix -4 4 | d = {"a": 1, "b": 2, "c": 3} -5 5 | -6 6 | [i for i in x] -7 |-{i for i in x} - 7 |+set(x) -8 8 | {k: v for k, v in y} -9 9 | {k: v for k, v in d.items()} -10 10 | [(k, v) for k, v in d.items()] +4 | d = {"a": 1, "b": 2, "c": 3} +5 | +6 | [i for i in x] + - {i for i in x} +7 + set(x) +8 | {k: v for k, v in y} +9 | {k: v for k, v in d.items()} +10 | [(k, v) for k, v in d.items()] +note: This is an unsafe fix and may change runtime behavior C416 [*] Unnecessary dict comprehension (rewrite using `dict()`) --> C416.py:8:1 @@ -55,16 +53,15 @@ C416 [*] Unnecessary dict comprehension (rewrite using `dict()`) 10 | [(k, v) for k, v in d.items()] | help: Rewrite using `dict()` - -ℹ Unsafe fix -5 5 | -6 6 | [i for i in x] -7 7 | {i for i in x} -8 |-{k: v for k, v in y} - 8 |+dict(y) -9 9 | {k: v for k, v in d.items()} -10 10 | [(k, v) for k, v in d.items()] -11 11 | [(k, v) for [k, v] in d.items()] +5 | +6 | [i for i in x] +7 | {i for i in x} + - {k: v for k, v in y} +8 + dict(y) +9 | {k: v for k, v in d.items()} +10 | [(k, v) for k, v in d.items()] +11 | [(k, v) for [k, v] in d.items()] +note: This is an unsafe fix and may change runtime behavior C416 [*] Unnecessary dict comprehension (rewrite using `dict()`) --> C416.py:9:1 @@ -77,16 +74,15 @@ C416 [*] Unnecessary dict comprehension (rewrite using `dict()`) 11 | [(k, v) for [k, v] in d.items()] | help: Rewrite using `dict()` - -ℹ Unsafe fix -6 6 | [i for i in x] -7 7 | {i for i in x} -8 8 | {k: v for k, v in y} -9 |-{k: v for k, v in d.items()} - 9 |+dict(d.items()) -10 10 | [(k, v) for k, v in d.items()] -11 11 | [(k, v) for [k, v] in d.items()] -12 12 | {k: (a, b) for k, (a, b) in d.items()} +6 | [i for i in x] +7 | {i for i in x} +8 | {k: v for k, v in y} + - {k: v for k, v in d.items()} +9 + dict(d.items()) +10 | [(k, v) for k, v in d.items()] +11 | [(k, v) for [k, v] in d.items()] +12 | {k: (a, b) for k, (a, b) in d.items()} +note: This is an unsafe fix and may change runtime behavior C416 [*] Unnecessary list comprehension (rewrite using `list()`) --> C416.py:10:1 @@ -99,16 +95,15 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`) 12 | {k: (a, b) for k, (a, b) in d.items()} | help: Rewrite using `list()` - -ℹ Unsafe fix -7 7 | {i for i in x} -8 8 | {k: v for k, v in y} -9 9 | {k: v for k, v in d.items()} -10 |-[(k, v) for k, v in d.items()] - 10 |+list(d.items()) -11 11 | [(k, v) for [k, v] in d.items()] -12 12 | {k: (a, b) for k, (a, b) in d.items()} -13 13 | +7 | {i for i in x} +8 | {k: v for k, v in y} +9 | {k: v for k, v in d.items()} + - [(k, v) for k, v in d.items()] +10 + list(d.items()) +11 | [(k, v) for [k, v] in d.items()] +12 | {k: (a, b) for k, (a, b) in d.items()} +13 | +note: This is an unsafe fix and may change runtime behavior C416 [*] Unnecessary list comprehension (rewrite using `list()`) --> C416.py:11:1 @@ -120,16 +115,15 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`) 12 | {k: (a, b) for k, (a, b) in d.items()} | help: Rewrite using `list()` - -ℹ Unsafe fix -8 8 | {k: v for k, v in y} -9 9 | {k: v for k, v in d.items()} -10 10 | [(k, v) for k, v in d.items()] -11 |-[(k, v) for [k, v] in d.items()] - 11 |+list(d.items()) -12 12 | {k: (a, b) for k, (a, b) in d.items()} -13 13 | -14 14 | [i for i, in z] +8 | {k: v for k, v in y} +9 | {k: v for k, v in d.items()} +10 | [(k, v) for k, v in d.items()] + - [(k, v) for [k, v] in d.items()] +11 + list(d.items()) +12 | {k: (a, b) for k, (a, b) in d.items()} +13 | +14 | [i for i, in z] +note: This is an unsafe fix and may change runtime behavior C416 [*] Unnecessary list comprehension (rewrite using `list()`) --> C416.py:25:70 @@ -141,13 +135,12 @@ C416 [*] Unnecessary list comprehension (rewrite using `list()`) 27 | zz = [[1], [2], [3]] | help: Rewrite using `list()` - -ℹ Unsafe fix -22 22 | {k: v if v else None for k, v in y} -23 23 | -24 24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196 -25 |-any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType]) - 25 |+any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in list(SymbolType)) -26 26 | -27 27 | zz = [[1], [2], [3]] -28 28 | [(i,) for (i,) in zz] # != list(zz) +22 | {k: v if v else None for k, v in y} +23 | +24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196 + - any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType]) +25 + any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in list(SymbolType)) +26 | +27 | zz = [[1], [2], [3]] +28 | [(i,) for (i,) in zz] # != list(zz) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap index a8bb7cfc8c..253c858611 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417.py.snap @@ -12,15 +12,14 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 5 | list(map(lambda x: x * 2, nums)) | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -1 1 | # Errors. -2 2 | nums = [1, 2, 3] -3 |-map(lambda x: x + 1, nums) - 3 |+(x + 1 for x in nums) -4 4 | map(lambda x: str(x), nums) -5 5 | list(map(lambda x: x * 2, nums)) -6 6 | set(map(lambda x: x % 2 == 0, nums)) +1 | # Errors. +2 | nums = [1, 2, 3] + - map(lambda x: x + 1, nums) +3 + (x + 1 for x in nums) +4 | map(lambda x: str(x), nums) +5 | list(map(lambda x: x * 2, nums)) +6 | set(map(lambda x: x % 2 == 0, nums)) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:4:1 @@ -33,16 +32,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 6 | set(map(lambda x: x % 2 == 0, nums)) | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -1 1 | # Errors. -2 2 | nums = [1, 2, 3] -3 3 | map(lambda x: x + 1, nums) -4 |-map(lambda x: str(x), nums) - 4 |+(str(x) for x in nums) -5 5 | list(map(lambda x: x * 2, nums)) -6 6 | set(map(lambda x: x % 2 == 0, nums)) -7 7 | dict(map(lambda v: (v, v**2), nums)) +1 | # Errors. +2 | nums = [1, 2, 3] +3 | map(lambda x: x + 1, nums) + - map(lambda x: str(x), nums) +4 + (str(x) for x in nums) +5 | list(map(lambda x: x * 2, nums)) +6 | set(map(lambda x: x % 2 == 0, nums)) +7 | dict(map(lambda v: (v, v**2), nums)) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a list comprehension) --> C417.py:5:1 @@ -55,16 +53,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a list comprehension) 7 | dict(map(lambda v: (v, v**2), nums)) | help: Replace `map()` with a list comprehension - -ℹ Unsafe fix -2 2 | nums = [1, 2, 3] -3 3 | map(lambda x: x + 1, nums) -4 4 | map(lambda x: str(x), nums) -5 |-list(map(lambda x: x * 2, nums)) - 5 |+[x * 2 for x in nums] -6 6 | set(map(lambda x: x % 2 == 0, nums)) -7 7 | dict(map(lambda v: (v, v**2), nums)) -8 8 | dict(map(lambda v: [v, v**2], nums)) +2 | nums = [1, 2, 3] +3 | map(lambda x: x + 1, nums) +4 | map(lambda x: str(x), nums) + - list(map(lambda x: x * 2, nums)) +5 + [x * 2 for x in nums] +6 | set(map(lambda x: x % 2 == 0, nums)) +7 | dict(map(lambda v: (v, v**2), nums)) +8 | dict(map(lambda v: [v, v**2], nums)) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension) --> C417.py:6:1 @@ -77,16 +74,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension) 8 | dict(map(lambda v: [v, v**2], nums)) | help: Replace `map()` with a set comprehension - -ℹ Unsafe fix -3 3 | map(lambda x: x + 1, nums) -4 4 | map(lambda x: str(x), nums) -5 5 | list(map(lambda x: x * 2, nums)) -6 |-set(map(lambda x: x % 2 == 0, nums)) - 6 |+{x % 2 == 0 for x in nums} -7 7 | dict(map(lambda v: (v, v**2), nums)) -8 8 | dict(map(lambda v: [v, v**2], nums)) -9 9 | +3 | map(lambda x: x + 1, nums) +4 | map(lambda x: str(x), nums) +5 | list(map(lambda x: x * 2, nums)) + - set(map(lambda x: x % 2 == 0, nums)) +6 + {x % 2 == 0 for x in nums} +7 | dict(map(lambda v: (v, v**2), nums)) +8 | dict(map(lambda v: [v, v**2], nums)) +9 | +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) --> C417.py:7:1 @@ -98,16 +94,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) 8 | dict(map(lambda v: [v, v**2], nums)) | help: Replace `map()` with a dict comprehension - -ℹ Unsafe fix -4 4 | map(lambda x: str(x), nums) -5 5 | list(map(lambda x: x * 2, nums)) -6 6 | set(map(lambda x: x % 2 == 0, nums)) -7 |-dict(map(lambda v: (v, v**2), nums)) - 7 |+{v: v**2 for v in nums} -8 8 | dict(map(lambda v: [v, v**2], nums)) -9 9 | -10 10 | map(lambda _: 3.0, nums) +4 | map(lambda x: str(x), nums) +5 | list(map(lambda x: x * 2, nums)) +6 | set(map(lambda x: x % 2 == 0, nums)) + - dict(map(lambda v: (v, v**2), nums)) +7 + {v: v**2 for v in nums} +8 | dict(map(lambda v: [v, v**2], nums)) +9 | +10 | map(lambda _: 3.0, nums) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) --> C417.py:8:1 @@ -120,16 +115,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) 10 | map(lambda _: 3.0, nums) | help: Replace `map()` with a dict comprehension - -ℹ Unsafe fix -5 5 | list(map(lambda x: x * 2, nums)) -6 6 | set(map(lambda x: x % 2 == 0, nums)) -7 7 | dict(map(lambda v: (v, v**2), nums)) -8 |-dict(map(lambda v: [v, v**2], nums)) - 8 |+{v: v**2 for v in nums} -9 9 | -10 10 | map(lambda _: 3.0, nums) -11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) +5 | list(map(lambda x: x * 2, nums)) +6 | set(map(lambda x: x % 2 == 0, nums)) +7 | dict(map(lambda v: (v, v**2), nums)) + - dict(map(lambda v: [v, v**2], nums)) +8 + {v: v**2 for v in nums} +9 | +10 | map(lambda _: 3.0, nums) +11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:10:1 @@ -142,16 +136,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 12 | all(map(lambda v: isinstance(v, dict), nums)) | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -7 7 | dict(map(lambda v: (v, v**2), nums)) -8 8 | dict(map(lambda v: [v, v**2], nums)) -9 9 | -10 |-map(lambda _: 3.0, nums) - 10 |+(3.0 for _ in nums) -11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) -12 12 | all(map(lambda v: isinstance(v, dict), nums)) -13 13 | filter(func, map(lambda v: v, nums)) +7 | dict(map(lambda v: (v, v**2), nums)) +8 | dict(map(lambda v: [v, v**2], nums)) +9 | + - map(lambda _: 3.0, nums) +10 + (3.0 for _ in nums) +11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) +12 | all(map(lambda v: isinstance(v, dict), nums)) +13 | filter(func, map(lambda v: v, nums)) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:11:13 @@ -163,16 +156,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 13 | filter(func, map(lambda v: v, nums)) | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -8 8 | dict(map(lambda v: [v, v**2], nums)) -9 9 | -10 10 | map(lambda _: 3.0, nums) -11 |-_ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) - 11 |+_ = "".join((x in nums and "1" or "0" for x in range(123))) -12 12 | all(map(lambda v: isinstance(v, dict), nums)) -13 13 | filter(func, map(lambda v: v, nums)) -14 14 | +8 | dict(map(lambda v: [v, v**2], nums)) +9 | +10 | map(lambda _: 3.0, nums) + - _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) +11 + _ = "".join((x in nums and "1" or "0" for x in range(123))) +12 | all(map(lambda v: isinstance(v, dict), nums)) +13 | filter(func, map(lambda v: v, nums)) +14 | +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:12:5 @@ -184,16 +176,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 13 | filter(func, map(lambda v: v, nums)) | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -9 9 | -10 10 | map(lambda _: 3.0, nums) -11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) -12 |-all(map(lambda v: isinstance(v, dict), nums)) - 12 |+all((isinstance(v, dict) for v in nums)) -13 13 | filter(func, map(lambda v: v, nums)) -14 14 | -15 15 | +9 | +10 | map(lambda _: 3.0, nums) +11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) + - all(map(lambda v: isinstance(v, dict), nums)) +12 + all((isinstance(v, dict) for v in nums)) +13 | filter(func, map(lambda v: v, nums)) +14 | +15 | +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:13:14 @@ -204,16 +195,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) | ^^^^^^^^^^^^^^^^^^^^^^ | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -10 10 | map(lambda _: 3.0, nums) -11 11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) -12 12 | all(map(lambda v: isinstance(v, dict), nums)) -13 |-filter(func, map(lambda v: v, nums)) - 13 |+filter(func, (v for v in nums)) -14 14 | -15 15 | -16 16 | # When inside f-string, then the fix should be surrounded by whitespace +10 | map(lambda _: 3.0, nums) +11 | _ = "".join(map(lambda x: x in nums and "1" or "0", range(123))) +12 | all(map(lambda v: isinstance(v, dict), nums)) + - filter(func, map(lambda v: v, nums)) +13 + filter(func, (v for v in nums)) +14 | +15 | +16 | # When inside f-string, then the fix should be surrounded by whitespace +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension) --> C417.py:17:8 @@ -224,16 +214,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension) 18 | _ = f"{dict(map(lambda v: (v, v**2), nums))}" | help: Replace `map()` with a set comprehension - -ℹ Unsafe fix -14 14 | -15 15 | -16 16 | # When inside f-string, then the fix should be surrounded by whitespace -17 |-_ = f"{set(map(lambda x: x % 2 == 0, nums))}" - 17 |+_ = f"{ {x % 2 == 0 for x in nums} }" -18 18 | _ = f"{dict(map(lambda v: (v, v**2), nums))}" -19 19 | -20 20 | # False negatives. +14 | +15 | +16 | # When inside f-string, then the fix should be surrounded by whitespace + - _ = f"{set(map(lambda x: x % 2 == 0, nums))}" +17 + _ = f"{ {x % 2 == 0 for x in nums} }" +18 | _ = f"{dict(map(lambda v: (v, v**2), nums))}" +19 | +20 | # False negatives. +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) --> C417.py:18:8 @@ -246,16 +235,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) 20 | # False negatives. | help: Replace `map()` with a dict comprehension - -ℹ Unsafe fix -15 15 | -16 16 | # When inside f-string, then the fix should be surrounded by whitespace -17 17 | _ = f"{set(map(lambda x: x % 2 == 0, nums))}" -18 |-_ = f"{dict(map(lambda v: (v, v**2), nums))}" - 18 |+_ = f"{ {v: v**2 for v in nums} }" -19 19 | -20 20 | # False negatives. -21 21 | map(lambda x=2, y=1: x + y, nums, nums) +15 | +16 | # When inside f-string, then the fix should be surrounded by whitespace +17 | _ = f"{set(map(lambda x: x % 2 == 0, nums))}" + - _ = f"{dict(map(lambda v: (v, v**2), nums))}" +18 + _ = f"{ {v: v**2 for v in nums} }" +19 | +20 | # False negatives. +21 | map(lambda x=2, y=1: x + y, nums, nums) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:36:1 @@ -267,16 +255,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 38 | # Ok because of the default parameters, and variadic arguments. | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -33 33 | map(lambda x: lambda: x, range(4)) -34 34 | -35 35 | # Error: the `x` is overridden by the inner lambda. -36 |-map(lambda x: lambda x: x, range(4)) - 36 |+(lambda x: x for x in range(4)) -37 37 | -38 38 | # Ok because of the default parameters, and variadic arguments. -39 39 | map(lambda x=1: x, nums) +33 | map(lambda x: lambda: x, range(4)) +34 | +35 | # Error: the `x` is overridden by the inner lambda. + - map(lambda x: lambda x: x, range(4)) +36 + (lambda x: x for x in range(4)) +37 | +38 | # Ok because of the default parameters, and variadic arguments. +39 | map(lambda x=1: x, nums) +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:47:1 @@ -288,16 +275,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 49 | map(lambda x: x, (x, y, z)) | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -44 44 | dict(map(lambda k, v: (k, v), keys, values)) -45 45 | -46 46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121 -47 |-map(lambda x: x, y if y else z) - 47 |+(x for x in (y if y else z)) -48 48 | map(lambda x: x, (y if y else z)) -49 49 | map(lambda x: x, (x, y, z)) -50 50 | +44 | dict(map(lambda k, v: (k, v), keys, values)) +45 | +46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121 + - map(lambda x: x, y if y else z) +47 + (x for x in (y if y else z)) +48 | map(lambda x: x, (y if y else z)) +49 | map(lambda x: x, (x, y, z)) +50 | +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:48:1 @@ -309,16 +295,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 49 | map(lambda x: x, (x, y, z)) | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -45 45 | -46 46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121 -47 47 | map(lambda x: x, y if y else z) -48 |-map(lambda x: x, (y if y else z)) - 48 |+(x for x in (y if y else z)) -49 49 | map(lambda x: x, (x, y, z)) -50 50 | -51 51 | # See https://github.com/astral-sh/ruff/issues/14808 +45 | +46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121 +47 | map(lambda x: x, y if y else z) + - map(lambda x: x, (y if y else z)) +48 + (x for x in (y if y else z)) +49 | map(lambda x: x, (x, y, z)) +50 | +51 | # See https://github.com/astral-sh/ruff/issues/14808 +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) --> C417.py:49:1 @@ -331,16 +316,15 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) 51 | # See https://github.com/astral-sh/ruff/issues/14808 | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -46 46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121 -47 47 | map(lambda x: x, y if y else z) -48 48 | map(lambda x: x, (y if y else z)) -49 |-map(lambda x: x, (x, y, z)) - 49 |+(x for x in (x, y, z)) -50 50 | -51 51 | # See https://github.com/astral-sh/ruff/issues/14808 -52 52 | # The following should be Ok since +46 | # Regression test for: https://github.com/astral-sh/ruff/issues/7121 +47 | map(lambda x: x, y if y else z) +48 | map(lambda x: x, (y if y else z)) + - map(lambda x: x, (x, y, z)) +49 + (x for x in (x, y, z)) +50 | +51 | # See https://github.com/astral-sh/ruff/issues/14808 +52 | # The following should be Ok since +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension) --> C417.py:75:8 @@ -351,15 +335,14 @@ C417 [*] Unnecessary `map()` usage (rewrite using a set comprehension) 76 | _ = t"{dict(map(lambda v: (v, v**2), nums))}" | help: Replace `map()` with a set comprehension - -ℹ Unsafe fix -72 72 | list(map(lambda x, y: x, [(1, 2), (3, 4)])) -73 73 | -74 74 | # When inside t-string, then the fix should be surrounded by whitespace -75 |-_ = t"{set(map(lambda x: x % 2 == 0, nums))}" - 75 |+_ = t"{ {x % 2 == 0 for x in nums} }" -76 76 | _ = t"{dict(map(lambda v: (v, v**2), nums))}" -77 77 | +72 | list(map(lambda x, y: x, [(1, 2), (3, 4)])) +73 | +74 | # When inside t-string, then the fix should be surrounded by whitespace + - _ = t"{set(map(lambda x: x % 2 == 0, nums))}" +75 + _ = t"{ {x % 2 == 0 for x in nums} }" +76 | _ = t"{dict(map(lambda v: (v, v**2), nums))}" +77 | +note: This is an unsafe fix and may change runtime behavior C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) --> C417.py:76:8 @@ -370,11 +353,10 @@ C417 [*] Unnecessary `map()` usage (rewrite using a dict comprehension) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace `map()` with a dict comprehension - -ℹ Unsafe fix -73 73 | -74 74 | # When inside t-string, then the fix should be surrounded by whitespace -75 75 | _ = t"{set(map(lambda x: x % 2 == 0, nums))}" -76 |-_ = t"{dict(map(lambda v: (v, v**2), nums))}" - 76 |+_ = t"{ {v: v**2 for v in nums} }" -77 77 | +73 | +74 | # When inside t-string, then the fix should be surrounded by whitespace +75 | _ = t"{set(map(lambda x: x % 2 == 0, nums))}" + - _ = t"{dict(map(lambda v: (v, v**2), nums))}" +76 + _ = t"{ {v: v**2 for v in nums} }" +77 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap index 1861b55ba8..b6a26b5914 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C417_C417_1.py.snap @@ -10,13 +10,12 @@ C417 [*] Unnecessary `map()` usage (rewrite using a generator expression) | ^^^^^^^^^^^^^^^^^^^^ | help: Replace `map()` with a generator expression - -ℹ Unsafe fix -4 4 | -5 5 | def overshadowed_list(): -6 6 | list = ... -7 |- list(map(lambda x: x, [])) - 7 |+ list((x for x in [])) -8 8 | -9 9 | -10 10 | ### No errors +4 | +5 | def overshadowed_list(): +6 | list = ... + - list(map(lambda x: x, [])) +7 + list((x for x in [])) +8 | +9 | +10 | ### No errors +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap index 48178c70e9..1c6c180b74 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C418_C418.py.snap @@ -10,13 +10,12 @@ C418 [*] Unnecessary dict literal passed to `dict()` (remove the outer call to ` 3 | dict({'x': 1 for x in range(10)}) | help: Remove outer `dict()` call - -ℹ Unsafe fix -1 |-dict({}) - 1 |+{} -2 2 | dict({'a': 1}) -3 3 | dict({'x': 1 for x in range(10)}) -4 4 | dict( + - dict({}) +1 + {} +2 | dict({'a': 1}) +3 | dict({'x': 1 for x in range(10)}) +4 | dict( +note: This is an unsafe fix and may change runtime behavior C418 [*] Unnecessary dict literal passed to `dict()` (remove the outer call to `dict()`) --> C418.py:2:1 @@ -28,14 +27,13 @@ C418 [*] Unnecessary dict literal passed to `dict()` (remove the outer call to ` 4 | dict( | help: Remove outer `dict()` call - -ℹ Unsafe fix -1 1 | dict({}) -2 |-dict({'a': 1}) - 2 |+{'a': 1} -3 3 | dict({'x': 1 for x in range(10)}) -4 4 | dict( -5 5 | {'x': 1 for x in range(10)} +1 | dict({}) + - dict({'a': 1}) +2 + {'a': 1} +3 | dict({'x': 1 for x in range(10)}) +4 | dict( +5 | {'x': 1 for x in range(10)} +note: This is an unsafe fix and may change runtime behavior C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer call to `dict()`) --> C418.py:3:1 @@ -48,15 +46,14 @@ C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer cal 5 | {'x': 1 for x in range(10)} | help: Remove outer `dict()` call - -ℹ Unsafe fix -1 1 | dict({}) -2 2 | dict({'a': 1}) -3 |-dict({'x': 1 for x in range(10)}) - 3 |+{'x': 1 for x in range(10)} -4 4 | dict( -5 5 | {'x': 1 for x in range(10)} -6 6 | ) +1 | dict({}) +2 | dict({'a': 1}) + - dict({'x': 1 for x in range(10)}) +3 + {'x': 1 for x in range(10)} +4 | dict( +5 | {'x': 1 for x in range(10)} +6 | ) +note: This is an unsafe fix and may change runtime behavior C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer call to `dict()`) --> C418.py:4:1 @@ -71,15 +68,14 @@ C418 [*] Unnecessary dict comprehension passed to `dict()` (remove the outer cal 8 | dict({}, a=1) | help: Remove outer `dict()` call - -ℹ Unsafe fix -1 1 | dict({}) -2 2 | dict({'a': 1}) -3 3 | dict({'x': 1 for x in range(10)}) -4 |-dict( -5 |- {'x': 1 for x in range(10)} -6 |-) - 4 |+{'x': 1 for x in range(10)} -7 5 | -8 6 | dict({}, a=1) -9 7 | dict({x: 1 for x in range(1)}, a=1) +1 | dict({}) +2 | dict({'a': 1}) +3 | dict({'x': 1 for x in range(10)}) + - dict( + - {'x': 1 for x in range(10)} + - ) +4 + {'x': 1 for x in range(10)} +5 | +6 | dict({}, a=1) +7 | dict({x: 1 for x in range(1)}, a=1) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap index e6e08ba2c4..1be1031220 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C419_C419.py.snap @@ -10,13 +10,12 @@ C419 [*] Unnecessary list comprehension 3 | any( # first comment | help: Remove unnecessary comprehension - -ℹ Unsafe fix -1 |-any([x.id for x in bar]) - 1 |+any(x.id for x in bar) -2 2 | all([x.id for x in bar]) -3 3 | any( # first comment -4 4 | [x.id for x in bar], # second comment + - any([x.id for x in bar]) +1 + any(x.id for x in bar) +2 | all([x.id for x in bar]) +3 | any( # first comment +4 | [x.id for x in bar], # second comment +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419.py:2:5 @@ -28,14 +27,13 @@ C419 [*] Unnecessary list comprehension 4 | [x.id for x in bar], # second comment | help: Remove unnecessary comprehension - -ℹ Unsafe fix -1 1 | any([x.id for x in bar]) -2 |-all([x.id for x in bar]) - 2 |+all(x.id for x in bar) -3 3 | any( # first comment -4 4 | [x.id for x in bar], # second comment -5 5 | ) # third comment +1 | any([x.id for x in bar]) + - all([x.id for x in bar]) +2 + all(x.id for x in bar) +3 | any( # first comment +4 | [x.id for x in bar], # second comment +5 | ) # third comment +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419.py:4:5 @@ -48,16 +46,15 @@ C419 [*] Unnecessary list comprehension 6 | all( # first comment | help: Remove unnecessary comprehension - -ℹ Unsafe fix -1 1 | any([x.id for x in bar]) -2 2 | all([x.id for x in bar]) -3 3 | any( # first comment -4 |- [x.id for x in bar], # second comment - 4 |+ x.id for x in bar # second comment -5 5 | ) # third comment -6 6 | all( # first comment -7 7 | [x.id for x in bar], # second comment +1 | any([x.id for x in bar]) +2 | all([x.id for x in bar]) +3 | any( # first comment + - [x.id for x in bar], # second comment +4 + x.id for x in bar # second comment +5 | ) # third comment +6 | all( # first comment +7 | [x.id for x in bar], # second comment +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419.py:7:5 @@ -70,16 +67,15 @@ C419 [*] Unnecessary list comprehension 9 | any({x.id for x in bar}) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -4 4 | [x.id for x in bar], # second comment -5 5 | ) # third comment -6 6 | all( # first comment -7 |- [x.id for x in bar], # second comment - 7 |+ x.id for x in bar # second comment -8 8 | ) # third comment -9 9 | any({x.id for x in bar}) -10 10 | +4 | [x.id for x in bar], # second comment +5 | ) # third comment +6 | all( # first comment + - [x.id for x in bar], # second comment +7 + x.id for x in bar # second comment +8 | ) # third comment +9 | any({x.id for x in bar}) +10 | +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary set comprehension --> C419.py:9:5 @@ -92,16 +88,15 @@ C419 [*] Unnecessary set comprehension 11 | # OK | help: Remove unnecessary comprehension - -ℹ Unsafe fix -6 6 | all( # first comment -7 7 | [x.id for x in bar], # second comment -8 8 | ) # third comment -9 |-any({x.id for x in bar}) - 9 |+any(x.id for x in bar) -10 10 | -11 11 | # OK -12 12 | all(x.id for x in bar) +6 | all( # first comment +7 | [x.id for x in bar], # second comment +8 | ) # third comment + - any({x.id for x in bar}) +9 + any(x.id for x in bar) +10 | +11 | # OK +12 | all(x.id for x in bar) +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419.py:28:5 @@ -119,24 +114,23 @@ C419 [*] Unnecessary list comprehension 35 | ) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -25 25 | -26 26 | # Special comment handling -27 27 | any( -28 |- [ # lbracket comment -29 |- # second line comment -30 |- i.bit_count() - 28 |+ # lbracket comment - 29 |+ # second line comment - 30 |+ i.bit_count() -31 31 | # random middle comment -32 |- for i in range(5) # rbracket comment -33 |- ] # rpar comment - 32 |+ for i in range(5) # rbracket comment # rpar comment -34 33 | # trailing comment -35 34 | ) -36 35 | +25 | +26 | # Special comment handling +27 | any( + - [ # lbracket comment + - # second line comment + - i.bit_count() +28 + # lbracket comment +29 + # second line comment +30 + i.bit_count() +31 | # random middle comment + - for i in range(5) # rbracket comment + - ] # rpar comment +32 + for i in range(5) # rbracket comment # rpar comment +33 | # trailing comment +34 | ) +35 | +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419.py:39:5 @@ -152,22 +146,21 @@ C419 [*] Unnecessary list comprehension 43 | ) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -36 36 | -37 37 | # Weird case where the function call, opening bracket, and comment are all -38 38 | # on the same line. -39 |-any([ # lbracket comment -40 |- # second line comment -41 |- i.bit_count() for i in range(5) # rbracket comment -42 |- ] # rpar comment - 39 |+any( - 40 |+# lbracket comment - 41 |+# second line comment - 42 |+i.bit_count() for i in range(5) # rbracket comment # rpar comment -43 43 | ) -44 44 | -45 45 | ## Set comprehensions should only be linted +36 | +37 | # Weird case where the function call, opening bracket, and comment are all +38 | # on the same line. + - any([ # lbracket comment + - # second line comment + - i.bit_count() for i in range(5) # rbracket comment + - ] # rpar comment +39 + any( +40 + # lbracket comment +41 + # second line comment +42 + i.bit_count() for i in range(5) # rbracket comment # rpar comment +43 | ) +44 | +45 | ## Set comprehensions should only be linted +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary set comprehension --> C419.py:49:5 @@ -178,16 +171,15 @@ C419 [*] Unnecessary set comprehension 50 | all({x.id for x in bar}) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -46 46 | ## when function is invariant under duplication of inputs -47 47 | -48 48 | # should be linted... -49 |-any({x.id for x in bar}) - 49 |+any(x.id for x in bar) -50 50 | all({x.id for x in bar}) -51 51 | -52 52 | # should be linted in preview... +46 | ## when function is invariant under duplication of inputs +47 | +48 | # should be linted... + - any({x.id for x in bar}) +49 + any(x.id for x in bar) +50 | all({x.id for x in bar}) +51 | +52 | # should be linted in preview... +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary set comprehension --> C419.py:50:5 @@ -200,13 +192,12 @@ C419 [*] Unnecessary set comprehension 52 | # should be linted in preview... | help: Remove unnecessary comprehension - -ℹ Unsafe fix -47 47 | -48 48 | # should be linted... -49 49 | any({x.id for x in bar}) -50 |-all({x.id for x in bar}) - 50 |+all(x.id for x in bar) -51 51 | -52 52 | # should be linted in preview... -53 53 | min({x.id for x in bar}) +47 | +48 | # should be linted... +49 | any({x.id for x in bar}) + - all({x.id for x in bar}) +50 + all(x.id for x in bar) +51 | +52 | # should be linted in preview... +53 | min({x.id for x in bar}) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap index 1fd0017534..9cfb3561be 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420.py.snap @@ -10,16 +10,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable, value)`) - -ℹ Safe fix -3 3 | -4 4 | def func(): -5 5 | numbers = [1, 2, 3] -6 |- {n: None for n in numbers} # RUF025 - 6 |+ dict.fromkeys(numbers) # RUF025 -7 7 | -8 8 | -9 9 | def func(): +3 | +4 | def func(): +5 | numbers = [1, 2, 3] + - {n: None for n in numbers} # RUF025 +6 + dict.fromkeys(numbers) # RUF025 +7 | +8 | +9 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:10:23 @@ -30,16 +28,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea 11 | pass | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -7 7 | -8 8 | -9 9 | def func(): -10 |- for key, value in {n: 1 for n in [1, 2, 3]}.items(): # RUF025 - 10 |+ for key, value in dict.fromkeys([1, 2, 3], 1).items(): # RUF025 -11 11 | pass -12 12 | -13 13 | +7 | +8 | +9 | def func(): + - for key, value in {n: 1 for n in [1, 2, 3]}.items(): # RUF025 +10 + for key, value in dict.fromkeys([1, 2, 3], 1).items(): # RUF025 +11 | pass +12 | +13 | C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:15:5 @@ -49,16 +45,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -12 12 | -13 13 | -14 14 | def func(): -15 |- {n: 1.1 for n in [1, 2, 3]} # RUF025 - 15 |+ dict.fromkeys([1, 2, 3], 1.1) # RUF025 -16 16 | -17 17 | -18 18 | def func(): +12 | +13 | +14 | def func(): + - {n: 1.1 for n in [1, 2, 3]} # RUF025 +15 + dict.fromkeys([1, 2, 3], 1.1) # RUF025 +16 | +17 | +18 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:26:7 @@ -69,16 +63,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -23 23 | def f(data): -24 24 | return data -25 25 | -26 |- f({c: "a" for c in "12345"}) # RUF025 - 26 |+ f(dict.fromkeys("12345", "a")) # RUF025 -27 27 | -28 28 | -29 29 | def func(): +23 | def f(data): +24 | return data +25 | + - f({c: "a" for c in "12345"}) # RUF025 +26 + f(dict.fromkeys("12345", "a")) # RUF025 +27 | +28 | +29 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:30:5 @@ -88,16 +80,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -27 27 | -28 28 | -29 29 | def func(): -30 |- {n: True for n in [1, 2, 2]} # RUF025 - 30 |+ dict.fromkeys([1, 2, 2], True) # RUF025 -31 31 | -32 32 | -33 33 | def func(): +27 | +28 | +29 | def func(): + - {n: True for n in [1, 2, 2]} # RUF025 +30 + dict.fromkeys([1, 2, 2], True) # RUF025 +31 | +32 | +33 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:34:5 @@ -107,16 +97,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -31 31 | -32 32 | -33 33 | def func(): -34 |- {n: b"hello" for n in (1, 2, 2)} # RUF025 - 34 |+ dict.fromkeys((1, 2, 2), b"hello") # RUF025 -35 35 | -36 36 | -37 37 | def func(): +31 | +32 | +33 | def func(): + - {n: b"hello" for n in (1, 2, 2)} # RUF025 +34 + dict.fromkeys((1, 2, 2), b"hello") # RUF025 +35 | +36 | +37 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:38:5 @@ -126,16 +114,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -35 35 | -36 36 | -37 37 | def func(): -38 |- {n: ... for n in [1, 2, 3]} # RUF025 - 38 |+ dict.fromkeys([1, 2, 3], ...) # RUF025 -39 39 | -40 40 | -41 41 | def func(): +35 | +36 | +37 | def func(): + - {n: ... for n in [1, 2, 3]} # RUF025 +38 + dict.fromkeys([1, 2, 3], ...) # RUF025 +39 | +40 | +41 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:42:5 @@ -145,16 +131,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -39 39 | -40 40 | -41 41 | def func(): -42 |- {n: False for n in {1: "a", 2: "b"}} # RUF025 - 42 |+ dict.fromkeys({1: "a", 2: "b"}, False) # RUF025 -43 43 | -44 44 | -45 45 | def func(): +39 | +40 | +41 | def func(): + - {n: False for n in {1: "a", 2: "b"}} # RUF025 +42 + dict.fromkeys({1: "a", 2: "b"}, False) # RUF025 +43 | +44 | +45 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:46:5 @@ -164,16 +148,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -43 43 | -44 44 | -45 45 | def func(): -46 |- {(a, b): 1 for (a, b) in [(1, 2), (3, 4)]} # RUF025 - 46 |+ dict.fromkeys([(1, 2), (3, 4)], 1) # RUF025 -47 47 | -48 48 | -49 49 | def func(): +43 | +44 | +45 | def func(): + - {(a, b): 1 for (a, b) in [(1, 2), (3, 4)]} # RUF025 +46 + dict.fromkeys([(1, 2), (3, 4)], 1) # RUF025 +47 | +48 | +49 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:54:5 @@ -183,16 +165,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -51 51 | return 1 -52 52 | -53 53 | a = f() -54 |- {n: a for n in [1, 2, 3]} # RUF025 - 54 |+ dict.fromkeys([1, 2, 3], a) # RUF025 -55 55 | -56 56 | -57 57 | def func(): +51 | return 1 +52 | +53 | a = f() + - {n: a for n in [1, 2, 3]} # RUF025 +54 + dict.fromkeys([1, 2, 3], a) # RUF025 +55 | +56 | +57 | def func(): C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:59:6 @@ -203,16 +183,14 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -56 56 | -57 57 | def func(): -58 58 | values = ["a", "b", "c"] -59 |- [{n: values for n in [1, 2, 3]}] # RUF025 - 59 |+ [dict.fromkeys([1, 2, 3], values)] # RUF025 -60 60 | -61 61 | -62 62 | # Non-violation cases: RUF025 +56 | +57 | def func(): +58 | values = ["a", "b", "c"] + - [{n: values for n in [1, 2, 3]}] # RUF025 +59 + [dict.fromkeys([1, 2, 3], values)] # RUF025 +60 | +61 | +62 | # Non-violation cases: RUF025 C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instead --> C420.py:95:1 @@ -230,18 +208,17 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | |_^ | help: Replace with `dict.fromkeys(iterable, value)`) - -ℹ Unsafe fix -92 92 | {(a, b): a + b for (a, b) in [(1, 2), (3, 4)]} # OK -93 93 | -94 94 | # https://github.com/astral-sh/ruff/issues/18764 -95 |-{ # 1 -96 |-a # 2 -97 |-: # 3 -98 |-None # 4 -99 |-for # 5 -100 |-a # 6 -101 |-in # 7 -102 |-iterable # 8 -103 |-} # 9 - 95 |+dict.fromkeys(iterable) # 9 +92 | {(a, b): a + b for (a, b) in [(1, 2), (3, 4)]} # OK +93 | +94 | # https://github.com/astral-sh/ruff/issues/18764 + - { # 1 + - a # 2 + - : # 3 + - None # 4 + - for # 5 + - a # 6 + - in # 7 + - iterable # 8 + - } # 9 +95 + dict.fromkeys(iterable) # 9 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap index e8287c0ae1..cc54075046 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_1.py.snap @@ -8,10 +8,8 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable)`) - -ℹ Safe fix -1 |-{x: NotImplemented for x in "XY"} - 1 |+dict.fromkeys("XY", NotImplemented) -2 2 | -3 3 | -4 4 | # Builtin bindings are placed at top of file, but should not count as + - {x: NotImplemented for x in "XY"} +1 + dict.fromkeys("XY", NotImplemented) +2 | +3 | +4 | # Builtin bindings are placed at top of file, but should not count as diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap index 0ff4e0d6ac..f609d02469 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__C420_C420_2.py.snap @@ -8,10 +8,8 @@ C420 [*] Unnecessary dict comprehension for iterable; use `dict.fromkeys` instea | ^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `dict.fromkeys(iterable, value)`) - -ℹ Safe fix -1 |-foo or{x: None for x in bar} - 1 |+foo or dict.fromkeys(bar) -2 2 | -3 3 | -4 4 | # C420 fix must make sure to insert a leading space if needed, + - foo or{x: None for x in bar} +1 + foo or dict.fromkeys(bar) +2 | +3 | +4 | # C420 fix must make sure to insert a leading space if needed, diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap index 68bb872982..fbf5aa8fcd 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C409_C409.py.snap @@ -10,13 +10,12 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 3 | t3 = tuple((1, 2)) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -1 |-t1 = tuple([]) - 1 |+t1 = () -2 2 | t2 = tuple([1, 2]) -3 3 | t3 = tuple((1, 2)) -4 4 | t4 = tuple([ + - t1 = tuple([]) +1 + t1 = () +2 | t2 = tuple([1, 2]) +3 | t3 = tuple((1, 2)) +4 | t4 = tuple([ +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:2:6 @@ -28,14 +27,13 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 4 | t4 = tuple([ | help: Rewrite as a tuple literal - -ℹ Unsafe fix -1 1 | t1 = tuple([]) -2 |-t2 = tuple([1, 2]) - 2 |+t2 = (1, 2) -3 3 | t3 = tuple((1, 2)) -4 4 | t4 = tuple([ -5 5 | 1, +1 | t1 = tuple([]) + - t2 = tuple([1, 2]) +2 + t2 = (1, 2) +3 | t3 = tuple((1, 2)) +4 | t4 = tuple([ +5 | 1, +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:3:6 @@ -48,15 +46,14 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 5 | 1, | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -1 1 | t1 = tuple([]) -2 2 | t2 = tuple([1, 2]) -3 |-t3 = tuple((1, 2)) - 3 |+t3 = (1, 2) -4 4 | t4 = tuple([ -5 5 | 1, -6 6 | 2 +1 | t1 = tuple([]) +2 | t2 = tuple([1, 2]) + - t3 = tuple((1, 2)) +3 + t3 = (1, 2) +4 | t4 = tuple([ +5 | 1, +6 | 2 +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:4:6 @@ -73,20 +70,19 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 9 | (1, 2) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -1 1 | t1 = tuple([]) -2 2 | t2 = tuple([1, 2]) -3 3 | t3 = tuple((1, 2)) -4 |-t4 = tuple([ - 4 |+t4 = ( -5 5 | 1, -6 6 | 2 -7 |-]) - 7 |+) -8 8 | t5 = tuple( -9 9 | (1, 2) -10 10 | ) +1 | t1 = tuple([]) +2 | t2 = tuple([1, 2]) +3 | t3 = tuple((1, 2)) + - t4 = tuple([ +4 + t4 = ( +5 | 1, +6 | 2 + - ]) +7 + ) +8 | t5 = tuple( +9 | (1, 2) +10 | ) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:8:6 @@ -102,18 +98,17 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 12 | tuple( # comment | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -5 5 | 1, -6 6 | 2 -7 7 | ]) -8 |-t5 = tuple( -9 |- (1, 2) -10 |-) - 8 |+t5 = (1, 2) -11 9 | -12 10 | tuple( # comment -13 11 | [1, 2] +5 | 1, +6 | 2 +7 | ]) + - t5 = tuple( + - (1, 2) + - ) +8 + t5 = (1, 2) +9 | +10 | tuple( # comment +11 | [1, 2] +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:12:1 @@ -128,18 +123,17 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 16 | tuple([ # comment | help: Rewrite as a tuple literal - -ℹ Unsafe fix -9 9 | (1, 2) -10 10 | ) -11 11 | -12 |-tuple( # comment -13 |- [1, 2] -14 |-) - 12 |+(1, 2) -15 13 | -16 14 | tuple([ # comment -17 15 | 1, 2 +9 | (1, 2) +10 | ) +11 | + - tuple( # comment + - [1, 2] + - ) +12 + (1, 2) +13 | +14 | tuple([ # comment +15 | 1, 2 +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:16:1 @@ -154,19 +148,18 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 20 | tuple(( | help: Rewrite as a tuple literal - -ℹ Unsafe fix -13 13 | [1, 2] -14 14 | ) -15 15 | -16 |-tuple([ # comment - 16 |+( # comment -17 17 | 1, 2 -18 |-]) - 18 |+) -19 19 | -20 20 | tuple(( -21 21 | 1, +13 | [1, 2] +14 | ) +15 | + - tuple([ # comment +16 + ( # comment +17 | 1, 2 + - ]) +18 + ) +19 | +20 | tuple(( +21 | 1, +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:20:1 @@ -181,19 +174,18 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 24 | t6 = tuple([1]) | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -17 17 | 1, 2 -18 18 | ]) -19 19 | -20 |-tuple(( - 20 |+( -21 21 | 1, -22 |-)) - 22 |+) -23 23 | -24 24 | t6 = tuple([1]) -25 25 | t7 = tuple((1,)) +17 | 1, 2 +18 | ]) +19 | + - tuple(( +20 + ( +21 | 1, + - )) +22 + ) +23 | +24 | t6 = tuple([1]) +25 | t7 = tuple((1,)) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:24:6 @@ -206,16 +198,15 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 26 | t8 = tuple([1,]) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -21 21 | 1, -22 22 | )) -23 23 | -24 |-t6 = tuple([1]) - 24 |+t6 = (1,) -25 25 | t7 = tuple((1,)) -26 26 | t8 = tuple([1,]) -27 27 | +21 | 1, +22 | )) +23 | + - t6 = tuple([1]) +24 + t6 = (1,) +25 | t7 = tuple((1,)) +26 | t8 = tuple([1,]) +27 | +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to `tuple()`) --> C409.py:25:6 @@ -226,16 +217,15 @@ C409 [*] Unnecessary tuple literal passed to `tuple()` (remove the outer call to 26 | t8 = tuple([1,]) | help: Remove the outer call to `tuple()` - -ℹ Unsafe fix -22 22 | )) -23 23 | -24 24 | t6 = tuple([1]) -25 |-t7 = tuple((1,)) - 25 |+t7 = (1,) -26 26 | t8 = tuple([1,]) -27 27 | -28 28 | tuple([x for x in range(5)]) +22 | )) +23 | +24 | t6 = tuple([1]) + - t7 = tuple((1,)) +25 + t7 = (1,) +26 | t8 = tuple([1,]) +27 | +28 | tuple([x for x in range(5)]) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple literal) --> C409.py:26:6 @@ -248,16 +238,15 @@ C409 [*] Unnecessary list literal passed to `tuple()` (rewrite as a tuple litera 28 | tuple([x for x in range(5)]) | help: Rewrite as a tuple literal - -ℹ Unsafe fix -23 23 | -24 24 | t6 = tuple([1]) -25 25 | t7 = tuple((1,)) -26 |-t8 = tuple([1,]) - 26 |+t8 = (1,) -27 27 | -28 28 | tuple([x for x in range(5)]) -29 29 | tuple({x for x in range(10)}) +23 | +24 | t6 = tuple([1]) +25 | t7 = tuple((1,)) + - t8 = tuple([1,]) +26 + t8 = (1,) +27 | +28 | tuple([x for x in range(5)]) +29 | tuple({x for x in range(10)}) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator) --> C409.py:28:1 @@ -270,16 +259,15 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera 30 | tuple(x for x in range(5)) | help: Rewrite as a generator - -ℹ Unsafe fix -25 25 | t7 = tuple((1,)) -26 26 | t8 = tuple([1,]) -27 27 | -28 |-tuple([x for x in range(5)]) - 28 |+tuple(x for x in range(5)) -29 29 | tuple({x for x in range(10)}) -30 30 | tuple(x for x in range(5)) -31 31 | tuple([ +25 | t7 = tuple((1,)) +26 | t8 = tuple([1,]) +27 | + - tuple([x for x in range(5)]) +28 + tuple(x for x in range(5)) +29 | tuple({x for x in range(10)}) +30 | tuple(x for x in range(5)) +31 | tuple([ +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator) --> C409.py:31:1 @@ -294,18 +282,17 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera 35 | [x for x in [1,2,3]] | help: Rewrite as a generator - -ℹ Unsafe fix -28 28 | tuple([x for x in range(5)]) -29 29 | tuple({x for x in range(10)}) -30 30 | tuple(x for x in range(5)) -31 |-tuple([ -32 |- x for x in [1,2,3] -33 |-]) - 31 |+tuple(x for x in [1,2,3]) -34 32 | tuple( # comment -35 33 | [x for x in [1,2,3]] -36 34 | ) +28 | tuple([x for x in range(5)]) +29 | tuple({x for x in range(10)}) +30 | tuple(x for x in range(5)) + - tuple([ + - x for x in [1,2,3] + - ]) +31 + tuple(x for x in [1,2,3]) +32 | tuple( # comment +33 | [x for x in [1,2,3]] +34 | ) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator) --> C409.py:34:1 @@ -320,16 +307,15 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera 38 | x for x in range(10) | help: Rewrite as a generator - -ℹ Unsafe fix -32 32 | x for x in [1,2,3] -33 33 | ]) -34 34 | tuple( # comment -35 |- [x for x in [1,2,3]] - 35 |+ x for x in [1,2,3] -36 36 | ) -37 37 | tuple([ # comment -38 38 | x for x in range(10) +32 | x for x in [1,2,3] +33 | ]) +34 | tuple( # comment + - [x for x in [1,2,3]] +35 + x for x in [1,2,3] +36 | ) +37 | tuple([ # comment +38 | x for x in range(10) +note: This is an unsafe fix and may change runtime behavior C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a generator) --> C409.py:37:1 @@ -344,18 +330,17 @@ C409 [*] Unnecessary list comprehension passed to `tuple()` (rewrite as a genera 41 | { | help: Rewrite as a generator - -ℹ Unsafe fix -34 34 | tuple( # comment -35 35 | [x for x in [1,2,3]] -36 36 | ) -37 |-tuple([ # comment -38 |- x for x in range(10) -39 |-]) -40 37 | tuple( - 38 |+# comment - 39 |+x for x in range(10)) - 40 |+tuple( -41 41 | { -42 42 | x for x in [1,2,3] -43 43 | } +34 | tuple( # comment +35 | [x for x in [1,2,3]] +36 | ) + - tuple([ # comment + - x for x in range(10) + - ]) +37 | tuple( +38 + # comment +39 + x for x in range(10)) +40 + tuple( +41 | { +42 | x for x in [1,2,3] +43 | } +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap index 33b991397a..ce7e603bbb 100644 --- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linter__rules__flake8_comprehensions__tests__preview__C419_C419_1.py.snap @@ -10,13 +10,12 @@ C419 [*] Unnecessary list comprehension 3 | max([x.val for x in bar]) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -1 |-sum([x.val for x in bar]) - 1 |+sum(x.val for x in bar) -2 2 | min([x.val for x in bar]) -3 3 | max([x.val for x in bar]) -4 4 | sum([x.val for x in bar], 0) + - sum([x.val for x in bar]) +1 + sum(x.val for x in bar) +2 | min([x.val for x in bar]) +3 | max([x.val for x in bar]) +4 | sum([x.val for x in bar], 0) +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419_1.py:2:5 @@ -28,14 +27,13 @@ C419 [*] Unnecessary list comprehension 4 | sum([x.val for x in bar], 0) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -1 1 | sum([x.val for x in bar]) -2 |-min([x.val for x in bar]) - 2 |+min(x.val for x in bar) -3 3 | max([x.val for x in bar]) -4 4 | sum([x.val for x in bar], 0) -5 5 | +1 | sum([x.val for x in bar]) + - min([x.val for x in bar]) +2 + min(x.val for x in bar) +3 | max([x.val for x in bar]) +4 | sum([x.val for x in bar], 0) +5 | +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419_1.py:3:5 @@ -47,15 +45,14 @@ C419 [*] Unnecessary list comprehension 4 | sum([x.val for x in bar], 0) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -1 1 | sum([x.val for x in bar]) -2 2 | min([x.val for x in bar]) -3 |-max([x.val for x in bar]) - 3 |+max(x.val for x in bar) -4 4 | sum([x.val for x in bar], 0) -5 5 | -6 6 | # OK +1 | sum([x.val for x in bar]) +2 | min([x.val for x in bar]) + - max([x.val for x in bar]) +3 + max(x.val for x in bar) +4 | sum([x.val for x in bar], 0) +5 | +6 | # OK +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419_1.py:4:5 @@ -68,16 +65,15 @@ C419 [*] Unnecessary list comprehension 6 | # OK | help: Remove unnecessary comprehension - -ℹ Unsafe fix -1 1 | sum([x.val for x in bar]) -2 2 | min([x.val for x in bar]) -3 3 | max([x.val for x in bar]) -4 |-sum([x.val for x in bar], 0) - 4 |+sum((x.val for x in bar), 0) -5 5 | -6 6 | # OK -7 7 | sum(x.val for x in bar) +1 | sum([x.val for x in bar]) +2 | min([x.val for x in bar]) +3 | max([x.val for x in bar]) + - sum([x.val for x in bar], 0) +4 + sum((x.val for x in bar), 0) +5 | +6 | # OK +7 | sum(x.val for x in bar) +note: This is an unsafe fix and may change runtime behavior C419 [*] Unnecessary list comprehension --> C419_1.py:14:5 @@ -94,17 +90,16 @@ C419 [*] Unnecessary list comprehension 20 | ) | help: Remove unnecessary comprehension - -ℹ Unsafe fix -11 11 | -12 12 | # Multi-line -13 13 | sum( -14 |- [ - 14 |+ ( -15 15 | delta -16 16 | for delta in timedelta_list -17 17 | if delta -18 |- ], - 18 |+ ), -19 19 | dt.timedelta(), -20 20 | ) +11 | +12 | # Multi-line +13 | sum( + - [ +14 + ( +15 | delta +16 | for delta in timedelta_list +17 | if delta + - ], +18 + ), +19 | dt.timedelta(), +20 | ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap index 0f3efc172f..7ca04ac460 100644 --- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap +++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap @@ -9,17 +9,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -2 2 | -3 3 | -4 4 | def f_a(): -5 |- raise RuntimeError("This is an example exception") - 5 |+ msg = "This is an example exception" - 6 |+ raise RuntimeError(msg) -6 7 | -7 8 | -8 9 | def f_a_short(): +2 | +3 | +4 | def f_a(): + - raise RuntimeError("This is an example exception") +5 + msg = "This is an example exception" +6 + raise RuntimeError(msg) +7 | +8 | +9 | def f_a_short(): +note: This is an unsafe fix and may change runtime behavior EM102 [*] Exception must not use an f-string literal, assign to variable first --> EM.py:18:24 @@ -30,17 +29,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove f-string literal - -ℹ Unsafe fix -15 15 | -16 16 | def f_b(): -17 17 | example = "example" -18 |- raise RuntimeError(f"This is an {example} exception") - 18 |+ msg = f"This is an {example} exception" - 19 |+ raise RuntimeError(msg) -19 20 | -20 21 | -21 22 | def f_c(): +15 | +16 | def f_b(): +17 | example = "example" + - raise RuntimeError(f"This is an {example} exception") +18 + msg = f"This is an {example} exception" +19 + raise RuntimeError(msg) +20 | +21 | +22 | def f_c(): +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:22:24 @@ -50,17 +48,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -19 19 | -20 20 | -21 21 | def f_c(): -22 |- raise RuntimeError("This is an {example} exception".format(example="example")) - 22 |+ msg = "This is an {example} exception".format(example="example") - 23 |+ raise RuntimeError(msg) -23 24 | -24 25 | -25 26 | def f_ok(): +19 | +20 | +21 | def f_c(): + - raise RuntimeError("This is an {example} exception".format(example="example")) +22 + msg = "This is an {example} exception".format(example="example") +23 + raise RuntimeError(msg) +24 | +25 | +26 | def f_ok(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:32:24 @@ -71,17 +68,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -29 29 | -30 30 | def f_msg_defined(): -31 31 | msg = "hello" -32 |- raise RuntimeError("This is an example exception") - 32 |+ msg = "This is an example exception" - 33 |+ raise RuntimeError(msg) -33 34 | -34 35 | -35 36 | def f_msg_in_nested_scope(): +29 | +30 | def f_msg_defined(): +31 | msg = "hello" + - raise RuntimeError("This is an example exception") +32 + msg = "This is an example exception" +33 + raise RuntimeError(msg) +34 | +35 | +36 | def f_msg_in_nested_scope(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:39:24 @@ -92,17 +88,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -36 36 | def nested(): -37 37 | msg = "hello" -38 38 | -39 |- raise RuntimeError("This is an example exception") - 39 |+ msg = "This is an example exception" - 40 |+ raise RuntimeError(msg) -40 41 | -41 42 | -42 43 | def f_msg_in_parent_scope(): +36 | def nested(): +37 | msg = "hello" +38 | + - raise RuntimeError("This is an example exception") +39 + msg = "This is an example exception" +40 + raise RuntimeError(msg) +41 | +42 | +43 | def f_msg_in_parent_scope(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:46:28 @@ -112,17 +107,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -43 43 | msg = "hello" -44 44 | -45 45 | def nested(): -46 |- raise RuntimeError("This is an example exception") - 46 |+ msg = "This is an example exception" - 47 |+ raise RuntimeError(msg) -47 48 | -48 49 | -49 50 | def f_fix_indentation_check(foo): +43 | msg = "hello" +44 | +45 | def nested(): + - raise RuntimeError("This is an example exception") +46 + msg = "This is an example exception" +47 + raise RuntimeError(msg) +48 | +49 | +50 | def f_fix_indentation_check(foo): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:51:28 @@ -135,17 +129,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first 53 | if foo == "foo": | help: Assign to variable; remove string literal - -ℹ Unsafe fix -48 48 | -49 49 | def f_fix_indentation_check(foo): -50 50 | if foo: -51 |- raise RuntimeError("This is an example exception") - 51 |+ msg = "This is an example exception" - 52 |+ raise RuntimeError(msg) -52 53 | else: -53 54 | if foo == "foo": -54 55 | raise RuntimeError(f"This is an exception: {foo}") +48 | +49 | def f_fix_indentation_check(foo): +50 | if foo: + - raise RuntimeError("This is an example exception") +51 + msg = "This is an example exception" +52 + raise RuntimeError(msg) +53 | else: +54 | if foo == "foo": +55 | raise RuntimeError(f"This is an exception: {foo}") +note: This is an unsafe fix and may change runtime behavior EM102 [*] Exception must not use an f-string literal, assign to variable first --> EM.py:54:32 @@ -157,17 +150,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first 55 | raise RuntimeError("This is an exception: {}".format(foo)) | help: Assign to variable; remove f-string literal - -ℹ Unsafe fix -51 51 | raise RuntimeError("This is an example exception") -52 52 | else: -53 53 | if foo == "foo": -54 |- raise RuntimeError(f"This is an exception: {foo}") - 54 |+ msg = f"This is an exception: {foo}" - 55 |+ raise RuntimeError(msg) -55 56 | raise RuntimeError("This is an exception: {}".format(foo)) -56 57 | -57 58 | +51 | raise RuntimeError("This is an example exception") +52 | else: +53 | if foo == "foo": + - raise RuntimeError(f"This is an exception: {foo}") +54 + msg = f"This is an exception: {foo}" +55 + raise RuntimeError(msg) +56 | raise RuntimeError("This is an exception: {}".format(foo)) +57 | +58 | +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:55:24 @@ -178,17 +170,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -52 52 | else: -53 53 | if foo == "foo": -54 54 | raise RuntimeError(f"This is an exception: {foo}") -55 |- raise RuntimeError("This is an exception: {}".format(foo)) - 55 |+ msg = "This is an exception: {}".format(foo) - 56 |+ raise RuntimeError(msg) -56 57 | -57 58 | -58 59 | # Report these, but don't fix them +52 | else: +53 | if foo == "foo": +54 | raise RuntimeError(f"This is an exception: {foo}") + - raise RuntimeError("This is an exception: {}".format(foo)) +55 + msg = "This is an exception: {}".format(foo) +56 + raise RuntimeError(msg) +57 | +58 | +59 | # Report these, but don't fix them +note: This is an unsafe fix and may change runtime behavior EM101 Exception must not use a string literal, assign to variable first --> EM.py:59:28 @@ -218,17 +209,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove f-string literal - -ℹ Unsafe fix -61 61 | -62 62 | -63 63 | def f_triple_quoted_string(): -64 |- raise RuntimeError(f"""This is an {"example"} exception""") - 64 |+ msg = f"""This is an {"example"} exception""" - 65 |+ raise RuntimeError(msg) -65 66 | -66 67 | -67 68 | def f_multi_line_string(): +61 | +62 | +63 | def f_triple_quoted_string(): + - raise RuntimeError(f"""This is an {"example"} exception""") +64 + msg = f"""This is an {"example"} exception""" +65 + raise RuntimeError(msg) +66 | +67 | +68 | def f_multi_line_string(): +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:76:9 @@ -242,23 +232,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab 79 | ) | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -72 72 | -73 73 | -74 74 | def f_multi_line_string2(): -75 |- raise RuntimeError( - 75 |+ msg = ( -76 76 | "This is an {example} exception".format( -77 77 | example="example" -78 78 | ) -79 79 | ) - 80 |+ raise RuntimeError( - 81 |+ msg - 82 |+ ) -80 83 | -81 84 | -82 85 | def f_multi_line_string2(): +72 | +73 | +74 | def f_multi_line_string2(): + - raise RuntimeError( +75 + msg = ( +76 | "This is an {example} exception".format( +77 | example="example" +78 | ) +79 | ) +80 + raise RuntimeError( +81 + msg +82 + ) +83 | +84 | +85 | def f_multi_line_string2(): +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:84:9 @@ -275,23 +264,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab 90 | ) | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -80 80 | -81 81 | -82 82 | def f_multi_line_string2(): -83 |- raise RuntimeError( - 83 |+ msg = ( -84 84 | ( -85 85 | "This is an " -86 86 | "{example} exception" +80 | +81 | +82 | def f_multi_line_string2(): + - raise RuntimeError( +83 + msg = ( +84 | ( +85 | "This is an " +86 | "{example} exception" -------------------------------------------------------------------------------- -88 88 | example="example" -89 89 | ) -90 90 | ) - 91 |+ raise RuntimeError( - 92 |+ msg - 93 |+ ) -91 94 | -92 95 | -93 96 | def raise_typing_cast_exception(): +88 | example="example" +89 | ) +90 | ) +91 + raise RuntimeError( +92 + msg +93 + ) +94 | +95 | +96 | def raise_typing_cast_exception(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap index d470bd5028..2ad5c0ac1c 100644 --- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap +++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__defaults.snap @@ -9,17 +9,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -2 2 | -3 3 | -4 4 | def f_a(): -5 |- raise RuntimeError("This is an example exception") - 5 |+ msg = "This is an example exception" - 6 |+ raise RuntimeError(msg) -6 7 | -7 8 | -8 9 | def f_a_short(): +2 | +3 | +4 | def f_a(): + - raise RuntimeError("This is an example exception") +5 + msg = "This is an example exception" +6 + raise RuntimeError(msg) +7 | +8 | +9 | def f_a_short(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:9:24 @@ -29,17 +28,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -6 6 | -7 7 | -8 8 | def f_a_short(): -9 |- raise RuntimeError("Error") - 9 |+ msg = "Error" - 10 |+ raise RuntimeError(msg) -10 11 | -11 12 | -12 13 | def f_a_empty(): +6 | +7 | +8 | def f_a_short(): + - raise RuntimeError("Error") +9 + msg = "Error" +10 + raise RuntimeError(msg) +11 | +12 | +13 | def f_a_empty(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:13:24 @@ -49,17 +47,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -10 10 | -11 11 | -12 12 | def f_a_empty(): -13 |- raise RuntimeError("") - 13 |+ msg = "" - 14 |+ raise RuntimeError(msg) -14 15 | -15 16 | -16 17 | def f_b(): +10 | +11 | +12 | def f_a_empty(): + - raise RuntimeError("") +13 + msg = "" +14 + raise RuntimeError(msg) +15 | +16 | +17 | def f_b(): +note: This is an unsafe fix and may change runtime behavior EM102 [*] Exception must not use an f-string literal, assign to variable first --> EM.py:18:24 @@ -70,17 +67,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove f-string literal - -ℹ Unsafe fix -15 15 | -16 16 | def f_b(): -17 17 | example = "example" -18 |- raise RuntimeError(f"This is an {example} exception") - 18 |+ msg = f"This is an {example} exception" - 19 |+ raise RuntimeError(msg) -19 20 | -20 21 | -21 22 | def f_c(): +15 | +16 | def f_b(): +17 | example = "example" + - raise RuntimeError(f"This is an {example} exception") +18 + msg = f"This is an {example} exception" +19 + raise RuntimeError(msg) +20 | +21 | +22 | def f_c(): +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:22:24 @@ -90,17 +86,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -19 19 | -20 20 | -21 21 | def f_c(): -22 |- raise RuntimeError("This is an {example} exception".format(example="example")) - 22 |+ msg = "This is an {example} exception".format(example="example") - 23 |+ raise RuntimeError(msg) -23 24 | -24 25 | -25 26 | def f_ok(): +19 | +20 | +21 | def f_c(): + - raise RuntimeError("This is an {example} exception".format(example="example")) +22 + msg = "This is an {example} exception".format(example="example") +23 + raise RuntimeError(msg) +24 | +25 | +26 | def f_ok(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:32:24 @@ -111,17 +106,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -29 29 | -30 30 | def f_msg_defined(): -31 31 | msg = "hello" -32 |- raise RuntimeError("This is an example exception") - 32 |+ msg = "This is an example exception" - 33 |+ raise RuntimeError(msg) -33 34 | -34 35 | -35 36 | def f_msg_in_nested_scope(): +29 | +30 | def f_msg_defined(): +31 | msg = "hello" + - raise RuntimeError("This is an example exception") +32 + msg = "This is an example exception" +33 + raise RuntimeError(msg) +34 | +35 | +36 | def f_msg_in_nested_scope(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:39:24 @@ -132,17 +126,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -36 36 | def nested(): -37 37 | msg = "hello" -38 38 | -39 |- raise RuntimeError("This is an example exception") - 39 |+ msg = "This is an example exception" - 40 |+ raise RuntimeError(msg) -40 41 | -41 42 | -42 43 | def f_msg_in_parent_scope(): +36 | def nested(): +37 | msg = "hello" +38 | + - raise RuntimeError("This is an example exception") +39 + msg = "This is an example exception" +40 + raise RuntimeError(msg) +41 | +42 | +43 | def f_msg_in_parent_scope(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:46:28 @@ -152,17 +145,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -43 43 | msg = "hello" -44 44 | -45 45 | def nested(): -46 |- raise RuntimeError("This is an example exception") - 46 |+ msg = "This is an example exception" - 47 |+ raise RuntimeError(msg) -47 48 | -48 49 | -49 50 | def f_fix_indentation_check(foo): +43 | msg = "hello" +44 | +45 | def nested(): + - raise RuntimeError("This is an example exception") +46 + msg = "This is an example exception" +47 + raise RuntimeError(msg) +48 | +49 | +50 | def f_fix_indentation_check(foo): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:51:28 @@ -175,17 +167,16 @@ EM101 [*] Exception must not use a string literal, assign to variable first 53 | if foo == "foo": | help: Assign to variable; remove string literal - -ℹ Unsafe fix -48 48 | -49 49 | def f_fix_indentation_check(foo): -50 50 | if foo: -51 |- raise RuntimeError("This is an example exception") - 51 |+ msg = "This is an example exception" - 52 |+ raise RuntimeError(msg) -52 53 | else: -53 54 | if foo == "foo": -54 55 | raise RuntimeError(f"This is an exception: {foo}") +48 | +49 | def f_fix_indentation_check(foo): +50 | if foo: + - raise RuntimeError("This is an example exception") +51 + msg = "This is an example exception" +52 + raise RuntimeError(msg) +53 | else: +54 | if foo == "foo": +55 | raise RuntimeError(f"This is an exception: {foo}") +note: This is an unsafe fix and may change runtime behavior EM102 [*] Exception must not use an f-string literal, assign to variable first --> EM.py:54:32 @@ -197,17 +188,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first 55 | raise RuntimeError("This is an exception: {}".format(foo)) | help: Assign to variable; remove f-string literal - -ℹ Unsafe fix -51 51 | raise RuntimeError("This is an example exception") -52 52 | else: -53 53 | if foo == "foo": -54 |- raise RuntimeError(f"This is an exception: {foo}") - 54 |+ msg = f"This is an exception: {foo}" - 55 |+ raise RuntimeError(msg) -55 56 | raise RuntimeError("This is an exception: {}".format(foo)) -56 57 | -57 58 | +51 | raise RuntimeError("This is an example exception") +52 | else: +53 | if foo == "foo": + - raise RuntimeError(f"This is an exception: {foo}") +54 + msg = f"This is an exception: {foo}" +55 + raise RuntimeError(msg) +56 | raise RuntimeError("This is an exception: {}".format(foo)) +57 | +58 | +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:55:24 @@ -218,17 +208,16 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -52 52 | else: -53 53 | if foo == "foo": -54 54 | raise RuntimeError(f"This is an exception: {foo}") -55 |- raise RuntimeError("This is an exception: {}".format(foo)) - 55 |+ msg = "This is an exception: {}".format(foo) - 56 |+ raise RuntimeError(msg) -56 57 | -57 58 | -58 59 | # Report these, but don't fix them +52 | else: +53 | if foo == "foo": +54 | raise RuntimeError(f"This is an exception: {foo}") + - raise RuntimeError("This is an exception: {}".format(foo)) +55 + msg = "This is an exception: {}".format(foo) +56 + raise RuntimeError(msg) +57 | +58 | +59 | # Report these, but don't fix them +note: This is an unsafe fix and may change runtime behavior EM101 Exception must not use a string literal, assign to variable first --> EM.py:59:28 @@ -258,17 +247,16 @@ EM102 [*] Exception must not use an f-string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove f-string literal - -ℹ Unsafe fix -61 61 | -62 62 | -63 63 | def f_triple_quoted_string(): -64 |- raise RuntimeError(f"""This is an {"example"} exception""") - 64 |+ msg = f"""This is an {"example"} exception""" - 65 |+ raise RuntimeError(msg) -65 66 | -66 67 | -67 68 | def f_multi_line_string(): +61 | +62 | +63 | def f_triple_quoted_string(): + - raise RuntimeError(f"""This is an {"example"} exception""") +64 + msg = f"""This is an {"example"} exception""" +65 + raise RuntimeError(msg) +66 | +67 | +68 | def f_multi_line_string(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM.py:69:9 @@ -281,22 +269,21 @@ EM101 [*] Exception must not use a string literal, assign to variable first 71 | ) | help: Assign to variable; remove string literal - -ℹ Unsafe fix -65 65 | -66 66 | -67 67 | def f_multi_line_string(): -68 |- raise RuntimeError( - 68 |+ msg = ( -69 69 | "first" -70 70 | "second" -71 71 | ) - 72 |+ raise RuntimeError( - 73 |+ msg - 74 |+ ) -72 75 | -73 76 | -74 77 | def f_multi_line_string2(): +65 | +66 | +67 | def f_multi_line_string(): + - raise RuntimeError( +68 + msg = ( +69 | "first" +70 | "second" +71 | ) +72 + raise RuntimeError( +73 + msg +74 + ) +75 | +76 | +77 | def f_multi_line_string2(): +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:76:9 @@ -310,23 +297,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab 79 | ) | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -72 72 | -73 73 | -74 74 | def f_multi_line_string2(): -75 |- raise RuntimeError( - 75 |+ msg = ( -76 76 | "This is an {example} exception".format( -77 77 | example="example" -78 78 | ) -79 79 | ) - 80 |+ raise RuntimeError( - 81 |+ msg - 82 |+ ) -80 83 | -81 84 | -82 85 | def f_multi_line_string2(): +72 | +73 | +74 | def f_multi_line_string2(): + - raise RuntimeError( +75 + msg = ( +76 | "This is an {example} exception".format( +77 | example="example" +78 | ) +79 | ) +80 + raise RuntimeError( +81 + msg +82 + ) +83 | +84 | +85 | def f_multi_line_string2(): +note: This is an unsafe fix and may change runtime behavior EM103 [*] Exception must not use a `.format()` string directly, assign to variable first --> EM.py:84:9 @@ -343,23 +329,22 @@ EM103 [*] Exception must not use a `.format()` string directly, assign to variab 90 | ) | help: Assign to variable; remove `.format()` string - -ℹ Unsafe fix -80 80 | -81 81 | -82 82 | def f_multi_line_string2(): -83 |- raise RuntimeError( - 83 |+ msg = ( -84 84 | ( -85 85 | "This is an " -86 86 | "{example} exception" +80 | +81 | +82 | def f_multi_line_string2(): + - raise RuntimeError( +83 + msg = ( +84 | ( +85 | "This is an " +86 | "{example} exception" -------------------------------------------------------------------------------- -88 88 | example="example" -89 89 | ) -90 90 | ) - 91 |+ raise RuntimeError( - 92 |+ msg - 93 |+ ) -91 94 | -92 95 | -93 96 | def raise_typing_cast_exception(): +88 | example="example" +89 | ) +90 | ) +91 + raise RuntimeError( +92 + msg +93 + ) +94 | +95 | +96 | def raise_typing_cast_exception(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__preview.snap b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__preview.snap index 56a0a67bce..d2763d0898 100644 --- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__preview.snap +++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__preview.snap @@ -9,15 +9,14 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -1 1 | def f_byte(): -2 |- raise RuntimeError(b"This is an example exception") - 2 |+ msg = b"This is an example exception" - 3 |+ raise RuntimeError(msg) -3 4 | -4 5 | -5 6 | def f_byte_empty(): +1 | def f_byte(): + - raise RuntimeError(b"This is an example exception") +2 + msg = b"This is an example exception" +3 + raise RuntimeError(msg) +4 | +5 | +6 | def f_byte_empty(): +note: This is an unsafe fix and may change runtime behavior EM101 [*] Exception must not use a string literal, assign to variable first --> EM101_byte_string.py:6:24 @@ -27,11 +26,10 @@ EM101 [*] Exception must not use a string literal, assign to variable first | ^^^ | help: Assign to variable; remove string literal - -ℹ Unsafe fix -3 3 | -4 4 | -5 5 | def f_byte_empty(): -6 |- raise RuntimeError(b"") - 6 |+ msg = b"" - 7 |+ raise RuntimeError(msg) +3 | +4 | +5 | def f_byte_empty(): + - raise RuntimeError(b"") +6 + msg = b"" +7 + raise RuntimeError(msg) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap index df337e1b7a..520b32887f 100644 --- a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_1.py.snap @@ -8,7 +8,5 @@ EXE004 [*] Avoid whitespace before shebang | ^^^^ | help: Remove whitespace before shebang - -ℹ Safe fix -1 |- #!/usr/bin/python - 1 |+#!/usr/bin/python + - #!/usr/bin/python +1 + #!/usr/bin/python diff --git a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap index 08eb0fdf1d..2730c24a5f 100644 --- a/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap +++ b/crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE004_4.py.snap @@ -9,8 +9,6 @@ EXE004 [*] Avoid whitespace before shebang | |____^ | help: Remove whitespace before shebang - -ℹ Safe fix -1 |- -2 |- #!/usr/bin/env python - 1 |+#!/usr/bin/env python + - + - #!/usr/bin/env python +1 + #!/usr/bin/env python diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap index 9e5186ee8d..5d72a8965e 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__edge_case.py.snap @@ -10,12 +10,11 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List` 7 | a_list.append("hello") | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import List -2 3 | import typing as t -3 4 | +1 + from __future__ import annotations +2 | from typing import List +3 | import typing as t +4 | +note: This is an unsafe fix and may change runtime behavior FA100 [*] Add `from __future__ import annotations` to simplify `typing.List` --> edge_case.py:6:13 @@ -26,9 +25,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List` 7 | a_list.append("hello") | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import List -2 3 | import typing as t -3 4 | +1 + from __future__ import annotations +2 | from typing import List +3 | import typing as t +4 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap index da4fb7fd56..4c715e326a 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_lowercase.py.snap @@ -9,9 +9,8 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collect 7 | del y | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | def main() -> None: -2 3 | a_list: list[str] = [] -3 4 | a_list.append("hello") +1 + from __future__ import annotations +2 | def main() -> None: +3 | a_list: list[str] = [] +4 | a_list.append("hello") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap index d6bc243ef3..5a4bae7b01 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union.py.snap @@ -9,12 +9,11 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collect 7 | del y | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | def main() -> None: -2 3 | a_list: list[str] | None = [] -3 4 | a_list.append("hello") +1 + from __future__ import annotations +2 | def main() -> None: +3 | a_list: list[str] | None = [] +4 | a_list.append("hello") +note: This is an unsafe fix and may change runtime behavior FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union --> no_future_import_uses_union.py:6:14 @@ -24,9 +23,8 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union 7 | del y | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | def main() -> None: -2 3 | a_list: list[str] | None = [] -3 4 | a_list.append("hello") +1 + from __future__ import annotations +2 | def main() -> None: +3 | a_list: list[str] | None = [] +4 | a_list.append("hello") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap index a50c50085c..de68087031 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__fa102_no_future_import_uses_union_inner.py.snap @@ -10,12 +10,11 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 585 collect 8 | del z | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | def main() -> None: -2 3 | a_list: list[str | None] = [] -3 4 | a_list.append("hello") +1 + from __future__ import annotations +2 | def main() -> None: +3 | a_list: list[str | None] = [] +4 | a_list.append("hello") +note: This is an unsafe fix and may change runtime behavior FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union --> no_future_import_uses_union_inner.py:6:19 @@ -26,9 +25,8 @@ FA102 [*] Missing `from __future__ import annotations`, but uses PEP 604 union 8 | del z | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | def main() -> None: -2 3 | a_list: list[str | None] = [] -3 4 | a_list.append("hello") +1 + from __future__ import annotations +2 | def main() -> None: +3 | a_list: list[str | None] = [] +4 | a_list.append("hello") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap index 7e9efe8130..cda1f54742 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import.py.snap @@ -10,9 +10,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List` 6 | a_list.append("hello") | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import List -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import List +3 | +4 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap index 7eac7667be..4949536020 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__from_typing_import_many.py.snap @@ -11,12 +11,11 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List` 7 | a_dict = cast(Dict[int | None, Union[int, Set[bool]]], {}) | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Dict, List, Optional, Set, Union, cast -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Dict, List, Optional, Set, Union, cast +3 | +4 | +note: This is an unsafe fix and may change runtime behavior FA100 [*] Add `from __future__ import annotations` to simplify `typing.Optional` --> from_typing_import_many.py:5:18 @@ -28,9 +27,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.Optional` 7 | a_dict = cast(Dict[int | None, Union[int, Set[bool]]], {}) | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Dict, List, Optional, Set, Union, cast -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Dict, List, Optional, Set, Union, cast +3 | +4 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap index d0fb70fded..adaccdcc10 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing.py.snap @@ -10,9 +10,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List` 6 | a_list.append("hello") | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | import typing -2 3 | -3 4 | +1 + from __future__ import annotations +2 | import typing +3 | +4 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap index 4de6371b70..ce51176f1e 100644 --- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap +++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linter__rules__flake8_future_annotations__tests__import_typing_as.py.snap @@ -10,9 +10,8 @@ FA100 [*] Add `from __future__ import annotations` to simplify `typing.List` 6 | a_list.append("hello") | help: Add `from __future__ import annotations` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | import typing as t -2 3 | -3 4 | +1 + from __future__ import annotations +2 | import typing as t +3 | +4 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap index f6a411fcb3..f232df6352 100644 --- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap +++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC001_ISC.py.snap @@ -10,13 +10,11 @@ ISC001 [*] Implicitly concatenated string literals on one line 3 | _ = "abc" + "def" | help: Combine string literals - -ℹ Safe fix -1 |-_ = "a" "b" "c" - 1 |+_ = "ab" "c" -2 2 | -3 3 | _ = "abc" + "def" -4 4 | + - _ = "a" "b" "c" +1 + _ = "ab" "c" +2 | +3 | _ = "abc" + "def" +4 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:1:9 @@ -27,13 +25,11 @@ ISC001 [*] Implicitly concatenated string literals on one line 3 | _ = "abc" + "def" | help: Combine string literals - -ℹ Safe fix -1 |-_ = "a" "b" "c" - 1 |+_ = "a" "bc" -2 2 | -3 3 | _ = "abc" + "def" -4 4 | + - _ = "a" "b" "c" +1 + _ = "a" "bc" +2 | +3 | _ = "abc" + "def" +4 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:38:5 @@ -46,16 +42,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 40 | _ = """a | help: Combine string literals - -ℹ Safe fix -35 35 | b"def" -36 36 | ) -37 37 | -38 |-_ = """a""" """b""" - 38 |+_ = """ab""" -39 39 | -40 40 | _ = """a -41 41 | b""" """c +35 | b"def" +36 | ) +37 | + - _ = """a""" """b""" +38 + _ = """ab""" +39 | +40 | _ = """a +41 | b""" """c ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:40:5 @@ -71,16 +65,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 44 | _ = f"""a""" f"""b""" | help: Combine string literals - -ℹ Safe fix -38 38 | _ = """a""" """b""" -39 39 | -40 40 | _ = """a -41 |-b""" """c - 41 |+bc -42 42 | d""" -43 43 | -44 44 | _ = f"""a""" f"""b""" +38 | _ = """a""" """b""" +39 | +40 | _ = """a + - b""" """c +41 + bc +42 | d""" +43 | +44 | _ = f"""a""" f"""b""" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:44:5 @@ -93,16 +85,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 46 | _ = f"a" "b" | help: Combine string literals - -ℹ Safe fix -41 41 | b""" """c -42 42 | d""" -43 43 | -44 |-_ = f"""a""" f"""b""" - 44 |+_ = f"""ab""" -45 45 | -46 46 | _ = f"a" "b" -47 47 | +41 | b""" """c +42 | d""" +43 | + - _ = f"""a""" f"""b""" +44 + _ = f"""ab""" +45 | +46 | _ = f"a" "b" +47 | ISC001 Implicitly concatenated string literals on one line --> ISC.py:46:5 @@ -151,16 +141,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 54 | # Single-line explicit concatenation should be ignored. | help: Combine string literals - -ℹ Safe fix -49 49 | -50 50 | _ = 'a' "b" -51 51 | -52 |-_ = rf"a" rf"b" - 52 |+_ = rf"ab" -53 53 | -54 54 | # Single-line explicit concatenation should be ignored. -55 55 | _ = "abc" + "def" + "ghi" +49 | +50 | _ = 'a' "b" +51 | + - _ = rf"a" rf"b" +52 + _ = rf"ab" +53 | +54 | # Single-line explicit concatenation should be ignored. +55 | _ = "abc" + "def" + "ghi" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:64:10 @@ -172,16 +160,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 66 | _ = f"""abc { | help: Combine string literals - -ℹ Safe fix -61 61 | _ = foo + "abc" + bar -62 62 | -63 63 | # Multiple strings nested inside a f-string -64 |-_ = f"a {'b' 'c' 'd'} e" - 64 |+_ = f"a {'bc' 'd'} e" -65 65 | _ = f"""abc {"def" "ghi"} jkl""" -66 66 | _ = f"""abc { -67 67 | "def" +61 | _ = foo + "abc" + bar +62 | +63 | # Multiple strings nested inside a f-string + - _ = f"a {'b' 'c' 'd'} e" +64 + _ = f"a {'bc' 'd'} e" +65 | _ = f"""abc {"def" "ghi"} jkl""" +66 | _ = f"""abc { +67 | "def" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:64:14 @@ -193,16 +179,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 66 | _ = f"""abc { | help: Combine string literals - -ℹ Safe fix -61 61 | _ = foo + "abc" + bar -62 62 | -63 63 | # Multiple strings nested inside a f-string -64 |-_ = f"a {'b' 'c' 'd'} e" - 64 |+_ = f"a {'b' 'cd'} e" -65 65 | _ = f"""abc {"def" "ghi"} jkl""" -66 66 | _ = f"""abc { -67 67 | "def" +61 | _ = foo + "abc" + bar +62 | +63 | # Multiple strings nested inside a f-string + - _ = f"a {'b' 'c' 'd'} e" +64 + _ = f"a {'b' 'cd'} e" +65 | _ = f"""abc {"def" "ghi"} jkl""" +66 | _ = f"""abc { +67 | "def" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:65:14 @@ -215,16 +199,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 67 | "def" | help: Combine string literals - -ℹ Safe fix -62 62 | -63 63 | # Multiple strings nested inside a f-string -64 64 | _ = f"a {'b' 'c' 'd'} e" -65 |-_ = f"""abc {"def" "ghi"} jkl""" - 65 |+_ = f"""abc {"defghi"} jkl""" -66 66 | _ = f"""abc { -67 67 | "def" -68 68 | "ghi" +62 | +63 | # Multiple strings nested inside a f-string +64 | _ = f"a {'b' 'c' 'd'} e" + - _ = f"""abc {"def" "ghi"} jkl""" +65 + _ = f"""abc {"defghi"} jkl""" +66 | _ = f"""abc { +67 | "def" +68 | "ghi" ISC001 Implicitly concatenated string literals on one line --> ISC.py:72:5 @@ -258,16 +240,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 74 | _ = f"b {f"abc" \ | help: Combine string literals - -ℹ Safe fix -69 69 | } jkl""" -70 70 | -71 71 | # Nested f-strings -72 |-_ = "a" f"b {f"c" f"d"} e" "f" - 72 |+_ = "a" f"b {f"cd"} e" "f" -73 73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h" -74 74 | _ = f"b {f"abc" \ -75 75 | f"def"} g" +69 | } jkl""" +70 | +71 | # Nested f-strings + - _ = "a" f"b {f"c" f"d"} e" "f" +72 + _ = "a" f"b {f"cd"} e" "f" +73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h" +74 | _ = f"b {f"abc" \ +75 | f"def"} g" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:73:10 @@ -280,16 +260,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 75 | f"def"} g" | help: Combine string literals - -ℹ Safe fix -70 70 | -71 71 | # Nested f-strings -72 72 | _ = "a" f"b {f"c" f"d"} e" "f" -73 |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h" - 73 |+_ = f"b {f"cd {f"e" f"f"} g"} h" -74 74 | _ = f"b {f"abc" \ -75 75 | f"def"} g" -76 76 | +70 | +71 | # Nested f-strings +72 | _ = "a" f"b {f"c" f"d"} e" "f" + - _ = f"b {f"c" f"d {f"e" f"f"} g"} h" +73 + _ = f"b {f"cd {f"e" f"f"} g"} h" +74 | _ = f"b {f"abc" \ +75 | f"def"} g" +76 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:73:20 @@ -302,16 +280,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 75 | f"def"} g" | help: Combine string literals - -ℹ Safe fix -70 70 | -71 71 | # Nested f-strings -72 72 | _ = "a" f"b {f"c" f"d"} e" "f" -73 |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h" - 73 |+_ = f"b {f"c" f"d {f"ef"} g"} h" -74 74 | _ = f"b {f"abc" \ -75 75 | f"def"} g" -76 76 | +70 | +71 | # Nested f-strings +72 | _ = "a" f"b {f"c" f"d"} e" "f" + - _ = f"b {f"c" f"d {f"e" f"f"} g"} h" +73 + _ = f"b {f"c" f"d {f"ef"} g"} h" +74 | _ = f"b {f"abc" \ +75 | f"def"} g" +76 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:84:5 @@ -323,16 +299,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 86 | _ = "\\\12""0" # fix should be "\\\0120" | help: Combine string literals - -ℹ Safe fix -81 81 | + f"second"} d" -82 82 | -83 83 | # See https://github.com/astral-sh/ruff/issues/12936 -84 |-_ = "\12""0" # fix should be "\0120" - 84 |+_ = "\0120" # fix should be "\0120" -85 85 | _ = "\\12""0" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" +81 | + f"second"} d" +82 | +83 | # See https://github.com/astral-sh/ruff/issues/12936 + - _ = "\12""0" # fix should be "\0120" +84 + _ = "\0120" # fix should be "\0120" +85 | _ = "\\12""0" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:85:5 @@ -345,16 +319,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 87 | _ = "\12 0""0" # fix should be "\12 00" | help: Combine string literals - -ℹ Safe fix -82 82 | -83 83 | # See https://github.com/astral-sh/ruff/issues/12936 -84 84 | _ = "\12""0" # fix should be "\0120" -85 |-_ = "\\12""0" # fix should be "\\120" - 85 |+_ = "\\120" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" +82 | +83 | # See https://github.com/astral-sh/ruff/issues/12936 +84 | _ = "\12""0" # fix should be "\0120" + - _ = "\\12""0" # fix should be "\\120" +85 + _ = "\\120" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:86:5 @@ -367,16 +339,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 88 | _ = r"\12"r"0" # fix should be r"\120" | help: Combine string literals - -ℹ Safe fix -83 83 | # See https://github.com/astral-sh/ruff/issues/12936 -84 84 | _ = "\12""0" # fix should be "\0120" -85 85 | _ = "\\12""0" # fix should be "\\120" -86 |-_ = "\\\12""0" # fix should be "\\\0120" - 86 |+_ = "\\\0120" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" +83 | # See https://github.com/astral-sh/ruff/issues/12936 +84 | _ = "\12""0" # fix should be "\0120" +85 | _ = "\\12""0" # fix should be "\\120" + - _ = "\\\12""0" # fix should be "\\\0120" +86 + _ = "\\\0120" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:87:5 @@ -389,16 +359,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 89 | _ = "\12 and more""0" # fix should be "\12 and more0" | help: Combine string literals - -ℹ Safe fix -84 84 | _ = "\12""0" # fix should be "\0120" -85 85 | _ = "\\12""0" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 |-_ = "\12 0""0" # fix should be "\12 00" - 87 |+_ = "\12 00" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" +84 | _ = "\12""0" # fix should be "\0120" +85 | _ = "\\12""0" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" + - _ = "\12 0""0" # fix should be "\12 00" +87 + _ = "\12 00" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:88:5 @@ -411,16 +379,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 90 | _ = "\8""0" # fix should be "\80" | help: Combine string literals - -ℹ Safe fix -85 85 | _ = "\\12""0" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 |-_ = r"\12"r"0" # fix should be r"\120" - 88 |+_ = r"\120" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" +85 | _ = "\\12""0" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" + - _ = r"\12"r"0" # fix should be r"\120" +88 + _ = r"\120" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:89:5 @@ -433,16 +399,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 91 | _ = "\12""8" # fix should be "\128" | help: Combine string literals - -ℹ Safe fix -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 |-_ = "\12 and more""0" # fix should be "\12 and more0" - 89 |+_ = "\12 and more0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" + - _ = "\12 and more""0" # fix should be "\12 and more0" +89 + _ = "\12 and more0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:90:5 @@ -455,16 +419,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 92 | _ = "\12""foo" # fix should be "\12foo" | help: Combine string literals - -ℹ Safe fix -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 |-_ = "\8""0" # fix should be "\80" - 90 |+_ = "\80" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" -93 93 | _ = "\12" "" # fix should be "\12" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" + - _ = "\8""0" # fix should be "\80" +90 + _ = "\80" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" +93 | _ = "\12" "" # fix should be "\12" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:91:5 @@ -477,16 +439,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 93 | _ = "\12" "" # fix should be "\12" | help: Combine string literals - -ℹ Safe fix -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 |-_ = "\12""8" # fix should be "\128" - 91 |+_ = "\128" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" -93 93 | _ = "\12" "" # fix should be "\12" -94 94 | +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" + - _ = "\12""8" # fix should be "\128" +91 + _ = "\128" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" +93 | _ = "\12" "" # fix should be "\12" +94 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:92:5 @@ -498,16 +458,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 93 | _ = "\12" "" # fix should be "\12" | help: Combine string literals - -ℹ Safe fix -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 |-_ = "\12""foo" # fix should be "\12foo" - 92 |+_ = "\12foo" # fix should be "\12foo" -93 93 | _ = "\12" "" # fix should be "\12" -94 94 | -95 95 | +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" + - _ = "\12""foo" # fix should be "\12foo" +92 + _ = "\12foo" # fix should be "\12foo" +93 | _ = "\12" "" # fix should be "\12" +94 | +95 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:93:5 @@ -518,13 +476,11 @@ ISC001 [*] Implicitly concatenated string literals on one line | ^^^^^^^^ | help: Combine string literals - -ℹ Safe fix -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" -93 |-_ = "\12" "" # fix should be "\12" - 93 |+_ = "\12" # fix should be "\12" -94 94 | -95 95 | -96 96 | # Mixed literal + non-literal scenarios +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" + - _ = "\12" "" # fix should be "\12" +93 + _ = "\12" # fix should be "\12" +94 | +95 | +96 | # Mixed literal + non-literal scenarios diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap index 795ab86e8a..b990f5e41b 100644 --- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap +++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__ISC003_ISC.py.snap @@ -11,16 +11,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 11 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -6 6 | "def" -7 7 | -8 8 | _ = ( -9 |- "abc" + - 9 |+ "abc" -10 10 | "def" -11 11 | ) -12 12 | +6 | "def" +7 | +8 | _ = ( + - "abc" + +9 + "abc" +10 | "def" +11 | ) +12 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:14:3 @@ -32,16 +30,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 16 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -11 11 | ) -12 12 | -13 13 | _ = ( -14 |- f"abc" + - 14 |+ f"abc" -15 15 | "def" -16 16 | ) -17 17 | +11 | ) +12 | +13 | _ = ( + - f"abc" + +14 + f"abc" +15 | "def" +16 | ) +17 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:19:3 @@ -53,16 +49,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 21 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -16 16 | ) -17 17 | -18 18 | _ = ( -19 |- b"abc" + - 19 |+ b"abc" -20 20 | b"def" -21 21 | ) -22 22 | +16 | ) +17 | +18 | _ = ( + - b"abc" + +19 + b"abc" +20 | b"def" +21 | ) +22 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:78:10 @@ -76,16 +70,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 81 | + f"second"} d" | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -76 76 | -77 77 | # Explicitly concatenated nested f-strings -78 78 | _ = f"a {f"first" -79 |- + f"second"} d" - 79 |+ f"second"} d" -80 80 | _ = f"a {f"first {f"middle"}" -81 81 | + f"second"} d" -82 82 | +76 | +77 | # Explicitly concatenated nested f-strings +78 | _ = f"a {f"first" + - + f"second"} d" +79 + f"second"} d" +80 | _ = f"a {f"first {f"middle"}" +81 | + f"second"} d" +82 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:80:10 @@ -100,16 +92,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 83 | # See https://github.com/astral-sh/ruff/issues/12936 | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -78 78 | _ = f"a {f"first" -79 79 | + f"second"} d" -80 80 | _ = f"a {f"first {f"middle"}" -81 |- + f"second"} d" - 81 |+ f"second"} d" -82 82 | -83 83 | # See https://github.com/astral-sh/ruff/issues/12936 -84 84 | _ = "\12""0" # fix should be "\0120" +78 | _ = f"a {f"first" +79 | + f"second"} d" +80 | _ = f"a {f"first {f"middle"}" + - + f"second"} d" +81 + f"second"} d" +82 | +83 | # See https://github.com/astral-sh/ruff/issues/12936 +84 | _ = "\12""0" # fix should be "\0120" ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:110:5 @@ -121,16 +111,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 112 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -107 107 | ) -108 108 | -109 109 | _ = ( -110 |- rf"raw_f{x}" + - 110 |+ rf"raw_f{x}" -111 111 | r"raw_normal" -112 112 | ) -113 113 | +107 | ) +108 | +109 | _ = ( + - rf"raw_f{x}" + +110 + rf"raw_f{x}" +111 | r"raw_normal" +112 | ) +113 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:117:5 @@ -143,16 +131,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 119 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -114 114 | -115 115 | # Different prefix combinations -116 116 | _ = ( -117 |- u"unicode" + - 117 |+ u"unicode" -118 118 | r"raw" -119 119 | ) -120 120 | +114 | +115 | # Different prefix combinations +116 | _ = ( + - u"unicode" + +117 + u"unicode" +118 | r"raw" +119 | ) +120 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:122:5 @@ -164,16 +150,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 124 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -119 119 | ) -120 120 | -121 121 | _ = ( -122 |- rb"raw_bytes" + - 122 |+ rb"raw_bytes" -123 123 | b"normal_bytes" -124 124 | ) -125 125 | +119 | ) +120 | +121 | _ = ( + - rb"raw_bytes" + +122 + rb"raw_bytes" +123 | b"normal_bytes" +124 | ) +125 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:127:5 @@ -185,16 +169,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 129 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -124 124 | ) -125 125 | -126 126 | _ = ( -127 |- b"bytes" + - 127 |+ b"bytes" -128 128 | b"with_bytes" -129 129 | ) -130 130 | +124 | ) +125 | +126 | _ = ( + - b"bytes" + +127 + b"bytes" +128 | b"with_bytes" +129 | ) +130 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:133:6 @@ -209,16 +191,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 136 | "d" + "e" | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -130 130 | -131 131 | # Repeated concatenation -132 132 | -133 |-_ = ("a" + - 133 |+_ = ("a" -134 134 | "b" + -135 135 | "c" + -136 136 | "d" + "e" +130 | +131 | # Repeated concatenation +132 | + - _ = ("a" + +133 + _ = ("a" +134 | "b" + +135 | "c" + +136 | "d" + "e" ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:139:6 @@ -233,16 +213,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 142 | + "d" | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -137 137 | ) -138 138 | -139 139 | _ = ("a" -140 |- + "b" - 140 |+ "b" -141 141 | + "c" -142 142 | + "d" -143 143 | + "e" +137 | ) +138 | +139 | _ = ("a" + - + "b" +140 + "b" +141 | + "c" +142 | + "d" +143 | + "e" ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:160:5 @@ -254,16 +232,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 162 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -158 158 | -159 159 | _ = ( -160 160 | "first" -161 |- + "second" # extra spaces around + - 161 |+ "second" # extra spaces around + -162 162 | ) -163 163 | -164 164 | _ = ( +158 | +159 | _ = ( +160 | "first" + - + "second" # extra spaces around + +161 + "second" # extra spaces around + +162 | ) +163 | +164 | _ = ( ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:165:5 @@ -275,16 +251,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 167 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -162 162 | ) -163 163 | -164 164 | _ = ( -165 |- "first" + # trailing spaces before + - 165 |+ "first" # trailing spaces before + -166 166 | "second" -167 167 | ) -168 168 | +162 | ) +163 | +164 | _ = ( + - "first" + # trailing spaces before + +165 + "first" # trailing spaces before + +166 | "second" +167 | ) +168 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:170:5 @@ -296,16 +270,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 172 | )) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -167 167 | ) -168 168 | -169 169 | _ = (( -170 |- "deep" + - 170 |+ "deep" -171 171 | "nesting" -172 172 | )) -173 173 | +167 | ) +168 | +169 | _ = (( + - "deep" + +170 + "deep" +171 | "nesting" +172 | )) +173 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:175:5 @@ -317,16 +289,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 177 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -172 172 | )) -173 173 | -174 174 | _ = ( -175 |- "contains + plus" + - 175 |+ "contains + plus" -176 176 | "another string" -177 177 | ) -178 178 | +172 | )) +173 | +174 | _ = ( + - "contains + plus" + +175 + "contains + plus" +176 | "another string" +177 | ) +178 | ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:180:5 @@ -339,16 +309,14 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 183 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -179 179 | _ = ( -180 180 | "start" -181 181 | # leading comment -182 |- + "end" - 182 |+ "end" -183 183 | ) -184 184 | -185 185 | _ = ( +179 | _ = ( +180 | "start" +181 | # leading comment + - + "end" +182 + "end" +183 | ) +184 | +185 | _ = ( ISC003 [*] Explicitly concatenated string should be implicitly concatenated --> ISC.py:186:5 @@ -361,13 +329,11 @@ ISC003 [*] Explicitly concatenated string should be implicitly concatenated 189 | ) | help: Remove redundant '+' operator to implicitly concatenate - -ℹ Safe fix -183 183 | ) -184 184 | -185 185 | _ = ( -186 |- "start" + - 186 |+ "start" -187 187 | # leading comment -188 188 | "end" -189 189 | ) +183 | ) +184 | +185 | _ = ( + - "start" + +186 + "start" +187 | # leading comment +188 | "end" +189 | ) diff --git a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap index f6a411fcb3..f232df6352 100644 --- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap +++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linter__rules__flake8_implicit_str_concat__tests__multiline_ISC001_ISC.py.snap @@ -10,13 +10,11 @@ ISC001 [*] Implicitly concatenated string literals on one line 3 | _ = "abc" + "def" | help: Combine string literals - -ℹ Safe fix -1 |-_ = "a" "b" "c" - 1 |+_ = "ab" "c" -2 2 | -3 3 | _ = "abc" + "def" -4 4 | + - _ = "a" "b" "c" +1 + _ = "ab" "c" +2 | +3 | _ = "abc" + "def" +4 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:1:9 @@ -27,13 +25,11 @@ ISC001 [*] Implicitly concatenated string literals on one line 3 | _ = "abc" + "def" | help: Combine string literals - -ℹ Safe fix -1 |-_ = "a" "b" "c" - 1 |+_ = "a" "bc" -2 2 | -3 3 | _ = "abc" + "def" -4 4 | + - _ = "a" "b" "c" +1 + _ = "a" "bc" +2 | +3 | _ = "abc" + "def" +4 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:38:5 @@ -46,16 +42,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 40 | _ = """a | help: Combine string literals - -ℹ Safe fix -35 35 | b"def" -36 36 | ) -37 37 | -38 |-_ = """a""" """b""" - 38 |+_ = """ab""" -39 39 | -40 40 | _ = """a -41 41 | b""" """c +35 | b"def" +36 | ) +37 | + - _ = """a""" """b""" +38 + _ = """ab""" +39 | +40 | _ = """a +41 | b""" """c ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:40:5 @@ -71,16 +65,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 44 | _ = f"""a""" f"""b""" | help: Combine string literals - -ℹ Safe fix -38 38 | _ = """a""" """b""" -39 39 | -40 40 | _ = """a -41 |-b""" """c - 41 |+bc -42 42 | d""" -43 43 | -44 44 | _ = f"""a""" f"""b""" +38 | _ = """a""" """b""" +39 | +40 | _ = """a + - b""" """c +41 + bc +42 | d""" +43 | +44 | _ = f"""a""" f"""b""" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:44:5 @@ -93,16 +85,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 46 | _ = f"a" "b" | help: Combine string literals - -ℹ Safe fix -41 41 | b""" """c -42 42 | d""" -43 43 | -44 |-_ = f"""a""" f"""b""" - 44 |+_ = f"""ab""" -45 45 | -46 46 | _ = f"a" "b" -47 47 | +41 | b""" """c +42 | d""" +43 | + - _ = f"""a""" f"""b""" +44 + _ = f"""ab""" +45 | +46 | _ = f"a" "b" +47 | ISC001 Implicitly concatenated string literals on one line --> ISC.py:46:5 @@ -151,16 +141,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 54 | # Single-line explicit concatenation should be ignored. | help: Combine string literals - -ℹ Safe fix -49 49 | -50 50 | _ = 'a' "b" -51 51 | -52 |-_ = rf"a" rf"b" - 52 |+_ = rf"ab" -53 53 | -54 54 | # Single-line explicit concatenation should be ignored. -55 55 | _ = "abc" + "def" + "ghi" +49 | +50 | _ = 'a' "b" +51 | + - _ = rf"a" rf"b" +52 + _ = rf"ab" +53 | +54 | # Single-line explicit concatenation should be ignored. +55 | _ = "abc" + "def" + "ghi" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:64:10 @@ -172,16 +160,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 66 | _ = f"""abc { | help: Combine string literals - -ℹ Safe fix -61 61 | _ = foo + "abc" + bar -62 62 | -63 63 | # Multiple strings nested inside a f-string -64 |-_ = f"a {'b' 'c' 'd'} e" - 64 |+_ = f"a {'bc' 'd'} e" -65 65 | _ = f"""abc {"def" "ghi"} jkl""" -66 66 | _ = f"""abc { -67 67 | "def" +61 | _ = foo + "abc" + bar +62 | +63 | # Multiple strings nested inside a f-string + - _ = f"a {'b' 'c' 'd'} e" +64 + _ = f"a {'bc' 'd'} e" +65 | _ = f"""abc {"def" "ghi"} jkl""" +66 | _ = f"""abc { +67 | "def" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:64:14 @@ -193,16 +179,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 66 | _ = f"""abc { | help: Combine string literals - -ℹ Safe fix -61 61 | _ = foo + "abc" + bar -62 62 | -63 63 | # Multiple strings nested inside a f-string -64 |-_ = f"a {'b' 'c' 'd'} e" - 64 |+_ = f"a {'b' 'cd'} e" -65 65 | _ = f"""abc {"def" "ghi"} jkl""" -66 66 | _ = f"""abc { -67 67 | "def" +61 | _ = foo + "abc" + bar +62 | +63 | # Multiple strings nested inside a f-string + - _ = f"a {'b' 'c' 'd'} e" +64 + _ = f"a {'b' 'cd'} e" +65 | _ = f"""abc {"def" "ghi"} jkl""" +66 | _ = f"""abc { +67 | "def" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:65:14 @@ -215,16 +199,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 67 | "def" | help: Combine string literals - -ℹ Safe fix -62 62 | -63 63 | # Multiple strings nested inside a f-string -64 64 | _ = f"a {'b' 'c' 'd'} e" -65 |-_ = f"""abc {"def" "ghi"} jkl""" - 65 |+_ = f"""abc {"defghi"} jkl""" -66 66 | _ = f"""abc { -67 67 | "def" -68 68 | "ghi" +62 | +63 | # Multiple strings nested inside a f-string +64 | _ = f"a {'b' 'c' 'd'} e" + - _ = f"""abc {"def" "ghi"} jkl""" +65 + _ = f"""abc {"defghi"} jkl""" +66 | _ = f"""abc { +67 | "def" +68 | "ghi" ISC001 Implicitly concatenated string literals on one line --> ISC.py:72:5 @@ -258,16 +240,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 74 | _ = f"b {f"abc" \ | help: Combine string literals - -ℹ Safe fix -69 69 | } jkl""" -70 70 | -71 71 | # Nested f-strings -72 |-_ = "a" f"b {f"c" f"d"} e" "f" - 72 |+_ = "a" f"b {f"cd"} e" "f" -73 73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h" -74 74 | _ = f"b {f"abc" \ -75 75 | f"def"} g" +69 | } jkl""" +70 | +71 | # Nested f-strings + - _ = "a" f"b {f"c" f"d"} e" "f" +72 + _ = "a" f"b {f"cd"} e" "f" +73 | _ = f"b {f"c" f"d {f"e" f"f"} g"} h" +74 | _ = f"b {f"abc" \ +75 | f"def"} g" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:73:10 @@ -280,16 +260,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 75 | f"def"} g" | help: Combine string literals - -ℹ Safe fix -70 70 | -71 71 | # Nested f-strings -72 72 | _ = "a" f"b {f"c" f"d"} e" "f" -73 |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h" - 73 |+_ = f"b {f"cd {f"e" f"f"} g"} h" -74 74 | _ = f"b {f"abc" \ -75 75 | f"def"} g" -76 76 | +70 | +71 | # Nested f-strings +72 | _ = "a" f"b {f"c" f"d"} e" "f" + - _ = f"b {f"c" f"d {f"e" f"f"} g"} h" +73 + _ = f"b {f"cd {f"e" f"f"} g"} h" +74 | _ = f"b {f"abc" \ +75 | f"def"} g" +76 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:73:20 @@ -302,16 +280,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 75 | f"def"} g" | help: Combine string literals - -ℹ Safe fix -70 70 | -71 71 | # Nested f-strings -72 72 | _ = "a" f"b {f"c" f"d"} e" "f" -73 |-_ = f"b {f"c" f"d {f"e" f"f"} g"} h" - 73 |+_ = f"b {f"c" f"d {f"ef"} g"} h" -74 74 | _ = f"b {f"abc" \ -75 75 | f"def"} g" -76 76 | +70 | +71 | # Nested f-strings +72 | _ = "a" f"b {f"c" f"d"} e" "f" + - _ = f"b {f"c" f"d {f"e" f"f"} g"} h" +73 + _ = f"b {f"c" f"d {f"ef"} g"} h" +74 | _ = f"b {f"abc" \ +75 | f"def"} g" +76 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:84:5 @@ -323,16 +299,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 86 | _ = "\\\12""0" # fix should be "\\\0120" | help: Combine string literals - -ℹ Safe fix -81 81 | + f"second"} d" -82 82 | -83 83 | # See https://github.com/astral-sh/ruff/issues/12936 -84 |-_ = "\12""0" # fix should be "\0120" - 84 |+_ = "\0120" # fix should be "\0120" -85 85 | _ = "\\12""0" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" +81 | + f"second"} d" +82 | +83 | # See https://github.com/astral-sh/ruff/issues/12936 + - _ = "\12""0" # fix should be "\0120" +84 + _ = "\0120" # fix should be "\0120" +85 | _ = "\\12""0" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:85:5 @@ -345,16 +319,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 87 | _ = "\12 0""0" # fix should be "\12 00" | help: Combine string literals - -ℹ Safe fix -82 82 | -83 83 | # See https://github.com/astral-sh/ruff/issues/12936 -84 84 | _ = "\12""0" # fix should be "\0120" -85 |-_ = "\\12""0" # fix should be "\\120" - 85 |+_ = "\\120" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" +82 | +83 | # See https://github.com/astral-sh/ruff/issues/12936 +84 | _ = "\12""0" # fix should be "\0120" + - _ = "\\12""0" # fix should be "\\120" +85 + _ = "\\120" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:86:5 @@ -367,16 +339,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 88 | _ = r"\12"r"0" # fix should be r"\120" | help: Combine string literals - -ℹ Safe fix -83 83 | # See https://github.com/astral-sh/ruff/issues/12936 -84 84 | _ = "\12""0" # fix should be "\0120" -85 85 | _ = "\\12""0" # fix should be "\\120" -86 |-_ = "\\\12""0" # fix should be "\\\0120" - 86 |+_ = "\\\0120" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" +83 | # See https://github.com/astral-sh/ruff/issues/12936 +84 | _ = "\12""0" # fix should be "\0120" +85 | _ = "\\12""0" # fix should be "\\120" + - _ = "\\\12""0" # fix should be "\\\0120" +86 + _ = "\\\0120" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:87:5 @@ -389,16 +359,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 89 | _ = "\12 and more""0" # fix should be "\12 and more0" | help: Combine string literals - -ℹ Safe fix -84 84 | _ = "\12""0" # fix should be "\0120" -85 85 | _ = "\\12""0" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 |-_ = "\12 0""0" # fix should be "\12 00" - 87 |+_ = "\12 00" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" +84 | _ = "\12""0" # fix should be "\0120" +85 | _ = "\\12""0" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" + - _ = "\12 0""0" # fix should be "\12 00" +87 + _ = "\12 00" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:88:5 @@ -411,16 +379,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 90 | _ = "\8""0" # fix should be "\80" | help: Combine string literals - -ℹ Safe fix -85 85 | _ = "\\12""0" # fix should be "\\120" -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 |-_ = r"\12"r"0" # fix should be r"\120" - 88 |+_ = r"\120" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" +85 | _ = "\\12""0" # fix should be "\\120" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" + - _ = r"\12"r"0" # fix should be r"\120" +88 + _ = r"\120" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:89:5 @@ -433,16 +399,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 91 | _ = "\12""8" # fix should be "\128" | help: Combine string literals - -ℹ Safe fix -86 86 | _ = "\\\12""0" # fix should be "\\\0120" -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 |-_ = "\12 and more""0" # fix should be "\12 and more0" - 89 |+_ = "\12 and more0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" +86 | _ = "\\\12""0" # fix should be "\\\0120" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" + - _ = "\12 and more""0" # fix should be "\12 and more0" +89 + _ = "\12 and more0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:90:5 @@ -455,16 +419,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 92 | _ = "\12""foo" # fix should be "\12foo" | help: Combine string literals - -ℹ Safe fix -87 87 | _ = "\12 0""0" # fix should be "\12 00" -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 |-_ = "\8""0" # fix should be "\80" - 90 |+_ = "\80" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" -93 93 | _ = "\12" "" # fix should be "\12" +87 | _ = "\12 0""0" # fix should be "\12 00" +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" + - _ = "\8""0" # fix should be "\80" +90 + _ = "\80" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" +93 | _ = "\12" "" # fix should be "\12" ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:91:5 @@ -477,16 +439,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 93 | _ = "\12" "" # fix should be "\12" | help: Combine string literals - -ℹ Safe fix -88 88 | _ = r"\12"r"0" # fix should be r"\120" -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 |-_ = "\12""8" # fix should be "\128" - 91 |+_ = "\128" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" -93 93 | _ = "\12" "" # fix should be "\12" -94 94 | +88 | _ = r"\12"r"0" # fix should be r"\120" +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" + - _ = "\12""8" # fix should be "\128" +91 + _ = "\128" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" +93 | _ = "\12" "" # fix should be "\12" +94 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:92:5 @@ -498,16 +458,14 @@ ISC001 [*] Implicitly concatenated string literals on one line 93 | _ = "\12" "" # fix should be "\12" | help: Combine string literals - -ℹ Safe fix -89 89 | _ = "\12 and more""0" # fix should be "\12 and more0" -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 |-_ = "\12""foo" # fix should be "\12foo" - 92 |+_ = "\12foo" # fix should be "\12foo" -93 93 | _ = "\12" "" # fix should be "\12" -94 94 | -95 95 | +89 | _ = "\12 and more""0" # fix should be "\12 and more0" +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" + - _ = "\12""foo" # fix should be "\12foo" +92 + _ = "\12foo" # fix should be "\12foo" +93 | _ = "\12" "" # fix should be "\12" +94 | +95 | ISC001 [*] Implicitly concatenated string literals on one line --> ISC.py:93:5 @@ -518,13 +476,11 @@ ISC001 [*] Implicitly concatenated string literals on one line | ^^^^^^^^ | help: Combine string literals - -ℹ Safe fix -90 90 | _ = "\8""0" # fix should be "\80" -91 91 | _ = "\12""8" # fix should be "\128" -92 92 | _ = "\12""foo" # fix should be "\12foo" -93 |-_ = "\12" "" # fix should be "\12" - 93 |+_ = "\12" # fix should be "\12" -94 94 | -95 95 | -96 96 | # Mixed literal + non-literal scenarios +90 | _ = "\8""0" # fix should be "\80" +91 | _ = "\12""8" # fix should be "\128" +92 | _ = "\12""foo" # fix should be "\12foo" + - _ = "\12" "" # fix should be "\12" +93 + _ = "\12" # fix should be "\12" +94 | +95 | +96 | # Mixed literal + non-literal scenarios diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap index acd73a4fd1..52708a8b47 100644 --- a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap +++ b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__defaults.snap @@ -11,16 +11,15 @@ ICN001 [*] `altair` should be imported as `alt` 8 | import numpy | help: Alias `altair` to `alt` - -ℹ Unsafe fix -3 3 | -4 4 | -5 5 | def unconventional(): -6 |- import altair - 6 |+ import altair as alt -7 7 | import matplotlib.pyplot -8 8 | import numpy -9 9 | import pandas +3 | +4 | +5 | def unconventional(): + - import altair +6 + import altair as alt +7 | import matplotlib.pyplot +8 | import numpy +9 | import pandas +note: This is an unsafe fix and may change runtime behavior ICN001 `matplotlib.pyplot` should be imported as `plt` --> defaults.py:7:12 @@ -45,16 +44,15 @@ ICN001 [*] `numpy` should be imported as `np` 10 | import seaborn | help: Alias `numpy` to `np` - -ℹ Unsafe fix -5 5 | def unconventional(): -6 6 | import altair -7 7 | import matplotlib.pyplot -8 |- import numpy - 8 |+ import numpy as np -9 9 | import pandas -10 10 | import seaborn -11 11 | import tkinter +5 | def unconventional(): +6 | import altair +7 | import matplotlib.pyplot + - import numpy +8 + import numpy as np +9 | import pandas +10 | import seaborn +11 | import tkinter +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `pandas` should be imported as `pd` --> defaults.py:9:12 @@ -67,16 +65,15 @@ ICN001 [*] `pandas` should be imported as `pd` 11 | import tkinter | help: Alias `pandas` to `pd` - -ℹ Unsafe fix -6 6 | import altair -7 7 | import matplotlib.pyplot -8 8 | import numpy -9 |- import pandas - 9 |+ import pandas as pd -10 10 | import seaborn -11 11 | import tkinter -12 12 | import networkx +6 | import altair +7 | import matplotlib.pyplot +8 | import numpy + - import pandas +9 + import pandas as pd +10 | import seaborn +11 | import tkinter +12 | import networkx +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `seaborn` should be imported as `sns` --> defaults.py:10:12 @@ -89,16 +86,15 @@ ICN001 [*] `seaborn` should be imported as `sns` 12 | import networkx | help: Alias `seaborn` to `sns` - -ℹ Unsafe fix -7 7 | import matplotlib.pyplot -8 8 | import numpy -9 9 | import pandas -10 |- import seaborn - 10 |+ import seaborn as sns -11 11 | import tkinter -12 12 | import networkx -13 13 | +7 | import matplotlib.pyplot +8 | import numpy +9 | import pandas + - import seaborn +10 + import seaborn as sns +11 | import tkinter +12 | import networkx +13 | +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `tkinter` should be imported as `tk` --> defaults.py:11:12 @@ -110,16 +106,15 @@ ICN001 [*] `tkinter` should be imported as `tk` 12 | import networkx | help: Alias `tkinter` to `tk` - -ℹ Unsafe fix -8 8 | import numpy -9 9 | import pandas -10 10 | import seaborn -11 |- import tkinter - 11 |+ import tkinter as tk -12 12 | import networkx -13 13 | -14 14 | +8 | import numpy +9 | import pandas +10 | import seaborn + - import tkinter +11 + import tkinter as tk +12 | import networkx +13 | +14 | +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `networkx` should be imported as `nx` --> defaults.py:12:12 @@ -130,16 +125,15 @@ ICN001 [*] `networkx` should be imported as `nx` | ^^^^^^^^ | help: Alias `networkx` to `nx` - -ℹ Unsafe fix -9 9 | import pandas -10 10 | import seaborn -11 11 | import tkinter -12 |- import networkx - 12 |+ import networkx as nx -13 13 | -14 14 | -15 15 | def unconventional_aliases(): +9 | import pandas +10 | import seaborn +11 | import tkinter + - import networkx +12 + import networkx as nx +13 | +14 | +15 | def unconventional_aliases(): +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `altair` should be imported as `alt` --> defaults.py:16:22 @@ -151,16 +145,15 @@ ICN001 [*] `altair` should be imported as `alt` 18 | import numpy as nmp | help: Alias `altair` to `alt` - -ℹ Unsafe fix -13 13 | -14 14 | -15 15 | def unconventional_aliases(): -16 |- import altair as altr - 16 |+ import altair as alt -17 17 | import matplotlib.pyplot as plot -18 18 | import numpy as nmp -19 19 | import pandas as pdas +13 | +14 | +15 | def unconventional_aliases(): + - import altair as altr +16 + import altair as alt +17 | import matplotlib.pyplot as plot +18 | import numpy as nmp +19 | import pandas as pdas +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `matplotlib.pyplot` should be imported as `plt` --> defaults.py:17:33 @@ -173,16 +166,15 @@ ICN001 [*] `matplotlib.pyplot` should be imported as `plt` 19 | import pandas as pdas | help: Alias `matplotlib.pyplot` to `plt` - -ℹ Unsafe fix -14 14 | -15 15 | def unconventional_aliases(): -16 16 | import altair as altr -17 |- import matplotlib.pyplot as plot - 17 |+ import matplotlib.pyplot as plt -18 18 | import numpy as nmp -19 19 | import pandas as pdas -20 20 | import seaborn as sbrn +14 | +15 | def unconventional_aliases(): +16 | import altair as altr + - import matplotlib.pyplot as plot +17 + import matplotlib.pyplot as plt +18 | import numpy as nmp +19 | import pandas as pdas +20 | import seaborn as sbrn +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `numpy` should be imported as `np` --> defaults.py:18:21 @@ -195,16 +187,15 @@ ICN001 [*] `numpy` should be imported as `np` 20 | import seaborn as sbrn | help: Alias `numpy` to `np` - -ℹ Unsafe fix -15 15 | def unconventional_aliases(): -16 16 | import altair as altr -17 17 | import matplotlib.pyplot as plot -18 |- import numpy as nmp - 18 |+ import numpy as np -19 19 | import pandas as pdas -20 20 | import seaborn as sbrn -21 21 | import tkinter as tkr +15 | def unconventional_aliases(): +16 | import altair as altr +17 | import matplotlib.pyplot as plot + - import numpy as nmp +18 + import numpy as np +19 | import pandas as pdas +20 | import seaborn as sbrn +21 | import tkinter as tkr +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `pandas` should be imported as `pd` --> defaults.py:19:22 @@ -217,16 +208,15 @@ ICN001 [*] `pandas` should be imported as `pd` 21 | import tkinter as tkr | help: Alias `pandas` to `pd` - -ℹ Unsafe fix -16 16 | import altair as altr -17 17 | import matplotlib.pyplot as plot -18 18 | import numpy as nmp -19 |- import pandas as pdas - 19 |+ import pandas as pd -20 20 | import seaborn as sbrn -21 21 | import tkinter as tkr -22 22 | import networkx as nxy +16 | import altair as altr +17 | import matplotlib.pyplot as plot +18 | import numpy as nmp + - import pandas as pdas +19 + import pandas as pd +20 | import seaborn as sbrn +21 | import tkinter as tkr +22 | import networkx as nxy +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `seaborn` should be imported as `sns` --> defaults.py:20:23 @@ -239,16 +229,15 @@ ICN001 [*] `seaborn` should be imported as `sns` 22 | import networkx as nxy | help: Alias `seaborn` to `sns` - -ℹ Unsafe fix -17 17 | import matplotlib.pyplot as plot -18 18 | import numpy as nmp -19 19 | import pandas as pdas -20 |- import seaborn as sbrn - 20 |+ import seaborn as sns -21 21 | import tkinter as tkr -22 22 | import networkx as nxy -23 23 | +17 | import matplotlib.pyplot as plot +18 | import numpy as nmp +19 | import pandas as pdas + - import seaborn as sbrn +20 + import seaborn as sns +21 | import tkinter as tkr +22 | import networkx as nxy +23 | +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `tkinter` should be imported as `tk` --> defaults.py:21:23 @@ -260,16 +249,15 @@ ICN001 [*] `tkinter` should be imported as `tk` 22 | import networkx as nxy | help: Alias `tkinter` to `tk` - -ℹ Unsafe fix -18 18 | import numpy as nmp -19 19 | import pandas as pdas -20 20 | import seaborn as sbrn -21 |- import tkinter as tkr - 21 |+ import tkinter as tk -22 22 | import networkx as nxy -23 23 | -24 24 | +18 | import numpy as nmp +19 | import pandas as pdas +20 | import seaborn as sbrn + - import tkinter as tkr +21 + import tkinter as tk +22 | import networkx as nxy +23 | +24 | +note: This is an unsafe fix and may change runtime behavior ICN001 [*] `networkx` should be imported as `nx` --> defaults.py:22:24 @@ -280,13 +268,12 @@ ICN001 [*] `networkx` should be imported as `nx` | ^^^ | help: Alias `networkx` to `nx` - -ℹ Unsafe fix -19 19 | import pandas as pdas -20 20 | import seaborn as sbrn -21 21 | import tkinter as tkr -22 |- import networkx as nxy - 22 |+ import networkx as nx -23 23 | -24 24 | -25 25 | def conventional_aliases(): +19 | import pandas as pdas +20 | import seaborn as sbrn +21 | import tkinter as tkr + - import networkx as nxy +22 + import networkx as nx +23 | +24 | +25 | def conventional_aliases(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap index 8d7e143a25..5e6eba5474 100644 --- a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap +++ b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__same_name.snap @@ -9,10 +9,9 @@ ICN001 [*] `django.conf.settings` should be imported as `settings` | ^ | help: Alias `django.conf.settings` to `settings` - -ℹ Unsafe fix -7 7 | -8 8 | -9 9 | def unconventional_alias(): -10 |- from django.conf import settings as s - 10 |+ from django.conf import settings as settings +7 | +8 | +9 | def unconventional_alias(): + - from django.conf import settings as s +10 + from django.conf import settings as settings +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap index 620a9275cc..42215754d7 100644 --- a/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap +++ b/crates/ruff_linter/src/rules/flake8_import_conventions/snapshots/ruff_linter__rules__flake8_import_conventions__tests__tricky.snap @@ -12,14 +12,13 @@ ICN001 [*] `pandas` should be imported as `pd` 9 | return False | help: Alias `pandas` to `pd` - -ℹ Unsafe fix -3 3 | -4 4 | def rename_global(): -5 5 | try: -6 |- global pandas -7 |- import pandas - 6 |+ global pd - 7 |+ import pandas as pd -8 8 | except ImportError: -9 9 | return False +3 | +4 | def rename_global(): +5 | try: + - global pandas + - import pandas +6 + global pd +7 + import pandas as pd +8 | except ImportError: +9 | return False +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap index dd0717c4e4..bf8f2feac6 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG001_LOG001.py.snap @@ -12,14 +12,13 @@ LOG001 [*] Use `logging.getLogger()` to instantiate loggers 5 | logging.getLogger(__name__) | help: Replace with `logging.getLogger()` - -ℹ Unsafe fix -1 1 | import logging -2 2 | -3 |-logging.Logger(__name__) - 3 |+logging.getLogger(__name__) -4 4 | logging.Logger() -5 5 | logging.getLogger(__name__) +1 | import logging +2 | + - logging.Logger(__name__) +3 + logging.getLogger(__name__) +4 | logging.Logger() +5 | logging.getLogger(__name__) +note: This is an unsafe fix and may change runtime behavior LOG001 [*] Use `logging.getLogger()` to instantiate loggers --> LOG001.py:4:1 @@ -30,11 +29,10 @@ LOG001 [*] Use `logging.getLogger()` to instantiate loggers 5 | logging.getLogger(__name__) | help: Replace with `logging.getLogger()` - -ℹ Unsafe fix -1 1 | import logging -2 2 | -3 3 | logging.Logger(__name__) -4 |-logging.Logger() - 4 |+logging.getLogger() -5 5 | logging.getLogger(__name__) +1 | import logging +2 | +3 | logging.Logger(__name__) + - logging.Logger() +4 + logging.getLogger() +5 | logging.getLogger(__name__) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap index d1ef1cb3af..4d0ddd8d3d 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG002_LOG002.py.snap @@ -10,16 +10,15 @@ LOG002 [*] Use `__name__` with `logging.getLogger()` 12 | logging.getLogger(name=__file__) | help: Replace with `__name__` - -ℹ Unsafe fix -8 8 | logging.getLogger(name="custom") -9 9 | -10 10 | # LOG002 -11 |-getLogger(__file__) - 11 |+getLogger(__name__) -12 12 | logging.getLogger(name=__file__) -13 13 | -14 14 | logging.getLogger(__cached__) +8 | logging.getLogger(name="custom") +9 | +10 | # LOG002 + - getLogger(__file__) +11 + getLogger(__name__) +12 | logging.getLogger(name=__file__) +13 | +14 | logging.getLogger(__cached__) +note: This is an unsafe fix and may change runtime behavior LOG002 [*] Use `__name__` with `logging.getLogger()` --> LOG002.py:12:24 @@ -32,16 +31,15 @@ LOG002 [*] Use `__name__` with `logging.getLogger()` 14 | logging.getLogger(__cached__) | help: Replace with `__name__` - -ℹ Unsafe fix -9 9 | -10 10 | # LOG002 -11 11 | getLogger(__file__) -12 |-logging.getLogger(name=__file__) - 12 |+logging.getLogger(name=__name__) -13 13 | -14 14 | logging.getLogger(__cached__) -15 15 | getLogger(name=__cached__) +9 | +10 | # LOG002 +11 | getLogger(__file__) + - logging.getLogger(name=__file__) +12 + logging.getLogger(name=__name__) +13 | +14 | logging.getLogger(__cached__) +15 | getLogger(name=__cached__) +note: This is an unsafe fix and may change runtime behavior LOG002 [*] Use `__name__` with `logging.getLogger()` --> LOG002.py:14:19 @@ -53,16 +51,15 @@ LOG002 [*] Use `__name__` with `logging.getLogger()` 15 | getLogger(name=__cached__) | help: Replace with `__name__` - -ℹ Unsafe fix -11 11 | getLogger(__file__) -12 12 | logging.getLogger(name=__file__) -13 13 | -14 |-logging.getLogger(__cached__) - 14 |+logging.getLogger(__name__) -15 15 | getLogger(name=__cached__) -16 16 | -17 17 | +11 | getLogger(__file__) +12 | logging.getLogger(name=__file__) +13 | + - logging.getLogger(__cached__) +14 + logging.getLogger(__name__) +15 | getLogger(name=__cached__) +16 | +17 | +note: This is an unsafe fix and may change runtime behavior LOG002 [*] Use `__name__` with `logging.getLogger()` --> LOG002.py:15:16 @@ -72,13 +69,12 @@ LOG002 [*] Use `__name__` with `logging.getLogger()` | ^^^^^^^^^^ | help: Replace with `__name__` - -ℹ Unsafe fix -12 12 | logging.getLogger(name=__file__) -13 13 | -14 14 | logging.getLogger(__cached__) -15 |-getLogger(name=__cached__) - 15 |+getLogger(name=__name__) -16 16 | -17 17 | -18 18 | # Override `logging.getLogger` +12 | logging.getLogger(name=__file__) +13 | +14 | logging.getLogger(__cached__) + - getLogger(name=__cached__) +15 + getLogger(name=__name__) +16 | +17 | +18 | # Override `logging.getLogger` +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap index 7bc2eb098a..1a17d40da6 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_0.py.snap @@ -12,16 +12,15 @@ LOG004 [*] `.exception()` call outside exception handlers 15 | exc("") | help: Replace with `.error()` - -ℹ Unsafe fix -10 10 | -11 11 | ### Errors -12 12 | -13 |-logging.exception("") - 13 |+logging.error("") -14 14 | logger.exception("") -15 15 | exc("") -16 16 | +10 | +11 | ### Errors +12 | + - logging.exception("") +13 + logging.error("") +14 | logger.exception("") +15 | exc("") +16 | +note: This is an unsafe fix and may change runtime behavior LOG004 [*] `.exception()` call outside exception handlers --> LOG004_0.py:14:1 @@ -32,16 +31,15 @@ LOG004 [*] `.exception()` call outside exception handlers 15 | exc("") | help: Replace with `.error()` - -ℹ Unsafe fix -11 11 | ### Errors -12 12 | -13 13 | logging.exception("") -14 |-logger.exception("") - 14 |+logger.error("") -15 15 | exc("") -16 16 | -17 17 | +11 | ### Errors +12 | +13 | logging.exception("") + - logger.exception("") +14 + logger.error("") +15 | exc("") +16 | +17 | +note: This is an unsafe fix and may change runtime behavior LOG004 `.exception()` call outside exception handlers --> LOG004_0.py:15:1 @@ -63,16 +61,15 @@ LOG004 [*] `.exception()` call outside exception handlers 21 | exc("") | help: Replace with `.error()` - -ℹ Unsafe fix -16 16 | -17 17 | -18 18 | def _(): -19 |- logging.exception("") - 19 |+ logging.error("") -20 20 | logger.exception("") -21 21 | exc("") -22 22 | +16 | +17 | +18 | def _(): + - logging.exception("") +19 + logging.error("") +20 | logger.exception("") +21 | exc("") +22 | +note: This is an unsafe fix and may change runtime behavior LOG004 [*] `.exception()` call outside exception handlers --> LOG004_0.py:20:5 @@ -84,16 +81,15 @@ LOG004 [*] `.exception()` call outside exception handlers 21 | exc("") | help: Replace with `.error()` - -ℹ Unsafe fix -17 17 | -18 18 | def _(): -19 19 | logging.exception("") -20 |- logger.exception("") - 20 |+ logger.error("") -21 21 | exc("") -22 22 | -23 23 | +17 | +18 | def _(): +19 | logging.exception("") + - logger.exception("") +20 + logger.error("") +21 | exc("") +22 | +23 | +note: This is an unsafe fix and may change runtime behavior LOG004 `.exception()` call outside exception handlers --> LOG004_0.py:21:5 @@ -116,16 +112,15 @@ LOG004 [*] `.exception()` call outside exception handlers 30 | exc("") | help: Replace with `.error()` - -ℹ Unsafe fix -25 25 | ... -26 26 | except ...: -27 27 | def _(): -28 |- logging.exception("") - 28 |+ logging.error("") -29 29 | logger.exception("") -30 30 | exc("") -31 31 | +25 | ... +26 | except ...: +27 | def _(): + - logging.exception("") +28 + logging.error("") +29 | logger.exception("") +30 | exc("") +31 | +note: This is an unsafe fix and may change runtime behavior LOG004 [*] `.exception()` call outside exception handlers --> LOG004_0.py:29:9 @@ -137,16 +132,15 @@ LOG004 [*] `.exception()` call outside exception handlers 30 | exc("") | help: Replace with `.error()` - -ℹ Unsafe fix -26 26 | except ...: -27 27 | def _(): -28 28 | logging.exception("") -29 |- logger.exception("") - 29 |+ logger.error("") -30 30 | exc("") -31 31 | -32 32 | +26 | except ...: +27 | def _(): +28 | logging.exception("") + - logger.exception("") +29 + logger.error("") +30 | exc("") +31 | +32 | +note: This is an unsafe fix and may change runtime behavior LOG004 `.exception()` call outside exception handlers --> LOG004_0.py:30:9 diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap index 758e9a1eac..19591ff044 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG004_LOG004_1.py.snap @@ -8,10 +8,9 @@ LOG004 [*] `.exception()` call outside exception handlers | ^^^^^^^^^^^^^^^^^^^^ | help: Replace with `.error()` - -ℹ Unsafe fix -1 1 | _ = (logger := __import__("somewhere").logger) -2 2 | -3 3 | -4 |-logger.exception("") - 4 |+logger.error("") +1 | _ = (logger := __import__("somewhere").logger) +2 | +3 | + - logger.exception("") +4 + logger.error("") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap index 0fcadb03cc..854860a4c6 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG009_LOG009.py.snap @@ -11,16 +11,14 @@ LOG009 [*] Use of undocumented `logging.WARN` constant 5 | logging.WARNING # OK | help: Replace `logging.WARN` with `logging.WARNING` - -ℹ Safe fix -1 1 | def func(): -2 2 | import logging -3 3 | -4 |- logging.WARN # LOG009 - 4 |+ logging.WARNING # LOG009 -5 5 | logging.WARNING # OK -6 6 | -7 7 | +1 | def func(): +2 | import logging +3 | + - logging.WARN # LOG009 +4 + logging.WARNING # LOG009 +5 | logging.WARNING # OK +6 | +7 | LOG009 [*] Use of undocumented `logging.WARN` constant --> LOG009.py:11:5 @@ -32,11 +30,9 @@ LOG009 [*] Use of undocumented `logging.WARN` constant 12 | WARNING # OK | help: Replace `logging.WARN` with `logging.WARNING` - -ℹ Safe fix -8 8 | def func(): -9 9 | from logging import WARN, WARNING -10 10 | -11 |- WARN # LOG009 - 11 |+ WARNING # LOG009 -12 12 | WARNING # OK +8 | def func(): +9 | from logging import WARN, WARNING +10 | + - WARN # LOG009 +11 + WARNING # LOG009 +12 | WARNING # OK diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap index 873b766eb9..49a5d0fd1f 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_0.py.snap @@ -11,16 +11,15 @@ LOG014 [*] `exc_info=` outside exception handlers 13 | logger.info("", exc_info=True) | help: Remove `exc_info=` - -ℹ Unsafe fix -9 9 | -10 10 | ### Errors -11 11 | -12 |-logging.info("", exc_info=True) - 12 |+logging.info("") -13 13 | logger.info("", exc_info=True) -14 14 | -15 15 | +9 | +10 | ### Errors +11 | + - logging.info("", exc_info=True) +12 + logging.info("") +13 | logger.info("", exc_info=True) +14 | +15 | +note: This is an unsafe fix and may change runtime behavior LOG014 [*] `exc_info=` outside exception handlers --> LOG014_0.py:13:17 @@ -30,16 +29,15 @@ LOG014 [*] `exc_info=` outside exception handlers | ^^^^^^^^^^^^^ | help: Remove `exc_info=` - -ℹ Unsafe fix -10 10 | ### Errors -11 11 | -12 12 | logging.info("", exc_info=True) -13 |-logger.info("", exc_info=True) - 13 |+logger.info("") -14 14 | -15 15 | -16 16 | logging.info("", exc_info=1) +10 | ### Errors +11 | +12 | logging.info("", exc_info=True) + - logger.info("", exc_info=True) +13 + logger.info("") +14 | +15 | +16 | logging.info("", exc_info=1) +note: This is an unsafe fix and may change runtime behavior LOG014 [*] `exc_info=` outside exception handlers --> LOG014_0.py:16:18 @@ -49,16 +47,15 @@ LOG014 [*] `exc_info=` outside exception handlers 17 | logger.info("", exc_info=1) | help: Remove `exc_info=` - -ℹ Unsafe fix -13 13 | logger.info("", exc_info=True) -14 14 | -15 15 | -16 |-logging.info("", exc_info=1) - 16 |+logging.info("") -17 17 | logger.info("", exc_info=1) -18 18 | -19 19 | +13 | logger.info("", exc_info=True) +14 | +15 | + - logging.info("", exc_info=1) +16 + logging.info("") +17 | logger.info("", exc_info=1) +18 | +19 | +note: This is an unsafe fix and may change runtime behavior LOG014 [*] `exc_info=` outside exception handlers --> LOG014_0.py:17:17 @@ -68,16 +65,15 @@ LOG014 [*] `exc_info=` outside exception handlers | ^^^^^^^^^^ | help: Remove `exc_info=` - -ℹ Unsafe fix -14 14 | -15 15 | -16 16 | logging.info("", exc_info=1) -17 |-logger.info("", exc_info=1) - 17 |+logger.info("") -18 18 | -19 19 | -20 20 | def _(): +14 | +15 | +16 | logging.info("", exc_info=1) + - logger.info("", exc_info=1) +17 + logger.info("") +18 | +19 | +20 | def _(): +note: This is an unsafe fix and may change runtime behavior LOG014 [*] `exc_info=` outside exception handlers --> LOG014_0.py:21:22 @@ -88,16 +84,15 @@ LOG014 [*] `exc_info=` outside exception handlers 22 | logger.info("", exc_info=True) | help: Remove `exc_info=` - -ℹ Unsafe fix -18 18 | -19 19 | -20 20 | def _(): -21 |- logging.info("", exc_info=True) - 21 |+ logging.info("") -22 22 | logger.info("", exc_info=True) -23 23 | -24 24 | +18 | +19 | +20 | def _(): + - logging.info("", exc_info=True) +21 + logging.info("") +22 | logger.info("", exc_info=True) +23 | +24 | +note: This is an unsafe fix and may change runtime behavior LOG014 [*] `exc_info=` outside exception handlers --> LOG014_0.py:22:21 @@ -108,16 +103,15 @@ LOG014 [*] `exc_info=` outside exception handlers | ^^^^^^^^^^^^^ | help: Remove `exc_info=` - -ℹ Unsafe fix -19 19 | -20 20 | def _(): -21 21 | logging.info("", exc_info=True) -22 |- logger.info("", exc_info=True) - 22 |+ logger.info("") -23 23 | -24 24 | -25 25 | try: +19 | +20 | def _(): +21 | logging.info("", exc_info=True) + - logger.info("", exc_info=True) +22 + logger.info("") +23 | +24 | +25 | try: +note: This is an unsafe fix and may change runtime behavior LOG014 [*] `exc_info=` outside exception handlers --> LOG014_0.py:29:26 @@ -129,16 +123,15 @@ LOG014 [*] `exc_info=` outside exception handlers 30 | logger.info("", exc_info=True) | help: Remove `exc_info=` - -ℹ Unsafe fix -26 26 | ... -27 27 | except ...: -28 28 | def _(): -29 |- logging.info("", exc_info=True) - 29 |+ logging.info("") -30 30 | logger.info("", exc_info=True) -31 31 | -32 32 | +26 | ... +27 | except ...: +28 | def _(): + - logging.info("", exc_info=True) +29 + logging.info("") +30 | logger.info("", exc_info=True) +31 | +32 | +note: This is an unsafe fix and may change runtime behavior LOG014 [*] `exc_info=` outside exception handlers --> LOG014_0.py:30:25 @@ -149,13 +142,12 @@ LOG014 [*] `exc_info=` outside exception handlers | ^^^^^^^^^^^^^ | help: Remove `exc_info=` - -ℹ Unsafe fix -27 27 | except ...: -28 28 | def _(): -29 29 | logging.info("", exc_info=True) -30 |- logger.info("", exc_info=True) - 30 |+ logger.info("") -31 31 | -32 32 | -33 33 | ### No errors +27 | except ...: +28 | def _(): +29 | logging.info("", exc_info=True) + - logger.info("", exc_info=True) +30 + logger.info("") +31 | +32 | +33 | ### No errors +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap index 95284f7c23..44b718029d 100644 --- a/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging/snapshots/ruff_linter__rules__flake8_logging__tests__LOG014_LOG014_1.py.snap @@ -8,10 +8,9 @@ LOG014 [*] `exc_info=` outside exception handlers | ^^^^^^^^^^^^^ | help: Remove `exc_info=` - -ℹ Unsafe fix -1 1 | _ = (logger := __import__("somewhere").logger) -2 2 | -3 3 | -4 |-logger.info("", exc_info=True) - 4 |+logger.info("") +1 | _ = (logger := __import__("somewhere").logger) +2 | +3 | + - logger.info("", exc_info=True) +4 + logger.info("") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap index af3076efbd..9dde1ed37a 100644 --- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__G010.py.snap @@ -12,16 +12,14 @@ G010 [*] Logging statement uses `warn` instead of `warning` 8 | logger.warn("Hello world!") | help: Convert to `warning` - -ℹ Safe fix -3 3 | -4 4 | from logging_setup import logger -5 5 | -6 |-logging.warn("Hello World!") - 6 |+logging.warning("Hello World!") -7 7 | log.warn("Hello world!") # This shouldn't be considered as a logger candidate -8 8 | logger.warn("Hello world!") -9 9 | +3 | +4 | from logging_setup import logger +5 | + - logging.warn("Hello World!") +6 + logging.warning("Hello World!") +7 | log.warn("Hello world!") # This shouldn't be considered as a logger candidate +8 | logger.warn("Hello world!") +9 | G010 [*] Logging statement uses `warn` instead of `warning` --> G010.py:8:8 @@ -34,16 +32,14 @@ G010 [*] Logging statement uses `warn` instead of `warning` 10 | logging . warn("Hello World!") | help: Convert to `warning` - -ℹ Safe fix -5 5 | -6 6 | logging.warn("Hello World!") -7 7 | log.warn("Hello world!") # This shouldn't be considered as a logger candidate -8 |-logger.warn("Hello world!") - 8 |+logger.warning("Hello world!") -9 9 | -10 10 | logging . warn("Hello World!") -11 11 | +5 | +6 | logging.warn("Hello World!") +7 | log.warn("Hello world!") # This shouldn't be considered as a logger candidate + - logger.warn("Hello world!") +8 + logger.warning("Hello world!") +9 | +10 | logging . warn("Hello World!") +11 | G010 [*] Logging statement uses `warn` instead of `warning` --> G010.py:10:11 @@ -56,16 +52,14 @@ G010 [*] Logging statement uses `warn` instead of `warning` 12 | from logging import warn, warning, exception | help: Convert to `warning` - -ℹ Safe fix -7 7 | log.warn("Hello world!") # This shouldn't be considered as a logger candidate -8 8 | logger.warn("Hello world!") -9 9 | -10 |-logging . warn("Hello World!") - 10 |+logging . warning("Hello World!") -11 11 | -12 12 | from logging import warn, warning, exception -13 13 | warn("foo") +7 | log.warn("Hello world!") # This shouldn't be considered as a logger candidate +8 | logger.warn("Hello world!") +9 | + - logging . warn("Hello World!") +10 + logging . warning("Hello World!") +11 | +12 | from logging import warn, warning, exception +13 | warn("foo") G010 [*] Logging statement uses `warn` instead of `warning` --> G010.py:13:1 @@ -77,12 +71,10 @@ G010 [*] Logging statement uses `warn` instead of `warning` 15 | exception("foo") | help: Convert to `warning` - -ℹ Safe fix -10 10 | logging . warn("Hello World!") -11 11 | -12 12 | from logging import warn, warning, exception -13 |-warn("foo") -14 13 | warning("foo") - 14 |+warning("foo") -15 15 | exception("foo") +10 | logging . warn("Hello World!") +11 | +12 | from logging import warn, warning, exception + - warn("foo") +13 | warning("foo") +14 + warning("foo") +15 | exception("foo") diff --git a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004.py.snap b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004.py.snap index b74a9e2306..92a9ff3139 100644 --- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004.py.snap +++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linter__rules__flake8_logging_format__tests__preview__G004_G004.py.snap @@ -10,16 +10,14 @@ G004 [*] Logging statement uses f-string 5 | logging.log(logging.INFO, f"Hello {name}") | help: Convert to lazy `%` formatting - -ℹ Safe fix -1 1 | import logging -2 2 | -3 3 | name = "world" -4 |-logging.info(f"Hello {name}") - 4 |+logging.info("Hello %s", name) -5 5 | logging.log(logging.INFO, f"Hello {name}") -6 6 | -7 7 | _LOGGER = logging.getLogger() +1 | import logging +2 | +3 | name = "world" + - logging.info(f"Hello {name}") +4 + logging.info("Hello %s", name) +5 | logging.log(logging.INFO, f"Hello {name}") +6 | +7 | _LOGGER = logging.getLogger() G004 [*] Logging statement uses f-string --> G004.py:5:27 @@ -32,16 +30,14 @@ G004 [*] Logging statement uses f-string 7 | _LOGGER = logging.getLogger() | help: Convert to lazy `%` formatting - -ℹ Safe fix -2 2 | -3 3 | name = "world" -4 4 | logging.info(f"Hello {name}") -5 |-logging.log(logging.INFO, f"Hello {name}") - 5 |+logging.log(logging.INFO, "Hello %s", name) -6 6 | -7 7 | _LOGGER = logging.getLogger() -8 8 | _LOGGER.info(f"{__name__}") +2 | +3 | name = "world" +4 | logging.info(f"Hello {name}") + - logging.log(logging.INFO, f"Hello {name}") +5 + logging.log(logging.INFO, "Hello %s", name) +6 | +7 | _LOGGER = logging.getLogger() +8 | _LOGGER.info(f"{__name__}") G004 [*] Logging statement uses f-string --> G004.py:8:14 @@ -53,16 +49,14 @@ G004 [*] Logging statement uses f-string 10 | logging.getLogger().info(f"{name}") | help: Convert to lazy `%` formatting - -ℹ Safe fix -5 5 | logging.log(logging.INFO, f"Hello {name}") -6 6 | -7 7 | _LOGGER = logging.getLogger() -8 |-_LOGGER.info(f"{__name__}") - 8 |+_LOGGER.info("%s", __name__) -9 9 | -10 10 | logging.getLogger().info(f"{name}") -11 11 | +5 | logging.log(logging.INFO, f"Hello {name}") +6 | +7 | _LOGGER = logging.getLogger() + - _LOGGER.info(f"{__name__}") +8 + _LOGGER.info("%s", __name__) +9 | +10 | logging.getLogger().info(f"{name}") +11 | G004 [*] Logging statement uses f-string --> G004.py:10:26 @@ -75,16 +69,14 @@ G004 [*] Logging statement uses f-string 12 | from logging import info | help: Convert to lazy `%` formatting - -ℹ Safe fix -7 7 | _LOGGER = logging.getLogger() -8 8 | _LOGGER.info(f"{__name__}") -9 9 | -10 |-logging.getLogger().info(f"{name}") - 10 |+logging.getLogger().info("%s", name) -11 11 | -12 12 | from logging import info -13 13 | +7 | _LOGGER = logging.getLogger() +8 | _LOGGER.info(f"{__name__}") +9 | + - logging.getLogger().info(f"{name}") +10 + logging.getLogger().info("%s", name) +11 | +12 | from logging import info +13 | G004 [*] Logging statement uses f-string --> G004.py:14:6 @@ -96,16 +88,14 @@ G004 [*] Logging statement uses f-string 15 | info(f"{__name__}") | help: Convert to lazy `%` formatting - -ℹ Safe fix -11 11 | -12 12 | from logging import info -13 13 | -14 |-info(f"{name}") - 14 |+info("%s", name) -15 15 | info(f"{__name__}") -16 16 | -17 17 | # Don't trigger for t-strings +11 | +12 | from logging import info +13 | + - info(f"{name}") +14 + info("%s", name) +15 | info(f"{__name__}") +16 | +17 | # Don't trigger for t-strings G004 [*] Logging statement uses f-string --> G004.py:15:6 @@ -117,16 +107,14 @@ G004 [*] Logging statement uses f-string 17 | # Don't trigger for t-strings | help: Convert to lazy `%` formatting - -ℹ Safe fix -12 12 | from logging import info -13 13 | -14 14 | info(f"{name}") -15 |-info(f"{__name__}") - 15 |+info("%s", __name__) -16 16 | -17 17 | # Don't trigger for t-strings -18 18 | info(t"{name}") +12 | from logging import info +13 | +14 | info(f"{name}") + - info(f"{__name__}") +15 + info("%s", __name__) +16 | +17 | # Don't trigger for t-strings +18 | info(t"{name}") G004 [*] Logging statement uses f-string --> G004.py:24:14 @@ -137,16 +125,14 @@ G004 [*] Logging statement uses f-string | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to lazy `%` formatting - -ℹ Safe fix -21 21 | count = 5 -22 22 | total = 9 -23 23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/" -24 |-logging.info(f"{count} out of {total} files in {directory_path} checked") - 24 |+logging.info("%s out of %s files in %s checked", count, total, directory_path) -25 25 | -26 26 | -27 27 | +21 | count = 5 +22 | total = 9 +23 | directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/" + - logging.info(f"{count} out of {total} files in {directory_path} checked") +24 + logging.info("%s out of %s files in %s checked", count, total, directory_path) +25 | +26 | +27 | G004 Logging statement uses f-string --> G004.py:30:13 diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap index 69d5e5041f..4fd56fcdf0 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap @@ -10,15 +10,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -1 1 | class Foo: -2 2 | """buzz""" -3 3 | -4 |- pass -5 4 | -6 5 | -7 6 | if foo: +1 | class Foo: +2 | """buzz""" +3 | + - pass +4 | +5 | +6 | if foo: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:9:5 @@ -29,15 +27,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -6 6 | -7 7 | if foo: -8 8 | """foo""" -9 |- pass -10 9 | -11 10 | -12 11 | def multi_statement() -> None: +6 | +7 | if foo: +8 | """foo""" + - pass +9 | +10 | +11 | def multi_statement() -> None: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:14:5 @@ -48,16 +44,14 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -11 11 | -12 12 | def multi_statement() -> None: -13 13 | """This is a function.""" -14 |- pass; print("hello") - 14 |+ print("hello") -15 15 | -16 16 | -17 17 | if foo: +11 | +12 | def multi_statement() -> None: +13 | """This is a function.""" + - pass; print("hello") +14 + print("hello") +15 | +16 | +17 | if foo: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:21:5 @@ -68,15 +62,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -18 18 | pass -19 19 | else: -20 20 | """bar""" -21 |- pass -22 21 | -23 22 | -24 23 | while True: +18 | pass +19 | else: +20 | """bar""" + - pass +21 | +22 | +23 | while True: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:28:5 @@ -87,15 +79,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -25 25 | pass -26 26 | else: -27 27 | """bar""" -28 |- pass -29 28 | -30 29 | -31 30 | for _ in range(10): +25 | pass +26 | else: +27 | """bar""" + - pass +28 | +29 | +30 | for _ in range(10): PIE790 [*] Unnecessary `pass` statement --> PIE790.py:35:5 @@ -106,15 +96,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -32 32 | pass -33 33 | else: -34 34 | """bar""" -35 |- pass -36 35 | -37 36 | -38 37 | async for _ in range(10): +32 | pass +33 | else: +34 | """bar""" + - pass +35 | +36 | +37 | async for _ in range(10): PIE790 [*] Unnecessary `pass` statement --> PIE790.py:42:5 @@ -125,15 +113,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -39 39 | pass -40 40 | else: -41 41 | """bar""" -42 |- pass -43 42 | -44 43 | -45 44 | def foo() -> None: +39 | pass +40 | else: +41 | """bar""" + - pass +42 | +43 | +44 | def foo() -> None: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:50:5 @@ -144,15 +130,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -47 47 | buzz -48 48 | """ -49 49 | -50 |- pass -51 50 | -52 51 | -53 52 | async def foo(): +47 | buzz +48 | """ +49 | + - pass +50 | +51 | +52 | async def foo(): PIE790 [*] Unnecessary `pass` statement --> PIE790.py:58:5 @@ -163,15 +147,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -55 55 | buzz -56 56 | """ -57 57 | -58 |- pass -59 58 | -60 59 | -61 60 | try: +55 | buzz +56 | """ +57 | + - pass +58 | +59 | +60 | try: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:65:5 @@ -184,15 +166,13 @@ PIE790 [*] Unnecessary `pass` statement 67 | pass | help: Remove unnecessary `pass` - -ℹ Safe fix -62 62 | """ -63 63 | buzz -64 64 | """ -65 |- pass -66 65 | except ValueError: -67 66 | pass -68 67 | +62 | """ +63 | buzz +64 | """ + - pass +65 | except ValueError: +66 | pass +67 | PIE790 [*] Unnecessary `pass` statement --> PIE790.py:74:5 @@ -203,15 +183,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -71 71 | bar() -72 72 | except ValueError: -73 73 | """bar""" -74 |- pass -75 74 | -76 75 | -77 76 | for _ in range(10): +71 | bar() +72 | except ValueError: +73 | """bar""" + - pass +74 | +75 | +76 | for _ in range(10): PIE790 [*] Unnecessary `pass` statement --> PIE790.py:79:5 @@ -224,15 +202,13 @@ PIE790 [*] Unnecessary `pass` statement 81 | async for _ in range(10): | help: Remove unnecessary `pass` - -ℹ Safe fix -76 76 | -77 77 | for _ in range(10): -78 78 | """buzz""" -79 |- pass -80 79 | -81 80 | async for _ in range(10): -82 81 | """buzz""" +76 | +77 | for _ in range(10): +78 | """buzz""" + - pass +79 | +80 | async for _ in range(10): +81 | """buzz""" PIE790 [*] Unnecessary `pass` statement --> PIE790.py:83:5 @@ -245,15 +221,13 @@ PIE790 [*] Unnecessary `pass` statement 85 | while cond: | help: Remove unnecessary `pass` - -ℹ Safe fix -80 80 | -81 81 | async for _ in range(10): -82 82 | """buzz""" -83 |- pass -84 83 | -85 84 | while cond: -86 85 | """buzz""" +80 | +81 | async for _ in range(10): +82 | """buzz""" + - pass +83 | +84 | while cond: +85 | """buzz""" PIE790 [*] Unnecessary `pass` statement --> PIE790.py:87:5 @@ -264,15 +238,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -84 84 | -85 85 | while cond: -86 86 | """buzz""" -87 |- pass -88 87 | -89 88 | -90 89 | with bar: +84 | +85 | while cond: +86 | """buzz""" + - pass +87 | +88 | +89 | with bar: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:92:5 @@ -285,15 +257,13 @@ PIE790 [*] Unnecessary `pass` statement 94 | async with bar: | help: Remove unnecessary `pass` - -ℹ Safe fix -89 89 | -90 90 | with bar: -91 91 | """buzz""" -92 |- pass -93 92 | -94 93 | async with bar: -95 94 | """buzz""" +89 | +90 | with bar: +91 | """buzz""" + - pass +92 | +93 | async with bar: +94 | """buzz""" PIE790 [*] Unnecessary `pass` statement --> PIE790.py:96:5 @@ -304,15 +274,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -93 93 | -94 94 | async with bar: -95 95 | """buzz""" -96 |- pass -97 96 | -98 97 | -99 98 | def foo() -> None: +93 | +94 | async with bar: +95 | """buzz""" + - pass +96 | +97 | +98 | def foo() -> None: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:101:5 @@ -323,16 +291,14 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -98 98 | -99 99 | def foo() -> None: -100 100 | """buzz""" -101 |- pass # bar - 101 |+ # bar -102 102 | -103 103 | -104 104 | class Foo: +98 | +99 | def foo() -> None: +100 | """buzz""" + - pass # bar +101 + # bar +102 | +103 | +104 | class Foo: PIE790 [*] Unnecessary `pass` statement --> PIE790.py:130:5 @@ -343,15 +309,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -127 127 | -128 128 | def foo(): -129 129 | print("foo") -130 |- pass -131 130 | -132 131 | -133 132 | def foo(): +127 | +128 | def foo(): +129 | print("foo") + - pass +130 | +131 | +132 | def foo(): PIE790 [*] Unnecessary `pass` statement --> PIE790.py:136:5 @@ -362,15 +326,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -133 133 | def foo(): -134 134 | """A docstring.""" -135 135 | print("foo") -136 |- pass -137 136 | -138 137 | -139 138 | for i in range(10): +133 | def foo(): +134 | """A docstring.""" +135 | print("foo") + - pass +136 | +137 | +138 | for i in range(10): PIE790 [*] Unnecessary `pass` statement --> PIE790.py:140:5 @@ -381,15 +343,13 @@ PIE790 [*] Unnecessary `pass` statement 141 | pass | help: Remove unnecessary `pass` - -ℹ Safe fix -138 138 | -139 139 | for i in range(10): -140 140 | pass -141 |- pass -142 141 | -143 142 | for i in range(10): -144 143 | pass +138 | +139 | for i in range(10): +140 | pass + - pass +141 | +142 | for i in range(10): +143 | pass PIE790 [*] Unnecessary `pass` statement --> PIE790.py:141:5 @@ -402,15 +362,13 @@ PIE790 [*] Unnecessary `pass` statement 143 | for i in range(10): | help: Remove unnecessary `pass` - -ℹ Safe fix -138 138 | -139 139 | for i in range(10): -140 140 | pass -141 |- pass -142 141 | -143 142 | for i in range(10): -144 143 | pass +138 | +139 | for i in range(10): +140 | pass + - pass +141 | +142 | for i in range(10): +143 | pass PIE790 [*] Unnecessary `pass` statement --> PIE790.py:144:5 @@ -422,15 +380,13 @@ PIE790 [*] Unnecessary `pass` statement 146 | pass | help: Remove unnecessary `pass` - -ℹ Safe fix -141 141 | pass -142 142 | -143 143 | for i in range(10): -144 |- pass -145 144 | -146 145 | pass -147 146 | +141 | pass +142 | +143 | for i in range(10): + - pass +144 | +145 | pass +146 | PIE790 [*] Unnecessary `pass` statement --> PIE790.py:146:5 @@ -443,15 +399,13 @@ PIE790 [*] Unnecessary `pass` statement 148 | for i in range(10): | help: Remove unnecessary `pass` - -ℹ Safe fix -143 143 | for i in range(10): -144 144 | pass -145 145 | -146 |- pass -147 146 | -148 147 | for i in range(10): -149 148 | pass # comment +143 | for i in range(10): +144 | pass +145 | + - pass +146 | +147 | for i in range(10): +148 | pass # comment PIE790 [*] Unnecessary `pass` statement --> PIE790.py:149:5 @@ -462,16 +416,14 @@ PIE790 [*] Unnecessary `pass` statement 150 | pass | help: Remove unnecessary `pass` - -ℹ Safe fix -146 146 | pass -147 147 | -148 148 | for i in range(10): -149 |- pass # comment - 149 |+ # comment -150 150 | pass -151 151 | -152 152 | +146 | pass +147 | +148 | for i in range(10): + - pass # comment +149 + # comment +150 | pass +151 | +152 | PIE790 [*] Unnecessary `pass` statement --> PIE790.py:150:5 @@ -482,15 +434,13 @@ PIE790 [*] Unnecessary `pass` statement | ^^^^ | help: Remove unnecessary `pass` - -ℹ Safe fix -147 147 | -148 148 | for i in range(10): -149 149 | pass # comment -150 |- pass -151 150 | -152 151 | -153 152 | def foo(): +147 | +148 | for i in range(10): +149 | pass # comment + - pass +150 | +151 | +152 | def foo(): PIE790 [*] Unnecessary `...` literal --> PIE790.py:155:5 @@ -501,15 +451,13 @@ PIE790 [*] Unnecessary `...` literal | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -152 152 | -153 153 | def foo(): -154 154 | print("foo") -155 |- ... -156 155 | -157 156 | -158 157 | def foo(): +152 | +153 | def foo(): +154 | print("foo") + - ... +155 | +156 | +157 | def foo(): PIE790 [*] Unnecessary `...` literal --> PIE790.py:161:5 @@ -520,15 +468,13 @@ PIE790 [*] Unnecessary `...` literal | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -158 158 | def foo(): -159 159 | """A docstring.""" -160 160 | print("foo") -161 |- ... -162 161 | -163 162 | -164 163 | for i in range(10): +158 | def foo(): +159 | """A docstring.""" +160 | print("foo") + - ... +161 | +162 | +163 | for i in range(10): PIE790 [*] Unnecessary `...` literal --> PIE790.py:165:5 @@ -539,15 +485,13 @@ PIE790 [*] Unnecessary `...` literal 166 | ... | help: Remove unnecessary `...` - -ℹ Safe fix -163 163 | -164 164 | for i in range(10): -165 165 | ... -166 |- ... -167 166 | -168 167 | for i in range(10): -169 168 | ... +163 | +164 | for i in range(10): +165 | ... + - ... +166 | +167 | for i in range(10): +168 | ... PIE790 [*] Unnecessary `...` literal --> PIE790.py:166:5 @@ -560,15 +504,13 @@ PIE790 [*] Unnecessary `...` literal 168 | for i in range(10): | help: Remove unnecessary `...` - -ℹ Safe fix -163 163 | -164 164 | for i in range(10): -165 165 | ... -166 |- ... -167 166 | -168 167 | for i in range(10): -169 168 | ... +163 | +164 | for i in range(10): +165 | ... + - ... +166 | +167 | for i in range(10): +168 | ... PIE790 [*] Unnecessary `...` literal --> PIE790.py:169:5 @@ -580,15 +522,13 @@ PIE790 [*] Unnecessary `...` literal 171 | ... | help: Remove unnecessary `...` - -ℹ Safe fix -166 166 | ... -167 167 | -168 168 | for i in range(10): -169 |- ... -170 169 | -171 170 | ... -172 171 | +166 | ... +167 | +168 | for i in range(10): + - ... +169 | +170 | ... +171 | PIE790 [*] Unnecessary `...` literal --> PIE790.py:171:5 @@ -601,15 +541,13 @@ PIE790 [*] Unnecessary `...` literal 173 | for i in range(10): | help: Remove unnecessary `...` - -ℹ Safe fix -168 168 | for i in range(10): -169 169 | ... -170 170 | -171 |- ... -172 171 | -173 172 | for i in range(10): -174 173 | ... # comment +168 | for i in range(10): +169 | ... +170 | + - ... +171 | +172 | for i in range(10): +173 | ... # comment PIE790 [*] Unnecessary `...` literal --> PIE790.py:174:5 @@ -620,16 +558,14 @@ PIE790 [*] Unnecessary `...` literal 175 | ... | help: Remove unnecessary `...` - -ℹ Safe fix -171 171 | ... -172 172 | -173 173 | for i in range(10): -174 |- ... # comment - 174 |+ # comment -175 175 | ... -176 176 | -177 177 | for i in range(10): +171 | ... +172 | +173 | for i in range(10): + - ... # comment +174 + # comment +175 | ... +176 | +177 | for i in range(10): PIE790 [*] Unnecessary `...` literal --> PIE790.py:175:5 @@ -642,15 +578,13 @@ PIE790 [*] Unnecessary `...` literal 177 | for i in range(10): | help: Remove unnecessary `...` - -ℹ Safe fix -172 172 | -173 173 | for i in range(10): -174 174 | ... # comment -175 |- ... -176 175 | -177 176 | for i in range(10): -178 177 | ... +172 | +173 | for i in range(10): +174 | ... # comment + - ... +175 | +176 | for i in range(10): +177 | ... PIE790 [*] Unnecessary `...` literal --> PIE790.py:178:5 @@ -661,15 +595,13 @@ PIE790 [*] Unnecessary `...` literal 179 | pass | help: Remove unnecessary `...` - -ℹ Safe fix -175 175 | ... -176 176 | -177 177 | for i in range(10): -178 |- ... -179 178 | pass -180 179 | -181 180 | from typing import Protocol +175 | ... +176 | +177 | for i in range(10): + - ... +178 | pass +179 | +180 | from typing import Protocol PIE790 [*] Unnecessary `pass` statement --> PIE790.py:179:5 @@ -682,15 +614,13 @@ PIE790 [*] Unnecessary `pass` statement 181 | from typing import Protocol | help: Remove unnecessary `pass` - -ℹ Safe fix -176 176 | -177 177 | for i in range(10): -178 178 | ... -179 |- pass -180 179 | -181 180 | from typing import Protocol -182 181 | +176 | +177 | for i in range(10): +178 | ... + - pass +179 | +180 | from typing import Protocol +181 | PIE790 [*] Unnecessary `...` literal --> PIE790.py:209:9 @@ -701,15 +631,13 @@ PIE790 [*] Unnecessary `...` literal | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -206 206 | -207 207 | def stub(self) -> str: -208 208 | """Docstring""" -209 |- ... -210 209 | -211 210 | -212 211 | class Repro(Protocol[int]): +206 | +207 | def stub(self) -> str: +208 | """Docstring""" + - ... +209 | +210 | +211 | class Repro(Protocol[int]): PIE790 [*] Unnecessary `pass` statement --> PIE790.py:241:5 @@ -722,15 +650,14 @@ PIE790 [*] Unnecessary `pass` statement 243 | Lorem ipsum dolor sit amet. | help: Remove unnecessary `pass` - -ℹ Unsafe fix -238 238 | -239 239 | # https://github.com/astral-sh/ruff/issues/12616 -240 240 | class PotentialDocstring1: -241 |- pass -242 241 | """ -243 242 | Lorem ipsum dolor sit amet. -244 243 | """ +238 | +239 | # https://github.com/astral-sh/ruff/issues/12616 +240 | class PotentialDocstring1: + - pass +241 | """ +242 | Lorem ipsum dolor sit amet. +243 | """ +note: This is an unsafe fix and may change runtime behavior PIE790 [*] Unnecessary `...` literal --> PIE790.py:248:5 @@ -741,10 +668,9 @@ PIE790 [*] Unnecessary `...` literal 249 | 'Lorem ipsum dolor sit amet.' | help: Remove unnecessary `...` - -ℹ Unsafe fix -245 245 | -246 246 | -247 247 | class PotentialDocstring2: -248 |- ... -249 248 | 'Lorem ipsum dolor sit amet.' +245 | +246 | +247 | class PotentialDocstring2: + - ... +248 | 'Lorem ipsum dolor sit amet.' +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap index 0988b138f7..3a8a341d46 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE794_PIE794.py.snap @@ -12,15 +12,14 @@ PIE794 [*] Class field `name` is defined multiple times 6 | def remove(self) -> None: | help: Remove duplicate field definition for `name` - -ℹ Unsafe fix -1 1 | class Foo(BaseModel): -2 2 | name = StringField() -3 3 | # .... -4 |- name = StringField() # PIE794 -5 4 | -6 5 | def remove(self) -> None: -7 6 | ... +1 | class Foo(BaseModel): +2 | name = StringField() +3 | # .... + - name = StringField() # PIE794 +4 | +5 | def remove(self) -> None: +6 | ... +note: This is an unsafe fix and may change runtime behavior PIE794 [*] Class field `name` is defined multiple times --> PIE794.py:13:5 @@ -33,15 +32,14 @@ PIE794 [*] Class field `name` is defined multiple times 15 | def foo(self) -> None: | help: Remove duplicate field definition for `name` - -ℹ Unsafe fix -10 10 | class Foo(BaseModel): -11 11 | name: str = StringField() -12 12 | # .... -13 |- name = StringField() # PIE794 -14 13 | -15 14 | def foo(self) -> None: -16 15 | ... +10 | class Foo(BaseModel): +11 | name: str = StringField() +12 | # .... + - name = StringField() # PIE794 +13 | +14 | def foo(self) -> None: +15 | ... +note: This is an unsafe fix and may change runtime behavior PIE794 [*] Class field `bar` is defined multiple times --> PIE794.py:23:5 @@ -52,15 +50,14 @@ PIE794 [*] Class field `bar` is defined multiple times | ^^^^^^^^^^^^^^^^^^^ | help: Remove duplicate field definition for `bar` - -ℹ Unsafe fix -20 20 | bar: str = StringField() -21 21 | foo: bool = BooleanField() -22 22 | # ... -23 |- bar = StringField() # PIE794 -24 23 | -25 24 | -26 25 | class User(BaseModel): +20 | bar: str = StringField() +21 | foo: bool = BooleanField() +22 | # ... + - bar = StringField() # PIE794 +23 | +24 | +25 | class User(BaseModel): +note: This is an unsafe fix and may change runtime behavior PIE794 [*] Class field `bar` is defined multiple times --> PIE794.py:40:5 @@ -71,15 +68,14 @@ PIE794 [*] Class field `bar` is defined multiple times | ^^^^^^^^^^^^^^^^^^^ | help: Remove duplicate field definition for `bar` - -ℹ Unsafe fix -37 37 | bar: str = StringField() -38 38 | foo: bool = BooleanField() -39 39 | # ... -40 |- bar = StringField() # PIE794 -41 40 | -42 41 | -43 42 | class Person: +37 | bar: str = StringField() +38 | foo: bool = BooleanField() +39 | # ... + - bar = StringField() # PIE794 +40 | +41 | +42 | class Person: +note: This is an unsafe fix and may change runtime behavior PIE794 [*] Class field `name` is defined multiple times --> PIE794.py:46:5 @@ -90,15 +86,14 @@ PIE794 [*] Class field `name` is defined multiple times | ^^^^^^^^^^^^ | help: Remove duplicate field definition for `name` - -ℹ Unsafe fix -43 43 | class Person: -44 44 | name = "Foo" -45 45 | name = name + " Bar" -46 |- name = "Bar" # PIE794 -47 46 | -48 47 | -49 48 | class Person: +43 | class Person: +44 | name = "Foo" +45 | name = name + " Bar" + - name = "Bar" # PIE794 +46 | +47 | +48 | class Person: +note: This is an unsafe fix and may change runtime behavior PIE794 [*] Class field `name` is defined multiple times --> PIE794.py:52:5 @@ -109,9 +104,8 @@ PIE794 [*] Class field `name` is defined multiple times | ^^^^^^^^^^^^^^^^^ | help: Remove duplicate field definition for `name` - -ℹ Unsafe fix -49 49 | class Person: -50 50 | name: str = "Foo" -51 51 | name: str = name + " Bar" -52 |- name: str = "Bar" # PIE794 +49 | class Person: +50 | name: str = "Foo" +51 | name: str = name + " Bar" + - name: str = "Bar" # PIE794 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap index 9d522c0a7c..1a8437526e 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap @@ -10,13 +10,11 @@ PIE800 [*] Unnecessary spread `**` 3 | {**{"bar": 10}, "a": "b"} # PIE800 | help: Remove unnecessary dict - -ℹ Safe fix -1 |-{"foo": 1, **{"bar": 1}} # PIE800 - 1 |+{"foo": 1, "bar": 1} # PIE800 -2 2 | -3 3 | {**{"bar": 10}, "a": "b"} # PIE800 -4 4 | + - {"foo": 1, **{"bar": 1}} # PIE800 +1 + {"foo": 1, "bar": 1} # PIE800 +2 | +3 | {**{"bar": 10}, "a": "b"} # PIE800 +4 | PIE800 [*] Unnecessary spread `**` --> PIE800.py:3:4 @@ -29,15 +27,13 @@ PIE800 [*] Unnecessary spread `**` 5 | foo({**foo, **{"bar": True}}) # PIE800 | help: Remove unnecessary dict - -ℹ Safe fix -1 1 | {"foo": 1, **{"bar": 1}} # PIE800 -2 2 | -3 |-{**{"bar": 10}, "a": "b"} # PIE800 - 3 |+{"bar": 10, "a": "b"} # PIE800 -4 4 | -5 5 | foo({**foo, **{"bar": True}}) # PIE800 -6 6 | +1 | {"foo": 1, **{"bar": 1}} # PIE800 +2 | + - {**{"bar": 10}, "a": "b"} # PIE800 +3 + {"bar": 10, "a": "b"} # PIE800 +4 | +5 | foo({**foo, **{"bar": True}}) # PIE800 +6 | PIE800 [*] Unnecessary spread `**` --> PIE800.py:5:15 @@ -50,16 +46,14 @@ PIE800 [*] Unnecessary spread `**` 7 | {**foo, **{"bar": 10}} # PIE800 | help: Remove unnecessary dict - -ℹ Safe fix -2 2 | -3 3 | {**{"bar": 10}, "a": "b"} # PIE800 -4 4 | -5 |-foo({**foo, **{"bar": True}}) # PIE800 - 5 |+foo({**foo, "bar": True}) # PIE800 -6 6 | -7 7 | {**foo, **{"bar": 10}} # PIE800 -8 8 | +2 | +3 | {**{"bar": 10}, "a": "b"} # PIE800 +4 | + - foo({**foo, **{"bar": True}}) # PIE800 +5 + foo({**foo, "bar": True}) # PIE800 +6 | +7 | {**foo, **{"bar": 10}} # PIE800 +8 | PIE800 [*] Unnecessary spread `**` --> PIE800.py:7:11 @@ -72,16 +66,14 @@ PIE800 [*] Unnecessary spread `**` 9 | { # PIE800 | help: Remove unnecessary dict - -ℹ Safe fix -4 4 | -5 5 | foo({**foo, **{"bar": True}}) # PIE800 -6 6 | -7 |-{**foo, **{"bar": 10}} # PIE800 - 7 |+{**foo, "bar": 10} # PIE800 -8 8 | -9 9 | { # PIE800 -10 10 | "a": "b", +4 | +5 | foo({**foo, **{"bar": True}}) # PIE800 +6 | + - {**foo, **{"bar": 10}} # PIE800 +7 + {**foo, "bar": 10} # PIE800 +8 | +9 | { # PIE800 +10 | "a": "b", PIE800 [*] Unnecessary spread `**` --> PIE800.py:12:7 @@ -98,22 +90,20 @@ PIE800 [*] Unnecessary spread `**` 17 | } | help: Remove unnecessary dict - -ℹ Safe fix -9 9 | { # PIE800 -10 10 | "a": "b", -11 11 | # Preserve -12 |- **{ - 12 |+ -13 13 | # all -14 |- "bar": 10, # the - 14 |+ "bar": 10 # the -15 15 | # comments -16 |- }, - 16 |+ , -17 17 | } -18 18 | -19 19 | {**foo, **buzz, **{bar: 10}} # PIE800 +9 | { # PIE800 +10 | "a": "b", +11 | # Preserve + - **{ +12 + +13 | # all + - "bar": 10, # the +14 + "bar": 10 # the +15 | # comments + - }, +16 + , +17 | } +18 | +19 | {**foo, **buzz, **{bar: 10}} # PIE800 PIE800 [*] Unnecessary spread `**` --> PIE800.py:19:19 @@ -126,16 +116,14 @@ PIE800 [*] Unnecessary spread `**` 21 | # https://github.com/astral-sh/ruff/issues/15366 | help: Remove unnecessary dict - -ℹ Safe fix -16 16 | }, -17 17 | } -18 18 | -19 |-{**foo, **buzz, **{bar: 10}} # PIE800 - 19 |+{**foo, **buzz, bar: 10} # PIE800 -20 20 | -21 21 | # https://github.com/astral-sh/ruff/issues/15366 -22 22 | { +16 | }, +17 | } +18 | + - {**foo, **buzz, **{bar: 10}} # PIE800 +19 + {**foo, **buzz, bar: 10} # PIE800 +20 | +21 | # https://github.com/astral-sh/ruff/issues/15366 +22 | { PIE800 [*] Unnecessary spread `**` --> PIE800.py:24:8 @@ -147,16 +135,14 @@ PIE800 [*] Unnecessary spread `**` 25 | } | help: Remove unnecessary dict - -ℹ Safe fix -21 21 | # https://github.com/astral-sh/ruff/issues/15366 -22 22 | { -23 23 | "data": [], -24 |- **({"count": 1 if include_count else {}}), - 24 |+ "count": 1 if include_count else {}, -25 25 | } -26 26 | -27 27 | { +21 | # https://github.com/astral-sh/ruff/issues/15366 +22 | { +23 | "data": [], + - **({"count": 1 if include_count else {}}), +24 + "count": 1 if include_count else {}, +25 | } +26 | +27 | { PIE800 [*] Unnecessary spread `**` --> PIE800.py:30:9 @@ -169,20 +155,18 @@ PIE800 [*] Unnecessary spread `**` 32 | } | help: Remove unnecessary dict - -ℹ Safe fix -26 26 | -27 27 | { -28 28 | "data": [], -29 |- **( # Comment -30 |- { # Comment -31 |- "count": 1 if include_count else {}}), - 29 |+ # Comment - 30 |+ # Comment - 31 |+ "count": 1 if include_count else {}, -32 32 | } -33 33 | -34 34 | { +26 | +27 | { +28 | "data": [], + - **( # Comment + - { # Comment + - "count": 1 if include_count else {}}), +29 + # Comment +30 + # Comment +31 + "count": 1 if include_count else {}, +32 | } +33 | +34 | { PIE800 [*] Unnecessary spread `**` --> PIE800.py:37:9 @@ -195,20 +179,18 @@ PIE800 [*] Unnecessary spread `**` 39 | } | help: Remove unnecessary dict - -ℹ Safe fix -33 33 | -34 34 | { -35 35 | "data": [], -36 |- **( -37 |- { -38 |- "count": (a := 1),}), - 36 |+ - 37 |+ - 38 |+ "count": (a := 1), -39 39 | } -40 40 | -41 41 | { +33 | +34 | { +35 | "data": [], + - **( + - { + - "count": (a := 1),}), +36 + +37 + +38 + "count": (a := 1), +39 | } +40 | +41 | { PIE800 [*] Unnecessary spread `**` --> PIE800.py:44:9 @@ -223,23 +205,21 @@ PIE800 [*] Unnecessary spread `**` 48 | , | help: Remove unnecessary dict - -ℹ Safe fix -40 40 | -41 41 | { -42 42 | "data": [], -43 |- **( -44 |- { - 43 |+ - 44 |+ -45 45 | "count": (a := 1) -46 |- } -47 |- ) - 46 |+ - 47 |+ -48 48 | , -49 49 | } -50 50 | +40 | +41 | { +42 | "data": [], + - **( + - { +43 + +44 + +45 | "count": (a := 1) + - } + - ) +46 + +47 + +48 | , +49 | } +50 | PIE800 [*] Unnecessary spread `**` --> PIE800.py:54:9 @@ -254,24 +234,22 @@ PIE800 [*] Unnecessary spread `**` 58 | , | help: Remove unnecessary dict - -ℹ Safe fix -50 50 | -51 51 | { -52 52 | "data": [], -53 |- **( -54 |- { -55 |- "count": (a := 1), # Comment -56 |- } # Comment -57 |- ) # Comment - 53 |+ - 54 |+ - 55 |+ "count": (a := 1) # Comment - 56 |+ # Comment - 57 |+ # Comment -58 58 | , -59 59 | } -60 60 | +50 | +51 | { +52 | "data": [], + - **( + - { + - "count": (a := 1), # Comment + - } # Comment + - ) # Comment +53 + +54 + +55 + "count": (a := 1) # Comment +56 + # Comment +57 + # Comment +58 | , +59 | } +60 | PIE800 [*] Unnecessary spread `**` --> PIE800.py:65:1 @@ -286,28 +264,26 @@ PIE800 [*] Unnecessary spread `**` 69 | ) # Comment | help: Remove unnecessary dict - -ℹ Safe fix -60 60 | -61 61 | ({ -62 62 | "data": [], -63 |- **( # Comment -64 |- ( # Comment -65 |-{ # Comment -66 |- "count": (a := 1), # Comment -67 |- } # Comment -68 |- ) -69 |- ) # Comment - 63 |+ # Comment - 64 |+ # Comment - 65 |+ # Comment - 66 |+ "count": (a := 1) # Comment - 67 |+ # Comment - 68 |+ - 69 |+ # Comment -70 70 | , -71 71 | }) -72 72 | +60 | +61 | ({ +62 | "data": [], + - **( # Comment + - ( # Comment + - { # Comment + - "count": (a := 1), # Comment + - } # Comment + - ) + - ) # Comment +63 + # Comment +64 + # Comment +65 + # Comment +66 + "count": (a := 1) # Comment +67 + # Comment +68 + +69 + # Comment +70 | , +71 | }) +72 | PIE800 [*] Unnecessary spread `**` --> PIE800.py:77:9 @@ -322,25 +298,23 @@ PIE800 [*] Unnecessary spread `**` 81 | c: 9, | help: Remove unnecessary dict - -ℹ Safe fix -72 72 | -73 73 | { -74 74 | "data": [], -75 |- ** # Foo -76 |- ( # Comment -77 |- { "a": b, - 75 |+ # Foo - 76 |+ # Comment - 77 |+ "a": b -78 78 | # Comment -79 |- } -80 |- ) , - 79 |+ - 80 |+ , -81 81 | c: 9, -82 82 | } -83 83 | +72 | +73 | { +74 | "data": [], + - ** # Foo + - ( # Comment + - { "a": b, +75 + # Foo +76 + # Comment +77 + "a": b +78 | # Comment + - } + - ) , +79 + +80 + , +81 | c: 9, +82 | } +83 | PIE800 [*] Unnecessary spread `**` --> PIE800.py:86:13 @@ -351,16 +325,14 @@ PIE800 [*] Unnecessary spread `**` 87 | {"a": [], **({}),} | help: Remove unnecessary dict - -ℹ Safe fix -83 83 | -84 84 | -85 85 | # https://github.com/astral-sh/ruff/issues/15997 -86 |-{"a": [], **{},} - 86 |+{"a": [], } -87 87 | {"a": [], **({}),} -88 88 | -89 89 | {"a": [], **{}, 6: 3} +83 | +84 | +85 | # https://github.com/astral-sh/ruff/issues/15997 + - {"a": [], **{},} +86 + {"a": [], } +87 | {"a": [], **({}),} +88 | +89 | {"a": [], **{}, 6: 3} PIE800 [*] Unnecessary spread `**` --> PIE800.py:87:14 @@ -373,16 +345,14 @@ PIE800 [*] Unnecessary spread `**` 89 | {"a": [], **{}, 6: 3} | help: Remove unnecessary dict - -ℹ Safe fix -84 84 | -85 85 | # https://github.com/astral-sh/ruff/issues/15997 -86 86 | {"a": [], **{},} -87 |-{"a": [], **({}),} - 87 |+{"a": [], } -88 88 | -89 89 | {"a": [], **{}, 6: 3} -90 90 | {"a": [], **({}), 6: 3} +84 | +85 | # https://github.com/astral-sh/ruff/issues/15997 +86 | {"a": [], **{},} + - {"a": [], **({}),} +87 + {"a": [], } +88 | +89 | {"a": [], **{}, 6: 3} +90 | {"a": [], **({}), 6: 3} PIE800 [*] Unnecessary spread `**` --> PIE800.py:89:13 @@ -394,16 +364,14 @@ PIE800 [*] Unnecessary spread `**` 90 | {"a": [], **({}), 6: 3} | help: Remove unnecessary dict - -ℹ Safe fix -86 86 | {"a": [], **{},} -87 87 | {"a": [], **({}),} -88 88 | -89 |-{"a": [], **{}, 6: 3} - 89 |+{"a": [], 6: 3} -90 90 | {"a": [], **({}), 6: 3} -91 91 | -92 92 | {"a": [], **{ +86 | {"a": [], **{},} +87 | {"a": [], **({}),} +88 | + - {"a": [], **{}, 6: 3} +89 + {"a": [], 6: 3} +90 | {"a": [], **({}), 6: 3} +91 | +92 | {"a": [], **{ PIE800 [*] Unnecessary spread `**` --> PIE800.py:90:14 @@ -415,16 +383,14 @@ PIE800 [*] Unnecessary spread `**` 92 | {"a": [], **{ | help: Remove unnecessary dict - -ℹ Safe fix -87 87 | {"a": [], **({}),} -88 88 | -89 89 | {"a": [], **{}, 6: 3} -90 |-{"a": [], **({}), 6: 3} - 90 |+{"a": [], 6: 3} -91 91 | -92 92 | {"a": [], **{ -93 93 | # Comment +87 | {"a": [], **({}),} +88 | +89 | {"a": [], **{}, 6: 3} + - {"a": [], **({}), 6: 3} +90 + {"a": [], 6: 3} +91 | +92 | {"a": [], **{ +93 | # Comment PIE800 [*] Unnecessary spread `**` --> PIE800.py:92:13 @@ -440,19 +406,17 @@ PIE800 [*] Unnecessary spread `**` 96 | # Comment | help: Remove unnecessary dict - -ℹ Safe fix -89 89 | {"a": [], **{}, 6: 3} -90 90 | {"a": [], **({}), 6: 3} -91 91 | -92 |-{"a": [], **{ - 92 |+{"a": [], -93 93 | # Comment -94 |-}, 6: 3} - 94 |+ 6: 3} -95 95 | {"a": [], **({ -96 96 | # Comment -97 97 | }), 6: 3} +89 | {"a": [], **{}, 6: 3} +90 | {"a": [], **({}), 6: 3} +91 | + - {"a": [], **{ +92 + {"a": [], +93 | # Comment + - }, 6: 3} +94 + 6: 3} +95 | {"a": [], **({ +96 | # Comment +97 | }), 6: 3} PIE800 [*] Unnecessary spread `**` --> PIE800.py:95:14 @@ -466,16 +430,14 @@ PIE800 [*] Unnecessary spread `**` | |_^ | help: Remove unnecessary dict - -ℹ Safe fix -92 92 | {"a": [], **{ -93 93 | # Comment -94 94 | }, 6: 3} -95 |-{"a": [], **({ - 95 |+{"a": [], -96 96 | # Comment -97 |-}), 6: 3} - 97 |+ 6: 3} -98 98 | -99 99 | -100 100 | {**foo, "bar": True } # OK +92 | {"a": [], **{ +93 | # Comment +94 | }, 6: 3} + - {"a": [], **({ +95 + {"a": [], +96 | # Comment + - }), 6: 3} +97 + 6: 3} +98 | +99 | +100 | {**foo, "bar": True } # OK diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap index 6b0e88fd27..63dfd24b39 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE804_PIE804.py.snap @@ -10,13 +10,11 @@ PIE804 [*] Unnecessary `dict` kwargs 3 | foo(**{"r2d2": True}) # PIE804 | help: Remove unnecessary kwargs - -ℹ Safe fix -1 |-foo(**{"bar": True}) # PIE804 - 1 |+foo(bar=True) # PIE804 -2 2 | -3 3 | foo(**{"r2d2": True}) # PIE804 -4 4 | + - foo(**{"bar": True}) # PIE804 +1 + foo(bar=True) # PIE804 +2 | +3 | foo(**{"r2d2": True}) # PIE804 +4 | PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:3:5 @@ -29,15 +27,13 @@ PIE804 [*] Unnecessary `dict` kwargs 5 | Foo.objects.create(**{"bar": True}) # PIE804 | help: Remove unnecessary kwargs - -ℹ Safe fix -1 1 | foo(**{"bar": True}) # PIE804 -2 2 | -3 |-foo(**{"r2d2": True}) # PIE804 - 3 |+foo(r2d2=True) # PIE804 -4 4 | -5 5 | Foo.objects.create(**{"bar": True}) # PIE804 -6 6 | +1 | foo(**{"bar": True}) # PIE804 +2 | + - foo(**{"r2d2": True}) # PIE804 +3 + foo(r2d2=True) # PIE804 +4 | +5 | Foo.objects.create(**{"bar": True}) # PIE804 +6 | PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:5:20 @@ -50,16 +46,14 @@ PIE804 [*] Unnecessary `dict` kwargs 7 | Foo.objects.create(**{"_id": some_id}) # PIE804 | help: Remove unnecessary kwargs - -ℹ Safe fix -2 2 | -3 3 | foo(**{"r2d2": True}) # PIE804 -4 4 | -5 |-Foo.objects.create(**{"bar": True}) # PIE804 - 5 |+Foo.objects.create(bar=True) # PIE804 -6 6 | -7 7 | Foo.objects.create(**{"_id": some_id}) # PIE804 -8 8 | +2 | +3 | foo(**{"r2d2": True}) # PIE804 +4 | + - Foo.objects.create(**{"bar": True}) # PIE804 +5 + Foo.objects.create(bar=True) # PIE804 +6 | +7 | Foo.objects.create(**{"_id": some_id}) # PIE804 +8 | PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:7:20 @@ -72,16 +66,14 @@ PIE804 [*] Unnecessary `dict` kwargs 9 | Foo.objects.create(**{**bar}) # PIE804 | help: Remove unnecessary kwargs - -ℹ Safe fix -4 4 | -5 5 | Foo.objects.create(**{"bar": True}) # PIE804 -6 6 | -7 |-Foo.objects.create(**{"_id": some_id}) # PIE804 - 7 |+Foo.objects.create(_id=some_id) # PIE804 -8 8 | -9 9 | Foo.objects.create(**{**bar}) # PIE804 -10 10 | +4 | +5 | Foo.objects.create(**{"bar": True}) # PIE804 +6 | + - Foo.objects.create(**{"_id": some_id}) # PIE804 +7 + Foo.objects.create(_id=some_id) # PIE804 +8 | +9 | Foo.objects.create(**{**bar}) # PIE804 +10 | PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:9:20 @@ -94,16 +86,14 @@ PIE804 [*] Unnecessary `dict` kwargs 11 | foo(**{}) | help: Remove unnecessary kwargs - -ℹ Safe fix -6 6 | -7 7 | Foo.objects.create(**{"_id": some_id}) # PIE804 -8 8 | -9 |-Foo.objects.create(**{**bar}) # PIE804 - 9 |+Foo.objects.create(**bar) # PIE804 -10 10 | -11 11 | foo(**{}) -12 12 | +6 | +7 | Foo.objects.create(**{"_id": some_id}) # PIE804 +8 | + - Foo.objects.create(**{**bar}) # PIE804 +9 + Foo.objects.create(**bar) # PIE804 +10 | +11 | foo(**{}) +12 | PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:11:5 @@ -116,16 +106,14 @@ PIE804 [*] Unnecessary `dict` kwargs 13 | foo(**{**data, "foo": "buzz"}) | help: Remove unnecessary kwargs - -ℹ Safe fix -8 8 | -9 9 | Foo.objects.create(**{**bar}) # PIE804 -10 10 | -11 |-foo(**{}) - 11 |+foo() -12 12 | -13 13 | foo(**{**data, "foo": "buzz"}) -14 14 | foo(**buzz) +8 | +9 | Foo.objects.create(**{**bar}) # PIE804 +10 | + - foo(**{}) +11 + foo() +12 | +13 | foo(**{**data, "foo": "buzz"}) +14 | foo(**buzz) PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:22:5 @@ -138,16 +126,14 @@ PIE804 [*] Unnecessary `dict` kwargs 24 | # Duplicated key names won't be fixed, to avoid syntax errors. | help: Remove unnecessary kwargs - -ℹ Safe fix -19 19 | foo(**{"": True}) -20 20 | foo(**{f"buzz__{bar}": True}) -21 21 | abc(**{"for": 3}) -22 |-foo(**{},) - 22 |+foo() -23 23 | -24 24 | # Duplicated key names won't be fixed, to avoid syntax errors. -25 25 | abc(**{'a': b}, **{'a': c}) # PIE804 +19 | foo(**{"": True}) +20 | foo(**{f"buzz__{bar}": True}) +21 | abc(**{"for": 3}) + - foo(**{},) +22 + foo() +23 | +24 | # Duplicated key names won't be fixed, to avoid syntax errors. +25 | abc(**{'a': b}, **{'a': c}) # PIE804 PIE804 Unnecessary `dict` kwargs --> PIE804.py:25:5 @@ -192,16 +178,14 @@ PIE804 [*] Unnecessary `dict` kwargs 28 | # Some values need to be parenthesized. | help: Remove unnecessary kwargs - -ℹ Safe fix -23 23 | -24 24 | # Duplicated key names won't be fixed, to avoid syntax errors. -25 25 | abc(**{'a': b}, **{'a': c}) # PIE804 -26 |-abc(a=1, **{'a': c}, **{'b': c}) # PIE804 - 26 |+abc(a=1, **{'a': c}, b=c) # PIE804 -27 27 | -28 28 | # Some values need to be parenthesized. -29 29 | def foo(): +23 | +24 | # Duplicated key names won't be fixed, to avoid syntax errors. +25 | abc(**{'a': b}, **{'a': c}) # PIE804 + - abc(a=1, **{'a': c}, **{'b': c}) # PIE804 +26 + abc(a=1, **{'a': c}, b=c) # PIE804 +27 | +28 | # Some values need to be parenthesized. +29 | def foo(): PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:30:16 @@ -213,16 +197,14 @@ PIE804 [*] Unnecessary `dict` kwargs 31 | abc(foo=1, **{'bar': (yield 1)}) # PIE804 | help: Remove unnecessary kwargs - -ℹ Safe fix -27 27 | -28 28 | # Some values need to be parenthesized. -29 29 | def foo(): -30 |- abc(foo=1, **{'bar': (bar := 1)}) # PIE804 - 30 |+ abc(foo=1, bar=(bar := 1)) # PIE804 -31 31 | abc(foo=1, **{'bar': (yield 1)}) # PIE804 -32 32 | -33 33 | # https://github.com/astral-sh/ruff/issues/18036 +27 | +28 | # Some values need to be parenthesized. +29 | def foo(): + - abc(foo=1, **{'bar': (bar := 1)}) # PIE804 +30 + abc(foo=1, bar=(bar := 1)) # PIE804 +31 | abc(foo=1, **{'bar': (yield 1)}) # PIE804 +32 | +33 | # https://github.com/astral-sh/ruff/issues/18036 PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:31:16 @@ -235,16 +217,14 @@ PIE804 [*] Unnecessary `dict` kwargs 33 | # https://github.com/astral-sh/ruff/issues/18036 | help: Remove unnecessary kwargs - -ℹ Safe fix -28 28 | # Some values need to be parenthesized. -29 29 | def foo(): -30 30 | abc(foo=1, **{'bar': (bar := 1)}) # PIE804 -31 |- abc(foo=1, **{'bar': (yield 1)}) # PIE804 - 31 |+ abc(foo=1, bar=(yield 1)) # PIE804 -32 32 | -33 33 | # https://github.com/astral-sh/ruff/issues/18036 -34 34 | # The autofix for this is unsafe due to the comments inside the dictionary. +28 | # Some values need to be parenthesized. +29 | def foo(): +30 | abc(foo=1, **{'bar': (bar := 1)}) # PIE804 + - abc(foo=1, **{'bar': (yield 1)}) # PIE804 +31 + abc(foo=1, bar=(yield 1)) # PIE804 +32 | +33 | # https://github.com/astral-sh/ruff/issues/18036 +34 | # The autofix for this is unsafe due to the comments inside the dictionary. PIE804 [*] Unnecessary `dict` kwargs --> PIE804.py:36:5 @@ -261,16 +241,15 @@ PIE804 [*] Unnecessary `dict` kwargs 42 | ) | help: Remove unnecessary kwargs - -ℹ Unsafe fix -33 33 | # https://github.com/astral-sh/ruff/issues/18036 -34 34 | # The autofix for this is unsafe due to the comments inside the dictionary. -35 35 | foo( -36 |- **{ -37 |- # Comment 1 -38 |- "x": 1.0, -39 |- # Comment 2 -40 |- "y": 2.0, -41 |- } - 36 |+ x=1.0, y=2.0 -42 37 | ) +33 | # https://github.com/astral-sh/ruff/issues/18036 +34 | # The autofix for this is unsafe due to the comments inside the dictionary. +35 | foo( + - **{ + - # Comment 1 + - "x": 1.0, + - # Comment 2 + - "y": 2.0, + - } +36 + x=1.0, y=2.0 +37 | ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap index 38cb78b806..63d875d446 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap @@ -11,15 +11,13 @@ PIE807 [*] Prefer `list` over useless lambda 4 | bar: Dict[str, int] = field(default_factory=lambda: {}) # PIE807 | help: Replace with `lambda` with `list` - -ℹ Safe fix -1 1 | @dataclass -2 2 | class Foo: -3 |- foo: List[str] = field(default_factory=lambda: []) # PIE807 - 3 |+ foo: List[str] = field(default_factory=list) # PIE807 -4 4 | bar: Dict[str, int] = field(default_factory=lambda: {}) # PIE807 -5 5 | -6 6 | +1 | @dataclass +2 | class Foo: + - foo: List[str] = field(default_factory=lambda: []) # PIE807 +3 + foo: List[str] = field(default_factory=list) # PIE807 +4 | bar: Dict[str, int] = field(default_factory=lambda: {}) # PIE807 +5 | +6 | PIE807 [*] Prefer `dict` over useless lambda --> PIE807.py:4:49 @@ -30,16 +28,14 @@ PIE807 [*] Prefer `dict` over useless lambda | ^^^^^^^^^^ | help: Replace with `lambda` with `dict` - -ℹ Safe fix -1 1 | @dataclass -2 2 | class Foo: -3 3 | foo: List[str] = field(default_factory=lambda: []) # PIE807 -4 |- bar: Dict[str, int] = field(default_factory=lambda: {}) # PIE807 - 4 |+ bar: Dict[str, int] = field(default_factory=dict) # PIE807 -5 5 | -6 6 | -7 7 | class FooTable(BaseTable): +1 | @dataclass +2 | class Foo: +3 | foo: List[str] = field(default_factory=lambda: []) # PIE807 + - bar: Dict[str, int] = field(default_factory=lambda: {}) # PIE807 +4 + bar: Dict[str, int] = field(default_factory=dict) # PIE807 +5 | +6 | +7 | class FooTable(BaseTable): PIE807 [*] Prefer `list` over useless lambda --> PIE807.py:8:36 @@ -50,16 +46,14 @@ PIE807 [*] Prefer `list` over useless lambda 9 | bar = fields.ListField(default=lambda: {}) # PIE807 | help: Replace with `lambda` with `list` - -ℹ Safe fix -5 5 | -6 6 | -7 7 | class FooTable(BaseTable): -8 |- foo = fields.ListField(default=lambda: []) # PIE807 - 8 |+ foo = fields.ListField(default=list) # PIE807 -9 9 | bar = fields.ListField(default=lambda: {}) # PIE807 -10 10 | -11 11 | +5 | +6 | +7 | class FooTable(BaseTable): + - foo = fields.ListField(default=lambda: []) # PIE807 +8 + foo = fields.ListField(default=list) # PIE807 +9 | bar = fields.ListField(default=lambda: {}) # PIE807 +10 | +11 | PIE807 [*] Prefer `dict` over useless lambda --> PIE807.py:9:36 @@ -70,16 +64,14 @@ PIE807 [*] Prefer `dict` over useless lambda | ^^^^^^^^^^ | help: Replace with `lambda` with `dict` - -ℹ Safe fix -6 6 | -7 7 | class FooTable(BaseTable): -8 8 | foo = fields.ListField(default=lambda: []) # PIE807 -9 |- bar = fields.ListField(default=lambda: {}) # PIE807 - 9 |+ bar = fields.ListField(default=dict) # PIE807 -10 10 | -11 11 | -12 12 | class FooTable(BaseTable): +6 | +7 | class FooTable(BaseTable): +8 | foo = fields.ListField(default=lambda: []) # PIE807 + - bar = fields.ListField(default=lambda: {}) # PIE807 +9 + bar = fields.ListField(default=dict) # PIE807 +10 | +11 | +12 | class FooTable(BaseTable): PIE807 [*] Prefer `list` over useless lambda --> PIE807.py:13:28 @@ -90,16 +82,14 @@ PIE807 [*] Prefer `list` over useless lambda 14 | bar = fields.ListField(default=lambda: {}) # PIE807 | help: Replace with `lambda` with `list` - -ℹ Safe fix -10 10 | -11 11 | -12 12 | class FooTable(BaseTable): -13 |- foo = fields.ListField(lambda: []) # PIE807 - 13 |+ foo = fields.ListField(list) # PIE807 -14 14 | bar = fields.ListField(default=lambda: {}) # PIE807 -15 15 | -16 16 | +10 | +11 | +12 | class FooTable(BaseTable): + - foo = fields.ListField(lambda: []) # PIE807 +13 + foo = fields.ListField(list) # PIE807 +14 | bar = fields.ListField(default=lambda: {}) # PIE807 +15 | +16 | PIE807 [*] Prefer `dict` over useless lambda --> PIE807.py:14:36 @@ -110,13 +100,11 @@ PIE807 [*] Prefer `dict` over useless lambda | ^^^^^^^^^^ | help: Replace with `lambda` with `dict` - -ℹ Safe fix -11 11 | -12 12 | class FooTable(BaseTable): -13 13 | foo = fields.ListField(lambda: []) # PIE807 -14 |- bar = fields.ListField(default=lambda: {}) # PIE807 - 14 |+ bar = fields.ListField(default=dict) # PIE807 -15 15 | -16 16 | -17 17 | @dataclass +11 | +12 | class FooTable(BaseTable): +13 | foo = fields.ListField(lambda: []) # PIE807 + - bar = fields.ListField(default=lambda: {}) # PIE807 +14 + bar = fields.ListField(default=dict) # PIE807 +15 | +16 | +17 | @dataclass diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap index 1ac8dcf635..cf62619996 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE808_PIE808.py.snap @@ -11,14 +11,12 @@ PIE808 [*] Unnecessary `start` argument in `range` 4 | import builtins | help: Remove `start` argument - -ℹ Safe fix -1 1 | # PIE808 -2 |-range(0, 10) - 2 |+range(10) -3 3 | -4 4 | import builtins -5 5 | builtins.range(0, 10) +1 | # PIE808 + - range(0, 10) +2 + range(10) +3 | +4 | import builtins +5 | builtins.range(0, 10) PIE808 [*] Unnecessary `start` argument in `range` --> PIE808.py:5:16 @@ -30,16 +28,14 @@ PIE808 [*] Unnecessary `start` argument in `range` 7 | # OK | help: Remove `start` argument - -ℹ Safe fix -2 2 | range(0, 10) -3 3 | -4 4 | import builtins -5 |-builtins.range(0, 10) - 5 |+builtins.range(10) -6 6 | -7 7 | # OK -8 8 | range(x, 10) +2 | range(0, 10) +3 | +4 | import builtins + - builtins.range(0, 10) +5 + builtins.range(10) +6 | +7 | # OK +8 | range(x, 10) PIE808 [*] Unnecessary `start` argument in `range` --> PIE808.py:19:8 @@ -49,10 +45,8 @@ PIE808 [*] Unnecessary `start` argument in `range` | ^ | help: Remove `start` argument - -ℹ Safe fix -16 16 | range(0, stop=10) -17 17 | -18 18 | # regression test for https://github.com/astral-sh/ruff/pull/18805 -19 |-range((0), 42) - 19 |+range(42) +16 | range(0, stop=10) +17 | +18 | # regression test for https://github.com/astral-sh/ruff/pull/18805 + - range((0), 42) +19 + range(42) diff --git a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap index 3fe1aacb7d..de487a9f14 100644 --- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap @@ -11,14 +11,13 @@ PIE810 [*] Call `startswith` once with a `tuple` 4 | obj.endswith("foo") or obj.endswith("bar") | help: Merge into a single `startswith` call - -ℹ Unsafe fix -1 1 | # error -2 |-obj.startswith("foo") or obj.startswith("bar") - 2 |+obj.startswith(("foo", "bar")) -3 3 | # error -4 4 | obj.endswith("foo") or obj.endswith("bar") -5 5 | # error +1 | # error + - obj.startswith("foo") or obj.startswith("bar") +2 + obj.startswith(("foo", "bar")) +3 | # error +4 | obj.endswith("foo") or obj.endswith("bar") +5 | # error +note: This is an unsafe fix and may change runtime behavior PIE810 [*] Call `endswith` once with a `tuple` --> PIE810.py:4:1 @@ -31,16 +30,15 @@ PIE810 [*] Call `endswith` once with a `tuple` 6 | obj.startswith(foo) or obj.startswith(bar) | help: Merge into a single `endswith` call - -ℹ Unsafe fix -1 1 | # error -2 2 | obj.startswith("foo") or obj.startswith("bar") -3 3 | # error -4 |-obj.endswith("foo") or obj.endswith("bar") - 4 |+obj.endswith(("foo", "bar")) -5 5 | # error -6 6 | obj.startswith(foo) or obj.startswith(bar) -7 7 | # error +1 | # error +2 | obj.startswith("foo") or obj.startswith("bar") +3 | # error + - obj.endswith("foo") or obj.endswith("bar") +4 + obj.endswith(("foo", "bar")) +5 | # error +6 | obj.startswith(foo) or obj.startswith(bar) +7 | # error +note: This is an unsafe fix and may change runtime behavior PIE810 [*] Call `startswith` once with a `tuple` --> PIE810.py:6:1 @@ -53,16 +51,15 @@ PIE810 [*] Call `startswith` once with a `tuple` 8 | obj.startswith(foo) or obj.startswith("foo") | help: Merge into a single `startswith` call - -ℹ Unsafe fix -3 3 | # error -4 4 | obj.endswith("foo") or obj.endswith("bar") -5 5 | # error -6 |-obj.startswith(foo) or obj.startswith(bar) - 6 |+obj.startswith((foo, bar)) -7 7 | # error -8 8 | obj.startswith(foo) or obj.startswith("foo") -9 9 | # error +3 | # error +4 | obj.endswith("foo") or obj.endswith("bar") +5 | # error + - obj.startswith(foo) or obj.startswith(bar) +6 + obj.startswith((foo, bar)) +7 | # error +8 | obj.startswith(foo) or obj.startswith("foo") +9 | # error +note: This is an unsafe fix and may change runtime behavior PIE810 [*] Call `startswith` once with a `tuple` --> PIE810.py:8:1 @@ -75,16 +72,15 @@ PIE810 [*] Call `startswith` once with a `tuple` 10 | obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo") | help: Merge into a single `startswith` call - -ℹ Unsafe fix -5 5 | # error -6 6 | obj.startswith(foo) or obj.startswith(bar) -7 7 | # error -8 |-obj.startswith(foo) or obj.startswith("foo") - 8 |+obj.startswith((foo, "foo")) -9 9 | # error -10 10 | obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo") -11 11 | +5 | # error +6 | obj.startswith(foo) or obj.startswith(bar) +7 | # error + - obj.startswith(foo) or obj.startswith("foo") +8 + obj.startswith((foo, "foo")) +9 | # error +10 | obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo") +11 | +note: This is an unsafe fix and may change runtime behavior PIE810 [*] Call `startswith` once with a `tuple` --> PIE810.py:10:1 @@ -97,16 +93,15 @@ PIE810 [*] Call `startswith` once with a `tuple` 12 | def func(): | help: Merge into a single `startswith` call - -ℹ Unsafe fix -7 7 | # error -8 8 | obj.startswith(foo) or obj.startswith("foo") -9 9 | # error -10 |-obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo") - 10 |+obj.endswith(foo) or obj.startswith((foo, "foo")) -11 11 | -12 12 | def func(): -13 13 | msg = "hello world" +7 | # error +8 | obj.startswith(foo) or obj.startswith("foo") +9 | # error + - obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo") +10 + obj.endswith(foo) or obj.startswith((foo, "foo")) +11 | +12 | def func(): +13 | msg = "hello world" +note: This is an unsafe fix and may change runtime behavior PIE810 [*] Call `startswith` once with a `tuple` --> PIE810.py:19:8 @@ -118,16 +113,15 @@ PIE810 [*] Call `startswith` once with a `tuple` 20 | print("yes") | help: Merge into a single `startswith` call - -ℹ Unsafe fix -16 16 | y = ("h", "e", "l", "l", "o") -17 17 | z = "w" -18 18 | -19 |- if msg.startswith(x) or msg.startswith(y) or msg.startswith(z): # Error - 19 |+ if msg.startswith((x, z)) or msg.startswith(y): # Error -20 20 | print("yes") -21 21 | -22 22 | def func(): +16 | y = ("h", "e", "l", "l", "o") +17 | z = "w" +18 | + - if msg.startswith(x) or msg.startswith(y) or msg.startswith(z): # Error +19 + if msg.startswith((x, z)) or msg.startswith(y): # Error +20 | print("yes") +21 | +22 | def func(): +note: This is an unsafe fix and may change runtime behavior PIE810 [*] Call `startswith` once with a `tuple` --> PIE810.py:25:8 @@ -139,16 +133,15 @@ PIE810 [*] Call `startswith` once with a `tuple` 26 | print("yes") | help: Merge into a single `startswith` call - -ℹ Unsafe fix -22 22 | def func(): -23 23 | msg = "hello world" -24 24 | -25 |- if msg.startswith(("h", "e", "l", "l", "o")) or msg.startswith("h") or msg.startswith("w"): # Error - 25 |+ if msg.startswith(("h", "e", "l", "l", "o", "h", "w")): # Error -26 26 | print("yes") -27 27 | -28 28 | # ok +22 | def func(): +23 | msg = "hello world" +24 | + - if msg.startswith(("h", "e", "l", "l", "o")) or msg.startswith("h") or msg.startswith("w"): # Error +25 + if msg.startswith(("h", "e", "l", "l", "o", "h", "w")): # Error +26 | print("yes") +27 | +28 | # ok +note: This is an unsafe fix and may change runtime behavior PIE810 [*] Call `startswith` once with a `tuple` --> PIE810.py:83:8 @@ -160,11 +153,10 @@ PIE810 [*] Call `startswith` once with a `tuple` 84 | print("yes") | help: Merge into a single `startswith` call - -ℹ Unsafe fix -80 80 | -81 81 | def func(): -82 82 | "Regression test for https://github.com/astral-sh/ruff/issues/9663" -83 |- if x.startswith("a") or x.startswith("b") or re.match(r"a\.b", x): - 83 |+ if x.startswith(("a", "b")) or re.match(r"a\.b", x): -84 84 | print("yes") +80 | +81 | def func(): +82 | "Regression test for https://github.com/astral-sh/ruff/issues/9663" + - if x.startswith("a") or x.startswith("b") or re.match(r"a\.b", x): +83 + if x.startswith(("a", "b")) or re.match(r"a\.b", x): +84 | print("yes") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap index 62d5112a6a..9b929f4163 100644 --- a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap +++ b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T201_T201.py.snap @@ -12,15 +12,14 @@ T201 [*] `print` found 6 | print("Hello, world!", file=sys.stdout) # T201 | help: Remove `print` - -ℹ Unsafe fix -1 1 | import sys -2 2 | import tempfile -3 3 | -4 |-print("Hello, world!") # T201 -5 4 | print("Hello, world!", file=None) # T201 -6 5 | print("Hello, world!", file=sys.stdout) # T201 -7 6 | print("Hello, world!", file=sys.stderr) # T201 +1 | import sys +2 | import tempfile +3 | + - print("Hello, world!") # T201 +4 | print("Hello, world!", file=None) # T201 +5 | print("Hello, world!", file=sys.stdout) # T201 +6 | print("Hello, world!", file=sys.stderr) # T201 +note: This is an unsafe fix and may change runtime behavior T201 [*] `print` found --> T201.py:5:1 @@ -32,15 +31,14 @@ T201 [*] `print` found 7 | print("Hello, world!", file=sys.stderr) # T201 | help: Remove `print` - -ℹ Unsafe fix -2 2 | import tempfile -3 3 | -4 4 | print("Hello, world!") # T201 -5 |-print("Hello, world!", file=None) # T201 -6 5 | print("Hello, world!", file=sys.stdout) # T201 -7 6 | print("Hello, world!", file=sys.stderr) # T201 -8 7 | +2 | import tempfile +3 | +4 | print("Hello, world!") # T201 + - print("Hello, world!", file=None) # T201 +5 | print("Hello, world!", file=sys.stdout) # T201 +6 | print("Hello, world!", file=sys.stderr) # T201 +7 | +note: This is an unsafe fix and may change runtime behavior T201 [*] `print` found --> T201.py:6:1 @@ -52,15 +50,14 @@ T201 [*] `print` found 7 | print("Hello, world!", file=sys.stderr) # T201 | help: Remove `print` - -ℹ Unsafe fix -3 3 | -4 4 | print("Hello, world!") # T201 -5 5 | print("Hello, world!", file=None) # T201 -6 |-print("Hello, world!", file=sys.stdout) # T201 -7 6 | print("Hello, world!", file=sys.stderr) # T201 -8 7 | -9 8 | with tempfile.NamedTemporaryFile() as fp: +3 | +4 | print("Hello, world!") # T201 +5 | print("Hello, world!", file=None) # T201 + - print("Hello, world!", file=sys.stdout) # T201 +6 | print("Hello, world!", file=sys.stderr) # T201 +7 | +8 | with tempfile.NamedTemporaryFile() as fp: +note: This is an unsafe fix and may change runtime behavior T201 [*] `print` found --> T201.py:7:1 @@ -73,12 +70,11 @@ T201 [*] `print` found 9 | with tempfile.NamedTemporaryFile() as fp: | help: Remove `print` - -ℹ Unsafe fix -4 4 | print("Hello, world!") # T201 -5 5 | print("Hello, world!", file=None) # T201 -6 6 | print("Hello, world!", file=sys.stdout) # T201 -7 |-print("Hello, world!", file=sys.stderr) # T201 -8 7 | -9 8 | with tempfile.NamedTemporaryFile() as fp: -10 9 | print("Hello, world!", file=fp) # OK +4 | print("Hello, world!") # T201 +5 | print("Hello, world!", file=None) # T201 +6 | print("Hello, world!", file=sys.stdout) # T201 + - print("Hello, world!", file=sys.stderr) # T201 +7 | +8 | with tempfile.NamedTemporaryFile() as fp: +9 | print("Hello, world!", file=fp) # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap index 04e2c9fd2e..0013e8aec6 100644 --- a/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap +++ b/crates/ruff_linter/src/rules/flake8_print/snapshots/ruff_linter__rules__flake8_print__tests__T203_T203.py.snap @@ -12,14 +12,13 @@ T203 [*] `pprint` found 5 | import pprint | help: Remove `pprint` - -ℹ Unsafe fix -1 1 | from pprint import pprint -2 2 | -3 |-pprint("Hello, world!") # T203 -4 3 | -5 4 | import pprint -6 5 | +1 | from pprint import pprint +2 | + - pprint("Hello, world!") # T203 +3 | +4 | import pprint +5 | +note: This is an unsafe fix and may change runtime behavior T203 [*] `pprint` found --> T203.py:7:1 @@ -32,11 +31,10 @@ T203 [*] `pprint` found 9 | pprint.pformat("Hello, world!") | help: Remove `pprint` - -ℹ Unsafe fix -4 4 | -5 5 | import pprint -6 6 | -7 |-pprint.pprint("Hello, world!") # T203 -8 7 | -9 8 | pprint.pformat("Hello, world!") +4 | +5 | import pprint +6 | + - pprint.pprint("Hello, world!") # T203 +7 | +8 | pprint.pformat("Hello, world!") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap index 4f421dfbec..21117270c5 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI009_PYI009.pyi.snap @@ -12,15 +12,13 @@ PYI009 [*] Empty body should contain `...`, not `pass` 5 | class Bar: ... # OK | help: Replace `pass` with `...` - -ℹ Safe fix -1 1 | def bar(): ... # OK -2 2 | def foo(): -3 |- pass # ERROR PYI009, since we're in a stub file - 3 |+ ... # ERROR PYI009, since we're in a stub file -4 4 | -5 5 | class Bar: ... # OK -6 6 | +1 | def bar(): ... # OK +2 | def foo(): + - pass # ERROR PYI009, since we're in a stub file +3 + ... # ERROR PYI009, since we're in a stub file +4 | +5 | class Bar: ... # OK +6 | PYI009 [*] Empty body should contain `...`, not `pass` --> PYI009.pyi:8:5 @@ -30,10 +28,8 @@ PYI009 [*] Empty body should contain `...`, not `pass` | ^^^^ | help: Replace `pass` with `...` - -ℹ Safe fix -5 5 | class Bar: ... # OK -6 6 | -7 7 | class Foo: -8 |- pass # ERROR PYI009, since we're in a stub file - 8 |+ ... # ERROR PYI009, since we're in a stub file +5 | class Bar: ... # OK +6 | +7 | class Foo: + - pass # ERROR PYI009, since we're in a stub file +8 + ... # ERROR PYI009, since we're in a stub file diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap index cbee721ffd..5e08248e09 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI010_PYI010.pyi.snap @@ -11,16 +11,14 @@ PYI010 [*] Function body must contain only `...` 8 | def foo2(): | help: Replace function body with `...` - -ℹ Safe fix -3 3 | """foo""" # OK, docstrings are handled by another rule -4 4 | -5 5 | def buzz(): -6 |- print("buzz") # ERROR PYI010 - 6 |+ ... # ERROR PYI010 -7 7 | -8 8 | def foo2(): -9 9 | 123 # ERROR PYI010 +3 | """foo""" # OK, docstrings are handled by another rule +4 | +5 | def buzz(): + - print("buzz") # ERROR PYI010 +6 + ... # ERROR PYI010 +7 | +8 | def foo2(): +9 | 123 # ERROR PYI010 PYI010 [*] Function body must contain only `...` --> PYI010.pyi:9:5 @@ -32,16 +30,14 @@ PYI010 [*] Function body must contain only `...` 11 | def bizz(): | help: Replace function body with `...` - -ℹ Safe fix -6 6 | print("buzz") # ERROR PYI010 -7 7 | -8 8 | def foo2(): -9 |- 123 # ERROR PYI010 - 9 |+ ... # ERROR PYI010 -10 10 | -11 11 | def bizz(): -12 12 | x = 123 # ERROR PYI010 +6 | print("buzz") # ERROR PYI010 +7 | +8 | def foo2(): + - 123 # ERROR PYI010 +9 + ... # ERROR PYI010 +10 | +11 | def bizz(): +12 | x = 123 # ERROR PYI010 PYI010 [*] Function body must contain only `...` --> PYI010.pyi:12:5 @@ -53,13 +49,11 @@ PYI010 [*] Function body must contain only `...` 14 | def foo3(): | help: Replace function body with `...` - -ℹ Safe fix -9 9 | 123 # ERROR PYI010 -10 10 | -11 11 | def bizz(): -12 |- x = 123 # ERROR PYI010 - 12 |+ ... # ERROR PYI010 -13 13 | -14 14 | def foo3(): -15 15 | pass # OK, pass is handled by another rule +9 | 123 # ERROR PYI010 +10 | +11 | def bizz(): + - x = 123 # ERROR PYI010 +12 + ... # ERROR PYI010 +13 | +14 | def foo3(): +15 | pass # OK, pass is handled by another rule diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap index 010b4f26d8..cb774917e3 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI011_PYI011.pyi.snap @@ -12,16 +12,14 @@ PYI011 [*] Only simple default values allowed for typed arguments 12 | def f11(*, x: str = "x") -> None: ... # OK | help: Replace default value with `...` - -ℹ Safe fix -7 7 | -8 8 | def f12( -9 9 | x, -10 |- y: str = os.pathsep, # Error PYI011 Only simple default values allowed for typed arguments - 10 |+ y: str = ..., # Error PYI011 Only simple default values allowed for typed arguments -11 11 | ) -> None: ... -12 12 | def f11(*, x: str = "x") -> None: ... # OK -13 13 | def f13( +7 | +8 | def f12( +9 | x, + - y: str = os.pathsep, # Error PYI011 Only simple default values allowed for typed arguments +10 + y: str = ..., # Error PYI011 Only simple default values allowed for typed arguments +11 | ) -> None: ... +12 | def f11(*, x: str = "x") -> None: ... # OK +13 | def f13( PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:38:9 @@ -38,19 +36,17 @@ PYI011 [*] Only simple default values allowed for typed arguments 43 | def f153( | help: Replace default value with `...` - -ℹ Safe fix -35 35 | def f152( -36 36 | x: dict[ -37 37 | int, int -38 |- ] = { # Error PYI011 Only simple default values allowed for typed arguments -39 |- 1: 2, -40 |- **{3: 4}, -41 |- } - 38 |+ ] = ... -42 39 | ) -> None: ... -43 40 | def f153( -44 41 | x: list[ +35 | def f152( +36 | x: dict[ +37 | int, int + - ] = { # Error PYI011 Only simple default values allowed for typed arguments + - 1: 2, + - **{3: 4}, + - } +38 + ] = ... +39 | ) -> None: ... +40 | def f153( +41 | x: list[ PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:46:9 @@ -76,28 +72,26 @@ PYI011 [*] Only simple default values allowed for typed arguments 60 | def f154( | help: Replace default value with `...` - -ℹ Safe fix -43 43 | def f153( -44 44 | x: list[ -45 45 | int -46 |- ] = [ # Error PYI011 Only simple default values allowed for typed arguments -47 |- 1, -48 |- 2, -49 |- 3, -50 |- 4, -51 |- 5, -52 |- 6, -53 |- 7, -54 |- 8, -55 |- 9, -56 |- 10, -57 |- 11, -58 |- ] - 46 |+ ] = ... -59 47 | ) -> None: ... -60 48 | def f154( -61 49 | x: tuple[ +43 | def f153( +44 | x: list[ +45 | int + - ] = [ # Error PYI011 Only simple default values allowed for typed arguments + - 1, + - 2, + - 3, + - 4, + - 5, + - 6, + - 7, + - 8, + - 9, + - 10, + - 11, + - ] +46 + ] = ... +47 | ) -> None: ... +48 | def f154( +49 | x: tuple[ PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:63:9 @@ -114,19 +108,17 @@ PYI011 [*] Only simple default values allowed for typed arguments 68 | def f141( | help: Replace default value with `...` - -ℹ Safe fix -60 60 | def f154( -61 61 | x: tuple[ -62 62 | str, tuple[str, ...] -63 |- ] = ( # Error PYI011 Only simple default values allowed for typed arguments -64 |- "foo", -65 |- ("bar", "baz"), -66 |- ) - 63 |+ ] = ... -67 64 | ) -> None: ... -68 65 | def f141( -69 66 | x: list[ +60 | def f154( +61 | x: tuple[ +62 | str, tuple[str, ...] + - ] = ( # Error PYI011 Only simple default values allowed for typed arguments + - "foo", + - ("bar", "baz"), + - ) +63 + ] = ... +64 | ) -> None: ... +65 | def f141( +66 | x: list[ PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:71:9 @@ -142,18 +134,16 @@ PYI011 [*] Only simple default values allowed for typed arguments 75 | def f142( | help: Replace default value with `...` - -ℹ Safe fix -68 68 | def f141( -69 69 | x: list[ -70 70 | int -71 |- ] = [ # Error PYI011 Only simple default values allowed for typed arguments -72 |- *range(10) -73 |- ], - 71 |+ ] = ..., -74 72 | ) -> None: ... -75 73 | def f142( -76 74 | x: list[ +68 | def f141( +69 | x: list[ +70 | int + - ] = [ # Error PYI011 Only simple default values allowed for typed arguments + - *range(10) + - ], +71 + ] = ..., +72 | ) -> None: ... +73 | def f142( +74 | x: list[ PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:78:9 @@ -169,18 +159,16 @@ PYI011 [*] Only simple default values allowed for typed arguments 82 | def f16( | help: Replace default value with `...` - -ℹ Safe fix -75 75 | def f142( -76 76 | x: list[ -77 77 | int -78 |- ] = list( # Error PYI011 Only simple default values allowed for typed arguments -79 |- range(10) -80 |- ), - 78 |+ ] = ..., -81 79 | ) -> None: ... -82 80 | def f16( -83 81 | x: frozenset[ +75 | def f142( +76 | x: list[ +77 | int + - ] = list( # Error PYI011 Only simple default values allowed for typed arguments + - range(10) + - ), +78 + ] = ..., +79 | ) -> None: ... +80 | def f16( +81 | x: frozenset[ PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:85:9 @@ -196,18 +184,16 @@ PYI011 [*] Only simple default values allowed for typed arguments 89 | def f17( | help: Replace default value with `...` - -ℹ Safe fix -82 82 | def f16( -83 83 | x: frozenset[ -84 84 | bytes -85 |- ] = frozenset( # Error PYI011 Only simple default values allowed for typed arguments -86 |- {b"foo", b"bar", b"baz"} -87 |- ) - 85 |+ ] = ... -88 86 | ) -> None: ... -89 87 | def f17( -90 88 | x: str = "foo" # Error PYI011 Only simple default values allowed for typed arguments +82 | def f16( +83 | x: frozenset[ +84 | bytes + - ] = frozenset( # Error PYI011 Only simple default values allowed for typed arguments + - {b"foo", b"bar", b"baz"} + - ) +85 + ] = ... +86 | ) -> None: ... +87 | def f17( +88 | x: str = "foo" # Error PYI011 Only simple default values allowed for typed arguments PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:90:14 @@ -222,17 +208,15 @@ PYI011 [*] Only simple default values allowed for typed arguments 93 | def f18( | help: Replace default value with `...` - -ℹ Safe fix -87 87 | ) -88 88 | ) -> None: ... -89 89 | def f17( -90 |- x: str = "foo" # Error PYI011 Only simple default values allowed for typed arguments -91 |- + "bar", - 90 |+ x: str = ..., -92 91 | ) -> None: ... -93 92 | def f18( -94 93 | x: str = b"foo" # Error PYI011 Only simple default values allowed for typed arguments +87 | ) +88 | ) -> None: ... +89 | def f17( + - x: str = "foo" # Error PYI011 Only simple default values allowed for typed arguments + - + "bar", +90 + x: str = ..., +91 | ) -> None: ... +92 | def f18( +93 | x: str = b"foo" # Error PYI011 Only simple default values allowed for typed arguments PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:94:14 @@ -247,17 +231,15 @@ PYI011 [*] Only simple default values allowed for typed arguments 97 | def f19( | help: Replace default value with `...` - -ℹ Safe fix -91 91 | + "bar", -92 92 | ) -> None: ... -93 93 | def f18( -94 |- x: str = b"foo" # Error PYI011 Only simple default values allowed for typed arguments -95 |- + b"bar", - 94 |+ x: str = ..., -96 95 | ) -> None: ... -97 96 | def f19( -98 97 | x: object = "foo" # Error PYI011 Only simple default values allowed for typed arguments +91 | + "bar", +92 | ) -> None: ... +93 | def f18( + - x: str = b"foo" # Error PYI011 Only simple default values allowed for typed arguments + - + b"bar", +94 + x: str = ..., +95 | ) -> None: ... +96 | def f19( +97 | x: object = "foo" # Error PYI011 Only simple default values allowed for typed arguments PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:98:17 @@ -272,17 +254,15 @@ PYI011 [*] Only simple default values allowed for typed arguments 101 | def f20( | help: Replace default value with `...` - -ℹ Safe fix -95 95 | + b"bar", -96 96 | ) -> None: ... -97 97 | def f19( -98 |- x: object = "foo" # Error PYI011 Only simple default values allowed for typed arguments -99 |- + 4, - 98 |+ x: object = ..., -100 99 | ) -> None: ... -101 100 | def f20( -102 101 | x: int = 5 +95 | + b"bar", +96 | ) -> None: ... +97 | def f19( + - x: object = "foo" # Error PYI011 Only simple default values allowed for typed arguments + - + 4, +98 + x: object = ..., +99 | ) -> None: ... +100 | def f20( +101 | x: int = 5 PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:102:14 @@ -297,17 +277,15 @@ PYI011 [*] Only simple default values allowed for typed arguments 105 | def f21( | help: Replace default value with `...` - -ℹ Safe fix -99 99 | + 4, -100 100 | ) -> None: ... -101 101 | def f20( -102 |- x: int = 5 -103 |- + 5, # Error PYI011 Only simple default values allowed for typed arguments - 102 |+ x: int = ..., # Error PYI011 Only simple default values allowed for typed arguments -104 103 | ) -> None: ... -105 104 | def f21( -106 105 | x: complex = 3j +99 | + 4, +100 | ) -> None: ... +101 | def f20( + - x: int = 5 + - + 5, # Error PYI011 Only simple default values allowed for typed arguments +102 + x: int = ..., # Error PYI011 Only simple default values allowed for typed arguments +103 | ) -> None: ... +104 | def f21( +105 | x: complex = 3j PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:106:18 @@ -322,17 +300,15 @@ PYI011 [*] Only simple default values allowed for typed arguments 109 | def f22( | help: Replace default value with `...` - -ℹ Safe fix -103 103 | + 5, # Error PYI011 Only simple default values allowed for typed arguments -104 104 | ) -> None: ... -105 105 | def f21( -106 |- x: complex = 3j -107 |- - 3j, # Error PYI011 Only simple default values allowed for typed arguments - 106 |+ x: complex = ..., # Error PYI011 Only simple default values allowed for typed arguments -108 107 | ) -> None: ... -109 108 | def f22( -110 109 | x: complex = -42.5j # Error PYI011 Only simple default values allowed for typed arguments +103 | + 5, # Error PYI011 Only simple default values allowed for typed arguments +104 | ) -> None: ... +105 | def f21( + - x: complex = 3j + - - 3j, # Error PYI011 Only simple default values allowed for typed arguments +106 + x: complex = ..., # Error PYI011 Only simple default values allowed for typed arguments +107 | ) -> None: ... +108 | def f22( +109 | x: complex = -42.5j # Error PYI011 Only simple default values allowed for typed arguments PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:110:18 @@ -347,17 +323,15 @@ PYI011 [*] Only simple default values allowed for typed arguments 113 | def f23( | help: Replace default value with `...` - -ℹ Safe fix -107 107 | - 3j, # Error PYI011 Only simple default values allowed for typed arguments -108 108 | ) -> None: ... -109 109 | def f22( -110 |- x: complex = -42.5j # Error PYI011 Only simple default values allowed for typed arguments -111 |- + 4.3j, - 110 |+ x: complex = ..., -112 111 | ) -> None: ... -113 112 | def f23( -114 113 | x: bool = True, # OK +107 | - 3j, # Error PYI011 Only simple default values allowed for typed arguments +108 | ) -> None: ... +109 | def f22( + - x: complex = -42.5j # Error PYI011 Only simple default values allowed for typed arguments + - + 4.3j, +110 + x: complex = ..., +111 | ) -> None: ... +112 | def f23( +113 | x: bool = True, # OK PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:138:16 @@ -370,16 +344,14 @@ PYI011 [*] Only simple default values allowed for typed arguments 140 | def f32( | help: Replace default value with `...` - -ℹ Safe fix -135 135 | x: float = -math.inf, # OK -136 136 | ) -> None: ... -137 137 | def f31( -138 |- x: float = inf, # Error PYI011 Only simple default values allowed for typed arguments - 138 |+ x: float = ..., # Error PYI011 Only simple default values allowed for typed arguments -139 139 | ) -> None: ... -140 140 | def f32( -141 141 | x: float = np.inf, # Error PYI011 Only simple default values allowed for typed arguments +135 | x: float = -math.inf, # OK +136 | ) -> None: ... +137 | def f31( + - x: float = inf, # Error PYI011 Only simple default values allowed for typed arguments +138 + x: float = ..., # Error PYI011 Only simple default values allowed for typed arguments +139 | ) -> None: ... +140 | def f32( +141 | x: float = np.inf, # Error PYI011 Only simple default values allowed for typed arguments PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:141:16 @@ -392,16 +364,14 @@ PYI011 [*] Only simple default values allowed for typed arguments 143 | def f33( | help: Replace default value with `...` - -ℹ Safe fix -138 138 | x: float = inf, # Error PYI011 Only simple default values allowed for typed arguments -139 139 | ) -> None: ... -140 140 | def f32( -141 |- x: float = np.inf, # Error PYI011 Only simple default values allowed for typed arguments - 141 |+ x: float = ..., # Error PYI011 Only simple default values allowed for typed arguments -142 142 | ) -> None: ... -143 143 | def f33( -144 144 | x: float = math.nan, # OK +138 | x: float = inf, # Error PYI011 Only simple default values allowed for typed arguments +139 | ) -> None: ... +140 | def f32( + - x: float = np.inf, # Error PYI011 Only simple default values allowed for typed arguments +141 + x: float = ..., # Error PYI011 Only simple default values allowed for typed arguments +142 | ) -> None: ... +143 | def f33( +144 | x: float = math.nan, # OK PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:147:16 @@ -414,16 +384,14 @@ PYI011 [*] Only simple default values allowed for typed arguments 149 | def f35( | help: Replace default value with `...` - -ℹ Safe fix -144 144 | x: float = math.nan, # OK -145 145 | ) -> None: ... -146 146 | def f34( -147 |- x: float = -math.nan, # Error PYI011 Only simple default values allowed for typed arguments - 147 |+ x: float = ..., # Error PYI011 Only simple default values allowed for typed arguments -148 148 | ) -> None: ... -149 149 | def f35( -150 150 | x: complex = math.inf # Error PYI011 Only simple default values allowed for typed arguments +144 | x: float = math.nan, # OK +145 | ) -> None: ... +146 | def f34( + - x: float = -math.nan, # Error PYI011 Only simple default values allowed for typed arguments +147 + x: float = ..., # Error PYI011 Only simple default values allowed for typed arguments +148 | ) -> None: ... +149 | def f35( +150 | x: complex = math.inf # Error PYI011 Only simple default values allowed for typed arguments PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:150:18 @@ -438,17 +406,15 @@ PYI011 [*] Only simple default values allowed for typed arguments 153 | def f36( | help: Replace default value with `...` - -ℹ Safe fix -147 147 | x: float = -math.nan, # Error PYI011 Only simple default values allowed for typed arguments -148 148 | ) -> None: ... -149 149 | def f35( -150 |- x: complex = math.inf # Error PYI011 Only simple default values allowed for typed arguments -151 |- + 1j, - 150 |+ x: complex = ..., -152 151 | ) -> None: ... -153 152 | def f36( -154 153 | *, +147 | x: float = -math.nan, # Error PYI011 Only simple default values allowed for typed arguments +148 | ) -> None: ... +149 | def f35( + - x: complex = math.inf # Error PYI011 Only simple default values allowed for typed arguments + - + 1j, +150 + x: complex = ..., +151 | ) -> None: ... +152 | def f36( +153 | *, PYI011 [*] Only simple default values allowed for typed arguments --> PYI011.pyi:159:14 @@ -462,12 +428,10 @@ PYI011 [*] Only simple default values allowed for typed arguments 161 | ) -> None: ... | help: Replace default value with `...` - -ℹ Safe fix -156 156 | ) -> None: ... -157 157 | def f37( -158 158 | *, -159 |- x: str = "" # Error PYI011 Only simple default values allowed for typed arguments -160 |- + "", - 159 |+ x: str = ..., -161 160 | ) -> None: ... +156 | ) -> None: ... +157 | def f37( +158 | *, + - x: str = "" # Error PYI011 Only simple default values allowed for typed arguments + - + "", +159 + x: str = ..., +160 | ) -> None: ... diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap index 874cc0c640..510e70a09b 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI012_PYI012.pyi.snap @@ -12,15 +12,13 @@ PYI012 [*] Class body must not contain `pass` 7 | class OneAttributeClassRev: | help: Remove unnecessary `pass` - -ℹ Safe fix -2 2 | -3 3 | class OneAttributeClass: -4 4 | value: int -5 |- pass # PYI012 Class body must not contain `pass` -6 5 | -7 6 | class OneAttributeClassRev: -8 7 | pass # PYI012 Class body must not contain `pass` +2 | +3 | class OneAttributeClass: +4 | value: int + - pass # PYI012 Class body must not contain `pass` +5 | +6 | class OneAttributeClassRev: +7 | pass # PYI012 Class body must not contain `pass` PYI012 [*] Class body must not contain `pass` --> PYI012.pyi:8:5 @@ -31,15 +29,13 @@ PYI012 [*] Class body must not contain `pass` 9 | value: int | help: Remove unnecessary `pass` - -ℹ Safe fix -5 5 | pass # PYI012 Class body must not contain `pass` -6 6 | -7 7 | class OneAttributeClassRev: -8 |- pass # PYI012 Class body must not contain `pass` -9 8 | value: int -10 9 | -11 10 | class DocstringClass: +5 | pass # PYI012 Class body must not contain `pass` +6 | +7 | class OneAttributeClassRev: + - pass # PYI012 Class body must not contain `pass` +8 | value: int +9 | +10 | class DocstringClass: PYI012 [*] Class body must not contain `pass` --> PYI012.pyi:16:5 @@ -52,15 +48,13 @@ PYI012 [*] Class body must not contain `pass` 18 | class NonEmptyChild(Exception): | help: Remove unnecessary `pass` - -ℹ Safe fix -13 13 | My body only contains pass. -14 14 | """ -15 15 | -16 |- pass # PYI012 Class body must not contain `pass` -17 16 | -18 17 | class NonEmptyChild(Exception): -19 18 | value: int +13 | My body only contains pass. +14 | """ +15 | + - pass # PYI012 Class body must not contain `pass` +16 | +17 | class NonEmptyChild(Exception): +18 | value: int PYI012 [*] Class body must not contain `pass` --> PYI012.pyi:20:5 @@ -73,15 +67,13 @@ PYI012 [*] Class body must not contain `pass` 22 | class NonEmptyChild2(Exception): | help: Remove unnecessary `pass` - -ℹ Safe fix -17 17 | -18 18 | class NonEmptyChild(Exception): -19 19 | value: int -20 |- pass # PYI012 Class body must not contain `pass` -21 20 | -22 21 | class NonEmptyChild2(Exception): -23 22 | pass # PYI012 Class body must not contain `pass` +17 | +18 | class NonEmptyChild(Exception): +19 | value: int + - pass # PYI012 Class body must not contain `pass` +20 | +21 | class NonEmptyChild2(Exception): +22 | pass # PYI012 Class body must not contain `pass` PYI012 [*] Class body must not contain `pass` --> PYI012.pyi:23:5 @@ -92,15 +84,13 @@ PYI012 [*] Class body must not contain `pass` 24 | value: int | help: Remove unnecessary `pass` - -ℹ Safe fix -20 20 | pass # PYI012 Class body must not contain `pass` -21 21 | -22 22 | class NonEmptyChild2(Exception): -23 |- pass # PYI012 Class body must not contain `pass` -24 23 | value: int -25 24 | -26 25 | class NonEmptyWithInit: +20 | pass # PYI012 Class body must not contain `pass` +21 | +22 | class NonEmptyChild2(Exception): + - pass # PYI012 Class body must not contain `pass` +23 | value: int +24 | +25 | class NonEmptyWithInit: PYI012 [*] Class body must not contain `pass` --> PYI012.pyi:28:5 @@ -113,12 +103,10 @@ PYI012 [*] Class body must not contain `pass` 30 | def __init__(): | help: Remove unnecessary `pass` - -ℹ Safe fix -25 25 | -26 26 | class NonEmptyWithInit: -27 27 | value: int -28 |- pass # PYI012 Class body must not contain `pass` -29 28 | -30 29 | def __init__(): -31 30 | pass +25 | +26 | class NonEmptyWithInit: +27 | value: int + - pass # PYI012 Class body must not contain `pass` +28 | +29 | def __init__(): +30 | pass diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap index c9e96ca5b3..154ca7681b 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.py.snap @@ -10,14 +10,12 @@ PYI013 [*] Non-empty class body must not contain `...` | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -1 1 | class OneAttributeClass: -2 2 | value: int -3 |- ... -4 3 | -5 4 | -6 5 | class OneAttributeClass2: +1 | class OneAttributeClass: +2 | value: int + - ... +3 | +4 | +5 | class OneAttributeClass2: PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:7:5 @@ -28,15 +26,13 @@ PYI013 [*] Non-empty class body must not contain `...` 8 | value: int | help: Remove unnecessary `...` - -ℹ Safe fix -4 4 | -5 5 | -6 6 | class OneAttributeClass2: -7 |- ... -8 7 | value: int -9 8 | -10 9 | +4 | +5 | +6 | class OneAttributeClass2: + - ... +7 | value: int +8 | +9 | PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:12:5 @@ -47,15 +43,13 @@ PYI013 [*] Non-empty class body must not contain `...` 13 | ... | help: Remove unnecessary `...` - -ℹ Safe fix -10 10 | -11 11 | class TwoEllipsesClass: -12 12 | ... -13 |- ... -14 13 | -15 14 | -16 15 | class DocstringClass: +10 | +11 | class TwoEllipsesClass: +12 | ... + - ... +13 | +14 | +15 | class DocstringClass: PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:13:5 @@ -66,15 +60,13 @@ PYI013 [*] Non-empty class body must not contain `...` | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -10 10 | -11 11 | class TwoEllipsesClass: -12 12 | ... -13 |- ... -14 13 | -15 14 | -16 15 | class DocstringClass: +10 | +11 | class TwoEllipsesClass: +12 | ... + - ... +13 | +14 | +15 | class DocstringClass: PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:21:5 @@ -85,15 +77,13 @@ PYI013 [*] Non-empty class body must not contain `...` | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -18 18 | My body only contains an ellipsis. -19 19 | """ -20 20 | -21 |- ... -22 21 | -23 22 | -24 23 | class NonEmptyChild(Exception): +18 | My body only contains an ellipsis. +19 | """ +20 | + - ... +21 | +22 | +23 | class NonEmptyChild(Exception): PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:26:5 @@ -104,15 +94,13 @@ PYI013 [*] Non-empty class body must not contain `...` | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -23 23 | -24 24 | class NonEmptyChild(Exception): -25 25 | value: int -26 |- ... -27 26 | -28 27 | -29 28 | class NonEmptyChild2(Exception): +23 | +24 | class NonEmptyChild(Exception): +25 | value: int + - ... +26 | +27 | +28 | class NonEmptyChild2(Exception): PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:30:5 @@ -123,15 +111,13 @@ PYI013 [*] Non-empty class body must not contain `...` 31 | value: int | help: Remove unnecessary `...` - -ℹ Safe fix -27 27 | -28 28 | -29 29 | class NonEmptyChild2(Exception): -30 |- ... -31 30 | value: int -32 31 | -33 32 | +27 | +28 | +29 | class NonEmptyChild2(Exception): + - ... +30 | value: int +31 | +32 | PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:36:5 @@ -144,15 +130,13 @@ PYI013 [*] Non-empty class body must not contain `...` 38 | def __init__(): | help: Remove unnecessary `...` - -ℹ Safe fix -33 33 | -34 34 | class NonEmptyWithInit: -35 35 | value: int -36 |- ... -37 36 | -38 37 | def __init__(): -39 38 | pass +33 | +34 | class NonEmptyWithInit: +35 | value: int + - ... +36 | +37 | def __init__(): +38 | pass PYI013 [*] Non-empty class body must not contain `...` --> PYI013.py:44:5 @@ -163,13 +147,11 @@ PYI013 [*] Non-empty class body must not contain `...` | ^^^ | help: Remove unnecessary `...` - -ℹ Safe fix -41 41 | -42 42 | class NonEmptyChildWithInlineComment: -43 43 | value: int -44 |- ... # preserve me - 44 |+ # preserve me -45 45 | -46 46 | -47 47 | class EmptyClass: +41 | +42 | class NonEmptyChildWithInlineComment: +43 | value: int + - ... # preserve me +44 + # preserve me +45 | +46 | +47 | class EmptyClass: diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap index 0c8e65f7bf..ccb21f6962 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI013_PYI013.pyi.snap @@ -12,16 +12,14 @@ PYI013 [*] Non-empty class body must not contain `...` 7 | class OneAttributeClass2: | help: Remove unnecessary `...` - -ℹ Safe fix -2 2 | -3 3 | class OneAttributeClass: -4 4 | value: int -5 |- ... # Error - 5 |+ # Error -6 6 | -7 7 | class OneAttributeClass2: -8 8 | ... # Error +2 | +3 | class OneAttributeClass: +4 | value: int + - ... # Error +5 + # Error +6 | +7 | class OneAttributeClass2: +8 | ... # Error PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:8:5 @@ -32,16 +30,14 @@ PYI013 [*] Non-empty class body must not contain `...` 9 | value: int | help: Remove unnecessary `...` - -ℹ Safe fix -5 5 | ... # Error -6 6 | -7 7 | class OneAttributeClass2: -8 |- ... # Error - 8 |+ # Error -9 9 | value: int -10 10 | -11 11 | class MyClass: +5 | ... # Error +6 | +7 | class OneAttributeClass2: + - ... # Error +8 + # Error +9 | value: int +10 | +11 | class MyClass: PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:12:5 @@ -52,15 +48,13 @@ PYI013 [*] Non-empty class body must not contain `...` 13 | value: int | help: Remove unnecessary `...` - -ℹ Safe fix -9 9 | value: int -10 10 | -11 11 | class MyClass: -12 |- ... -13 12 | value: int -14 13 | -15 14 | class TwoEllipsesClass: +9 | value: int +10 | +11 | class MyClass: + - ... +12 | value: int +13 | +14 | class TwoEllipsesClass: PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:16:5 @@ -71,15 +65,13 @@ PYI013 [*] Non-empty class body must not contain `...` 17 | ... # Error | help: Remove unnecessary `...` - -ℹ Safe fix -13 13 | value: int -14 14 | -15 15 | class TwoEllipsesClass: -16 |- ... -17 16 | ... # Error -18 17 | -19 18 | class DocstringClass: +13 | value: int +14 | +15 | class TwoEllipsesClass: + - ... +16 | ... # Error +17 | +18 | class DocstringClass: PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:17:5 @@ -92,16 +84,14 @@ PYI013 [*] Non-empty class body must not contain `...` 19 | class DocstringClass: | help: Remove unnecessary `...` - -ℹ Safe fix -14 14 | -15 15 | class TwoEllipsesClass: -16 16 | ... -17 |- ... # Error - 17 |+ # Error -18 18 | -19 19 | class DocstringClass: -20 20 | """ +14 | +15 | class TwoEllipsesClass: +16 | ... + - ... # Error +17 + # Error +18 | +19 | class DocstringClass: +20 | """ PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:24:5 @@ -114,16 +104,14 @@ PYI013 [*] Non-empty class body must not contain `...` 26 | class NonEmptyChild(Exception): | help: Remove unnecessary `...` - -ℹ Safe fix -21 21 | My body only contains an ellipsis. -22 22 | """ -23 23 | -24 |- ... # Error - 24 |+ # Error -25 25 | -26 26 | class NonEmptyChild(Exception): -27 27 | value: int +21 | My body only contains an ellipsis. +22 | """ +23 | + - ... # Error +24 + # Error +25 | +26 | class NonEmptyChild(Exception): +27 | value: int PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:28:5 @@ -136,16 +124,14 @@ PYI013 [*] Non-empty class body must not contain `...` 30 | class NonEmptyChild2(Exception): | help: Remove unnecessary `...` - -ℹ Safe fix -25 25 | -26 26 | class NonEmptyChild(Exception): -27 27 | value: int -28 |- ... # Error - 28 |+ # Error -29 29 | -30 30 | class NonEmptyChild2(Exception): -31 31 | ... # Error +25 | +26 | class NonEmptyChild(Exception): +27 | value: int + - ... # Error +28 + # Error +29 | +30 | class NonEmptyChild2(Exception): +31 | ... # Error PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:31:5 @@ -156,16 +142,14 @@ PYI013 [*] Non-empty class body must not contain `...` 32 | value: int | help: Remove unnecessary `...` - -ℹ Safe fix -28 28 | ... # Error -29 29 | -30 30 | class NonEmptyChild2(Exception): -31 |- ... # Error - 31 |+ # Error -32 32 | value: int -33 33 | -34 34 | class NonEmptyWithInit: +28 | ... # Error +29 | +30 | class NonEmptyChild2(Exception): + - ... # Error +31 + # Error +32 | value: int +33 | +34 | class NonEmptyWithInit: PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:36:5 @@ -178,16 +162,14 @@ PYI013 [*] Non-empty class body must not contain `...` 38 | def __init__(): | help: Remove unnecessary `...` - -ℹ Safe fix -33 33 | -34 34 | class NonEmptyWithInit: -35 35 | value: int -36 |- ... # Error - 36 |+ # Error -37 37 | -38 38 | def __init__(): -39 39 | pass +33 | +34 | class NonEmptyWithInit: +35 | value: int + - ... # Error +36 + # Error +37 | +38 | def __init__(): +39 | pass PYI013 [*] Non-empty class body must not contain `...` --> PYI013.pyi:43:5 @@ -200,13 +182,11 @@ PYI013 [*] Non-empty class body must not contain `...` 45 | # Not violations | help: Remove unnecessary `...` - -ℹ Safe fix -40 40 | -41 41 | class NonEmptyChildWithInlineComment: -42 42 | value: int -43 |- ... # preserve me - 43 |+ # preserve me -44 44 | -45 45 | # Not violations -46 46 | +40 | +41 | class NonEmptyChildWithInlineComment: +42 | value: int + - ... # preserve me +43 + # preserve me +44 | +45 | # Not violations +46 | diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap index d236b3a61a..6e479272d5 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI014_PYI014.pyi.snap @@ -12,15 +12,13 @@ PYI014 [*] Only simple default values allowed for arguments 5 | def f11(*, x="x") -> None: ... # OK | help: Replace default value with `...` - -ℹ Safe fix -1 1 | def f12( -2 2 | x, -3 |- y=os.pathsep, # Error PYI014 - 3 |+ y=..., # Error PYI014 -4 4 | ) -> None: ... -5 5 | def f11(*, x="x") -> None: ... # OK -6 6 | def f13( +1 | def f12( +2 | x, + - y=os.pathsep, # Error PYI014 +3 + y=..., # Error PYI014 +4 | ) -> None: ... +5 | def f11(*, x="x") -> None: ... # OK +6 | def f13( PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:29:7 @@ -37,19 +35,17 @@ PYI014 [*] Only simple default values allowed for arguments 34 | def f153( | help: Replace default value with `...` - -ℹ Safe fix -26 26 | ) -> None: ... -27 27 | def f151(x={1: 2}) -> None: ... -28 28 | def f152( -29 |- x={ # Error PYI014 -30 |- 1: 2, -31 |- **{3: 4}, -32 |- } - 29 |+ x=... -33 30 | ) -> None: ... -34 31 | def f153( -35 32 | x=[ # Error PYI014 +26 | ) -> None: ... +27 | def f151(x={1: 2}) -> None: ... +28 | def f152( + - x={ # Error PYI014 + - 1: 2, + - **{3: 4}, + - } +29 + x=... +30 | ) -> None: ... +31 | def f153( +32 | x=[ # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:35:7 @@ -75,28 +71,26 @@ PYI014 [*] Only simple default values allowed for arguments 49 | def f154( | help: Replace default value with `...` - -ℹ Safe fix -32 32 | } -33 33 | ) -> None: ... -34 34 | def f153( -35 |- x=[ # Error PYI014 -36 |- 1, -37 |- 2, -38 |- 3, -39 |- 4, -40 |- 5, -41 |- 6, -42 |- 7, -43 |- 8, -44 |- 9, -45 |- 10, -46 |- 11, -47 |- ] - 35 |+ x=... -48 36 | ) -> None: ... -49 37 | def f154( -50 38 | x=( # Error PYI014 +32 | } +33 | ) -> None: ... +34 | def f153( + - x=[ # Error PYI014 + - 1, + - 2, + - 3, + - 4, + - 5, + - 6, + - 7, + - 8, + - 9, + - 10, + - 11, + - ] +35 + x=... +36 | ) -> None: ... +37 | def f154( +38 | x=( # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:50:7 @@ -113,19 +107,17 @@ PYI014 [*] Only simple default values allowed for arguments 55 | def f141( | help: Replace default value with `...` - -ℹ Safe fix -47 47 | ] -48 48 | ) -> None: ... -49 49 | def f154( -50 |- x=( # Error PYI014 -51 |- "foo", -52 |- ("bar", "baz"), -53 |- ) - 50 |+ x=... -54 51 | ) -> None: ... -55 52 | def f141( -56 53 | x=[*range(10)], # Error PYI014 +47 | ] +48 | ) -> None: ... +49 | def f154( + - x=( # Error PYI014 + - "foo", + - ("bar", "baz"), + - ) +50 + x=... +51 | ) -> None: ... +52 | def f141( +53 | x=[*range(10)], # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:56:7 @@ -138,16 +130,14 @@ PYI014 [*] Only simple default values allowed for arguments 58 | def f142( | help: Replace default value with `...` - -ℹ Safe fix -53 53 | ) -54 54 | ) -> None: ... -55 55 | def f141( -56 |- x=[*range(10)], # Error PYI014 - 56 |+ x=..., # Error PYI014 -57 57 | ) -> None: ... -58 58 | def f142( -59 59 | x=list(range(10)), # Error PYI014 +53 | ) +54 | ) -> None: ... +55 | def f141( + - x=[*range(10)], # Error PYI014 +56 + x=..., # Error PYI014 +57 | ) -> None: ... +58 | def f142( +59 | x=list(range(10)), # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:59:7 @@ -160,16 +150,14 @@ PYI014 [*] Only simple default values allowed for arguments 61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ... # Error PYI014 | help: Replace default value with `...` - -ℹ Safe fix -56 56 | x=[*range(10)], # Error PYI014 -57 57 | ) -> None: ... -58 58 | def f142( -59 |- x=list(range(10)), # Error PYI014 - 59 |+ x=..., # Error PYI014 -60 60 | ) -> None: ... -61 61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ... # Error PYI014 -62 62 | def f17( +56 | x=[*range(10)], # Error PYI014 +57 | ) -> None: ... +58 | def f142( + - x=list(range(10)), # Error PYI014 +59 + x=..., # Error PYI014 +60 | ) -> None: ... +61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ... # Error PYI014 +62 | def f17( PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:61:11 @@ -182,16 +170,14 @@ PYI014 [*] Only simple default values allowed for arguments 63 | x="foo" + "bar", # Error PYI014 | help: Replace default value with `...` - -ℹ Safe fix -58 58 | def f142( -59 59 | x=list(range(10)), # Error PYI014 -60 60 | ) -> None: ... -61 |-def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ... # Error PYI014 - 61 |+def f16(x=...) -> None: ... # Error PYI014 -62 62 | def f17( -63 63 | x="foo" + "bar", # Error PYI014 -64 64 | ) -> None: ... +58 | def f142( +59 | x=list(range(10)), # Error PYI014 +60 | ) -> None: ... + - def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ... # Error PYI014 +61 + def f16(x=...) -> None: ... # Error PYI014 +62 | def f17( +63 | x="foo" + "bar", # Error PYI014 +64 | ) -> None: ... PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:63:7 @@ -204,16 +190,14 @@ PYI014 [*] Only simple default values allowed for arguments 65 | def f18( | help: Replace default value with `...` - -ℹ Safe fix -60 60 | ) -> None: ... -61 61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ... # Error PYI014 -62 62 | def f17( -63 |- x="foo" + "bar", # Error PYI014 - 63 |+ x=..., # Error PYI014 -64 64 | ) -> None: ... -65 65 | def f18( -66 66 | x=b"foo" + b"bar", # Error PYI014 +60 | ) -> None: ... +61 | def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ... # Error PYI014 +62 | def f17( + - x="foo" + "bar", # Error PYI014 +63 + x=..., # Error PYI014 +64 | ) -> None: ... +65 | def f18( +66 | x=b"foo" + b"bar", # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:66:7 @@ -226,16 +210,14 @@ PYI014 [*] Only simple default values allowed for arguments 68 | def f19( | help: Replace default value with `...` - -ℹ Safe fix -63 63 | x="foo" + "bar", # Error PYI014 -64 64 | ) -> None: ... -65 65 | def f18( -66 |- x=b"foo" + b"bar", # Error PYI014 - 66 |+ x=..., # Error PYI014 -67 67 | ) -> None: ... -68 68 | def f19( -69 69 | x="foo" + 4, # Error PYI014 +63 | x="foo" + "bar", # Error PYI014 +64 | ) -> None: ... +65 | def f18( + - x=b"foo" + b"bar", # Error PYI014 +66 + x=..., # Error PYI014 +67 | ) -> None: ... +68 | def f19( +69 | x="foo" + 4, # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:69:7 @@ -248,16 +230,14 @@ PYI014 [*] Only simple default values allowed for arguments 71 | def f20( | help: Replace default value with `...` - -ℹ Safe fix -66 66 | x=b"foo" + b"bar", # Error PYI014 -67 67 | ) -> None: ... -68 68 | def f19( -69 |- x="foo" + 4, # Error PYI014 - 69 |+ x=..., # Error PYI014 -70 70 | ) -> None: ... -71 71 | def f20( -72 72 | x=5 + 5, # Error PYI014 +66 | x=b"foo" + b"bar", # Error PYI014 +67 | ) -> None: ... +68 | def f19( + - x="foo" + 4, # Error PYI014 +69 + x=..., # Error PYI014 +70 | ) -> None: ... +71 | def f20( +72 | x=5 + 5, # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:72:7 @@ -270,16 +250,14 @@ PYI014 [*] Only simple default values allowed for arguments 74 | def f21( | help: Replace default value with `...` - -ℹ Safe fix -69 69 | x="foo" + 4, # Error PYI014 -70 70 | ) -> None: ... -71 71 | def f20( -72 |- x=5 + 5, # Error PYI014 - 72 |+ x=..., # Error PYI014 -73 73 | ) -> None: ... -74 74 | def f21( -75 75 | x=3j - 3j, # Error PYI014 +69 | x="foo" + 4, # Error PYI014 +70 | ) -> None: ... +71 | def f20( + - x=5 + 5, # Error PYI014 +72 + x=..., # Error PYI014 +73 | ) -> None: ... +74 | def f21( +75 | x=3j - 3j, # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:75:7 @@ -292,16 +270,14 @@ PYI014 [*] Only simple default values allowed for arguments 77 | def f22( | help: Replace default value with `...` - -ℹ Safe fix -72 72 | x=5 + 5, # Error PYI014 -73 73 | ) -> None: ... -74 74 | def f21( -75 |- x=3j - 3j, # Error PYI014 - 75 |+ x=..., # Error PYI014 -76 76 | ) -> None: ... -77 77 | def f22( -78 78 | x=-42.5j + 4.3j, # Error PYI014 +72 | x=5 + 5, # Error PYI014 +73 | ) -> None: ... +74 | def f21( + - x=3j - 3j, # Error PYI014 +75 + x=..., # Error PYI014 +76 | ) -> None: ... +77 | def f22( +78 | x=-42.5j + 4.3j, # Error PYI014 PYI014 [*] Only simple default values allowed for arguments --> PYI014.pyi:78:7 @@ -314,13 +290,11 @@ PYI014 [*] Only simple default values allowed for arguments 80 | def f23( | help: Replace default value with `...` - -ℹ Safe fix -75 75 | x=3j - 3j, # Error PYI014 -76 76 | ) -> None: ... -77 77 | def f22( -78 |- x=-42.5j + 4.3j, # Error PYI014 - 78 |+ x=..., # Error PYI014 -79 79 | ) -> None: ... -80 80 | def f23( -81 81 | x=True, # OK +75 | x=3j - 3j, # Error PYI014 +76 | ) -> None: ... +77 | def f22( + - x=-42.5j + 4.3j, # Error PYI014 +78 + x=..., # Error PYI014 +79 | ) -> None: ... +80 | def f23( +81 | x=True, # OK diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap index 6bdd007b88..f919f48b08 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI015_PYI015.pyi.snap @@ -11,16 +11,14 @@ PYI015 [*] Only simple default values allowed for assignments 46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -41 41 | field22: Final = {"foo": 5} -42 42 | -43 43 | # We *should* emit Y015 for more complex default values -44 |-field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments - 44 |+field221: list[int] = ... # Y015 Only simple default values are allowed for assignments -45 45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments -46 46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments -47 47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments +41 | field22: Final = {"foo": 5} +42 | +43 | # We *should* emit Y015 for more complex default values + - field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments +44 + field221: list[int] = ... # Y015 Only simple default values are allowed for assignments +45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments +46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments +47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:45:23 @@ -33,16 +31,14 @@ PYI015 [*] Only simple default values allowed for assignments 47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -42 42 | -43 43 | # We *should* emit Y015 for more complex default values -44 44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments -45 |-field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments - 45 |+field223: list[int] = ... # Y015 Only simple default values are allowed for assignments -46 46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments -47 47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments -48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments +42 | +43 | # We *should* emit Y015 for more complex default values +44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments + - field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments +45 + field223: list[int] = ... # Y015 Only simple default values are allowed for assignments +46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments +47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments +48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:46:23 @@ -55,16 +51,14 @@ PYI015 [*] Only simple default values allowed for assignments 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -43 43 | # We *should* emit Y015 for more complex default values -44 44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments -45 45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments -46 |-field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments - 46 |+field224: list[int] = ... # Y015 Only simple default values are allowed for assignments -47 47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments -48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments -49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments +43 | # We *should* emit Y015 for more complex default values +44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments +45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments + - field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments +46 + field224: list[int] = ... # Y015 Only simple default values are allowed for assignments +47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments +48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments +49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:47:26 @@ -77,16 +71,14 @@ PYI015 [*] Only simple default values allowed for assignments 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -44 44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments -45 45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments -46 46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments -47 |-field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments - 47 |+field225: list[object] = ... # Y015 Only simple default values are allowed for assignments -48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments -49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments -50 50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments +44 | field221: list[int] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # Y015 Only simple default values are allowed for assignments +45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments +46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments + - field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments +47 + field225: list[object] = ... # Y015 Only simple default values are allowed for assignments +48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments +49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments +50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:48:47 @@ -99,16 +91,14 @@ PYI015 [*] Only simple default values allowed for assignments 50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -45 45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments -46 46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments -47 47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments -48 |-field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments - 48 |+field226: tuple[str | tuple[str, ...], ...] = ... # Y015 Only simple default values are allowed for assignments -49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments -50 50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments -51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node +45 | field223: list[int] = [*range(10)] # Y015 Only simple default values are allowed for assignments +46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments +47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments + - field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments +48 + field226: tuple[str | tuple[str, ...], ...] = ... # Y015 Only simple default values are allowed for assignments +49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments +50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments +51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:49:31 @@ -121,16 +111,14 @@ PYI015 [*] Only simple default values allowed for assignments 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node | help: Replace default value with `...` - -ℹ Safe fix -46 46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments -47 47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments -48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments -49 |-field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments - 49 |+field227: dict[str, object] = ... # Y015 Only simple default values are allowed for assignments -50 50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments -51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node -52 52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments +46 | field224: list[int] = list(range(10)) # Y015 Only simple default values are allowed for assignments +47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments +48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments + - field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments +49 + field227: dict[str, object] = ... # Y015 Only simple default values are allowed for assignments +50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments +51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node +52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:50:37 @@ -143,16 +131,14 @@ PYI015 [*] Only simple default values allowed for assignments 52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -47 47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments -48 48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments -49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments -50 |-field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments - 50 |+field228: dict[str, list[object]] = ... # Y015 Only simple default values are allowed for assignments -51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node -52 52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments -53 53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments +47 | field225: list[object] = [{}, 1, 2] # Y015 Only simple default values are allowed for assignments +48 | field226: tuple[str | tuple[str, ...], ...] = ("foo", ("foo", "bar")) # Y015 Only simple default values are allowed for assignments +49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments + - field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments +50 + field228: dict[str, list[object]] = ... # Y015 Only simple default values are allowed for assignments +51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node +52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments +53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:52:28 @@ -165,16 +151,14 @@ PYI015 [*] Only simple default values allowed for assignments 54 | field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -49 49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments -50 50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments -51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node -52 |-field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments - 52 |+field229: dict[int, int] = ... # Y015 Only simple default values are allowed for assignments -53 53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments -54 54 | field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments -55 55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments +49 | field227: dict[str, object] = {"foo": {"foo": "bar"}} # Y015 Only simple default values are allowed for assignments +50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments +51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node + - field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments +52 + field229: dict[int, int] = ... # Y015 Only simple default values are allowed for assignments +53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments +54 | field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments +55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:53:11 @@ -187,16 +171,14 @@ PYI015 [*] Only simple default values allowed for assignments 55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -50 50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments -51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node -52 52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments -53 |-field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments - 53 |+field23 = ... # Y015 Only simple default values are allowed for assignments -54 54 | field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments -55 55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments -56 56 | +50 | field228: dict[str, list[object]] = {"foo": []} # Y015 Only simple default values are allowed for assignments +51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node +52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments + - field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments +53 + field23 = ... # Y015 Only simple default values are allowed for assignments +54 | field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments +55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments +56 | PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:54:11 @@ -208,16 +190,14 @@ PYI015 [*] Only simple default values allowed for assignments 55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments | help: Replace default value with `...` - -ℹ Safe fix -51 51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node -52 52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments -53 53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments -54 |-field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments - 54 |+field24 = ... # Y015 Only simple default values are allowed for assignments -55 55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments -56 56 | -57 57 | # We shouldn't emit Y015 within functions +51 | # When parsed, this case results in `None` being placed in the `.keys` list for the `ast.Dict` node +52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments +53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments + - field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments +54 + field24 = ... # Y015 Only simple default values are allowed for assignments +55 | field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments +56 | +57 | # We shouldn't emit Y015 within functions PYI015 [*] Only simple default values allowed for assignments --> PYI015.pyi:55:11 @@ -230,13 +210,11 @@ PYI015 [*] Only simple default values allowed for assignments 57 | # We shouldn't emit Y015 within functions | help: Replace default value with `...` - -ℹ Safe fix -52 52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments -53 53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments -54 54 | field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments -55 |-field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments - 55 |+field25 = ... # Y015 Only simple default values are allowed for assignments -56 56 | -57 57 | # We shouldn't emit Y015 within functions -58 58 | def f(): +52 | field229: dict[int, int] = {1: 2, **{3: 4}} # Y015 Only simple default values are allowed for assignments +53 | field23 = "foo" + "bar" # Y015 Only simple default values are allowed for assignments +54 | field24 = b"foo" + b"bar" # Y015 Only simple default values are allowed for assignments + - field25 = 5 * 5 # Y015 Only simple default values are allowed for assignments +55 + field25 = ... # Y015 Only simple default values are allowed for assignments +56 | +57 | # We shouldn't emit Y015 within functions +58 | def f(): diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap index ad83ac3daa..f6cc519c39 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.py.snap @@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str` 9 | # Should emit for union types in arguments. | help: Remove duplicate union member `str` - -ℹ Safe fix -4 4 | field1: str -5 5 | -6 6 | # Should emit for duplicate field types. -7 |-field2: str | str # PYI016: Duplicate union member `str` - 7 |+field2: str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` +4 | field1: str +5 | +6 | # Should emit for duplicate field types. + - field2: str | str # PYI016: Duplicate union member `str` +7 + field2: str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. +10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:10:23 @@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int` 11 | print(arg1) | help: Remove duplicate union member `int` - -ℹ Safe fix -7 7 | field2: str | str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 |-def func1(arg1: int | int): # PYI016: Duplicate union member `int` - 10 |+def func1(arg1: int): # PYI016: Duplicate union member `int` -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. +7 | field2: str | str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. + - def func1(arg1: int | int): # PYI016: Duplicate union member `int` +10 + def func1(arg1: int): # PYI016: Duplicate union member `int` +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. PYI016 [*] Duplicate union member `str` --> PYI016.py:14:22 @@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str` 15 | return "my string" | help: Remove duplicate union member `str` - -ℹ Safe fix -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. -14 |-def func2() -> str | str: # PYI016: Duplicate union member `str` - 14 |+def func2() -> str: # PYI016: Duplicate union member `str` -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. + - def func2() -> str | str: # PYI016: Duplicate union member `str` +14 + def func2() -> str: # PYI016: Duplicate union member `str` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. PYI016 [*] Duplicate union member `str` --> PYI016.py:18:15 @@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str` 20 | field5: str | int | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `str` - -ℹ Safe fix -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 |-field3: str | str | int # PYI016: Duplicate union member `str` - 18 |+field3: str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. + - field3: str | str | int # PYI016: Duplicate union member `str` +18 + field3: str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:19:15 @@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `int` - -ℹ Safe fix -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 |-field4: int | int | str # PYI016: Duplicate union member `int` - 19 |+field4: int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | +16 | +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` + - field4: int | int | str # PYI016: Duplicate union member `int` +19 + field4: int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | PYI016 [*] Duplicate union member `str` --> PYI016.py:20:21 @@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `str` - -ℹ Safe fix -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 |-field5: str | int | str # PYI016: Duplicate union member `str` - 20 |+field5: str | int # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` + - field5: str | int | str # PYI016: Duplicate union member `str` +20 + field5: str | int # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. PYI016 [*] Duplicate union member `int` --> PYI016.py:21:28 @@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int` 23 | # Shouldn't emit for non-type unions. | help: Remove duplicate union member `int` - -ℹ Safe fix -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 |-field6: int | bool | str | int # PYI016: Duplicate union member `int` - 21 |+field6: int | bool | str # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. -24 24 | field7 = str | str +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` + - field6: int | bool | str | int # PYI016: Duplicate union member `int` +21 + field6: int | bool | str # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. +24 | field7 = str | str PYI016 [*] Duplicate union member `int` --> PYI016.py:27:22 @@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int` 29 | # Should handle user brackets when fixing. | help: Remove duplicate union member `int` - -ℹ Safe fix -24 24 | field7 = str | str -25 25 | -26 26 | # Should emit for strangely-bracketed unions. -27 |-field8: int | (str | int) # PYI016: Duplicate union member `int` - 27 |+field8: int | str # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` +24 | field7 = str | str +25 | +26 | # Should emit for strangely-bracketed unions. + - field8: int | (str | int) # PYI016: Duplicate union member `int` +27 + field8: int | str # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:30:16 @@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int` 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `int` - -ℹ Safe fix -27 27 | field8: int | (str | int) # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 |-field9: int | (int | str) # PYI016: Duplicate union member `int` - 30 |+field9: int | str # PYI016: Duplicate union member `int` -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. +27 | field8: int | (str | int) # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. + - field9: int | (int | str) # PYI016: Duplicate union member `int` +30 + field9: int | str # PYI016: Duplicate union member `int` +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. PYI016 [*] Duplicate union member `str` --> PYI016.py:31:24 @@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str` 33 | # Should emit for nested unions. | help: Remove duplicate union member `str` - -ℹ Safe fix -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` -31 |-field10: (str | int) | str # PYI016: Duplicate union member `str` - 31 |+field10: str | int # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 34 | field11: dict[int | int, str] +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` + - field10: (str | int) | str # PYI016: Duplicate union member `str` +31 + field10: str | int # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. +34 | field11: dict[int | int, str] PYI016 [*] Duplicate union member `int` --> PYI016.py:34:21 @@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int` 36 | # Should emit for unions with more than two cases | help: Remove duplicate union member `int` - -ℹ Safe fix -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 |-field11: dict[int | int, str] - 34 |+field11: dict[int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. + - field11: dict[int | int, str] +34 + field11: dict[int, str] +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:37:16 @@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.py:37:22 @@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.py:38:16 @@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:38:22 @@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:38:28 @@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:41:16 @@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:41:28 @@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `typing.Literal[1]` --> PYI016.py:44:30 @@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]` 46 | # Shouldn't emit if in new parent type | help: Remove duplicate union member `typing.Literal[1]` - -ℹ Safe fix -41 41 | field14: int | int | str | int # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 |-field15: typing.Literal[1] | typing.Literal[1] # Error - 44 |+field15: typing.Literal[1] # Error -45 45 | -46 46 | # Shouldn't emit if in new parent type -47 47 | field16: int | dict[int, str] # OK +41 | field14: int | int | str | int # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 + - field15: typing.Literal[1] | typing.Literal[1] # Error +44 + field15: typing.Literal[1] # Error +45 | +46 | # Shouldn't emit if in new parent type +47 | field16: int | dict[int, str] # OK PYI016 [*] Duplicate union member `set[int]` --> PYI016.py:57:5 @@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]` 60 | ] # Error, newline and comment will not be emitted in message | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -50 50 | field17: dict[int, int] # OK -51 51 | -52 52 | # Should emit in cases with newlines -53 |-field18: typing.Union[ -54 |- set[ -55 |- int # foo -56 |- ], -57 |- set[ -58 |- int # bar -59 |- ], -60 |-] # Error, newline and comment will not be emitted in message - 53 |+field18: set[int] # Error, newline and comment will not be emitted in message -61 54 | -62 55 | # Should emit in cases with `typing.Union` instead of `|` -63 56 | field19: typing.Union[int, int] # Error +50 | field17: dict[int, int] # OK +51 | +52 | # Should emit in cases with newlines + - field18: typing.Union[ + - set[ + - int # foo + - ], + - set[ + - int # bar + - ], + - ] # Error, newline and comment will not be emitted in message +53 + field18: set[int] # Error, newline and comment will not be emitted in message +54 | +55 | # Should emit in cases with `typing.Union` instead of `|` +56 | field19: typing.Union[int, int] # Error +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.py:63:28 @@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int` 65 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -60 60 | ] # Error, newline and comment will not be emitted in message -61 61 | -62 62 | # Should emit in cases with `typing.Union` instead of `|` -63 |-field19: typing.Union[int, int] # Error - 63 |+field19: int # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error +60 | ] # Error, newline and comment will not be emitted in message +61 | +62 | # Should emit in cases with `typing.Union` instead of `|` + - field19: typing.Union[int, int] # Error +63 + field19: int # Error +64 | +65 | # Should emit in cases with nested `typing.Union` +66 | field20: typing.Union[int, typing.Union[int, str]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:66:41 @@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int` 68 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -63 63 | field19: typing.Union[int, int] # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 |-field20: typing.Union[int, typing.Union[int, str]] # Error - 66 |+field20: typing.Union[int, str] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 69 | field21: typing.Union[int, int | str] # Error +63 | field19: typing.Union[int, int] # Error +64 | +65 | # Should emit in cases with nested `typing.Union` + - field20: typing.Union[int, typing.Union[int, str]] # Error +66 + field20: typing.Union[int, str] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` +69 | field21: typing.Union[int, int | str] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:69:28 @@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int` 71 | # Should emit only once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 |-field21: typing.Union[int, int | str] # Error - 69 |+field21: int | str # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +66 | field20: typing.Union[int, typing.Union[int, str]] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` + - field21: typing.Union[int, int | str] # Error +69 + field21: int | str # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:72:41 @@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.py:72:59 @@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.py:72:64 @@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `set[int]` --> PYI016.py:76:12 @@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]` 78 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 |-field23: set[ # foo -76 |- int] | set[int] - 75 |+field23: set[int] -77 76 | -78 77 | # Should emit twice (once for each `int` in the nested union, both of which are -79 78 | # duplicates of the outer `int`), but not three times (which would indicate that +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +73 | +74 | # Should emit in cases with newlines + - field23: set[ # foo + - int] | set[int] +75 + field23: set[int] +76 | +77 | # Should emit twice (once for each `int` in the nested union, both of which are +78 | # duplicates of the outer `int`), but not three times (which would indicate that +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.py:81:41 @@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.py:81:46 @@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.py:86:28 @@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:86:34 @@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:89:41 @@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int` 91 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -86 86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 |-field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` - 89 |+field26: int # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` + - field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +89 + field26: int # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:92:54 @@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int` 94 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 |-field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` - 92 |+field27: int # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 95 | field28: typing.Union[int | int] # Error +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` + - field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +92 + field27: int # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` +95 | field28: typing.Union[int | int] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:95:29 @@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int` 97 | # Should emit twice in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 |-field28: typing.Union[int | int] # Error - 95 |+field28: int # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` + - field28: typing.Union[int | int] # Error +95 + field28: int # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:98:54 @@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:98:59 @@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:101:54 @@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int` 103 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error - 101 |+field30: typing.Union[int, str] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` + - field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +101 + field30: typing.Union[int, str] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` +104 | field31: typing.Union[float, typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:104:49 @@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int` 106 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 |-field31: typing.Union[float, typing.Union[int | int]] # Error - 104 |+field31: float | int # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` + - field31: typing.Union[float, typing.Union[int | int]] # Error +104 + field31: float | int # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:107:49 @@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:107:55 @@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:110:42 @@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:110:62 @@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:110:68 @@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `list[int]` --> PYI016.py:113:61 @@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]` 115 | field35: "int | str | int" # Error | help: Remove duplicate union member `list[int]` - -ℹ Safe fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error -111 111 | -112 112 | # Test case for mixed union type -113 |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error - 113 |+field34: typing.Union[list[int], str, bytes] # Error -114 114 | -115 115 | field35: "int | str | int" # Error -116 116 | +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +111 | +112 | # Test case for mixed union type + - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +113 + field34: typing.Union[list[int], str, bytes] # Error +114 | +115 | field35: "int | str | int" # Error +116 | PYI016 [*] Duplicate union member `int` --> PYI016.py:115:23 @@ -950,16 +864,14 @@ PYI016 [*] Duplicate union member `int` | ^^^ | help: Remove duplicate union member `int` - -ℹ Safe fix -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error -114 114 | -115 |-field35: "int | str | int" # Error - 115 |+field35: "int | str" # Error -116 116 | -117 117 | -118 118 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +114 | + - field35: "int | str | int" # Error +115 + field35: "int | str" # Error +116 | +117 | +118 | PYI016 [*] Duplicate union member `typing.Optional[int]` --> PYI016.py:134:45 @@ -972,16 +884,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]` 136 | field44: typing.Optional[int | None] | help: Remove duplicate union member `typing.Optional[int]` - -ℹ Safe fix -131 131 | # equivalent to int | None -132 132 | field40: typing.Union[typing.Optional[int], None] -133 133 | field41: typing.Optional[typing.Union[int, None]] -134 |-field42: typing.Union[typing.Optional[int], typing.Optional[int]] - 134 |+field42: typing.Optional[int] -135 135 | field43: typing.Optional[int] | None -136 136 | field44: typing.Optional[int | None] -137 137 | field45: typing.Optional[int] | typing.Optional[int] +131 | # equivalent to int | None +132 | field40: typing.Union[typing.Optional[int], None] +133 | field41: typing.Optional[typing.Union[int, None]] + - field42: typing.Union[typing.Optional[int], typing.Optional[int]] +134 + field42: typing.Optional[int] +135 | field43: typing.Optional[int] | None +136 | field44: typing.Optional[int | None] +137 | field45: typing.Optional[int] | typing.Optional[int] PYI016 [*] Duplicate union member `typing.Optional[int]` --> PYI016.py:137:33 @@ -994,16 +904,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]` 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] | help: Remove duplicate union member `typing.Optional[int]` - -ℹ Safe fix -134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -135 135 | field43: typing.Optional[int] | None -136 136 | field44: typing.Optional[int | None] -137 |-field45: typing.Optional[int] | typing.Optional[int] - 137 |+field45: typing.Optional[int] -138 138 | # equivalent to int | dict | None -139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -140 140 | field47: typing.Optional[int] | typing.Optional[dict] +134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +135 | field43: typing.Optional[int] | None +136 | field44: typing.Optional[int | None] + - field45: typing.Optional[int] | typing.Optional[int] +137 + field45: typing.Optional[int] +138 | # equivalent to int | dict | None +139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +140 | field47: typing.Optional[int] | typing.Optional[dict] PYI016 [*] Duplicate union member `complex` --> PYI016.py:143:61 @@ -1014,16 +922,14 @@ PYI016 [*] Duplicate union member `complex` 144 | field49: typing.Optional[complex | complex] | complex | help: Remove duplicate union member `complex` - -ℹ Safe fix -140 140 | field47: typing.Optional[int] | typing.Optional[dict] -141 141 | -142 142 | # avoid reporting twice -143 |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] - 143 |+field48: typing.Union[typing.Optional[complex], complex] -144 144 | field49: typing.Optional[complex | complex] | complex -145 145 | -146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 +140 | field47: typing.Optional[int] | typing.Optional[dict] +141 | +142 | # avoid reporting twice + - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +143 + field48: typing.Union[typing.Optional[complex], complex] +144 | field49: typing.Optional[complex | complex] | complex +145 | +146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 PYI016 [*] Duplicate union member `complex` --> PYI016.py:144:36 @@ -1036,16 +942,14 @@ PYI016 [*] Duplicate union member `complex` 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 | help: Remove duplicate union member `complex` - -ℹ Safe fix -141 141 | -142 142 | # avoid reporting twice -143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] -144 |-field49: typing.Optional[complex | complex] | complex - 144 |+field49: typing.Optional[complex] | complex -145 145 | -146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 -147 147 | # Should throw duplicate union member but not fix +141 | +142 | # avoid reporting twice +143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] + - field49: typing.Optional[complex | complex] | complex +144 + field49: typing.Optional[complex] | complex +145 | +146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 +147 | # Should throw duplicate union member but not fix PYI016 Duplicate union member `None` --> PYI016.py:148:37 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap index a90d84ca63..21ae9d7404 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI016_PYI016.pyi.snap @@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str` 9 | # Should emit for union types in arguments. | help: Remove duplicate union member `str` - -ℹ Safe fix -4 4 | field1: str -5 5 | -6 6 | # Should emit for duplicate field types. -7 |-field2: str | str # PYI016: Duplicate union member `str` - 7 |+field2: str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` +4 | field1: str +5 | +6 | # Should emit for duplicate field types. + - field2: str | str # PYI016: Duplicate union member `str` +7 + field2: str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. +10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:10:23 @@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int` 11 | print(arg1) | help: Remove duplicate union member `int` - -ℹ Safe fix -7 7 | field2: str | str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 |-def func1(arg1: int | int): # PYI016: Duplicate union member `int` - 10 |+def func1(arg1: int): # PYI016: Duplicate union member `int` -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. +7 | field2: str | str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. + - def func1(arg1: int | int): # PYI016: Duplicate union member `int` +10 + def func1(arg1: int): # PYI016: Duplicate union member `int` +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. PYI016 [*] Duplicate union member `str` --> PYI016.pyi:14:22 @@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str` 15 | return "my string" | help: Remove duplicate union member `str` - -ℹ Safe fix -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. -14 |-def func2() -> str | str: # PYI016: Duplicate union member `str` - 14 |+def func2() -> str: # PYI016: Duplicate union member `str` -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. + - def func2() -> str | str: # PYI016: Duplicate union member `str` +14 + def func2() -> str: # PYI016: Duplicate union member `str` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. PYI016 [*] Duplicate union member `str` --> PYI016.pyi:18:15 @@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str` 20 | field5: str | int | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `str` - -ℹ Safe fix -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 |-field3: str | str | int # PYI016: Duplicate union member `str` - 18 |+field3: str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. + - field3: str | str | int # PYI016: Duplicate union member `str` +18 + field3: str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:19:15 @@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `int` - -ℹ Safe fix -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 |-field4: int | int | str # PYI016: Duplicate union member `int` - 19 |+field4: int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | +16 | +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` + - field4: int | int | str # PYI016: Duplicate union member `int` +19 + field4: int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | PYI016 [*] Duplicate union member `str` --> PYI016.pyi:20:21 @@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `str` - -ℹ Safe fix -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 |-field5: str | int | str # PYI016: Duplicate union member `str` - 20 |+field5: str | int # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` + - field5: str | int | str # PYI016: Duplicate union member `str` +20 + field5: str | int # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. PYI016 [*] Duplicate union member `int` --> PYI016.pyi:21:28 @@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int` 23 | # Shouldn't emit for non-type unions. | help: Remove duplicate union member `int` - -ℹ Safe fix -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 |-field6: int | bool | str | int # PYI016: Duplicate union member `int` - 21 |+field6: int | bool | str # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. -24 24 | field7 = str | str +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` + - field6: int | bool | str | int # PYI016: Duplicate union member `int` +21 + field6: int | bool | str # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. +24 | field7 = str | str PYI016 [*] Duplicate union member `int` --> PYI016.pyi:27:22 @@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int` 29 | # Should handle user brackets when fixing. | help: Remove duplicate union member `int` - -ℹ Safe fix -24 24 | field7 = str | str -25 25 | -26 26 | # Should emit for strangely-bracketed unions. -27 |-field8: int | (str | int) # PYI016: Duplicate union member `int` - 27 |+field8: int | str # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` +24 | field7 = str | str +25 | +26 | # Should emit for strangely-bracketed unions. + - field8: int | (str | int) # PYI016: Duplicate union member `int` +27 + field8: int | str # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:30:16 @@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int` 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `int` - -ℹ Safe fix -27 27 | field8: int | (str | int) # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 |-field9: int | (int | str) # PYI016: Duplicate union member `int` - 30 |+field9: int | str # PYI016: Duplicate union member `int` -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. +27 | field8: int | (str | int) # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. + - field9: int | (int | str) # PYI016: Duplicate union member `int` +30 + field9: int | str # PYI016: Duplicate union member `int` +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. PYI016 [*] Duplicate union member `str` --> PYI016.pyi:31:24 @@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str` 33 | # Should emit for nested unions. | help: Remove duplicate union member `str` - -ℹ Safe fix -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` -31 |-field10: (str | int) | str # PYI016: Duplicate union member `str` - 31 |+field10: str | int # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 34 | field11: dict[int | int, str] +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` + - field10: (str | int) | str # PYI016: Duplicate union member `str` +31 + field10: str | int # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. +34 | field11: dict[int | int, str] PYI016 [*] Duplicate union member `int` --> PYI016.pyi:34:21 @@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int` 36 | # Should emit for unions with more than two cases | help: Remove duplicate union member `int` - -ℹ Safe fix -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 |-field11: dict[int | int, str] - 34 |+field11: dict[int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. + - field11: dict[int | int, str] +34 + field11: dict[int, str] +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:37:16 @@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.pyi:37:22 @@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.pyi:38:16 @@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:38:22 @@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:38:28 @@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:41:16 @@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:41:28 @@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `typing.Literal[1]` --> PYI016.pyi:44:30 @@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]` 46 | # Shouldn't emit if in new parent type | help: Remove duplicate union member `typing.Literal[1]` - -ℹ Safe fix -41 41 | field14: int | int | str | int # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 |-field15: typing.Literal[1] | typing.Literal[1] # Error - 44 |+field15: typing.Literal[1] # Error -45 45 | -46 46 | # Shouldn't emit if in new parent type -47 47 | field16: int | dict[int, str] # OK +41 | field14: int | int | str | int # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 + - field15: typing.Literal[1] | typing.Literal[1] # Error +44 + field15: typing.Literal[1] # Error +45 | +46 | # Shouldn't emit if in new parent type +47 | field16: int | dict[int, str] # OK PYI016 [*] Duplicate union member `set[int]` --> PYI016.pyi:57:5 @@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]` 60 | ] # Error, newline and comment will not be emitted in message | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -50 50 | field17: dict[int, int] # OK -51 51 | -52 52 | # Should emit in cases with newlines -53 |-field18: typing.Union[ -54 |- set[ -55 |- int # foo -56 |- ], -57 |- set[ -58 |- int # bar -59 |- ], -60 |-] # Error, newline and comment will not be emitted in message - 53 |+field18: set[int] # Error, newline and comment will not be emitted in message -61 54 | -62 55 | # Should emit in cases with `typing.Union` instead of `|` -63 56 | field19: typing.Union[int, int] # Error +50 | field17: dict[int, int] # OK +51 | +52 | # Should emit in cases with newlines + - field18: typing.Union[ + - set[ + - int # foo + - ], + - set[ + - int # bar + - ], + - ] # Error, newline and comment will not be emitted in message +53 + field18: set[int] # Error, newline and comment will not be emitted in message +54 | +55 | # Should emit in cases with `typing.Union` instead of `|` +56 | field19: typing.Union[int, int] # Error +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.pyi:63:28 @@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int` 65 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -60 60 | ] # Error, newline and comment will not be emitted in message -61 61 | -62 62 | # Should emit in cases with `typing.Union` instead of `|` -63 |-field19: typing.Union[int, int] # Error - 63 |+field19: int # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error +60 | ] # Error, newline and comment will not be emitted in message +61 | +62 | # Should emit in cases with `typing.Union` instead of `|` + - field19: typing.Union[int, int] # Error +63 + field19: int # Error +64 | +65 | # Should emit in cases with nested `typing.Union` +66 | field20: typing.Union[int, typing.Union[int, str]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:66:41 @@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int` 68 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -63 63 | field19: typing.Union[int, int] # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 |-field20: typing.Union[int, typing.Union[int, str]] # Error - 66 |+field20: typing.Union[int, str] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 69 | field21: typing.Union[int, int | str] # Error +63 | field19: typing.Union[int, int] # Error +64 | +65 | # Should emit in cases with nested `typing.Union` + - field20: typing.Union[int, typing.Union[int, str]] # Error +66 + field20: typing.Union[int, str] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` +69 | field21: typing.Union[int, int | str] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:69:28 @@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int` 71 | # Should emit only once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 |-field21: typing.Union[int, int | str] # Error - 69 |+field21: int | str # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +66 | field20: typing.Union[int, typing.Union[int, str]] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` + - field21: typing.Union[int, int | str] # Error +69 + field21: int | str # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:72:41 @@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.pyi:72:59 @@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.pyi:72:64 @@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `set[int]` --> PYI016.pyi:76:12 @@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]` 78 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 |-field23: set[ # foo -76 |- int] | set[int] - 75 |+field23: set[int] -77 76 | -78 77 | # Should emit twice (once for each `int` in the nested union, both of which are -79 78 | # duplicates of the outer `int`), but not three times (which would indicate that +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +73 | +74 | # Should emit in cases with newlines + - field23: set[ # foo + - int] | set[int] +75 + field23: set[int] +76 | +77 | # Should emit twice (once for each `int` in the nested union, both of which are +78 | # duplicates of the outer `int`), but not three times (which would indicate that +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.pyi:81:41 @@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.pyi:81:46 @@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.pyi:86:28 @@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:86:34 @@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:89:41 @@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int` 91 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -86 86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 |-field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` - 89 |+field26: int # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` + - field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +89 + field26: int # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:92:54 @@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int` 94 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 |-field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` - 92 |+field27: int # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 95 | field28: typing.Union[int | int] # Error +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` + - field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +92 + field27: int # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` +95 | field28: typing.Union[int | int] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:95:29 @@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int` 97 | # Should emit twice in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 |-field28: typing.Union[int | int] # Error - 95 |+field28: int # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` + - field28: typing.Union[int | int] # Error +95 + field28: int # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:98:54 @@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:98:59 @@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:101:54 @@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int` 103 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error - 101 |+field30: typing.Union[int, str] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` + - field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +101 + field30: typing.Union[int, str] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` +104 | field31: typing.Union[float, typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:104:49 @@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int` 106 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 |-field31: typing.Union[float, typing.Union[int | int]] # Error - 104 |+field31: float | int # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` + - field31: typing.Union[float, typing.Union[int | int]] # Error +104 + field31: float | int # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:107:49 @@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:107:55 @@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:110:42 @@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:110:62 @@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:110:68 @@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `list[int]` --> PYI016.pyi:113:61 @@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]` 115 | # https://github.com/astral-sh/ruff/issues/18546 | help: Remove duplicate union member `list[int]` - -ℹ Safe fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error -111 111 | -112 112 | # Test case for mixed union type -113 |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error - 113 |+field34: typing.Union[list[int], str, bytes] # Error -114 114 | -115 115 | # https://github.com/astral-sh/ruff/issues/18546 -116 116 | # Expand Optional[T] to Union[T, None] +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +111 | +112 | # Test case for mixed union type + - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +113 + field34: typing.Union[list[int], str, bytes] # Error +114 | +115 | # https://github.com/astral-sh/ruff/issues/18546 +116 | # Expand Optional[T] to Union[T, None] PYI016 [*] Duplicate union member `typing.Optional[int]` --> PYI016.pyi:125:45 @@ -952,16 +866,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]` 127 | field44: typing.Optional[int | None] | help: Remove duplicate union member `typing.Optional[int]` - -ℹ Safe fix -122 122 | # equivalent to int | None -123 123 | field40: typing.Union[typing.Optional[int], None] -124 124 | field41: typing.Optional[typing.Union[int, None]] -125 |-field42: typing.Union[typing.Optional[int], typing.Optional[int]] - 125 |+field42: typing.Optional[int] -126 126 | field43: typing.Optional[int] | None -127 127 | field44: typing.Optional[int | None] -128 128 | field45: typing.Optional[int] | typing.Optional[int] +122 | # equivalent to int | None +123 | field40: typing.Union[typing.Optional[int], None] +124 | field41: typing.Optional[typing.Union[int, None]] + - field42: typing.Union[typing.Optional[int], typing.Optional[int]] +125 + field42: typing.Optional[int] +126 | field43: typing.Optional[int] | None +127 | field44: typing.Optional[int | None] +128 | field45: typing.Optional[int] | typing.Optional[int] PYI016 [*] Duplicate union member `typing.Optional[int]` --> PYI016.pyi:128:33 @@ -974,16 +886,14 @@ PYI016 [*] Duplicate union member `typing.Optional[int]` 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] | help: Remove duplicate union member `typing.Optional[int]` - -ℹ Safe fix -125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -126 126 | field43: typing.Optional[int] | None -127 127 | field44: typing.Optional[int | None] -128 |-field45: typing.Optional[int] | typing.Optional[int] - 128 |+field45: typing.Optional[int] -129 129 | # equivalent to int | dict | None -130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -131 131 | field47: typing.Optional[int] | typing.Optional[dict] +125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +126 | field43: typing.Optional[int] | None +127 | field44: typing.Optional[int | None] + - field45: typing.Optional[int] | typing.Optional[int] +128 + field45: typing.Optional[int] +129 | # equivalent to int | dict | None +130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +131 | field47: typing.Optional[int] | typing.Optional[dict] PYI016 [*] Duplicate union member `complex` --> PYI016.pyi:134:61 @@ -994,14 +904,12 @@ PYI016 [*] Duplicate union member `complex` 135 | field49: typing.Optional[complex | complex] | complex | help: Remove duplicate union member `complex` - -ℹ Safe fix -131 131 | field47: typing.Optional[int] | typing.Optional[dict] -132 132 | -133 133 | # avoid reporting twice -134 |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] - 134 |+field48: typing.Union[typing.Optional[complex], complex] -135 135 | field49: typing.Optional[complex | complex] | complex +131 | field47: typing.Optional[int] | typing.Optional[dict] +132 | +133 | # avoid reporting twice + - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +134 + field48: typing.Union[typing.Optional[complex], complex] +135 | field49: typing.Optional[complex | complex] | complex PYI016 [*] Duplicate union member `complex` --> PYI016.pyi:135:36 @@ -1012,10 +920,8 @@ PYI016 [*] Duplicate union member `complex` | ^^^^^^^ | help: Remove duplicate union member `complex` - -ℹ Safe fix -132 132 | -133 133 | # avoid reporting twice -134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] -135 |-field49: typing.Optional[complex | complex] | complex - 135 |+field49: typing.Optional[complex] | complex +132 | +133 | # avoid reporting twice +134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] + - field49: typing.Optional[complex | complex] | complex +135 + field49: typing.Optional[complex] | complex diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap index df9aec8da1..51bee8e111 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.py.snap @@ -12,15 +12,14 @@ PYI018 [*] Private TypeVar `_T` is never used 8 | _P = ParamSpec("_P") | help: Remove unused private TypeVar `_T` - -ℹ Unsafe fix -3 3 | from typing import TypeVar -4 4 | from typing_extensions import ParamSpec, TypeVarTuple -5 5 | -6 |-_T = typing.TypeVar("_T") -7 6 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 7 | _P = ParamSpec("_P") -9 8 | _P2 = typing.ParamSpec("_P2") +3 | from typing import TypeVar +4 | from typing_extensions import ParamSpec, TypeVarTuple +5 | + - _T = typing.TypeVar("_T") +6 | _Ts = typing_extensions.TypeVarTuple("_Ts") +7 | _P = ParamSpec("_P") +8 | _P2 = typing.ParamSpec("_P2") +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private TypeVarTuple `_Ts` is never used --> PYI018.py:7:1 @@ -32,15 +31,14 @@ PYI018 [*] Private TypeVarTuple `_Ts` is never used 9 | _P2 = typing.ParamSpec("_P2") | help: Remove unused private TypeVarTuple `_Ts` - -ℹ Unsafe fix -4 4 | from typing_extensions import ParamSpec, TypeVarTuple -5 5 | -6 6 | _T = typing.TypeVar("_T") -7 |-_Ts = typing_extensions.TypeVarTuple("_Ts") -8 7 | _P = ParamSpec("_P") -9 8 | _P2 = typing.ParamSpec("_P2") -10 9 | _Ts2 = TypeVarTuple("_Ts2") +4 | from typing_extensions import ParamSpec, TypeVarTuple +5 | +6 | _T = typing.TypeVar("_T") + - _Ts = typing_extensions.TypeVarTuple("_Ts") +7 | _P = ParamSpec("_P") +8 | _P2 = typing.ParamSpec("_P2") +9 | _Ts2 = TypeVarTuple("_Ts2") +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private ParamSpec `_P` is never used --> PYI018.py:8:1 @@ -53,15 +51,14 @@ PYI018 [*] Private ParamSpec `_P` is never used 10 | _Ts2 = TypeVarTuple("_Ts2") | help: Remove unused private ParamSpec `_P` - -ℹ Unsafe fix -5 5 | -6 6 | _T = typing.TypeVar("_T") -7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 |-_P = ParamSpec("_P") -9 8 | _P2 = typing.ParamSpec("_P2") -10 9 | _Ts2 = TypeVarTuple("_Ts2") -11 10 | +5 | +6 | _T = typing.TypeVar("_T") +7 | _Ts = typing_extensions.TypeVarTuple("_Ts") + - _P = ParamSpec("_P") +8 | _P2 = typing.ParamSpec("_P2") +9 | _Ts2 = TypeVarTuple("_Ts2") +10 | +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private ParamSpec `_P2` is never used --> PYI018.py:9:1 @@ -73,15 +70,14 @@ PYI018 [*] Private ParamSpec `_P2` is never used 10 | _Ts2 = TypeVarTuple("_Ts2") | help: Remove unused private ParamSpec `_P2` - -ℹ Unsafe fix -6 6 | _T = typing.TypeVar("_T") -7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 8 | _P = ParamSpec("_P") -9 |-_P2 = typing.ParamSpec("_P2") -10 9 | _Ts2 = TypeVarTuple("_Ts2") -11 10 | -12 11 | # OK +6 | _T = typing.TypeVar("_T") +7 | _Ts = typing_extensions.TypeVarTuple("_Ts") +8 | _P = ParamSpec("_P") + - _P2 = typing.ParamSpec("_P2") +9 | _Ts2 = TypeVarTuple("_Ts2") +10 | +11 | # OK +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private TypeVarTuple `_Ts2` is never used --> PYI018.py:10:1 @@ -94,12 +90,11 @@ PYI018 [*] Private TypeVarTuple `_Ts2` is never used 12 | # OK | help: Remove unused private TypeVarTuple `_Ts2` - -ℹ Unsafe fix -7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 8 | _P = ParamSpec("_P") -9 9 | _P2 = typing.ParamSpec("_P2") -10 |-_Ts2 = TypeVarTuple("_Ts2") -11 10 | -12 11 | # OK -13 12 | _UsedTypeVar = TypeVar("_UsedTypeVar") +7 | _Ts = typing_extensions.TypeVarTuple("_Ts") +8 | _P = ParamSpec("_P") +9 | _P2 = typing.ParamSpec("_P2") + - _Ts2 = TypeVarTuple("_Ts2") +10 | +11 | # OK +12 | _UsedTypeVar = TypeVar("_UsedTypeVar") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap index 48d81cf3cd..4bc1337bf5 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI018_PYI018.pyi.snap @@ -12,15 +12,14 @@ PYI018 [*] Private TypeVar `_T` is never used 8 | _P = ParamSpec("_P") | help: Remove unused private TypeVar `_T` - -ℹ Unsafe fix -3 3 | from typing import TypeVar -4 4 | from typing_extensions import ParamSpec, TypeVarTuple -5 5 | -6 |-_T = typing.TypeVar("_T") -7 6 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 7 | _P = ParamSpec("_P") -9 8 | _P2 = typing.ParamSpec("_P2") +3 | from typing import TypeVar +4 | from typing_extensions import ParamSpec, TypeVarTuple +5 | + - _T = typing.TypeVar("_T") +6 | _Ts = typing_extensions.TypeVarTuple("_Ts") +7 | _P = ParamSpec("_P") +8 | _P2 = typing.ParamSpec("_P2") +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private TypeVarTuple `_Ts` is never used --> PYI018.pyi:7:1 @@ -32,15 +31,14 @@ PYI018 [*] Private TypeVarTuple `_Ts` is never used 9 | _P2 = typing.ParamSpec("_P2") | help: Remove unused private TypeVarTuple `_Ts` - -ℹ Unsafe fix -4 4 | from typing_extensions import ParamSpec, TypeVarTuple -5 5 | -6 6 | _T = typing.TypeVar("_T") -7 |-_Ts = typing_extensions.TypeVarTuple("_Ts") -8 7 | _P = ParamSpec("_P") -9 8 | _P2 = typing.ParamSpec("_P2") -10 9 | _Ts2 = TypeVarTuple("_Ts2") +4 | from typing_extensions import ParamSpec, TypeVarTuple +5 | +6 | _T = typing.TypeVar("_T") + - _Ts = typing_extensions.TypeVarTuple("_Ts") +7 | _P = ParamSpec("_P") +8 | _P2 = typing.ParamSpec("_P2") +9 | _Ts2 = TypeVarTuple("_Ts2") +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private ParamSpec `_P` is never used --> PYI018.pyi:8:1 @@ -53,15 +51,14 @@ PYI018 [*] Private ParamSpec `_P` is never used 10 | _Ts2 = TypeVarTuple("_Ts2") | help: Remove unused private ParamSpec `_P` - -ℹ Unsafe fix -5 5 | -6 6 | _T = typing.TypeVar("_T") -7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 |-_P = ParamSpec("_P") -9 8 | _P2 = typing.ParamSpec("_P2") -10 9 | _Ts2 = TypeVarTuple("_Ts2") -11 10 | +5 | +6 | _T = typing.TypeVar("_T") +7 | _Ts = typing_extensions.TypeVarTuple("_Ts") + - _P = ParamSpec("_P") +8 | _P2 = typing.ParamSpec("_P2") +9 | _Ts2 = TypeVarTuple("_Ts2") +10 | +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private ParamSpec `_P2` is never used --> PYI018.pyi:9:1 @@ -73,15 +70,14 @@ PYI018 [*] Private ParamSpec `_P2` is never used 10 | _Ts2 = TypeVarTuple("_Ts2") | help: Remove unused private ParamSpec `_P2` - -ℹ Unsafe fix -6 6 | _T = typing.TypeVar("_T") -7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 8 | _P = ParamSpec("_P") -9 |-_P2 = typing.ParamSpec("_P2") -10 9 | _Ts2 = TypeVarTuple("_Ts2") -11 10 | -12 11 | # OK +6 | _T = typing.TypeVar("_T") +7 | _Ts = typing_extensions.TypeVarTuple("_Ts") +8 | _P = ParamSpec("_P") + - _P2 = typing.ParamSpec("_P2") +9 | _Ts2 = TypeVarTuple("_Ts2") +10 | +11 | # OK +note: This is an unsafe fix and may change runtime behavior PYI018 [*] Private TypeVarTuple `_Ts2` is never used --> PYI018.pyi:10:1 @@ -94,12 +90,11 @@ PYI018 [*] Private TypeVarTuple `_Ts2` is never used 12 | # OK | help: Remove unused private TypeVarTuple `_Ts2` - -ℹ Unsafe fix -7 7 | _Ts = typing_extensions.TypeVarTuple("_Ts") -8 8 | _P = ParamSpec("_P") -9 9 | _P2 = typing.ParamSpec("_P2") -10 |-_Ts2 = TypeVarTuple("_Ts2") -11 10 | -12 11 | # OK -13 12 | _UsedTypeVar = TypeVar("_UsedTypeVar") +7 | _Ts = typing_extensions.TypeVarTuple("_Ts") +8 | _P = ParamSpec("_P") +9 | _P2 = typing.ParamSpec("_P2") + - _Ts2 = TypeVarTuple("_Ts2") +10 | +11 | # OK +12 | _UsedTypeVar = TypeVar("_UsedTypeVar") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap index 5c3f8a0e18..a6ddc2b669 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.py.snap @@ -9,16 +9,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -4 4 | _S2 = TypeVar("_S2", BadClass, GoodClass) -5 5 | -6 6 | class BadClass: -7 |- def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 - 7 |+ def __new__(cls, *args: str, **kwargs: int) -> Self: ... # PYI019 -8 8 | -9 9 | -10 10 | def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 +4 | _S2 = TypeVar("_S2", BadClass, GoodClass) +5 | +6 | class BadClass: + - def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 +7 + def __new__(cls, *args: str, **kwargs: int) -> Self: ... # PYI019 +8 | +9 | +10 | def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.py:10:28 @@ -27,16 +25,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -7 7 | def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 -8 8 | -9 9 | -10 |- def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 - 10 |+ def bad_instance_method(self, arg: bytes) -> Self: ... # PYI019 -11 11 | -12 12 | -13 13 | @classmethod +7 | def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 +8 | +9 | + - def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 +10 + def bad_instance_method(self, arg: bytes) -> Self: ... # PYI019 +11 | +12 | +13 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.py:14:25 @@ -46,16 +42,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -11 11 | -12 12 | -13 13 | @classmethod -14 |- def bad_class_method(cls: type[_S], arg: int) -> _S: ... # PYI019 - 14 |+ def bad_class_method(cls, arg: int) -> Self: ... # PYI019 -15 15 | -16 16 | -17 17 | @classmethod +11 | +12 | +13 | @classmethod + - def bad_class_method(cls: type[_S], arg: int) -> _S: ... # PYI019 +14 + def bad_class_method(cls, arg: int) -> Self: ... # PYI019 +15 | +16 | +17 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.py:18:33 @@ -65,16 +59,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -15 15 | -16 16 | -17 17 | @classmethod -18 |- def bad_posonly_class_method(cls: type[_S], /) -> _S: ... # PYI019 - 18 |+ def bad_posonly_class_method(cls, /) -> Self: ... # PYI019 -19 19 | -20 20 | -21 21 | @classmethod +15 | +16 | +17 | @classmethod + - def bad_posonly_class_method(cls: type[_S], /) -> _S: ... # PYI019 +18 + def bad_posonly_class_method(cls, /) -> Self: ... # PYI019 +19 | +20 | +21 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:39:14 @@ -85,16 +77,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -36 36 | -37 37 | # Python > 3.12 -38 38 | class PEP695BadDunderNew[T]: -39 |- def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 - 39 |+ def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ... # PYI019 -40 40 | -41 41 | -42 42 | def generic_instance_method[S](self: S) -> S: ... # PYI019 +36 | +37 | # Python > 3.12 +38 | class PEP695BadDunderNew[T]: + - def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 +39 + def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ... # PYI019 +40 | +41 | +42 | def generic_instance_method[S](self: S) -> S: ... # PYI019 PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:42:30 @@ -103,16 +93,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -39 39 | def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 -40 40 | -41 41 | -42 |- def generic_instance_method[S](self: S) -> S: ... # PYI019 - 42 |+ def generic_instance_method(self) -> Self: ... # PYI019 -43 43 | -44 44 | -45 45 | class PEP695GoodDunderNew[T]: +39 | def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 +40 | +41 | + - def generic_instance_method[S](self: S) -> S: ... # PYI019 +42 + def generic_instance_method(self) -> Self: ... # PYI019 +43 | +44 | +45 | class PEP695GoodDunderNew[T]: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:54:11 @@ -123,16 +111,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -51 51 | # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators` -52 52 | # in the settings for this test: -53 53 | @foo_classmethod -54 |- def foo[S](cls: type[S]) -> S: ... # PYI019 - 54 |+ def foo(cls) -> Self: ... # PYI019 -55 55 | -56 56 | -57 57 | _S695 = TypeVar("_S695", bound="PEP695Fix") +51 | # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators` +52 | # in the settings for this test: +53 | @foo_classmethod + - def foo[S](cls: type[S]) -> S: ... # PYI019 +54 + def foo(cls) -> Self: ... # PYI019 +55 | +56 | +57 | _S695 = TypeVar("_S695", bound="PEP695Fix") PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:61:16 @@ -144,16 +130,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 63 | def __init_subclass__[S](cls: type[S]) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -58 58 | -59 59 | -60 60 | class PEP695Fix: -61 |- def __new__[S: PEP695Fix](cls: type[S]) -> S: ... - 61 |+ def __new__(cls) -> Self: ... -62 62 | -63 63 | def __init_subclass__[S](cls: type[S]) -> S: ... -64 64 | +58 | +59 | +60 | class PEP695Fix: + - def __new__[S: PEP695Fix](cls: type[S]) -> S: ... +61 + def __new__(cls) -> Self: ... +62 | +63 | def __init_subclass__[S](cls: type[S]) -> S: ... +64 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:63:26 @@ -166,16 +150,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 65 | def __neg__[S: PEP695Fix](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -60 60 | class PEP695Fix: -61 61 | def __new__[S: PEP695Fix](cls: type[S]) -> S: ... -62 62 | -63 |- def __init_subclass__[S](cls: type[S]) -> S: ... - 63 |+ def __init_subclass__(cls) -> Self: ... -64 64 | -65 65 | def __neg__[S: PEP695Fix](self: S) -> S: ... -66 66 | +60 | class PEP695Fix: +61 | def __new__[S: PEP695Fix](cls: type[S]) -> S: ... +62 | + - def __init_subclass__[S](cls: type[S]) -> S: ... +63 + def __init_subclass__(cls) -> Self: ... +64 | +65 | def __neg__[S: PEP695Fix](self: S) -> S: ... +66 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:65:16 @@ -188,16 +170,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 67 | def __pos__[S](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -62 62 | -63 63 | def __init_subclass__[S](cls: type[S]) -> S: ... -64 64 | -65 |- def __neg__[S: PEP695Fix](self: S) -> S: ... - 65 |+ def __neg__(self) -> Self: ... -66 66 | -67 67 | def __pos__[S](self: S) -> S: ... -68 68 | +62 | +63 | def __init_subclass__[S](cls: type[S]) -> S: ... +64 | + - def __neg__[S: PEP695Fix](self: S) -> S: ... +65 + def __neg__(self) -> Self: ... +66 | +67 | def __pos__[S](self: S) -> S: ... +68 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:67:16 @@ -210,16 +190,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -64 64 | -65 65 | def __neg__[S: PEP695Fix](self: S) -> S: ... -66 66 | -67 |- def __pos__[S](self: S) -> S: ... - 67 |+ def __pos__(self) -> Self: ... -68 68 | -69 69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... -70 70 | +64 | +65 | def __neg__[S: PEP695Fix](self: S) -> S: ... +66 | + - def __pos__[S](self: S) -> S: ... +67 + def __pos__(self) -> Self: ... +68 | +69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... +70 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:69:16 @@ -232,16 +210,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 71 | def __sub__[S](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -66 66 | -67 67 | def __pos__[S](self: S) -> S: ... -68 68 | -69 |- def __add__[S: PEP695Fix](self: S, other: S) -> S: ... - 69 |+ def __add__(self, other: Self) -> Self: ... -70 70 | -71 71 | def __sub__[S](self: S, other: S) -> S: ... -72 72 | +66 | +67 | def __pos__[S](self: S) -> S: ... +68 | + - def __add__[S: PEP695Fix](self: S, other: S) -> S: ... +69 + def __add__(self, other: Self) -> Self: ... +70 | +71 | def __sub__[S](self: S, other: S) -> S: ... +72 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:71:16 @@ -254,16 +230,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 73 | @classmethod | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -68 68 | -69 69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... -70 70 | -71 |- def __sub__[S](self: S, other: S) -> S: ... - 71 |+ def __sub__(self, other: Self) -> Self: ... -72 72 | -73 73 | @classmethod -74 74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... +68 | +69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... +70 | + - def __sub__[S](self: S, other: S) -> S: ... +71 + def __sub__(self, other: Self) -> Self: ... +72 | +73 | @classmethod +74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:74:27 @@ -275,16 +249,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 76 | @classmethod | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -71 71 | def __sub__[S](self: S, other: S) -> S: ... -72 72 | -73 73 | @classmethod -74 |- def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... - 74 |+ def class_method_bound(cls) -> Self: ... -75 75 | -76 76 | @classmethod -77 77 | def class_method_unbound[S](cls: type[S]) -> S: ... +71 | def __sub__[S](self: S, other: S) -> S: ... +72 | +73 | @classmethod + - def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... +74 + def class_method_bound(cls) -> Self: ... +75 | +76 | @classmethod +77 | def class_method_unbound[S](cls: type[S]) -> S: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:77:29 @@ -296,16 +268,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -74 74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... -75 75 | -76 76 | @classmethod -77 |- def class_method_unbound[S](cls: type[S]) -> S: ... - 77 |+ def class_method_unbound(cls) -> Self: ... -78 78 | -79 79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... -80 80 | +74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... +75 | +76 | @classmethod + - def class_method_unbound[S](cls: type[S]) -> S: ... +77 + def class_method_unbound(cls) -> Self: ... +78 | +79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... +80 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:79:30 @@ -318,16 +288,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 81 | def instance_method_unbound[S](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -76 76 | @classmethod -77 77 | def class_method_unbound[S](cls: type[S]) -> S: ... -78 78 | -79 |- def instance_method_bound[S: PEP695Fix](self: S) -> S: ... - 79 |+ def instance_method_bound(self) -> Self: ... -80 80 | -81 81 | def instance_method_unbound[S](self: S) -> S: ... -82 82 | +76 | @classmethod +77 | def class_method_unbound[S](cls: type[S]) -> S: ... +78 | + - def instance_method_bound[S: PEP695Fix](self: S) -> S: ... +79 + def instance_method_bound(self) -> Self: ... +80 | +81 | def instance_method_unbound[S](self: S) -> S: ... +82 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:81:32 @@ -340,16 +308,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -78 78 | -79 79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... -80 80 | -81 |- def instance_method_unbound[S](self: S) -> S: ... - 81 |+ def instance_method_unbound(self) -> Self: ... -82 82 | -83 83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... -84 84 | +78 | +79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... +80 | + - def instance_method_unbound[S](self: S) -> S: ... +81 + def instance_method_unbound(self) -> Self: ... +82 | +83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... +84 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:83:53 @@ -362,16 +328,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -80 80 | -81 81 | def instance_method_unbound[S](self: S) -> S: ... -82 82 | -83 |- def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... - 83 |+ def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ... -84 84 | -85 85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... -86 86 | +80 | +81 | def instance_method_unbound[S](self: S) -> S: ... +82 | + - def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... +83 + def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ... +84 | +85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... +86 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:85:55 @@ -384,16 +348,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -82 82 | -83 83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... -84 84 | -85 |- def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... - 85 |+ def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ... -86 86 | -87 87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... -88 88 | +82 | +83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... +84 | + - def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... +85 + def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ... +86 | +87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... +88 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:87:27 @@ -406,16 +368,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 89 | def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -84 84 | -85 85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... -86 86 | -87 |- def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... - 87 |+ def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ... -88 88 | -89 89 | def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... -90 90 | +84 | +85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... +86 | + - def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... +87 + def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ... +88 | +89 | def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... +90 | PYI019 [*] Use `Self` instead of custom TypeVar `_S695` --> PYI019_0.py:89:43 @@ -426,16 +386,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S695` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S695` with `Self` - -ℹ Safe fix -86 86 | -87 87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... -88 88 | -89 |- def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... - 89 |+ def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ... -90 90 | -91 91 | -92 92 | class InvalidButWeDoNotPanic: +86 | +87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... +88 | + - def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... +89 + def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ... +90 | +91 | +92 | class InvalidButWeDoNotPanic: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:94:10 @@ -447,16 +405,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 95 | def n(self: S) -> S[int]: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -91 91 | -92 92 | class InvalidButWeDoNotPanic: -93 93 | @classmethod -94 |- def m[S](cls: type[S], /) -> S[int]: ... - 94 |+ def m(cls, /) -> Self[int]: ... -95 95 | def n(self: S) -> S[int]: ... -96 96 | -97 97 | +91 | +92 | class InvalidButWeDoNotPanic: +93 | @classmethod + - def m[S](cls: type[S], /) -> S[int]: ... +94 + def m(cls, /) -> Self[int]: ... +95 | def n(self: S) -> S[int]: ... +96 | +97 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:114:10 @@ -467,16 +423,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -111 111 | -112 112 | class SubscriptReturnType: -113 113 | @classmethod -114 |- def m[S](cls: type[S]) -> type[S]: ... # PYI019 - 114 |+ def m(cls) -> type[Self]: ... # PYI019 -115 115 | -116 116 | -117 117 | class SelfNotUsedInReturnAnnotation: +111 | +112 | class SubscriptReturnType: +113 | @classmethod + - def m[S](cls: type[S]) -> type[S]: ... # PYI019 +114 + def m(cls) -> type[Self]: ... # PYI019 +115 | +116 | +117 | class SelfNotUsedInReturnAnnotation: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:118:10 @@ -488,16 +442,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 120 | def n[S](cls: type[S], other: S) -> int: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -115 115 | -116 116 | -117 117 | class SelfNotUsedInReturnAnnotation: -118 |- def m[S](self: S, other: S) -> int: ... - 118 |+ def m(self, other: Self) -> int: ... -119 119 | @classmethod -120 120 | def n[S](cls: type[S], other: S) -> int: ... -121 121 | +115 | +116 | +117 | class SelfNotUsedInReturnAnnotation: + - def m[S](self: S, other: S) -> int: ... +118 + def m(self, other: Self) -> int: ... +119 | @classmethod +120 | def n[S](cls: type[S], other: S) -> int: ... +121 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:120:10 @@ -508,16 +460,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -117 117 | class SelfNotUsedInReturnAnnotation: -118 118 | def m[S](self: S, other: S) -> int: ... -119 119 | @classmethod -120 |- def n[S](cls: type[S], other: S) -> int: ... - 120 |+ def n(cls, other: Self) -> int: ... -121 121 | -122 122 | -123 123 | class _NotATypeVar: ... +117 | class SelfNotUsedInReturnAnnotation: +118 | def m[S](self: S, other: S) -> int: ... +119 | @classmethod + - def n[S](cls: type[S], other: S) -> int: ... +120 + def n(cls, other: Self) -> int: ... +121 | +122 | +123 | class _NotATypeVar: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:135:10 @@ -529,16 +479,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 137 | def n[S](cls: type[S], other: S): ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -132 132 | -133 133 | -134 134 | class NoReturnAnnotations: -135 |- def m[S](self: S, other: S): ... - 135 |+ def m(self, other: Self): ... -136 136 | @classmethod -137 137 | def n[S](cls: type[S], other: S): ... -138 138 | +132 | +133 | +134 | class NoReturnAnnotations: + - def m[S](self: S, other: S): ... +135 + def m(self, other: Self): ... +136 | @classmethod +137 | def n[S](cls: type[S], other: S): ... +138 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:137:10 @@ -551,16 +499,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 139 | class MultipleBoundParameters: | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -134 134 | class NoReturnAnnotations: -135 135 | def m[S](self: S, other: S): ... -136 136 | @classmethod -137 |- def n[S](cls: type[S], other: S): ... - 137 |+ def n(cls, other: Self): ... -138 138 | -139 139 | class MultipleBoundParameters: -140 140 | def m[S: int, T: int](self: S, other: T) -> S: ... +134 | class NoReturnAnnotations: +135 | def m[S](self: S, other: S): ... +136 | @classmethod + - def n[S](cls: type[S], other: S): ... +137 + def n(cls, other: Self): ... +138 | +139 | class MultipleBoundParameters: +140 | def m[S: int, T: int](self: S, other: T) -> S: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:140:10 @@ -571,16 +517,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 141 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -137 137 | def n[S](cls: type[S], other: S): ... -138 138 | -139 139 | class MultipleBoundParameters: -140 |- def m[S: int, T: int](self: S, other: T) -> S: ... - 140 |+ def m[T: int](self, other: T) -> Self: ... -141 141 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... -142 142 | -143 143 | class MethodsWithBody: +137 | def n[S](cls: type[S], other: S): ... +138 | +139 | class MultipleBoundParameters: + - def m[S: int, T: int](self: S, other: T) -> S: ... +140 + def m[T: int](self, other: T) -> Self: ... +141 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... +142 | +143 | class MethodsWithBody: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:141:10 @@ -593,16 +537,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 143 | class MethodsWithBody: | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -138 138 | -139 139 | class MultipleBoundParameters: -140 140 | def m[S: int, T: int](self: S, other: T) -> S: ... -141 |- def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... - 141 |+ def n[T: (int, str)](self, other: T) -> Self: ... -142 142 | -143 143 | class MethodsWithBody: -144 144 | def m[S](self: S, other: S) -> S: +138 | +139 | class MultipleBoundParameters: +140 | def m[S: int, T: int](self: S, other: T) -> S: ... + - def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... +141 + def n[T: (int, str)](self, other: T) -> Self: ... +142 | +143 | class MethodsWithBody: +144 | def m[S](self: S, other: S) -> S: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:144:10 @@ -614,18 +556,16 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 146 | return x | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -141 141 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... -142 142 | -143 143 | class MethodsWithBody: -144 |- def m[S](self: S, other: S) -> S: -145 |- x: S = other - 144 |+ def m(self, other: Self) -> Self: - 145 |+ x: Self = other -146 146 | return x -147 147 | -148 148 | @classmethod +141 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... +142 | +143 | class MethodsWithBody: + - def m[S](self: S, other: S) -> S: + - x: S = other +144 + def m(self, other: Self) -> Self: +145 + x: Self = other +146 | return x +147 | +148 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:149:10 @@ -637,18 +577,16 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 151 | return x() | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -146 146 | return x -147 147 | -148 148 | @classmethod -149 |- def n[S](cls: type[S], other: S) -> S: -150 |- x: type[S] = type(other) - 149 |+ def n(cls, other: Self) -> Self: - 150 |+ x: type[Self] = type(other) -151 151 | return x() -152 152 | -153 153 | class StringizedReferencesCanBeFixed: +146 | return x +147 | +148 | @classmethod + - def n[S](cls: type[S], other: S) -> S: + - x: type[S] = type(other) +149 + def n(cls, other: Self) -> Self: +150 + x: type[Self] = type(other) +151 | return x() +152 | +153 | class StringizedReferencesCanBeFixed: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:154:10 @@ -660,18 +598,16 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 156 | return x | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -151 151 | return x() -152 152 | -153 153 | class StringizedReferencesCanBeFixed: -154 |- def m[S](self: S) -> S: -155 |- x = cast("list[tuple[S, S]]", self) - 154 |+ def m(self) -> Self: - 155 |+ x = cast("list[tuple[Self, Self]]", self) -156 156 | return x -157 157 | -158 158 | class ButStrangeStringizedReferencesCannotBeFixed: +151 | return x() +152 | +153 | class StringizedReferencesCanBeFixed: + - def m[S](self: S) -> S: + - x = cast("list[tuple[S, S]]", self) +154 + def m(self) -> Self: +155 + x = cast("list[tuple[Self, Self]]", self) +156 | return x +157 | +158 | class ButStrangeStringizedReferencesCannotBeFixed: PYI019 Use `Self` instead of custom TypeVar `_T` --> PYI019_0.py:159:10 @@ -694,16 +630,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 166 | # so `del S` here is not actually a reference to the type variable `S`. | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -161 161 | return x -162 162 | -163 163 | class DeletionsAreNotTouched: -164 |- def m[S](self: S) -> S: - 164 |+ def m(self) -> Self: -165 165 | # `S` is not a local variable here, and `del` can only be used with local variables, -166 166 | # so `del S` here is not actually a reference to the type variable `S`. -167 167 | # This `del` statement is therefore not touched by the autofix (it raises `UnboundLocalError` +161 | return x +162 | +163 | class DeletionsAreNotTouched: + - def m[S](self: S) -> S: +164 + def m(self) -> Self: +165 | # `S` is not a local variable here, and `del` can only be used with local variables, +166 | # so `del S` here is not actually a reference to the type variable `S`. +167 | # This `del` statement is therefore not touched by the autofix (it raises `UnboundLocalError` PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:173:10 @@ -715,16 +649,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 175 | print(S) # not a reference to the type variable, so not touched by the autofix | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -170 170 | return self -171 171 | -172 172 | class NamesShadowingTypeVarAreNotTouched: -173 |- def m[S](self: S) -> S: - 173 |+ def m(self) -> Self: -174 174 | type S = int -175 175 | print(S) # not a reference to the type variable, so not touched by the autofix -176 176 | return 42 +170 | return self +171 | +172 | class NamesShadowingTypeVarAreNotTouched: + - def m[S](self: S) -> S: +173 + def m(self) -> Self: +174 | type S = int +175 | print(S) # not a reference to the type variable, so not touched by the autofix +176 | return 42 PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.py:189:52 @@ -736,16 +668,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` 191 | @classmethod | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -186 186 | from __future__ import annotations -187 187 | -188 188 | class BadClassWithStringTypeHints: -189 |- def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 - 189 |+ def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019 -190 190 | -191 191 | @classmethod -192 192 | def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 +186 | from __future__ import annotations +187 | +188 | class BadClassWithStringTypeHints: + - def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 +189 + def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019 +190 | +191 | @classmethod +192 | def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.py:192:49 @@ -755,16 +685,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -189 189 | def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 -190 190 | -191 191 | @classmethod -192 |- def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 - 192 |+ def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019 -193 193 | -194 194 | -195 195 | @classmethod +189 | def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 +190 | +191 | @classmethod + - def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 +192 + def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019 +193 | +194 | +195 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.py:196:50 @@ -774,16 +702,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -193 193 | -194 194 | -195 195 | @classmethod -196 |- def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019 - 196 |+ def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019 -197 197 | -198 198 | -199 199 | @classmethod +193 | +194 | +195 | @classmethod + - def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019 +196 + def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019 +197 | +198 | +199 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.py:200:50 @@ -793,16 +719,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -197 197 | -198 198 | -199 199 | @classmethod -200 |- def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019 - 200 |+ def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019 -201 201 | -202 202 | -203 203 | class BadSubscriptReturnTypeWithStringTypeHints: +197 | +198 | +199 | @classmethod + - def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019 +200 + def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019 +201 | +202 | +203 | class BadSubscriptReturnTypeWithStringTypeHints: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.py:205:10 @@ -813,13 +737,11 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -202 202 | -203 203 | class BadSubscriptReturnTypeWithStringTypeHints: -204 204 | @classmethod -205 |- def m[S](cls: "type[S]") -> "type[S]": ... # PYI019 - 205 |+ def m(cls) -> "type[Self]": ... # PYI019 -206 206 | -207 207 | -208 208 | class GoodClassWiStringTypeHints: +202 | +203 | class BadSubscriptReturnTypeWithStringTypeHints: +204 | @classmethod + - def m[S](cls: "type[S]") -> "type[S]": ... # PYI019 +205 + def m(cls) -> "type[Self]": ... # PYI019 +206 | +207 | +208 | class GoodClassWiStringTypeHints: diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap index fcd0d9b54a..28baa8bd92 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_0.pyi.snap @@ -9,16 +9,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -4 4 | _S2 = TypeVar("_S2", BadClass, GoodClass) -5 5 | -6 6 | class BadClass: -7 |- def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 - 7 |+ def __new__(cls, *args: str, **kwargs: int) -> Self: ... # PYI019 -8 8 | -9 9 | -10 10 | def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 +4 | _S2 = TypeVar("_S2", BadClass, GoodClass) +5 | +6 | class BadClass: + - def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 +7 + def __new__(cls, *args: str, **kwargs: int) -> Self: ... # PYI019 +8 | +9 | +10 | def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.pyi:10:28 @@ -27,16 +25,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -7 7 | def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 -8 8 | -9 9 | -10 |- def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 - 10 |+ def bad_instance_method(self, arg: bytes) -> Self: ... # PYI019 -11 11 | -12 12 | -13 13 | @classmethod +7 | def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ... # PYI019 +8 | +9 | + - def bad_instance_method(self: _S, arg: bytes) -> _S: ... # PYI019 +10 + def bad_instance_method(self, arg: bytes) -> Self: ... # PYI019 +11 | +12 | +13 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.pyi:14:25 @@ -46,16 +42,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -11 11 | -12 12 | -13 13 | @classmethod -14 |- def bad_class_method(cls: type[_S], arg: int) -> _S: ... # PYI019 - 14 |+ def bad_class_method(cls, arg: int) -> Self: ... # PYI019 -15 15 | -16 16 | -17 17 | @classmethod +11 | +12 | +13 | @classmethod + - def bad_class_method(cls: type[_S], arg: int) -> _S: ... # PYI019 +14 + def bad_class_method(cls, arg: int) -> Self: ... # PYI019 +15 | +16 | +17 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.pyi:18:33 @@ -65,16 +59,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -15 15 | -16 16 | -17 17 | @classmethod -18 |- def bad_posonly_class_method(cls: type[_S], /) -> _S: ... # PYI019 - 18 |+ def bad_posonly_class_method(cls, /) -> Self: ... # PYI019 -19 19 | -20 20 | -21 21 | @classmethod +15 | +16 | +17 | @classmethod + - def bad_posonly_class_method(cls: type[_S], /) -> _S: ... # PYI019 +18 + def bad_posonly_class_method(cls, /) -> Self: ... # PYI019 +19 | +20 | +21 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:39:14 @@ -85,16 +77,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -36 36 | -37 37 | # Python > 3.12 -38 38 | class PEP695BadDunderNew[T]: -39 |- def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 - 39 |+ def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ... # PYI019 -40 40 | -41 41 | -42 42 | def generic_instance_method[S](self: S) -> S: ... # PYI019 +36 | +37 | # Python > 3.12 +38 | class PEP695BadDunderNew[T]: + - def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 +39 + def __new__(cls, *args: Any, ** kwargs: Any) -> Self: ... # PYI019 +40 | +41 | +42 | def generic_instance_method[S](self: S) -> S: ... # PYI019 PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:42:30 @@ -103,16 +93,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -39 39 | def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 -40 40 | -41 41 | -42 |- def generic_instance_method[S](self: S) -> S: ... # PYI019 - 42 |+ def generic_instance_method(self) -> Self: ... # PYI019 -43 43 | -44 44 | -45 45 | class PEP695GoodDunderNew[T]: +39 | def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ... # PYI019 +40 | +41 | + - def generic_instance_method[S](self: S) -> S: ... # PYI019 +42 + def generic_instance_method(self) -> Self: ... # PYI019 +43 | +44 | +45 | class PEP695GoodDunderNew[T]: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:54:11 @@ -123,16 +111,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -51 51 | # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators` -52 52 | # in the settings for this test: -53 53 | @foo_classmethod -54 |- def foo[S](cls: type[S]) -> S: ... # PYI019 - 54 |+ def foo(cls) -> Self: ... # PYI019 -55 55 | -56 56 | -57 57 | _S695 = TypeVar("_S695", bound="PEP695Fix") +51 | # due to `foo_classmethod being listed in `pep8_naming.classmethod-decorators` +52 | # in the settings for this test: +53 | @foo_classmethod + - def foo[S](cls: type[S]) -> S: ... # PYI019 +54 + def foo(cls) -> Self: ... # PYI019 +55 | +56 | +57 | _S695 = TypeVar("_S695", bound="PEP695Fix") PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:61:16 @@ -144,16 +130,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 63 | def __init_subclass__[S](cls: type[S]) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -58 58 | -59 59 | -60 60 | class PEP695Fix: -61 |- def __new__[S: PEP695Fix](cls: type[S]) -> S: ... - 61 |+ def __new__(cls) -> Self: ... -62 62 | -63 63 | def __init_subclass__[S](cls: type[S]) -> S: ... -64 64 | +58 | +59 | +60 | class PEP695Fix: + - def __new__[S: PEP695Fix](cls: type[S]) -> S: ... +61 + def __new__(cls) -> Self: ... +62 | +63 | def __init_subclass__[S](cls: type[S]) -> S: ... +64 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:63:26 @@ -166,16 +150,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 65 | def __neg__[S: PEP695Fix](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -60 60 | class PEP695Fix: -61 61 | def __new__[S: PEP695Fix](cls: type[S]) -> S: ... -62 62 | -63 |- def __init_subclass__[S](cls: type[S]) -> S: ... - 63 |+ def __init_subclass__(cls) -> Self: ... -64 64 | -65 65 | def __neg__[S: PEP695Fix](self: S) -> S: ... -66 66 | +60 | class PEP695Fix: +61 | def __new__[S: PEP695Fix](cls: type[S]) -> S: ... +62 | + - def __init_subclass__[S](cls: type[S]) -> S: ... +63 + def __init_subclass__(cls) -> Self: ... +64 | +65 | def __neg__[S: PEP695Fix](self: S) -> S: ... +66 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:65:16 @@ -188,16 +170,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 67 | def __pos__[S](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -62 62 | -63 63 | def __init_subclass__[S](cls: type[S]) -> S: ... -64 64 | -65 |- def __neg__[S: PEP695Fix](self: S) -> S: ... - 65 |+ def __neg__(self) -> Self: ... -66 66 | -67 67 | def __pos__[S](self: S) -> S: ... -68 68 | +62 | +63 | def __init_subclass__[S](cls: type[S]) -> S: ... +64 | + - def __neg__[S: PEP695Fix](self: S) -> S: ... +65 + def __neg__(self) -> Self: ... +66 | +67 | def __pos__[S](self: S) -> S: ... +68 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:67:16 @@ -210,16 +190,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -64 64 | -65 65 | def __neg__[S: PEP695Fix](self: S) -> S: ... -66 66 | -67 |- def __pos__[S](self: S) -> S: ... - 67 |+ def __pos__(self) -> Self: ... -68 68 | -69 69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... -70 70 | +64 | +65 | def __neg__[S: PEP695Fix](self: S) -> S: ... +66 | + - def __pos__[S](self: S) -> S: ... +67 + def __pos__(self) -> Self: ... +68 | +69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... +70 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:69:16 @@ -232,16 +210,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 71 | def __sub__[S](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -66 66 | -67 67 | def __pos__[S](self: S) -> S: ... -68 68 | -69 |- def __add__[S: PEP695Fix](self: S, other: S) -> S: ... - 69 |+ def __add__(self, other: Self) -> Self: ... -70 70 | -71 71 | def __sub__[S](self: S, other: S) -> S: ... -72 72 | +66 | +67 | def __pos__[S](self: S) -> S: ... +68 | + - def __add__[S: PEP695Fix](self: S, other: S) -> S: ... +69 + def __add__(self, other: Self) -> Self: ... +70 | +71 | def __sub__[S](self: S, other: S) -> S: ... +72 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:71:16 @@ -254,16 +230,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 73 | @classmethod | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -68 68 | -69 69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... -70 70 | -71 |- def __sub__[S](self: S, other: S) -> S: ... - 71 |+ def __sub__(self, other: Self) -> Self: ... -72 72 | -73 73 | @classmethod -74 74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... +68 | +69 | def __add__[S: PEP695Fix](self: S, other: S) -> S: ... +70 | + - def __sub__[S](self: S, other: S) -> S: ... +71 + def __sub__(self, other: Self) -> Self: ... +72 | +73 | @classmethod +74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:74:27 @@ -275,16 +249,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 76 | @classmethod | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -71 71 | def __sub__[S](self: S, other: S) -> S: ... -72 72 | -73 73 | @classmethod -74 |- def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... - 74 |+ def class_method_bound(cls) -> Self: ... -75 75 | -76 76 | @classmethod -77 77 | def class_method_unbound[S](cls: type[S]) -> S: ... +71 | def __sub__[S](self: S, other: S) -> S: ... +72 | +73 | @classmethod + - def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... +74 + def class_method_bound(cls) -> Self: ... +75 | +76 | @classmethod +77 | def class_method_unbound[S](cls: type[S]) -> S: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:77:29 @@ -296,16 +268,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -74 74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... -75 75 | -76 76 | @classmethod -77 |- def class_method_unbound[S](cls: type[S]) -> S: ... - 77 |+ def class_method_unbound(cls) -> Self: ... -78 78 | -79 79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... -80 80 | +74 | def class_method_bound[S: PEP695Fix](cls: type[S]) -> S: ... +75 | +76 | @classmethod + - def class_method_unbound[S](cls: type[S]) -> S: ... +77 + def class_method_unbound(cls) -> Self: ... +78 | +79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... +80 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:79:30 @@ -318,16 +288,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 81 | def instance_method_unbound[S](self: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -76 76 | @classmethod -77 77 | def class_method_unbound[S](cls: type[S]) -> S: ... -78 78 | -79 |- def instance_method_bound[S: PEP695Fix](self: S) -> S: ... - 79 |+ def instance_method_bound(self) -> Self: ... -80 80 | -81 81 | def instance_method_unbound[S](self: S) -> S: ... -82 82 | +76 | @classmethod +77 | def class_method_unbound[S](cls: type[S]) -> S: ... +78 | + - def instance_method_bound[S: PEP695Fix](self: S) -> S: ... +79 + def instance_method_bound(self) -> Self: ... +80 | +81 | def instance_method_unbound[S](self: S) -> S: ... +82 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:81:32 @@ -340,16 +308,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -78 78 | -79 79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... -80 80 | -81 |- def instance_method_unbound[S](self: S) -> S: ... - 81 |+ def instance_method_unbound(self) -> Self: ... -82 82 | -83 83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... -84 84 | +78 | +79 | def instance_method_bound[S: PEP695Fix](self: S) -> S: ... +80 | + - def instance_method_unbound[S](self: S) -> S: ... +81 + def instance_method_unbound(self) -> Self: ... +82 | +83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... +84 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:83:53 @@ -362,16 +328,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -80 80 | -81 81 | def instance_method_unbound[S](self: S) -> S: ... -82 82 | -83 |- def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... - 83 |+ def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ... -84 84 | -85 85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... -86 86 | +80 | +81 | def instance_method_unbound[S](self: S) -> S: ... +82 | + - def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... +83 + def instance_method_bound_with_another_parameter(self, other: Self) -> Self: ... +84 | +85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... +86 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:85:55 @@ -384,16 +348,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -82 82 | -83 83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... -84 84 | -85 |- def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... - 85 |+ def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ... -86 86 | -87 87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... -88 88 | +82 | +83 | def instance_method_bound_with_another_parameter[S: PEP695Fix](self: S, other: S) -> S: ... +84 | + - def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... +85 + def instance_method_unbound_with_another_parameter(self, other: Self) -> Self: ... +86 | +87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... +88 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:87:27 @@ -406,16 +368,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 89 | def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -84 84 | -85 85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... -86 86 | -87 |- def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... - 87 |+ def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ... -88 88 | -89 89 | def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... -90 90 | +84 | +85 | def instance_method_unbound_with_another_parameter[S](self: S, other: S) -> S: ... +86 | + - def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... +87 + def multiple_type_vars[*Ts, T](self, other: Self, /, *args: *Ts, a: T, b: list[T]) -> Self: ... +88 | +89 | def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... +90 | PYI019 [*] Use `Self` instead of custom TypeVar `_S695` --> PYI019_0.pyi:89:43 @@ -426,16 +386,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S695` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S695` with `Self` - -ℹ Safe fix -86 86 | -87 87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... -88 88 | -89 |- def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... - 89 |+ def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ... -90 90 | -91 91 | -92 92 | class InvalidButWeDoNotPanic: +86 | +87 | def multiple_type_vars[S, *Ts, T](self: S, other: S, /, *args: *Ts, a: T, b: list[T]) -> S: ... +88 | + - def mixing_old_and_new_style_type_vars[T](self: _S695, a: T, b: T) -> _S695: ... +89 + def mixing_old_and_new_style_type_vars[T](self, a: T, b: T) -> Self: ... +90 | +91 | +92 | class InvalidButWeDoNotPanic: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:94:10 @@ -447,16 +405,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 95 | def n(self: S) -> S[int]: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -91 91 | -92 92 | class InvalidButWeDoNotPanic: -93 93 | @classmethod -94 |- def m[S](cls: type[S], /) -> S[int]: ... - 94 |+ def m(cls, /) -> Self[int]: ... -95 95 | def n(self: S) -> S[int]: ... -96 96 | -97 97 | +91 | +92 | class InvalidButWeDoNotPanic: +93 | @classmethod + - def m[S](cls: type[S], /) -> S[int]: ... +94 + def m(cls, /) -> Self[int]: ... +95 | def n(self: S) -> S[int]: ... +96 | +97 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:114:10 @@ -467,16 +423,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -111 111 | -112 112 | class SubscriptReturnType: -113 113 | @classmethod -114 |- def m[S](cls: type[S]) -> type[S]: ... # PYI019 - 114 |+ def m(cls) -> type[Self]: ... # PYI019 -115 115 | -116 116 | -117 117 | class PEP695TypeParameterAtTheVeryEndOfTheList: +111 | +112 | class SubscriptReturnType: +113 | @classmethod + - def m[S](cls: type[S]) -> type[S]: ... # PYI019 +114 + def m(cls) -> type[Self]: ... # PYI019 +115 | +116 | +117 | class PEP695TypeParameterAtTheVeryEndOfTheList: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:118:10 @@ -486,16 +440,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -115 115 | -116 116 | -117 117 | class PEP695TypeParameterAtTheVeryEndOfTheList: -118 |- def f[T, S](self: S) -> S: ... - 118 |+ def f[T](self) -> Self: ... -119 119 | -120 120 | -121 121 | class PEP695Again: +115 | +116 | +117 | class PEP695TypeParameterAtTheVeryEndOfTheList: + - def f[T, S](self: S) -> S: ... +118 + def f[T](self) -> Self: ... +119 | +120 | +121 | class PEP695Again: PYI019 [*] Use `Self` instead of custom TypeVar `_S695` --> PYI019_0.pyi:122:26 @@ -506,16 +458,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S695` 123 | def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ... | help: Replace TypeVar `_S695` with `Self` - -ℹ Safe fix -119 119 | -120 120 | -121 121 | class PEP695Again: -122 |- def mixing_and_nested[T](self: _S695, a: list[_S695], b: dict[_S695, str | T | set[_S695]]) -> _S695: ... - 122 |+ def mixing_and_nested[T](self, a: list[Self], b: dict[Self, str | T | set[Self]]) -> Self: ... -123 123 | def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ... -124 124 | -125 125 | @classmethod +119 | +120 | +121 | class PEP695Again: + - def mixing_and_nested[T](self: _S695, a: list[_S695], b: dict[_S695, str | T | set[_S695]]) -> _S695: ... +122 + def mixing_and_nested[T](self, a: list[Self], b: dict[Self, str | T | set[Self]]) -> Self: ... +123 | def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ... +124 | +125 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:126:29 @@ -534,25 +484,24 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 134 | def comment_outside_fix_range[T, S]( | help: Replace TypeVar `S` with `Self` - -ℹ Unsafe fix -123 123 | def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ... -124 124 | -125 125 | @classmethod -126 |- def comment_in_fix_range[T, S]( -127 |- cls: type[ # Lorem ipsum -128 |- S -129 |- ], - 126 |+ def comment_in_fix_range[T]( - 127 |+ cls, -130 128 | a: T, -131 |- b: tuple[S, T] -132 |- ) -> S: ... - 129 |+ b: tuple[Self, T] - 130 |+ ) -> Self: ... -133 131 | -134 132 | def comment_outside_fix_range[T, S]( -135 133 | self: S, +123 | def also_uses_s695_but_should_not_be_edited(self, v: set[tuple[_S695]]) -> _S695: ... +124 | +125 | @classmethod + - def comment_in_fix_range[T, S]( + - cls: type[ # Lorem ipsum + - S + - ], +126 + def comment_in_fix_range[T]( +127 + cls, +128 | a: T, + - b: tuple[S, T] + - ) -> S: ... +129 + b: tuple[Self, T] +130 + ) -> Self: ... +131 | +132 | def comment_outside_fix_range[T, S]( +133 | self: S, +note: This is an unsafe fix and may change runtime behavior PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:134:34 @@ -571,26 +520,24 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | |__________^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -131 131 | b: tuple[S, T] -132 132 | ) -> S: ... -133 133 | -134 |- def comment_outside_fix_range[T, S]( -135 |- self: S, - 134 |+ def comment_outside_fix_range[T]( - 135 |+ self, -136 136 | a: T, -137 137 | b: tuple[ -138 138 | # Lorem ipsum -139 |- S, T - 139 |+ Self, T -140 140 | ] -141 |- ) -> S: ... - 141 |+ ) -> Self: ... -142 142 | -143 143 | -144 144 | class SelfNotUsedInReturnAnnotation: +131 | b: tuple[S, T] +132 | ) -> S: ... +133 | + - def comment_outside_fix_range[T, S]( + - self: S, +134 + def comment_outside_fix_range[T]( +135 + self, +136 | a: T, +137 | b: tuple[ +138 | # Lorem ipsum + - S, T +139 + Self, T +140 | ] + - ) -> S: ... +141 + ) -> Self: ... +142 | +143 | +144 | class SelfNotUsedInReturnAnnotation: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:145:10 @@ -602,16 +549,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 147 | def n[S](cls: type[S], other: S) -> int: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -142 142 | -143 143 | -144 144 | class SelfNotUsedInReturnAnnotation: -145 |- def m[S](self: S, other: S) -> int: ... - 145 |+ def m(self, other: Self) -> int: ... -146 146 | @classmethod -147 147 | def n[S](cls: type[S], other: S) -> int: ... -148 148 | +142 | +143 | +144 | class SelfNotUsedInReturnAnnotation: + - def m[S](self: S, other: S) -> int: ... +145 + def m(self, other: Self) -> int: ... +146 | @classmethod +147 | def n[S](cls: type[S], other: S) -> int: ... +148 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:147:10 @@ -622,16 +567,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -144 144 | class SelfNotUsedInReturnAnnotation: -145 145 | def m[S](self: S, other: S) -> int: ... -146 146 | @classmethod -147 |- def n[S](cls: type[S], other: S) -> int: ... - 147 |+ def n(cls, other: Self) -> int: ... -148 148 | -149 149 | -150 150 | class _NotATypeVar: ... +144 | class SelfNotUsedInReturnAnnotation: +145 | def m[S](self: S, other: S) -> int: ... +146 | @classmethod + - def n[S](cls: type[S], other: S) -> int: ... +147 + def n(cls, other: Self) -> int: ... +148 | +149 | +150 | class _NotATypeVar: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:161:10 @@ -643,16 +586,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 163 | def n[S](cls: type[S], other: S): ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -158 158 | def y(self: type[_NotATypeVar]) -> _NotATypeVar: ... -159 159 | -160 160 | class NoReturnAnnotations: -161 |- def m[S](self: S, other: S): ... - 161 |+ def m(self, other: Self): ... -162 162 | @classmethod -163 163 | def n[S](cls: type[S], other: S): ... -164 164 | +158 | def y(self: type[_NotATypeVar]) -> _NotATypeVar: ... +159 | +160 | class NoReturnAnnotations: + - def m[S](self: S, other: S): ... +161 + def m(self, other: Self): ... +162 | @classmethod +163 | def n[S](cls: type[S], other: S): ... +164 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:163:10 @@ -665,16 +606,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 165 | class MultipleBoundParameters: | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -160 160 | class NoReturnAnnotations: -161 161 | def m[S](self: S, other: S): ... -162 162 | @classmethod -163 |- def n[S](cls: type[S], other: S): ... - 163 |+ def n(cls, other: Self): ... -164 164 | -165 165 | class MultipleBoundParameters: -166 166 | def m[S: int, T: int](self: S, other: T) -> S: ... +160 | class NoReturnAnnotations: +161 | def m[S](self: S, other: S): ... +162 | @classmethod + - def n[S](cls: type[S], other: S): ... +163 + def n(cls, other: Self): ... +164 | +165 | class MultipleBoundParameters: +166 | def m[S: int, T: int](self: S, other: T) -> S: ... PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:166:10 @@ -685,16 +624,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` 167 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -163 163 | def n[S](cls: type[S], other: S): ... -164 164 | -165 165 | class MultipleBoundParameters: -166 |- def m[S: int, T: int](self: S, other: T) -> S: ... - 166 |+ def m[T: int](self, other: T) -> Self: ... -167 167 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... -168 168 | -169 169 | +163 | def n[S](cls: type[S], other: S): ... +164 | +165 | class MultipleBoundParameters: + - def m[S: int, T: int](self: S, other: T) -> S: ... +166 + def m[T: int](self, other: T) -> Self: ... +167 | def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... +168 | +169 | PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:167:10 @@ -705,16 +642,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -164 164 | -165 165 | class MultipleBoundParameters: -166 166 | def m[S: int, T: int](self: S, other: T) -> S: ... -167 |- def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... - 167 |+ def n[T: (int, str)](self, other: T) -> Self: ... -168 168 | -169 169 | -170 170 | MetaType = TypeVar("MetaType") +164 | +165 | class MultipleBoundParameters: +166 | def m[S: int, T: int](self: S, other: T) -> S: ... + - def n[T: (int, str), S: (int, str)](self: S, other: T) -> S: ... +167 + def n[T: (int, str)](self, other: T) -> Self: ... +168 | +169 | +170 | MetaType = TypeVar("MetaType") PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.pyi:181:52 @@ -726,16 +661,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` 183 | @classmethod | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -178 178 | -179 179 | -180 180 | class BadClassWithStringTypeHints: -181 |- def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 - 181 |+ def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019 -182 182 | -183 183 | @classmethod -184 184 | def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 +178 | +179 | +180 | class BadClassWithStringTypeHints: + - def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 +181 + def bad_instance_method_with_string_annotations(self, arg: str) -> "Self": ... # PYI019 +182 | +183 | @classmethod +184 | def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.pyi:184:49 @@ -745,16 +678,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -181 181 | def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 -182 182 | -183 183 | @classmethod -184 |- def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 - 184 |+ def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019 -185 185 | -186 186 | -187 187 | @classmethod +181 | def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019 +182 | +183 | @classmethod + - def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019 +184 + def bad_class_method_with_string_annotations(cls) -> "Self": ... # PYI019 +185 | +186 | +187 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.pyi:188:50 @@ -764,16 +695,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -185 185 | -186 186 | -187 187 | @classmethod -188 |- def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019 - 188 |+ def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019 -189 189 | -190 190 | -191 191 | @classmethod +185 | +186 | +187 | @classmethod + - def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019 +188 + def bad_class_method_with_mixed_annotations_1(cls) -> Self: ... # PYI019 +189 | +190 | +191 | @classmethod PYI019 [*] Use `Self` instead of custom TypeVar `_S` --> PYI019_0.pyi:192:50 @@ -783,16 +712,14 @@ PYI019 [*] Use `Self` instead of custom TypeVar `_S` | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `_S` with `Self` - -ℹ Safe fix -189 189 | -190 190 | -191 191 | @classmethod -192 |- def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019 - 192 |+ def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019 -193 193 | -194 194 | -195 195 | class BadSubscriptReturnTypeWithStringTypeHints: +189 | +190 | +191 | @classmethod + - def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019 +192 + def bad_class_method_with_mixed_annotations_1(cls) -> "Self": ... # PYI019 +193 | +194 | +195 | class BadSubscriptReturnTypeWithStringTypeHints: PYI019 [*] Use `Self` instead of custom TypeVar `S` --> PYI019_0.pyi:197:10 @@ -803,13 +730,11 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -194 194 | -195 195 | class BadSubscriptReturnTypeWithStringTypeHints: -196 196 | @classmethod -197 |- def m[S](cls: "type[S]") -> "type[S]": ... # PYI019 - 197 |+ def m(cls) -> "type[Self]": ... # PYI019 -198 198 | -199 199 | -200 200 | class GoodClassWithStringTypeHints: +194 | +195 | class BadSubscriptReturnTypeWithStringTypeHints: +196 | @classmethod + - def m[S](cls: "type[S]") -> "type[S]": ... # PYI019 +197 + def m(cls) -> "type[Self]": ... # PYI019 +198 | +199 | +200 | class GoodClassWithStringTypeHints: diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap index 6a606ef108..7b701cee68 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI019_PYI019_1.pyi.snap @@ -9,10 +9,8 @@ PYI019 [*] Use `Self` instead of custom TypeVar `S` | ^^^^^^^^^^^^^^^^^ | help: Replace TypeVar `S` with `Self` - -ℹ Safe fix -1 1 | import typing -2 2 | -3 3 | class F: -4 |- def m[S](self: S) -> S: ... - 4 |+ def m(self) -> typing.Self: ... +1 | import typing +2 | +3 | class F: + - def m[S](self: S) -> S: ... +4 + def m(self) -> typing.Self: ... diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap index 2398a9f453..e86115650c 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI020_PYI020.pyi.snap @@ -12,16 +12,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 9 | _T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs | help: Remove quotes - -ℹ Safe fix -4 4 | -5 5 | import typing_extensions -6 6 | -7 |-def f(x: "int"): ... # Y020 Quoted annotations should never be used in stubs - 7 |+def f(x: int): ... # Y020 Quoted annotations should never be used in stubs -8 8 | def g(x: list["int"]): ... # Y020 Quoted annotations should never be used in stubs -9 9 | _T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs -10 10 | +4 | +5 | import typing_extensions +6 | + - def f(x: "int"): ... # Y020 Quoted annotations should never be used in stubs +7 + def f(x: int): ... # Y020 Quoted annotations should never be used in stubs +8 | def g(x: list["int"]): ... # Y020 Quoted annotations should never be used in stubs +9 | _T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs +10 | PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:8:15 @@ -32,16 +30,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 9 | _T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs | help: Remove quotes - -ℹ Safe fix -5 5 | import typing_extensions -6 6 | -7 7 | def f(x: "int"): ... # Y020 Quoted annotations should never be used in stubs -8 |-def g(x: list["int"]): ... # Y020 Quoted annotations should never be used in stubs - 8 |+def g(x: list[int]): ... # Y020 Quoted annotations should never be used in stubs -9 9 | _T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs -10 10 | -11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... +5 | import typing_extensions +6 | +7 | def f(x: "int"): ... # Y020 Quoted annotations should never be used in stubs + - def g(x: list["int"]): ... # Y020 Quoted annotations should never be used in stubs +8 + def g(x: list[int]): ... # Y020 Quoted annotations should never be used in stubs +9 | _T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs +10 | +11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:9:26 @@ -54,16 +50,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... | help: Remove quotes - -ℹ Safe fix -6 6 | -7 7 | def f(x: "int"): ... # Y020 Quoted annotations should never be used in stubs -8 8 | def g(x: list["int"]): ... # Y020 Quoted annotations should never be used in stubs -9 |-_T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs - 9 |+_T = TypeVar("_T", bound=int) # Y020 Quoted annotations should never be used in stubs -10 10 | -11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... -12 12 | +6 | +7 | def f(x: "int"): ... # Y020 Quoted annotations should never be used in stubs +8 | def g(x: list["int"]): ... # Y020 Quoted annotations should never be used in stubs + - _T = TypeVar("_T", bound="int") # Y020 Quoted annotations should never be used in stubs +9 + _T = TypeVar("_T", bound=int) # Y020 Quoted annotations should never be used in stubs +10 | +11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... +12 | PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:13:12 @@ -75,16 +69,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 14 | Alias: TypeAlias = list["int"] # Y020 Quoted annotations should never be used in stubs | help: Remove quotes - -ℹ Safe fix -10 10 | -11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... -12 12 | -13 |-def j() -> "int": ... # Y020 Quoted annotations should never be used in stubs - 13 |+def j() -> int: ... # Y020 Quoted annotations should never be used in stubs -14 14 | Alias: TypeAlias = list["int"] # Y020 Quoted annotations should never be used in stubs -15 15 | -16 16 | class Child(list["int"]): # Y020 Quoted annotations should never be used in stubs +10 | +11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... +12 | + - def j() -> "int": ... # Y020 Quoted annotations should never be used in stubs +13 + def j() -> int: ... # Y020 Quoted annotations should never be used in stubs +14 | Alias: TypeAlias = list["int"] # Y020 Quoted annotations should never be used in stubs +15 | +16 | class Child(list["int"]): # Y020 Quoted annotations should never be used in stubs PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:14:25 @@ -96,16 +88,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 16 | class Child(list["int"]): # Y020 Quoted annotations should never be used in stubs | help: Remove quotes - -ℹ Safe fix -11 11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... -12 12 | -13 13 | def j() -> "int": ... # Y020 Quoted annotations should never be used in stubs -14 |-Alias: TypeAlias = list["int"] # Y020 Quoted annotations should never be used in stubs - 14 |+Alias: TypeAlias = list[int] # Y020 Quoted annotations should never be used in stubs -15 15 | -16 16 | class Child(list["int"]): # Y020 Quoted annotations should never be used in stubs -17 17 | """Documented and guaranteed useful.""" # Y021 Docstrings should not be included in stubs +11 | def h(w: Literal["a", "b"], x: typing.Literal["c"], y: typing_extensions.Literal["d"], z: _T) -> _T: ... +12 | +13 | def j() -> "int": ... # Y020 Quoted annotations should never be used in stubs + - Alias: TypeAlias = list["int"] # Y020 Quoted annotations should never be used in stubs +14 + Alias: TypeAlias = list[int] # Y020 Quoted annotations should never be used in stubs +15 | +16 | class Child(list["int"]): # Y020 Quoted annotations should never be used in stubs +17 | """Documented and guaranteed useful.""" # Y021 Docstrings should not be included in stubs PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:16:18 @@ -117,16 +107,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 17 | """Documented and guaranteed useful.""" # Y021 Docstrings should not be included in stubs | help: Remove quotes - -ℹ Safe fix -13 13 | def j() -> "int": ... # Y020 Quoted annotations should never be used in stubs -14 14 | Alias: TypeAlias = list["int"] # Y020 Quoted annotations should never be used in stubs -15 15 | -16 |-class Child(list["int"]): # Y020 Quoted annotations should never be used in stubs - 16 |+class Child(list[int]): # Y020 Quoted annotations should never be used in stubs -17 17 | """Documented and guaranteed useful.""" # Y021 Docstrings should not be included in stubs -18 18 | -19 19 | if sys.platform == "linux": +13 | def j() -> "int": ... # Y020 Quoted annotations should never be used in stubs +14 | Alias: TypeAlias = list["int"] # Y020 Quoted annotations should never be used in stubs +15 | + - class Child(list["int"]): # Y020 Quoted annotations should never be used in stubs +16 + class Child(list[int]): # Y020 Quoted annotations should never be used in stubs +17 | """Documented and guaranteed useful.""" # Y021 Docstrings should not be included in stubs +18 | +19 | if sys.platform == "linux": PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:20:8 @@ -138,16 +126,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 22 | f: "str" # Y020 Quoted annotations should never be used in stubs | help: Remove quotes - -ℹ Safe fix -17 17 | """Documented and guaranteed useful.""" # Y021 Docstrings should not be included in stubs -18 18 | -19 19 | if sys.platform == "linux": -20 |- f: "int" # Y020 Quoted annotations should never be used in stubs - 20 |+ f: int # Y020 Quoted annotations should never be used in stubs -21 21 | elif sys.platform == "win32": -22 22 | f: "str" # Y020 Quoted annotations should never be used in stubs -23 23 | else: +17 | """Documented and guaranteed useful.""" # Y021 Docstrings should not be included in stubs +18 | +19 | if sys.platform == "linux": + - f: "int" # Y020 Quoted annotations should never be used in stubs +20 + f: int # Y020 Quoted annotations should never be used in stubs +21 | elif sys.platform == "win32": +22 | f: "str" # Y020 Quoted annotations should never be used in stubs +23 | else: PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:22:8 @@ -160,16 +146,14 @@ PYI020 [*] Quoted annotations should not be included in stubs 24 | f: "bytes" # Y020 Quoted annotations should never be used in stubs | help: Remove quotes - -ℹ Safe fix -19 19 | if sys.platform == "linux": -20 20 | f: "int" # Y020 Quoted annotations should never be used in stubs -21 21 | elif sys.platform == "win32": -22 |- f: "str" # Y020 Quoted annotations should never be used in stubs - 22 |+ f: str # Y020 Quoted annotations should never be used in stubs -23 23 | else: -24 24 | f: "bytes" # Y020 Quoted annotations should never be used in stubs -25 25 | +19 | if sys.platform == "linux": +20 | f: "int" # Y020 Quoted annotations should never be used in stubs +21 | elif sys.platform == "win32": + - f: "str" # Y020 Quoted annotations should never be used in stubs +22 + f: str # Y020 Quoted annotations should never be used in stubs +23 | else: +24 | f: "bytes" # Y020 Quoted annotations should never be used in stubs +25 | PYI020 [*] Quoted annotations should not be included in stubs --> PYI020.pyi:24:8 @@ -182,13 +166,11 @@ PYI020 [*] Quoted annotations should not be included in stubs 26 | # These two shouldn't trigger Y020 -- empty strings can't be "quoted annotations" | help: Remove quotes - -ℹ Safe fix -21 21 | elif sys.platform == "win32": -22 22 | f: "str" # Y020 Quoted annotations should never be used in stubs -23 23 | else: -24 |- f: "bytes" # Y020 Quoted annotations should never be used in stubs - 24 |+ f: bytes # Y020 Quoted annotations should never be used in stubs -25 25 | -26 26 | # These two shouldn't trigger Y020 -- empty strings can't be "quoted annotations" -27 27 | k = "" # Y052 Need type annotation for "k" +21 | elif sys.platform == "win32": +22 | f: "str" # Y020 Quoted annotations should never be used in stubs +23 | else: + - f: "bytes" # Y020 Quoted annotations should never be used in stubs +24 + f: bytes # Y020 Quoted annotations should never be used in stubs +25 | +26 | # These two shouldn't trigger Y020 -- empty strings can't be "quoted annotations" +27 | k = "" # Y052 Need type annotation for "k" diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap index 1813232fb8..fec14111e2 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI021_PYI021.pyi.snap @@ -10,13 +10,12 @@ PYI021 [*] Docstrings should not be included in stubs 3 | def foo(): | help: Remove docstring - -ℹ Unsafe fix -1 |-"""foo""" # ERROR PYI021 - 1 |+ # ERROR PYI021 -2 2 | -3 3 | def foo(): -4 4 | """foo""" # ERROR PYI021 + - """foo""" # ERROR PYI021 +1 + # ERROR PYI021 +2 | +3 | def foo(): +4 | """foo""" # ERROR PYI021 +note: This is an unsafe fix and may change runtime behavior PYI021 [*] Docstrings should not be included in stubs --> PYI021.pyi:4:5 @@ -28,16 +27,15 @@ PYI021 [*] Docstrings should not be included in stubs 6 | class Bar: | help: Remove docstring - -ℹ Unsafe fix -1 1 | """foo""" # ERROR PYI021 -2 2 | -3 3 | def foo(): -4 |- """foo""" # ERROR PYI021 - 4 |+ ... # ERROR PYI021 -5 5 | -6 6 | class Bar: -7 7 | """bar""" # ERROR PYI021 +1 | """foo""" # ERROR PYI021 +2 | +3 | def foo(): + - """foo""" # ERROR PYI021 +4 + ... # ERROR PYI021 +5 | +6 | class Bar: +7 | """bar""" # ERROR PYI021 +note: This is an unsafe fix and may change runtime behavior PYI021 [*] Docstrings should not be included in stubs --> PYI021.pyi:7:5 @@ -49,16 +47,15 @@ PYI021 [*] Docstrings should not be included in stubs 9 | class Qux: | help: Remove docstring - -ℹ Unsafe fix -4 4 | """foo""" # ERROR PYI021 -5 5 | -6 6 | class Bar: -7 |- """bar""" # ERROR PYI021 - 7 |+ ... # ERROR PYI021 -8 8 | -9 9 | class Qux: -10 10 | """qux""" # ERROR PYI021 +4 | """foo""" # ERROR PYI021 +5 | +6 | class Bar: + - """bar""" # ERROR PYI021 +7 + ... # ERROR PYI021 +8 | +9 | class Qux: +10 | """qux""" # ERROR PYI021 +note: This is an unsafe fix and may change runtime behavior PYI021 [*] Docstrings should not be included in stubs --> PYI021.pyi:10:5 @@ -70,16 +67,15 @@ PYI021 [*] Docstrings should not be included in stubs 12 | def __init__(self) -> None: ... | help: Remove docstring - -ℹ Unsafe fix -7 7 | """bar""" # ERROR PYI021 -8 8 | -9 9 | class Qux: -10 |- """qux""" # ERROR PYI021 - 10 |+ # ERROR PYI021 -11 11 | -12 12 | def __init__(self) -> None: ... -13 13 | +7 | """bar""" # ERROR PYI021 +8 | +9 | class Qux: + - """qux""" # ERROR PYI021 +10 + # ERROR PYI021 +11 | +12 | def __init__(self) -> None: ... +13 | +note: This is an unsafe fix and may change runtime behavior PYI021 [*] Docstrings should not be included in stubs --> PYI021.pyi:15:5 @@ -94,16 +90,15 @@ PYI021 [*] Docstrings should not be included in stubs 20 | def __init__(self) -> None: ... | help: Remove docstring - -ℹ Unsafe fix -12 12 | def __init__(self) -> None: ... -13 13 | -14 14 | class Baz: -15 |- """Multiline docstring -16 |- -17 |- Lorem ipsum dolor sit amet -18 |- """ - 15 |+ -19 16 | -20 17 | def __init__(self) -> None: ... -21 18 | +12 | def __init__(self) -> None: ... +13 | +14 | class Baz: + - """Multiline docstring + - + - Lorem ipsum dolor sit amet + - """ +15 + +16 | +17 | def __init__(self) -> None: ... +18 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap index 1e5b623529..12f30669a9 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.py.snap @@ -9,16 +9,14 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi | ^^^ | help: Alias `Set` to `AbstractSet` - -ℹ Safe fix -7 7 | -8 8 | -9 9 | def f(): -10 |- from collections.abc import Set # PYI025 - 10 |+ from collections.abc import Set as AbstractSet # PYI025 -11 11 | -12 12 | -13 13 | def f(): +7 | +8 | +9 | def f(): + - from collections.abc import Set # PYI025 +10 + from collections.abc import Set as AbstractSet # PYI025 +11 | +12 | +13 | def f(): PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin --> PYI025_1.py:14:51 @@ -30,17 +28,15 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 16 | GLOBAL: Set[int] = set() | help: Alias `Set` to `AbstractSet` - -ℹ Safe fix -11 11 | -12 12 | -13 13 | def f(): -14 |- from collections.abc import Container, Sized, Set, ValuesView # PYI025 - 14 |+ from collections.abc import Container, Sized, Set as AbstractSet, ValuesView # PYI025 -15 15 | -16 |- GLOBAL: Set[int] = set() - 16 |+ GLOBAL: AbstractSet[int] = set() -17 17 | -18 18 | class Class: -19 |- member: Set[int] - 19 |+ member: AbstractSet[int] +11 | +12 | +13 | def f(): + - from collections.abc import Container, Sized, Set, ValuesView # PYI025 +14 + from collections.abc import Container, Sized, Set as AbstractSet, ValuesView # PYI025 +15 | + - GLOBAL: Set[int] = set() +16 + GLOBAL: AbstractSet[int] = set() +17 | +18 | class Class: + - member: Set[int] +19 + member: AbstractSet[int] diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap index e8148d3b21..0f54a8cf79 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_1.pyi.snap @@ -11,16 +11,14 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 10 | def f(): | help: Alias `Set` to `AbstractSet` - -ℹ Safe fix -5 5 | from collections.abc import Container, Sized, Set as AbstractSet, ValuesView # Ok -6 6 | -7 7 | def f(): -8 |- from collections.abc import Set # PYI025 - 8 |+ from collections.abc import Set as AbstractSet # PYI025 -9 9 | -10 10 | def f(): -11 11 | from collections.abc import Container, Sized, Set, ValuesView # PYI025 +5 | from collections.abc import Container, Sized, Set as AbstractSet, ValuesView # Ok +6 | +7 | def f(): + - from collections.abc import Set # PYI025 +8 + from collections.abc import Set as AbstractSet # PYI025 +9 | +10 | def f(): +11 | from collections.abc import Container, Sized, Set, ValuesView # PYI025 PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin --> PYI025_1.pyi:11:51 @@ -32,16 +30,14 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 13 | def f(): | help: Alias `Set` to `AbstractSet` - -ℹ Safe fix -8 8 | from collections.abc import Set # PYI025 -9 9 | -10 10 | def f(): -11 |- from collections.abc import Container, Sized, Set, ValuesView # PYI025 - 11 |+ from collections.abc import Container, Sized, Set as AbstractSet, ValuesView # PYI025 -12 12 | -13 13 | def f(): -14 14 | """Test: local symbol renaming.""" +8 | from collections.abc import Set # PYI025 +9 | +10 | def f(): + - from collections.abc import Container, Sized, Set, ValuesView # PYI025 +11 + from collections.abc import Container, Sized, Set as AbstractSet, ValuesView # PYI025 +12 | +13 | def f(): +14 | """Test: local symbol renaming.""" PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin --> PYI025_1.pyi:16:37 @@ -54,30 +50,28 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 18 | Set = 1 | help: Alias `Set` to `AbstractSet` - -ℹ Safe fix -13 13 | def f(): -14 14 | """Test: local symbol renaming.""" -15 15 | if True: -16 |- from collections.abc import Set - 16 |+ from collections.abc import Set as AbstractSet -17 17 | else: -18 |- Set = 1 - 18 |+ AbstractSet = 1 -19 19 | -20 20 | x: Set = set() -21 21 | -22 22 | x: Set -23 23 | -24 |- del Set - 24 |+ del AbstractSet -25 25 | -26 26 | def f(): -27 |- print(Set) - 27 |+ print(AbstractSet) -28 28 | -29 29 | def Set(): -30 30 | pass +13 | def f(): +14 | """Test: local symbol renaming.""" +15 | if True: + - from collections.abc import Set +16 + from collections.abc import Set as AbstractSet +17 | else: + - Set = 1 +18 + AbstractSet = 1 +19 | +20 | x: Set = set() +21 | +22 | x: Set +23 | + - del Set +24 + del AbstractSet +25 | +26 | def f(): + - print(Set) +27 + print(AbstractSet) +28 | +29 | def Set(): +30 | pass PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin --> PYI025_1.pyi:33:29 @@ -90,38 +84,36 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 35 | def f(): | help: Alias `Set` to `AbstractSet` - -ℹ Safe fix -17 17 | else: -18 18 | Set = 1 -19 19 | -20 |- x: Set = set() - 20 |+ x: AbstractSet = set() -21 21 | -22 |- x: Set - 22 |+ x: AbstractSet -23 23 | -24 24 | del Set -25 25 | +17 | else: +18 | Set = 1 +19 | + - x: Set = set() +20 + x: AbstractSet = set() +21 | + - x: Set +22 + x: AbstractSet +23 | +24 | del Set +25 | -------------------------------------------------------------------------------- -30 30 | pass -31 31 | print(Set) -32 32 | -33 |-from collections.abc import Set - 33 |+from collections.abc import Set as AbstractSet -34 34 | -35 35 | def f(): -36 36 | """Test: global symbol renaming.""" -37 |- global Set - 37 |+ global AbstractSet -38 38 | -39 |- Set = 1 -40 |- print(Set) - 39 |+ AbstractSet = 1 - 40 |+ print(AbstractSet) -41 41 | -42 42 | def f(): -43 43 | """Test: nonlocal symbol renaming.""" +30 | pass +31 | print(Set) +32 | + - from collections.abc import Set +33 + from collections.abc import Set as AbstractSet +34 | +35 | def f(): +36 | """Test: global symbol renaming.""" + - global Set +37 + global AbstractSet +38 | + - Set = 1 + - print(Set) +39 + AbstractSet = 1 +40 + print(AbstractSet) +41 | +42 | def f(): +43 | """Test: nonlocal symbol renaming.""" PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusion with the `set` builtin --> PYI025_1.pyi:44:33 @@ -134,19 +126,17 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 46 | def g(): | help: Alias `Set` to `AbstractSet` - -ℹ Safe fix -41 41 | -42 42 | def f(): -43 43 | """Test: nonlocal symbol renaming.""" -44 |- from collections.abc import Set - 44 |+ from collections.abc import Set as AbstractSet -45 45 | -46 46 | def g(): -47 |- nonlocal Set - 47 |+ nonlocal AbstractSet -48 48 | -49 |- Set = 1 -50 |- print(Set) - 49 |+ AbstractSet = 1 - 50 |+ print(AbstractSet) +41 | +42 | def f(): +43 | """Test: nonlocal symbol renaming.""" + - from collections.abc import Set +44 + from collections.abc import Set as AbstractSet +45 | +46 | def g(): + - nonlocal Set +47 + nonlocal AbstractSet +48 | + - Set = 1 + - print(Set) +49 + AbstractSet = 1 +50 + print(AbstractSet) diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap index ef5a7584bb..3a46a06d38 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.py.snap @@ -12,24 +12,23 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 5 | __all__ = ["Set"] | help: Alias `Set` to `AbstractSet` - -ℹ Unsafe fix -1 1 | """Tests to ensure we correctly rename references inside `__all__`""" -2 2 | -3 |-from collections.abc import Set - 3 |+from collections.abc import Set as AbstractSet -4 4 | -5 |-__all__ = ["Set"] - 5 |+__all__ = ["AbstractSet"] -6 6 | -7 7 | if True: -8 |- __all__ += [r'''Set'''] - 8 |+ __all__ += ["AbstractSet"] -9 9 | -10 10 | if 1: -11 |- __all__ += ["S" "e" "t"] - 11 |+ __all__ += ["AbstractSet"] -12 12 | -13 13 | if not False: -14 |- __all__ += ["Se" 't'] - 14 |+ __all__ += ["AbstractSet"] +1 | """Tests to ensure we correctly rename references inside `__all__`""" +2 | + - from collections.abc import Set +3 + from collections.abc import Set as AbstractSet +4 | + - __all__ = ["Set"] +5 + __all__ = ["AbstractSet"] +6 | +7 | if True: + - __all__ += [r'''Set'''] +8 + __all__ += ["AbstractSet"] +9 | +10 | if 1: + - __all__ += ["S" "e" "t"] +11 + __all__ += ["AbstractSet"] +12 | +13 | if not False: + - __all__ += ["Se" 't'] +14 + __all__ += ["AbstractSet"] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap index 16ad7a6cc6..711a53b3b8 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_2.pyi.snap @@ -12,24 +12,23 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi 5 | __all__ = ["Set"] | help: Alias `Set` to `AbstractSet` - -ℹ Unsafe fix -1 1 | """Tests to ensure we correctly rename references inside `__all__`""" -2 2 | -3 |-from collections.abc import Set - 3 |+from collections.abc import Set as AbstractSet -4 4 | -5 |-__all__ = ["Set"] - 5 |+__all__ = ["AbstractSet"] -6 6 | -7 7 | if True: -8 |- __all__ += [r'''Set'''] - 8 |+ __all__ += ["AbstractSet"] -9 9 | -10 10 | if 1: -11 |- __all__ += ["S" "e" "t"] - 11 |+ __all__ += ["AbstractSet"] -12 12 | -13 13 | if not False: -14 |- __all__ += ["Se" 't'] - 14 |+ __all__ += ["AbstractSet"] +1 | """Tests to ensure we correctly rename references inside `__all__`""" +2 | + - from collections.abc import Set +3 + from collections.abc import Set as AbstractSet +4 | + - __all__ = ["Set"] +5 + __all__ = ["AbstractSet"] +6 | +7 | if True: + - __all__ += [r'''Set'''] +8 + __all__ += ["AbstractSet"] +9 | +10 | if 1: + - __all__ += ["S" "e" "t"] +11 + __all__ += ["AbstractSet"] +12 | +13 | if not False: + - __all__ += ["Se" 't'] +14 + __all__ += ["AbstractSet"] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap index ae989e3db5..4c11e4a4a1 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.py.snap @@ -10,10 +10,9 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi | ^^^ | help: Alias `Set` to `AbstractSet` - -ℹ Unsafe fix -3 3 | through usage of a "redundant" `import Set as Set` alias -4 4 | """ -5 5 | -6 |-from collections.abc import Set as Set # PYI025 triggered but fix is not marked as safe - 6 |+from collections.abc import Set as AbstractSet # PYI025 triggered but fix is not marked as safe +3 | through usage of a "redundant" `import Set as Set` alias +4 | """ +5 | + - from collections.abc import Set as Set # PYI025 triggered but fix is not marked as safe +6 + from collections.abc import Set as AbstractSet # PYI025 triggered but fix is not marked as safe +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap index c277b2ce9e..68b225df67 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025_3.pyi.snap @@ -10,10 +10,9 @@ PYI025 [*] Use `from collections.abc import Set as AbstractSet` to avoid confusi | ^^^ | help: Alias `Set` to `AbstractSet` - -ℹ Unsafe fix -3 3 | through usage of a "redundant" `import Set as Set` alias -4 4 | """ -5 5 | -6 |-from collections.abc import Set as Set # PYI025 triggered but fix is not marked as safe - 6 |+from collections.abc import Set as AbstractSet # PYI025 triggered but fix is not marked as safe +3 | through usage of a "redundant" `import Set as Set` alias +4 | """ +5 | + - from collections.abc import Set as Set # PYI025 triggered but fix is not marked as safe +6 + from collections.abc import Set as AbstractSet # PYI025 triggered but fix is not marked as safe +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap index 5c772f1030..e6e31f6e57 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI026_PYI026.pyi.snap @@ -12,16 +12,14 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `NewAny: TypeAlias = Any 5 | Foo = Literal["foo"] | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 |-from typing import Literal, Any - 1 |+from typing import Literal, Any, TypeAlias -2 2 | -3 |-NewAny = Any - 3 |+NewAny: TypeAlias = Any -4 4 | OptionalStr = typing.Optional[str] -5 5 | Foo = Literal["foo"] -6 6 | IntOrStr = int | str + - from typing import Literal, Any +1 + from typing import Literal, Any, TypeAlias +2 | + - NewAny = Any +3 + NewAny: TypeAlias = Any +4 | OptionalStr = typing.Optional[str] +5 | Foo = Literal["foo"] +6 | IntOrStr = int | str PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `OptionalStr: TypeAlias = typing.Optional[str]` --> PYI026.pyi:4:1 @@ -33,17 +31,15 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `OptionalStr: TypeAlias 6 | IntOrStr = int | str | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 |-from typing import Literal, Any - 1 |+from typing import Literal, Any, TypeAlias -2 2 | -3 3 | NewAny = Any -4 |-OptionalStr = typing.Optional[str] - 4 |+OptionalStr: TypeAlias = typing.Optional[str] -5 5 | Foo = Literal["foo"] -6 6 | IntOrStr = int | str -7 7 | AliasNone = None + - from typing import Literal, Any +1 + from typing import Literal, Any, TypeAlias +2 | +3 | NewAny = Any + - OptionalStr = typing.Optional[str] +4 + OptionalStr: TypeAlias = typing.Optional[str] +5 | Foo = Literal["foo"] +6 | IntOrStr = int | str +7 | AliasNone = None PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `Foo: TypeAlias = Literal["foo"]` --> PYI026.pyi:5:1 @@ -56,18 +52,16 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `Foo: TypeAlias = Litera 7 | AliasNone = None | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 |-from typing import Literal, Any - 1 |+from typing import Literal, Any, TypeAlias -2 2 | -3 3 | NewAny = Any -4 4 | OptionalStr = typing.Optional[str] -5 |-Foo = Literal["foo"] - 5 |+Foo: TypeAlias = Literal["foo"] -6 6 | IntOrStr = int | str -7 7 | AliasNone = None -8 8 | + - from typing import Literal, Any +1 + from typing import Literal, Any, TypeAlias +2 | +3 | NewAny = Any +4 | OptionalStr = typing.Optional[str] + - Foo = Literal["foo"] +5 + Foo: TypeAlias = Literal["foo"] +6 | IntOrStr = int | str +7 | AliasNone = None +8 | PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `IntOrStr: TypeAlias = int | str` --> PYI026.pyi:6:1 @@ -79,19 +73,17 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `IntOrStr: TypeAlias = i 7 | AliasNone = None | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 |-from typing import Literal, Any - 1 |+from typing import Literal, Any, TypeAlias -2 2 | -3 3 | NewAny = Any -4 4 | OptionalStr = typing.Optional[str] -5 5 | Foo = Literal["foo"] -6 |-IntOrStr = int | str - 6 |+IntOrStr: TypeAlias = int | str -7 7 | AliasNone = None -8 8 | -9 9 | NewAny: typing.TypeAlias = Any + - from typing import Literal, Any +1 + from typing import Literal, Any, TypeAlias +2 | +3 | NewAny = Any +4 | OptionalStr = typing.Optional[str] +5 | Foo = Literal["foo"] + - IntOrStr = int | str +6 + IntOrStr: TypeAlias = int | str +7 | AliasNone = None +8 | +9 | NewAny: typing.TypeAlias = Any PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `AliasNone: TypeAlias = None` --> PYI026.pyi:7:1 @@ -104,20 +96,18 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `AliasNone: TypeAlias = 9 | NewAny: typing.TypeAlias = Any | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 |-from typing import Literal, Any - 1 |+from typing import Literal, Any, TypeAlias -2 2 | -3 3 | NewAny = Any -4 4 | OptionalStr = typing.Optional[str] -5 5 | Foo = Literal["foo"] -6 6 | IntOrStr = int | str -7 |-AliasNone = None - 7 |+AliasNone: TypeAlias = None -8 8 | -9 9 | NewAny: typing.TypeAlias = Any -10 10 | OptionalStr: TypeAlias = typing.Optional[str] + - from typing import Literal, Any +1 + from typing import Literal, Any, TypeAlias +2 | +3 | NewAny = Any +4 | OptionalStr = typing.Optional[str] +5 | Foo = Literal["foo"] +6 | IntOrStr = int | str + - AliasNone = None +7 + AliasNone: TypeAlias = None +8 | +9 | NewAny: typing.TypeAlias = Any +10 | OptionalStr: TypeAlias = typing.Optional[str] PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `FLAG_THIS: TypeAlias = None` --> PYI026.pyi:17:5 @@ -129,19 +119,17 @@ PYI026 [*] Use `typing.TypeAlias` for type alias, e.g., `FLAG_THIS: TypeAlias = 19 | # these are ok | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 |-from typing import Literal, Any - 1 |+from typing import Literal, Any, TypeAlias -2 2 | -3 3 | NewAny = Any -4 4 | OptionalStr = typing.Optional[str] + - from typing import Literal, Any +1 + from typing import Literal, Any, TypeAlias +2 | +3 | NewAny = Any +4 | OptionalStr = typing.Optional[str] -------------------------------------------------------------------------------- -14 14 | AliasNone: typing.TypeAlias = None -15 15 | -16 16 | class NotAnEnum: -17 |- FLAG_THIS = None - 17 |+ FLAG_THIS: TypeAlias = None -18 18 | -19 19 | # these are ok -20 20 | from enum import Enum +14 | AliasNone: typing.TypeAlias = None +15 | +16 | class NotAnEnum: + - FLAG_THIS = None +17 + FLAG_THIS: TypeAlias = None +18 | +19 | # these are ok +20 | from enum import Enum diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap index 23fbe27ce2..4e03c21410 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI029_PYI029.pyi.snap @@ -11,16 +11,14 @@ PYI029 [*] Defining `__str__` in a stub is almost always redundant 12 | class ShouldRemove: | help: Remove definition of `__str__` - -ℹ Safe fix -7 7 | def __repr__(self, *, foo) -> str: ... -8 8 | -9 9 | class ShouldRemoveSingle: -10 |- def __str__(self) -> builtins.str: ... # Error: PYI029 - 10 |+ pass # Error: PYI029 -11 11 | -12 12 | class ShouldRemove: -13 13 | def __repr__(self) -> str: ... # Error: PYI029 +7 | def __repr__(self, *, foo) -> str: ... +8 | +9 | class ShouldRemoveSingle: + - def __str__(self) -> builtins.str: ... # Error: PYI029 +10 + pass # Error: PYI029 +11 | +12 | class ShouldRemove: +13 | def __repr__(self) -> str: ... # Error: PYI029 PYI029 [*] Defining `__repr__` in a stub is almost always redundant --> PYI029.pyi:13:9 @@ -31,15 +29,13 @@ PYI029 [*] Defining `__repr__` in a stub is almost always redundant 14 | def __str__(self) -> builtins.str: ... # Error: PYI029 | help: Remove definition of `__repr__` - -ℹ Safe fix -10 10 | def __str__(self) -> builtins.str: ... # Error: PYI029 -11 11 | -12 12 | class ShouldRemove: -13 |- def __repr__(self) -> str: ... # Error: PYI029 -14 13 | def __str__(self) -> builtins.str: ... # Error: PYI029 -15 14 | -16 15 | class NoReturnSpecified: +10 | def __str__(self) -> builtins.str: ... # Error: PYI029 +11 | +12 | class ShouldRemove: + - def __repr__(self) -> str: ... # Error: PYI029 +13 | def __str__(self) -> builtins.str: ... # Error: PYI029 +14 | +15 | class NoReturnSpecified: PYI029 [*] Defining `__str__` in a stub is almost always redundant --> PYI029.pyi:14:9 @@ -52,12 +48,10 @@ PYI029 [*] Defining `__str__` in a stub is almost always redundant 16 | class NoReturnSpecified: | help: Remove definition of `__str__` - -ℹ Safe fix -11 11 | -12 12 | class ShouldRemove: -13 13 | def __repr__(self) -> str: ... # Error: PYI029 -14 |- def __str__(self) -> builtins.str: ... # Error: PYI029 -15 14 | -16 15 | class NoReturnSpecified: -17 16 | def __str__(self): ... +11 | +12 | class ShouldRemove: +13 | def __repr__(self) -> str: ... # Error: PYI029 + - def __str__(self) -> builtins.str: ... # Error: PYI029 +14 | +15 | class NoReturnSpecified: +16 | def __str__(self): ... diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap index 1d3b52f3b9..3768ab0bea 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap @@ -11,16 +11,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 11 | # Should emit for union types in arguments. | help: Replace with a single `Literal` - -ℹ Safe fix -6 6 | field1: Literal[1] # OK -7 7 | -8 8 | # Should emit for duplicate field types. -9 |-field2: Literal[1] | Literal[2] # Error - 9 |+field2: Literal[1, 2] # Error -10 10 | -11 11 | # Should emit for union types in arguments. -12 12 | def func1(arg1: Literal[1] | Literal[2]): # Error +6 | field1: Literal[1] # OK +7 | +8 | # Should emit for duplicate field types. + - field2: Literal[1] | Literal[2] # Error +9 + field2: Literal[1, 2] # Error +10 | +11 | # Should emit for union types in arguments. +12 | def func1(arg1: Literal[1] | Literal[2]): # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:12:17 @@ -31,16 +29,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 13 | print(arg1) | help: Replace with a single `Literal` - -ℹ Safe fix -9 9 | field2: Literal[1] | Literal[2] # Error -10 10 | -11 11 | # Should emit for union types in arguments. -12 |-def func1(arg1: Literal[1] | Literal[2]): # Error - 12 |+def func1(arg1: Literal[1, 2]): # Error -13 13 | print(arg1) -14 14 | -15 15 | +9 | field2: Literal[1] | Literal[2] # Error +10 | +11 | # Should emit for union types in arguments. + - def func1(arg1: Literal[1] | Literal[2]): # Error +12 + def func1(arg1: Literal[1, 2]): # Error +13 | print(arg1) +14 | +15 | PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:17:16 @@ -51,16 +47,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 18 | return "my Literal[1]ing" | help: Replace with a single `Literal` - -ℹ Safe fix -14 14 | -15 15 | -16 16 | # Should emit for unions in return types. -17 |-def func2() -> Literal[1] | Literal[2]: # Error - 17 |+def func2() -> Literal[1, 2]: # Error -18 18 | return "my Literal[1]ing" -19 19 | -20 20 | +14 | +15 | +16 | # Should emit for unions in return types. + - def func2() -> Literal[1] | Literal[2]: # Error +17 + def func2() -> Literal[1, 2]: # Error +18 | return "my Literal[1]ing" +19 | +20 | PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:22:9 @@ -72,16 +66,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 24 | field5: Literal[1] | str | Literal[2] # Error | help: Replace with a single `Literal` - -ℹ Safe fix -19 19 | -20 20 | -21 21 | # Should emit in longer unions, even if not directly adjacent. -22 |-field3: Literal[1] | Literal[2] | str # Error - 22 |+field3: Literal[1, 2] | str # Error -23 23 | field4: str | Literal[1] | Literal[2] # Error -24 24 | field5: Literal[1] | str | Literal[2] # Error -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error +19 | +20 | +21 | # Should emit in longer unions, even if not directly adjacent. + - field3: Literal[1] | Literal[2] | str # Error +22 + field3: Literal[1, 2] | str # Error +23 | field4: str | Literal[1] | Literal[2] # Error +24 | field5: Literal[1] | str | Literal[2] # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:23:9 @@ -94,16 +86,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 25 | field6: Literal[1] | bool | Literal[2] | str # Error | help: Replace with a single `Literal` - -ℹ Safe fix -20 20 | -21 21 | # Should emit in longer unions, even if not directly adjacent. -22 22 | field3: Literal[1] | Literal[2] | str # Error -23 |-field4: str | Literal[1] | Literal[2] # Error - 23 |+field4: Literal[1, 2] | str # Error -24 24 | field5: Literal[1] | str | Literal[2] # Error -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error -26 26 | +20 | +21 | # Should emit in longer unions, even if not directly adjacent. +22 | field3: Literal[1] | Literal[2] | str # Error + - field4: str | Literal[1] | Literal[2] # Error +23 + field4: Literal[1, 2] | str # Error +24 | field5: Literal[1] | str | Literal[2] # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error +26 | PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:24:9 @@ -115,16 +105,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 25 | field6: Literal[1] | bool | Literal[2] | str # Error | help: Replace with a single `Literal` - -ℹ Safe fix -21 21 | # Should emit in longer unions, even if not directly adjacent. -22 22 | field3: Literal[1] | Literal[2] | str # Error -23 23 | field4: str | Literal[1] | Literal[2] # Error -24 |-field5: Literal[1] | str | Literal[2] # Error - 24 |+field5: Literal[1, 2] | str # Error -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error -26 26 | -27 27 | # Should emit for non-type unions. +21 | # Should emit in longer unions, even if not directly adjacent. +22 | field3: Literal[1] | Literal[2] | str # Error +23 | field4: str | Literal[1] | Literal[2] # Error + - field5: Literal[1] | str | Literal[2] # Error +24 + field5: Literal[1, 2] | str # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error +26 | +27 | # Should emit for non-type unions. PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:25:9 @@ -137,16 +125,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 27 | # Should emit for non-type unions. | help: Replace with a single `Literal` - -ℹ Safe fix -22 22 | field3: Literal[1] | Literal[2] | str # Error -23 23 | field4: str | Literal[1] | Literal[2] # Error -24 24 | field5: Literal[1] | str | Literal[2] # Error -25 |-field6: Literal[1] | bool | Literal[2] | str # Error - 25 |+field6: Literal[1, 2] | bool | str # Error -26 26 | -27 27 | # Should emit for non-type unions. -28 28 | field7 = Literal[1] | Literal[2] # Error +22 | field3: Literal[1] | Literal[2] | str # Error +23 | field4: str | Literal[1] | Literal[2] # Error +24 | field5: Literal[1] | str | Literal[2] # Error + - field6: Literal[1] | bool | Literal[2] | str # Error +25 + field6: Literal[1, 2] | bool | str # Error +26 | +27 | # Should emit for non-type unions. +28 | field7 = Literal[1] | Literal[2] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:28:10 @@ -158,16 +144,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 30 | # Should emit for parenthesized unions. | help: Replace with a single `Literal` - -ℹ Safe fix -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error -26 26 | -27 27 | # Should emit for non-type unions. -28 |-field7 = Literal[1] | Literal[2] # Error - 28 |+field7 = Literal[1, 2] # Error -29 29 | -30 30 | # Should emit for parenthesized unions. -31 31 | field8: Literal[1] | (Literal[2] | str) # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error +26 | +27 | # Should emit for non-type unions. + - field7 = Literal[1] | Literal[2] # Error +28 + field7 = Literal[1, 2] # Error +29 | +30 | # Should emit for parenthesized unions. +31 | field8: Literal[1] | (Literal[2] | str) # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:31:9 @@ -179,16 +163,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 33 | # Should handle user parentheses when fixing. | help: Replace with a single `Literal` - -ℹ Safe fix -28 28 | field7 = Literal[1] | Literal[2] # Error -29 29 | -30 30 | # Should emit for parenthesized unions. -31 |-field8: Literal[1] | (Literal[2] | str) # Error - 31 |+field8: Literal[1, 2] | str # Error -32 32 | -33 33 | # Should handle user parentheses when fixing. -34 34 | field9: Literal[1] | (Literal[2] | str) # Error +28 | field7 = Literal[1] | Literal[2] # Error +29 | +30 | # Should emit for parenthesized unions. + - field8: Literal[1] | (Literal[2] | str) # Error +31 + field8: Literal[1, 2] | str # Error +32 | +33 | # Should handle user parentheses when fixing. +34 | field9: Literal[1] | (Literal[2] | str) # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:34:9 @@ -199,16 +181,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 35 | field10: (Literal[1] | str) | Literal[2] # Error | help: Replace with a single `Literal` - -ℹ Safe fix -31 31 | field8: Literal[1] | (Literal[2] | str) # Error -32 32 | -33 33 | # Should handle user parentheses when fixing. -34 |-field9: Literal[1] | (Literal[2] | str) # Error - 34 |+field9: Literal[1, 2] | str # Error -35 35 | field10: (Literal[1] | str) | Literal[2] # Error -36 36 | -37 37 | # Should emit for union in generic parent type. +31 | field8: Literal[1] | (Literal[2] | str) # Error +32 | +33 | # Should handle user parentheses when fixing. + - field9: Literal[1] | (Literal[2] | str) # Error +34 + field9: Literal[1, 2] | str # Error +35 | field10: (Literal[1] | str) | Literal[2] # Error +36 | +37 | # Should emit for union in generic parent type. PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:35:10 @@ -221,16 +201,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 37 | # Should emit for union in generic parent type. | help: Replace with a single `Literal` - -ℹ Safe fix -32 32 | -33 33 | # Should handle user parentheses when fixing. -34 34 | field9: Literal[1] | (Literal[2] | str) # Error -35 |-field10: (Literal[1] | str) | Literal[2] # Error - 35 |+field10: Literal[1, 2] | str # Error -36 36 | -37 37 | # Should emit for union in generic parent type. -38 38 | field11: dict[Literal[1] | Literal[2], str] # Error +32 | +33 | # Should handle user parentheses when fixing. +34 | field9: Literal[1] | (Literal[2] | str) # Error + - field10: (Literal[1] | str) | Literal[2] # Error +35 + field10: Literal[1, 2] | str # Error +36 | +37 | # Should emit for union in generic parent type. +38 | field11: dict[Literal[1] | Literal[2], str] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:38:15 @@ -242,16 +220,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 40 | # Should emit for unions with more than two cases | help: Replace with a single `Literal` - -ℹ Safe fix -35 35 | field10: (Literal[1] | str) | Literal[2] # Error -36 36 | -37 37 | # Should emit for union in generic parent type. -38 |-field11: dict[Literal[1] | Literal[2], str] # Error - 38 |+field11: dict[Literal[1, 2], str] # Error -39 39 | -40 40 | # Should emit for unions with more than two cases -41 41 | field12: Literal[1] | Literal[2] | Literal[3] # Error +35 | field10: (Literal[1] | str) | Literal[2] # Error +36 | +37 | # Should emit for union in generic parent type. + - field11: dict[Literal[1] | Literal[2], str] # Error +38 + field11: dict[Literal[1, 2], str] # Error +39 | +40 | # Should emit for unions with more than two cases +41 | field12: Literal[1] | Literal[2] | Literal[3] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]` --> PYI030.py:41:10 @@ -262,16 +238,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error | help: Replace with a single `Literal` - -ℹ Safe fix -38 38 | field11: dict[Literal[1] | Literal[2], str] # Error -39 39 | -40 40 | # Should emit for unions with more than two cases -41 |-field12: Literal[1] | Literal[2] | Literal[3] # Error - 41 |+field12: Literal[1, 2, 3] # Error -42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error -43 43 | -44 44 | # Should emit for unions with more than two cases, even if not directly adjacent +38 | field11: dict[Literal[1] | Literal[2], str] # Error +39 | +40 | # Should emit for unions with more than two cases + - field12: Literal[1] | Literal[2] | Literal[3] # Error +41 + field12: Literal[1, 2, 3] # Error +42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error +43 | +44 | # Should emit for unions with more than two cases, even if not directly adjacent PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.py:42:10 @@ -284,16 +258,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 44 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Replace with a single `Literal` - -ℹ Safe fix -39 39 | -40 40 | # Should emit for unions with more than two cases -41 41 | field12: Literal[1] | Literal[2] | Literal[3] # Error -42 |-field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error - 42 |+field13: Literal[1, 2, 3, 4] # Error -43 43 | -44 44 | # Should emit for unions with more than two cases, even if not directly adjacent -45 45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error +39 | +40 | # Should emit for unions with more than two cases +41 | field12: Literal[1] | Literal[2] | Literal[3] # Error + - field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error +42 + field13: Literal[1, 2, 3, 4] # Error +43 | +44 | # Should emit for unions with more than two cases, even if not directly adjacent +45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]` --> PYI030.py:45:10 @@ -305,16 +277,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 47 | # Should emit for unions with mixed literal internal types | help: Replace with a single `Literal` - -ℹ Safe fix -42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error -43 43 | -44 44 | # Should emit for unions with more than two cases, even if not directly adjacent -45 |-field14: Literal[1] | Literal[2] | str | Literal[3] # Error - 45 |+field14: Literal[1, 2, 3] | str # Error -46 46 | -47 47 | # Should emit for unions with mixed literal internal types -48 48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error +42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error +43 | +44 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: Literal[1] | Literal[2] | str | Literal[3] # Error +45 + field14: Literal[1, 2, 3] | str # Error +46 | +47 | # Should emit for unions with mixed literal internal types +48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]` --> PYI030.py:48:10 @@ -326,16 +296,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 | help: Replace with a single `Literal` - -ℹ Safe fix -45 45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error -46 46 | -47 47 | # Should emit for unions with mixed literal internal types -48 |-field15: Literal[1] | Literal["foo"] | Literal[True] # Error - 48 |+field15: Literal[1, "foo", True] # Error -49 49 | -50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 -51 51 | field16: Literal[1] | Literal[1] # OK +45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error +46 | +47 | # Should emit for unions with mixed literal internal types + - field15: Literal[1] | Literal["foo"] | Literal[True] # Error +48 + field15: Literal[1, "foo", True] # Error +49 | +50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 +51 | field16: Literal[1] | Literal[1] # OK PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]` --> PYI030.py:51:10 @@ -347,16 +315,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 53 | # Shouldn't emit if in new parent type | help: Replace with a single `Literal` - -ℹ Safe fix -48 48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error -49 49 | -50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 -51 |-field16: Literal[1] | Literal[1] # OK - 51 |+field16: Literal[1, 1] # OK -52 52 | -53 53 | # Shouldn't emit if in new parent type -54 54 | field17: Literal[1] | dict[Literal[2], str] # OK +48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error +49 | +50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 + - field16: Literal[1] | Literal[1] # OK +51 + field16: Literal[1, 1] # OK +52 | +53 | # Shouldn't emit if in new parent type +54 | field17: Literal[1] | dict[Literal[2], str] # OK PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:60:10 @@ -368,16 +334,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 62 | # Should emit in cases with newlines | help: Replace with a single `Literal` - -ℹ Safe fix -57 57 | field18: dict[Literal[1], Literal[2]] # OK -58 58 | -59 59 | # Should respect name of literal type used -60 |-field19: typing.Literal[1] | typing.Literal[2] # Error - 60 |+field19: typing.Literal[1, 2] # Error -61 61 | -62 62 | # Should emit in cases with newlines -63 63 | field20: typing.Union[ +57 | field18: dict[Literal[1], Literal[2]] # OK +58 | +59 | # Should respect name of literal type used + - field19: typing.Literal[1] | typing.Literal[2] # Error +60 + field19: typing.Literal[1, 2] # Error +61 | +62 | # Should emit in cases with newlines +63 | field20: typing.Union[ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:63:10 @@ -395,21 +359,20 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 70 | # Should handle multiple unions with multiple members | help: Replace with a single `Literal` - -ℹ Unsafe fix -60 60 | field19: typing.Literal[1] | typing.Literal[2] # Error -61 61 | -62 62 | # Should emit in cases with newlines -63 |-field20: typing.Union[ -64 |- Literal[ -65 |- 1 # test -66 |- ], -67 |- Literal[2], -68 |-] # Error, newline and comment will not be emitted in message - 63 |+field20: Literal[1, 2] # Error, newline and comment will not be emitted in message -69 64 | -70 65 | # Should handle multiple unions with multiple members -71 66 | field21: Literal[1, 2] | Literal[3, 4] # Error +60 | field19: typing.Literal[1] | typing.Literal[2] # Error +61 | +62 | # Should emit in cases with newlines + - field20: typing.Union[ + - Literal[ + - 1 # test + - ], + - Literal[2], + - ] # Error, newline and comment will not be emitted in message +63 + field20: Literal[1, 2] # Error, newline and comment will not be emitted in message +64 | +65 | # Should handle multiple unions with multiple members +66 | field21: Literal[1, 2] | Literal[3, 4] # Error +note: This is an unsafe fix and may change runtime behavior PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.py:71:10 @@ -421,16 +384,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 73 | # Should emit in cases with `typing.Union` instead of `|` | help: Replace with a single `Literal` - -ℹ Safe fix -68 68 | ] # Error, newline and comment will not be emitted in message -69 69 | -70 70 | # Should handle multiple unions with multiple members -71 |-field21: Literal[1, 2] | Literal[3, 4] # Error - 71 |+field21: Literal[1, 2, 3, 4] # Error -72 72 | -73 73 | # Should emit in cases with `typing.Union` instead of `|` -74 74 | field22: typing.Union[Literal[1], Literal[2]] # Error +68 | ] # Error, newline and comment will not be emitted in message +69 | +70 | # Should handle multiple unions with multiple members + - field21: Literal[1, 2] | Literal[3, 4] # Error +71 + field21: Literal[1, 2, 3, 4] # Error +72 | +73 | # Should emit in cases with `typing.Union` instead of `|` +74 | field22: typing.Union[Literal[1], Literal[2]] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:74:10 @@ -442,16 +403,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 76 | # Should emit in cases with `typing_extensions.Literal` | help: Replace with a single `Literal` - -ℹ Safe fix -71 71 | field21: Literal[1, 2] | Literal[3, 4] # Error -72 72 | -73 73 | # Should emit in cases with `typing.Union` instead of `|` -74 |-field22: typing.Union[Literal[1], Literal[2]] # Error - 74 |+field22: Literal[1, 2] # Error -75 75 | -76 76 | # Should emit in cases with `typing_extensions.Literal` -77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error +71 | field21: Literal[1, 2] | Literal[3, 4] # Error +72 | +73 | # Should emit in cases with `typing.Union` instead of `|` + - field22: typing.Union[Literal[1], Literal[2]] # Error +74 + field22: Literal[1, 2] # Error +75 | +76 | # Should emit in cases with `typing_extensions.Literal` +77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:77:10 @@ -463,16 +422,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 79 | # Should emit in cases with nested `typing.Union` | help: Replace with a single `Literal` - -ℹ Safe fix -74 74 | field22: typing.Union[Literal[1], Literal[2]] # Error -75 75 | -76 76 | # Should emit in cases with `typing_extensions.Literal` -77 |-field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error - 77 |+field23: typing_extensions.Literal[1, 2] # Error -78 78 | -79 79 | # Should emit in cases with nested `typing.Union` -80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error +74 | field22: typing.Union[Literal[1], Literal[2]] # Error +75 | +76 | # Should emit in cases with `typing_extensions.Literal` + - field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error +77 + field23: typing_extensions.Literal[1, 2] # Error +78 | +79 | # Should emit in cases with nested `typing.Union` +80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:80:10 @@ -484,16 +441,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 82 | # Should emit in cases with mixed `typing.Union` and `|` | help: Replace with a single `Literal` - -ℹ Safe fix -77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error -78 78 | -79 79 | # Should emit in cases with nested `typing.Union` -80 |-field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error - 80 |+field24: typing.Union[Literal[1, 2], str] # Error -81 81 | -82 82 | # Should emit in cases with mixed `typing.Union` and `|` -83 83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error +77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error +78 | +79 | # Should emit in cases with nested `typing.Union` + - field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error +80 + field24: typing.Union[Literal[1, 2], str] # Error +81 | +82 | # Should emit in cases with mixed `typing.Union` and `|` +83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.py:83:10 @@ -505,16 +460,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 85 | # Should emit only once in cases with multiple nested `typing.Union` | help: Replace with a single `Literal` - -ℹ Safe fix -80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error -81 81 | -82 82 | # Should emit in cases with mixed `typing.Union` and `|` -83 |-field25: typing.Union[Literal[1], Literal[2] | str] # Error - 83 |+field25: typing.Union[Literal[1, 2], str] # Error -84 84 | -85 85 | # Should emit only once in cases with multiple nested `typing.Union` -86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error +80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error +81 | +82 | # Should emit in cases with mixed `typing.Union` and `|` + - field25: typing.Union[Literal[1], Literal[2] | str] # Error +83 + field25: typing.Union[Literal[1, 2], str] # Error +84 | +85 | # Should emit only once in cases with multiple nested `typing.Union` +86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.py:86:10 @@ -526,16 +479,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 88 | # Should use the first literal subscript attribute when fixing | help: Replace with a single `Literal` - -ℹ Safe fix -83 83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error -84 84 | -85 85 | # Should emit only once in cases with multiple nested `typing.Union` -86 |-field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error - 86 |+field24: Literal[1, 2, 3, 4] # Error -87 87 | -88 88 | # Should use the first literal subscript attribute when fixing -89 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error +83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error +84 | +85 | # Should emit only once in cases with multiple nested `typing.Union` + - field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error +86 + field24: Literal[1, 2, 3, 4] # Error +87 | +88 | # Should use the first literal subscript attribute when fixing +89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.py:89:10 @@ -547,16 +498,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 91 | from typing import IO, Literal | help: Replace with a single `Literal` - -ℹ Safe fix -86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error -87 87 | -88 88 | # Should use the first literal subscript attribute when fixing -89 |-field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error - 89 |+field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str] # Error -90 90 | -91 91 | from typing import IO, Literal -92 92 | +86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error +87 | +88 | # Should use the first literal subscript attribute when fixing + - field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error +89 + field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str] # Error +90 | +91 | from typing import IO, Literal +92 | PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b"]` --> PYI030.py:93:16 @@ -569,16 +518,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 95 | # Should use unsafe fix when comments are deleted | help: Replace with a single `Literal` - -ℹ Safe fix -90 90 | -91 91 | from typing import IO, Literal -92 92 | -93 |-InlineOption = Literal["a"] | Literal["b"] | IO[str] - 93 |+InlineOption = Literal["a", "b"] | IO[str] -94 94 | -95 95 | # Should use unsafe fix when comments are deleted -96 96 | field26: ( +90 | +91 | from typing import IO, Literal +92 | + - InlineOption = Literal["a"] | Literal["b"] | IO[str] +93 + InlineOption = Literal["a", "b"] | IO[str] +94 | +95 | # Should use unsafe fix when comments are deleted +96 | field26: ( PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]` --> PYI030.py:98:5 @@ -593,18 +540,17 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 102 | field27: ( | help: Replace with a single `Literal` - -ℹ Unsafe fix -95 95 | # Should use unsafe fix when comments are deleted -96 96 | field26: ( -97 97 | # First comment -98 |- Literal["a", "b"] -99 |- # Second comment -100 |- | Literal["c", "d"] - 98 |+ Literal["a", "b", "c", "d"] -101 99 | ) -102 100 | field27: ( -103 101 | Literal["a", "b"] # First comment +95 | # Should use unsafe fix when comments are deleted +96 | field26: ( +97 | # First comment + - Literal["a", "b"] + - # Second comment + - | Literal["c", "d"] +98 + Literal["a", "b", "c", "d"] +99 | ) +100 | field27: ( +101 | Literal["a", "b"] # First comment +note: This is an unsafe fix and may change runtime behavior PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]` --> PYI030.py:103:5 @@ -617,12 +563,11 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 105 | ) | help: Replace with a single `Literal` - -ℹ Unsafe fix -100 100 | | Literal["c", "d"] -101 101 | ) -102 102 | field27: ( -103 |- Literal["a", "b"] # First comment -104 |- | Literal["c", "d"] # Second comment - 103 |+ Literal["a", "b", "c", "d"] # Second comment -105 104 | ) +100 | | Literal["c", "d"] +101 | ) +102 | field27: ( + - Literal["a", "b"] # First comment + - | Literal["c", "d"] # Second comment +103 + Literal["a", "b", "c", "d"] # Second comment +104 | ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap index 7236f6b59d..652a41654c 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap @@ -11,16 +11,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 11 | # Should emit for union types in arguments. | help: Replace with a single `Literal` - -ℹ Safe fix -6 6 | field1: Literal[1] # OK -7 7 | -8 8 | # Should emit for duplicate field types. -9 |-field2: Literal[1] | Literal[2] # Error - 9 |+field2: Literal[1, 2] # Error -10 10 | -11 11 | # Should emit for union types in arguments. -12 12 | def func1(arg1: Literal[1] | Literal[2]): # Error +6 | field1: Literal[1] # OK +7 | +8 | # Should emit for duplicate field types. + - field2: Literal[1] | Literal[2] # Error +9 + field2: Literal[1, 2] # Error +10 | +11 | # Should emit for union types in arguments. +12 | def func1(arg1: Literal[1] | Literal[2]): # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:12:17 @@ -31,16 +29,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 13 | print(arg1) | help: Replace with a single `Literal` - -ℹ Safe fix -9 9 | field2: Literal[1] | Literal[2] # Error -10 10 | -11 11 | # Should emit for union types in arguments. -12 |-def func1(arg1: Literal[1] | Literal[2]): # Error - 12 |+def func1(arg1: Literal[1, 2]): # Error -13 13 | print(arg1) -14 14 | -15 15 | +9 | field2: Literal[1] | Literal[2] # Error +10 | +11 | # Should emit for union types in arguments. + - def func1(arg1: Literal[1] | Literal[2]): # Error +12 + def func1(arg1: Literal[1, 2]): # Error +13 | print(arg1) +14 | +15 | PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:17:16 @@ -51,16 +47,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 18 | return "my Literal[1]ing" | help: Replace with a single `Literal` - -ℹ Safe fix -14 14 | -15 15 | -16 16 | # Should emit for unions in return types. -17 |-def func2() -> Literal[1] | Literal[2]: # Error - 17 |+def func2() -> Literal[1, 2]: # Error -18 18 | return "my Literal[1]ing" -19 19 | -20 20 | +14 | +15 | +16 | # Should emit for unions in return types. + - def func2() -> Literal[1] | Literal[2]: # Error +17 + def func2() -> Literal[1, 2]: # Error +18 | return "my Literal[1]ing" +19 | +20 | PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:22:9 @@ -72,16 +66,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 24 | field5: Literal[1] | str | Literal[2] # Error | help: Replace with a single `Literal` - -ℹ Safe fix -19 19 | -20 20 | -21 21 | # Should emit in longer unions, even if not directly adjacent. -22 |-field3: Literal[1] | Literal[2] | str # Error - 22 |+field3: Literal[1, 2] | str # Error -23 23 | field4: str | Literal[1] | Literal[2] # Error -24 24 | field5: Literal[1] | str | Literal[2] # Error -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error +19 | +20 | +21 | # Should emit in longer unions, even if not directly adjacent. + - field3: Literal[1] | Literal[2] | str # Error +22 + field3: Literal[1, 2] | str # Error +23 | field4: str | Literal[1] | Literal[2] # Error +24 | field5: Literal[1] | str | Literal[2] # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:23:9 @@ -94,16 +86,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 25 | field6: Literal[1] | bool | Literal[2] | str # Error | help: Replace with a single `Literal` - -ℹ Safe fix -20 20 | -21 21 | # Should emit in longer unions, even if not directly adjacent. -22 22 | field3: Literal[1] | Literal[2] | str # Error -23 |-field4: str | Literal[1] | Literal[2] # Error - 23 |+field4: Literal[1, 2] | str # Error -24 24 | field5: Literal[1] | str | Literal[2] # Error -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error -26 26 | +20 | +21 | # Should emit in longer unions, even if not directly adjacent. +22 | field3: Literal[1] | Literal[2] | str # Error + - field4: str | Literal[1] | Literal[2] # Error +23 + field4: Literal[1, 2] | str # Error +24 | field5: Literal[1] | str | Literal[2] # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error +26 | PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:24:9 @@ -115,16 +105,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 25 | field6: Literal[1] | bool | Literal[2] | str # Error | help: Replace with a single `Literal` - -ℹ Safe fix -21 21 | # Should emit in longer unions, even if not directly adjacent. -22 22 | field3: Literal[1] | Literal[2] | str # Error -23 23 | field4: str | Literal[1] | Literal[2] # Error -24 |-field5: Literal[1] | str | Literal[2] # Error - 24 |+field5: Literal[1, 2] | str # Error -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error -26 26 | -27 27 | # Should emit for non-type unions. +21 | # Should emit in longer unions, even if not directly adjacent. +22 | field3: Literal[1] | Literal[2] | str # Error +23 | field4: str | Literal[1] | Literal[2] # Error + - field5: Literal[1] | str | Literal[2] # Error +24 + field5: Literal[1, 2] | str # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error +26 | +27 | # Should emit for non-type unions. PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:25:9 @@ -137,16 +125,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 27 | # Should emit for non-type unions. | help: Replace with a single `Literal` - -ℹ Safe fix -22 22 | field3: Literal[1] | Literal[2] | str # Error -23 23 | field4: str | Literal[1] | Literal[2] # Error -24 24 | field5: Literal[1] | str | Literal[2] # Error -25 |-field6: Literal[1] | bool | Literal[2] | str # Error - 25 |+field6: Literal[1, 2] | bool | str # Error -26 26 | -27 27 | # Should emit for non-type unions. -28 28 | field7 = Literal[1] | Literal[2] # Error +22 | field3: Literal[1] | Literal[2] | str # Error +23 | field4: str | Literal[1] | Literal[2] # Error +24 | field5: Literal[1] | str | Literal[2] # Error + - field6: Literal[1] | bool | Literal[2] | str # Error +25 + field6: Literal[1, 2] | bool | str # Error +26 | +27 | # Should emit for non-type unions. +28 | field7 = Literal[1] | Literal[2] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:28:10 @@ -158,16 +144,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 30 | # Should emit for parenthesized unions. | help: Replace with a single `Literal` - -ℹ Safe fix -25 25 | field6: Literal[1] | bool | Literal[2] | str # Error -26 26 | -27 27 | # Should emit for non-type unions. -28 |-field7 = Literal[1] | Literal[2] # Error - 28 |+field7 = Literal[1, 2] # Error -29 29 | -30 30 | # Should emit for parenthesized unions. -31 31 | field8: Literal[1] | (Literal[2] | str) # Error +25 | field6: Literal[1] | bool | Literal[2] | str # Error +26 | +27 | # Should emit for non-type unions. + - field7 = Literal[1] | Literal[2] # Error +28 + field7 = Literal[1, 2] # Error +29 | +30 | # Should emit for parenthesized unions. +31 | field8: Literal[1] | (Literal[2] | str) # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:31:9 @@ -179,16 +163,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 33 | # Should handle user parentheses when fixing. | help: Replace with a single `Literal` - -ℹ Safe fix -28 28 | field7 = Literal[1] | Literal[2] # Error -29 29 | -30 30 | # Should emit for parenthesized unions. -31 |-field8: Literal[1] | (Literal[2] | str) # Error - 31 |+field8: Literal[1, 2] | str # Error -32 32 | -33 33 | # Should handle user parentheses when fixing. -34 34 | field9: Literal[1] | (Literal[2] | str) # Error +28 | field7 = Literal[1] | Literal[2] # Error +29 | +30 | # Should emit for parenthesized unions. + - field8: Literal[1] | (Literal[2] | str) # Error +31 + field8: Literal[1, 2] | str # Error +32 | +33 | # Should handle user parentheses when fixing. +34 | field9: Literal[1] | (Literal[2] | str) # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:34:9 @@ -199,16 +181,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 35 | field10: (Literal[1] | str) | Literal[2] # Error | help: Replace with a single `Literal` - -ℹ Safe fix -31 31 | field8: Literal[1] | (Literal[2] | str) # Error -32 32 | -33 33 | # Should handle user parentheses when fixing. -34 |-field9: Literal[1] | (Literal[2] | str) # Error - 34 |+field9: Literal[1, 2] | str # Error -35 35 | field10: (Literal[1] | str) | Literal[2] # Error -36 36 | -37 37 | # Should emit for union in generic parent type. +31 | field8: Literal[1] | (Literal[2] | str) # Error +32 | +33 | # Should handle user parentheses when fixing. + - field9: Literal[1] | (Literal[2] | str) # Error +34 + field9: Literal[1, 2] | str # Error +35 | field10: (Literal[1] | str) | Literal[2] # Error +36 | +37 | # Should emit for union in generic parent type. PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:35:10 @@ -221,16 +201,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 37 | # Should emit for union in generic parent type. | help: Replace with a single `Literal` - -ℹ Safe fix -32 32 | -33 33 | # Should handle user parentheses when fixing. -34 34 | field9: Literal[1] | (Literal[2] | str) # Error -35 |-field10: (Literal[1] | str) | Literal[2] # Error - 35 |+field10: Literal[1, 2] | str # Error -36 36 | -37 37 | # Should emit for union in generic parent type. -38 38 | field11: dict[Literal[1] | Literal[2], str] # Error +32 | +33 | # Should handle user parentheses when fixing. +34 | field9: Literal[1] | (Literal[2] | str) # Error + - field10: (Literal[1] | str) | Literal[2] # Error +35 + field10: Literal[1, 2] | str # Error +36 | +37 | # Should emit for union in generic parent type. +38 | field11: dict[Literal[1] | Literal[2], str] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:38:15 @@ -242,16 +220,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 40 | # Should emit for unions with more than two cases | help: Replace with a single `Literal` - -ℹ Safe fix -35 35 | field10: (Literal[1] | str) | Literal[2] # Error -36 36 | -37 37 | # Should emit for union in generic parent type. -38 |-field11: dict[Literal[1] | Literal[2], str] # Error - 38 |+field11: dict[Literal[1, 2], str] # Error -39 39 | -40 40 | # Should emit for unions with more than two cases -41 41 | field12: Literal[1] | Literal[2] | Literal[3] # Error +35 | field10: (Literal[1] | str) | Literal[2] # Error +36 | +37 | # Should emit for union in generic parent type. + - field11: dict[Literal[1] | Literal[2], str] # Error +38 + field11: dict[Literal[1, 2], str] # Error +39 | +40 | # Should emit for unions with more than two cases +41 | field12: Literal[1] | Literal[2] | Literal[3] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]` --> PYI030.pyi:41:10 @@ -262,16 +238,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error | help: Replace with a single `Literal` - -ℹ Safe fix -38 38 | field11: dict[Literal[1] | Literal[2], str] # Error -39 39 | -40 40 | # Should emit for unions with more than two cases -41 |-field12: Literal[1] | Literal[2] | Literal[3] # Error - 41 |+field12: Literal[1, 2, 3] # Error -42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error -43 43 | -44 44 | # Should emit for unions with more than two cases, even if not directly adjacent +38 | field11: dict[Literal[1] | Literal[2], str] # Error +39 | +40 | # Should emit for unions with more than two cases + - field12: Literal[1] | Literal[2] | Literal[3] # Error +41 + field12: Literal[1, 2, 3] # Error +42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error +43 | +44 | # Should emit for unions with more than two cases, even if not directly adjacent PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.pyi:42:10 @@ -284,16 +258,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 44 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Replace with a single `Literal` - -ℹ Safe fix -39 39 | -40 40 | # Should emit for unions with more than two cases -41 41 | field12: Literal[1] | Literal[2] | Literal[3] # Error -42 |-field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error - 42 |+field13: Literal[1, 2, 3, 4] # Error -43 43 | -44 44 | # Should emit for unions with more than two cases, even if not directly adjacent -45 45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error +39 | +40 | # Should emit for unions with more than two cases +41 | field12: Literal[1] | Literal[2] | Literal[3] # Error + - field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error +42 + field13: Literal[1, 2, 3, 4] # Error +43 | +44 | # Should emit for unions with more than two cases, even if not directly adjacent +45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]` --> PYI030.pyi:45:10 @@ -305,16 +277,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 47 | # Should emit for unions with mixed literal internal types | help: Replace with a single `Literal` - -ℹ Safe fix -42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error -43 43 | -44 44 | # Should emit for unions with more than two cases, even if not directly adjacent -45 |-field14: Literal[1] | Literal[2] | str | Literal[3] # Error - 45 |+field14: Literal[1, 2, 3] | str # Error -46 46 | -47 47 | # Should emit for unions with mixed literal internal types -48 48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error +42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4] # Error +43 | +44 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: Literal[1] | Literal[2] | str | Literal[3] # Error +45 + field14: Literal[1, 2, 3] | str # Error +46 | +47 | # Should emit for unions with mixed literal internal types +48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]` --> PYI030.pyi:48:10 @@ -326,16 +296,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 | help: Replace with a single `Literal` - -ℹ Safe fix -45 45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error -46 46 | -47 47 | # Should emit for unions with mixed literal internal types -48 |-field15: Literal[1] | Literal["foo"] | Literal[True] # Error - 48 |+field15: Literal[1, "foo", True] # Error -49 49 | -50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 -51 51 | field16: Literal[1] | Literal[1] # OK +45 | field14: Literal[1] | Literal[2] | str | Literal[3] # Error +46 | +47 | # Should emit for unions with mixed literal internal types + - field15: Literal[1] | Literal["foo"] | Literal[True] # Error +48 + field15: Literal[1, "foo", True] # Error +49 | +50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 +51 | field16: Literal[1] | Literal[1] # OK PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]` --> PYI030.pyi:51:10 @@ -347,16 +315,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 53 | # Shouldn't emit if in new parent type | help: Replace with a single `Literal` - -ℹ Safe fix -48 48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error -49 49 | -50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 -51 |-field16: Literal[1] | Literal[1] # OK - 51 |+field16: Literal[1, 1] # OK -52 52 | -53 53 | # Shouldn't emit if in new parent type -54 54 | field17: Literal[1] | dict[Literal[2], str] # OK +48 | field15: Literal[1] | Literal["foo"] | Literal[True] # Error +49 | +50 | # Shouldn't emit for duplicate field types with same value; covered by Y016 + - field16: Literal[1] | Literal[1] # OK +51 + field16: Literal[1, 1] # OK +52 | +53 | # Shouldn't emit if in new parent type +54 | field17: Literal[1] | dict[Literal[2], str] # OK PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:60:10 @@ -368,16 +334,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 62 | # Should emit in cases with newlines | help: Replace with a single `Literal` - -ℹ Safe fix -57 57 | field18: dict[Literal[1], Literal[2]] # OK -58 58 | -59 59 | # Should respect name of literal type used -60 |-field19: typing.Literal[1] | typing.Literal[2] # Error - 60 |+field19: typing.Literal[1, 2] # Error -61 61 | -62 62 | # Should emit in cases with newlines -63 63 | field20: typing.Union[ +57 | field18: dict[Literal[1], Literal[2]] # OK +58 | +59 | # Should respect name of literal type used + - field19: typing.Literal[1] | typing.Literal[2] # Error +60 + field19: typing.Literal[1, 2] # Error +61 | +62 | # Should emit in cases with newlines +63 | field20: typing.Union[ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:63:10 @@ -395,21 +359,20 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 70 | # Should handle multiple unions with multiple members | help: Replace with a single `Literal` - -ℹ Unsafe fix -60 60 | field19: typing.Literal[1] | typing.Literal[2] # Error -61 61 | -62 62 | # Should emit in cases with newlines -63 |-field20: typing.Union[ -64 |- Literal[ -65 |- 1 # test -66 |- ], -67 |- Literal[2], -68 |-] # Error, newline and comment will not be emitted in message - 63 |+field20: Literal[1, 2] # Error, newline and comment will not be emitted in message -69 64 | -70 65 | # Should handle multiple unions with multiple members -71 66 | field21: Literal[1, 2] | Literal[3, 4] # Error +60 | field19: typing.Literal[1] | typing.Literal[2] # Error +61 | +62 | # Should emit in cases with newlines + - field20: typing.Union[ + - Literal[ + - 1 # test + - ], + - Literal[2], + - ] # Error, newline and comment will not be emitted in message +63 + field20: Literal[1, 2] # Error, newline and comment will not be emitted in message +64 | +65 | # Should handle multiple unions with multiple members +66 | field21: Literal[1, 2] | Literal[3, 4] # Error +note: This is an unsafe fix and may change runtime behavior PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.pyi:71:10 @@ -421,16 +384,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 73 | # Should emit in cases with `typing.Union` instead of `|` | help: Replace with a single `Literal` - -ℹ Safe fix -68 68 | ] # Error, newline and comment will not be emitted in message -69 69 | -70 70 | # Should handle multiple unions with multiple members -71 |-field21: Literal[1, 2] | Literal[3, 4] # Error - 71 |+field21: Literal[1, 2, 3, 4] # Error -72 72 | -73 73 | # Should emit in cases with `typing.Union` instead of `|` -74 74 | field22: typing.Union[Literal[1], Literal[2]] # Error +68 | ] # Error, newline and comment will not be emitted in message +69 | +70 | # Should handle multiple unions with multiple members + - field21: Literal[1, 2] | Literal[3, 4] # Error +71 + field21: Literal[1, 2, 3, 4] # Error +72 | +73 | # Should emit in cases with `typing.Union` instead of `|` +74 | field22: typing.Union[Literal[1], Literal[2]] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:74:10 @@ -442,16 +403,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 76 | # Should emit in cases with `typing_extensions.Literal` | help: Replace with a single `Literal` - -ℹ Safe fix -71 71 | field21: Literal[1, 2] | Literal[3, 4] # Error -72 72 | -73 73 | # Should emit in cases with `typing.Union` instead of `|` -74 |-field22: typing.Union[Literal[1], Literal[2]] # Error - 74 |+field22: Literal[1, 2] # Error -75 75 | -76 76 | # Should emit in cases with `typing_extensions.Literal` -77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error +71 | field21: Literal[1, 2] | Literal[3, 4] # Error +72 | +73 | # Should emit in cases with `typing.Union` instead of `|` + - field22: typing.Union[Literal[1], Literal[2]] # Error +74 + field22: Literal[1, 2] # Error +75 | +76 | # Should emit in cases with `typing_extensions.Literal` +77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:77:10 @@ -463,16 +422,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 79 | # Should emit in cases with nested `typing.Union` | help: Replace with a single `Literal` - -ℹ Safe fix -74 74 | field22: typing.Union[Literal[1], Literal[2]] # Error -75 75 | -76 76 | # Should emit in cases with `typing_extensions.Literal` -77 |-field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error - 77 |+field23: typing_extensions.Literal[1, 2] # Error -78 78 | -79 79 | # Should emit in cases with nested `typing.Union` -80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error +74 | field22: typing.Union[Literal[1], Literal[2]] # Error +75 | +76 | # Should emit in cases with `typing_extensions.Literal` + - field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error +77 + field23: typing_extensions.Literal[1, 2] # Error +78 | +79 | # Should emit in cases with nested `typing.Union` +80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:80:10 @@ -484,16 +441,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 82 | # Should emit in cases with mixed `typing.Union` and `|` | help: Replace with a single `Literal` - -ℹ Safe fix -77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error -78 78 | -79 79 | # Should emit in cases with nested `typing.Union` -80 |-field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error - 80 |+field24: typing.Union[Literal[1, 2], str] # Error -81 81 | -82 82 | # Should emit in cases with mixed `typing.Union` and `|` -83 83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error +77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2] # Error +78 | +79 | # Should emit in cases with nested `typing.Union` + - field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error +80 + field24: typing.Union[Literal[1, 2], str] # Error +81 | +82 | # Should emit in cases with mixed `typing.Union` and `|` +83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]` --> PYI030.pyi:83:10 @@ -505,16 +460,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 85 | # Should emit only once in cases with multiple nested `typing.Union` | help: Replace with a single `Literal` - -ℹ Safe fix -80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error -81 81 | -82 82 | # Should emit in cases with mixed `typing.Union` and `|` -83 |-field25: typing.Union[Literal[1], Literal[2] | str] # Error - 83 |+field25: typing.Union[Literal[1, 2], str] # Error -84 84 | -85 85 | # Should emit only once in cases with multiple nested `typing.Union` -86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error +80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]] # Error +81 | +82 | # Should emit in cases with mixed `typing.Union` and `|` + - field25: typing.Union[Literal[1], Literal[2] | str] # Error +83 + field25: typing.Union[Literal[1, 2], str] # Error +84 | +85 | # Should emit only once in cases with multiple nested `typing.Union` +86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.pyi:86:10 @@ -526,16 +479,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 88 | # Should use the first literal subscript attribute when fixing | help: Replace with a single `Literal` - -ℹ Safe fix -83 83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error -84 84 | -85 85 | # Should emit only once in cases with multiple nested `typing.Union` -86 |-field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error - 86 |+field24: Literal[1, 2, 3, 4] # Error -87 87 | -88 88 | # Should use the first literal subscript attribute when fixing -89 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error +83 | field25: typing.Union[Literal[1], Literal[2] | str] # Error +84 | +85 | # Should emit only once in cases with multiple nested `typing.Union` + - field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error +86 + field24: Literal[1, 2, 3, 4] # Error +87 | +88 | # Should use the first literal subscript attribute when fixing +89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]` --> PYI030.pyi:89:10 @@ -547,16 +498,14 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 91 | # Should use unsafe fix when comments are deleted | help: Replace with a single `Literal` - -ℹ Safe fix -86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error -87 87 | -88 88 | # Should use the first literal subscript attribute when fixing -89 |-field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error - 89 |+field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str] # Error -90 90 | -91 91 | # Should use unsafe fix when comments are deleted -92 92 | field26: ( +86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]] # Error +87 | +88 | # Should use the first literal subscript attribute when fixing + - field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str] # Error +89 + field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str] # Error +90 | +91 | # Should use unsafe fix when comments are deleted +92 | field26: ( PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]` --> PYI030.pyi:94:5 @@ -571,18 +520,17 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 98 | field27: ( | help: Replace with a single `Literal` - -ℹ Unsafe fix -91 91 | # Should use unsafe fix when comments are deleted -92 92 | field26: ( -93 93 | # First comment -94 |- Literal["a", "b"] -95 |- # Second comment -96 |- | Literal["c", "d"] - 94 |+ Literal["a", "b", "c", "d"] -97 95 | ) -98 96 | field27: ( -99 97 | Literal["a", "b"] # First comment +91 | # Should use unsafe fix when comments are deleted +92 | field26: ( +93 | # First comment + - Literal["a", "b"] + - # Second comment + - | Literal["c", "d"] +94 + Literal["a", "b", "c", "d"] +95 | ) +96 | field27: ( +97 | Literal["a", "b"] # First comment +note: This is an unsafe fix and may change runtime behavior PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal["a", "b", "c", "d"]` --> PYI030.pyi:99:5 @@ -595,12 +543,11 @@ PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Lite 101 | ) | help: Replace with a single `Literal` - -ℹ Unsafe fix -96 96 | | Literal["c", "d"] -97 97 | ) -98 98 | field27: ( -99 |- Literal["a", "b"] # First comment -100 |- | Literal["c", "d"] # Second comment - 99 |+ Literal["a", "b", "c", "d"] # Second comment -101 100 | ) +96 | | Literal["c", "d"] +97 | ) +98 | field27: ( + - Literal["a", "b"] # First comment + - | Literal["c", "d"] # Second comment +99 + Literal["a", "b", "c", "d"] # Second comment +100 | ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap index 142d812fa7..019b0568cb 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.py.snap @@ -10,16 +10,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__` 7 | def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 | help: Replace with `object` - -ℹ Safe fix -3 3 | -4 4 | -5 5 | class Bad: -6 |- def __eq__(self, other: Any) -> bool: ... # PYI032 - 6 |+ def __eq__(self, other: object) -> bool: ... # PYI032 -7 7 | def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 -8 8 | -9 9 | +3 | +4 | +5 | class Bad: + - def __eq__(self, other: Any) -> bool: ... # PYI032 +6 + def __eq__(self, other: object) -> bool: ... # PYI032 +7 | def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 +8 | +9 | PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` --> PYI032.py:7:29 @@ -30,16 +28,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` | ^^^^^^^^^^ | help: Replace with `object` - -ℹ Safe fix -4 4 | -5 5 | class Bad: -6 6 | def __eq__(self, other: Any) -> bool: ... # PYI032 -7 |- def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 - 7 |+ def __ne__(self, other: object) -> typing.Any: ... # PYI032 -8 8 | -9 9 | -10 10 | class Good: +4 | +5 | class Bad: +6 | def __eq__(self, other: Any) -> bool: ... # PYI032 + - def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 +7 + def __ne__(self, other: object) -> typing.Any: ... # PYI032 +8 | +9 | +10 | class Good: PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__` --> PYI032.py:27:28 @@ -50,14 +46,12 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__` 28 | def __ne__(self, other: "Any") -> bool: ... # PYI032 | help: Replace with `object` - -ℹ Safe fix -24 24 | -25 25 | -26 26 | class BadStringized: -27 |- def __eq__(self, other: "Any") -> bool: ... # PYI032 - 27 |+ def __eq__(self, other: object) -> bool: ... # PYI032 -28 28 | def __ne__(self, other: "Any") -> bool: ... # PYI032 +24 | +25 | +26 | class BadStringized: + - def __eq__(self, other: "Any") -> bool: ... # PYI032 +27 + def __eq__(self, other: object) -> bool: ... # PYI032 +28 | def __ne__(self, other: "Any") -> bool: ... # PYI032 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` --> PYI032.py:28:28 @@ -68,10 +62,8 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` | ^^^^^ | help: Replace with `object` - -ℹ Safe fix -25 25 | -26 26 | class BadStringized: -27 27 | def __eq__(self, other: "Any") -> bool: ... # PYI032 -28 |- def __ne__(self, other: "Any") -> bool: ... # PYI032 - 28 |+ def __ne__(self, other: object) -> bool: ... # PYI032 +25 | +26 | class BadStringized: +27 | def __eq__(self, other: "Any") -> bool: ... # PYI032 + - def __ne__(self, other: "Any") -> bool: ... # PYI032 +28 + def __ne__(self, other: object) -> bool: ... # PYI032 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap index 41bd9881af..598c88fb95 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI032_PYI032.pyi.snap @@ -10,16 +10,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__` 7 | def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 | help: Replace with `object` - -ℹ Safe fix -3 3 | -4 4 | -5 5 | class Bad: -6 |- def __eq__(self, other: Any) -> bool: ... # PYI032 - 6 |+ def __eq__(self, other: object) -> bool: ... # PYI032 -7 7 | def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 -8 8 | -9 9 | +3 | +4 | +5 | class Bad: + - def __eq__(self, other: Any) -> bool: ... # PYI032 +6 + def __eq__(self, other: object) -> bool: ... # PYI032 +7 | def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 +8 | +9 | PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` --> PYI032.pyi:7:29 @@ -30,16 +28,14 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` | ^^^^^^^^^^ | help: Replace with `object` - -ℹ Safe fix -4 4 | -5 5 | class Bad: -6 6 | def __eq__(self, other: Any) -> bool: ... # PYI032 -7 |- def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 - 7 |+ def __ne__(self, other: object) -> typing.Any: ... # PYI032 -8 8 | -9 9 | -10 10 | class Good: +4 | +5 | class Bad: +6 | def __eq__(self, other: Any) -> bool: ... # PYI032 + - def __ne__(self, other: typing.Any) -> typing.Any: ... # PYI032 +7 + def __ne__(self, other: object) -> typing.Any: ... # PYI032 +8 | +9 | +10 | class Good: PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__` --> PYI032.pyi:26:28 @@ -50,14 +46,12 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__eq__` 27 | def __ne__(self, other: "Any") -> bool: ... # PYI032 | help: Replace with `object` - -ℹ Safe fix -23 23 | def __ne__(self) -> bool: ... -24 24 | -25 25 | class BadStringized: -26 |- def __eq__(self, other: "Any") -> bool: ... # PYI032 - 26 |+ def __eq__(self, other: object) -> bool: ... # PYI032 -27 27 | def __ne__(self, other: "Any") -> bool: ... # PYI032 +23 | def __ne__(self) -> bool: ... +24 | +25 | class BadStringized: + - def __eq__(self, other: "Any") -> bool: ... # PYI032 +26 + def __eq__(self, other: object) -> bool: ... # PYI032 +27 | def __ne__(self, other: "Any") -> bool: ... # PYI032 PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` --> PYI032.pyi:27:28 @@ -68,10 +62,8 @@ PYI032 [*] Prefer `object` to `Any` for the second parameter to `__ne__` | ^^^^^ | help: Replace with `object` - -ℹ Safe fix -24 24 | -25 25 | class BadStringized: -26 26 | def __eq__(self, other: "Any") -> bool: ... # PYI032 -27 |- def __ne__(self, other: "Any") -> bool: ... # PYI032 - 27 |+ def __ne__(self, other: object) -> bool: ... # PYI032 +24 | +25 | class BadStringized: +26 | def __eq__(self, other: "Any") -> bool: ... # PYI032 + - def __ne__(self, other: "Any") -> bool: ... # PYI032 +27 + def __ne__(self, other: object) -> bool: ... # PYI032 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap index d9837eff5d..0b142738a1 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.py.snap @@ -11,16 +11,15 @@ PYI034 [*] `__new__` methods in classes like `Bad` usually return `self` at runt 22 | ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g.… | help: Use `Self` as return type - -ℹ Unsafe fix -18 18 | class Bad( -19 19 | object -20 20 | ): # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3 -21 |- def __new__(cls, *args: Any, **kwargs: Any) -> Bad: - 21 |+ def __new__(cls, *args: Any, **kwargs: Any) -> typing.Self: -22 22 | ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..." -23 23 | -24 24 | def __repr__(self) -> str: +18 | class Bad( +19 | object +20 | ): # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3 + - def __new__(cls, *args: Any, **kwargs: Any) -> Bad: +21 + def __new__(cls, *args: Any, **kwargs: Any) -> typing.Self: +22 | ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..." +23 | +24 | def __repr__(self) -> str: +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at runtime --> PYI034.py:36:9 @@ -32,16 +31,15 @@ PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at ru 37 | ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self… | help: Use `Self` as return type - -ℹ Unsafe fix -33 33 | def __ne__(self, other: typing.Any) -> typing.Any: -34 34 | ... # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods -35 35 | -36 |- def __enter__(self) -> Bad: - 36 |+ def __enter__(self) -> typing.Self: -37 37 | ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." -38 38 | -39 39 | async def __aenter__(self) -> Bad: +33 | def __ne__(self, other: typing.Any) -> typing.Any: +34 | ... # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods +35 | + - def __enter__(self) -> Bad: +36 + def __enter__(self) -> typing.Self: +37 | ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." +38 | +39 | async def __aenter__(self) -> Bad: +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at runtime --> PYI034.py:39:15 @@ -53,16 +51,15 @@ PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at r 40 | ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Sel… | help: Use `Self` as return type - -ℹ Unsafe fix -36 36 | def __enter__(self) -> Bad: -37 37 | ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." -38 38 | -39 |- async def __aenter__(self) -> Bad: - 39 |+ async def __aenter__(self) -> typing.Self: -40 40 | ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." -41 41 | -42 42 | def __iadd__(self, other: Bad) -> Bad: +36 | def __enter__(self) -> Bad: +37 | ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." +38 | + - async def __aenter__(self) -> Bad: +39 + async def __aenter__(self) -> typing.Self: +40 | ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." +41 | +42 | def __iadd__(self, other: Bad) -> Bad: +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at runtime --> PYI034.py:42:9 @@ -74,16 +71,15 @@ PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at run 43 | ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self"… | help: Use `Self` as return type - -ℹ Unsafe fix -39 39 | async def __aenter__(self) -> Bad: -40 40 | ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." -41 41 | -42 |- def __iadd__(self, other: Bad) -> Bad: - 42 |+ def __iadd__(self, other: Bad) -> typing.Self: -43 43 | ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." -44 44 | -45 45 | +39 | async def __aenter__(self) -> Bad: +40 | ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." +41 | + - def __iadd__(self, other: Bad) -> Bad: +42 + def __iadd__(self, other: Bad) -> typing.Self: +43 | ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." +44 | +45 | +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `self` at runtime --> PYI034.py:165:9 @@ -94,16 +90,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `sel 166 | ... # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extens… | help: Use `Self` as return type - -ℹ Unsafe fix -162 162 | -163 163 | -164 164 | class BadIterator1(Iterator[int]): -165 |- def __iter__(self) -> Iterator[int]: - 165 |+ def __iter__(self) -> typing.Self: -166 166 | ... # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..." -167 167 | -168 168 | +162 | +163 | +164 | class BadIterator1(Iterator[int]): + - def __iter__(self) -> Iterator[int]: +165 + def __iter__(self) -> typing.Self: +166 | ... # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..." +167 | +168 | +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `self` at runtime --> PYI034.py:172:9 @@ -115,16 +110,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `sel 173 | ... # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extens… | help: Use `Self` as return type - -ℹ Unsafe fix -169 169 | class BadIterator2( -170 170 | typing.Iterator[int] -171 171 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) -172 |- def __iter__(self) -> Iterator[int]: - 172 |+ def __iter__(self) -> typing.Self: -173 173 | ... # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..." -174 174 | -175 175 | +169 | class BadIterator2( +170 | typing.Iterator[int] +171 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) + - def __iter__(self) -> Iterator[int]: +172 + def __iter__(self) -> typing.Self: +173 | ... # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..." +174 | +175 | +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `self` at runtime --> PYI034.py:179:9 @@ -136,16 +130,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `sel 180 | ... # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extens… | help: Use `Self` as return type - -ℹ Unsafe fix -176 176 | class BadIterator3( -177 177 | typing.Iterator[int] -178 178 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) -179 |- def __iter__(self) -> collections.abc.Iterator[int]: - 179 |+ def __iter__(self) -> typing.Self: -180 180 | ... # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..." -181 181 | -182 182 | +176 | class BadIterator3( +177 | typing.Iterator[int] +178 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) + - def __iter__(self) -> collections.abc.Iterator[int]: +179 + def __iter__(self) -> typing.Self: +180 | ... # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..." +181 | +182 | +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `self` at runtime --> PYI034.py:185:9 @@ -157,16 +150,15 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `sel 186 | ... # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extens… | help: Use `Self` as return type - -ℹ Unsafe fix -182 182 | -183 183 | class BadIterator4(Iterator[int]): -184 184 | # Note: *Iterable*, not *Iterator*, returned! -185 |- def __iter__(self) -> Iterable[int]: - 185 |+ def __iter__(self) -> typing.Self: -186 186 | ... # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..." -187 187 | -188 188 | +182 | +183 | class BadIterator4(Iterator[int]): +184 | # Note: *Iterable*, not *Iterator*, returned! + - def __iter__(self) -> Iterable[int]: +185 + def __iter__(self) -> typing.Self: +186 | ... # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..." +187 | +188 | +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return `self` at runtime --> PYI034.py:195:9 @@ -177,16 +169,15 @@ PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return 196 | ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_e… | help: Use `Self` as return type - -ℹ Unsafe fix -192 192 | -193 193 | -194 194 | class BadAsyncIterator(collections.abc.AsyncIterator[str]): -195 |- def __aiter__(self) -> typing.AsyncIterator[str]: - 195 |+ def __aiter__(self) -> typing.Self: -196 196 | ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) -197 197 | -198 198 | class SubclassOfBadIterator3(BadIterator3): +192 | +193 | +194 | class BadAsyncIterator(collections.abc.AsyncIterator[str]): + - def __aiter__(self) -> typing.AsyncIterator[str]: +195 + def __aiter__(self) -> typing.Self: +196 | ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) +197 | +198 | class SubclassOfBadIterator3(BadIterator3): +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `SubclassOfBadIterator3` usually return `self` at runtime --> PYI034.py:199:9 @@ -197,16 +188,15 @@ PYI034 [*] `__iter__` methods in classes like `SubclassOfBadIterator3` usually r 200 | ... | help: Use `Self` as return type - -ℹ Unsafe fix -196 196 | ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) -197 197 | -198 198 | class SubclassOfBadIterator3(BadIterator3): -199 |- def __iter__(self) -> Iterator[int]: # Y034 - 199 |+ def __iter__(self) -> typing.Self: # Y034 -200 200 | ... -201 201 | -202 202 | class SubclassOfBadAsyncIterator(BadAsyncIterator): +196 | ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) +197 | +198 | class SubclassOfBadIterator3(BadIterator3): + - def __iter__(self) -> Iterator[int]: # Y034 +199 + def __iter__(self) -> typing.Self: # Y034 +200 | ... +201 | +202 | class SubclassOfBadAsyncIterator(BadAsyncIterator): +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__aiter__` methods in classes like `SubclassOfBadAsyncIterator` usually return `self` at runtime --> PYI034.py:203:9 @@ -217,16 +207,15 @@ PYI034 [*] `__aiter__` methods in classes like `SubclassOfBadAsyncIterator` usua 204 | ... | help: Use `Self` as return type - -ℹ Unsafe fix -200 200 | ... -201 201 | -202 202 | class SubclassOfBadAsyncIterator(BadAsyncIterator): -203 |- def __aiter__(self) -> collections.abc.AsyncIterator[str]: # Y034 - 203 |+ def __aiter__(self) -> typing.Self: # Y034 -204 204 | ... -205 205 | -206 206 | class AsyncIteratorReturningAsyncIterable: +200 | ... +201 | +202 | class SubclassOfBadAsyncIterator(BadAsyncIterator): + - def __aiter__(self) -> collections.abc.AsyncIterator[str]: # Y034 +203 + def __aiter__(self) -> typing.Self: # Y034 +204 | ... +205 | +206 | class AsyncIteratorReturningAsyncIterable: +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self` at runtime --> PYI034.py:327:9 @@ -237,16 +226,15 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self` 328 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... | help: Use `Self` as return type - -ℹ Unsafe fix -324 324 | -325 325 | -326 326 | class NonGeneric1(tuple): -327 |- def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... - 327 |+ def __new__(cls, *args, **kwargs) -> typing.Self: ... -328 328 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... -329 329 | -330 330 | class NonGeneric2(tuple): +324 | +325 | +326 | class NonGeneric1(tuple): + - def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... +327 + def __new__(cls, *args, **kwargs) -> typing.Self: ... +328 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... +329 | +330 | class NonGeneric2(tuple): +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `self` at runtime --> PYI034.py:328:9 @@ -259,16 +247,15 @@ PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `sel 330 | class NonGeneric2(tuple): | help: Use `Self` as return type - -ℹ Unsafe fix -325 325 | -326 326 | class NonGeneric1(tuple): -327 327 | def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... -328 |- def __enter__(self: NonGeneric1) -> NonGeneric1: ... - 328 |+ def __enter__(self) -> typing.Self: ... -329 329 | -330 330 | class NonGeneric2(tuple): -331 331 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +325 | +326 | class NonGeneric1(tuple): +327 | def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... + - def __enter__(self: NonGeneric1) -> NonGeneric1: ... +328 + def __enter__(self) -> typing.Self: ... +329 | +330 | class NonGeneric2(tuple): +331 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self` at runtime --> PYI034.py:331:9 @@ -280,16 +267,15 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self` 333 | class Generic1[T](list): | help: Use `Self` as return type - -ℹ Unsafe fix -328 328 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... -329 329 | -330 330 | class NonGeneric2(tuple): -331 |- def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... - 331 |+ def __new__(cls) -> typing.Self: ... -332 332 | -333 333 | class Generic1[T](list): -334 334 | def __new__(cls: type[Generic1]) -> Generic1: ... +328 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... +329 | +330 | class NonGeneric2(tuple): + - def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +331 + def __new__(cls) -> typing.Self: ... +332 | +333 | class Generic1[T](list): +334 | def __new__(cls: type[Generic1]) -> Generic1: ... +note: This is an unsafe fix and may change runtime behavior PYI034 `__new__` methods in classes like `Generic1` usually return `self` at runtime --> PYI034.py:334:9 @@ -300,16 +286,15 @@ PYI034 `__new__` methods in classes like `Generic1` usually return `self` at run 335 | def __enter__(self: Generic1) -> Generic1: ... | help: Use `Self` as return type - -ℹ Display-only fix -331 331 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... -332 332 | -333 333 | class Generic1[T](list): -334 |- def __new__(cls: type[Generic1]) -> Generic1: ... - 334 |+ def __new__(cls) -> typing.Self: ... -335 335 | def __enter__(self: Generic1) -> Generic1: ... -336 336 | -337 337 | +331 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +332 | +333 | class Generic1[T](list): + - def __new__(cls: type[Generic1]) -> Generic1: ... +334 + def __new__(cls) -> typing.Self: ... +335 | def __enter__(self: Generic1) -> Generic1: ... +336 | +337 | +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at runtime --> PYI034.py:335:9 @@ -320,16 +305,15 @@ PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at r | ^^^^^^^^^ | help: Use `Self` as return type - -ℹ Display-only fix -332 332 | -333 333 | class Generic1[T](list): -334 334 | def __new__(cls: type[Generic1]) -> Generic1: ... -335 |- def __enter__(self: Generic1) -> Generic1: ... - 335 |+ def __enter__(self) -> typing.Self: ... -336 336 | -337 337 | -338 338 | ### Correctness of typevar-likes are not verified. +332 | +333 | class Generic1[T](list): +334 | def __new__(cls: type[Generic1]) -> Generic1: ... + - def __enter__(self: Generic1) -> Generic1: ... +335 + def __enter__(self) -> typing.Self: ... +336 | +337 | +338 | ### Correctness of typevar-likes are not verified. +note: This is a display-only fix and is likely to be incorrect PYI034 `__new__` methods in classes like `Generic2` usually return `self` at runtime --> PYI034.py:345:9 @@ -340,16 +324,15 @@ PYI034 `__new__` methods in classes like `Generic2` usually return `self` at run 346 | def __enter__(self: Generic2) -> Generic2: ... | help: Use `Self` as return type - -ℹ Display-only fix -342 342 | Ts = TypeVarTuple('foo') -343 343 | -344 344 | class Generic2(Generic[T]): -345 |- def __new__(cls: type[Generic2]) -> Generic2: ... - 345 |+ def __new__(cls) -> typing.Self: ... -346 346 | def __enter__(self: Generic2) -> Generic2: ... -347 347 | -348 348 | class Generic3(tuple[*Ts]): +342 | Ts = TypeVarTuple('foo') +343 | +344 | class Generic2(Generic[T]): + - def __new__(cls: type[Generic2]) -> Generic2: ... +345 + def __new__(cls) -> typing.Self: ... +346 | def __enter__(self: Generic2) -> Generic2: ... +347 | +348 | class Generic3(tuple[*Ts]): +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at runtime --> PYI034.py:346:9 @@ -362,16 +345,15 @@ PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at r 348 | class Generic3(tuple[*Ts]): | help: Use `Self` as return type - -ℹ Display-only fix -343 343 | -344 344 | class Generic2(Generic[T]): -345 345 | def __new__(cls: type[Generic2]) -> Generic2: ... -346 |- def __enter__(self: Generic2) -> Generic2: ... - 346 |+ def __enter__(self) -> typing.Self: ... -347 347 | -348 348 | class Generic3(tuple[*Ts]): -349 349 | def __new__(cls: type[Generic3]) -> Generic3: ... +343 | +344 | class Generic2(Generic[T]): +345 | def __new__(cls: type[Generic2]) -> Generic2: ... + - def __enter__(self: Generic2) -> Generic2: ... +346 + def __enter__(self) -> typing.Self: ... +347 | +348 | class Generic3(tuple[*Ts]): +349 | def __new__(cls: type[Generic3]) -> Generic3: ... +note: This is a display-only fix and is likely to be incorrect PYI034 `__new__` methods in classes like `Generic3` usually return `self` at runtime --> PYI034.py:349:9 @@ -382,16 +364,15 @@ PYI034 `__new__` methods in classes like `Generic3` usually return `self` at run 350 | def __enter__(self: Generic3) -> Generic3: ... | help: Use `Self` as return type - -ℹ Display-only fix -346 346 | def __enter__(self: Generic2) -> Generic2: ... -347 347 | -348 348 | class Generic3(tuple[*Ts]): -349 |- def __new__(cls: type[Generic3]) -> Generic3: ... - 349 |+ def __new__(cls) -> typing.Self: ... -350 350 | def __enter__(self: Generic3) -> Generic3: ... -351 351 | -352 352 | class Generic4(collections.abc.Callable[P, ...]): +346 | def __enter__(self: Generic2) -> Generic2: ... +347 | +348 | class Generic3(tuple[*Ts]): + - def __new__(cls: type[Generic3]) -> Generic3: ... +349 + def __new__(cls) -> typing.Self: ... +350 | def __enter__(self: Generic3) -> Generic3: ... +351 | +352 | class Generic4(collections.abc.Callable[P, ...]): +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at runtime --> PYI034.py:350:9 @@ -404,16 +385,15 @@ PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at r 352 | class Generic4(collections.abc.Callable[P, ...]): | help: Use `Self` as return type - -ℹ Display-only fix -347 347 | -348 348 | class Generic3(tuple[*Ts]): -349 349 | def __new__(cls: type[Generic3]) -> Generic3: ... -350 |- def __enter__(self: Generic3) -> Generic3: ... - 350 |+ def __enter__(self) -> typing.Self: ... -351 351 | -352 352 | class Generic4(collections.abc.Callable[P, ...]): -353 353 | def __new__(cls: type[Generic4]) -> Generic4: ... +347 | +348 | class Generic3(tuple[*Ts]): +349 | def __new__(cls: type[Generic3]) -> Generic3: ... + - def __enter__(self: Generic3) -> Generic3: ... +350 + def __enter__(self) -> typing.Self: ... +351 | +352 | class Generic4(collections.abc.Callable[P, ...]): +353 | def __new__(cls: type[Generic4]) -> Generic4: ... +note: This is a display-only fix and is likely to be incorrect PYI034 `__new__` methods in classes like `Generic4` usually return `self` at runtime --> PYI034.py:353:9 @@ -424,16 +404,15 @@ PYI034 `__new__` methods in classes like `Generic4` usually return `self` at run 354 | def __enter__(self: Generic4) -> Generic4: ... | help: Use `Self` as return type - -ℹ Display-only fix -350 350 | def __enter__(self: Generic3) -> Generic3: ... -351 351 | -352 352 | class Generic4(collections.abc.Callable[P, ...]): -353 |- def __new__(cls: type[Generic4]) -> Generic4: ... - 353 |+ def __new__(cls) -> typing.Self: ... -354 354 | def __enter__(self: Generic4) -> Generic4: ... -355 355 | -356 356 | from some_module import PotentialTypeVar +350 | def __enter__(self: Generic3) -> Generic3: ... +351 | +352 | class Generic4(collections.abc.Callable[P, ...]): + - def __new__(cls: type[Generic4]) -> Generic4: ... +353 + def __new__(cls) -> typing.Self: ... +354 | def __enter__(self: Generic4) -> Generic4: ... +355 | +356 | from some_module import PotentialTypeVar +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at runtime --> PYI034.py:354:9 @@ -446,16 +425,15 @@ PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at r 356 | from some_module import PotentialTypeVar | help: Use `Self` as return type - -ℹ Display-only fix -351 351 | -352 352 | class Generic4(collections.abc.Callable[P, ...]): -353 353 | def __new__(cls: type[Generic4]) -> Generic4: ... -354 |- def __enter__(self: Generic4) -> Generic4: ... - 354 |+ def __enter__(self) -> typing.Self: ... -355 355 | -356 356 | from some_module import PotentialTypeVar -357 357 | +351 | +352 | class Generic4(collections.abc.Callable[P, ...]): +353 | def __new__(cls: type[Generic4]) -> Generic4: ... + - def __enter__(self: Generic4) -> Generic4: ... +354 + def __enter__(self) -> typing.Self: ... +355 | +356 | from some_module import PotentialTypeVar +357 | +note: This is a display-only fix and is likely to be incorrect PYI034 [*] `__new__` methods in classes like `Generic5` usually return `self` at runtime --> PYI034.py:359:9 @@ -466,15 +444,14 @@ PYI034 [*] `__new__` methods in classes like `Generic5` usually return `self` at 360 | def __enter__(self: Generic5) -> Generic5: ... | help: Use `Self` as return type - -ℹ Unsafe fix -356 356 | from some_module import PotentialTypeVar -357 357 | -358 358 | class Generic5(list[PotentialTypeVar]): -359 |- def __new__(cls: type[Generic5]) -> Generic5: ... - 359 |+ def __new__(cls) -> typing.Self: ... -360 360 | def __enter__(self: Generic5) -> Generic5: ... -361 361 | +356 | from some_module import PotentialTypeVar +357 | +358 | class Generic5(list[PotentialTypeVar]): + - def __new__(cls: type[Generic5]) -> Generic5: ... +359 + def __new__(cls) -> typing.Self: ... +360 | def __enter__(self: Generic5) -> Generic5: ... +361 | +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__enter__` methods in classes like `Generic5` usually return `self` at runtime --> PYI034.py:360:9 @@ -485,11 +462,10 @@ PYI034 [*] `__enter__` methods in classes like `Generic5` usually return `self` | ^^^^^^^^^ | help: Use `Self` as return type - -ℹ Unsafe fix -357 357 | -358 358 | class Generic5(list[PotentialTypeVar]): -359 359 | def __new__(cls: type[Generic5]) -> Generic5: ... -360 |- def __enter__(self: Generic5) -> Generic5: ... - 360 |+ def __enter__(self) -> typing.Self: ... -361 361 | +357 | +358 | class Generic5(list[PotentialTypeVar]): +359 | def __new__(cls: type[Generic5]) -> Generic5: ... + - def __enter__(self: Generic5) -> Generic5: ... +360 + def __enter__(self) -> typing.Self: ... +361 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap index 294587cb6d..b8ff0ac77a 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI034_PYI034.pyi.snap @@ -12,16 +12,15 @@ PYI034 [*] `__new__` methods in classes like `Bad` usually return `self` at runt 22 | ) -> Bad: ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__"… | help: Use `Self` as return type - -ℹ Unsafe fix -19 19 | ): # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3 -20 20 | def __new__( -21 21 | cls, *args: Any, **kwargs: Any -22 |- ) -> Bad: ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..." - 22 |+ ) -> typing.Self: ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..." -23 23 | def __repr__( -24 24 | self, -25 25 | ) -> str: ... # Y029 Defining __repr__ or __str__ in a stub is almost always redundant +19 | ): # Y040 Do not inherit from "object" explicitly, as it is redundant in Python 3 +20 | def __new__( +21 | cls, *args: Any, **kwargs: Any + - ) -> Bad: ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..." +22 + ) -> typing.Self: ... # Y034 "__new__" methods usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__new__", e.g. "def __new__(cls, *args: Any, **kwargs: Any) -> Self: ..." +23 | def __repr__( +24 | self, +25 | ) -> str: ... # Y029 Defining __repr__ or __str__ in a stub is almost always redundant +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at runtime --> PYI034.pyi:35:9 @@ -34,16 +33,15 @@ PYI034 [*] `__enter__` methods in classes like `Bad` usually return `self` at ru 37 | ) -> Bad: ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extension… | help: Use `Self` as return type - -ℹ Unsafe fix -34 34 | ) -> typing.Any: ... # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods -35 35 | def __enter__( -36 36 | self, -37 |- ) -> Bad: ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." - 37 |+ ) -> typing.Self: ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." -38 38 | async def __aenter__( -39 39 | self, -40 40 | ) -> Bad: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." +34 | ) -> typing.Any: ... # Y032 Prefer "object" to "Any" for the second parameter in "__ne__" methods +35 | def __enter__( +36 | self, + - ) -> Bad: ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." +37 + ) -> typing.Self: ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." +38 | async def __aenter__( +39 | self, +40 | ) -> Bad: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at runtime --> PYI034.pyi:38:15 @@ -56,16 +54,15 @@ PYI034 [*] `__aenter__` methods in classes like `Bad` usually return `self` at r 40 | ) -> Bad: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensio… | help: Use `Self` as return type - -ℹ Unsafe fix -37 37 | ) -> Bad: ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." -38 38 | async def __aenter__( -39 39 | self, -40 |- ) -> Bad: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." - 40 |+ ) -> typing.Self: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." -41 41 | def __iadd__( -42 42 | self, other: Bad -43 43 | ) -> Bad: ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." +37 | ) -> Bad: ... # Y034 "__enter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__enter__", e.g. "def __enter__(self) -> Self: ..." +38 | async def __aenter__( +39 | self, + - ) -> Bad: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." +40 + ) -> typing.Self: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." +41 | def __iadd__( +42 | self, other: Bad +43 | ) -> Bad: ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at runtime --> PYI034.pyi:41:9 @@ -78,16 +75,15 @@ PYI034 [*] `__iadd__` methods in classes like `Bad` usually return `self` at run 43 | ) -> Bad: ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions… | help: Use `Self` as return type - -ℹ Unsafe fix -40 40 | ) -> Bad: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." -41 41 | def __iadd__( -42 42 | self, other: Bad -43 |- ) -> Bad: ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." - 43 |+ ) -> typing.Self: ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." -44 44 | -45 45 | class AlsoBad( -46 46 | int, builtins.object +40 | ) -> Bad: ... # Y034 "__aenter__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__aenter__", e.g. "async def __aenter__(self) -> Self: ..." +41 | def __iadd__( +42 | self, other: Bad + - ) -> Bad: ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." +43 + ) -> typing.Self: ... # Y034 "__iadd__" methods in classes like "Bad" usually return "self" at runtime. Consider using "typing_extensions.Self" in "Bad.__iadd__", e.g. "def __iadd__(self, other: Bad) -> Self: ..." +44 | +45 | class AlsoBad( +46 | int, builtins.object +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `self` at runtime --> PYI034.pyi:104:9 @@ -99,18 +95,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator1` usually return `sel 106 | ) -> Iterator[ | help: Use `Self` as return type - -ℹ Unsafe fix -103 103 | class BadIterator1(Iterator[int]): -104 104 | def __iter__( -105 105 | self, -106 |- ) -> Iterator[ -107 |- int -108 |- ]: ... # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..." - 106 |+ ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..." -109 107 | -110 108 | class BadIterator2( -111 109 | typing.Iterator[int] +103 | class BadIterator1(Iterator[int]): +104 | def __iter__( +105 | self, + - ) -> Iterator[ + - int + - ]: ... # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..." +106 + ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator1" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator1.__iter__", e.g. "def __iter__(self) -> Self: ..." +107 | +108 | class BadIterator2( +109 | typing.Iterator[int] +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `self` at runtime --> PYI034.pyi:113:9 @@ -123,18 +118,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator2` usually return `sel 115 | ) -> Iterator[ | help: Use `Self` as return type - -ℹ Unsafe fix -112 112 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) -113 113 | def __iter__( -114 114 | self, -115 |- ) -> Iterator[ -116 |- int -117 |- ]: ... # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..." - 115 |+ ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..." -118 116 | -119 117 | class BadIterator3( -120 118 | typing.Iterator[int] +112 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) +113 | def __iter__( +114 | self, + - ) -> Iterator[ + - int + - ]: ... # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..." +115 + ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator2" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator2.__iter__", e.g. "def __iter__(self) -> Self: ..." +116 | +117 | class BadIterator3( +118 | typing.Iterator[int] +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `self` at runtime --> PYI034.pyi:122:9 @@ -147,18 +141,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator3` usually return `sel 124 | ) -> collections.abc.Iterator[ | help: Use `Self` as return type - -ℹ Unsafe fix -121 121 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) -122 122 | def __iter__( -123 123 | self, -124 |- ) -> collections.abc.Iterator[ -125 |- int -126 |- ]: ... # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..." - 124 |+ ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..." -127 125 | -128 126 | class BadIterator4(Iterator[int]): -129 127 | # Note: *Iterable*, not *Iterator*, returned! +121 | ): # Y022 Use "collections.abc.Iterator[T]" instead of "typing.Iterator[T]" (PEP 585 syntax) +122 | def __iter__( +123 | self, + - ) -> collections.abc.Iterator[ + - int + - ]: ... # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..." +124 + ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator3" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator3.__iter__", e.g. "def __iter__(self) -> Self: ..." +125 | +126 | class BadIterator4(Iterator[int]): +127 | # Note: *Iterable*, not *Iterator*, returned! +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `self` at runtime --> PYI034.pyi:130:9 @@ -171,18 +164,17 @@ PYI034 [*] `__iter__` methods in classes like `BadIterator4` usually return `sel 132 | ) -> Iterable[ | help: Use `Self` as return type - -ℹ Unsafe fix -129 129 | # Note: *Iterable*, not *Iterator*, returned! -130 130 | def __iter__( -131 131 | self, -132 |- ) -> Iterable[ -133 |- int -134 |- ]: ... # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..." - 132 |+ ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..." -135 133 | -136 134 | class IteratorReturningIterable: -137 135 | def __iter__( +129 | # Note: *Iterable*, not *Iterator*, returned! +130 | def __iter__( +131 | self, + - ) -> Iterable[ + - int + - ]: ... # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..." +132 + ) -> typing.Self: ... # Y034 "__iter__" methods in classes like "BadIterator4" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadIterator4.__iter__", e.g. "def __iter__(self) -> Self: ..." +133 | +134 | class IteratorReturningIterable: +135 | def __iter__( +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return `self` at runtime --> PYI034.pyi:144:9 @@ -194,18 +186,17 @@ PYI034 [*] `__aiter__` methods in classes like `BadAsyncIterator` usually return 146 | ) -> typing.AsyncIterator[ | help: Use `Self` as return type - -ℹ Unsafe fix -143 143 | class BadAsyncIterator(collections.abc.AsyncIterator[str]): -144 144 | def __aiter__( -145 145 | self, -146 |- ) -> typing.AsyncIterator[ -147 |- str -148 |- ]: ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) - 146 |+ ) -> typing.Self: ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) -149 147 | -150 148 | class AsyncIteratorReturningAsyncIterable: -151 149 | def __aiter__( +143 | class BadAsyncIterator(collections.abc.AsyncIterator[str]): +144 | def __aiter__( +145 | self, + - ) -> typing.AsyncIterator[ + - str + - ]: ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) +146 + ) -> typing.Self: ... # Y034 "__aiter__" methods in classes like "BadAsyncIterator" usually return "self" at runtime. Consider using "typing_extensions.Self" in "BadAsyncIterator.__aiter__", e.g. "def __aiter__(self) -> Self: ..." # Y022 Use "collections.abc.AsyncIterator[T]" instead of "typing.AsyncIterator[T]" (PEP 585 syntax) +147 | +148 | class AsyncIteratorReturningAsyncIterable: +149 | def __aiter__( +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self` at runtime --> PYI034.pyi:221:9 @@ -216,16 +207,15 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric1` usually return `self` 222 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... | help: Use `Self` as return type - -ℹ Unsafe fix -218 218 | -219 219 | -220 220 | class NonGeneric1(tuple): -221 |- def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... - 221 |+ def __new__(cls, *args, **kwargs) -> typing.Self: ... -222 222 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... -223 223 | -224 224 | class NonGeneric2(tuple): +218 | +219 | +220 | class NonGeneric1(tuple): + - def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... +221 + def __new__(cls, *args, **kwargs) -> typing.Self: ... +222 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... +223 | +224 | class NonGeneric2(tuple): +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `self` at runtime --> PYI034.pyi:222:9 @@ -238,16 +228,15 @@ PYI034 [*] `__enter__` methods in classes like `NonGeneric1` usually return `sel 224 | class NonGeneric2(tuple): | help: Use `Self` as return type - -ℹ Unsafe fix -219 219 | -220 220 | class NonGeneric1(tuple): -221 221 | def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... -222 |- def __enter__(self: NonGeneric1) -> NonGeneric1: ... - 222 |+ def __enter__(self) -> typing.Self: ... -223 223 | -224 224 | class NonGeneric2(tuple): -225 225 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +219 | +220 | class NonGeneric1(tuple): +221 | def __new__(cls: type[NonGeneric1], *args, **kwargs) -> NonGeneric1: ... + - def __enter__(self: NonGeneric1) -> NonGeneric1: ... +222 + def __enter__(self) -> typing.Self: ... +223 | +224 | class NonGeneric2(tuple): +225 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +note: This is an unsafe fix and may change runtime behavior PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self` at runtime --> PYI034.pyi:225:9 @@ -259,16 +248,15 @@ PYI034 [*] `__new__` methods in classes like `NonGeneric2` usually return `self` 227 | class Generic1[T](list): | help: Use `Self` as return type - -ℹ Unsafe fix -222 222 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... -223 223 | -224 224 | class NonGeneric2(tuple): -225 |- def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... - 225 |+ def __new__(cls) -> typing.Self: ... -226 226 | -227 227 | class Generic1[T](list): -228 228 | def __new__(cls: type[Generic1]) -> Generic1: ... +222 | def __enter__(self: NonGeneric1) -> NonGeneric1: ... +223 | +224 | class NonGeneric2(tuple): + - def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +225 + def __new__(cls) -> typing.Self: ... +226 | +227 | class Generic1[T](list): +228 | def __new__(cls: type[Generic1]) -> Generic1: ... +note: This is an unsafe fix and may change runtime behavior PYI034 `__new__` methods in classes like `Generic1` usually return `self` at runtime --> PYI034.pyi:228:9 @@ -279,16 +267,15 @@ PYI034 `__new__` methods in classes like `Generic1` usually return `self` at run 229 | def __enter__(self: Generic1) -> Generic1: ... | help: Use `Self` as return type - -ℹ Display-only fix -225 225 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... -226 226 | -227 227 | class Generic1[T](list): -228 |- def __new__(cls: type[Generic1]) -> Generic1: ... - 228 |+ def __new__(cls) -> typing.Self: ... -229 229 | def __enter__(self: Generic1) -> Generic1: ... -230 230 | -231 231 | +225 | def __new__(cls: Type[NonGeneric2]) -> NonGeneric2: ... +226 | +227 | class Generic1[T](list): + - def __new__(cls: type[Generic1]) -> Generic1: ... +228 + def __new__(cls) -> typing.Self: ... +229 | def __enter__(self: Generic1) -> Generic1: ... +230 | +231 | +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at runtime --> PYI034.pyi:229:9 @@ -299,16 +286,15 @@ PYI034 `__enter__` methods in classes like `Generic1` usually return `self` at r | ^^^^^^^^^ | help: Use `Self` as return type - -ℹ Display-only fix -226 226 | -227 227 | class Generic1[T](list): -228 228 | def __new__(cls: type[Generic1]) -> Generic1: ... -229 |- def __enter__(self: Generic1) -> Generic1: ... - 229 |+ def __enter__(self) -> typing.Self: ... -230 230 | -231 231 | -232 232 | ### Correctness of typevar-likes are not verified. +226 | +227 | class Generic1[T](list): +228 | def __new__(cls: type[Generic1]) -> Generic1: ... + - def __enter__(self: Generic1) -> Generic1: ... +229 + def __enter__(self) -> typing.Self: ... +230 | +231 | +232 | ### Correctness of typevar-likes are not verified. +note: This is a display-only fix and is likely to be incorrect PYI034 `__new__` methods in classes like `Generic2` usually return `self` at runtime --> PYI034.pyi:239:9 @@ -319,16 +305,15 @@ PYI034 `__new__` methods in classes like `Generic2` usually return `self` at run 240 | def __enter__(self: Generic2) -> Generic2: ... | help: Use `Self` as return type - -ℹ Display-only fix -236 236 | Ts = TypeVarTuple('foo') -237 237 | -238 238 | class Generic2(Generic[T]): -239 |- def __new__(cls: type[Generic2]) -> Generic2: ... - 239 |+ def __new__(cls) -> typing.Self: ... -240 240 | def __enter__(self: Generic2) -> Generic2: ... -241 241 | -242 242 | class Generic3(tuple[*Ts]): +236 | Ts = TypeVarTuple('foo') +237 | +238 | class Generic2(Generic[T]): + - def __new__(cls: type[Generic2]) -> Generic2: ... +239 + def __new__(cls) -> typing.Self: ... +240 | def __enter__(self: Generic2) -> Generic2: ... +241 | +242 | class Generic3(tuple[*Ts]): +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at runtime --> PYI034.pyi:240:9 @@ -341,16 +326,15 @@ PYI034 `__enter__` methods in classes like `Generic2` usually return `self` at r 242 | class Generic3(tuple[*Ts]): | help: Use `Self` as return type - -ℹ Display-only fix -237 237 | -238 238 | class Generic2(Generic[T]): -239 239 | def __new__(cls: type[Generic2]) -> Generic2: ... -240 |- def __enter__(self: Generic2) -> Generic2: ... - 240 |+ def __enter__(self) -> typing.Self: ... -241 241 | -242 242 | class Generic3(tuple[*Ts]): -243 243 | def __new__(cls: type[Generic3]) -> Generic3: ... +237 | +238 | class Generic2(Generic[T]): +239 | def __new__(cls: type[Generic2]) -> Generic2: ... + - def __enter__(self: Generic2) -> Generic2: ... +240 + def __enter__(self) -> typing.Self: ... +241 | +242 | class Generic3(tuple[*Ts]): +243 | def __new__(cls: type[Generic3]) -> Generic3: ... +note: This is a display-only fix and is likely to be incorrect PYI034 `__new__` methods in classes like `Generic3` usually return `self` at runtime --> PYI034.pyi:243:9 @@ -361,16 +345,15 @@ PYI034 `__new__` methods in classes like `Generic3` usually return `self` at run 244 | def __enter__(self: Generic3) -> Generic3: ... | help: Use `Self` as return type - -ℹ Display-only fix -240 240 | def __enter__(self: Generic2) -> Generic2: ... -241 241 | -242 242 | class Generic3(tuple[*Ts]): -243 |- def __new__(cls: type[Generic3]) -> Generic3: ... - 243 |+ def __new__(cls) -> typing.Self: ... -244 244 | def __enter__(self: Generic3) -> Generic3: ... -245 245 | -246 246 | class Generic4(collections.abc.Callable[P, ...]): +240 | def __enter__(self: Generic2) -> Generic2: ... +241 | +242 | class Generic3(tuple[*Ts]): + - def __new__(cls: type[Generic3]) -> Generic3: ... +243 + def __new__(cls) -> typing.Self: ... +244 | def __enter__(self: Generic3) -> Generic3: ... +245 | +246 | class Generic4(collections.abc.Callable[P, ...]): +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at runtime --> PYI034.pyi:244:9 @@ -383,16 +366,15 @@ PYI034 `__enter__` methods in classes like `Generic3` usually return `self` at r 246 | class Generic4(collections.abc.Callable[P, ...]): | help: Use `Self` as return type - -ℹ Display-only fix -241 241 | -242 242 | class Generic3(tuple[*Ts]): -243 243 | def __new__(cls: type[Generic3]) -> Generic3: ... -244 |- def __enter__(self: Generic3) -> Generic3: ... - 244 |+ def __enter__(self) -> typing.Self: ... -245 245 | -246 246 | class Generic4(collections.abc.Callable[P, ...]): -247 247 | def __new__(cls: type[Generic4]) -> Generic4: ... +241 | +242 | class Generic3(tuple[*Ts]): +243 | def __new__(cls: type[Generic3]) -> Generic3: ... + - def __enter__(self: Generic3) -> Generic3: ... +244 + def __enter__(self) -> typing.Self: ... +245 | +246 | class Generic4(collections.abc.Callable[P, ...]): +247 | def __new__(cls: type[Generic4]) -> Generic4: ... +note: This is a display-only fix and is likely to be incorrect PYI034 `__new__` methods in classes like `Generic4` usually return `self` at runtime --> PYI034.pyi:247:9 @@ -403,16 +385,15 @@ PYI034 `__new__` methods in classes like `Generic4` usually return `self` at run 248 | def __enter__(self: Generic4) -> Generic4: ... | help: Use `Self` as return type - -ℹ Display-only fix -244 244 | def __enter__(self: Generic3) -> Generic3: ... -245 245 | -246 246 | class Generic4(collections.abc.Callable[P, ...]): -247 |- def __new__(cls: type[Generic4]) -> Generic4: ... - 247 |+ def __new__(cls) -> typing.Self: ... -248 248 | def __enter__(self: Generic4) -> Generic4: ... -249 249 | -250 250 | from some_module import PotentialTypeVar +244 | def __enter__(self: Generic3) -> Generic3: ... +245 | +246 | class Generic4(collections.abc.Callable[P, ...]): + - def __new__(cls: type[Generic4]) -> Generic4: ... +247 + def __new__(cls) -> typing.Self: ... +248 | def __enter__(self: Generic4) -> Generic4: ... +249 | +250 | from some_module import PotentialTypeVar +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at runtime --> PYI034.pyi:248:9 @@ -425,16 +406,15 @@ PYI034 `__enter__` methods in classes like `Generic4` usually return `self` at r 250 | from some_module import PotentialTypeVar | help: Use `Self` as return type - -ℹ Display-only fix -245 245 | -246 246 | class Generic4(collections.abc.Callable[P, ...]): -247 247 | def __new__(cls: type[Generic4]) -> Generic4: ... -248 |- def __enter__(self: Generic4) -> Generic4: ... - 248 |+ def __enter__(self) -> typing.Self: ... -249 249 | -250 250 | from some_module import PotentialTypeVar -251 251 | +245 | +246 | class Generic4(collections.abc.Callable[P, ...]): +247 | def __new__(cls: type[Generic4]) -> Generic4: ... + - def __enter__(self: Generic4) -> Generic4: ... +248 + def __enter__(self) -> typing.Self: ... +249 | +250 | from some_module import PotentialTypeVar +251 | +note: This is a display-only fix and is likely to be incorrect PYI034 `__new__` methods in classes like `Generic5` usually return `self` at runtime --> PYI034.pyi:253:9 @@ -445,14 +425,13 @@ PYI034 `__new__` methods in classes like `Generic5` usually return `self` at run 254 | def __enter__(self: Generic5) -> Generic5: ... | help: Use `Self` as return type - -ℹ Display-only fix -250 250 | from some_module import PotentialTypeVar -251 251 | -252 252 | class Generic5(list[PotentialTypeVar]): -253 |- def __new__(cls: type[Generic5]) -> Generic5: ... - 253 |+ def __new__(cls) -> typing.Self: ... -254 254 | def __enter__(self: Generic5) -> Generic5: ... +250 | from some_module import PotentialTypeVar +251 | +252 | class Generic5(list[PotentialTypeVar]): + - def __new__(cls: type[Generic5]) -> Generic5: ... +253 + def __new__(cls) -> typing.Self: ... +254 | def __enter__(self: Generic5) -> Generic5: ... +note: This is a display-only fix and is likely to be incorrect PYI034 `__enter__` methods in classes like `Generic5` usually return `self` at runtime --> PYI034.pyi:254:9 @@ -463,10 +442,9 @@ PYI034 `__enter__` methods in classes like `Generic5` usually return `self` at r | ^^^^^^^^^ | help: Use `Self` as return type - -ℹ Display-only fix -251 251 | -252 252 | class Generic5(list[PotentialTypeVar]): -253 253 | def __new__(cls: type[Generic5]) -> Generic5: ... -254 |- def __enter__(self: Generic5) -> Generic5: ... - 254 |+ def __enter__(self) -> typing.Self: ... +251 | +252 | class Generic5(list[PotentialTypeVar]): +253 | def __new__(cls: type[Generic5]) -> Generic5: ... + - def __enter__(self: Generic5) -> Generic5: ... +254 + def __enter__(self) -> typing.Self: ... +note: This is a display-only fix and is likely to be incorrect diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap index 15a8ed0a74..7762ae8004 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.py.snap @@ -10,16 +10,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object` 55 | async def __aexit__(self) -> None: ... # PYI036: Missing args | help: Annotate star-args with `object` - -ℹ Safe fix -51 51 | -52 52 | -53 53 | class BadOne: -54 |- def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation - 54 |+ def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation -55 55 | async def __aexit__(self) -> None: ... # PYI036: Missing args -56 56 | -57 57 | class BadTwo: +51 | +52 | +53 | class BadOne: + - def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation +54 + def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation +55 | async def __aexit__(self) -> None: ... # PYI036: Missing args +56 | +57 | class BadTwo: PYI036 If there are no star-args, `__aexit__` should have at least 3 non-keyword-only args (excluding `self`) --> PYI036.py:55:24 @@ -121,16 +119,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object` 71 | async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotati… | help: Annotate star-args with `object` - -ℹ Safe fix -67 67 | async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation -68 68 | -69 69 | class BadFive: -70 |- def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation - 70 |+ def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation -71 71 | async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation -72 72 | -73 73 | class BadSix: +67 | async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation +68 | +69 | class BadFive: + - def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation +70 + def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation +71 | async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation +72 | +73 | class BadSix: PYI036 [*] Star-args in `__aexit__` should be annotated with `object` --> PYI036.py:71:74 @@ -143,16 +139,14 @@ PYI036 [*] Star-args in `__aexit__` should be annotated with `object` 73 | class BadSix: | help: Annotate star-args with `object` - -ℹ Safe fix -68 68 | -69 69 | class BadFive: -70 70 | def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation -71 |- async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation - 71 |+ async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation -72 72 | -73 73 | class BadSix: -74 74 | def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default +68 | +69 | class BadFive: +70 | def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation + - async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation +71 + async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation +72 | +73 | class BadSix: +74 | def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default PYI036 All arguments after the first four in `__exit__` must have a default value --> PYI036.py:74:38 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap index aad7a9348e..0c74e34826 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI036_PYI036.pyi.snap @@ -10,16 +10,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object` 55 | async def __aexit__(self) -> None: ... # PYI036: Missing args | help: Annotate star-args with `object` - -ℹ Safe fix -51 51 | -52 52 | -53 53 | class BadOne: -54 |- def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation - 54 |+ def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation -55 55 | async def __aexit__(self) -> None: ... # PYI036: Missing args -56 56 | -57 57 | class BadTwo: +51 | +52 | +53 | class BadOne: + - def __exit__(self, *args: Any) -> None: ... # PYI036: Bad star-args annotation +54 + def __exit__(self, *args: object) -> None: ... # PYI036: Bad star-args annotation +55 | async def __aexit__(self) -> None: ... # PYI036: Missing args +56 | +57 | class BadTwo: PYI036 If there are no star-args, `__aexit__` should have at least 3 non-keyword-only args (excluding `self`) --> PYI036.pyi:55:24 @@ -132,16 +130,14 @@ PYI036 [*] Star-args in `__exit__` should be annotated with `object` 71 | async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotati… | help: Annotate star-args with `object` - -ℹ Safe fix -67 67 | async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation -68 68 | -69 69 | class BadFive: -70 |- def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation - 70 |+ def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation -71 71 | async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation -72 72 | -73 73 | class BadSix: +67 | async def __aexit__(self, __typ: type[BaseException] | None, __exc: BaseException | None, __tb: typing.Union[TracebackType, None, int]) -> bool | None: ... # PYI036: Third arg has bad annotation +68 | +69 | class BadFive: + - def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation +70 + def __exit__(self, typ: BaseException | None, *args: object) -> bool: ... # PYI036: Bad star-args annotation +71 | async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation +72 | +73 | class BadSix: PYI036 [*] Star-args in `__aexit__` should be annotated with `object` --> PYI036.pyi:71:74 @@ -154,16 +150,14 @@ PYI036 [*] Star-args in `__aexit__` should be annotated with `object` 73 | class BadSix: | help: Annotate star-args with `object` - -ℹ Safe fix -68 68 | -69 69 | class BadFive: -70 70 | def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation -71 |- async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation - 71 |+ async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation -72 72 | -73 73 | class BadSix: -74 74 | def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default +68 | +69 | class BadFive: +70 | def __exit__(self, typ: BaseException | None, *args: list[str]) -> bool: ... # PYI036: Bad star-args annotation + - async def __aexit__(self, /, typ: type[BaseException] | None, *args: Any) -> Awaitable[None]: ... # PYI036: Bad star-args annotation +71 + async def __aexit__(self, /, typ: type[BaseException] | None, *args: object) -> Awaitable[None]: ... # PYI036: Bad star-args annotation +72 | +73 | class BadSix: +74 | def __exit__(self, typ, exc, tb, weird_extra_arg, extra_arg2 = None) -> None: ... # PYI036: Extra arg must have default PYI036 All arguments after the first four in `__exit__` must have a default value --> PYI036.pyi:74:38 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap index 6f1d026f5c..85d1d40c22 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.py.snap @@ -9,16 +9,14 @@ PYI041 [*] Use `float` instead of `int | float` 24 | ... | help: Remove redundant type - -ℹ Safe fix -20 20 | ... -21 21 | -22 22 | -23 |-def f0(arg1: float | int) -> None: - 23 |+def f0(arg1: float) -> None: -24 24 | ... -25 25 | -26 26 | +20 | ... +21 | +22 | + - def f0(arg1: float | int) -> None: +23 + def f0(arg1: float) -> None: +24 | ... +25 | +26 | PYI041 [*] Use `complex` instead of `float | complex` --> PYI041_1.py:27:30 @@ -28,16 +26,14 @@ PYI041 [*] Use `complex` instead of `float | complex` 28 | ... | help: Remove redundant type - -ℹ Safe fix -24 24 | ... -25 25 | -26 26 | -27 |-def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: - 27 |+def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None: -28 28 | ... -29 29 | -30 30 | +24 | ... +25 | +26 | + - def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: +27 + def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None: +28 | ... +29 | +30 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:31:28 @@ -47,16 +43,14 @@ PYI041 [*] Use `float` instead of `int | float` 32 | ... | help: Remove redundant type - -ℹ Safe fix -28 28 | ... -29 29 | -30 30 | -31 |-def f2(arg1: int, /, arg2: int | int | float) -> None: - 31 |+def f2(arg1: int, /, arg2: float) -> None: -32 32 | ... -33 33 | -34 34 | +28 | ... +29 | +30 | + - def f2(arg1: int, /, arg2: int | int | float) -> None: +31 + def f2(arg1: int, /, arg2: float) -> None: +32 | ... +33 | +34 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:35:26 @@ -66,16 +60,14 @@ PYI041 [*] Use `float` instead of `int | float` 36 | ... | help: Remove redundant type - -ℹ Safe fix -32 32 | ... -33 33 | -34 34 | -35 |-def f3(arg1: int, *args: Union[int | int | float]) -> None: - 35 |+def f3(arg1: int, *args: float) -> None: -36 36 | ... -37 37 | -38 38 | +32 | ... +33 | +34 | + - def f3(arg1: int, *args: Union[int | int | float]) -> None: +35 + def f3(arg1: int, *args: float) -> None: +36 | ... +37 | +38 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:39:24 @@ -85,16 +77,14 @@ PYI041 [*] Use `float` instead of `int | float` 40 | ... | help: Remove redundant type - -ℹ Safe fix -36 36 | ... -37 37 | -38 38 | -39 |-async def f4(**kwargs: int | int | float) -> None: - 39 |+async def f4(**kwargs: float) -> None: -40 40 | ... -41 41 | -42 42 | +36 | ... +37 | +38 | + - async def f4(**kwargs: int | int | float) -> None: +39 + async def f4(**kwargs: float) -> None: +40 | ... +41 | +42 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:43:26 @@ -104,16 +94,14 @@ PYI041 [*] Use `float` instead of `int | float` 44 | ... | help: Remove redundant type - -ℹ Safe fix -40 40 | ... -41 41 | -42 42 | -43 |-def f5(arg1: int, *args: Union[int, int, float]) -> None: - 43 |+def f5(arg1: int, *args: float) -> None: -44 44 | ... -45 45 | -46 46 | +40 | ... +41 | +42 | + - def f5(arg1: int, *args: Union[int, int, float]) -> None: +43 + def f5(arg1: int, *args: float) -> None: +44 | ... +45 | +46 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:47:26 @@ -123,16 +111,14 @@ PYI041 [*] Use `float` instead of `int | float` 48 | ... | help: Remove redundant type - -ℹ Safe fix -44 44 | ... -45 45 | -46 46 | -47 |-def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: - 47 |+def f6(arg1: int, *args: float) -> None: -48 48 | ... -49 49 | -50 50 | +44 | ... +45 | +46 | + - def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: +47 + def f6(arg1: int, *args: float) -> None: +48 | ... +49 | +50 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:51:26 @@ -142,16 +128,14 @@ PYI041 [*] Use `float` instead of `int | float` 52 | ... | help: Remove redundant type - -ℹ Safe fix -48 48 | ... -49 49 | -50 50 | -51 |-def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: - 51 |+def f7(arg1: int, *args: float) -> None: -52 52 | ... -53 53 | -54 54 | +48 | ... +49 | +50 | + - def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: +51 + def f7(arg1: int, *args: float) -> None: +52 | ... +53 | +54 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:55:26 @@ -161,16 +145,14 @@ PYI041 [*] Use `float` instead of `int | float` 56 | ... | help: Remove redundant type - -ℹ Safe fix -52 52 | ... -53 53 | -54 54 | -55 |-def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: - 55 |+def f8(arg1: int, *args: float) -> None: -56 56 | ... -57 57 | -58 58 | +52 | ... +53 | +54 | + - def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: +55 + def f8(arg1: int, *args: float) -> None: +56 | ... +57 | +58 | PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.py:60:10 @@ -185,18 +167,17 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 64 | ... | help: Remove redundant type - -ℹ Unsafe fix -57 57 | -58 58 | -59 59 | def f9( -60 |- arg: Union[ # comment -61 |- float, # another -62 |- complex, int] - 60 |+ arg: complex -63 61 | ) -> None: -64 62 | ... -65 63 | +57 | +58 | +59 | def f9( + - arg: Union[ # comment + - float, # another + - complex, int] +60 + arg: complex +61 | ) -> None: +62 | ... +63 | +note: This is an unsafe fix and may change runtime behavior PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.py:68:9 @@ -211,16 +192,15 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 72 | ) -> None: | help: Remove redundant type - -ℹ Unsafe fix -65 65 | -66 66 | def f10( -67 67 | arg: ( -68 |- int | # comment -69 |- float | # another -70 68 | complex -71 69 | ) -72 70 | ) -> None: +65 | +66 | def f10( +67 | arg: ( + - int | # comment + - float | # another +68 | complex +69 | ) +70 | ) -> None: +note: This is an unsafe fix and may change runtime behavior PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.py:80:24 @@ -232,16 +212,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 81 | ... | help: Remove redundant type - -ℹ Safe fix -77 77 | def good(self, arg: int) -> None: -78 78 | ... -79 79 | -80 |- def bad(self, arg: int | float | complex) -> None: - 80 |+ def bad(self, arg: complex) -> None: -81 81 | ... -82 82 | -83 83 | def bad2(self, arg: int | Union[float, complex]) -> None: +77 | def good(self, arg: int) -> None: +78 | ... +79 | + - def bad(self, arg: int | float | complex) -> None: +80 + def bad(self, arg: complex) -> None: +81 | ... +82 | +83 | def bad2(self, arg: int | Union[float, complex]) -> None: PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.py:83:25 @@ -253,16 +231,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 84 | ... | help: Remove redundant type - -ℹ Safe fix -80 80 | def bad(self, arg: int | float | complex) -> None: -81 81 | ... -82 82 | -83 |- def bad2(self, arg: int | Union[float, complex]) -> None: - 83 |+ def bad2(self, arg: complex) -> None: -84 84 | ... -85 85 | -86 86 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: +80 | def bad(self, arg: int | float | complex) -> None: +81 | ... +82 | + - def bad2(self, arg: int | Union[float, complex]) -> None: +83 + def bad2(self, arg: complex) -> None: +84 | ... +85 | +86 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.py:86:25 @@ -274,16 +250,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 87 | ... | help: Remove redundant type - -ℹ Safe fix -83 83 | def bad2(self, arg: int | Union[float, complex]) -> None: -84 84 | ... -85 85 | -86 |- def bad3(self, arg: Union[Union[float, complex], int]) -> None: - 86 |+ def bad3(self, arg: complex) -> None: -87 87 | ... -88 88 | -89 89 | def bad4(self, arg: Union[float | complex, int]) -> None: +83 | def bad2(self, arg: int | Union[float, complex]) -> None: +84 | ... +85 | + - def bad3(self, arg: Union[Union[float, complex], int]) -> None: +86 + def bad3(self, arg: complex) -> None: +87 | ... +88 | +89 | def bad4(self, arg: Union[float | complex, int]) -> None: PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.py:89:25 @@ -295,16 +269,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 90 | ... | help: Remove redundant type - -ℹ Safe fix -86 86 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: -87 87 | ... -88 88 | -89 |- def bad4(self, arg: Union[float | complex, int]) -> None: - 89 |+ def bad4(self, arg: complex) -> None: -90 90 | ... -91 91 | -92 92 | def bad5(self, arg: int | (float | complex)) -> None: +86 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: +87 | ... +88 | + - def bad4(self, arg: Union[float | complex, int]) -> None: +89 + def bad4(self, arg: complex) -> None: +90 | ... +91 | +92 | def bad5(self, arg: int | (float | complex)) -> None: PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.py:92:25 @@ -316,16 +288,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 93 | ... | help: Remove redundant type - -ℹ Safe fix -89 89 | def bad4(self, arg: Union[float | complex, int]) -> None: -90 90 | ... -91 91 | -92 |- def bad5(self, arg: int | (float | complex)) -> None: - 92 |+ def bad5(self, arg: complex) -> None: -93 93 | ... -94 94 | -95 95 | +89 | def bad4(self, arg: Union[float | complex, int]) -> None: +90 | ... +91 | + - def bad5(self, arg: int | (float | complex)) -> None: +92 + def bad5(self, arg: complex) -> None: +93 | ... +94 | +95 | PYI041 Use `float` instead of `int | float` --> PYI041_1.py:99:23 @@ -349,16 +319,14 @@ PYI041 [*] Use `float` instead of `int | float` 106 | else: | help: Remove redundant type - -ℹ Safe fix -101 101 | -102 102 | if TYPE_CHECKING: -103 103 | -104 |- def f2(self, arg: None | int | None | float = None) -> None: ... # PYI041 - with fix - 104 |+ def f2(self, arg: None | None | float = None) -> None: ... # PYI041 - with fix -105 105 | -106 106 | else: -107 107 | +101 | +102 | if TYPE_CHECKING: +103 | + - def f2(self, arg: None | int | None | float = None) -> None: ... # PYI041 - with fix +104 + def f2(self, arg: None | None | float = None) -> None: ... # PYI041 - with fix +105 | +106 | else: +107 | PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.py:111:23 @@ -370,11 +338,9 @@ PYI041 [*] Use `float` instead of `int | float` 112 | pass | help: Remove redundant type - -ℹ Safe fix -108 108 | def f2(self, arg=None) -> None: -109 109 | pass -110 110 | -111 |- def f3(self, arg: None | float | None | int | None = None) -> None: # PYI041 - with fix - 111 |+ def f3(self, arg: None | float | None | None = None) -> None: # PYI041 - with fix -112 112 | pass +108 | def f2(self, arg=None) -> None: +109 | pass +110 | + - def f3(self, arg: None | float | None | int | None = None) -> None: # PYI041 - with fix +111 + def f3(self, arg: None | float | None | None = None) -> None: # PYI041 - with fix +112 | pass diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap index a3cdaa28f9..4c65f472d8 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI041_PYI041_1.pyi.snap @@ -8,16 +8,14 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -18 18 | def good2(arg: int, arg2: int | bool) -> None: ... -19 19 | -20 20 | -21 |-def f0(arg1: float | int) -> None: ... # PYI041 - 21 |+def f0(arg1: float) -> None: ... # PYI041 -22 22 | -23 23 | -24 24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ... # PYI041 +18 | def good2(arg: int, arg2: int | bool) -> None: ... +19 | +20 | + - def f0(arg1: float | int) -> None: ... # PYI041 +21 + def f0(arg1: float) -> None: ... # PYI041 +22 | +23 | +24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ... # PYI041 PYI041 [*] Use `complex` instead of `float | complex` --> PYI041_1.pyi:24:30 @@ -26,16 +24,14 @@ PYI041 [*] Use `complex` instead of `float | complex` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -21 21 | def f0(arg1: float | int) -> None: ... # PYI041 -22 22 | -23 23 | -24 |-def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ... # PYI041 - 24 |+def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None: ... # PYI041 -25 25 | -26 26 | -27 27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ... # PYI041 +21 | def f0(arg1: float | int) -> None: ... # PYI041 +22 | +23 | + - def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ... # PYI041 +24 + def f1(arg1: float, *, arg2: list[str] | type[bool] | complex) -> None: ... # PYI041 +25 | +26 | +27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ... # PYI041 PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:27:28 @@ -44,16 +40,14 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -24 24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ... # PYI041 -25 25 | -26 26 | -27 |-def f2(arg1: int, /, arg2: int | int | float) -> None: ... # PYI041 - 27 |+def f2(arg1: int, /, arg2: float) -> None: ... # PYI041 -28 28 | -29 29 | -30 30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ... # PYI041 +24 | def f1(arg1: float, *, arg2: float | list[str] | type[bool] | complex) -> None: ... # PYI041 +25 | +26 | + - def f2(arg1: int, /, arg2: int | int | float) -> None: ... # PYI041 +27 + def f2(arg1: int, /, arg2: float) -> None: ... # PYI041 +28 | +29 | +30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ... # PYI041 PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:30:26 @@ -62,16 +56,14 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -27 27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ... # PYI041 -28 28 | -29 29 | -30 |-def f3(arg1: int, *args: Union[int | int | float]) -> None: ... # PYI041 - 30 |+def f3(arg1: int, *args: float) -> None: ... # PYI041 -31 31 | -32 32 | -33 33 | async def f4(**kwargs: int | int | float) -> None: ... # PYI041 +27 | def f2(arg1: int, /, arg2: int | int | float) -> None: ... # PYI041 +28 | +29 | + - def f3(arg1: int, *args: Union[int | int | float]) -> None: ... # PYI041 +30 + def f3(arg1: int, *args: float) -> None: ... # PYI041 +31 | +32 | +33 | async def f4(**kwargs: int | int | float) -> None: ... # PYI041 PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:33:24 @@ -82,16 +74,14 @@ PYI041 [*] Use `float` instead of `int | float` 35 | def f5( | help: Remove redundant type - -ℹ Safe fix -30 30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ... # PYI041 -31 31 | -32 32 | -33 |-async def f4(**kwargs: int | int | float) -> None: ... # PYI041 - 33 |+async def f4(**kwargs: float) -> None: ... # PYI041 -34 34 | -35 35 | def f5( -36 36 | arg: Union[ # comment +30 | def f3(arg1: int, *args: Union[int | int | float]) -> None: ... # PYI041 +31 | +32 | + - async def f4(**kwargs: int | int | float) -> None: ... # PYI041 +33 + async def f4(**kwargs: float) -> None: ... # PYI041 +34 | +35 | def f5( +36 | arg: Union[ # comment PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.pyi:36:10 @@ -105,18 +95,17 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 39 | ) -> None: ... # PYI041 | help: Remove redundant type - -ℹ Unsafe fix -33 33 | async def f4(**kwargs: int | int | float) -> None: ... # PYI041 -34 34 | -35 35 | def f5( -36 |- arg: Union[ # comment -37 |- float, # another -38 |- complex, int] - 36 |+ arg: complex -39 37 | ) -> None: ... # PYI041 -40 38 | -41 39 | def f6( +33 | async def f4(**kwargs: int | int | float) -> None: ... # PYI041 +34 | +35 | def f5( + - arg: Union[ # comment + - float, # another + - complex, int] +36 + arg: complex +37 | ) -> None: ... # PYI041 +38 | +39 | def f6( +note: This is an unsafe fix and may change runtime behavior PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.pyi:43:9 @@ -131,16 +120,15 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 47 | ) -> None: ... # PYI041 | help: Remove redundant type - -ℹ Unsafe fix -40 40 | -41 41 | def f6( -42 42 | arg: ( -43 |- int | # comment -44 |- float | # another -45 43 | complex -46 44 | ) -47 45 | ) -> None: ... # PYI041 +40 | +41 | def f6( +42 | arg: ( + - int | # comment + - float | # another +43 | complex +44 | ) +45 | ) -> None: ... # PYI041 +note: This is an unsafe fix and may change runtime behavior PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:49:26 @@ -151,16 +139,14 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -46 46 | ) -47 47 | ) -> None: ... # PYI041 -48 48 | -49 |-def f5(arg1: int, *args: Union[int, int, float]) -> None: ... # PYI041 - 49 |+def f5(arg1: int, *args: float) -> None: ... # PYI041 -50 50 | -51 51 | -52 52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ... # PYI041 +46 | ) +47 | ) -> None: ... # PYI041 +48 | + - def f5(arg1: int, *args: Union[int, int, float]) -> None: ... # PYI041 +49 + def f5(arg1: int, *args: float) -> None: ... # PYI041 +50 | +51 | +52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ... # PYI041 PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:52:26 @@ -169,16 +155,14 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -49 49 | def f5(arg1: int, *args: Union[int, int, float]) -> None: ... # PYI041 -50 50 | -51 51 | -52 |-def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ... # PYI041 - 52 |+def f6(arg1: int, *args: float) -> None: ... # PYI041 -53 53 | -54 54 | -55 55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ... # PYI041 +49 | def f5(arg1: int, *args: Union[int, int, float]) -> None: ... # PYI041 +50 | +51 | + - def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ... # PYI041 +52 + def f6(arg1: int, *args: float) -> None: ... # PYI041 +53 | +54 | +55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ... # PYI041 PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:55:26 @@ -187,16 +171,14 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -52 52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ... # PYI041 -53 53 | -54 54 | -55 |-def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ... # PYI041 - 55 |+def f7(arg1: int, *args: float) -> None: ... # PYI041 -56 56 | -57 57 | -58 58 | def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ... # PYI041 +52 | def f6(arg1: int, *args: Union[Union[int, int, float]]) -> None: ... # PYI041 +53 | +54 | + - def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ... # PYI041 +55 + def f7(arg1: int, *args: float) -> None: ... # PYI041 +56 | +57 | +58 | def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ... # PYI041 PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:58:26 @@ -205,16 +187,14 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -55 55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ... # PYI041 -56 56 | -57 57 | -58 |-def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ... # PYI041 - 58 |+def f8(arg1: int, *args: float) -> None: ... # PYI041 -59 59 | -60 60 | -61 61 | class Foo: +55 | def f7(arg1: int, *args: Union[Union[Union[int, int, float]]]) -> None: ... # PYI041 +56 | +57 | + - def f8(arg1: int, *args: Union[Union[Union[int | int | float]]]) -> None: ... # PYI041 +58 + def f8(arg1: int, *args: float) -> None: ... # PYI041 +59 | +60 | +61 | class Foo: PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.pyi:64:24 @@ -227,16 +207,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 66 | def bad2(self, arg: int | Union[float, complex]) -> None: ... # PYI041 | help: Remove redundant type - -ℹ Safe fix -61 61 | class Foo: -62 62 | def good(self, arg: int) -> None: ... -63 63 | -64 |- def bad(self, arg: int | float | complex) -> None: ... # PYI041 - 64 |+ def bad(self, arg: complex) -> None: ... # PYI041 -65 65 | -66 66 | def bad2(self, arg: int | Union[float, complex]) -> None: ... # PYI041 -67 67 | +61 | class Foo: +62 | def good(self, arg: int) -> None: ... +63 | + - def bad(self, arg: int | float | complex) -> None: ... # PYI041 +64 + def bad(self, arg: complex) -> None: ... # PYI041 +65 | +66 | def bad2(self, arg: int | Union[float, complex]) -> None: ... # PYI041 +67 | PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.pyi:66:25 @@ -249,16 +227,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 68 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: ... # PYI041 | help: Remove redundant type - -ℹ Safe fix -63 63 | -64 64 | def bad(self, arg: int | float | complex) -> None: ... # PYI041 -65 65 | -66 |- def bad2(self, arg: int | Union[float, complex]) -> None: ... # PYI041 - 66 |+ def bad2(self, arg: complex) -> None: ... # PYI041 -67 67 | -68 68 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: ... # PYI041 -69 69 | +63 | +64 | def bad(self, arg: int | float | complex) -> None: ... # PYI041 +65 | + - def bad2(self, arg: int | Union[float, complex]) -> None: ... # PYI041 +66 + def bad2(self, arg: complex) -> None: ... # PYI041 +67 | +68 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: ... # PYI041 +69 | PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.pyi:68:25 @@ -271,16 +247,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 70 | def bad4(self, arg: Union[float | complex, int]) -> None: ... # PYI041 | help: Remove redundant type - -ℹ Safe fix -65 65 | -66 66 | def bad2(self, arg: int | Union[float, complex]) -> None: ... # PYI041 -67 67 | -68 |- def bad3(self, arg: Union[Union[float, complex], int]) -> None: ... # PYI041 - 68 |+ def bad3(self, arg: complex) -> None: ... # PYI041 -69 69 | -70 70 | def bad4(self, arg: Union[float | complex, int]) -> None: ... # PYI041 -71 71 | +65 | +66 | def bad2(self, arg: int | Union[float, complex]) -> None: ... # PYI041 +67 | + - def bad3(self, arg: Union[Union[float, complex], int]) -> None: ... # PYI041 +68 + def bad3(self, arg: complex) -> None: ... # PYI041 +69 | +70 | def bad4(self, arg: Union[float | complex, int]) -> None: ... # PYI041 +71 | PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.pyi:70:25 @@ -293,16 +267,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` 72 | def bad5(self, arg: int | (float | complex)) -> None: ... # PYI041 | help: Remove redundant type - -ℹ Safe fix -67 67 | -68 68 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: ... # PYI041 -69 69 | -70 |- def bad4(self, arg: Union[float | complex, int]) -> None: ... # PYI041 - 70 |+ def bad4(self, arg: complex) -> None: ... # PYI041 -71 71 | -72 72 | def bad5(self, arg: int | (float | complex)) -> None: ... # PYI041 -73 73 | +67 | +68 | def bad3(self, arg: Union[Union[float, complex], int]) -> None: ... # PYI041 +69 | + - def bad4(self, arg: Union[float | complex, int]) -> None: ... # PYI041 +70 + def bad4(self, arg: complex) -> None: ... # PYI041 +71 | +72 | def bad5(self, arg: int | (float | complex)) -> None: ... # PYI041 +73 | PYI041 [*] Use `complex` instead of `int | float | complex` --> PYI041_1.pyi:72:25 @@ -313,16 +285,14 @@ PYI041 [*] Use `complex` instead of `int | float | complex` | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -69 69 | -70 70 | def bad4(self, arg: Union[float | complex, int]) -> None: ... # PYI041 -71 71 | -72 |- def bad5(self, arg: int | (float | complex)) -> None: ... # PYI041 - 72 |+ def bad5(self, arg: complex) -> None: ... # PYI041 -73 73 | -74 74 | -75 75 | # https://github.com/astral-sh/ruff/issues/18298 +69 | +70 | def bad4(self, arg: Union[float | complex, int]) -> None: ... # PYI041 +71 | + - def bad5(self, arg: int | (float | complex)) -> None: ... # PYI041 +72 + def bad5(self, arg: complex) -> None: ... # PYI041 +73 | +74 | +75 | # https://github.com/astral-sh/ruff/issues/18298 PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:78:23 @@ -335,15 +305,13 @@ PYI041 [*] Use `float` instead of `int | float` 80 | def f3(self, arg: None | float | None | int | None = None) -> None: ... # PYI041 - with fix | help: Remove redundant type - -ℹ Safe fix -75 75 | # https://github.com/astral-sh/ruff/issues/18298 -76 76 | # fix must not yield runtime `None | None | ...` (TypeError) -77 77 | class Issue18298: -78 |- def f1(self, arg: None | int | None | float = None) -> None: ... # PYI041 - with fix - 78 |+ def f1(self, arg: None | None | float = None) -> None: ... # PYI041 - with fix -79 79 | -80 80 | def f3(self, arg: None | float | None | int | None = None) -> None: ... # PYI041 - with fix +75 | # https://github.com/astral-sh/ruff/issues/18298 +76 | # fix must not yield runtime `None | None | ...` (TypeError) +77 | class Issue18298: + - def f1(self, arg: None | int | None | float = None) -> None: ... # PYI041 - with fix +78 + def f1(self, arg: None | None | float = None) -> None: ... # PYI041 - with fix +79 | +80 | def f3(self, arg: None | float | None | int | None = None) -> None: ... # PYI041 - with fix PYI041 [*] Use `float` instead of `int | float` --> PYI041_1.pyi:80:23 @@ -354,10 +322,8 @@ PYI041 [*] Use `float` instead of `int | float` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove redundant type - -ℹ Safe fix -77 77 | class Issue18298: -78 78 | def f1(self, arg: None | int | None | float = None) -> None: ... # PYI041 - with fix -79 79 | -80 |- def f3(self, arg: None | float | None | int | None = None) -> None: ... # PYI041 - with fix - 80 |+ def f3(self, arg: None | float | None | None = None) -> None: ... # PYI041 - with fix +77 | class Issue18298: +78 | def f1(self, arg: None | int | None | float = None) -> None: ... # PYI041 - with fix +79 | + - def f3(self, arg: None | float | None | int | None = None) -> None: ... # PYI041 - with fix +80 + def f3(self, arg: None | float | None | None = None) -> None: ... # PYI041 - with fix diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap index bf7da8eb1f..a135b05380 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI044_PYI044.pyi.snap @@ -10,13 +10,11 @@ PYI044 [*] `from __future__ import annotations` has no effect in stub files, sin 3 | from __future__ import annotations, with_statement # PYI044. | help: Remove `from __future__ import annotations` - -ℹ Safe fix -1 1 | # Bad import. -2 |-from __future__ import annotations # PYI044. -3 2 | from __future__ import annotations, with_statement # PYI044. -4 3 | -5 4 | # Good imports. +1 | # Bad import. + - from __future__ import annotations # PYI044. +2 | from __future__ import annotations, with_statement # PYI044. +3 | +4 | # Good imports. PYI044 [*] `from __future__ import annotations` has no effect in stub files, since type checkers automatically treat stubs as having those semantics --> PYI044.pyi:3:1 @@ -29,12 +27,10 @@ PYI044 [*] `from __future__ import annotations` has no effect in stub files, sin 5 | # Good imports. | help: Remove `from __future__ import annotations` - -ℹ Safe fix -1 1 | # Bad import. -2 2 | from __future__ import annotations # PYI044. -3 |-from __future__ import annotations, with_statement # PYI044. - 3 |+from __future__ import with_statement # PYI044. -4 4 | -5 5 | # Good imports. -6 6 | from __future__ import with_statement +1 | # Bad import. +2 | from __future__ import annotations # PYI044. + - from __future__ import annotations, with_statement # PYI044. +3 + from __future__ import with_statement # PYI044. +4 | +5 | # Good imports. +6 | from __future__ import with_statement diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap index 0bd6da014d..3ec1a18844 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI053_PYI053.pyi.snap @@ -12,16 +12,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 9 | def f3( | help: Replace with `...` - -ℹ Safe fix -4 4 | -5 5 | def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ... # OK -6 6 | def f2( -7 |- x: str = "51 character stringgggggggggggggggggggggggggggggggg", # Error: PYI053 - 7 |+ x: str = ..., # Error: PYI053 -8 8 | ) -> None: ... -9 9 | def f3( -10 10 | x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600", # OK +4 | +5 | def f1(x: str = "50 character stringggggggggggggggggggggggggggggggg") -> None: ... # OK +6 | def f2( + - x: str = "51 character stringgggggggggggggggggggggggggggggggg", # Error: PYI053 +7 + x: str = ..., # Error: PYI053 +8 | ) -> None: ... +9 | def f3( +10 | x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600", # OK PYI053 [*] String and bytes literals longer than 50 characters are not permitted --> PYI053.pyi:13:14 @@ -34,16 +32,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 15 | def f5( | help: Replace with `...` - -ℹ Safe fix -10 10 | x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600", # OK -11 11 | ) -> None: ... -12 12 | def f4( -13 |- x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600", # Error: PYI053 - 13 |+ x: str = ..., # Error: PYI053 -14 14 | ) -> None: ... -15 15 | def f5( -16 16 | x: bytes = b"50 character byte stringgggggggggggggggggggggggggg", # OK +10 | x: str = "50 character stringgggggggggggggggggggggggggggggg\U0001f600", # OK +11 | ) -> None: ... +12 | def f4( + - x: str = "51 character stringggggggggggggggggggggggggggggggg\U0001f600", # Error: PYI053 +13 + x: str = ..., # Error: PYI053 +14 | ) -> None: ... +15 | def f5( +16 | x: bytes = b"50 character byte stringgggggggggggggggggggggggggg", # OK PYI053 [*] String and bytes literals longer than 50 characters are not permitted --> PYI053.pyi:25:16 @@ -55,16 +51,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 26 | ) -> None: ... | help: Replace with `...` - -ℹ Safe fix -22 22 | x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff", # OK -23 23 | ) -> None: ... -24 24 | def f8( -25 |- x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff", # Error: PYI053 - 25 |+ x: bytes = ..., # Error: PYI053 -26 26 | ) -> None: ... -27 27 | -28 28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg" # OK +22 | x: bytes = b"50 character byte stringggggggggggggggggggggggggg\xff", # OK +23 | ) -> None: ... +24 | def f8( + - x: bytes = b"51 character byte stringgggggggggggggggggggggggggg\xff", # Error: PYI053 +25 + x: bytes = ..., # Error: PYI053 +26 | ) -> None: ... +27 | +28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg" # OK PYI053 [*] String and bytes literals longer than 50 characters are not permitted --> PYI053.pyi:30:12 @@ -77,16 +71,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg" # OK | help: Replace with `...` - -ℹ Safe fix -27 27 | -28 28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg" # OK -29 29 | -30 |-bar: str = "51 character stringgggggggggggggggggggggggggggggggg" # Error: PYI053 - 30 |+bar: str = ... # Error: PYI053 -31 31 | -32 32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg" # OK -33 33 | +27 | +28 | foo: str = "50 character stringggggggggggggggggggggggggggggggg" # OK +29 | + - bar: str = "51 character stringgggggggggggggggggggggggggggggggg" # Error: PYI053 +30 + bar: str = ... # Error: PYI053 +31 | +32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg" # OK +33 | PYI053 [*] String and bytes literals longer than 50 characters are not permitted --> PYI053.pyi:34:14 @@ -99,16 +91,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg" # OK | help: Replace with `...` - -ℹ Safe fix -31 31 | -32 32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg" # OK -33 33 | -34 |-qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff" # Error: PYI053 - 34 |+qux: bytes = ... # Error: PYI053 -35 35 | -36 36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg" # OK -37 37 | +31 | +32 | baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg" # OK +33 | + - qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff" # Error: PYI053 +34 + qux: bytes = ... # Error: PYI053 +35 | +36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg" # OK +37 | PYI053 [*] String and bytes literals longer than 50 characters are not permitted --> PYI053.pyi:38:13 @@ -121,16 +111,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 40 | class Demo: | help: Replace with `...` - -ℹ Safe fix -35 35 | -36 36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg" # OK -37 37 | -38 |-fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg" # Error: PYI053 - 38 |+fbar: str = ... # Error: PYI053 -39 39 | -40 40 | class Demo: -41 41 | """Docstrings are excluded from this rule. Some padding.""" # OK +35 | +36 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg" # OK +37 | + - fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg" # Error: PYI053 +38 + fbar: str = ... # Error: PYI053 +39 | +40 | class Demo: +41 | """Docstrings are excluded from this rule. Some padding.""" # OK PYI053 [*] String and bytes literals longer than 50 characters are not permitted --> PYI053.pyi:64:5 @@ -142,16 +130,14 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 66 | def not_a_deprecated_function() -> None: ... | help: Replace with `...` - -ℹ Safe fix -61 61 | ) -> Callable[[Callable[[], None]], Callable[[], None]]: ... -62 62 | -63 63 | @not_warnings_dot_deprecated( -64 |- "Not warnings.deprecated, so this one *should* lead to PYI053 in a stub!" # Error: PYI053 - 64 |+ ... # Error: PYI053 -65 65 | ) -66 66 | def not_a_deprecated_function() -> None: ... -67 67 | +61 | ) -> Callable[[Callable[[], None]], Callable[[], None]]: ... +62 | +63 | @not_warnings_dot_deprecated( + - "Not warnings.deprecated, so this one *should* lead to PYI053 in a stub!" # Error: PYI053 +64 + ... # Error: PYI053 +65 | ) +66 | def not_a_deprecated_function() -> None: ... +67 | PYI053 [*] String and bytes literals longer than 50 characters are not permitted --> PYI053.pyi:68:13 @@ -164,13 +150,11 @@ PYI053 [*] String and bytes literals longer than 50 characters are not permitted 70 | from typing import TypeAlias, Literal, Annotated | help: Replace with `...` - -ℹ Safe fix -65 65 | ) -66 66 | def not_a_deprecated_function() -> None: ... -67 67 | -68 |-fbaz: str = f"51 character {foo} stringgggggggggggggggggggggggggg" # Error: PYI053 - 68 |+fbaz: str = ... # Error: PYI053 -69 69 | -70 70 | from typing import TypeAlias, Literal, Annotated -71 71 | +65 | ) +66 | def not_a_deprecated_function() -> None: ... +67 | + - fbaz: str = f"51 character {foo} stringgggggggggggggggggggggggggg" # Error: PYI053 +68 + fbaz: str = ... # Error: PYI053 +69 | +70 | from typing import TypeAlias, Literal, Annotated +71 | diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap index 2b9d8538c0..813cf43e37 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI054_PYI054.pyi.snap @@ -11,14 +11,12 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact 4 | field04: int = -0xFFFFFFFFF # Error: PYI054 | help: Replace with `...` - -ℹ Safe fix -1 1 | field01: int = 0xFFFFFFFF -2 |-field02: int = 0xFFFFFFFFF # Error: PYI054 - 2 |+field02: int = ... # Error: PYI054 -3 3 | field03: int = -0xFFFFFFFF -4 4 | field04: int = -0xFFFFFFFFF # Error: PYI054 -5 5 | +1 | field01: int = 0xFFFFFFFF + - field02: int = 0xFFFFFFFFF # Error: PYI054 +2 + field02: int = ... # Error: PYI054 +3 | field03: int = -0xFFFFFFFF +4 | field04: int = -0xFFFFFFFFF # Error: PYI054 +5 | PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted --> PYI054.pyi:4:17 @@ -31,16 +29,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact 6 | field05: int = 1234567890 | help: Replace with `...` - -ℹ Safe fix -1 1 | field01: int = 0xFFFFFFFF -2 2 | field02: int = 0xFFFFFFFFF # Error: PYI054 -3 3 | field03: int = -0xFFFFFFFF -4 |-field04: int = -0xFFFFFFFFF # Error: PYI054 - 4 |+field04: int = -... # Error: PYI054 -5 5 | -6 6 | field05: int = 1234567890 -7 7 | field06: int = 12_456_890 +1 | field01: int = 0xFFFFFFFF +2 | field02: int = 0xFFFFFFFFF # Error: PYI054 +3 | field03: int = -0xFFFFFFFF + - field04: int = -0xFFFFFFFFF # Error: PYI054 +4 + field04: int = -... # Error: PYI054 +5 | +6 | field05: int = 1234567890 +7 | field06: int = 12_456_890 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted --> PYI054.pyi:8:16 @@ -53,16 +49,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact 10 | field09: int = -234_567_890 # Error: PYI054 | help: Replace with `...` - -ℹ Safe fix -5 5 | -6 6 | field05: int = 1234567890 -7 7 | field06: int = 12_456_890 -8 |-field07: int = 12345678901 # Error: PYI054 - 8 |+field07: int = ... # Error: PYI054 -9 9 | field08: int = -1234567801 -10 10 | field09: int = -234_567_890 # Error: PYI054 -11 11 | +5 | +6 | field05: int = 1234567890 +7 | field06: int = 12_456_890 + - field07: int = 12345678901 # Error: PYI054 +8 + field07: int = ... # Error: PYI054 +9 | field08: int = -1234567801 +10 | field09: int = -234_567_890 # Error: PYI054 +11 | PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted --> PYI054.pyi:10:17 @@ -75,16 +69,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact 12 | field10: float = 123.456789 | help: Replace with `...` - -ℹ Safe fix -7 7 | field06: int = 12_456_890 -8 8 | field07: int = 12345678901 # Error: PYI054 -9 9 | field08: int = -1234567801 -10 |-field09: int = -234_567_890 # Error: PYI054 - 10 |+field09: int = -... # Error: PYI054 -11 11 | -12 12 | field10: float = 123.456789 -13 13 | field11: float = 123.4567890 # Error: PYI054 +7 | field06: int = 12_456_890 +8 | field07: int = 12345678901 # Error: PYI054 +9 | field08: int = -1234567801 + - field09: int = -234_567_890 # Error: PYI054 +10 + field09: int = -... # Error: PYI054 +11 | +12 | field10: float = 123.456789 +13 | field11: float = 123.4567890 # Error: PYI054 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted --> PYI054.pyi:13:18 @@ -96,16 +88,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact 15 | field13: float = -123.567_890 # Error: PYI054 | help: Replace with `...` - -ℹ Safe fix -10 10 | field09: int = -234_567_890 # Error: PYI054 -11 11 | -12 12 | field10: float = 123.456789 -13 |-field11: float = 123.4567890 # Error: PYI054 - 13 |+field11: float = ... # Error: PYI054 -14 14 | field12: float = -123.456789 -15 15 | field13: float = -123.567_890 # Error: PYI054 -16 16 | +10 | field09: int = -234_567_890 # Error: PYI054 +11 | +12 | field10: float = 123.456789 + - field11: float = 123.4567890 # Error: PYI054 +13 + field11: float = ... # Error: PYI054 +14 | field12: float = -123.456789 +15 | field13: float = -123.567_890 # Error: PYI054 +16 | PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted --> PYI054.pyi:15:19 @@ -118,16 +108,14 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact 17 | field14: complex = 1e1234567j | help: Replace with `...` - -ℹ Safe fix -12 12 | field10: float = 123.456789 -13 13 | field11: float = 123.4567890 # Error: PYI054 -14 14 | field12: float = -123.456789 -15 |-field13: float = -123.567_890 # Error: PYI054 - 15 |+field13: float = -... # Error: PYI054 -16 16 | -17 17 | field14: complex = 1e1234567j -18 18 | field15: complex = 1e12345678j # Error: PYI054 +12 | field10: float = 123.456789 +13 | field11: float = 123.4567890 # Error: PYI054 +14 | field12: float = -123.456789 + - field13: float = -123.567_890 # Error: PYI054 +15 + field13: float = -... # Error: PYI054 +16 | +17 | field14: complex = 1e1234567j +18 | field15: complex = 1e12345678j # Error: PYI054 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted --> PYI054.pyi:18:20 @@ -139,15 +127,13 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact 20 | field17: complex = 1e123456789j # Error: PYI054 | help: Replace with `...` - -ℹ Safe fix -15 15 | field13: float = -123.567_890 # Error: PYI054 -16 16 | -17 17 | field14: complex = 1e1234567j -18 |-field15: complex = 1e12345678j # Error: PYI054 - 18 |+field15: complex = ... # Error: PYI054 -19 19 | field16: complex = -1e1234567j -20 20 | field17: complex = 1e123456789j # Error: PYI054 +15 | field13: float = -123.567_890 # Error: PYI054 +16 | +17 | field14: complex = 1e1234567j + - field15: complex = 1e12345678j # Error: PYI054 +18 + field15: complex = ... # Error: PYI054 +19 | field16: complex = -1e1234567j +20 | field17: complex = 1e123456789j # Error: PYI054 PYI054 [*] Numeric literals with a string representation longer than ten characters are not permitted --> PYI054.pyi:20:20 @@ -158,10 +144,8 @@ PYI054 [*] Numeric literals with a string representation longer than ten charact | ^^^^^^^^^^^^ | help: Replace with `...` - -ℹ Safe fix -17 17 | field14: complex = 1e1234567j -18 18 | field15: complex = 1e12345678j # Error: PYI054 -19 19 | field16: complex = -1e1234567j -20 |-field17: complex = 1e123456789j # Error: PYI054 - 20 |+field17: complex = ... # Error: PYI054 +17 | field14: complex = 1e1234567j +18 | field15: complex = 1e12345678j # Error: PYI054 +19 | field16: complex = -1e1234567j + - field17: complex = 1e123456789j # Error: PYI054 +20 + field17: complex = ... # Error: PYI054 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap index a1ec7eed26..15a50a1e1b 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.py.snap @@ -12,16 +12,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 36 | z: Union[ # comment | help: Combine multiple `type` members - -ℹ Safe fix -31 31 | -32 32 | def func(): -33 33 | # PYI055 -34 |- x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker - 34 |+ x: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker -35 35 | y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker -36 36 | z: Union[ # comment -37 37 | type[requests_mock.Mocker], # another comment +31 | +32 | def func(): +33 | # PYI055 + - x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker +34 + x: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker +35 | y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker +36 | z: Union[ # comment +37 | type[requests_mock.Mocker], # another comment PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`. --> PYI055.py:35:8 @@ -34,16 +32,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 37 | type[requests_mock.Mocker], # another comment | help: Combine multiple `type` members - -ℹ Safe fix -32 32 | def func(): -33 33 | # PYI055 -34 34 | x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker -35 |- y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker - 35 |+ y: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker -36 36 | z: Union[ # comment -37 37 | type[requests_mock.Mocker], # another comment -38 38 | type[httpretty], type[str]] = requests_mock.Mocker +32 | def func(): +33 | # PYI055 +34 | x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker + - y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker +35 + y: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker +36 | z: Union[ # comment +37 | type[requests_mock.Mocker], # another comment +38 | type[httpretty], type[str]] = requests_mock.Mocker PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`. --> PYI055.py:36:8 @@ -57,18 +53,17 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ | |___________________________________^ | help: Combine multiple `type` members - -ℹ Unsafe fix -33 33 | # PYI055 -34 34 | x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker -35 35 | y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker -36 |- z: Union[ # comment -37 |- type[requests_mock.Mocker], # another comment -38 |- type[httpretty], type[str]] = requests_mock.Mocker - 36 |+ z: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker -39 37 | -40 38 | -41 39 | def func(): +33 | # PYI055 +34 | x: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker +35 | y: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker + - z: Union[ # comment + - type[requests_mock.Mocker], # another comment + - type[httpretty], type[str]] = requests_mock.Mocker +36 + z: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker +37 | +38 | +39 | def func(): +note: This is an unsafe fix and may change runtime behavior PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`. --> PYI055.py:45:8 @@ -78,16 +73,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Combine multiple `type` members - -ℹ Safe fix -42 42 | from typing import Union as U -43 43 | -44 44 | # PYI055 -45 |- x: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker - 45 |+ x: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker -46 46 | -47 47 | -48 48 | def convert_union(union: UnionType) -> _T | None: +42 | from typing import Union as U +43 | +44 | # PYI055 + - x: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker +45 + x: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker +46 | +47 | +48 | def convert_union(union: UnionType) -> _T | None: PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`. --> PYI055.py:50:9 @@ -100,16 +93,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 52 | ... | help: Combine multiple `type` members - -ℹ Safe fix -47 47 | -48 48 | def convert_union(union: UnionType) -> _T | None: -49 49 | converters: tuple[ -50 |- type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 - 50 |+ type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 -51 51 | ] = union.__args__ -52 52 | ... -53 53 | +47 | +48 | def convert_union(union: UnionType) -> _T | None: +49 | converters: tuple[ + - type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 +50 + type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 +51 | ] = union.__args__ +52 | ... +53 | PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`. --> PYI055.py:56:9 @@ -122,16 +113,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 58 | ... | help: Combine multiple `type` members - -ℹ Safe fix -53 53 | -54 54 | def convert_union(union: UnionType) -> _T | None: -55 55 | converters: tuple[ -56 |- Union[type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T]], ... # PYI055 - 56 |+ type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 -57 57 | ] = union.__args__ -58 58 | ... -59 59 | +53 | +54 | def convert_union(union: UnionType) -> _T | None: +55 | converters: tuple[ + - Union[type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T]], ... # PYI055 +56 + type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 +57 | ] = union.__args__ +58 | ... +59 | PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`. --> PYI055.py:62:9 @@ -144,16 +133,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 64 | ... | help: Combine multiple `type` members - -ℹ Safe fix -59 59 | -60 60 | def convert_union(union: UnionType) -> _T | None: -61 61 | converters: tuple[ -62 |- Union[type[_T] | type[Converter[_T]]] | Converter[_T] | Callable[[str], _T], ... # PYI055 - 62 |+ type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 -63 63 | ] = union.__args__ -64 64 | ... -65 65 | +59 | +60 | def convert_union(union: UnionType) -> _T | None: +61 | converters: tuple[ + - Union[type[_T] | type[Converter[_T]]] | Converter[_T] | Callable[[str], _T], ... # PYI055 +62 + type[_T | Converter[_T]] | Converter[_T] | Callable[[str], _T], ... # PYI055 +63 | ] = union.__args__ +64 | ... +65 | PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[_T | Converter[_T]]`. --> PYI055.py:68:9 @@ -166,13 +153,11 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 70 | ... | help: Combine multiple `type` members - -ℹ Safe fix -65 65 | -66 66 | def convert_union(union: UnionType) -> _T | None: -67 67 | converters: tuple[ -68 |- Union[type[_T] | type[Converter[_T]] | str] | Converter[_T] | Callable[[str], _T], ... # PYI055 - 68 |+ type[_T | Converter[_T]] | str | Converter[_T] | Callable[[str], _T], ... # PYI055 -69 69 | ] = union.__args__ -70 70 | ... -71 71 | +65 | +66 | def convert_union(union: UnionType) -> _T | None: +67 | converters: tuple[ + - Union[type[_T] | type[Converter[_T]] | str] | Converter[_T] | Callable[[str], _T], ... # PYI055 +68 + type[_T | Converter[_T]] | str | Converter[_T] | Callable[[str], _T], ... # PYI055 +69 | ] = union.__args__ +70 | ... +71 | diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap index d921242df6..e86808c585 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI055_PYI055.pyi.snap @@ -12,16 +12,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 6 | u: builtins.type[int] | type[str] | builtins.type[complex] | help: Combine multiple `type` members - -ℹ Safe fix -1 1 | import builtins -2 2 | from typing import Union -3 3 | -4 |-s: builtins.type[int] | builtins.type[str] | builtins.type[complex] - 4 |+s: type[int | str | complex] -5 5 | t: type[int] | type[str] | type[float] -6 6 | u: builtins.type[int] | type[str] | builtins.type[complex] -7 7 | v: Union[type[float], type[complex]] +1 | import builtins +2 | from typing import Union +3 | + - s: builtins.type[int] | builtins.type[str] | builtins.type[complex] +4 + s: type[int | str | complex] +5 | t: type[int] | type[str] | type[float] +6 | u: builtins.type[int] | type[str] | builtins.type[complex] +7 | v: Union[type[float], type[complex]] PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | str | float]`. --> PYI055.pyi:5:4 @@ -33,16 +31,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 7 | v: Union[type[float], type[complex]] | help: Combine multiple `type` members - -ℹ Safe fix -2 2 | from typing import Union -3 3 | -4 4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex] -5 |-t: type[int] | type[str] | type[float] - 5 |+t: type[int | str | float] -6 6 | u: builtins.type[int] | type[str] | builtins.type[complex] -7 7 | v: Union[type[float], type[complex]] -8 8 | w: Union[type[Union[float, int]], type[complex]] +2 | from typing import Union +3 | +4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex] + - t: type[int] | type[str] | type[float] +5 + t: type[int | str | float] +6 | u: builtins.type[int] | type[str] | builtins.type[complex] +7 | v: Union[type[float], type[complex]] +8 | w: Union[type[Union[float, int]], type[complex]] PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | str | complex]`. --> PYI055.pyi:6:4 @@ -55,16 +51,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 8 | w: Union[type[Union[float, int]], type[complex]] | help: Combine multiple `type` members - -ℹ Safe fix -3 3 | -4 4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex] -5 5 | t: type[int] | type[str] | type[float] -6 |-u: builtins.type[int] | type[str] | builtins.type[complex] - 6 |+u: type[int | str | complex] -7 7 | v: Union[type[float], type[complex]] -8 8 | w: Union[type[Union[float, int]], type[complex]] -9 9 | x: Union[Union[type[Union[float, int]], type[complex]]] +3 | +4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex] +5 | t: type[int] | type[str] | type[float] + - u: builtins.type[int] | type[str] | builtins.type[complex] +6 + u: type[int | str | complex] +7 | v: Union[type[float], type[complex]] +8 | w: Union[type[Union[float, int]], type[complex]] +9 | x: Union[Union[type[Union[float, int]], type[complex]]] PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[float, complex]]`. --> PYI055.pyi:7:4 @@ -77,16 +71,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 9 | x: Union[Union[type[Union[float, int]], type[complex]]] | help: Combine multiple `type` members - -ℹ Safe fix -4 4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex] -5 5 | t: type[int] | type[str] | type[float] -6 6 | u: builtins.type[int] | type[str] | builtins.type[complex] -7 |-v: Union[type[float], type[complex]] - 7 |+v: type[Union[float, complex]] -8 8 | w: Union[type[Union[float, int]], type[complex]] -9 9 | x: Union[Union[type[Union[float, int]], type[complex]]] -10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] +4 | s: builtins.type[int] | builtins.type[str] | builtins.type[complex] +5 | t: type[int] | type[str] | type[float] +6 | u: builtins.type[int] | type[str] | builtins.type[complex] + - v: Union[type[float], type[complex]] +7 + v: type[Union[float, complex]] +8 | w: Union[type[Union[float, int]], type[complex]] +9 | x: Union[Union[type[Union[float, int]], type[complex]]] +10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[Union[float, int], complex]]`. --> PYI055.pyi:8:4 @@ -99,16 +91,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] | help: Combine multiple `type` members - -ℹ Safe fix -5 5 | t: type[int] | type[str] | type[float] -6 6 | u: builtins.type[int] | type[str] | builtins.type[complex] -7 7 | v: Union[type[float], type[complex]] -8 |-w: Union[type[Union[float, int]], type[complex]] - 8 |+w: type[Union[Union[float, int], complex]] -9 9 | x: Union[Union[type[Union[float, int]], type[complex]]] -10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] -11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] +5 | t: type[int] | type[str] | type[float] +6 | u: builtins.type[int] | type[str] | builtins.type[complex] +7 | v: Union[type[float], type[complex]] + - w: Union[type[Union[float, int]], type[complex]] +8 + w: type[Union[Union[float, int], complex]] +9 | x: Union[Union[type[Union[float, int]], type[complex]]] +10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] +11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[Union[float, int], complex]]`. --> PYI055.pyi:9:4 @@ -121,16 +111,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] | help: Combine multiple `type` members - -ℹ Safe fix -6 6 | u: builtins.type[int] | type[str] | builtins.type[complex] -7 7 | v: Union[type[float], type[complex]] -8 8 | w: Union[type[Union[float, int]], type[complex]] -9 |-x: Union[Union[type[Union[float, int]], type[complex]]] - 9 |+x: type[Union[Union[float, int], complex]] -10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] -11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] -12 12 | +6 | u: builtins.type[int] | type[str] | builtins.type[complex] +7 | v: Union[type[float], type[complex]] +8 | w: Union[type[Union[float, int]], type[complex]] + - x: Union[Union[type[Union[float, int]], type[complex]]] +9 + x: type[Union[Union[float, int], complex]] +10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] +11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] +12 | PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[Union[float, int], complex]]`. --> PYI055.pyi:10:4 @@ -142,16 +130,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] | help: Combine multiple `type` members - -ℹ Safe fix -7 7 | v: Union[type[float], type[complex]] -8 8 | w: Union[type[Union[float, int]], type[complex]] -9 9 | x: Union[Union[type[Union[float, int]], type[complex]]] -10 |-y: Union[Union[Union[type[Union[float, int]], type[complex]]]] - 10 |+y: type[Union[Union[float, int], complex]] -11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] -12 12 | -13 13 | def func(arg: type[int] | str | type[float]) -> None: ... +7 | v: Union[type[float], type[complex]] +8 | w: Union[type[Union[float, int]], type[complex]] +9 | x: Union[Union[type[Union[float, int]], type[complex]]] + - y: Union[Union[Union[type[Union[float, int]], type[complex]]]] +10 + y: type[Union[Union[float, int], complex]] +11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] +12 | +13 | def func(arg: type[int] | str | type[float]) -> None: ... PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[complex, Union[float, int]]]`. --> PYI055.pyi:11:4 @@ -164,16 +150,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 13 | def func(arg: type[int] | str | type[float]) -> None: ... | help: Combine multiple `type` members - -ℹ Safe fix -8 8 | w: Union[type[Union[float, int]], type[complex]] -9 9 | x: Union[Union[type[Union[float, int]], type[complex]]] -10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] -11 |-z: Union[type[complex], Union[Union[type[Union[float, int]]]]] - 11 |+z: type[Union[complex, Union[float, int]]] -12 12 | -13 13 | def func(arg: type[int] | str | type[float]) -> None: ... -14 14 | +8 | w: Union[type[Union[float, int]], type[complex]] +9 | x: Union[Union[type[Union[float, int]], type[complex]]] +10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] + - z: Union[type[complex], Union[Union[type[Union[float, int]]]]] +11 + z: type[Union[complex, Union[float, int]]] +12 | +13 | def func(arg: type[int] | str | type[float]) -> None: ... +14 | PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[int | float]`. --> PYI055.pyi:13:15 @@ -186,16 +170,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 15 | # OK | help: Combine multiple `type` members - -ℹ Safe fix -10 10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] -11 11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] -12 12 | -13 |-def func(arg: type[int] | str | type[float]) -> None: ... - 13 |+def func(arg: type[int | float] | str) -> None: ... -14 14 | -15 15 | # OK -16 16 | x: type[int | str | float] +10 | y: Union[Union[Union[type[Union[float, int]], type[complex]]]] +11 | z: Union[type[complex], Union[Union[type[Union[float, int]]]]] +12 | + - def func(arg: type[int] | str | type[float]) -> None: ... +13 + def func(arg: type[int | float] | str) -> None: ... +14 | +15 | # OK +16 | x: type[int | str | float] PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[requests_mock.Mocker | httpretty]`. --> PYI055.pyi:23:7 @@ -207,16 +189,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 25 | def func(): | help: Combine multiple `type` members - -ℹ Safe fix -20 20 | def func(arg: type[int, float] | str) -> None: ... -21 21 | -22 22 | # PYI055 -23 |-item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker - 23 |+item: type[requests_mock.Mocker | httpretty] = requests_mock.Mocker -24 24 | -25 25 | def func(): -26 26 | # PYI055 +20 | def func(arg: type[int, float] | str) -> None: ... +21 | +22 | # PYI055 + - item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker +23 + item: type[requests_mock.Mocker | httpretty] = requests_mock.Mocker +24 | +25 | def func(): +26 | # PYI055 PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[requests_mock.Mocker | httpretty | str]`. --> PYI055.pyi:27:11 @@ -229,16 +209,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 29 | item3: Union[ # comment | help: Combine multiple `type` members - -ℹ Safe fix -24 24 | -25 25 | def func(): -26 26 | # PYI055 -27 |- item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker - 27 |+ item: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker -28 28 | item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker -29 29 | item3: Union[ # comment -30 30 | type[requests_mock.Mocker], # another comment +24 | +25 | def func(): +26 | # PYI055 + - item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker +27 + item: type[requests_mock.Mocker | httpretty | str] = requests_mock.Mocker +28 | item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker +29 | item3: Union[ # comment +30 | type[requests_mock.Mocker], # another comment PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`. --> PYI055.pyi:28:12 @@ -251,16 +229,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ 30 | type[requests_mock.Mocker], # another comment | help: Combine multiple `type` members - -ℹ Safe fix -25 25 | def func(): -26 26 | # PYI055 -27 27 | item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker -28 |- item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker - 28 |+ item2: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker -29 29 | item3: Union[ # comment -30 30 | type[requests_mock.Mocker], # another comment -31 31 | type[httpretty], type[str]] = requests_mock.Mocker +25 | def func(): +26 | # PYI055 +27 | item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker + - item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker +28 + item2: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker +29 | item3: Union[ # comment +30 | type[requests_mock.Mocker], # another comment +31 | type[httpretty], type[str]] = requests_mock.Mocker PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `type[Union[requests_mock.Mocker, httpretty, str]]`. --> PYI055.pyi:29:12 @@ -274,15 +250,14 @@ PYI055 [*] Multiple `type` members in a union. Combine them into one, e.g., `typ | |___________________________________^ | help: Combine multiple `type` members - -ℹ Unsafe fix -26 26 | # PYI055 -27 27 | item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker -28 28 | item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker -29 |- item3: Union[ # comment -30 |- type[requests_mock.Mocker], # another comment -31 |- type[httpretty], type[str]] = requests_mock.Mocker - 29 |+ item3: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker -32 30 | -33 31 | -34 32 | # OK +26 | # PYI055 +27 | item: type[requests_mock.Mocker] | type[httpretty] | type[str] = requests_mock.Mocker +28 | item2: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker + - item3: Union[ # comment + - type[requests_mock.Mocker], # another comment + - type[httpretty], type[str]] = requests_mock.Mocker +29 + item3: type[Union[requests_mock.Mocker, httpretty, str]] = requests_mock.Mocker +30 | +31 | +32 | # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap index 19d08064d6..b4668d648b 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.py.snap @@ -10,18 +10,16 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 6 | ... # PYI058 (use `Iterator`) | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix - 1 |+from collections.abc import Iterator -1 2 | def scope(): -2 3 | from collections.abc import Generator -3 4 | -4 5 | class IteratorReturningSimpleGenerator1: -5 |- def __iter__(self) -> Generator: - 6 |+ def __iter__(self) -> Iterator: -6 7 | ... # PYI058 (use `Iterator`) -7 8 | -8 9 | +1 + from collections.abc import Iterator +2 | def scope(): +3 | from collections.abc import Generator +4 | +5 | class IteratorReturningSimpleGenerator1: + - def __iter__(self) -> Generator: +6 + def __iter__(self) -> Iterator: +7 | ... # PYI058 (use `Iterator`) +8 | +9 | PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.py:13:13 @@ -32,16 +30,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 14 | ... # PYI058 (use `Iterator`) | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -10 10 | import typing -11 11 | -12 12 | class IteratorReturningSimpleGenerator2: -13 |- def __iter__(self) -> typing.Generator: - 13 |+ def __iter__(self) -> typing.Iterator: -14 14 | ... # PYI058 (use `Iterator`) -15 15 | -16 16 | +10 | import typing +11 | +12 | class IteratorReturningSimpleGenerator2: + - def __iter__(self) -> typing.Generator: +13 + def __iter__(self) -> typing.Iterator: +14 | ... # PYI058 (use `Iterator`) +15 | +16 | PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.py:21:13 @@ -52,16 +48,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 22 | ... # PYI058 (use `Iterator`) | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -18 18 | import collections.abc -19 19 | -20 20 | class IteratorReturningSimpleGenerator3: -21 |- def __iter__(self) -> collections.abc.Generator: - 21 |+ def __iter__(self) -> collections.abc.Iterator: -22 22 | ... # PYI058 (use `Iterator`) -23 23 | -24 24 | +18 | import collections.abc +19 | +20 | class IteratorReturningSimpleGenerator3: + - def __iter__(self) -> collections.abc.Generator: +21 + def __iter__(self) -> collections.abc.Iterator: +22 | ... # PYI058 (use `Iterator`) +23 | +24 | PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.py:30:13 @@ -72,16 +66,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 31 | ... # PYI058 (use `Iterator`) | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -27 27 | from typing import Any -28 28 | -29 29 | class IteratorReturningSimpleGenerator4: -30 |- def __iter__(self, /) -> collections.abc.Generator[str, Any, None]: - 30 |+ def __iter__(self, /) -> collections.abc.Iterator[str]: -31 31 | ... # PYI058 (use `Iterator`) -32 32 | -33 33 | +27 | from typing import Any +28 | +29 | class IteratorReturningSimpleGenerator4: + - def __iter__(self, /) -> collections.abc.Generator[str, Any, None]: +30 + def __iter__(self, /) -> collections.abc.Iterator[str]: +31 | ... # PYI058 (use `Iterator`) +32 | +33 | PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.py:39:13 @@ -92,16 +84,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 40 | ... # PYI058 (use `Iterator`) | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -36 36 | import typing -37 37 | -38 38 | class IteratorReturningSimpleGenerator5: -39 |- def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]: - 39 |+ def __iter__(self, /) -> collections.abc.Iterator[str]: -40 40 | ... # PYI058 (use `Iterator`) -41 41 | -42 42 | +36 | import typing +37 | +38 | class IteratorReturningSimpleGenerator5: + - def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]: +39 + def __iter__(self, /) -> collections.abc.Iterator[str]: +40 | ... # PYI058 (use `Iterator`) +41 | +42 | PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.py:47:13 @@ -112,21 +102,19 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 48 | ... # PYI058 (use `Iterator`) | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix - 1 |+from collections.abc import Iterator -1 2 | def scope(): -2 3 | from collections.abc import Generator -3 4 | +1 + from collections.abc import Iterator +2 | def scope(): +3 | from collections.abc import Generator +4 | -------------------------------------------------------------------------------- -44 45 | from collections.abc import Generator -45 46 | -46 47 | class IteratorReturningSimpleGenerator6: -47 |- def __iter__(self, /) -> Generator[str, None, None]: - 48 |+ def __iter__(self, /) -> Iterator[str]: -48 49 | ... # PYI058 (use `Iterator`) -49 50 | -50 51 | +45 | from collections.abc import Generator +46 | +47 | class IteratorReturningSimpleGenerator6: + - def __iter__(self, /) -> Generator[str, None, None]: +48 + def __iter__(self, /) -> Iterator[str]: +49 | ... # PYI058 (use `Iterator`) +50 | +51 | PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods --> PYI058.py:55:13 @@ -138,16 +126,14 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method 57 | ) -> typing_extensions.AsyncGenerator: | help: Convert the return annotation of your `__aiter__` method to `AsyncIterator` - -ℹ Safe fix -54 54 | class AsyncIteratorReturningSimpleAsyncGenerator1: -55 55 | def __aiter__( -56 56 | self, -57 |- ) -> typing_extensions.AsyncGenerator: - 57 |+ ) -> typing_extensions.AsyncIterator: -58 58 | ... # PYI058 (Use `AsyncIterator`) -59 59 | -60 60 | +54 | class AsyncIteratorReturningSimpleAsyncGenerator1: +55 | def __aiter__( +56 | self, + - ) -> typing_extensions.AsyncGenerator: +57 + ) -> typing_extensions.AsyncIterator: +58 | ... # PYI058 (Use `AsyncIterator`) +59 | +60 | PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods --> PYI058.py:73:13 @@ -158,13 +144,11 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method 74 | ... # PYI058 (Use `AsyncIterator`) | help: Convert the return annotation of your `__aiter__` method to `AsyncIterator` - -ℹ Safe fix -70 70 | import collections.abc -71 71 | -72 72 | class AsyncIteratorReturningSimpleAsyncGenerator3: -73 |- def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: - 73 |+ def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: -74 74 | ... # PYI058 (Use `AsyncIterator`) -75 75 | -76 76 | +70 | import collections.abc +71 | +72 | class AsyncIteratorReturningSimpleAsyncGenerator3: + - def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: +73 + def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: +74 | ... # PYI058 (Use `AsyncIterator`) +75 | +76 | diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap index bb0d2ac135..6c5cf0e577 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI058_PYI058.pyi.snap @@ -11,18 +11,16 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 7 | def scope(): | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix - 1 |+from collections.abc import Iterator -1 2 | def scope(): -2 3 | from collections.abc import Generator -3 4 | -4 5 | class IteratorReturningSimpleGenerator1: -5 |- def __iter__(self) -> Generator: ... # PYI058 (use `Iterator`) - 6 |+ def __iter__(self) -> Iterator: ... # PYI058 (use `Iterator`) -6 7 | -7 8 | def scope(): -8 9 | import typing +1 + from collections.abc import Iterator +2 | def scope(): +3 | from collections.abc import Generator +4 | +5 | class IteratorReturningSimpleGenerator1: + - def __iter__(self) -> Generator: ... # PYI058 (use `Iterator`) +6 + def __iter__(self) -> Iterator: ... # PYI058 (use `Iterator`) +7 | +8 | def scope(): +9 | import typing PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.pyi:11:13 @@ -34,16 +32,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 13 | def scope(): | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -8 8 | import typing -9 9 | -10 10 | class IteratorReturningSimpleGenerator2: -11 |- def __iter__(self) -> typing.Generator: ... # PYI058 (use `Iterator`) - 11 |+ def __iter__(self) -> typing.Iterator: ... # PYI058 (use `Iterator`) -12 12 | -13 13 | def scope(): -14 14 | import collections.abc +8 | import typing +9 | +10 | class IteratorReturningSimpleGenerator2: + - def __iter__(self) -> typing.Generator: ... # PYI058 (use `Iterator`) +11 + def __iter__(self) -> typing.Iterator: ... # PYI058 (use `Iterator`) +12 | +13 | def scope(): +14 | import collections.abc PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.pyi:17:13 @@ -55,16 +51,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 19 | def scope(): | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -14 14 | import collections.abc -15 15 | -16 16 | class IteratorReturningSimpleGenerator3: -17 |- def __iter__(self) -> collections.abc.Generator: ... # PYI058 (use `Iterator`) - 17 |+ def __iter__(self) -> collections.abc.Iterator: ... # PYI058 (use `Iterator`) -18 18 | -19 19 | def scope(): -20 20 | import collections.abc +14 | import collections.abc +15 | +16 | class IteratorReturningSimpleGenerator3: + - def __iter__(self) -> collections.abc.Generator: ... # PYI058 (use `Iterator`) +17 + def __iter__(self) -> collections.abc.Iterator: ... # PYI058 (use `Iterator`) +18 | +19 | def scope(): +20 | import collections.abc PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.pyi:24:13 @@ -76,16 +70,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 26 | def scope(): | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -21 21 | from typing import Any -22 22 | -23 23 | class IteratorReturningSimpleGenerator4: -24 |- def __iter__(self, /) -> collections.abc.Generator[str, Any, None]: ... # PYI058 (use `Iterator`) - 24 |+ def __iter__(self, /) -> collections.abc.Iterator[str]: ... # PYI058 (use `Iterator`) -25 25 | -26 26 | def scope(): -27 27 | import collections.abc +21 | from typing import Any +22 | +23 | class IteratorReturningSimpleGenerator4: + - def __iter__(self, /) -> collections.abc.Generator[str, Any, None]: ... # PYI058 (use `Iterator`) +24 + def __iter__(self, /) -> collections.abc.Iterator[str]: ... # PYI058 (use `Iterator`) +25 | +26 | def scope(): +27 | import collections.abc PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.pyi:31:13 @@ -97,16 +89,14 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 33 | def scope(): | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix -28 28 | import typing -29 29 | -30 30 | class IteratorReturningSimpleGenerator5: -31 |- def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]: ... # PYI058 (use `Iterator`) - 31 |+ def __iter__(self, /) -> collections.abc.Iterator[str]: ... # PYI058 (use `Iterator`) -32 32 | -33 33 | def scope(): -34 34 | from collections.abc import Generator +28 | import typing +29 | +30 | class IteratorReturningSimpleGenerator5: + - def __iter__(self, /) -> collections.abc.Generator[str, None, typing.Any]: ... # PYI058 (use `Iterator`) +31 + def __iter__(self, /) -> collections.abc.Iterator[str]: ... # PYI058 (use `Iterator`) +32 | +33 | def scope(): +34 | from collections.abc import Generator PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods --> PYI058.pyi:37:13 @@ -118,21 +108,19 @@ PYI058 [*] Use `Iterator` as the return value for simple `__iter__` methods 39 | def scope(): | help: Convert the return annotation of your `__iter__` method to `Iterator` - -ℹ Safe fix - 1 |+from collections.abc import Iterator -1 2 | def scope(): -2 3 | from collections.abc import Generator -3 4 | +1 + from collections.abc import Iterator +2 | def scope(): +3 | from collections.abc import Generator +4 | -------------------------------------------------------------------------------- -34 35 | from collections.abc import Generator -35 36 | -36 37 | class IteratorReturningSimpleGenerator6: -37 |- def __iter__(self, /) -> Generator[str, None, None]: ... # PYI058 (use `Iterator`) - 38 |+ def __iter__(self, /) -> Iterator[str]: ... # PYI058 (use `Iterator`) -38 39 | -39 40 | def scope(): -40 41 | import typing_extensions +35 | from collections.abc import Generator +36 | +37 | class IteratorReturningSimpleGenerator6: + - def __iter__(self, /) -> Generator[str, None, None]: ... # PYI058 (use `Iterator`) +38 + def __iter__(self, /) -> Iterator[str]: ... # PYI058 (use `Iterator`) +39 | +40 | def scope(): +41 | import typing_extensions PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods --> PYI058.pyi:43:13 @@ -144,16 +132,14 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method 45 | def scope(): | help: Convert the return annotation of your `__aiter__` method to `AsyncIterator` - -ℹ Safe fix -40 40 | import typing_extensions -41 41 | -42 42 | class AsyncIteratorReturningSimpleAsyncGenerator1: -43 |- def __aiter__(self,) -> typing_extensions.AsyncGenerator: ... # PYI058 (Use `AsyncIterator`) - 43 |+ def __aiter__(self,) -> typing_extensions.AsyncIterator: ... # PYI058 (Use `AsyncIterator`) -44 44 | -45 45 | def scope(): -46 46 | import collections.abc +40 | import typing_extensions +41 | +42 | class AsyncIteratorReturningSimpleAsyncGenerator1: + - def __aiter__(self,) -> typing_extensions.AsyncGenerator: ... # PYI058 (Use `AsyncIterator`) +43 + def __aiter__(self,) -> typing_extensions.AsyncIterator: ... # PYI058 (Use `AsyncIterator`) +44 | +45 | def scope(): +46 | import collections.abc PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods --> PYI058.pyi:49:13 @@ -164,16 +150,14 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method 50 | ... # PYI058 (Use `AsyncIterator`) | help: Convert the return annotation of your `__aiter__` method to `AsyncIterator` - -ℹ Safe fix -46 46 | import collections.abc -47 47 | -48 48 | class AsyncIteratorReturningSimpleAsyncGenerator3: -49 |- def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: - 49 |+ def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: -50 50 | ... # PYI058 (Use `AsyncIterator`) -51 51 | -52 52 | def scope(): +46 | import collections.abc +47 | +48 | class AsyncIteratorReturningSimpleAsyncGenerator3: + - def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: +49 + def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: +50 | ... # PYI058 (Use `AsyncIterator`) +51 | +52 | def scope(): PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` methods --> PYI058.pyi:56:13 @@ -185,13 +169,11 @@ PYI058 [*] Use `AsyncIterator` as the return value for simple `__aiter__` method 58 | def scope(): | help: Convert the return annotation of your `__aiter__` method to `AsyncIterator` - -ℹ Safe fix -53 53 | import collections.abc -54 54 | -55 55 | class AsyncIteratorReturningSimpleAsyncGenerator3: -56 |- def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: ... # PYI058 (Use `AsyncIterator`) - 56 |+ def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: ... # PYI058 (Use `AsyncIterator`) -57 57 | -58 58 | def scope(): -59 59 | from typing import Iterator +53 | import collections.abc +54 | +55 | class AsyncIteratorReturningSimpleAsyncGenerator3: + - def __aiter__(self, /) -> collections.abc.AsyncGenerator[str, None]: ... # PYI058 (Use `AsyncIterator`) +56 + def __aiter__(self, /) -> collections.abc.AsyncIterator[str]: ... # PYI058 (Use `AsyncIterator`) +57 | +58 | def scope(): +59 | from typing import Iterator diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap index ccf22bb545..0ac7627e7f 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.py.snap @@ -12,16 +12,15 @@ PYI059 [*] `Generic[]` should always be the last base class 10 | self._items: List[T] = [] | help: Move `Generic[]` to the end - -ℹ Unsafe fix -5 5 | K = TypeVar('K') -6 6 | V = TypeVar('V') -7 7 | -8 |-class LinkedList(Generic[T], Sized): # PYI059 - 8 |+class LinkedList(Sized, Generic[T]): # PYI059 -9 9 | def __init__(self) -> None: -10 10 | self._items: List[T] = [] -11 11 | +5 | K = TypeVar('K') +6 | V = TypeVar('V') +7 | + - class LinkedList(Generic[T], Sized): # PYI059 +8 + class LinkedList(Sized, Generic[T]): # PYI059 +9 | def __init__(self) -> None: +10 | self._items: List[T] = [] +11 | +note: This is an unsafe fix and may change runtime behavior PYI059 [*] `Generic[]` should always be the last base class --> PYI059.py:15:16 @@ -38,18 +37,17 @@ PYI059 [*] `Generic[]` should always be the last base class 20 | ... | help: Move `Generic[]` to the end - -ℹ Unsafe fix -13 13 | self._items.append(item) -14 14 | -15 15 | class MyMapping( # PYI059 -16 |- t.Generic[K, V], -17 16 | Iterable[Tuple[K, V]], -18 |- Container[Tuple[K, V]], - 17 |+ Container[Tuple[K, V]], t.Generic[K, V], -19 18 | ): -20 19 | ... -21 20 | +13 | self._items.append(item) +14 | +15 | class MyMapping( # PYI059 + - t.Generic[K, V], +16 | Iterable[Tuple[K, V]], + - Container[Tuple[K, V]], +17 + Container[Tuple[K, V]], t.Generic[K, V], +18 | ): +19 | ... +20 | +note: This is an unsafe fix and may change runtime behavior PYI059 [*] `Generic[]` should always be the last base class --> PYI059.py:26:10 @@ -61,16 +59,15 @@ PYI059 [*] `Generic[]` should always be the last base class 27 | pass | help: Move `Generic[]` to the end - -ℹ Unsafe fix -23 23 | # Inheriting from just `Generic` is a TypeError, but it's probably fine -24 24 | # to flag this issue in this case as well, since after fixing the error -25 25 | # the Generic's position issue persists. -26 |-class Foo(Generic, LinkedList): # PYI059 - 26 |+class Foo(LinkedList, Generic): # PYI059 -27 27 | pass -28 28 | -29 29 | +23 | # Inheriting from just `Generic` is a TypeError, but it's probably fine +24 | # to flag this issue in this case as well, since after fixing the error +25 | # the Generic's position issue persists. + - class Foo(Generic, LinkedList): # PYI059 +26 + class Foo(LinkedList, Generic): # PYI059 +27 | pass +28 | +29 | +note: This is an unsafe fix and may change runtime behavior PYI059 [*] `Generic[]` should always be the last base class --> PYI059.py:30:10 @@ -91,22 +88,21 @@ PYI059 [*] `Generic[]` should always be the last base class 41 | ... | help: Move `Generic[]` to the end - -ℹ Unsafe fix -30 30 | class Foo( # comment about the bracket -31 31 | # Part 1 of multiline comment 1 -32 32 | # Part 2 of multiline comment 1 -33 |- Generic[T] # comment about Generic[T] # PYI059 -34 |- # another comment? -35 |- , # comment about the comma? - 33 |+ # comment about the comma? -36 34 | # part 1 of multiline comment 2 -37 35 | # part 2 of multiline comment 2 -38 |- int, # comment about int - 36 |+ int, Generic[T], # comment about int -39 37 | # yet another comment? -40 38 | ): # and another one for good measure -41 39 | ... +30 | class Foo( # comment about the bracket +31 | # Part 1 of multiline comment 1 +32 | # Part 2 of multiline comment 1 + - Generic[T] # comment about Generic[T] # PYI059 + - # another comment? + - , # comment about the comma? +33 + # comment about the comma? +34 | # part 1 of multiline comment 2 +35 | # part 2 of multiline comment 2 + - int, # comment about int +36 + int, Generic[T], # comment about int +37 | # yet another comment? +38 | ): # and another one for good measure +39 | ... +note: This is an unsafe fix and may change runtime behavior PYI059 `Generic[]` should always be the last base class --> PYI059.py:45:8 @@ -127,16 +123,15 @@ PYI059 [*] `Generic[]` should always be the last base class 60 | ... | help: Move `Generic[]` to the end - -ℹ Unsafe fix -56 56 | -57 57 | # syntax errors with starred and keyword arguments from -58 58 | # https://github.com/astral-sh/ruff/issues/18602 -59 |-class C1(Generic[T], str, **{"metaclass": type}): # PYI059 - 59 |+class C1(str, Generic[T], **{"metaclass": type}): # PYI059 -60 60 | ... -61 61 | -62 62 | class C2(Generic[T], str, metaclass=type): # PYI059 +56 | +57 | # syntax errors with starred and keyword arguments from +58 | # https://github.com/astral-sh/ruff/issues/18602 + - class C1(Generic[T], str, **{"metaclass": type}): # PYI059 +59 + class C1(str, Generic[T], **{"metaclass": type}): # PYI059 +60 | ... +61 | +62 | class C2(Generic[T], str, metaclass=type): # PYI059 +note: This is an unsafe fix and may change runtime behavior PYI059 [*] `Generic[]` should always be the last base class --> PYI059.py:62:9 @@ -148,16 +143,15 @@ PYI059 [*] `Generic[]` should always be the last base class 63 | ... | help: Move `Generic[]` to the end - -ℹ Unsafe fix -59 59 | class C1(Generic[T], str, **{"metaclass": type}): # PYI059 -60 60 | ... -61 61 | -62 |-class C2(Generic[T], str, metaclass=type): # PYI059 - 62 |+class C2(str, Generic[T], metaclass=type): # PYI059 -63 63 | ... -64 64 | -65 65 | class C3(Generic[T], metaclass=type, *[str]): # PYI059 but no fix +59 | class C1(Generic[T], str, **{"metaclass": type}): # PYI059 +60 | ... +61 | + - class C2(Generic[T], str, metaclass=type): # PYI059 +62 + class C2(str, Generic[T], metaclass=type): # PYI059 +63 | ... +64 | +65 | class C3(Generic[T], metaclass=type, *[str]): # PYI059 but no fix +note: This is an unsafe fix and may change runtime behavior PYI059 `Generic[]` should always be the last base class --> PYI059.py:65:9 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap index 318b646903..6a4c3e3f9f 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI059_PYI059.pyi.snap @@ -12,16 +12,15 @@ PYI059 [*] `Generic[]` should always be the last base class 10 | def push(self, item: T) -> None: ... | help: Move `Generic[]` to the end - -ℹ Unsafe fix -5 5 | K = TypeVar('K') -6 6 | V = TypeVar('V') -7 7 | -8 |-class LinkedList(Generic[T], Sized): # PYI059 - 8 |+class LinkedList(Sized, Generic[T]): # PYI059 -9 9 | def __init__(self) -> None: ... -10 10 | def push(self, item: T) -> None: ... -11 11 | +5 | K = TypeVar('K') +6 | V = TypeVar('V') +7 | + - class LinkedList(Generic[T], Sized): # PYI059 +8 + class LinkedList(Sized, Generic[T]): # PYI059 +9 | def __init__(self) -> None: ... +10 | def push(self, item: T) -> None: ... +11 | +note: This is an unsafe fix and may change runtime behavior PYI059 [*] `Generic[]` should always be the last base class --> PYI059.pyi:12:16 @@ -38,18 +37,17 @@ PYI059 [*] `Generic[]` should always be the last base class 17 | ... | help: Move `Generic[]` to the end - -ℹ Unsafe fix -10 10 | def push(self, item: T) -> None: ... -11 11 | -12 12 | class MyMapping( # PYI059 -13 |- t.Generic[K, V], -14 13 | Iterable[Tuple[K, V]], -15 |- Container[Tuple[K, V]], - 14 |+ Container[Tuple[K, V]], t.Generic[K, V], -16 15 | ): -17 16 | ... -18 17 | +10 | def push(self, item: T) -> None: ... +11 | +12 | class MyMapping( # PYI059 + - t.Generic[K, V], +13 | Iterable[Tuple[K, V]], + - Container[Tuple[K, V]], +14 + Container[Tuple[K, V]], t.Generic[K, V], +15 | ): +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior PYI059 [*] `Generic[]` should always be the last base class --> PYI059.pyi:22:10 @@ -60,16 +58,15 @@ PYI059 [*] `Generic[]` should always be the last base class | ^^^^^^^^^^^^^^^^^^^^^ | help: Move `Generic[]` to the end - -ℹ Unsafe fix -19 19 | # Inheriting from just `Generic` is a TypeError, but it's probably fine -20 20 | # to flag this issue in this case as well, since after fixing the error -21 21 | # the Generic's position issue persists. -22 |-class Foo(Generic, LinkedList): ... # PYI059 - 22 |+class Foo(LinkedList, Generic): ... # PYI059 -23 23 | -24 24 | -25 25 | class Foo( # comment about the bracket +19 | # Inheriting from just `Generic` is a TypeError, but it's probably fine +20 | # to flag this issue in this case as well, since after fixing the error +21 | # the Generic's position issue persists. + - class Foo(Generic, LinkedList): ... # PYI059 +22 + class Foo(LinkedList, Generic): ... # PYI059 +23 | +24 | +25 | class Foo( # comment about the bracket +note: This is an unsafe fix and may change runtime behavior PYI059 [*] `Generic[]` should always be the last base class --> PYI059.pyi:25:10 @@ -90,22 +87,21 @@ PYI059 [*] `Generic[]` should always be the last base class 36 | ... | help: Move `Generic[]` to the end - -ℹ Unsafe fix -25 25 | class Foo( # comment about the bracket -26 26 | # Part 1 of multiline comment 1 -27 27 | # Part 2 of multiline comment 1 -28 |- Generic[T] # comment about Generic[T] # PYI059 -29 |- # another comment? -30 |- , # comment about the comma? - 28 |+ # comment about the comma? -31 29 | # part 1 of multiline comment 2 -32 30 | # part 2 of multiline comment 2 -33 |- int, # comment about int - 31 |+ int, Generic[T], # comment about int -34 32 | # yet another comment? -35 33 | ): # and another one for good measure -36 34 | ... +25 | class Foo( # comment about the bracket +26 | # Part 1 of multiline comment 1 +27 | # Part 2 of multiline comment 1 + - Generic[T] # comment about Generic[T] # PYI059 + - # another comment? + - , # comment about the comma? +28 + # comment about the comma? +29 | # part 1 of multiline comment 2 +30 | # part 2 of multiline comment 2 + - int, # comment about int +31 + int, Generic[T], # comment about int +32 | # yet another comment? +33 | ): # and another one for good measure +34 | ... +note: This is an unsafe fix and may change runtime behavior PYI059 `Generic[]` should always be the last base class --> PYI059.pyi:40:8 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap index 524844413e..db21e97656 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.py.snap @@ -9,16 +9,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 5 | ... | help: Replace with `None` - -ℹ Safe fix -1 1 | from typing import Literal, Union -2 2 | -3 3 | -4 |-def func1(arg1: Literal[None]): - 4 |+def func1(arg1: None): -5 5 | ... -6 6 | -7 7 | +1 | from typing import Literal, Union +2 | +3 | + - def func1(arg1: Literal[None]): +4 + def func1(arg1: None): +5 | ... +6 | +7 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:8:25 @@ -28,16 +26,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 9 | ... | help: Replace with `None` - -ℹ Safe fix -5 5 | ... -6 6 | -7 7 | -8 |-def func2(arg1: Literal[None] | int): - 8 |+def func2(arg1: None | int): -9 9 | ... -10 10 | -11 11 | +5 | ... +6 | +7 | + - def func2(arg1: Literal[None] | int): +8 + def func2(arg1: None | int): +9 | ... +10 | +11 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:12:24 @@ -47,16 +43,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 13 | ... | help: Replace with `None` - -ℹ Safe fix -9 9 | ... -10 10 | -11 11 | -12 |-def func3() -> Literal[None]: - 12 |+def func3() -> None: -13 13 | ... -14 14 | -15 15 | +9 | ... +10 | +11 | + - def func3() -> Literal[None]: +12 + def func3() -> None: +13 | ... +14 | +15 | PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.py:16:30 @@ -66,16 +60,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 17 | ... | help: Replace with `Literal[...] | None` - -ℹ Safe fix -13 13 | ... -14 14 | -15 15 | -16 |-def func4(arg1: Literal[int, None, float]): - 16 |+def func4(arg1: Literal[int, float] | None): -17 17 | ... -18 18 | -19 19 | +13 | ... +14 | +15 | + - def func4(arg1: Literal[int, None, float]): +16 + def func4(arg1: Literal[int, float] | None): +17 | ... +18 | +19 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:20:25 @@ -85,16 +77,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 21 | ... | help: Replace with `None` - -ℹ Safe fix -17 17 | ... -18 18 | -19 19 | -20 |-def func5(arg1: Literal[None, None]): - 20 |+def func5(arg1: None): -21 21 | ... -22 22 | -23 23 | +17 | ... +18 | +19 | + - def func5(arg1: Literal[None, None]): +20 + def func5(arg1: None): +21 | ... +22 | +23 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:20:31 @@ -104,16 +94,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 21 | ... | help: Replace with `None` - -ℹ Safe fix -17 17 | ... -18 18 | -19 19 | -20 |-def func5(arg1: Literal[None, None]): - 20 |+def func5(arg1: None): -21 21 | ... -22 22 | -23 23 | +17 | ... +18 | +19 | + - def func5(arg1: Literal[None, None]): +20 + def func5(arg1: None): +21 | ... +22 | +23 | PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.py:26:5 @@ -126,20 +114,19 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 28 | ]): | help: Replace with `Literal[...] | None` - -ℹ Unsafe fix -21 21 | ... -22 22 | -23 23 | -24 |-def func6(arg1: Literal[ -25 |- "hello", -26 |- None # Comment 1 -27 |- , "world" -28 |- ]): - 24 |+def func6(arg1: Literal["hello", "world"] | None): -29 25 | ... -30 26 | -31 27 | +21 | ... +22 | +23 | + - def func6(arg1: Literal[ + - "hello", + - None # Comment 1 + - , "world" + - ]): +24 + def func6(arg1: Literal["hello", "world"] | None): +25 | ... +26 | +27 | +note: This is an unsafe fix and may change runtime behavior PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:33:5 @@ -151,18 +138,17 @@ PYI061 [*] Use `None` rather than `Literal[None]` 35 | ... | help: Replace with `None` - -ℹ Unsafe fix -29 29 | ... -30 30 | -31 31 | -32 |-def func7(arg1: Literal[ -33 |- None # Comment 1 -34 |- ]): - 32 |+def func7(arg1: None): -35 33 | ... -36 34 | -37 35 | +29 | ... +30 | +31 | + - def func7(arg1: Literal[ + - None # Comment 1 + - ]): +32 + def func7(arg1: None): +33 | ... +34 | +35 | +note: This is an unsafe fix and may change runtime behavior PYI061 Use `None` rather than `Literal[None]` --> PYI061.py:38:25 @@ -181,16 +167,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 43 | ... | help: Replace with `None` - -ℹ Safe fix -39 39 | ... -40 40 | -41 41 | -42 |-def func9(arg1: Union[Literal[None], None]): - 42 |+def func9(arg1: Union[None, None]): -43 43 | ... -44 44 | -45 45 | +39 | ... +40 | +41 | + - def func9(arg1: Union[Literal[None], None]): +42 + def func9(arg1: Union[None, None]): +43 | ... +44 | +45 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:52:9 @@ -201,16 +185,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 53 | Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" | help: Replace with `None` - -ℹ Safe fix -49 49 | -50 50 | -51 51 | # From flake8-pyi -52 |-Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" - 52 |+None # Y061 None inside "Literal[]" expression. Replace with "None" -53 53 | Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -54 54 | -55 55 | ### +49 | +50 | +51 | # From flake8-pyi + - Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" +52 + None # Y061 None inside "Literal[]" expression. Replace with "None" +53 | Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +54 | +55 | ### PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.py:53:15 @@ -223,16 +205,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 55 | ### | help: Replace with `Literal[...] | None` - -ℹ Safe fix -50 50 | -51 51 | # From flake8-pyi -52 52 | Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" -53 |-Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" - 53 |+Literal[True] | None # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -54 54 | -55 55 | ### -56 56 | # The following rules here are slightly subtle, +50 | +51 | # From flake8-pyi +52 | Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" + - Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +53 + Literal[True] | None # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +54 | +55 | ### +56 | # The following rules here are slightly subtle, PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:62:9 @@ -244,16 +224,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" | help: Replace with `None` - -ℹ Safe fix -59 59 | -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 |-Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" - 62 |+None # Y061 None inside "Literal[]" expression. Replace with "None" -63 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply +59 | +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... + - Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" +62 + None # Y061 None inside "Literal[]" expression. Replace with "None" +63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:62:15 @@ -265,16 +243,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" | help: Replace with `None` - -ℹ Safe fix -59 59 | -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 |-Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" - 62 |+None # Y061 None inside "Literal[]" expression. Replace with "None" -63 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply +59 | +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... + - Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" +62 + None # Y061 None inside "Literal[]" expression. Replace with "None" +63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.py:63:12 @@ -287,16 +263,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 65 | # ... but if Y061 and Y062 both apply | help: Replace with `Literal[...] | None` - -ℹ Safe fix -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" -63 |-Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" - 63 |+Literal[1, "foo"] | None # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... +62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" + - Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +63 + Literal[1, "foo"] | None # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.py:63:25 @@ -309,16 +283,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 65 | # ... but if Y061 and Y062 both apply | help: Replace with `Literal[...] | None` - -ℹ Safe fix -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" -63 |-Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" - 63 |+Literal[1, "foo"] | None # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... +62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" + - Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +63 + Literal[1, "foo"] | None # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.py:68:9 @@ -329,16 +301,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Literal[...] | None` - -ℹ Safe fix -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, -67 67 | # only emit Y062: -68 |-Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" - 68 |+Literal[True, True] | None # Y062 Duplicate "Literal[]" member "True" -69 69 | -70 70 | -71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, +67 | # only emit Y062: + - Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" +68 + Literal[True, True] | None # Y062 Duplicate "Literal[]" member "True" +69 | +70 | +71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.py:68:21 @@ -349,16 +319,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Literal[...] | None` - -ℹ Safe fix -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, -67 67 | # only emit Y062: -68 |-Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" - 68 |+Literal[True, True] | None # Y062 Duplicate "Literal[]" member "True" -69 69 | -70 70 | -71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, +67 | # only emit Y062: + - Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" +68 + Literal[True, True] | None # Y062 Duplicate "Literal[]" member "True" +69 | +70 | +71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 PYI061 Use `None` rather than `Literal[None]` --> PYI061.py:72:12 @@ -393,16 +361,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 76 | a: int | Literal[None] | None | help: Replace with `None` - -ℹ Safe fix -71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 -72 72 | x: Literal[None] | None -73 73 | y: None | Literal[None] -74 |-z: Union[Literal[None], None] - 74 |+z: Union[None, None] -75 75 | -76 76 | a: int | Literal[None] | None -77 77 | b: None | Literal[None] | None +71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +72 | x: Literal[None] | None +73 | y: None | Literal[None] + - z: Union[Literal[None], None] +74 + z: Union[None, None] +75 | +76 | a: int | Literal[None] | None +77 | b: None | Literal[None] | None PYI061 Use `None` rather than `Literal[None]` --> PYI061.py:76:18 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap index 181432a325..34fbd2eb2b 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI061_PYI061.pyi.snap @@ -8,16 +8,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -1 1 | from typing import Literal, Union -2 2 | -3 3 | -4 |-def func1(arg1: Literal[None]): ... - 4 |+def func1(arg1: None): ... -5 5 | -6 6 | -7 7 | def func2(arg1: Literal[None] | int): ... +1 | from typing import Literal, Union +2 | +3 | + - def func1(arg1: Literal[None]): ... +4 + def func1(arg1: None): ... +5 | +6 | +7 | def func2(arg1: Literal[None] | int): ... PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:7:25 @@ -26,16 +24,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -4 4 | def func1(arg1: Literal[None]): ... -5 5 | -6 6 | -7 |-def func2(arg1: Literal[None] | int): ... - 7 |+def func2(arg1: None | int): ... -8 8 | -9 9 | -10 10 | def func3() -> Literal[None]: ... +4 | def func1(arg1: Literal[None]): ... +5 | +6 | + - def func2(arg1: Literal[None] | int): ... +7 + def func2(arg1: None | int): ... +8 | +9 | +10 | def func3() -> Literal[None]: ... PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:10:24 @@ -44,16 +40,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -7 7 | def func2(arg1: Literal[None] | int): ... -8 8 | -9 9 | -10 |-def func3() -> Literal[None]: ... - 10 |+def func3() -> None: ... -11 11 | -12 12 | -13 13 | def func4(arg1: Literal[int, None, float]): ... +7 | def func2(arg1: Literal[None] | int): ... +8 | +9 | + - def func3() -> Literal[None]: ... +10 + def func3() -> None: ... +11 | +12 | +13 | def func4(arg1: Literal[int, None, float]): ... PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.pyi:13:30 @@ -62,16 +56,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Literal[...] | None` - -ℹ Safe fix -10 10 | def func3() -> Literal[None]: ... -11 11 | -12 12 | -13 |-def func4(arg1: Literal[int, None, float]): ... - 13 |+def func4(arg1: Literal[int, float] | None): ... -14 14 | -15 15 | -16 16 | def func5(arg1: Literal[None, None]): ... +10 | def func3() -> Literal[None]: ... +11 | +12 | + - def func4(arg1: Literal[int, None, float]): ... +13 + def func4(arg1: Literal[int, float] | None): ... +14 | +15 | +16 | def func5(arg1: Literal[None, None]): ... PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:16:25 @@ -80,16 +72,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -13 13 | def func4(arg1: Literal[int, None, float]): ... -14 14 | -15 15 | -16 |-def func5(arg1: Literal[None, None]): ... - 16 |+def func5(arg1: None): ... -17 17 | -18 18 | -19 19 | def func6(arg1: Literal[ +13 | def func4(arg1: Literal[int, None, float]): ... +14 | +15 | + - def func5(arg1: Literal[None, None]): ... +16 + def func5(arg1: None): ... +17 | +18 | +19 | def func6(arg1: Literal[ PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:16:31 @@ -98,16 +88,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -13 13 | def func4(arg1: Literal[int, None, float]): ... -14 14 | -15 15 | -16 |-def func5(arg1: Literal[None, None]): ... - 16 |+def func5(arg1: None): ... -17 17 | -18 18 | -19 19 | def func6(arg1: Literal[ +13 | def func4(arg1: Literal[int, None, float]): ... +14 | +15 | + - def func5(arg1: Literal[None, None]): ... +16 + def func5(arg1: None): ... +17 | +18 | +19 | def func6(arg1: Literal[ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.pyi:21:5 @@ -120,20 +108,19 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 23 | ]): ... | help: Replace with `Literal[...] | None` - -ℹ Unsafe fix -16 16 | def func5(arg1: Literal[None, None]): ... -17 17 | -18 18 | -19 |-def func6(arg1: Literal[ -20 |- "hello", -21 |- None # Comment 1 -22 |- , "world" -23 |-]): ... - 19 |+def func6(arg1: Literal["hello", "world"] | None): ... -24 20 | -25 21 | -26 22 | def func7(arg1: Literal[ +16 | def func5(arg1: Literal[None, None]): ... +17 | +18 | + - def func6(arg1: Literal[ + - "hello", + - None # Comment 1 + - , "world" + - ]): ... +19 + def func6(arg1: Literal["hello", "world"] | None): ... +20 | +21 | +22 | def func7(arg1: Literal[ +note: This is an unsafe fix and may change runtime behavior PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:27:5 @@ -144,18 +131,17 @@ PYI061 [*] Use `None` rather than `Literal[None]` 28 | ]): ... | help: Replace with `None` - -ℹ Unsafe fix -23 23 | ]): ... -24 24 | -25 25 | -26 |-def func7(arg1: Literal[ -27 |- None # Comment 1 -28 |-]): ... - 26 |+def func7(arg1: None): ... -29 27 | -30 28 | -31 29 | def func8(arg1: Literal[None] | None):... +23 | ]): ... +24 | +25 | + - def func7(arg1: Literal[ + - None # Comment 1 + - ]): ... +26 + def func7(arg1: None): ... +27 | +28 | +29 | def func8(arg1: Literal[None] | None):... +note: This is an unsafe fix and may change runtime behavior PYI061 Use `None` rather than `Literal[None]` --> PYI061.pyi:31:25 @@ -172,16 +158,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -31 31 | def func8(arg1: Literal[None] | None):... -32 32 | -33 33 | -34 |-def func9(arg1: Union[Literal[None], None]): ... - 34 |+def func9(arg1: Union[None, None]): ... -35 35 | -36 36 | -37 37 | # OK +31 | def func8(arg1: Literal[None] | None):... +32 | +33 | + - def func9(arg1: Union[Literal[None], None]): ... +34 + def func9(arg1: Union[None, None]): ... +35 | +36 | +37 | # OK PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:42:9 @@ -192,16 +176,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 43 | Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" | help: Replace with `None` - -ℹ Safe fix -39 39 | -40 40 | -41 41 | # From flake8-pyi -42 |-Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" - 42 |+None # PYI061 None inside "Literal[]" expression. Replace with "None" -43 43 | Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -44 44 | -45 45 | +39 | +40 | +41 | # From flake8-pyi + - Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" +42 + None # PYI061 None inside "Literal[]" expression. Replace with "None" +43 | Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +44 | +45 | PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.pyi:43:15 @@ -212,16 +194,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Literal[...] | None` - -ℹ Safe fix -40 40 | -41 41 | # From flake8-pyi -42 42 | Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" -43 |-Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" - 43 |+Literal[True] | None # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -44 44 | -45 45 | -46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +40 | +41 | # From flake8-pyi +42 | Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" + - Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +43 + Literal[True] | None # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +44 | +45 | +46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 PYI061 Use `None` rather than `Literal[None]` --> PYI061.pyi:47:12 @@ -256,16 +236,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 51 | a: int | Literal[None] | None | help: Replace with `None` - -ℹ Safe fix -46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 -47 47 | x: Literal[None] | None -48 48 | y: None | Literal[None] -49 |-z: Union[Literal[None], None] - 49 |+z: Union[None, None] -50 50 | -51 51 | a: int | Literal[None] | None -52 52 | b: None | Literal[None] | None +46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +47 | x: Literal[None] | None +48 | y: None | Literal[None] + - z: Union[Literal[None], None] +49 + z: Union[None, None] +50 | +51 | a: int | Literal[None] | None +52 | b: None | Literal[None] | None PYI061 Use `None` rather than `Literal[None]` --> PYI061.pyi:51:18 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap index 879572b57b..bc1421e4db 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.py.snap @@ -12,16 +12,14 @@ PYI062 [*] Duplicate literal member `True` 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 | help: Remove duplicates - -ℹ Safe fix -2 2 | import typing as t -3 3 | import typing_extensions -4 4 | -5 |-x: Literal[True, False, True, False] # PYI062 twice here - 5 |+x: Literal[True, False] # PYI062 twice here -6 6 | -7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 -8 8 | +2 | import typing as t +3 | import typing_extensions +4 | + - x: Literal[True, False, True, False] # PYI062 twice here +5 + x: Literal[True, False] # PYI062 twice here +6 | +7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +8 | PYI062 [*] Duplicate literal member `False` --> PYI062.py:5:31 @@ -34,16 +32,14 @@ PYI062 [*] Duplicate literal member `False` 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 | help: Remove duplicates - -ℹ Safe fix -2 2 | import typing as t -3 3 | import typing_extensions -4 4 | -5 |-x: Literal[True, False, True, False] # PYI062 twice here - 5 |+x: Literal[True, False] # PYI062 twice here -6 6 | -7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 -8 8 | +2 | import typing as t +3 | import typing_extensions +4 | + - x: Literal[True, False, True, False] # PYI062 twice here +5 + x: Literal[True, False] # PYI062 twice here +6 | +7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +8 | PYI062 [*] Duplicate literal member `1` --> PYI062.py:7:45 @@ -56,16 +52,14 @@ PYI062 [*] Duplicate literal member `1` 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal | help: Remove duplicates - -ℹ Safe fix -4 4 | -5 5 | x: Literal[True, False, True, False] # PYI062 twice here -6 6 | -7 |-y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 - 7 |+y: Literal[1, print("hello"), 3, 4] # PYI062 on the last 1 -8 8 | -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | +4 | +5 | x: Literal[True, False, True, False] # PYI062 twice here +6 | + - y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +7 + y: Literal[1, print("hello"), 3, 4] # PYI062 on the last 1 +8 | +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | PYI062 [*] Duplicate literal member `{1, 3, 5}` --> PYI062.py:9:33 @@ -78,16 +72,14 @@ PYI062 [*] Duplicate literal member `{1, 3, 5}` 11 | Literal[1, Literal[1]] # once | help: Remove duplicates - -ℹ Safe fix -6 6 | -7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 -8 8 | -9 |-z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal - 9 |+z: Literal[{1, 3, 5}, "foobar"] # PYI062 on the set literal -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice +6 | +7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +8 | + - z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +9 + z: Literal[{1, 3, 5}, "foobar"] # PYI062 on the set literal +10 | +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice PYI062 [*] Duplicate literal member `1` --> PYI062.py:11:20 @@ -100,16 +92,14 @@ PYI062 [*] Duplicate literal member `1` 13 | Literal[1, Literal[1], Literal[1]] # twice | help: Remove duplicates - -ℹ Safe fix -8 8 | -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | -11 |-Literal[1, Literal[1]] # once - 11 |+Literal[1] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once +8 | +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | + - Literal[1, Literal[1]] # once +11 + Literal[1] # once +12 | Literal[1, 2, Literal[1, 2]] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once PYI062 [*] Duplicate literal member `1` --> PYI062.py:12:23 @@ -121,16 +111,14 @@ PYI062 [*] Duplicate literal member `1` 14 | Literal[1, Literal[2], Literal[2]] # once | help: Remove duplicates - -ℹ Safe fix -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 |-Literal[1, 2, Literal[1, 2]] # twice - 12 |+Literal[1, 2] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | +11 | Literal[1, Literal[1]] # once + - Literal[1, 2, Literal[1, 2]] # twice +12 + Literal[1, 2] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once PYI062 [*] Duplicate literal member `2` --> PYI062.py:12:26 @@ -142,16 +130,14 @@ PYI062 [*] Duplicate literal member `2` 14 | Literal[1, Literal[2], Literal[2]] # once | help: Remove duplicates - -ℹ Safe fix -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 |-Literal[1, 2, Literal[1, 2]] # twice - 12 |+Literal[1, 2] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | +11 | Literal[1, Literal[1]] # once + - Literal[1, 2, Literal[1, 2]] # twice +12 + Literal[1, 2] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once PYI062 [*] Duplicate literal member `1` --> PYI062.py:13:20 @@ -164,16 +150,14 @@ PYI062 [*] Duplicate literal member `1` 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once | help: Remove duplicates - -ℹ Safe fix -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 |-Literal[1, Literal[1], Literal[1]] # twice - 13 |+Literal[1] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice +10 | +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice + - Literal[1, Literal[1], Literal[1]] # twice +13 + Literal[1] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice PYI062 [*] Duplicate literal member `1` --> PYI062.py:13:32 @@ -186,16 +170,14 @@ PYI062 [*] Duplicate literal member `1` 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once | help: Remove duplicates - -ℹ Safe fix -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 |-Literal[1, Literal[1], Literal[1]] # twice - 13 |+Literal[1] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice +10 | +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice + - Literal[1, Literal[1], Literal[1]] # twice +13 + Literal[1] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice PYI062 [*] Duplicate literal member `2` --> PYI062.py:14:32 @@ -208,16 +190,14 @@ PYI062 [*] Duplicate literal member `2` 16 | typing_extensions.Literal[1, 1, 1] # twice | help: Remove duplicates - -ℹ Safe fix -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 |-Literal[1, Literal[2], Literal[2]] # once - 14 |+Literal[1, 2] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice -17 17 | Literal[ +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice + - Literal[1, Literal[2], Literal[2]] # once +14 + Literal[1, 2] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice +17 | Literal[ PYI062 [*] Duplicate literal member `1` --> PYI062.py:15:37 @@ -230,16 +210,14 @@ PYI062 [*] Duplicate literal member `1` 17 | Literal[ | help: Remove duplicates - -ℹ Safe fix -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 |-t.Literal[1, t.Literal[2, t.Literal[1]]] # once - 15 |+t.Literal[1, 2] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice -17 17 | Literal[ -18 18 | 1, # comment +12 | Literal[1, 2, Literal[1, 2]] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once + - t.Literal[1, t.Literal[2, t.Literal[1]]] # once +15 + t.Literal[1, 2] # once +16 | typing_extensions.Literal[1, 1, 1] # twice +17 | Literal[ +18 | 1, # comment PYI062 [*] Duplicate literal member `1` --> PYI062.py:16:30 @@ -252,16 +230,14 @@ PYI062 [*] Duplicate literal member `1` 18 | 1, # comment | help: Remove duplicates - -ℹ Safe fix -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 |-typing_extensions.Literal[1, 1, 1] # twice - 16 |+typing_extensions.Literal[1] # twice -17 17 | Literal[ -18 18 | 1, # comment -19 19 | Literal[ # another comment +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once + - typing_extensions.Literal[1, 1, 1] # twice +16 + typing_extensions.Literal[1] # twice +17 | Literal[ +18 | 1, # comment +19 | Literal[ # another comment PYI062 [*] Duplicate literal member `1` --> PYI062.py:16:33 @@ -274,16 +250,14 @@ PYI062 [*] Duplicate literal member `1` 18 | 1, # comment | help: Remove duplicates - -ℹ Safe fix -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 |-typing_extensions.Literal[1, 1, 1] # twice - 16 |+typing_extensions.Literal[1] # twice -17 17 | Literal[ -18 18 | 1, # comment -19 19 | Literal[ # another comment +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once + - typing_extensions.Literal[1, 1, 1] # twice +16 + typing_extensions.Literal[1] # twice +17 | Literal[ +18 | 1, # comment +19 | Literal[ # another comment PYI062 [*] Duplicate literal member `1` --> PYI062.py:20:9 @@ -296,21 +270,20 @@ PYI062 [*] Duplicate literal member `1` 22 | ] # once | help: Remove duplicates - -ℹ Unsafe fix -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice -17 |-Literal[ -18 |- 1, # comment -19 |- Literal[ # another comment -20 |- 1 -21 |- ] -22 |-] # once - 17 |+Literal[1] # once -23 18 | -24 19 | # Ensure issue is only raised once, even on nested literals -25 20 | MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice + - Literal[ + - 1, # comment + - Literal[ # another comment + - 1 + - ] + - ] # once +17 + Literal[1] # once +18 | +19 | # Ensure issue is only raised once, even on nested literals +20 | MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 +note: This is an unsafe fix and may change runtime behavior PYI062 [*] Duplicate literal member `True` --> PYI062.py:25:46 @@ -322,16 +295,14 @@ PYI062 [*] Duplicate literal member `True` 27 | n: Literal["No", "duplicates", "here", 1, "1"] | help: Remove duplicates - -ℹ Safe fix -22 22 | ] # once -23 23 | -24 24 | # Ensure issue is only raised once, even on nested literals -25 |-MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 - 25 |+MyType = Literal["foo", True, False, "bar"] # PYI062 -26 26 | -27 27 | n: Literal["No", "duplicates", "here", 1, "1"] -28 28 | +22 | ] # once +23 | +24 | # Ensure issue is only raised once, even on nested literals + - MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 +25 + MyType = Literal["foo", True, False, "bar"] # PYI062 +26 | +27 | n: Literal["No", "duplicates", "here", 1, "1"] +28 | PYI062 [*] Duplicate literal member `1` --> PYI062.py:32:37 @@ -343,14 +314,12 @@ PYI062 [*] Duplicate literal member `1` 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]] # once | help: Remove duplicates - -ℹ Safe fix -29 29 | -30 30 | # nested literals, all equivalent to `Literal[1]` -31 31 | Literal[Literal[1]] # no duplicate -32 |-Literal[Literal[Literal[1], Literal[1]]] # once - 32 |+Literal[1] # once -33 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]] # once +29 | +30 | # nested literals, all equivalent to `Literal[1]` +31 | Literal[Literal[1]] # no duplicate + - Literal[Literal[Literal[1], Literal[1]]] # once +32 + Literal[1] # once +33 | Literal[Literal[1], Literal[Literal[Literal[1]]]] # once PYI062 [*] Duplicate literal member `1` --> PYI062.py:33:45 @@ -361,10 +330,8 @@ PYI062 [*] Duplicate literal member `1` | ^ | help: Remove duplicates - -ℹ Safe fix -30 30 | # nested literals, all equivalent to `Literal[1]` -31 31 | Literal[Literal[1]] # no duplicate -32 32 | Literal[Literal[Literal[1], Literal[1]]] # once -33 |-Literal[Literal[1], Literal[Literal[Literal[1]]]] # once - 33 |+Literal[1] # once +30 | # nested literals, all equivalent to `Literal[1]` +31 | Literal[Literal[1]] # no duplicate +32 | Literal[Literal[Literal[1], Literal[1]]] # once + - Literal[Literal[1], Literal[Literal[Literal[1]]]] # once +33 + Literal[1] # once diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap index c94781a8b4..9592eddfbe 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI062_PYI062.pyi.snap @@ -12,16 +12,14 @@ PYI062 [*] Duplicate literal member `True` 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 | help: Remove duplicates - -ℹ Safe fix -2 2 | import typing as t -3 3 | import typing_extensions -4 4 | -5 |-x: Literal[True, False, True, False] # PYI062 twice here - 5 |+x: Literal[True, False] # PYI062 twice here -6 6 | -7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 -8 8 | +2 | import typing as t +3 | import typing_extensions +4 | + - x: Literal[True, False, True, False] # PYI062 twice here +5 + x: Literal[True, False] # PYI062 twice here +6 | +7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +8 | PYI062 [*] Duplicate literal member `False` --> PYI062.pyi:5:31 @@ -34,16 +32,14 @@ PYI062 [*] Duplicate literal member `False` 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 | help: Remove duplicates - -ℹ Safe fix -2 2 | import typing as t -3 3 | import typing_extensions -4 4 | -5 |-x: Literal[True, False, True, False] # PYI062 twice here - 5 |+x: Literal[True, False] # PYI062 twice here -6 6 | -7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 -8 8 | +2 | import typing as t +3 | import typing_extensions +4 | + - x: Literal[True, False, True, False] # PYI062 twice here +5 + x: Literal[True, False] # PYI062 twice here +6 | +7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +8 | PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:7:45 @@ -56,16 +52,14 @@ PYI062 [*] Duplicate literal member `1` 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal | help: Remove duplicates - -ℹ Safe fix -4 4 | -5 5 | x: Literal[True, False, True, False] # PYI062 twice here -6 6 | -7 |-y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 - 7 |+y: Literal[1, print("hello"), 3, 4] # PYI062 on the last 1 -8 8 | -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | +4 | +5 | x: Literal[True, False, True, False] # PYI062 twice here +6 | + - y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +7 + y: Literal[1, print("hello"), 3, 4] # PYI062 on the last 1 +8 | +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | PYI062 [*] Duplicate literal member `{1, 3, 5}` --> PYI062.pyi:9:33 @@ -78,16 +72,14 @@ PYI062 [*] Duplicate literal member `{1, 3, 5}` 11 | Literal[1, Literal[1]] # once | help: Remove duplicates - -ℹ Safe fix -6 6 | -7 7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 -8 8 | -9 |-z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal - 9 |+z: Literal[{1, 3, 5}, "foobar"] # PYI062 on the set literal -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice +6 | +7 | y: Literal[1, print("hello"), 3, Literal[4, 1]] # PYI062 on the last 1 +8 | + - z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +9 + z: Literal[{1, 3, 5}, "foobar"] # PYI062 on the set literal +10 | +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:11:20 @@ -100,16 +92,14 @@ PYI062 [*] Duplicate literal member `1` 13 | Literal[1, Literal[1], Literal[1]] # twice | help: Remove duplicates - -ℹ Safe fix -8 8 | -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | -11 |-Literal[1, Literal[1]] # once - 11 |+Literal[1] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once +8 | +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | + - Literal[1, Literal[1]] # once +11 + Literal[1] # once +12 | Literal[1, 2, Literal[1, 2]] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:12:23 @@ -121,16 +111,14 @@ PYI062 [*] Duplicate literal member `1` 14 | Literal[1, Literal[2], Literal[2]] # once | help: Remove duplicates - -ℹ Safe fix -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 |-Literal[1, 2, Literal[1, 2]] # twice - 12 |+Literal[1, 2] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | +11 | Literal[1, Literal[1]] # once + - Literal[1, 2, Literal[1, 2]] # twice +12 + Literal[1, 2] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once PYI062 [*] Duplicate literal member `2` --> PYI062.pyi:12:26 @@ -142,16 +130,14 @@ PYI062 [*] Duplicate literal member `2` 14 | Literal[1, Literal[2], Literal[2]] # once | help: Remove duplicates - -ℹ Safe fix -9 9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 |-Literal[1, 2, Literal[1, 2]] # twice - 12 |+Literal[1, 2] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +9 | z: Literal[{1, 3, 5}, "foobar", {1,3,5}] # PYI062 on the set literal +10 | +11 | Literal[1, Literal[1]] # once + - Literal[1, 2, Literal[1, 2]] # twice +12 + Literal[1, 2] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:13:20 @@ -164,16 +150,14 @@ PYI062 [*] Duplicate literal member `1` 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once | help: Remove duplicates - -ℹ Safe fix -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 |-Literal[1, Literal[1], Literal[1]] # twice - 13 |+Literal[1] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice +10 | +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice + - Literal[1, Literal[1], Literal[1]] # twice +13 + Literal[1] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:13:32 @@ -186,16 +170,14 @@ PYI062 [*] Duplicate literal member `1` 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once | help: Remove duplicates - -ℹ Safe fix -10 10 | -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 |-Literal[1, Literal[1], Literal[1]] # twice - 13 |+Literal[1] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice +10 | +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice + - Literal[1, Literal[1], Literal[1]] # twice +13 + Literal[1] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice PYI062 [*] Duplicate literal member `2` --> PYI062.pyi:14:32 @@ -208,16 +190,14 @@ PYI062 [*] Duplicate literal member `2` 16 | typing_extensions.Literal[1, 1, 1] # twice | help: Remove duplicates - -ℹ Safe fix -11 11 | Literal[1, Literal[1]] # once -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 |-Literal[1, Literal[2], Literal[2]] # once - 14 |+Literal[1, 2] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice -17 17 | Literal[ +11 | Literal[1, Literal[1]] # once +12 | Literal[1, 2, Literal[1, 2]] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice + - Literal[1, Literal[2], Literal[2]] # once +14 + Literal[1, 2] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice +17 | Literal[ PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:15:37 @@ -230,16 +210,14 @@ PYI062 [*] Duplicate literal member `1` 17 | Literal[ | help: Remove duplicates - -ℹ Safe fix -12 12 | Literal[1, 2, Literal[1, 2]] # twice -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 |-t.Literal[1, t.Literal[2, t.Literal[1]]] # once - 15 |+t.Literal[1, 2] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice -17 17 | Literal[ -18 18 | 1, # comment +12 | Literal[1, 2, Literal[1, 2]] # twice +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once + - t.Literal[1, t.Literal[2, t.Literal[1]]] # once +15 + t.Literal[1, 2] # once +16 | typing_extensions.Literal[1, 1, 1] # twice +17 | Literal[ +18 | 1, # comment PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:16:30 @@ -252,16 +230,14 @@ PYI062 [*] Duplicate literal member `1` 18 | 1, # comment | help: Remove duplicates - -ℹ Safe fix -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 |-typing_extensions.Literal[1, 1, 1] # twice - 16 |+typing_extensions.Literal[1] # twice -17 17 | Literal[ -18 18 | 1, # comment -19 19 | Literal[ # another comment +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once + - typing_extensions.Literal[1, 1, 1] # twice +16 + typing_extensions.Literal[1] # twice +17 | Literal[ +18 | 1, # comment +19 | Literal[ # another comment PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:16:33 @@ -274,16 +250,14 @@ PYI062 [*] Duplicate literal member `1` 18 | 1, # comment | help: Remove duplicates - -ℹ Safe fix -13 13 | Literal[1, Literal[1], Literal[1]] # twice -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 |-typing_extensions.Literal[1, 1, 1] # twice - 16 |+typing_extensions.Literal[1] # twice -17 17 | Literal[ -18 18 | 1, # comment -19 19 | Literal[ # another comment +13 | Literal[1, Literal[1], Literal[1]] # twice +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once + - typing_extensions.Literal[1, 1, 1] # twice +16 + typing_extensions.Literal[1] # twice +17 | Literal[ +18 | 1, # comment +19 | Literal[ # another comment PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:20:9 @@ -296,21 +270,20 @@ PYI062 [*] Duplicate literal member `1` 22 | ] # once | help: Remove duplicates - -ℹ Unsafe fix -14 14 | Literal[1, Literal[2], Literal[2]] # once -15 15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once -16 16 | typing_extensions.Literal[1, 1, 1] # twice -17 |-Literal[ -18 |- 1, # comment -19 |- Literal[ # another comment -20 |- 1 -21 |- ] -22 |-] # once - 17 |+Literal[1] # once -23 18 | -24 19 | # Ensure issue is only raised once, even on nested literals -25 20 | MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 +14 | Literal[1, Literal[2], Literal[2]] # once +15 | t.Literal[1, t.Literal[2, t.Literal[1]]] # once +16 | typing_extensions.Literal[1, 1, 1] # twice + - Literal[ + - 1, # comment + - Literal[ # another comment + - 1 + - ] + - ] # once +17 + Literal[1] # once +18 | +19 | # Ensure issue is only raised once, even on nested literals +20 | MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 +note: This is an unsafe fix and may change runtime behavior PYI062 [*] Duplicate literal member `True` --> PYI062.pyi:25:46 @@ -322,16 +295,14 @@ PYI062 [*] Duplicate literal member `True` 27 | n: Literal["No", "duplicates", "here", 1, "1"] | help: Remove duplicates - -ℹ Safe fix -22 22 | ] # once -23 23 | -24 24 | # Ensure issue is only raised once, even on nested literals -25 |-MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 - 25 |+MyType = Literal["foo", True, False, "bar"] # PYI062 -26 26 | -27 27 | n: Literal["No", "duplicates", "here", 1, "1"] -28 28 | +22 | ] # once +23 | +24 | # Ensure issue is only raised once, even on nested literals + - MyType = Literal["foo", Literal[True, False, True], "bar"] # PYI062 +25 + MyType = Literal["foo", True, False, "bar"] # PYI062 +26 | +27 | n: Literal["No", "duplicates", "here", 1, "1"] +28 | PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:32:37 @@ -343,14 +314,12 @@ PYI062 [*] Duplicate literal member `1` 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]] # once | help: Remove duplicates - -ℹ Safe fix -29 29 | -30 30 | # nested literals, all equivalent to `Literal[1]` -31 31 | Literal[Literal[1]] # no duplicate -32 |-Literal[Literal[Literal[1], Literal[1]]] # once - 32 |+Literal[1] # once -33 33 | Literal[Literal[1], Literal[Literal[Literal[1]]]] # once +29 | +30 | # nested literals, all equivalent to `Literal[1]` +31 | Literal[Literal[1]] # no duplicate + - Literal[Literal[Literal[1], Literal[1]]] # once +32 + Literal[1] # once +33 | Literal[Literal[1], Literal[Literal[Literal[1]]]] # once PYI062 [*] Duplicate literal member `1` --> PYI062.pyi:33:45 @@ -361,10 +330,8 @@ PYI062 [*] Duplicate literal member `1` | ^ | help: Remove duplicates - -ℹ Safe fix -30 30 | # nested literals, all equivalent to `Literal[1]` -31 31 | Literal[Literal[1]] # no duplicate -32 32 | Literal[Literal[Literal[1], Literal[1]]] # once -33 |-Literal[Literal[1], Literal[Literal[Literal[1]]]] # once - 33 |+Literal[1] # once +30 | # nested literals, all equivalent to `Literal[1]` +31 | Literal[Literal[1]] # no duplicate +32 | Literal[Literal[Literal[1], Literal[1]]] # once + - Literal[Literal[1], Literal[Literal[Literal[1]]]] # once +33 + Literal[1] # once diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap index 397440ade2..6a80897cad 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.py.snap @@ -12,15 +12,13 @@ PYI064 [*] `Final[Literal[True]]` can be replaced with a bare `Final` 5 | z: Final[Literal[ # PYI064 | help: Replace with `Final` - -ℹ Safe fix -1 1 | from typing import Final, Literal -2 2 | -3 |-x: Final[Literal[True]] = True # PYI064 - 3 |+x: Final = True # PYI064 -4 4 | y: Final[Literal[None]] = None # PYI064 -5 5 | z: Final[Literal[ # PYI064 -6 6 | "this is a really long literal, that won't be rendered in the issue text" +1 | from typing import Final, Literal +2 | + - x: Final[Literal[True]] = True # PYI064 +3 + x: Final = True # PYI064 +4 | y: Final[Literal[None]] = None # PYI064 +5 | z: Final[Literal[ # PYI064 +6 | "this is a really long literal, that won't be rendered in the issue text" PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final` --> PYI064.py:4:1 @@ -32,16 +30,14 @@ PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final` 6 | "this is a really long literal, that won't be rendered in the issue text" | help: Replace with `Final` - -ℹ Safe fix -1 1 | from typing import Final, Literal -2 2 | -3 3 | x: Final[Literal[True]] = True # PYI064 -4 |-y: Final[Literal[None]] = None # PYI064 - 4 |+y: Final = None # PYI064 -5 5 | z: Final[Literal[ # PYI064 -6 6 | "this is a really long literal, that won't be rendered in the issue text" -7 7 | ]] = "this is a really long literal, that won't be rendered in the issue text" +1 | from typing import Final, Literal +2 | +3 | x: Final[Literal[True]] = True # PYI064 + - y: Final[Literal[None]] = None # PYI064 +4 + y: Final = None # PYI064 +5 | z: Final[Literal[ # PYI064 +6 | "this is a really long literal, that won't be rendered in the issue text" +7 | ]] = "this is a really long literal, that won't be rendered in the issue text" PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final` --> PYI064.py:5:1 @@ -56,18 +52,16 @@ PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final` 9 | # This should be fixable, and marked as safe | help: Replace with `Final` - -ℹ Safe fix -2 2 | -3 3 | x: Final[Literal[True]] = True # PYI064 -4 4 | y: Final[Literal[None]] = None # PYI064 -5 |-z: Final[Literal[ # PYI064 -6 |- "this is a really long literal, that won't be rendered in the issue text" -7 |-]] = "this is a really long literal, that won't be rendered in the issue text" - 5 |+z: Final = "this is a really long literal, that won't be rendered in the issue text" -8 6 | -9 7 | # This should be fixable, and marked as safe -10 8 | w1: Final[Literal[123]] # PYI064 +2 | +3 | x: Final[Literal[True]] = True # PYI064 +4 | y: Final[Literal[None]] = None # PYI064 + - z: Final[Literal[ # PYI064 + - "this is a really long literal, that won't be rendered in the issue text" + - ]] = "this is a really long literal, that won't be rendered in the issue text" +5 + z: Final = "this is a really long literal, that won't be rendered in the issue text" +6 | +7 | # This should be fixable, and marked as safe +8 | w1: Final[Literal[123]] # PYI064 PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final` --> PYI064.py:10:1 @@ -79,16 +73,14 @@ PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final` 12 | # This should not be fixable | help: Replace with `Final` - -ℹ Safe fix -7 7 | ]] = "this is a really long literal, that won't be rendered in the issue text" -8 8 | -9 9 | # This should be fixable, and marked as safe -10 |-w1: Final[Literal[123]] # PYI064 - 10 |+w1: Final = 123 # PYI064 -11 11 | -12 12 | # This should not be fixable -13 13 | w2: Final[Literal[123]] = "random value" # PYI064 +7 | ]] = "this is a really long literal, that won't be rendered in the issue text" +8 | +9 | # This should be fixable, and marked as safe + - w1: Final[Literal[123]] # PYI064 +10 + w1: Final = 123 # PYI064 +11 | +12 | # This should not be fixable +13 | w2: Final[Literal[123]] = "random value" # PYI064 PYI064 `Final[Literal[123]]` can be replaced with a bare `Final` --> PYI064.py:13:1 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap index 03f7f83dbd..babf17ca3f 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI064_PYI064.pyi.snap @@ -12,15 +12,13 @@ PYI064 [*] `Final[Literal[True]]` can be replaced with a bare `Final` 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 | help: Replace with `Final` - -ℹ Safe fix -1 1 | from typing import Final, Literal -2 2 | -3 |-x: Final[Literal[True]] # PYI064 - 3 |+x: Final = True # PYI064 -4 4 | y: Final[Literal[None]] = None # PYI064 -5 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 -6 6 | +1 | from typing import Final, Literal +2 | + - x: Final[Literal[True]] # PYI064 +3 + x: Final = True # PYI064 +4 | y: Final[Literal[None]] = None # PYI064 +5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 +6 | PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final` --> PYI064.pyi:4:1 @@ -31,16 +29,14 @@ PYI064 [*] `Final[Literal[None]]` can be replaced with a bare `Final` 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 | help: Replace with `Final` - -ℹ Safe fix -1 1 | from typing import Final, Literal -2 2 | -3 3 | x: Final[Literal[True]] # PYI064 -4 |-y: Final[Literal[None]] = None # PYI064 - 4 |+y: Final = None # PYI064 -5 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 -6 6 | -7 7 | # This should be fixable, and marked as safe +1 | from typing import Final, Literal +2 | +3 | x: Final[Literal[True]] # PYI064 + - y: Final[Literal[None]] = None # PYI064 +4 + y: Final = None # PYI064 +5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 +6 | +7 | # This should be fixable, and marked as safe PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final` --> PYI064.pyi:5:1 @@ -53,16 +49,14 @@ PYI064 [*] `Final[Literal[...]]` can be replaced with a bare `Final` 7 | # This should be fixable, and marked as safe | help: Replace with `Final` - -ℹ Safe fix -2 2 | -3 3 | x: Final[Literal[True]] # PYI064 -4 4 | y: Final[Literal[None]] = None # PYI064 -5 |-z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 - 5 |+z: Final = "this is a really long literal, that won't be rendered in the issue text" # PYI064 -6 6 | -7 7 | # This should be fixable, and marked as safe -8 8 | w1: Final[Literal[123]] # PYI064 +2 | +3 | x: Final[Literal[True]] # PYI064 +4 | y: Final[Literal[None]] = None # PYI064 + - z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 +5 + z: Final = "this is a really long literal, that won't be rendered in the issue text" # PYI064 +6 | +7 | # This should be fixable, and marked as safe +8 | w1: Final[Literal[123]] # PYI064 PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final` --> PYI064.pyi:8:1 @@ -74,16 +68,14 @@ PYI064 [*] `Final[Literal[123]]` can be replaced with a bare `Final` 10 | # This should not be fixable | help: Replace with `Final` - -ℹ Safe fix -5 5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 -6 6 | -7 7 | # This should be fixable, and marked as safe -8 |-w1: Final[Literal[123]] # PYI064 - 8 |+w1: Final = 123 # PYI064 -9 9 | -10 10 | # This should not be fixable -11 11 | w2: Final[Literal[123]] = "random value" # PYI064 +5 | z: Final[Literal["this is a really long literal, that won't be rendered in the issue text"]] # PYI064 +6 | +7 | # This should be fixable, and marked as safe + - w1: Final[Literal[123]] # PYI064 +8 + w1: Final = 123 # PYI064 +9 | +10 | # This should not be fixable +11 | w2: Final[Literal[123]] = "random value" # PYI064 PYI064 `Final[Literal[123]]` can be replaced with a bare `Final` --> PYI064.pyi:11:1 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap index 15f4e54dd8..bfab666867 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.py.snap @@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str` 9 | # Should emit for union types in arguments. | help: Remove duplicate union member `str` - -ℹ Safe fix -4 4 | field1: str -5 5 | -6 6 | # Should emit for duplicate field types. -7 |-field2: str | str # PYI016: Duplicate union member `str` - 7 |+field2: str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` +4 | field1: str +5 | +6 | # Should emit for duplicate field types. + - field2: str | str # PYI016: Duplicate union member `str` +7 + field2: str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. +10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:10:23 @@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int` 11 | print(arg1) | help: Remove duplicate union member `int` - -ℹ Safe fix -7 7 | field2: str | str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 |-def func1(arg1: int | int): # PYI016: Duplicate union member `int` - 10 |+def func1(arg1: int): # PYI016: Duplicate union member `int` -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. +7 | field2: str | str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. + - def func1(arg1: int | int): # PYI016: Duplicate union member `int` +10 + def func1(arg1: int): # PYI016: Duplicate union member `int` +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. PYI016 [*] Duplicate union member `str` --> PYI016.py:14:22 @@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str` 15 | return "my string" | help: Remove duplicate union member `str` - -ℹ Safe fix -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. -14 |-def func2() -> str | str: # PYI016: Duplicate union member `str` - 14 |+def func2() -> str: # PYI016: Duplicate union member `str` -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. + - def func2() -> str | str: # PYI016: Duplicate union member `str` +14 + def func2() -> str: # PYI016: Duplicate union member `str` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. PYI016 [*] Duplicate union member `str` --> PYI016.py:18:15 @@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str` 20 | field5: str | int | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `str` - -ℹ Safe fix -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 |-field3: str | str | int # PYI016: Duplicate union member `str` - 18 |+field3: str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. + - field3: str | str | int # PYI016: Duplicate union member `str` +18 + field3: str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:19:15 @@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `int` - -ℹ Safe fix -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 |-field4: int | int | str # PYI016: Duplicate union member `int` - 19 |+field4: int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | +16 | +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` + - field4: int | int | str # PYI016: Duplicate union member `int` +19 + field4: int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | PYI016 [*] Duplicate union member `str` --> PYI016.py:20:21 @@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `str` - -ℹ Safe fix -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 |-field5: str | int | str # PYI016: Duplicate union member `str` - 20 |+field5: str | int # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` + - field5: str | int | str # PYI016: Duplicate union member `str` +20 + field5: str | int # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. PYI016 [*] Duplicate union member `int` --> PYI016.py:21:28 @@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int` 23 | # Shouldn't emit for non-type unions. | help: Remove duplicate union member `int` - -ℹ Safe fix -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 |-field6: int | bool | str | int # PYI016: Duplicate union member `int` - 21 |+field6: int | bool | str # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. -24 24 | field7 = str | str +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` + - field6: int | bool | str | int # PYI016: Duplicate union member `int` +21 + field6: int | bool | str # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. +24 | field7 = str | str PYI016 [*] Duplicate union member `int` --> PYI016.py:27:22 @@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int` 29 | # Should handle user brackets when fixing. | help: Remove duplicate union member `int` - -ℹ Safe fix -24 24 | field7 = str | str -25 25 | -26 26 | # Should emit for strangely-bracketed unions. -27 |-field8: int | (str | int) # PYI016: Duplicate union member `int` - 27 |+field8: int | str # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` +24 | field7 = str | str +25 | +26 | # Should emit for strangely-bracketed unions. + - field8: int | (str | int) # PYI016: Duplicate union member `int` +27 + field8: int | str # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:30:16 @@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int` 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `int` - -ℹ Safe fix -27 27 | field8: int | (str | int) # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 |-field9: int | (int | str) # PYI016: Duplicate union member `int` - 30 |+field9: int | str # PYI016: Duplicate union member `int` -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. +27 | field8: int | (str | int) # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. + - field9: int | (int | str) # PYI016: Duplicate union member `int` +30 + field9: int | str # PYI016: Duplicate union member `int` +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. PYI016 [*] Duplicate union member `str` --> PYI016.py:31:24 @@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str` 33 | # Should emit for nested unions. | help: Remove duplicate union member `str` - -ℹ Safe fix -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` -31 |-field10: (str | int) | str # PYI016: Duplicate union member `str` - 31 |+field10: str | int # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 34 | field11: dict[int | int, str] +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` + - field10: (str | int) | str # PYI016: Duplicate union member `str` +31 + field10: str | int # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. +34 | field11: dict[int | int, str] PYI016 [*] Duplicate union member `int` --> PYI016.py:34:21 @@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int` 36 | # Should emit for unions with more than two cases | help: Remove duplicate union member `int` - -ℹ Safe fix -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 |-field11: dict[int | int, str] - 34 |+field11: dict[int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. + - field11: dict[int | int, str] +34 + field11: dict[int, str] +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:37:16 @@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.py:37:22 @@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.py:38:16 @@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:38:22 @@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:38:28 @@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:41:16 @@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:41:28 @@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `typing.Literal[1]` --> PYI016.py:44:30 @@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]` 46 | # Shouldn't emit if in new parent type | help: Remove duplicate union member `typing.Literal[1]` - -ℹ Safe fix -41 41 | field14: int | int | str | int # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 |-field15: typing.Literal[1] | typing.Literal[1] # Error - 44 |+field15: typing.Literal[1] # Error -45 45 | -46 46 | # Shouldn't emit if in new parent type -47 47 | field16: int | dict[int, str] # OK +41 | field14: int | int | str | int # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 + - field15: typing.Literal[1] | typing.Literal[1] # Error +44 + field15: typing.Literal[1] # Error +45 | +46 | # Shouldn't emit if in new parent type +47 | field16: int | dict[int, str] # OK PYI016 [*] Duplicate union member `set[int]` --> PYI016.py:57:5 @@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]` 60 | ] # Error, newline and comment will not be emitted in message | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -50 50 | field17: dict[int, int] # OK -51 51 | -52 52 | # Should emit in cases with newlines -53 |-field18: typing.Union[ -54 |- set[ -55 |- int # foo -56 |- ], -57 |- set[ -58 |- int # bar -59 |- ], -60 |-] # Error, newline and comment will not be emitted in message - 53 |+field18: set[int] # Error, newline and comment will not be emitted in message -61 54 | -62 55 | # Should emit in cases with `typing.Union` instead of `|` -63 56 | field19: typing.Union[int, int] # Error +50 | field17: dict[int, int] # OK +51 | +52 | # Should emit in cases with newlines + - field18: typing.Union[ + - set[ + - int # foo + - ], + - set[ + - int # bar + - ], + - ] # Error, newline and comment will not be emitted in message +53 + field18: set[int] # Error, newline and comment will not be emitted in message +54 | +55 | # Should emit in cases with `typing.Union` instead of `|` +56 | field19: typing.Union[int, int] # Error +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.py:63:28 @@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int` 65 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -60 60 | ] # Error, newline and comment will not be emitted in message -61 61 | -62 62 | # Should emit in cases with `typing.Union` instead of `|` -63 |-field19: typing.Union[int, int] # Error - 63 |+field19: int # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error +60 | ] # Error, newline and comment will not be emitted in message +61 | +62 | # Should emit in cases with `typing.Union` instead of `|` + - field19: typing.Union[int, int] # Error +63 + field19: int # Error +64 | +65 | # Should emit in cases with nested `typing.Union` +66 | field20: typing.Union[int, typing.Union[int, str]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:66:41 @@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int` 68 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -63 63 | field19: typing.Union[int, int] # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 |-field20: typing.Union[int, typing.Union[int, str]] # Error - 66 |+field20: typing.Union[int, str] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 69 | field21: typing.Union[int, int | str] # Error +63 | field19: typing.Union[int, int] # Error +64 | +65 | # Should emit in cases with nested `typing.Union` + - field20: typing.Union[int, typing.Union[int, str]] # Error +66 + field20: typing.Union[int, str] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` +69 | field21: typing.Union[int, int | str] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:69:28 @@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int` 71 | # Should emit only once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 |-field21: typing.Union[int, int | str] # Error - 69 |+field21: int | str # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +66 | field20: typing.Union[int, typing.Union[int, str]] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` + - field21: typing.Union[int, int | str] # Error +69 + field21: int | str # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:72:41 @@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.py:72:59 @@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.py:72:64 @@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `set[int]` --> PYI016.py:76:12 @@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]` 78 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 |-field23: set[ # foo -76 |- int] | set[int] - 75 |+field23: set[int] -77 76 | -78 77 | # Should emit twice (once for each `int` in the nested union, both of which are -79 78 | # duplicates of the outer `int`), but not three times (which would indicate that +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +73 | +74 | # Should emit in cases with newlines + - field23: set[ # foo + - int] | set[int] +75 + field23: set[int] +76 | +77 | # Should emit twice (once for each `int` in the nested union, both of which are +78 | # duplicates of the outer `int`), but not three times (which would indicate that +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.py:81:41 @@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.py:81:46 @@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.py:86:28 @@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:86:34 @@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:89:41 @@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int` 91 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -86 86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 |-field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` - 89 |+field26: int # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` + - field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +89 + field26: int # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.py:92:54 @@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int` 94 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 |-field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` - 92 |+field27: int # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 95 | field28: typing.Union[int | int] # Error +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` + - field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +92 + field27: int # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` +95 | field28: typing.Union[int | int] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:95:29 @@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int` 97 | # Should emit twice in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 |-field28: typing.Union[int | int] # Error - 95 |+field28: int # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` + - field28: typing.Union[int | int] # Error +95 + field28: int # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:98:54 @@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:98:59 @@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:101:54 @@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int` 103 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error - 101 |+field30: typing.Union[int, str] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` + - field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +101 + field30: typing.Union[int, str] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` +104 | field31: typing.Union[float, typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:104:49 @@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int` 106 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 |-field31: typing.Union[float, typing.Union[int | int]] # Error - 104 |+field31: float | int # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` + - field31: typing.Union[float, typing.Union[int | int]] # Error +104 + field31: float | int # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:107:49 @@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:107:55 @@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:110:42 @@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:110:62 @@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.py:110:68 @@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `list[int]` --> PYI016.py:113:61 @@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]` 115 | field35: "int | str | int" # Error | help: Remove duplicate union member `list[int]` - -ℹ Safe fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error -111 111 | -112 112 | # Test case for mixed union type -113 |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error - 113 |+field34: typing.Union[list[int], str, bytes] # Error -114 114 | -115 115 | field35: "int | str | int" # Error -116 116 | +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +111 | +112 | # Test case for mixed union type + - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +113 + field34: typing.Union[list[int], str, bytes] # Error +114 | +115 | field35: "int | str | int" # Error +116 | PYI016 [*] Duplicate union member `int` --> PYI016.py:115:23 @@ -950,16 +864,14 @@ PYI016 [*] Duplicate union member `int` | ^^^ | help: Remove duplicate union member `int` - -ℹ Safe fix -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error -114 114 | -115 |-field35: "int | str | int" # Error - 115 |+field35: "int | str" # Error -116 116 | -117 117 | -118 118 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +114 | + - field35: "int | str | int" # Error +115 + field35: "int | str" # Error +116 | +117 | +118 | PYI016 [*] Duplicate union member `None` --> PYI016.py:130:26 @@ -972,16 +884,14 @@ PYI016 [*] Duplicate union member `None` 132 | field40: typing.Union[typing.Optional[int], None] | help: Remove duplicate union member `None` - -ℹ Safe fix -127 127 | field37: typing.Optional[int] -128 128 | field38: typing.Union[int, None] -129 129 | # equivalent to None -130 |-field39: typing.Optional[None] - 130 |+field39: None -131 131 | # equivalent to int | None -132 132 | field40: typing.Union[typing.Optional[int], None] -133 133 | field41: typing.Optional[typing.Union[int, None]] +127 | field37: typing.Optional[int] +128 | field38: typing.Union[int, None] +129 | # equivalent to None + - field39: typing.Optional[None] +130 + field39: None +131 | # equivalent to int | None +132 | field40: typing.Union[typing.Optional[int], None] +133 | field41: typing.Optional[typing.Union[int, None]] PYI016 [*] Duplicate union member `None` --> PYI016.py:132:45 @@ -994,16 +904,14 @@ PYI016 [*] Duplicate union member `None` 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] | help: Remove duplicate union member `None` - -ℹ Safe fix -129 129 | # equivalent to None -130 130 | field39: typing.Optional[None] -131 131 | # equivalent to int | None -132 |-field40: typing.Union[typing.Optional[int], None] - 132 |+field40: typing.Union[None, int] -133 133 | field41: typing.Optional[typing.Union[int, None]] -134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -135 135 | field43: typing.Optional[int] | None +129 | # equivalent to None +130 | field39: typing.Optional[None] +131 | # equivalent to int | None + - field40: typing.Union[typing.Optional[int], None] +132 + field40: typing.Union[None, int] +133 | field41: typing.Optional[typing.Union[int, None]] +134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +135 | field43: typing.Optional[int] | None PYI016 [*] Duplicate union member `None` --> PYI016.py:133:44 @@ -1016,16 +924,14 @@ PYI016 [*] Duplicate union member `None` 135 | field43: typing.Optional[int] | None | help: Remove duplicate union member `None` - -ℹ Safe fix -130 130 | field39: typing.Optional[None] -131 131 | # equivalent to int | None -132 132 | field40: typing.Union[typing.Optional[int], None] -133 |-field41: typing.Optional[typing.Union[int, None]] - 133 |+field41: typing.Union[None, int] -134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -135 135 | field43: typing.Optional[int] | None -136 136 | field44: typing.Optional[int | None] +130 | field39: typing.Optional[None] +131 | # equivalent to int | None +132 | field40: typing.Union[typing.Optional[int], None] + - field41: typing.Optional[typing.Union[int, None]] +133 + field41: typing.Union[None, int] +134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +135 | field43: typing.Optional[int] | None +136 | field44: typing.Optional[int | None] PYI016 [*] Duplicate union member `None` --> PYI016.py:134:45 @@ -1038,16 +944,14 @@ PYI016 [*] Duplicate union member `None` 136 | field44: typing.Optional[int | None] | help: Remove duplicate union member `None` - -ℹ Safe fix -131 131 | # equivalent to int | None -132 132 | field40: typing.Union[typing.Optional[int], None] -133 133 | field41: typing.Optional[typing.Union[int, None]] -134 |-field42: typing.Union[typing.Optional[int], typing.Optional[int]] - 134 |+field42: typing.Union[None, int] -135 135 | field43: typing.Optional[int] | None -136 136 | field44: typing.Optional[int | None] -137 137 | field45: typing.Optional[int] | typing.Optional[int] +131 | # equivalent to int | None +132 | field40: typing.Union[typing.Optional[int], None] +133 | field41: typing.Optional[typing.Union[int, None]] + - field42: typing.Union[typing.Optional[int], typing.Optional[int]] +134 + field42: typing.Union[None, int] +135 | field43: typing.Optional[int] | None +136 | field44: typing.Optional[int | None] +137 | field45: typing.Optional[int] | typing.Optional[int] PYI016 [*] Duplicate union member `int` --> PYI016.py:134:61 @@ -1060,16 +964,14 @@ PYI016 [*] Duplicate union member `int` 136 | field44: typing.Optional[int | None] | help: Remove duplicate union member `int` - -ℹ Safe fix -131 131 | # equivalent to int | None -132 132 | field40: typing.Union[typing.Optional[int], None] -133 133 | field41: typing.Optional[typing.Union[int, None]] -134 |-field42: typing.Union[typing.Optional[int], typing.Optional[int]] - 134 |+field42: typing.Union[None, int] -135 135 | field43: typing.Optional[int] | None -136 136 | field44: typing.Optional[int | None] -137 137 | field45: typing.Optional[int] | typing.Optional[int] +131 | # equivalent to int | None +132 | field40: typing.Union[typing.Optional[int], None] +133 | field41: typing.Optional[typing.Union[int, None]] + - field42: typing.Union[typing.Optional[int], typing.Optional[int]] +134 + field42: typing.Union[None, int] +135 | field43: typing.Optional[int] | None +136 | field44: typing.Optional[int | None] +137 | field45: typing.Optional[int] | typing.Optional[int] PYI016 [*] Duplicate union member `None` --> PYI016.py:135:33 @@ -1082,16 +984,14 @@ PYI016 [*] Duplicate union member `None` 137 | field45: typing.Optional[int] | typing.Optional[int] | help: Remove duplicate union member `None` - -ℹ Safe fix -132 132 | field40: typing.Union[typing.Optional[int], None] -133 133 | field41: typing.Optional[typing.Union[int, None]] -134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -135 |-field43: typing.Optional[int] | None - 135 |+field43: None | int -136 136 | field44: typing.Optional[int | None] -137 137 | field45: typing.Optional[int] | typing.Optional[int] -138 138 | # equivalent to int | dict | None +132 | field40: typing.Union[typing.Optional[int], None] +133 | field41: typing.Optional[typing.Union[int, None]] +134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] + - field43: typing.Optional[int] | None +135 + field43: None | int +136 | field44: typing.Optional[int | None] +137 | field45: typing.Optional[int] | typing.Optional[int] +138 | # equivalent to int | dict | None PYI016 [*] Duplicate union member `None` --> PYI016.py:136:32 @@ -1104,16 +1004,14 @@ PYI016 [*] Duplicate union member `None` 138 | # equivalent to int | dict | None | help: Remove duplicate union member `None` - -ℹ Safe fix -133 133 | field41: typing.Optional[typing.Union[int, None]] -134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -135 135 | field43: typing.Optional[int] | None -136 |-field44: typing.Optional[int | None] - 136 |+field44: None | int -137 137 | field45: typing.Optional[int] | typing.Optional[int] -138 138 | # equivalent to int | dict | None -139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +133 | field41: typing.Optional[typing.Union[int, None]] +134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +135 | field43: typing.Optional[int] | None + - field44: typing.Optional[int | None] +136 + field44: None | int +137 | field45: typing.Optional[int] | typing.Optional[int] +138 | # equivalent to int | dict | None +139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] PYI016 [*] Duplicate union member `None` --> PYI016.py:137:33 @@ -1126,16 +1024,14 @@ PYI016 [*] Duplicate union member `None` 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] | help: Remove duplicate union member `None` - -ℹ Safe fix -134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -135 135 | field43: typing.Optional[int] | None -136 136 | field44: typing.Optional[int | None] -137 |-field45: typing.Optional[int] | typing.Optional[int] - 137 |+field45: typing.Union[None, int] -138 138 | # equivalent to int | dict | None -139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -140 140 | field47: typing.Optional[int] | typing.Optional[dict] +134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +135 | field43: typing.Optional[int] | None +136 | field44: typing.Optional[int | None] + - field45: typing.Optional[int] | typing.Optional[int] +137 + field45: typing.Union[None, int] +138 | # equivalent to int | dict | None +139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +140 | field47: typing.Optional[int] | typing.Optional[dict] PYI016 [*] Duplicate union member `int` --> PYI016.py:137:49 @@ -1148,16 +1044,14 @@ PYI016 [*] Duplicate union member `int` 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] | help: Remove duplicate union member `int` - -ℹ Safe fix -134 134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -135 135 | field43: typing.Optional[int] | None -136 136 | field44: typing.Optional[int | None] -137 |-field45: typing.Optional[int] | typing.Optional[int] - 137 |+field45: typing.Union[None, int] -138 138 | # equivalent to int | dict | None -139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -140 140 | field47: typing.Optional[int] | typing.Optional[dict] +134 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +135 | field43: typing.Optional[int] | None +136 | field44: typing.Optional[int | None] + - field45: typing.Optional[int] | typing.Optional[int] +137 + field45: typing.Union[None, int] +138 | # equivalent to int | dict | None +139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +140 | field47: typing.Optional[int] | typing.Optional[dict] PYI016 [*] Duplicate union member `None` --> PYI016.py:139:45 @@ -1169,16 +1063,14 @@ PYI016 [*] Duplicate union member `None` 140 | field47: typing.Optional[int] | typing.Optional[dict] | help: Remove duplicate union member `None` - -ℹ Safe fix -136 136 | field44: typing.Optional[int | None] -137 137 | field45: typing.Optional[int] | typing.Optional[int] -138 138 | # equivalent to int | dict | None -139 |-field46: typing.Union[typing.Optional[int], typing.Optional[dict]] - 139 |+field46: typing.Union[None, int, dict] -140 140 | field47: typing.Optional[int] | typing.Optional[dict] -141 141 | -142 142 | # avoid reporting twice +136 | field44: typing.Optional[int | None] +137 | field45: typing.Optional[int] | typing.Optional[int] +138 | # equivalent to int | dict | None + - field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +139 + field46: typing.Union[None, int, dict] +140 | field47: typing.Optional[int] | typing.Optional[dict] +141 | +142 | # avoid reporting twice PYI016 [*] Duplicate union member `None` --> PYI016.py:140:33 @@ -1191,16 +1083,14 @@ PYI016 [*] Duplicate union member `None` 142 | # avoid reporting twice | help: Remove duplicate union member `None` - -ℹ Safe fix -137 137 | field45: typing.Optional[int] | typing.Optional[int] -138 138 | # equivalent to int | dict | None -139 139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -140 |-field47: typing.Optional[int] | typing.Optional[dict] - 140 |+field47: typing.Union[None, int, dict] -141 141 | -142 142 | # avoid reporting twice -143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +137 | field45: typing.Optional[int] | typing.Optional[int] +138 | # equivalent to int | dict | None +139 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] + - field47: typing.Optional[int] | typing.Optional[dict] +140 + field47: typing.Union[None, int, dict] +141 | +142 | # avoid reporting twice +143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] PYI016 [*] Duplicate union member `complex` --> PYI016.py:143:61 @@ -1211,16 +1101,14 @@ PYI016 [*] Duplicate union member `complex` 144 | field49: typing.Optional[complex | complex] | complex | help: Remove duplicate union member `complex` - -ℹ Safe fix -140 140 | field47: typing.Optional[int] | typing.Optional[dict] -141 141 | -142 142 | # avoid reporting twice -143 |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] - 143 |+field48: typing.Union[None, complex] -144 144 | field49: typing.Optional[complex | complex] | complex -145 145 | -146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 +140 | field47: typing.Optional[int] | typing.Optional[dict] +141 | +142 | # avoid reporting twice + - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +143 + field48: typing.Union[None, complex] +144 | field49: typing.Optional[complex | complex] | complex +145 | +146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 PYI016 [*] Duplicate union member `complex` --> PYI016.py:143:72 @@ -1231,16 +1119,14 @@ PYI016 [*] Duplicate union member `complex` 144 | field49: typing.Optional[complex | complex] | complex | help: Remove duplicate union member `complex` - -ℹ Safe fix -140 140 | field47: typing.Optional[int] | typing.Optional[dict] -141 141 | -142 142 | # avoid reporting twice -143 |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] - 143 |+field48: typing.Union[None, complex] -144 144 | field49: typing.Optional[complex | complex] | complex -145 145 | -146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 +140 | field47: typing.Optional[int] | typing.Optional[dict] +141 | +142 | # avoid reporting twice + - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +143 + field48: typing.Union[None, complex] +144 | field49: typing.Optional[complex | complex] | complex +145 | +146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 PYI016 [*] Duplicate union member `complex` --> PYI016.py:144:36 @@ -1253,16 +1139,14 @@ PYI016 [*] Duplicate union member `complex` 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 | help: Remove duplicate union member `complex` - -ℹ Safe fix -141 141 | -142 142 | # avoid reporting twice -143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] -144 |-field49: typing.Optional[complex | complex] | complex - 144 |+field49: None | complex -145 145 | -146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 -147 147 | # Should throw duplicate union member but not fix +141 | +142 | # avoid reporting twice +143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] + - field49: typing.Optional[complex | complex] | complex +144 + field49: None | complex +145 | +146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 +147 | # Should throw duplicate union member but not fix PYI016 [*] Duplicate union member `complex` --> PYI016.py:144:47 @@ -1275,16 +1159,14 @@ PYI016 [*] Duplicate union member `complex` 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 | help: Remove duplicate union member `complex` - -ℹ Safe fix -141 141 | -142 142 | # avoid reporting twice -143 143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] -144 |-field49: typing.Optional[complex | complex] | complex - 144 |+field49: None | complex -145 145 | -146 146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 -147 147 | # Should throw duplicate union member but not fix +141 | +142 | # avoid reporting twice +143 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] + - field49: typing.Optional[complex | complex] | complex +144 + field49: None | complex +145 | +146 | # Regression test for https://github.com/astral-sh/ruff/issues/19403 +147 | # Should throw duplicate union member but not fix PYI016 Duplicate union member `None` --> PYI016.py:148:37 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap index 4d970dddd1..55114a857e 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI016_PYI016.pyi.snap @@ -11,16 +11,14 @@ PYI016 [*] Duplicate union member `str` 9 | # Should emit for union types in arguments. | help: Remove duplicate union member `str` - -ℹ Safe fix -4 4 | field1: str -5 5 | -6 6 | # Should emit for duplicate field types. -7 |-field2: str | str # PYI016: Duplicate union member `str` - 7 |+field2: str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` +4 | field1: str +5 | +6 | # Should emit for duplicate field types. + - field2: str | str # PYI016: Duplicate union member `str` +7 + field2: str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. +10 | def func1(arg1: int | int): # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:10:23 @@ -31,16 +29,14 @@ PYI016 [*] Duplicate union member `int` 11 | print(arg1) | help: Remove duplicate union member `int` - -ℹ Safe fix -7 7 | field2: str | str # PYI016: Duplicate union member `str` -8 8 | -9 9 | # Should emit for union types in arguments. -10 |-def func1(arg1: int | int): # PYI016: Duplicate union member `int` - 10 |+def func1(arg1: int): # PYI016: Duplicate union member `int` -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. +7 | field2: str | str # PYI016: Duplicate union member `str` +8 | +9 | # Should emit for union types in arguments. + - def func1(arg1: int | int): # PYI016: Duplicate union member `int` +10 + def func1(arg1: int): # PYI016: Duplicate union member `int` +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. PYI016 [*] Duplicate union member `str` --> PYI016.pyi:14:22 @@ -51,16 +47,14 @@ PYI016 [*] Duplicate union member `str` 15 | return "my string" | help: Remove duplicate union member `str` - -ℹ Safe fix -11 11 | print(arg1) -12 12 | -13 13 | # Should emit for unions in return types. -14 |-def func2() -> str | str: # PYI016: Duplicate union member `str` - 14 |+def func2() -> str: # PYI016: Duplicate union member `str` -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. +11 | print(arg1) +12 | +13 | # Should emit for unions in return types. + - def func2() -> str | str: # PYI016: Duplicate union member `str` +14 + def func2() -> str: # PYI016: Duplicate union member `str` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. PYI016 [*] Duplicate union member `str` --> PYI016.pyi:18:15 @@ -72,16 +66,14 @@ PYI016 [*] Duplicate union member `str` 20 | field5: str | int | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `str` - -ℹ Safe fix -15 15 | return "my string" -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 |-field3: str | str | int # PYI016: Duplicate union member `str` - 18 |+field3: str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +15 | return "my string" +16 | +17 | # Should emit in longer unions, even if not directly adjacent. + - field3: str | str | int # PYI016: Duplicate union member `str` +18 + field3: str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:19:15 @@ -94,16 +86,14 @@ PYI016 [*] Duplicate union member `int` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `int` - -ℹ Safe fix -16 16 | -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 |-field4: int | int | str # PYI016: Duplicate union member `int` - 19 |+field4: int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | +16 | +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` + - field4: int | int | str # PYI016: Duplicate union member `int` +19 + field4: int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | PYI016 [*] Duplicate union member `str` --> PYI016.pyi:20:21 @@ -115,16 +105,14 @@ PYI016 [*] Duplicate union member `str` 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` | help: Remove duplicate union member `str` - -ℹ Safe fix -17 17 | # Should emit in longer unions, even if not directly adjacent. -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 |-field5: str | int | str # PYI016: Duplicate union member `str` - 20 |+field5: str | int # PYI016: Duplicate union member `str` -21 21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. +17 | # Should emit in longer unions, even if not directly adjacent. +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` + - field5: str | int | str # PYI016: Duplicate union member `str` +20 + field5: str | int # PYI016: Duplicate union member `str` +21 | field6: int | bool | str | int # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. PYI016 [*] Duplicate union member `int` --> PYI016.pyi:21:28 @@ -137,16 +125,14 @@ PYI016 [*] Duplicate union member `int` 23 | # Shouldn't emit for non-type unions. | help: Remove duplicate union member `int` - -ℹ Safe fix -18 18 | field3: str | str | int # PYI016: Duplicate union member `str` -19 19 | field4: int | int | str # PYI016: Duplicate union member `int` -20 20 | field5: str | int | str # PYI016: Duplicate union member `str` -21 |-field6: int | bool | str | int # PYI016: Duplicate union member `int` - 21 |+field6: int | bool | str # PYI016: Duplicate union member `int` -22 22 | -23 23 | # Shouldn't emit for non-type unions. -24 24 | field7 = str | str +18 | field3: str | str | int # PYI016: Duplicate union member `str` +19 | field4: int | int | str # PYI016: Duplicate union member `int` +20 | field5: str | int | str # PYI016: Duplicate union member `str` + - field6: int | bool | str | int # PYI016: Duplicate union member `int` +21 + field6: int | bool | str # PYI016: Duplicate union member `int` +22 | +23 | # Shouldn't emit for non-type unions. +24 | field7 = str | str PYI016 [*] Duplicate union member `int` --> PYI016.pyi:27:22 @@ -158,16 +144,14 @@ PYI016 [*] Duplicate union member `int` 29 | # Should handle user brackets when fixing. | help: Remove duplicate union member `int` - -ℹ Safe fix -24 24 | field7 = str | str -25 25 | -26 26 | # Should emit for strangely-bracketed unions. -27 |-field8: int | (str | int) # PYI016: Duplicate union member `int` - 27 |+field8: int | str # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` +24 | field7 = str | str +25 | +26 | # Should emit for strangely-bracketed unions. + - field8: int | (str | int) # PYI016: Duplicate union member `int` +27 + field8: int | str # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:30:16 @@ -178,16 +162,14 @@ PYI016 [*] Duplicate union member `int` 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` | help: Remove duplicate union member `int` - -ℹ Safe fix -27 27 | field8: int | (str | int) # PYI016: Duplicate union member `int` -28 28 | -29 29 | # Should handle user brackets when fixing. -30 |-field9: int | (int | str) # PYI016: Duplicate union member `int` - 30 |+field9: int | str # PYI016: Duplicate union member `int` -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. +27 | field8: int | (str | int) # PYI016: Duplicate union member `int` +28 | +29 | # Should handle user brackets when fixing. + - field9: int | (int | str) # PYI016: Duplicate union member `int` +30 + field9: int | str # PYI016: Duplicate union member `int` +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. PYI016 [*] Duplicate union member `str` --> PYI016.pyi:31:24 @@ -200,16 +182,14 @@ PYI016 [*] Duplicate union member `str` 33 | # Should emit for nested unions. | help: Remove duplicate union member `str` - -ℹ Safe fix -28 28 | -29 29 | # Should handle user brackets when fixing. -30 30 | field9: int | (int | str) # PYI016: Duplicate union member `int` -31 |-field10: (str | int) | str # PYI016: Duplicate union member `str` - 31 |+field10: str | int # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 34 | field11: dict[int | int, str] +28 | +29 | # Should handle user brackets when fixing. +30 | field9: int | (int | str) # PYI016: Duplicate union member `int` + - field10: (str | int) | str # PYI016: Duplicate union member `str` +31 + field10: str | int # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. +34 | field11: dict[int | int, str] PYI016 [*] Duplicate union member `int` --> PYI016.pyi:34:21 @@ -221,16 +201,14 @@ PYI016 [*] Duplicate union member `int` 36 | # Should emit for unions with more than two cases | help: Remove duplicate union member `int` - -ℹ Safe fix -31 31 | field10: (str | int) | str # PYI016: Duplicate union member `str` -32 32 | -33 33 | # Should emit for nested unions. -34 |-field11: dict[int | int, str] - 34 |+field11: dict[int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error +31 | field10: (str | int) | str # PYI016: Duplicate union member `str` +32 | +33 | # Should emit for nested unions. + - field11: dict[int | int, str] +34 + field11: dict[int, str] +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:37:16 @@ -241,16 +219,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.pyi:37:22 @@ -261,16 +237,14 @@ PYI016 [*] Duplicate union member `int` 38 | field13: int | int | int | int # Error | help: Remove duplicate union member `int` - -ℹ Safe fix -34 34 | field11: dict[int | int, str] -35 35 | -36 36 | # Should emit for unions with more than two cases -37 |-field12: int | int | int # Error - 37 |+field12: int # Error -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent +34 | field11: dict[int | int, str] +35 | +36 | # Should emit for unions with more than two cases + - field12: int | int | int # Error +37 + field12: int # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent PYI016 [*] Duplicate union member `int` --> PYI016.pyi:38:16 @@ -283,16 +257,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:38:22 @@ -305,16 +277,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:38:28 @@ -327,16 +297,14 @@ PYI016 [*] Duplicate union member `int` 40 | # Should emit for unions with more than two cases, even if not directly adjacent | help: Remove duplicate union member `int` - -ℹ Safe fix -35 35 | -36 36 | # Should emit for unions with more than two cases -37 37 | field12: int | int | int # Error -38 |-field13: int | int | int | int # Error - 38 |+field13: int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 41 | field14: int | int | str | int # Error +35 | +36 | # Should emit for unions with more than two cases +37 | field12: int | int | int # Error + - field13: int | int | int | int # Error +38 + field13: int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent +41 | field14: int | int | str | int # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:41:16 @@ -348,16 +316,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:41:28 @@ -369,16 +335,14 @@ PYI016 [*] Duplicate union member `int` 43 | # Should emit for duplicate literal types; also covered by PYI030 | help: Remove duplicate union member `int` - -ℹ Safe fix -38 38 | field13: int | int | int | int # Error -39 39 | -40 40 | # Should emit for unions with more than two cases, even if not directly adjacent -41 |-field14: int | int | str | int # Error - 41 |+field14: int | str # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 44 | field15: typing.Literal[1] | typing.Literal[1] # Error +38 | field13: int | int | int | int # Error +39 | +40 | # Should emit for unions with more than two cases, even if not directly adjacent + - field14: int | int | str | int # Error +41 + field14: int | str # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 +44 | field15: typing.Literal[1] | typing.Literal[1] # Error PYI016 [*] Duplicate union member `typing.Literal[1]` --> PYI016.pyi:44:30 @@ -390,16 +354,14 @@ PYI016 [*] Duplicate union member `typing.Literal[1]` 46 | # Shouldn't emit if in new parent type | help: Remove duplicate union member `typing.Literal[1]` - -ℹ Safe fix -41 41 | field14: int | int | str | int # Error -42 42 | -43 43 | # Should emit for duplicate literal types; also covered by PYI030 -44 |-field15: typing.Literal[1] | typing.Literal[1] # Error - 44 |+field15: typing.Literal[1] # Error -45 45 | -46 46 | # Shouldn't emit if in new parent type -47 47 | field16: int | dict[int, str] # OK +41 | field14: int | int | str | int # Error +42 | +43 | # Should emit for duplicate literal types; also covered by PYI030 + - field15: typing.Literal[1] | typing.Literal[1] # Error +44 + field15: typing.Literal[1] # Error +45 | +46 | # Shouldn't emit if in new parent type +47 | field16: int | dict[int, str] # OK PYI016 [*] Duplicate union member `set[int]` --> PYI016.pyi:57:5 @@ -413,23 +375,22 @@ PYI016 [*] Duplicate union member `set[int]` 60 | ] # Error, newline and comment will not be emitted in message | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -50 50 | field17: dict[int, int] # OK -51 51 | -52 52 | # Should emit in cases with newlines -53 |-field18: typing.Union[ -54 |- set[ -55 |- int # foo -56 |- ], -57 |- set[ -58 |- int # bar -59 |- ], -60 |-] # Error, newline and comment will not be emitted in message - 53 |+field18: set[int] # Error, newline and comment will not be emitted in message -61 54 | -62 55 | # Should emit in cases with `typing.Union` instead of `|` -63 56 | field19: typing.Union[int, int] # Error +50 | field17: dict[int, int] # OK +51 | +52 | # Should emit in cases with newlines + - field18: typing.Union[ + - set[ + - int # foo + - ], + - set[ + - int # bar + - ], + - ] # Error, newline and comment will not be emitted in message +53 + field18: set[int] # Error, newline and comment will not be emitted in message +54 | +55 | # Should emit in cases with `typing.Union` instead of `|` +56 | field19: typing.Union[int, int] # Error +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.pyi:63:28 @@ -441,16 +402,14 @@ PYI016 [*] Duplicate union member `int` 65 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -60 60 | ] # Error, newline and comment will not be emitted in message -61 61 | -62 62 | # Should emit in cases with `typing.Union` instead of `|` -63 |-field19: typing.Union[int, int] # Error - 63 |+field19: int # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error +60 | ] # Error, newline and comment will not be emitted in message +61 | +62 | # Should emit in cases with `typing.Union` instead of `|` + - field19: typing.Union[int, int] # Error +63 + field19: int # Error +64 | +65 | # Should emit in cases with nested `typing.Union` +66 | field20: typing.Union[int, typing.Union[int, str]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:66:41 @@ -462,16 +421,14 @@ PYI016 [*] Duplicate union member `int` 68 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -63 63 | field19: typing.Union[int, int] # Error -64 64 | -65 65 | # Should emit in cases with nested `typing.Union` -66 |-field20: typing.Union[int, typing.Union[int, str]] # Error - 66 |+field20: typing.Union[int, str] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 69 | field21: typing.Union[int, int | str] # Error +63 | field19: typing.Union[int, int] # Error +64 | +65 | # Should emit in cases with nested `typing.Union` + - field20: typing.Union[int, typing.Union[int, str]] # Error +66 + field20: typing.Union[int, str] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` +69 | field21: typing.Union[int, int | str] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:69:28 @@ -483,16 +440,14 @@ PYI016 [*] Duplicate union member `int` 71 | # Should emit only once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -66 66 | field20: typing.Union[int, typing.Union[int, str]] # Error -67 67 | -68 68 | # Should emit in cases with mixed `typing.Union` and `|` -69 |-field21: typing.Union[int, int | str] # Error - 69 |+field21: int | str # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +66 | field20: typing.Union[int, typing.Union[int, str]] # Error +67 | +68 | # Should emit in cases with mixed `typing.Union` and `|` + - field21: typing.Union[int, int | str] # Error +69 + field21: int | str # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:72:41 @@ -504,16 +459,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.pyi:72:59 @@ -525,16 +478,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `int` --> PYI016.pyi:72:64 @@ -546,16 +497,14 @@ PYI016 [*] Duplicate union member `int` 74 | # Should emit in cases with newlines | help: Remove duplicate union member `int` - -ℹ Safe fix -69 69 | field21: typing.Union[int, int | str] # Error -70 70 | -71 71 | # Should emit only once in cases with multiple nested `typing.Union` -72 |-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error - 72 |+field22: int # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 75 | field23: set[ # foo +69 | field21: typing.Union[int, int | str] # Error +70 | +71 | # Should emit only once in cases with multiple nested `typing.Union` + - field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +72 + field22: int # Error +73 | +74 | # Should emit in cases with newlines +75 | field23: set[ # foo PYI016 [*] Duplicate union member `set[int]` --> PYI016.pyi:76:12 @@ -568,17 +517,16 @@ PYI016 [*] Duplicate union member `set[int]` 78 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `set[int]` - -ℹ Unsafe fix -72 72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error -73 73 | -74 74 | # Should emit in cases with newlines -75 |-field23: set[ # foo -76 |- int] | set[int] - 75 |+field23: set[int] -77 76 | -78 77 | # Should emit twice (once for each `int` in the nested union, both of which are -79 78 | # duplicates of the outer `int`), but not three times (which would indicate that +72 | field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]] # Error +73 | +74 | # Should emit in cases with newlines + - field23: set[ # foo + - int] | set[int] +75 + field23: set[int] +76 | +77 | # Should emit twice (once for each `int` in the nested union, both of which are +78 | # duplicates of the outer `int`), but not three times (which would indicate that +note: This is an unsafe fix and may change runtime behavior PYI016 [*] Duplicate union member `int` --> PYI016.pyi:81:41 @@ -591,16 +539,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.pyi:81:46 @@ -613,16 +559,14 @@ PYI016 [*] Duplicate union member `int` 83 | # Should emit twice (once for each `int` in the nested union, both of which are | help: Remove duplicate union member `int` - -ℹ Safe fix -78 78 | # Should emit twice (once for each `int` in the nested union, both of which are -79 79 | # duplicates of the outer `int`), but not three times (which would indicate that -80 80 | # we incorrectly re-checked the nested union). -81 |-field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` - 81 |+field24: int # PYI016: Duplicate union member `int` -82 82 | -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that +78 | # Should emit twice (once for each `int` in the nested union, both of which are +79 | # duplicates of the outer `int`), but not three times (which would indicate that +80 | # we incorrectly re-checked the nested union). + - field24: typing.Union[int, typing.Union[int, int]] # PYI016: Duplicate union member `int` +81 + field24: int # PYI016: Duplicate union member `int` +82 | +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that PYI016 [*] Duplicate union member `int` --> PYI016.pyi:86:28 @@ -635,16 +579,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:86:34 @@ -657,16 +599,14 @@ PYI016 [*] Duplicate union member `int` 88 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -83 83 | # Should emit twice (once for each `int` in the nested union, both of which are -84 84 | # duplicates of the outer `int`), but not three times (which would indicate that -85 85 | # we incorrectly re-checked the nested union). -86 |-field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` - 86 |+field25: int # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +83 | # Should emit twice (once for each `int` in the nested union, both of which are +84 | # duplicates of the outer `int`), but not three times (which would indicate that +85 | # we incorrectly re-checked the nested union). + - field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +86 + field25: int # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:89:41 @@ -678,16 +618,14 @@ PYI016 [*] Duplicate union member `int` 91 | # Should emit in cases with nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -86 86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` -87 87 | -88 88 | # Should emit in cases with nested `typing.Union` -89 |-field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` - 89 |+field26: int # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +86 | field25: typing.Union[int, int | int] # PYI016: Duplicate union member `int` +87 | +88 | # Should emit in cases with nested `typing.Union` + - field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +89 + field26: int # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` PYI016 [*] Duplicate union member `int` --> PYI016.pyi:92:54 @@ -699,16 +637,14 @@ PYI016 [*] Duplicate union member `int` 94 | # Should emit in cases with mixed `typing.Union` and `|` | help: Remove duplicate union member `int` - -ℹ Safe fix -89 89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` -90 90 | -91 91 | # Should emit in cases with nested `typing.Union` -92 |-field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` - 92 |+field27: int # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 95 | field28: typing.Union[int | int] # Error +89 | field26: typing.Union[typing.Union[int, int]] # PYI016: Duplicate union member `int` +90 | +91 | # Should emit in cases with nested `typing.Union` + - field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +92 + field27: int # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` +95 | field28: typing.Union[int | int] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:95:29 @@ -720,16 +656,14 @@ PYI016 [*] Duplicate union member `int` 97 | # Should emit twice in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -92 92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` -93 93 | -94 94 | # Should emit in cases with mixed `typing.Union` and `|` -95 |-field28: typing.Union[int | int] # Error - 95 |+field28: int # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +92 | field27: typing.Union[typing.Union[typing.Union[int, int]]] # PYI016: Duplicate union member `int` +93 | +94 | # Should emit in cases with mixed `typing.Union` and `|` + - field28: typing.Union[int | int] # Error +95 + field28: int # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:98:54 @@ -741,16 +675,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:98:59 @@ -762,16 +694,14 @@ PYI016 [*] Duplicate union member `int` 100 | # Should emit once in cases with multiple nested `typing.Union` | help: Remove duplicate union member `int` - -ℹ Safe fix -95 95 | field28: typing.Union[int | int] # Error -96 96 | -97 97 | # Should emit twice in cases with multiple nested `typing.Union` -98 |-field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error - 98 |+field29: int # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +95 | field28: typing.Union[int | int] # Error +96 | +97 | # Should emit twice in cases with multiple nested `typing.Union` + - field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +98 + field29: int # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:101:54 @@ -783,16 +713,14 @@ PYI016 [*] Duplicate union member `int` 103 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -98 98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error -99 99 | -100 100 | # Should emit once in cases with multiple nested `typing.Union` -101 |-field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error - 101 |+field30: typing.Union[int, str] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error +98 | field29: typing.Union[int, typing.Union[typing.Union[int, int]]] # Error +99 | +100 | # Should emit once in cases with multiple nested `typing.Union` + - field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +101 + field30: typing.Union[int, str] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` +104 | field31: typing.Union[float, typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:104:49 @@ -804,16 +732,14 @@ PYI016 [*] Duplicate union member `int` 106 | # Should emit once, and fix to `typing.Union[float, int]` | help: Remove duplicate union member `int` - -ℹ Safe fix -101 101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error -102 102 | -103 103 | # Should emit once, and fix to `typing.Union[float, int]` -104 |-field31: typing.Union[float, typing.Union[int | int]] # Error - 104 |+field31: float | int # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +101 | field30: typing.Union[int, typing.Union[typing.Union[int, str]]] # Error +102 | +103 | # Should emit once, and fix to `typing.Union[float, int]` + - field31: typing.Union[float, typing.Union[int | int]] # Error +104 + field31: float | int # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:107:49 @@ -825,16 +751,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:107:55 @@ -846,16 +770,14 @@ PYI016 [*] Duplicate union member `int` 109 | # Test case for mixed union type fix | help: Remove duplicate union member `int` - -ℹ Safe fix -104 104 | field31: typing.Union[float, typing.Union[int | int]] # Error -105 105 | -106 106 | # Should emit once, and fix to `typing.Union[float, int]` -107 |-field32: typing.Union[float, typing.Union[int | int | int]] # Error - 107 |+field32: float | int # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +104 | field31: typing.Union[float, typing.Union[int | int]] # Error +105 | +106 | # Should emit once, and fix to `typing.Union[float, int]` + - field32: typing.Union[float, typing.Union[int | int | int]] # Error +107 + field32: float | int # Error +108 | +109 | # Test case for mixed union type fix +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:110:42 @@ -867,16 +789,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:110:62 @@ -888,16 +808,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `int` --> PYI016.pyi:110:68 @@ -909,16 +827,14 @@ PYI016 [*] Duplicate union member `int` 112 | # Test case for mixed union type | help: Remove duplicate union member `int` - -ℹ Safe fix -107 107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error -108 108 | -109 109 | # Test case for mixed union type fix -110 |-field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error - 110 |+field33: int # Error -111 111 | -112 112 | # Test case for mixed union type -113 113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +107 | field32: typing.Union[float, typing.Union[int | int | int]] # Error +108 | +109 | # Test case for mixed union type fix + - field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +110 + field33: int # Error +111 | +112 | # Test case for mixed union type +113 | field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error PYI016 [*] Duplicate union member `list[int]` --> PYI016.pyi:113:61 @@ -930,16 +846,14 @@ PYI016 [*] Duplicate union member `list[int]` 115 | # https://github.com/astral-sh/ruff/issues/18546 | help: Remove duplicate union member `list[int]` - -ℹ Safe fix -110 110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error -111 111 | -112 112 | # Test case for mixed union type -113 |-field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error - 113 |+field34: typing.Union[list[int], str, bytes] # Error -114 114 | -115 115 | # https://github.com/astral-sh/ruff/issues/18546 -116 116 | # Expand Optional[T] to Union[T, None] +110 | field33: typing.Union[typing.Union[int | int] | typing.Union[int | int]] # Error +111 | +112 | # Test case for mixed union type + - field34: typing.Union[list[int], str] | typing.Union[bytes, list[int]] # Error +113 + field34: typing.Union[list[int], str, bytes] # Error +114 | +115 | # https://github.com/astral-sh/ruff/issues/18546 +116 | # Expand Optional[T] to Union[T, None] PYI016 [*] Duplicate union member `None` --> PYI016.pyi:121:26 @@ -952,16 +866,14 @@ PYI016 [*] Duplicate union member `None` 123 | field40: typing.Union[typing.Optional[int], None] | help: Remove duplicate union member `None` - -ℹ Safe fix -118 118 | field37: typing.Optional[int] -119 119 | field38: typing.Union[int, None] -120 120 | # equivalent to None -121 |-field39: typing.Optional[None] - 121 |+field39: None -122 122 | # equivalent to int | None -123 123 | field40: typing.Union[typing.Optional[int], None] -124 124 | field41: typing.Optional[typing.Union[int, None]] +118 | field37: typing.Optional[int] +119 | field38: typing.Union[int, None] +120 | # equivalent to None + - field39: typing.Optional[None] +121 + field39: None +122 | # equivalent to int | None +123 | field40: typing.Union[typing.Optional[int], None] +124 | field41: typing.Optional[typing.Union[int, None]] PYI016 [*] Duplicate union member `None` --> PYI016.pyi:123:45 @@ -974,16 +886,14 @@ PYI016 [*] Duplicate union member `None` 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] | help: Remove duplicate union member `None` - -ℹ Safe fix -120 120 | # equivalent to None -121 121 | field39: typing.Optional[None] -122 122 | # equivalent to int | None -123 |-field40: typing.Union[typing.Optional[int], None] - 123 |+field40: typing.Union[None, int] -124 124 | field41: typing.Optional[typing.Union[int, None]] -125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -126 126 | field43: typing.Optional[int] | None +120 | # equivalent to None +121 | field39: typing.Optional[None] +122 | # equivalent to int | None + - field40: typing.Union[typing.Optional[int], None] +123 + field40: typing.Union[None, int] +124 | field41: typing.Optional[typing.Union[int, None]] +125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +126 | field43: typing.Optional[int] | None PYI016 [*] Duplicate union member `None` --> PYI016.pyi:124:44 @@ -996,16 +906,14 @@ PYI016 [*] Duplicate union member `None` 126 | field43: typing.Optional[int] | None | help: Remove duplicate union member `None` - -ℹ Safe fix -121 121 | field39: typing.Optional[None] -122 122 | # equivalent to int | None -123 123 | field40: typing.Union[typing.Optional[int], None] -124 |-field41: typing.Optional[typing.Union[int, None]] - 124 |+field41: typing.Union[None, int] -125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -126 126 | field43: typing.Optional[int] | None -127 127 | field44: typing.Optional[int | None] +121 | field39: typing.Optional[None] +122 | # equivalent to int | None +123 | field40: typing.Union[typing.Optional[int], None] + - field41: typing.Optional[typing.Union[int, None]] +124 + field41: typing.Union[None, int] +125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +126 | field43: typing.Optional[int] | None +127 | field44: typing.Optional[int | None] PYI016 [*] Duplicate union member `None` --> PYI016.pyi:125:45 @@ -1018,16 +926,14 @@ PYI016 [*] Duplicate union member `None` 127 | field44: typing.Optional[int | None] | help: Remove duplicate union member `None` - -ℹ Safe fix -122 122 | # equivalent to int | None -123 123 | field40: typing.Union[typing.Optional[int], None] -124 124 | field41: typing.Optional[typing.Union[int, None]] -125 |-field42: typing.Union[typing.Optional[int], typing.Optional[int]] - 125 |+field42: typing.Union[None, int] -126 126 | field43: typing.Optional[int] | None -127 127 | field44: typing.Optional[int | None] -128 128 | field45: typing.Optional[int] | typing.Optional[int] +122 | # equivalent to int | None +123 | field40: typing.Union[typing.Optional[int], None] +124 | field41: typing.Optional[typing.Union[int, None]] + - field42: typing.Union[typing.Optional[int], typing.Optional[int]] +125 + field42: typing.Union[None, int] +126 | field43: typing.Optional[int] | None +127 | field44: typing.Optional[int | None] +128 | field45: typing.Optional[int] | typing.Optional[int] PYI016 [*] Duplicate union member `int` --> PYI016.pyi:125:61 @@ -1040,16 +946,14 @@ PYI016 [*] Duplicate union member `int` 127 | field44: typing.Optional[int | None] | help: Remove duplicate union member `int` - -ℹ Safe fix -122 122 | # equivalent to int | None -123 123 | field40: typing.Union[typing.Optional[int], None] -124 124 | field41: typing.Optional[typing.Union[int, None]] -125 |-field42: typing.Union[typing.Optional[int], typing.Optional[int]] - 125 |+field42: typing.Union[None, int] -126 126 | field43: typing.Optional[int] | None -127 127 | field44: typing.Optional[int | None] -128 128 | field45: typing.Optional[int] | typing.Optional[int] +122 | # equivalent to int | None +123 | field40: typing.Union[typing.Optional[int], None] +124 | field41: typing.Optional[typing.Union[int, None]] + - field42: typing.Union[typing.Optional[int], typing.Optional[int]] +125 + field42: typing.Union[None, int] +126 | field43: typing.Optional[int] | None +127 | field44: typing.Optional[int | None] +128 | field45: typing.Optional[int] | typing.Optional[int] PYI016 [*] Duplicate union member `None` --> PYI016.pyi:126:33 @@ -1062,16 +966,14 @@ PYI016 [*] Duplicate union member `None` 128 | field45: typing.Optional[int] | typing.Optional[int] | help: Remove duplicate union member `None` - -ℹ Safe fix -123 123 | field40: typing.Union[typing.Optional[int], None] -124 124 | field41: typing.Optional[typing.Union[int, None]] -125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -126 |-field43: typing.Optional[int] | None - 126 |+field43: None | int -127 127 | field44: typing.Optional[int | None] -128 128 | field45: typing.Optional[int] | typing.Optional[int] -129 129 | # equivalent to int | dict | None +123 | field40: typing.Union[typing.Optional[int], None] +124 | field41: typing.Optional[typing.Union[int, None]] +125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] + - field43: typing.Optional[int] | None +126 + field43: None | int +127 | field44: typing.Optional[int | None] +128 | field45: typing.Optional[int] | typing.Optional[int] +129 | # equivalent to int | dict | None PYI016 [*] Duplicate union member `None` --> PYI016.pyi:127:32 @@ -1084,16 +986,14 @@ PYI016 [*] Duplicate union member `None` 129 | # equivalent to int | dict | None | help: Remove duplicate union member `None` - -ℹ Safe fix -124 124 | field41: typing.Optional[typing.Union[int, None]] -125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -126 126 | field43: typing.Optional[int] | None -127 |-field44: typing.Optional[int | None] - 127 |+field44: None | int -128 128 | field45: typing.Optional[int] | typing.Optional[int] -129 129 | # equivalent to int | dict | None -130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +124 | field41: typing.Optional[typing.Union[int, None]] +125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +126 | field43: typing.Optional[int] | None + - field44: typing.Optional[int | None] +127 + field44: None | int +128 | field45: typing.Optional[int] | typing.Optional[int] +129 | # equivalent to int | dict | None +130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] PYI016 [*] Duplicate union member `None` --> PYI016.pyi:128:33 @@ -1106,16 +1006,14 @@ PYI016 [*] Duplicate union member `None` 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] | help: Remove duplicate union member `None` - -ℹ Safe fix -125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -126 126 | field43: typing.Optional[int] | None -127 127 | field44: typing.Optional[int | None] -128 |-field45: typing.Optional[int] | typing.Optional[int] - 128 |+field45: typing.Union[None, int] -129 129 | # equivalent to int | dict | None -130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -131 131 | field47: typing.Optional[int] | typing.Optional[dict] +125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +126 | field43: typing.Optional[int] | None +127 | field44: typing.Optional[int | None] + - field45: typing.Optional[int] | typing.Optional[int] +128 + field45: typing.Union[None, int] +129 | # equivalent to int | dict | None +130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +131 | field47: typing.Optional[int] | typing.Optional[dict] PYI016 [*] Duplicate union member `int` --> PYI016.pyi:128:49 @@ -1128,16 +1026,14 @@ PYI016 [*] Duplicate union member `int` 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] | help: Remove duplicate union member `int` - -ℹ Safe fix -125 125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] -126 126 | field43: typing.Optional[int] | None -127 127 | field44: typing.Optional[int | None] -128 |-field45: typing.Optional[int] | typing.Optional[int] - 128 |+field45: typing.Union[None, int] -129 129 | # equivalent to int | dict | None -130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -131 131 | field47: typing.Optional[int] | typing.Optional[dict] +125 | field42: typing.Union[typing.Optional[int], typing.Optional[int]] +126 | field43: typing.Optional[int] | None +127 | field44: typing.Optional[int | None] + - field45: typing.Optional[int] | typing.Optional[int] +128 + field45: typing.Union[None, int] +129 | # equivalent to int | dict | None +130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +131 | field47: typing.Optional[int] | typing.Optional[dict] PYI016 [*] Duplicate union member `None` --> PYI016.pyi:130:45 @@ -1149,16 +1045,14 @@ PYI016 [*] Duplicate union member `None` 131 | field47: typing.Optional[int] | typing.Optional[dict] | help: Remove duplicate union member `None` - -ℹ Safe fix -127 127 | field44: typing.Optional[int | None] -128 128 | field45: typing.Optional[int] | typing.Optional[int] -129 129 | # equivalent to int | dict | None -130 |-field46: typing.Union[typing.Optional[int], typing.Optional[dict]] - 130 |+field46: typing.Union[None, int, dict] -131 131 | field47: typing.Optional[int] | typing.Optional[dict] -132 132 | -133 133 | # avoid reporting twice +127 | field44: typing.Optional[int | None] +128 | field45: typing.Optional[int] | typing.Optional[int] +129 | # equivalent to int | dict | None + - field46: typing.Union[typing.Optional[int], typing.Optional[dict]] +130 + field46: typing.Union[None, int, dict] +131 | field47: typing.Optional[int] | typing.Optional[dict] +132 | +133 | # avoid reporting twice PYI016 [*] Duplicate union member `None` --> PYI016.pyi:131:33 @@ -1171,16 +1065,14 @@ PYI016 [*] Duplicate union member `None` 133 | # avoid reporting twice | help: Remove duplicate union member `None` - -ℹ Safe fix -128 128 | field45: typing.Optional[int] | typing.Optional[int] -129 129 | # equivalent to int | dict | None -130 130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] -131 |-field47: typing.Optional[int] | typing.Optional[dict] - 131 |+field47: typing.Union[None, int, dict] -132 132 | -133 133 | # avoid reporting twice -134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +128 | field45: typing.Optional[int] | typing.Optional[int] +129 | # equivalent to int | dict | None +130 | field46: typing.Union[typing.Optional[int], typing.Optional[dict]] + - field47: typing.Optional[int] | typing.Optional[dict] +131 + field47: typing.Union[None, int, dict] +132 | +133 | # avoid reporting twice +134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] PYI016 [*] Duplicate union member `complex` --> PYI016.pyi:134:61 @@ -1191,14 +1083,12 @@ PYI016 [*] Duplicate union member `complex` 135 | field49: typing.Optional[complex | complex] | complex | help: Remove duplicate union member `complex` - -ℹ Safe fix -131 131 | field47: typing.Optional[int] | typing.Optional[dict] -132 132 | -133 133 | # avoid reporting twice -134 |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] - 134 |+field48: typing.Union[None, complex] -135 135 | field49: typing.Optional[complex | complex] | complex +131 | field47: typing.Optional[int] | typing.Optional[dict] +132 | +133 | # avoid reporting twice + - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +134 + field48: typing.Union[None, complex] +135 | field49: typing.Optional[complex | complex] | complex PYI016 [*] Duplicate union member `complex` --> PYI016.pyi:134:72 @@ -1209,14 +1099,12 @@ PYI016 [*] Duplicate union member `complex` 135 | field49: typing.Optional[complex | complex] | complex | help: Remove duplicate union member `complex` - -ℹ Safe fix -131 131 | field47: typing.Optional[int] | typing.Optional[dict] -132 132 | -133 133 | # avoid reporting twice -134 |-field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] - 134 |+field48: typing.Union[None, complex] -135 135 | field49: typing.Optional[complex | complex] | complex +131 | field47: typing.Optional[int] | typing.Optional[dict] +132 | +133 | # avoid reporting twice + - field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] +134 + field48: typing.Union[None, complex] +135 | field49: typing.Optional[complex | complex] | complex PYI016 [*] Duplicate union member `complex` --> PYI016.pyi:135:36 @@ -1227,13 +1115,11 @@ PYI016 [*] Duplicate union member `complex` | ^^^^^^^ | help: Remove duplicate union member `complex` - -ℹ Safe fix -132 132 | -133 133 | # avoid reporting twice -134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] -135 |-field49: typing.Optional[complex | complex] | complex - 135 |+field49: None | complex +132 | +133 | # avoid reporting twice +134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] + - field49: typing.Optional[complex | complex] | complex +135 + field49: None | complex PYI016 [*] Duplicate union member `complex` --> PYI016.pyi:135:47 @@ -1244,10 +1130,8 @@ PYI016 [*] Duplicate union member `complex` | ^^^^^^^ | help: Remove duplicate union member `complex` - -ℹ Safe fix -132 132 | -133 133 | # avoid reporting twice -134 134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] -135 |-field49: typing.Optional[complex | complex] | complex - 135 |+field49: None | complex +132 | +133 | # avoid reporting twice +134 | field48: typing.Union[typing.Optional[typing.Union[complex, complex]], complex] + - field49: typing.Optional[complex | complex] | complex +135 + field49: None | complex diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap index aca6cc9120..eeb5df4a57 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI026_PYI026.pyi.snap @@ -12,16 +12,14 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `NewAny: Type 5 | Foo = Literal["foo"] | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 1 | from typing import Literal, Any - 2 |+from typing_extensions import TypeAlias -2 3 | -3 |-NewAny = Any - 4 |+NewAny: TypeAlias = Any -4 5 | OptionalStr = typing.Optional[str] -5 6 | Foo = Literal["foo"] -6 7 | IntOrStr = int | str +1 | from typing import Literal, Any +2 + from typing_extensions import TypeAlias +3 | + - NewAny = Any +4 + NewAny: TypeAlias = Any +5 | OptionalStr = typing.Optional[str] +6 | Foo = Literal["foo"] +7 | IntOrStr = int | str PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `OptionalStr: TypeAlias = typing.Optional[str]` --> PYI026.pyi:4:1 @@ -33,17 +31,15 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `OptionalStr: 6 | IntOrStr = int | str | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 1 | from typing import Literal, Any - 2 |+from typing_extensions import TypeAlias -2 3 | -3 4 | NewAny = Any -4 |-OptionalStr = typing.Optional[str] - 5 |+OptionalStr: TypeAlias = typing.Optional[str] -5 6 | Foo = Literal["foo"] -6 7 | IntOrStr = int | str -7 8 | AliasNone = None +1 | from typing import Literal, Any +2 + from typing_extensions import TypeAlias +3 | +4 | NewAny = Any + - OptionalStr = typing.Optional[str] +5 + OptionalStr: TypeAlias = typing.Optional[str] +6 | Foo = Literal["foo"] +7 | IntOrStr = int | str +8 | AliasNone = None PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `Foo: TypeAlias = Literal["foo"]` --> PYI026.pyi:5:1 @@ -56,18 +52,16 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `Foo: TypeAli 7 | AliasNone = None | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 1 | from typing import Literal, Any - 2 |+from typing_extensions import TypeAlias -2 3 | -3 4 | NewAny = Any -4 5 | OptionalStr = typing.Optional[str] -5 |-Foo = Literal["foo"] - 6 |+Foo: TypeAlias = Literal["foo"] -6 7 | IntOrStr = int | str -7 8 | AliasNone = None -8 9 | +1 | from typing import Literal, Any +2 + from typing_extensions import TypeAlias +3 | +4 | NewAny = Any +5 | OptionalStr = typing.Optional[str] + - Foo = Literal["foo"] +6 + Foo: TypeAlias = Literal["foo"] +7 | IntOrStr = int | str +8 | AliasNone = None +9 | PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `IntOrStr: TypeAlias = int | str` --> PYI026.pyi:6:1 @@ -79,19 +73,17 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `IntOrStr: Ty 7 | AliasNone = None | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 1 | from typing import Literal, Any - 2 |+from typing_extensions import TypeAlias -2 3 | -3 4 | NewAny = Any -4 5 | OptionalStr = typing.Optional[str] -5 6 | Foo = Literal["foo"] -6 |-IntOrStr = int | str - 7 |+IntOrStr: TypeAlias = int | str -7 8 | AliasNone = None -8 9 | -9 10 | NewAny: typing.TypeAlias = Any +1 | from typing import Literal, Any +2 + from typing_extensions import TypeAlias +3 | +4 | NewAny = Any +5 | OptionalStr = typing.Optional[str] +6 | Foo = Literal["foo"] + - IntOrStr = int | str +7 + IntOrStr: TypeAlias = int | str +8 | AliasNone = None +9 | +10 | NewAny: typing.TypeAlias = Any PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `AliasNone: TypeAlias = None` --> PYI026.pyi:7:1 @@ -104,20 +96,18 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `AliasNone: T 9 | NewAny: typing.TypeAlias = Any | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 1 | from typing import Literal, Any - 2 |+from typing_extensions import TypeAlias -2 3 | -3 4 | NewAny = Any -4 5 | OptionalStr = typing.Optional[str] -5 6 | Foo = Literal["foo"] -6 7 | IntOrStr = int | str -7 |-AliasNone = None - 8 |+AliasNone: TypeAlias = None -8 9 | -9 10 | NewAny: typing.TypeAlias = Any -10 11 | OptionalStr: TypeAlias = typing.Optional[str] +1 | from typing import Literal, Any +2 + from typing_extensions import TypeAlias +3 | +4 | NewAny = Any +5 | OptionalStr = typing.Optional[str] +6 | Foo = Literal["foo"] +7 | IntOrStr = int | str + - AliasNone = None +8 + AliasNone: TypeAlias = None +9 | +10 | NewAny: typing.TypeAlias = Any +11 | OptionalStr: TypeAlias = typing.Optional[str] PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `FLAG_THIS: TypeAlias = None` --> PYI026.pyi:17:5 @@ -129,19 +119,17 @@ PYI026 [*] Use `typing_extensions.TypeAlias` for type alias, e.g., `FLAG_THIS: T 19 | # these are ok | help: Add `TypeAlias` annotation - -ℹ Safe fix -1 1 | from typing import Literal, Any - 2 |+from typing_extensions import TypeAlias -2 3 | -3 4 | NewAny = Any -4 5 | OptionalStr = typing.Optional[str] +1 | from typing import Literal, Any +2 + from typing_extensions import TypeAlias +3 | +4 | NewAny = Any +5 | OptionalStr = typing.Optional[str] -------------------------------------------------------------------------------- -14 15 | AliasNone: typing.TypeAlias = None -15 16 | -16 17 | class NotAnEnum: -17 |- FLAG_THIS = None - 18 |+ FLAG_THIS: TypeAlias = None -18 19 | -19 20 | # these are ok -20 21 | from enum import Enum +15 | AliasNone: typing.TypeAlias = None +16 | +17 | class NotAnEnum: + - FLAG_THIS = None +18 + FLAG_THIS: TypeAlias = None +19 | +20 | # these are ok +21 | from enum import Enum diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap index dc91e6c77a..2236235dfb 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.py.snap @@ -9,16 +9,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 5 | ... | help: Replace with `None` - -ℹ Safe fix -1 1 | from typing import Literal, Union -2 2 | -3 3 | -4 |-def func1(arg1: Literal[None]): - 4 |+def func1(arg1: None): -5 5 | ... -6 6 | -7 7 | +1 | from typing import Literal, Union +2 | +3 | + - def func1(arg1: Literal[None]): +4 + def func1(arg1: None): +5 | ... +6 | +7 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:8:25 @@ -28,16 +26,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 9 | ... | help: Replace with `None` - -ℹ Safe fix -5 5 | ... -6 6 | -7 7 | -8 |-def func2(arg1: Literal[None] | int): - 8 |+def func2(arg1: None | int): -9 9 | ... -10 10 | -11 11 | +5 | ... +6 | +7 | + - def func2(arg1: Literal[None] | int): +8 + def func2(arg1: None | int): +9 | ... +10 | +11 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:12:24 @@ -47,16 +43,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 13 | ... | help: Replace with `None` - -ℹ Safe fix -9 9 | ... -10 10 | -11 11 | -12 |-def func3() -> Literal[None]: - 12 |+def func3() -> None: -13 13 | ... -14 14 | -15 15 | +9 | ... +10 | +11 | + - def func3() -> Literal[None]: +12 + def func3() -> None: +13 | ... +14 | +15 | PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` --> PYI061.py:16:30 @@ -66,22 +60,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 17 | ... | help: Replace with `Optional[Literal[...]]` - -ℹ Safe fix -1 |-from typing import Literal, Union - 1 |+from typing import Literal, Union, Optional -2 2 | -3 3 | -4 4 | def func1(arg1: Literal[None]): + - from typing import Literal, Union +1 + from typing import Literal, Union, Optional +2 | +3 | +4 | def func1(arg1: Literal[None]): -------------------------------------------------------------------------------- -13 13 | ... -14 14 | -15 15 | -16 |-def func4(arg1: Literal[int, None, float]): - 16 |+def func4(arg1: Optional[Literal[int, float]]): -17 17 | ... -18 18 | -19 19 | +13 | ... +14 | +15 | + - def func4(arg1: Literal[int, None, float]): +16 + def func4(arg1: Optional[Literal[int, float]]): +17 | ... +18 | +19 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:20:25 @@ -91,16 +83,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 21 | ... | help: Replace with `None` - -ℹ Safe fix -17 17 | ... -18 18 | -19 19 | -20 |-def func5(arg1: Literal[None, None]): - 20 |+def func5(arg1: None): -21 21 | ... -22 22 | -23 23 | +17 | ... +18 | +19 | + - def func5(arg1: Literal[None, None]): +20 + def func5(arg1: None): +21 | ... +22 | +23 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:20:31 @@ -110,16 +100,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 21 | ... | help: Replace with `None` - -ℹ Safe fix -17 17 | ... -18 18 | -19 19 | -20 |-def func5(arg1: Literal[None, None]): - 20 |+def func5(arg1: None): -21 21 | ... -22 22 | -23 23 | +17 | ... +18 | +19 | + - def func5(arg1: Literal[None, None]): +20 + def func5(arg1: None): +21 | ... +22 | +23 | PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` --> PYI061.py:26:5 @@ -132,26 +120,25 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 28 | ]): | help: Replace with `Optional[Literal[...]]` - -ℹ Unsafe fix -1 |-from typing import Literal, Union - 1 |+from typing import Literal, Union, Optional -2 2 | -3 3 | -4 4 | def func1(arg1: Literal[None]): + - from typing import Literal, Union +1 + from typing import Literal, Union, Optional +2 | +3 | +4 | def func1(arg1: Literal[None]): -------------------------------------------------------------------------------- -21 21 | ... -22 22 | -23 23 | -24 |-def func6(arg1: Literal[ -25 |- "hello", -26 |- None # Comment 1 -27 |- , "world" -28 |- ]): - 24 |+def func6(arg1: Optional[Literal["hello", "world"]]): -29 25 | ... -30 26 | -31 27 | +21 | ... +22 | +23 | + - def func6(arg1: Literal[ + - "hello", + - None # Comment 1 + - , "world" + - ]): +24 + def func6(arg1: Optional[Literal["hello", "world"]]): +25 | ... +26 | +27 | +note: This is an unsafe fix and may change runtime behavior PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:33:5 @@ -163,18 +150,17 @@ PYI061 [*] Use `None` rather than `Literal[None]` 35 | ... | help: Replace with `None` - -ℹ Unsafe fix -29 29 | ... -30 30 | -31 31 | -32 |-def func7(arg1: Literal[ -33 |- None # Comment 1 -34 |- ]): - 32 |+def func7(arg1: None): -35 33 | ... -36 34 | -37 35 | +29 | ... +30 | +31 | + - def func7(arg1: Literal[ + - None # Comment 1 + - ]): +32 + def func7(arg1: None): +33 | ... +34 | +35 | +note: This is an unsafe fix and may change runtime behavior PYI061 Use `None` rather than `Literal[None]` --> PYI061.py:38:25 @@ -193,16 +179,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 43 | ... | help: Replace with `None` - -ℹ Safe fix -39 39 | ... -40 40 | -41 41 | -42 |-def func9(arg1: Union[Literal[None], None]): - 42 |+def func9(arg1: Union[None, None]): -43 43 | ... -44 44 | -45 45 | +39 | ... +40 | +41 | + - def func9(arg1: Union[Literal[None], None]): +42 + def func9(arg1: Union[None, None]): +43 | ... +44 | +45 | PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:52:9 @@ -213,16 +197,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 53 | Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" | help: Replace with `None` - -ℹ Safe fix -49 49 | -50 50 | -51 51 | # From flake8-pyi -52 |-Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" - 52 |+None # Y061 None inside "Literal[]" expression. Replace with "None" -53 53 | Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -54 54 | -55 55 | ### +49 | +50 | +51 | # From flake8-pyi + - Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" +52 + None # Y061 None inside "Literal[]" expression. Replace with "None" +53 | Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +54 | +55 | ### PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` --> PYI061.py:53:15 @@ -235,22 +217,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 55 | ### | help: Replace with `Optional[Literal[...]]` - -ℹ Safe fix -1 |-from typing import Literal, Union - 1 |+from typing import Literal, Union, Optional -2 2 | -3 3 | -4 4 | def func1(arg1: Literal[None]): + - from typing import Literal, Union +1 + from typing import Literal, Union, Optional +2 | +3 | +4 | def func1(arg1: Literal[None]): -------------------------------------------------------------------------------- -50 50 | -51 51 | # From flake8-pyi -52 52 | Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" -53 |-Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" - 53 |+Optional[Literal[True]] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -54 54 | -55 55 | ### -56 56 | # The following rules here are slightly subtle, +50 | +51 | # From flake8-pyi +52 | Literal[None] # Y061 None inside "Literal[]" expression. Replace with "None" + - Literal[True, None] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +53 + Optional[Literal[True]] # Y061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +54 | +55 | ### +56 | # The following rules here are slightly subtle, PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:62:9 @@ -262,16 +242,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" | help: Replace with `None` - -ℹ Safe fix -59 59 | -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 |-Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" - 62 |+None # Y061 None inside "Literal[]" expression. Replace with "None" -63 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply +59 | +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... + - Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" +62 + None # Y061 None inside "Literal[]" expression. Replace with "None" +63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.py:62:15 @@ -283,16 +261,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" | help: Replace with `None` - -ℹ Safe fix -59 59 | -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 |-Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" - 62 |+None # Y061 None inside "Literal[]" expression. Replace with "None" -63 63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply +59 | +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... + - Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" +62 + None # Y061 None inside "Literal[]" expression. Replace with "None" +63 | Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` --> PYI061.py:63:12 @@ -305,22 +281,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 65 | # ... but if Y061 and Y062 both apply | help: Replace with `Optional[Literal[...]]` - -ℹ Safe fix -1 |-from typing import Literal, Union - 1 |+from typing import Literal, Union, Optional -2 2 | -3 3 | -4 4 | def func1(arg1: Literal[None]): + - from typing import Literal, Union +1 + from typing import Literal, Union, Optional +2 | +3 | +4 | def func1(arg1: Literal[None]): -------------------------------------------------------------------------------- -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" -63 |-Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" - 63 |+Optional[Literal[1, "foo"]] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... +62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" + - Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +63 + Optional[Literal[1, "foo"]] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` --> PYI061.py:63:25 @@ -333,22 +307,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` 65 | # ... but if Y061 and Y062 both apply | help: Replace with `Optional[Literal[...]]` - -ℹ Safe fix -1 |-from typing import Literal, Union - 1 |+from typing import Literal, Union, Optional -2 2 | -3 3 | -4 4 | def func1(arg1: Literal[None]): + - from typing import Literal, Union +1 + from typing import Literal, Union, Optional +2 | +3 | +4 | def func1(arg1: Literal[None]): -------------------------------------------------------------------------------- -60 60 | # If Y061 and Y062 both apply, but all the duplicate members are None, -61 61 | # only emit Y061... -62 62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" -63 |-Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" - 63 |+Optional[Literal[1, "foo"]] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" -64 64 | -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, +60 | # If Y061 and Y062 both apply, but all the duplicate members are None, +61 | # only emit Y061... +62 | Literal[None, None] # Y061 None inside "Literal[]" expression. Replace with "None" + - Literal[1, None, "foo", None] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +63 + Optional[Literal[1, "foo"]] # Y061 None inside "Literal[]" expression. Replace with "Literal[1, 'foo'] | None" +64 | +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` --> PYI061.py:68:9 @@ -359,22 +331,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Optional[Literal[...]]` - -ℹ Safe fix -1 |-from typing import Literal, Union - 1 |+from typing import Literal, Union, Optional -2 2 | -3 3 | -4 4 | def func1(arg1: Literal[None]): + - from typing import Literal, Union +1 + from typing import Literal, Union, Optional +2 | +3 | +4 | def func1(arg1: Literal[None]): -------------------------------------------------------------------------------- -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, -67 67 | # only emit Y062: -68 |-Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" - 68 |+Optional[Literal[True, True]] # Y062 Duplicate "Literal[]" member "True" -69 69 | -70 70 | -71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, +67 | # only emit Y062: + - Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" +68 + Optional[Literal[True, True]] # Y062 Duplicate "Literal[]" member "True" +69 | +70 | +71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` --> PYI061.py:68:21 @@ -385,22 +355,20 @@ PYI061 [*] Use `Optional[Literal[...]]` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Optional[Literal[...]]` - -ℹ Safe fix -1 |-from typing import Literal, Union - 1 |+from typing import Literal, Union, Optional -2 2 | -3 3 | -4 4 | def func1(arg1: Literal[None]): + - from typing import Literal, Union +1 + from typing import Literal, Union, Optional +2 | +3 | +4 | def func1(arg1: Literal[None]): -------------------------------------------------------------------------------- -65 65 | # ... but if Y061 and Y062 both apply -66 66 | # and there are no None members in the Literal[] slice, -67 67 | # only emit Y062: -68 |-Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" - 68 |+Optional[Literal[True, True]] # Y062 Duplicate "Literal[]" member "True" -69 69 | -70 70 | -71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +65 | # ... but if Y061 and Y062 both apply +66 | # and there are no None members in the Literal[] slice, +67 | # only emit Y062: + - Literal[None, True, None, True] # Y062 Duplicate "Literal[]" member "True" +68 + Optional[Literal[True, True]] # Y062 Duplicate "Literal[]" member "True" +69 | +70 | +71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 PYI061 Use `None` rather than `Literal[None]` --> PYI061.py:72:12 @@ -435,16 +403,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 76 | a: int | Literal[None] | None | help: Replace with `None` - -ℹ Safe fix -71 71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 -72 72 | x: Literal[None] | None -73 73 | y: None | Literal[None] -74 |-z: Union[Literal[None], None] - 74 |+z: Union[None, None] -75 75 | -76 76 | a: int | Literal[None] | None -77 77 | b: None | Literal[None] | None +71 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +72 | x: Literal[None] | None +73 | y: None | Literal[None] + - z: Union[Literal[None], None] +74 + z: Union[None, None] +75 | +76 | a: int | Literal[None] | None +77 | b: None | Literal[None] | None PYI061 Use `None` rather than `Literal[None]` --> PYI061.py:76:18 diff --git a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap index 181432a325..34fbd2eb2b 100644 --- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap +++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__py38_PYI061_PYI061.pyi.snap @@ -8,16 +8,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -1 1 | from typing import Literal, Union -2 2 | -3 3 | -4 |-def func1(arg1: Literal[None]): ... - 4 |+def func1(arg1: None): ... -5 5 | -6 6 | -7 7 | def func2(arg1: Literal[None] | int): ... +1 | from typing import Literal, Union +2 | +3 | + - def func1(arg1: Literal[None]): ... +4 + def func1(arg1: None): ... +5 | +6 | +7 | def func2(arg1: Literal[None] | int): ... PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:7:25 @@ -26,16 +24,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -4 4 | def func1(arg1: Literal[None]): ... -5 5 | -6 6 | -7 |-def func2(arg1: Literal[None] | int): ... - 7 |+def func2(arg1: None | int): ... -8 8 | -9 9 | -10 10 | def func3() -> Literal[None]: ... +4 | def func1(arg1: Literal[None]): ... +5 | +6 | + - def func2(arg1: Literal[None] | int): ... +7 + def func2(arg1: None | int): ... +8 | +9 | +10 | def func3() -> Literal[None]: ... PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:10:24 @@ -44,16 +40,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -7 7 | def func2(arg1: Literal[None] | int): ... -8 8 | -9 9 | -10 |-def func3() -> Literal[None]: ... - 10 |+def func3() -> None: ... -11 11 | -12 12 | -13 13 | def func4(arg1: Literal[int, None, float]): ... +7 | def func2(arg1: Literal[None] | int): ... +8 | +9 | + - def func3() -> Literal[None]: ... +10 + def func3() -> None: ... +11 | +12 | +13 | def func4(arg1: Literal[int, None, float]): ... PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.pyi:13:30 @@ -62,16 +56,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Literal[...] | None` - -ℹ Safe fix -10 10 | def func3() -> Literal[None]: ... -11 11 | -12 12 | -13 |-def func4(arg1: Literal[int, None, float]): ... - 13 |+def func4(arg1: Literal[int, float] | None): ... -14 14 | -15 15 | -16 16 | def func5(arg1: Literal[None, None]): ... +10 | def func3() -> Literal[None]: ... +11 | +12 | + - def func4(arg1: Literal[int, None, float]): ... +13 + def func4(arg1: Literal[int, float] | None): ... +14 | +15 | +16 | def func5(arg1: Literal[None, None]): ... PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:16:25 @@ -80,16 +72,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -13 13 | def func4(arg1: Literal[int, None, float]): ... -14 14 | -15 15 | -16 |-def func5(arg1: Literal[None, None]): ... - 16 |+def func5(arg1: None): ... -17 17 | -18 18 | -19 19 | def func6(arg1: Literal[ +13 | def func4(arg1: Literal[int, None, float]): ... +14 | +15 | + - def func5(arg1: Literal[None, None]): ... +16 + def func5(arg1: None): ... +17 | +18 | +19 | def func6(arg1: Literal[ PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:16:31 @@ -98,16 +88,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -13 13 | def func4(arg1: Literal[int, None, float]): ... -14 14 | -15 15 | -16 |-def func5(arg1: Literal[None, None]): ... - 16 |+def func5(arg1: None): ... -17 17 | -18 18 | -19 19 | def func6(arg1: Literal[ +13 | def func4(arg1: Literal[int, None, float]): ... +14 | +15 | + - def func5(arg1: Literal[None, None]): ... +16 + def func5(arg1: None): ... +17 | +18 | +19 | def func6(arg1: Literal[ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.pyi:21:5 @@ -120,20 +108,19 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` 23 | ]): ... | help: Replace with `Literal[...] | None` - -ℹ Unsafe fix -16 16 | def func5(arg1: Literal[None, None]): ... -17 17 | -18 18 | -19 |-def func6(arg1: Literal[ -20 |- "hello", -21 |- None # Comment 1 -22 |- , "world" -23 |-]): ... - 19 |+def func6(arg1: Literal["hello", "world"] | None): ... -24 20 | -25 21 | -26 22 | def func7(arg1: Literal[ +16 | def func5(arg1: Literal[None, None]): ... +17 | +18 | + - def func6(arg1: Literal[ + - "hello", + - None # Comment 1 + - , "world" + - ]): ... +19 + def func6(arg1: Literal["hello", "world"] | None): ... +20 | +21 | +22 | def func7(arg1: Literal[ +note: This is an unsafe fix and may change runtime behavior PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:27:5 @@ -144,18 +131,17 @@ PYI061 [*] Use `None` rather than `Literal[None]` 28 | ]): ... | help: Replace with `None` - -ℹ Unsafe fix -23 23 | ]): ... -24 24 | -25 25 | -26 |-def func7(arg1: Literal[ -27 |- None # Comment 1 -28 |-]): ... - 26 |+def func7(arg1: None): ... -29 27 | -30 28 | -31 29 | def func8(arg1: Literal[None] | None):... +23 | ]): ... +24 | +25 | + - def func7(arg1: Literal[ + - None # Comment 1 + - ]): ... +26 + def func7(arg1: None): ... +27 | +28 | +29 | def func8(arg1: Literal[None] | None):... +note: This is an unsafe fix and may change runtime behavior PYI061 Use `None` rather than `Literal[None]` --> PYI061.pyi:31:25 @@ -172,16 +158,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` | ^^^^ | help: Replace with `None` - -ℹ Safe fix -31 31 | def func8(arg1: Literal[None] | None):... -32 32 | -33 33 | -34 |-def func9(arg1: Union[Literal[None], None]): ... - 34 |+def func9(arg1: Union[None, None]): ... -35 35 | -36 36 | -37 37 | # OK +31 | def func8(arg1: Literal[None] | None):... +32 | +33 | + - def func9(arg1: Union[Literal[None], None]): ... +34 + def func9(arg1: Union[None, None]): ... +35 | +36 | +37 | # OK PYI061 [*] Use `None` rather than `Literal[None]` --> PYI061.pyi:42:9 @@ -192,16 +176,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 43 | Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" | help: Replace with `None` - -ℹ Safe fix -39 39 | -40 40 | -41 41 | # From flake8-pyi -42 |-Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" - 42 |+None # PYI061 None inside "Literal[]" expression. Replace with "None" -43 43 | Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -44 44 | -45 45 | +39 | +40 | +41 | # From flake8-pyi + - Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" +42 + None # PYI061 None inside "Literal[]" expression. Replace with "None" +43 | Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +44 | +45 | PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` --> PYI061.pyi:43:15 @@ -212,16 +194,14 @@ PYI061 [*] Use `Literal[...] | None` rather than `Literal[None, ...]` | ^^^^ | help: Replace with `Literal[...] | None` - -ℹ Safe fix -40 40 | -41 41 | # From flake8-pyi -42 42 | Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" -43 |-Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" - 43 |+Literal[True] | None # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" -44 44 | -45 45 | -46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +40 | +41 | # From flake8-pyi +42 | Literal[None] # PYI061 None inside "Literal[]" expression. Replace with "None" + - Literal[True, None] # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +43 + Literal[True] | None # PYI061 None inside "Literal[]" expression. Replace with "Literal[True] | None" +44 | +45 | +46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 PYI061 Use `None` rather than `Literal[None]` --> PYI061.pyi:47:12 @@ -256,16 +236,14 @@ PYI061 [*] Use `None` rather than `Literal[None]` 51 | a: int | Literal[None] | None | help: Replace with `None` - -ℹ Safe fix -46 46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 -47 47 | x: Literal[None] | None -48 48 | y: None | Literal[None] -49 |-z: Union[Literal[None], None] - 49 |+z: Union[None, None] -50 50 | -51 51 | a: int | Literal[None] | None -52 52 | b: None | Literal[None] | None +46 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +47 | x: Literal[None] | None +48 | y: None | Literal[None] + - z: Union[Literal[None], None] +49 + z: Union[None, None] +50 | +51 | a: int | Literal[None] | None +52 | b: None | Literal[None] | None PYI061 Use `None` rather than `Literal[None]` --> PYI061.pyi:51:18 diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap index d362d1787e..bb9555c212 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_default.snap @@ -10,16 +10,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 16 | return 42 | help: Remove parentheses - -ℹ Safe fix -11 11 | return 42 -12 12 | -13 13 | -14 |-@pytest.fixture() - 14 |+@pytest.fixture -15 15 | def parentheses_no_params(): -16 16 | return 42 -17 17 | +11 | return 42 +12 | +13 | + - @pytest.fixture() +14 + @pytest.fixture +15 | def parentheses_no_params(): +16 | return 42 +17 | PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:24:1 @@ -32,18 +30,16 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 28 | return 42 | help: Remove parentheses - -ℹ Safe fix -21 21 | return 42 -22 22 | -23 23 | -24 |-@pytest.fixture( -25 |- -26 |-) - 24 |+@pytest.fixture -27 25 | def parentheses_no_params_multiline(): -28 26 | return 42 -29 27 | +21 | return 42 +22 | +23 | + - @pytest.fixture( + - + - ) +24 + @pytest.fixture +25 | def parentheses_no_params_multiline(): +26 | return 42 +27 | PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:39:1 @@ -54,16 +50,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 41 | return 42 | help: Remove parentheses - -ℹ Safe fix -36 36 | return 42 -37 37 | -38 38 | -39 |-@fixture() - 39 |+@fixture -40 40 | def imported_from_parentheses_no_params(): -41 41 | return 42 -42 42 | +36 | return 42 +37 | +38 | + - @fixture() +39 + @fixture +40 | def imported_from_parentheses_no_params(): +41 | return 42 +42 | PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:49:1 @@ -76,18 +70,16 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 53 | return 42 | help: Remove parentheses - -ℹ Safe fix -46 46 | return 42 -47 47 | -48 48 | -49 |-@fixture( -50 |- -51 |-) - 49 |+@fixture -52 50 | def imported_from_parentheses_no_params_multiline(): -53 51 | return 42 -54 52 | +46 | return 42 +47 | +48 | + - @fixture( + - + - ) +49 + @fixture +50 | def imported_from_parentheses_no_params_multiline(): +51 | return 42 +52 | PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:64:1 @@ -98,16 +90,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 66 | return 42 | help: Remove parentheses - -ℹ Safe fix -61 61 | return 42 -62 62 | -63 63 | -64 |-@aliased() - 64 |+@aliased -65 65 | def aliased_parentheses_no_params(): -66 66 | return 42 -67 67 | +61 | return 42 +62 | +63 | + - @aliased() +64 + @aliased +65 | def aliased_parentheses_no_params(): +66 | return 42 +67 | PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:74:1 @@ -120,18 +110,16 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 78 | return 42 | help: Remove parentheses - -ℹ Safe fix -71 71 | return 42 -72 72 | -73 73 | -74 |-@aliased( -75 |- -76 |-) - 74 |+@aliased -77 75 | def aliased_parentheses_no_params_multiline(): -78 76 | return 42 -79 77 | +71 | return 42 +72 | +73 | + - @aliased( + - + - ) +74 + @aliased +75 | def aliased_parentheses_no_params_multiline(): +76 | return 42 +77 | PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:81:1 @@ -145,19 +133,18 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 85 | def my_fixture(): ... | help: Remove parentheses - -ℹ Unsafe fix -78 78 | return 42 -79 79 | -80 80 | # https://github.com/astral-sh/ruff/issues/18770 -81 |-@pytest.fixture( -82 |- # TODO: use module scope -83 |- # scope="module" -84 |-) - 81 |+@pytest.fixture -85 82 | def my_fixture(): ... -86 83 | -87 84 | +78 | return 42 +79 | +80 | # https://github.com/astral-sh/ruff/issues/18770 + - @pytest.fixture( + - # TODO: use module scope + - # scope="module" + - ) +81 + @pytest.fixture +82 | def my_fixture(): ... +83 | +84 | +note: This is an unsafe fix and may change runtime behavior PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:88:1 @@ -168,16 +155,14 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 90 | return 42 | help: Remove parentheses - -ℹ Safe fix -85 85 | def my_fixture(): ... -86 86 | -87 87 | -88 |-@(pytest.fixture()) - 88 |+@(pytest.fixture) -89 89 | def outer_paren_fixture_no_params(): -90 90 | return 42 -91 91 | +85 | def my_fixture(): ... +86 | +87 | + - @(pytest.fixture()) +88 + @(pytest.fixture) +89 | def outer_paren_fixture_no_params(): +90 | return 42 +91 | PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` --> PT001.py:93:1 @@ -188,12 +173,10 @@ PT001 [*] Use `@pytest.fixture` over `@pytest.fixture()` 95 | return 42 | help: Remove parentheses - -ℹ Safe fix -90 90 | return 42 -91 91 | -92 92 | -93 |-@(fixture()) - 93 |+@(fixture) -94 94 | def outer_paren_imported_fixture_no_params(): -95 95 | return 42 +90 | return 42 +91 | +92 | + - @(fixture()) +93 + @(fixture) +94 | def outer_paren_imported_fixture_no_params(): +95 | return 42 diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap index 1ed682df4c..52c9042aba 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT001_parentheses.snap @@ -10,16 +10,14 @@ PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture` 11 | return 42 | help: Add parentheses - -ℹ Safe fix -6 6 | # `import pytest` -7 7 | -8 8 | -9 |-@pytest.fixture - 9 |+@pytest.fixture() -10 10 | def no_parentheses(): -11 11 | return 42 -12 12 | +6 | # `import pytest` +7 | +8 | + - @pytest.fixture +9 + @pytest.fixture() +10 | def no_parentheses(): +11 | return 42 +12 | PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture` --> PT001.py:34:1 @@ -30,16 +28,14 @@ PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture` 36 | return 42 | help: Add parentheses - -ℹ Safe fix -31 31 | # `from pytest import fixture` -32 32 | -33 33 | -34 |-@fixture - 34 |+@fixture() -35 35 | def imported_from_no_parentheses(): -36 36 | return 42 -37 37 | +31 | # `from pytest import fixture` +32 | +33 | + - @fixture +34 + @fixture() +35 | def imported_from_no_parentheses(): +36 | return 42 +37 | PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture` --> PT001.py:59:1 @@ -50,13 +46,11 @@ PT001 [*] Use `@pytest.fixture()` over `@pytest.fixture` 61 | return 42 | help: Add parentheses - -ℹ Safe fix -56 56 | # `from pytest import fixture as aliased` -57 57 | -58 58 | -59 |-@aliased - 59 |+@aliased() -60 60 | def aliased_no_parentheses(): -61 61 | return 42 -62 62 | +56 | # `from pytest import fixture as aliased` +57 | +58 | + - @aliased +59 + @aliased() +60 | def aliased_no_parentheses(): +61 | return 42 +62 | diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap index 3ad32a399f..478048f99f 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT003.snap @@ -10,16 +10,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 16 | ... | help: Remove implied `scope` argument - -ℹ Unsafe fix -11 11 | ... -12 12 | -13 13 | -14 |-@pytest.fixture(scope="function") - 14 |+@pytest.fixture() -15 15 | def error(): -16 16 | ... -17 17 | +11 | ... +12 | +13 | + - @pytest.fixture(scope="function") +14 + @pytest.fixture() +15 | def error(): +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior PT003 [*] `scope='function'` is implied in `@pytest.fixture()` --> PT003.py:19:17 @@ -30,16 +29,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 21 | ... | help: Remove implied `scope` argument - -ℹ Unsafe fix -16 16 | ... -17 17 | -18 18 | -19 |-@pytest.fixture(scope="function", name="my_fixture") - 19 |+@pytest.fixture(name="my_fixture") -20 20 | def error_multiple_args(): -21 21 | ... -22 22 | +16 | ... +17 | +18 | + - @pytest.fixture(scope="function", name="my_fixture") +19 + @pytest.fixture(name="my_fixture") +20 | def error_multiple_args(): +21 | ... +22 | +note: This is an unsafe fix and may change runtime behavior PT003 [*] `scope='function'` is implied in `@pytest.fixture()` --> PT003.py:24:36 @@ -50,16 +48,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 26 | ... | help: Remove implied `scope` argument - -ℹ Unsafe fix -21 21 | ... -22 22 | -23 23 | -24 |-@pytest.fixture(name="my_fixture", scope="function") - 24 |+@pytest.fixture(name="my_fixture") -25 25 | def error_multiple_args(): -26 26 | ... -27 27 | +21 | ... +22 | +23 | + - @pytest.fixture(name="my_fixture", scope="function") +24 + @pytest.fixture(name="my_fixture") +25 | def error_multiple_args(): +26 | ... +27 | +note: This is an unsafe fix and may change runtime behavior PT003 [*] `scope='function'` is implied in `@pytest.fixture()` --> PT003.py:29:36 @@ -70,16 +67,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 31 | ... | help: Remove implied `scope` argument - -ℹ Unsafe fix -26 26 | ... -27 27 | -28 28 | -29 |-@pytest.fixture(name="my_fixture", scope="function", **kwargs) - 29 |+@pytest.fixture(name="my_fixture", **kwargs) -30 30 | def error_second_arg(): -31 31 | ... -32 32 | +26 | ... +27 | +28 | + - @pytest.fixture(name="my_fixture", scope="function", **kwargs) +29 + @pytest.fixture(name="my_fixture", **kwargs) +30 | def error_second_arg(): +31 | ... +32 | +note: This is an unsafe fix and may change runtime behavior PT003 [*] `scope='function'` is implied in `@pytest.fixture()` --> PT003.py:37:31 @@ -92,16 +88,15 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 39 | ... | help: Remove implied `scope` argument - -ℹ Unsafe fix -34 34 | # pytest.fixture does not take positional arguments, however this -35 35 | # tests the general case as we use a helper function that should -36 36 | # work for all cases. -37 |-@pytest.fixture("my_fixture", scope="function") - 37 |+@pytest.fixture("my_fixture") -38 38 | def error_arg(): -39 39 | ... -40 40 | +34 | # pytest.fixture does not take positional arguments, however this +35 | # tests the general case as we use a helper function that should +36 | # work for all cases. + - @pytest.fixture("my_fixture", scope="function") +37 + @pytest.fixture("my_fixture") +38 | def error_arg(): +39 | ... +40 | +note: This is an unsafe fix and may change runtime behavior PT003 [*] `scope='function'` is implied in `@pytest.fixture()` --> PT003.py:43:5 @@ -113,15 +108,14 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 45 | ) | help: Remove implied `scope` argument - -ℹ Unsafe fix -40 40 | -41 41 | -42 42 | @pytest.fixture( -43 |- scope="function", -44 43 | name="my_fixture", -45 44 | ) -46 45 | def error_multiple_args(): +40 | +41 | +42 | @pytest.fixture( + - scope="function", +43 | name="my_fixture", +44 | ) +45 | def error_multiple_args(): +note: This is an unsafe fix and may change runtime behavior PT003 [*] `scope='function'` is implied in `@pytest.fixture()` --> PT003.py:52:5 @@ -134,15 +128,14 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 54 | def error_multiple_args(): | help: Remove implied `scope` argument - -ℹ Unsafe fix -49 49 | -50 50 | @pytest.fixture( -51 51 | name="my_fixture", -52 |- scope="function", -53 52 | ) -54 53 | def error_multiple_args(): -55 54 | ... +49 | +50 | @pytest.fixture( +51 | name="my_fixture", + - scope="function", +52 | ) +53 | def error_multiple_args(): +54 | ... +note: This is an unsafe fix and may change runtime behavior PT003 [*] `scope='function'` is implied in `@pytest.fixture()` --> PT003.py:66:5 @@ -155,15 +148,14 @@ PT003 [*] `scope='function'` is implied in `@pytest.fixture()` 68 | , | help: Remove implied `scope` argument - -ℹ Unsafe fix -63 63 | -64 64 | # another comment ,) -65 65 | -66 |- scope=\ -67 |- "function" # some comment ), -68 |- , -69 |- -70 66 | name2=name, name3="my_fixture", **kwargs -71 67 | ) -72 68 | def error_multiple_args(): +63 | +64 | # another comment ,) +65 | + - scope=\ + - "function" # some comment ), + - , + - +66 | name2=name, name3="my_fixture", **kwargs +67 | ) +68 | def error_multiple_args(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap index f8419f3b59..4792979b82 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_and_PT007.snap @@ -12,14 +12,12 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 5 | ... | help: Use a string for the first argument - -ℹ Safe fix -1 1 | import pytest -2 2 | -3 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 3 |+@pytest.mark.parametrize("param", [1, 2]) -4 4 | def test_PT006_and_PT007_do_not_conflict(param): -5 5 | ... +1 | import pytest +2 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +3 + @pytest.mark.parametrize("param", [1, 2]) +4 | def test_PT006_and_PT007_do_not_conflict(param): +5 | ... PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT006_and_PT007.py:3:39 @@ -32,14 +30,13 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 5 | ... | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -1 1 | import pytest -2 2 | -3 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 3 |+@pytest.mark.parametrize(("param",), [(1,), [2]]) -4 4 | def test_PT006_and_PT007_do_not_conflict(param): -5 5 | ... +1 | import pytest +2 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +3 + @pytest.mark.parametrize(("param",), [(1,), [2]]) +4 | def test_PT006_and_PT007_do_not_conflict(param): +5 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT006_and_PT007.py:3:44 @@ -52,11 +49,10 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 5 | ... | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -1 1 | import pytest -2 2 | -3 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 3 |+@pytest.mark.parametrize(("param",), [[1], (2,)]) -4 4 | def test_PT006_and_PT007_do_not_conflict(param): -5 5 | ... +1 | import pytest +2 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +3 + @pytest.mark.parametrize(("param",), [[1], (2,)]) +4 | def test_PT006_and_PT007_do_not_conflict(param): +5 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap index def0e46f71..ba76432fe1 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_csv.snap @@ -10,16 +10,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 26 | ... | help: Use a string of comma-separated values for the first argument - -ℹ Unsafe fix -21 21 | ... -22 22 | -23 23 | -24 |-@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) - 24 |+@pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)]) -25 25 | def test_tuple(param1, param2): -26 26 | ... -27 27 | +21 | ... +22 | +23 | + - @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +24 + @pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)]) +25 | def test_tuple(param1, param2): +26 | ... +27 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:29:26 @@ -30,16 +29,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 31 | ... | help: Use a string for the first argument - -ℹ Safe fix -26 26 | ... -27 27 | -28 28 | -29 |-@pytest.mark.parametrize(("param1",), [1, 2, 3]) - 29 |+@pytest.mark.parametrize("param1", [1, 2, 3]) -30 30 | def test_tuple_one_elem(param1, param2): -31 31 | ... -32 32 | +26 | ... +27 | +28 | + - @pytest.mark.parametrize(("param1",), [1, 2, 3]) +29 + @pytest.mark.parametrize("param1", [1, 2, 3]) +30 | def test_tuple_one_elem(param1, param2): +31 | ... +32 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected a string of comma-separated values --> PT006.py:34:26 @@ -50,16 +47,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 36 | ... | help: Use a string of comma-separated values for the first argument - -ℹ Unsafe fix -31 31 | ... -32 32 | -33 33 | -34 |-@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) - 34 |+@pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)]) -35 35 | def test_list(param1, param2): -36 36 | ... -37 37 | +31 | ... +32 | +33 | + - @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +34 + @pytest.mark.parametrize("param1, param2", [(1, 2), (3, 4)]) +35 | def test_list(param1, param2): +36 | ... +37 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:39:26 @@ -70,16 +66,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 41 | ... | help: Use a string for the first argument - -ℹ Safe fix -36 36 | ... -37 37 | -38 38 | -39 |-@pytest.mark.parametrize(["param1"], [1, 2, 3]) - 39 |+@pytest.mark.parametrize("param1", [1, 2, 3]) -40 40 | def test_list_one_elem(param1, param2): -41 41 | ... -42 42 | +36 | ... +37 | +38 | + - @pytest.mark.parametrize(["param1"], [1, 2, 3]) +39 + @pytest.mark.parametrize("param1", [1, 2, 3]) +40 | def test_list_one_elem(param1, param2): +41 | ... +42 | PT006 Wrong type passed to first argument of `pytest.mark.parametrize`; expected a string of comma-separated values --> PT006.py:44:26 @@ -110,16 +104,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 88 | ... | help: Use a string for the first argument - -ℹ Safe fix -83 83 | ... -84 84 | -85 85 | -86 |-@pytest.mark.parametrize(("param",), [(1,), (2,)]) - 86 |+@pytest.mark.parametrize("param", [1, 2]) -87 87 | def test_single_element_tuple(param): -88 88 | ... -89 89 | +83 | ... +84 | +85 | + - @pytest.mark.parametrize(("param",), [(1,), (2,)]) +86 + @pytest.mark.parametrize("param", [1, 2]) +87 | def test_single_element_tuple(param): +88 | ... +89 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:91:26 @@ -130,16 +122,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 93 | ... | help: Use a string for the first argument - -ℹ Safe fix -88 88 | ... -89 89 | -90 90 | -91 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 91 |+@pytest.mark.parametrize("param", [1, 2]) -92 92 | def test_single_element_list(param): -93 93 | ... -94 94 | +88 | ... +89 | +90 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +91 + @pytest.mark.parametrize("param", [1, 2]) +92 | def test_single_element_list(param): +93 | ... +94 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:96:26 @@ -150,16 +140,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 98 | ... | help: Use a string for the first argument - -ℹ Safe fix -93 93 | ... -94 94 | -95 95 | -96 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 96 |+@pytest.mark.parametrize("param", [1, 2]) -97 97 | def test_single_element_list(param): -98 98 | ... -99 99 | +93 | ... +94 | +95 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +96 + @pytest.mark.parametrize("param", [1, 2]) +97 | def test_single_element_list(param): +98 | ... +99 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:103:5 @@ -175,21 +163,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 108 | ) | help: Use a string for the first argument - -ℹ Unsafe fix -100 100 | -101 101 | # Unsafe fix -102 102 | @pytest.mark.parametrize( -103 |- ( -104 |- # comment -105 |- "param", -106 |- ), -107 |- [[1], [2]], - 103 |+ "param", - 104 |+ [1, 2], -108 105 | ) -109 106 | def test_comment_in_argnames(param): -110 107 | ... +100 | +101 | # Unsafe fix +102 | @pytest.mark.parametrize( + - ( + - # comment + - "param", + - ), + - [[1], [2]], +103 + "param", +104 + [1, 2], +105 | ) +106 | def test_comment_in_argnames(param): +107 | ... +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:114:5 @@ -202,24 +189,23 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 116 | ( | help: Use a string for the first argument - -ℹ Unsafe fix -111 111 | -112 112 | # Unsafe fix -113 113 | @pytest.mark.parametrize( -114 |- ("param",), - 114 |+ "param", -115 115 | [ -116 |- ( -117 |- # comment -118 |- 1, -119 |- ), -120 |- (2,), - 116 |+ 1, - 117 |+ 2, -121 118 | ], -122 119 | ) -123 120 | def test_comment_in_argvalues(param): +111 | +112 | # Unsafe fix +113 | @pytest.mark.parametrize( + - ("param",), +114 + "param", +115 | [ + - ( + - # comment + - 1, + - ), + - (2,), +116 + 1, +117 + 2, +118 | ], +119 | ) +120 | def test_comment_in_argvalues(param): +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:129:5 @@ -232,22 +218,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 131 | (1,), | help: Use a string for the first argument - -ℹ Safe fix -126 126 | -127 127 | # Safe fix -128 128 | @pytest.mark.parametrize( -129 |- ("param",), - 129 |+ "param", -130 130 | [ -131 |- (1,), - 131 |+ 1, -132 132 | # comment -133 |- (2,), - 133 |+ 2, -134 134 | ], -135 135 | ) -136 136 | def test_comment_between_argvalues_items(param): +126 | +127 | # Safe fix +128 | @pytest.mark.parametrize( + - ("param",), +129 + "param", +130 | [ + - (1,), +131 + 1, +132 | # comment + - (2,), +133 + 2, +134 | ], +135 | ) +136 | def test_comment_between_argvalues_items(param): PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:142:5 @@ -260,13 +244,11 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 144 | (1,), | help: Use a string for the first argument - -ℹ Safe fix -139 139 | -140 140 | # A fix should be suggested for `argnames`, but not for `argvalues`. -141 141 | @pytest.mark.parametrize( -142 |- ("param",), - 142 |+ "param", -143 143 | [ -144 144 | (1,), -145 145 | (2, 3), +139 | +140 | # A fix should be suggested for `argnames`, but not for `argvalues`. +141 | @pytest.mark.parametrize( + - ("param",), +142 + "param", +143 | [ +144 | (1,), +145 | (2, 3), diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap index c444562708..518ee826db 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_default.snap @@ -10,16 +10,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 11 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -6 6 | ... -7 7 | -8 8 | -9 |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) - 9 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) -10 10 | def test_csv(param1, param2): -11 11 | ... -12 12 | +6 | ... +7 | +8 | + - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) +9 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +10 | def test_csv(param1, param2): +11 | ... +12 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:14:26 @@ -30,16 +29,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 16 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -11 11 | ... -12 12 | -13 13 | -14 |-@pytest.mark.parametrize(" param1, , param2 , ", [(1, 2), (3, 4)]) - 14 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) -15 15 | def test_csv_with_whitespace(param1, param2): -16 16 | ... -17 17 | +11 | ... +12 | +13 | + - @pytest.mark.parametrize(" param1, , param2 , ", [(1, 2), (3, 4)]) +14 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +15 | def test_csv_with_whitespace(param1, param2): +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:19:26 @@ -50,16 +48,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 21 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -16 16 | ... -17 17 | -18 18 | -19 |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) - 19 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) -20 20 | def test_csv_bad_quotes(param1, param2): -21 21 | ... -22 22 | +16 | ... +17 | +18 | + - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) +19 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +20 | def test_csv_bad_quotes(param1, param2): +21 | ... +22 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:29:26 @@ -70,16 +67,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 31 | ... | help: Use a string for the first argument - -ℹ Safe fix -26 26 | ... -27 27 | -28 28 | -29 |-@pytest.mark.parametrize(("param1",), [1, 2, 3]) - 29 |+@pytest.mark.parametrize("param1", [1, 2, 3]) -30 30 | def test_tuple_one_elem(param1, param2): -31 31 | ... -32 32 | +26 | ... +27 | +28 | + - @pytest.mark.parametrize(("param1",), [1, 2, 3]) +29 + @pytest.mark.parametrize("param1", [1, 2, 3]) +30 | def test_tuple_one_elem(param1, param2): +31 | ... +32 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:34:26 @@ -90,16 +85,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 36 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -31 31 | ... -32 32 | -33 33 | -34 |-@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) - 34 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) -35 35 | def test_list(param1, param2): -36 36 | ... -37 37 | +31 | ... +32 | +33 | + - @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +34 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +35 | def test_list(param1, param2): +36 | ... +37 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:39:26 @@ -110,16 +104,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 41 | ... | help: Use a string for the first argument - -ℹ Safe fix -36 36 | ... -37 37 | -38 38 | -39 |-@pytest.mark.parametrize(["param1"], [1, 2, 3]) - 39 |+@pytest.mark.parametrize("param1", [1, 2, 3]) -40 40 | def test_list_one_elem(param1, param2): -41 41 | ... -42 42 | +36 | ... +37 | +38 | + - @pytest.mark.parametrize(["param1"], [1, 2, 3]) +39 + @pytest.mark.parametrize("param1", [1, 2, 3]) +40 | def test_list_one_elem(param1, param2): +41 | ... +42 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:44:26 @@ -130,16 +122,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 46 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -41 41 | ... -42 42 | -43 43 | -44 |-@pytest.mark.parametrize([some_expr, another_expr], [1, 2, 3]) - 44 |+@pytest.mark.parametrize((some_expr, another_expr), [1, 2, 3]) -45 45 | def test_list_expressions(param1, param2): -46 46 | ... -47 47 | +41 | ... +42 | +43 | + - @pytest.mark.parametrize([some_expr, another_expr], [1, 2, 3]) +44 + @pytest.mark.parametrize((some_expr, another_expr), [1, 2, 3]) +45 | def test_list_expressions(param1, param2): +46 | ... +47 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:49:26 @@ -150,16 +141,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 51 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -46 46 | ... -47 47 | -48 48 | -49 |-@pytest.mark.parametrize([some_expr, "param2"], [1, 2, 3]) - 49 |+@pytest.mark.parametrize((some_expr, "param2"), [1, 2, 3]) -50 50 | def test_list_mixed_expr_literal(param1, param2): -51 51 | ... -52 52 | +46 | ... +47 | +48 | + - @pytest.mark.parametrize([some_expr, "param2"], [1, 2, 3]) +49 + @pytest.mark.parametrize((some_expr, "param2"), [1, 2, 3]) +50 | def test_list_mixed_expr_literal(param1, param2): +51 | ... +52 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:54:26 @@ -170,16 +160,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 56 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -51 51 | ... -52 52 | -53 53 | -54 |-@pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)]) - 54 |+@pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)]) -55 55 | def test_implicit_str_concat_with_parens(param1, param2, param3): -56 56 | ... -57 57 | +51 | ... +52 | +53 | + - @pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)]) +54 + @pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)]) +55 | def test_implicit_str_concat_with_parens(param1, param2, param3): +56 | ... +57 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:59:26 @@ -190,16 +179,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 61 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -56 56 | ... -57 57 | -58 58 | -59 |-@pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)]) - 59 |+@pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)]) -60 60 | def test_implicit_str_concat_no_parens(param1, param2, param3): -61 61 | ... -62 62 | +56 | ... +57 | +58 | + - @pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)]) +59 + @pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)]) +60 | def test_implicit_str_concat_no_parens(param1, param2, param3): +61 | ... +62 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:64:26 @@ -210,16 +198,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 66 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -61 61 | ... -62 62 | -63 63 | -64 |-@pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)]) - 64 |+@pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)]) -65 65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3): -66 66 | ... -67 67 | +61 | ... +62 | +63 | + - @pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)]) +64 + @pytest.mark.parametrize(("param1", "param2", "param3"), [(1, 2, 3), (4, 5, 6)]) +65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3): +66 | ... +67 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:69:26 @@ -230,16 +217,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 71 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -66 66 | ... -67 67 | -68 68 | -69 |-@pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) - 69 |+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) -70 70 | def test_csv_with_parens(param1, param2): -71 71 | ... -72 72 | +66 | ... +67 | +68 | + - @pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) +69 + @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +70 | def test_csv_with_parens(param1, param2): +71 | ... +72 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:74:39 @@ -250,16 +236,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 76 | @parametrize | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -71 71 | ... -72 72 | -73 73 | -74 |-parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) - 74 |+parametrize = pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) -75 75 | -76 76 | @parametrize -77 77 | def test_not_decorator(param1, param2): +71 | ... +72 | +73 | + - parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) +74 + parametrize = pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +75 | +76 | @parametrize +77 | def test_not_decorator(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple` --> PT006.py:81:35 @@ -270,16 +255,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 83 | ... | help: Use a `tuple` for the first argument - -ℹ Unsafe fix -78 78 | ... -79 79 | -80 80 | -81 |-@pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)]) - 81 |+@pytest.mark.parametrize(argnames=("param1", "param2"), argvalues=[(1, 2), (3, 4)]) -82 82 | def test_keyword_arguments(param1, param2): -83 83 | ... -84 84 | +78 | ... +79 | +80 | + - @pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)]) +81 + @pytest.mark.parametrize(argnames=("param1", "param2"), argvalues=[(1, 2), (3, 4)]) +82 | def test_keyword_arguments(param1, param2): +83 | ... +84 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:86:26 @@ -290,16 +274,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 88 | ... | help: Use a string for the first argument - -ℹ Safe fix -83 83 | ... -84 84 | -85 85 | -86 |-@pytest.mark.parametrize(("param",), [(1,), (2,)]) - 86 |+@pytest.mark.parametrize("param", [1, 2]) -87 87 | def test_single_element_tuple(param): -88 88 | ... -89 89 | +83 | ... +84 | +85 | + - @pytest.mark.parametrize(("param",), [(1,), (2,)]) +86 + @pytest.mark.parametrize("param", [1, 2]) +87 | def test_single_element_tuple(param): +88 | ... +89 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:91:26 @@ -310,16 +292,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 93 | ... | help: Use a string for the first argument - -ℹ Safe fix -88 88 | ... -89 89 | -90 90 | -91 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 91 |+@pytest.mark.parametrize("param", [1, 2]) -92 92 | def test_single_element_list(param): -93 93 | ... -94 94 | +88 | ... +89 | +90 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +91 + @pytest.mark.parametrize("param", [1, 2]) +92 | def test_single_element_list(param): +93 | ... +94 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:96:26 @@ -330,16 +310,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 98 | ... | help: Use a string for the first argument - -ℹ Safe fix -93 93 | ... -94 94 | -95 95 | -96 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 96 |+@pytest.mark.parametrize("param", [1, 2]) -97 97 | def test_single_element_list(param): -98 98 | ... -99 99 | +93 | ... +94 | +95 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +96 + @pytest.mark.parametrize("param", [1, 2]) +97 | def test_single_element_list(param): +98 | ... +99 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:103:5 @@ -355,21 +333,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 108 | ) | help: Use a string for the first argument - -ℹ Unsafe fix -100 100 | -101 101 | # Unsafe fix -102 102 | @pytest.mark.parametrize( -103 |- ( -104 |- # comment -105 |- "param", -106 |- ), -107 |- [[1], [2]], - 103 |+ "param", - 104 |+ [1, 2], -108 105 | ) -109 106 | def test_comment_in_argnames(param): -110 107 | ... +100 | +101 | # Unsafe fix +102 | @pytest.mark.parametrize( + - ( + - # comment + - "param", + - ), + - [[1], [2]], +103 + "param", +104 + [1, 2], +105 | ) +106 | def test_comment_in_argnames(param): +107 | ... +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:114:5 @@ -382,24 +359,23 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 116 | ( | help: Use a string for the first argument - -ℹ Unsafe fix -111 111 | -112 112 | # Unsafe fix -113 113 | @pytest.mark.parametrize( -114 |- ("param",), - 114 |+ "param", -115 115 | [ -116 |- ( -117 |- # comment -118 |- 1, -119 |- ), -120 |- (2,), - 116 |+ 1, - 117 |+ 2, -121 118 | ], -122 119 | ) -123 120 | def test_comment_in_argvalues(param): +111 | +112 | # Unsafe fix +113 | @pytest.mark.parametrize( + - ("param",), +114 + "param", +115 | [ + - ( + - # comment + - 1, + - ), + - (2,), +116 + 1, +117 + 2, +118 | ], +119 | ) +120 | def test_comment_in_argvalues(param): +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:129:5 @@ -412,22 +388,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 131 | (1,), | help: Use a string for the first argument - -ℹ Safe fix -126 126 | -127 127 | # Safe fix -128 128 | @pytest.mark.parametrize( -129 |- ("param",), - 129 |+ "param", -130 130 | [ -131 |- (1,), - 131 |+ 1, -132 132 | # comment -133 |- (2,), - 133 |+ 2, -134 134 | ], -135 135 | ) -136 136 | def test_comment_between_argvalues_items(param): +126 | +127 | # Safe fix +128 | @pytest.mark.parametrize( + - ("param",), +129 + "param", +130 | [ + - (1,), +131 + 1, +132 | # comment + - (2,), +133 + 2, +134 | ], +135 | ) +136 | def test_comment_between_argvalues_items(param): PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:142:5 @@ -440,13 +414,11 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 144 | (1,), | help: Use a string for the first argument - -ℹ Safe fix -139 139 | -140 140 | # A fix should be suggested for `argnames`, but not for `argvalues`. -141 141 | @pytest.mark.parametrize( -142 |- ("param",), - 142 |+ "param", -143 143 | [ -144 144 | (1,), -145 145 | (2, 3), +139 | +140 | # A fix should be suggested for `argnames`, but not for `argvalues`. +141 | @pytest.mark.parametrize( + - ("param",), +142 + "param", +143 | [ +144 | (1,), +145 | (2, 3), diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap index 9ff3aaeb43..9c6fa17b1f 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT006_list.snap @@ -10,16 +10,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 11 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -6 6 | ... -7 7 | -8 8 | -9 |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) - 9 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) -10 10 | def test_csv(param1, param2): -11 11 | ... -12 12 | +6 | ... +7 | +8 | + - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) +9 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +10 | def test_csv(param1, param2): +11 | ... +12 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:14:26 @@ -30,16 +29,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 16 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -11 11 | ... -12 12 | -13 13 | -14 |-@pytest.mark.parametrize(" param1, , param2 , ", [(1, 2), (3, 4)]) - 14 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) -15 15 | def test_csv_with_whitespace(param1, param2): -16 16 | ... -17 17 | +11 | ... +12 | +13 | + - @pytest.mark.parametrize(" param1, , param2 , ", [(1, 2), (3, 4)]) +14 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +15 | def test_csv_with_whitespace(param1, param2): +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:19:26 @@ -50,16 +48,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 21 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -16 16 | ... -17 17 | -18 18 | -19 |-@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) - 19 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) -20 20 | def test_csv_bad_quotes(param1, param2): -21 21 | ... -22 22 | +16 | ... +17 | +18 | + - @pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)]) +19 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +20 | def test_csv_bad_quotes(param1, param2): +21 | ... +22 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:24:26 @@ -70,16 +67,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 26 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -21 21 | ... -22 22 | -23 23 | -24 |-@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) - 24 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) -25 25 | def test_tuple(param1, param2): -26 26 | ... -27 27 | +21 | ... +22 | +23 | + - @pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)]) +24 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +25 | def test_tuple(param1, param2): +26 | ... +27 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:29:26 @@ -90,16 +86,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 31 | ... | help: Use a string for the first argument - -ℹ Safe fix -26 26 | ... -27 27 | -28 28 | -29 |-@pytest.mark.parametrize(("param1",), [1, 2, 3]) - 29 |+@pytest.mark.parametrize("param1", [1, 2, 3]) -30 30 | def test_tuple_one_elem(param1, param2): -31 31 | ... -32 32 | +26 | ... +27 | +28 | + - @pytest.mark.parametrize(("param1",), [1, 2, 3]) +29 + @pytest.mark.parametrize("param1", [1, 2, 3]) +30 | def test_tuple_one_elem(param1, param2): +31 | ... +32 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:39:26 @@ -110,16 +104,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 41 | ... | help: Use a string for the first argument - -ℹ Safe fix -36 36 | ... -37 37 | -38 38 | -39 |-@pytest.mark.parametrize(["param1"], [1, 2, 3]) - 39 |+@pytest.mark.parametrize("param1", [1, 2, 3]) -40 40 | def test_list_one_elem(param1, param2): -41 41 | ... -42 42 | +36 | ... +37 | +38 | + - @pytest.mark.parametrize(["param1"], [1, 2, 3]) +39 + @pytest.mark.parametrize("param1", [1, 2, 3]) +40 | def test_list_one_elem(param1, param2): +41 | ... +42 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:54:26 @@ -130,16 +122,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 56 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -51 51 | ... -52 52 | -53 53 | -54 |-@pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)]) - 54 |+@pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)]) -55 55 | def test_implicit_str_concat_with_parens(param1, param2, param3): -56 56 | ... -57 57 | +51 | ... +52 | +53 | + - @pytest.mark.parametrize(("param1, " "param2, " "param3"), [(1, 2, 3), (4, 5, 6)]) +54 + @pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)]) +55 | def test_implicit_str_concat_with_parens(param1, param2, param3): +56 | ... +57 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:59:26 @@ -150,16 +141,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 61 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -56 56 | ... -57 57 | -58 58 | -59 |-@pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)]) - 59 |+@pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)]) -60 60 | def test_implicit_str_concat_no_parens(param1, param2, param3): -61 61 | ... -62 62 | +56 | ... +57 | +58 | + - @pytest.mark.parametrize("param1, " "param2, " "param3", [(1, 2, 3), (4, 5, 6)]) +59 + @pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)]) +60 | def test_implicit_str_concat_no_parens(param1, param2, param3): +61 | ... +62 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:64:26 @@ -170,16 +160,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 66 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -61 61 | ... -62 62 | -63 63 | -64 |-@pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)]) - 64 |+@pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)]) -65 65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3): -66 66 | ... -67 67 | +61 | ... +62 | +63 | + - @pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)]) +64 + @pytest.mark.parametrize(["param1", "param2", "param3"], [(1, 2, 3), (4, 5, 6)]) +65 | def test_implicit_str_concat_with_multi_parens(param1, param2, param3): +66 | ... +67 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:69:26 @@ -190,16 +179,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 71 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -66 66 | ... -67 67 | -68 68 | -69 |-@pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) - 69 |+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) -70 70 | def test_csv_with_parens(param1, param2): -71 71 | ... -72 72 | +66 | ... +67 | +68 | + - @pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) +69 + @pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +70 | def test_csv_with_parens(param1, param2): +71 | ... +72 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:74:39 @@ -210,16 +198,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 76 | @parametrize | help: Use a `list` for the first argument - -ℹ Unsafe fix -71 71 | ... -72 72 | -73 73 | -74 |-parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) - 74 |+parametrize = pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) -75 75 | -76 76 | @parametrize -77 77 | def test_not_decorator(param1, param2): +71 | ... +72 | +73 | + - parametrize = pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)]) +74 + parametrize = pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)]) +75 | +76 | @parametrize +77 | def test_not_decorator(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `list` --> PT006.py:81:35 @@ -230,16 +217,15 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 83 | ... | help: Use a `list` for the first argument - -ℹ Unsafe fix -78 78 | ... -79 79 | -80 80 | -81 |-@pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)]) - 81 |+@pytest.mark.parametrize(argnames=["param1", "param2"], argvalues=[(1, 2), (3, 4)]) -82 82 | def test_keyword_arguments(param1, param2): -83 83 | ... -84 84 | +78 | ... +79 | +80 | + - @pytest.mark.parametrize(argnames=("param1,param2"), argvalues=[(1, 2), (3, 4)]) +81 + @pytest.mark.parametrize(argnames=["param1", "param2"], argvalues=[(1, 2), (3, 4)]) +82 | def test_keyword_arguments(param1, param2): +83 | ... +84 | +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:86:26 @@ -250,16 +236,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 88 | ... | help: Use a string for the first argument - -ℹ Safe fix -83 83 | ... -84 84 | -85 85 | -86 |-@pytest.mark.parametrize(("param",), [(1,), (2,)]) - 86 |+@pytest.mark.parametrize("param", [1, 2]) -87 87 | def test_single_element_tuple(param): -88 88 | ... -89 89 | +83 | ... +84 | +85 | + - @pytest.mark.parametrize(("param",), [(1,), (2,)]) +86 + @pytest.mark.parametrize("param", [1, 2]) +87 | def test_single_element_tuple(param): +88 | ... +89 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:91:26 @@ -270,16 +254,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 93 | ... | help: Use a string for the first argument - -ℹ Safe fix -88 88 | ... -89 89 | -90 90 | -91 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 91 |+@pytest.mark.parametrize("param", [1, 2]) -92 92 | def test_single_element_list(param): -93 93 | ... -94 94 | +88 | ... +89 | +90 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +91 + @pytest.mark.parametrize("param", [1, 2]) +92 | def test_single_element_list(param): +93 | ... +94 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:96:26 @@ -290,16 +272,14 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 98 | ... | help: Use a string for the first argument - -ℹ Safe fix -93 93 | ... -94 94 | -95 95 | -96 |-@pytest.mark.parametrize(("param",), [[1], [2]]) - 96 |+@pytest.mark.parametrize("param", [1, 2]) -97 97 | def test_single_element_list(param): -98 98 | ... -99 99 | +93 | ... +94 | +95 | + - @pytest.mark.parametrize(("param",), [[1], [2]]) +96 + @pytest.mark.parametrize("param", [1, 2]) +97 | def test_single_element_list(param): +98 | ... +99 | PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:103:5 @@ -315,21 +295,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 108 | ) | help: Use a string for the first argument - -ℹ Unsafe fix -100 100 | -101 101 | # Unsafe fix -102 102 | @pytest.mark.parametrize( -103 |- ( -104 |- # comment -105 |- "param", -106 |- ), -107 |- [[1], [2]], - 103 |+ "param", - 104 |+ [1, 2], -108 105 | ) -109 106 | def test_comment_in_argnames(param): -110 107 | ... +100 | +101 | # Unsafe fix +102 | @pytest.mark.parametrize( + - ( + - # comment + - "param", + - ), + - [[1], [2]], +103 + "param", +104 + [1, 2], +105 | ) +106 | def test_comment_in_argnames(param): +107 | ... +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:114:5 @@ -342,24 +321,23 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 116 | ( | help: Use a string for the first argument - -ℹ Unsafe fix -111 111 | -112 112 | # Unsafe fix -113 113 | @pytest.mark.parametrize( -114 |- ("param",), - 114 |+ "param", -115 115 | [ -116 |- ( -117 |- # comment -118 |- 1, -119 |- ), -120 |- (2,), - 116 |+ 1, - 117 |+ 2, -121 118 | ], -122 119 | ) -123 120 | def test_comment_in_argvalues(param): +111 | +112 | # Unsafe fix +113 | @pytest.mark.parametrize( + - ("param",), +114 + "param", +115 | [ + - ( + - # comment + - 1, + - ), + - (2,), +116 + 1, +117 + 2, +118 | ], +119 | ) +120 | def test_comment_in_argvalues(param): +note: This is an unsafe fix and may change runtime behavior PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:129:5 @@ -372,22 +350,20 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 131 | (1,), | help: Use a string for the first argument - -ℹ Safe fix -126 126 | -127 127 | # Safe fix -128 128 | @pytest.mark.parametrize( -129 |- ("param",), - 129 |+ "param", -130 130 | [ -131 |- (1,), - 131 |+ 1, -132 132 | # comment -133 |- (2,), - 133 |+ 2, -134 134 | ], -135 135 | ) -136 136 | def test_comment_between_argvalues_items(param): +126 | +127 | # Safe fix +128 | @pytest.mark.parametrize( + - ("param",), +129 + "param", +130 | [ + - (1,), +131 + 1, +132 | # comment + - (2,), +133 + 2, +134 | ], +135 | ) +136 | def test_comment_between_argvalues_items(param): PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expected `str` --> PT006.py:142:5 @@ -400,13 +376,11 @@ PT006 [*] Wrong type passed to first argument of `pytest.mark.parametrize`; expe 144 | (1,), | help: Use a string for the first argument - -ℹ Safe fix -139 139 | -140 140 | # A fix should be suggested for `argnames`, but not for `argvalues`. -141 141 | @pytest.mark.parametrize( -142 |- ("param",), - 142 |+ "param", -143 143 | [ -144 144 | (1,), -145 145 | (2, 3), +139 | +140 | # A fix should be suggested for `argnames`, but not for `argvalues`. +141 | @pytest.mark.parametrize( + - ("param",), +142 + "param", +143 | [ +144 | (1,), +145 | (2, 3), diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap index 41e4434970..e96f855c7b 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_lists.snap @@ -10,16 +10,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 6 | ... | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -1 1 | import pytest -2 2 | -3 3 | -4 |-@pytest.mark.parametrize("param", (1, 2)) - 4 |+@pytest.mark.parametrize("param", [1, 2]) -5 5 | def test_tuple(param): -6 6 | ... -7 7 | +1 | import pytest +2 | +3 | + - @pytest.mark.parametrize("param", (1, 2)) +4 + @pytest.mark.parametrize("param", [1, 2]) +5 | def test_tuple(param): +6 | ... +7 | +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:11:5 @@ -35,20 +34,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 16 | def test_tuple_of_tuples(param1, param2): | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -8 8 | -9 9 | @pytest.mark.parametrize( -10 10 | ("param1", "param2"), -11 |- ( - 11 |+ [ -12 12 | (1, 2), -13 13 | (3, 4), -14 |- ), - 14 |+ ], -15 15 | ) -16 16 | def test_tuple_of_tuples(param1, param2): -17 17 | ... +8 | +9 | @pytest.mark.parametrize( +10 | ("param1", "param2"), + - ( +11 + [ +12 | (1, 2), +13 | (3, 4), + - ), +14 + ], +15 | ) +16 | def test_tuple_of_tuples(param1, param2): +17 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:12:9 @@ -61,16 +59,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 14 | ), | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -9 9 | @pytest.mark.parametrize( -10 10 | ("param1", "param2"), -11 11 | ( -12 |- (1, 2), - 12 |+ [1, 2], -13 13 | (3, 4), -14 14 | ), -15 15 | ) +9 | @pytest.mark.parametrize( +10 | ("param1", "param2"), +11 | ( + - (1, 2), +12 + [1, 2], +13 | (3, 4), +14 | ), +15 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:13:9 @@ -83,16 +80,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 15 | ) | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -10 10 | ("param1", "param2"), -11 11 | ( -12 12 | (1, 2), -13 |- (3, 4), - 13 |+ [3, 4], -14 14 | ), -15 15 | ) -16 16 | def test_tuple_of_tuples(param1, param2): +10 | ("param1", "param2"), +11 | ( +12 | (1, 2), + - (3, 4), +13 + [3, 4], +14 | ), +15 | ) +16 | def test_tuple_of_tuples(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:22:5 @@ -108,20 +104,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 27 | def test_tuple_of_lists(param1, param2): | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -19 19 | -20 20 | @pytest.mark.parametrize( -21 21 | ("param1", "param2"), -22 |- ( - 22 |+ [ -23 23 | [1, 2], -24 24 | [3, 4], -25 |- ), - 25 |+ ], -26 26 | ) -27 27 | def test_tuple_of_lists(param1, param2): -28 28 | ... +19 | +20 | @pytest.mark.parametrize( +21 | ("param1", "param2"), + - ( +22 + [ +23 | [1, 2], +24 | [3, 4], + - ), +25 + ], +26 | ) +27 | def test_tuple_of_lists(param1, param2): +28 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:39:9 @@ -134,16 +129,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 41 | ], | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -36 36 | @pytest.mark.parametrize( -37 37 | ("param1", "param2"), -38 38 | [ -39 |- (1, 2), - 39 |+ [1, 2], -40 40 | (3, 4), -41 41 | ], -42 42 | ) +36 | @pytest.mark.parametrize( +37 | ("param1", "param2"), +38 | [ + - (1, 2), +39 + [1, 2], +40 | (3, 4), +41 | ], +42 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:40:9 @@ -156,16 +150,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 42 | ) | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -37 37 | ("param1", "param2"), -38 38 | [ -39 39 | (1, 2), -40 |- (3, 4), - 40 |+ [3, 4], -41 41 | ], -42 42 | ) -43 43 | def test_list_of_tuples(param1, param2): +37 | ("param1", "param2"), +38 | [ +39 | (1, 2), + - (3, 4), +40 + [3, 4], +41 | ], +42 | ) +43 | def test_list_of_tuples(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:81:38 @@ -177,16 +170,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 83 | @pytest.mark.parametrize( | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -78 78 | -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) - 81 |+@pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)]) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", +78 | +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) + - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +81 + @pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)]) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:81:39 @@ -198,16 +190,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 83 | @pytest.mark.parametrize( | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -78 78 | -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) - 81 |+@pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6))) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", +78 | +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) + - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +81 + @pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6))) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `list` --> PT007.py:81:47 @@ -219,13 +210,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `lis 83 | @pytest.mark.parametrize( | help: Use `list` of `list` for parameter values - -ℹ Unsafe fix -78 78 | -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) - 81 |+@pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6])) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", +78 | +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) + - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +81 + @pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6])) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap index 1791c79d03..d9cd93b399 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_list_of_tuples.snap @@ -10,16 +10,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 6 | ... | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -1 1 | import pytest -2 2 | -3 3 | -4 |-@pytest.mark.parametrize("param", (1, 2)) - 4 |+@pytest.mark.parametrize("param", [1, 2]) -5 5 | def test_tuple(param): -6 6 | ... -7 7 | +1 | import pytest +2 | +3 | + - @pytest.mark.parametrize("param", (1, 2)) +4 + @pytest.mark.parametrize("param", [1, 2]) +5 | def test_tuple(param): +6 | ... +7 | +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:11:5 @@ -35,20 +34,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 16 | def test_tuple_of_tuples(param1, param2): | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -8 8 | -9 9 | @pytest.mark.parametrize( -10 10 | ("param1", "param2"), -11 |- ( - 11 |+ [ -12 12 | (1, 2), -13 13 | (3, 4), -14 |- ), - 14 |+ ], -15 15 | ) -16 16 | def test_tuple_of_tuples(param1, param2): -17 17 | ... +8 | +9 | @pytest.mark.parametrize( +10 | ("param1", "param2"), + - ( +11 + [ +12 | (1, 2), +13 | (3, 4), + - ), +14 + ], +15 | ) +16 | def test_tuple_of_tuples(param1, param2): +17 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:22:5 @@ -64,20 +62,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 27 | def test_tuple_of_lists(param1, param2): | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -19 19 | -20 20 | @pytest.mark.parametrize( -21 21 | ("param1", "param2"), -22 |- ( - 22 |+ [ -23 23 | [1, 2], -24 24 | [3, 4], -25 |- ), - 25 |+ ], -26 26 | ) -27 27 | def test_tuple_of_lists(param1, param2): -28 28 | ... +19 | +20 | @pytest.mark.parametrize( +21 | ("param1", "param2"), + - ( +22 + [ +23 | [1, 2], +24 | [3, 4], + - ), +25 + ], +26 | ) +27 | def test_tuple_of_lists(param1, param2): +28 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:23:9 @@ -90,16 +87,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 25 | ), | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -20 20 | @pytest.mark.parametrize( -21 21 | ("param1", "param2"), -22 22 | ( -23 |- [1, 2], - 23 |+ (1, 2), -24 24 | [3, 4], -25 25 | ), -26 26 | ) +20 | @pytest.mark.parametrize( +21 | ("param1", "param2"), +22 | ( + - [1, 2], +23 + (1, 2), +24 | [3, 4], +25 | ), +26 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:24:9 @@ -112,16 +108,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 26 | ) | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -21 21 | ("param1", "param2"), -22 22 | ( -23 23 | [1, 2], -24 |- [3, 4], - 24 |+ (3, 4), -25 25 | ), -26 26 | ) -27 27 | def test_tuple_of_lists(param1, param2): +21 | ("param1", "param2"), +22 | ( +23 | [1, 2], + - [3, 4], +24 + (3, 4), +25 | ), +26 | ) +27 | def test_tuple_of_lists(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:50:9 @@ -134,16 +129,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 52 | ], | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -47 47 | @pytest.mark.parametrize( -48 48 | ("param1", "param2"), -49 49 | [ -50 |- [1, 2], - 50 |+ (1, 2), -51 51 | [3, 4], -52 52 | ], -53 53 | ) +47 | @pytest.mark.parametrize( +48 | ("param1", "param2"), +49 | [ + - [1, 2], +50 + (1, 2), +51 | [3, 4], +52 | ], +53 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:51:9 @@ -156,16 +150,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 53 | ) | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -48 48 | ("param1", "param2"), -49 49 | [ -50 50 | [1, 2], -51 |- [3, 4], - 51 |+ (3, 4), -52 52 | ], -53 53 | ) -54 54 | def test_list_of_lists(param1, param2): +48 | ("param1", "param2"), +49 | [ +50 | [1, 2], + - [3, 4], +51 + (3, 4), +52 | ], +53 | ) +54 | def test_list_of_lists(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:61:9 @@ -178,16 +171,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 63 | ], | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -58 58 | @pytest.mark.parametrize( -59 59 | "param1,param2", -60 60 | [ -61 |- [1, 2], - 61 |+ (1, 2), -62 62 | [3, 4], -63 63 | ], -64 64 | ) +58 | @pytest.mark.parametrize( +59 | "param1,param2", +60 | [ + - [1, 2], +61 + (1, 2), +62 | [3, 4], +63 | ], +64 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:62:9 @@ -200,16 +192,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 64 | ) | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -59 59 | "param1,param2", -60 60 | [ -61 61 | [1, 2], -62 |- [3, 4], - 62 |+ (3, 4), -63 63 | ], -64 64 | ) -65 65 | def test_csv_name_list_of_lists(param1, param2): +59 | "param1,param2", +60 | [ +61 | [1, 2], + - [3, 4], +62 + (3, 4), +63 | ], +64 | ) +65 | def test_csv_name_list_of_lists(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tuple` --> PT007.py:81:38 @@ -221,13 +212,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `list` of `tup 83 | @pytest.mark.parametrize( | help: Use `list` of `tuple` for parameter values - -ℹ Unsafe fix -78 78 | -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) - 81 |+@pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)]) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", +78 | +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) + - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +81 + @pytest.mark.parametrize(("b", "c"), [(3, 4), (5, 6)]) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap index 9e6b515935..70ac21a8e8 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_lists.snap @@ -12,16 +12,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 14 | ), | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -9 9 | @pytest.mark.parametrize( -10 10 | ("param1", "param2"), -11 11 | ( -12 |- (1, 2), - 12 |+ [1, 2], -13 13 | (3, 4), -14 14 | ), -15 15 | ) +9 | @pytest.mark.parametrize( +10 | ("param1", "param2"), +11 | ( + - (1, 2), +12 + [1, 2], +13 | (3, 4), +14 | ), +15 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:13:9 @@ -34,16 +33,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 15 | ) | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -10 10 | ("param1", "param2"), -11 11 | ( -12 12 | (1, 2), -13 |- (3, 4), - 13 |+ [3, 4], -14 14 | ), -15 15 | ) -16 16 | def test_tuple_of_tuples(param1, param2): +10 | ("param1", "param2"), +11 | ( +12 | (1, 2), + - (3, 4), +13 + [3, 4], +14 | ), +15 | ) +16 | def test_tuple_of_tuples(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:31:35 @@ -54,16 +52,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 33 | ... | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -28 28 | ... -29 29 | -30 30 | -31 |-@pytest.mark.parametrize("param", [1, 2]) - 31 |+@pytest.mark.parametrize("param", (1, 2)) -32 32 | def test_list(param): -33 33 | ... -34 34 | +28 | ... +29 | +30 | + - @pytest.mark.parametrize("param", [1, 2]) +31 + @pytest.mark.parametrize("param", (1, 2)) +32 | def test_list(param): +33 | ... +34 | +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:38:5 @@ -79,20 +76,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 43 | def test_list_of_tuples(param1, param2): | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -35 35 | -36 36 | @pytest.mark.parametrize( -37 37 | ("param1", "param2"), -38 |- [ - 38 |+ ( -39 39 | (1, 2), -40 40 | (3, 4), -41 |- ], - 41 |+ ), -42 42 | ) -43 43 | def test_list_of_tuples(param1, param2): -44 44 | ... +35 | +36 | @pytest.mark.parametrize( +37 | ("param1", "param2"), + - [ +38 + ( +39 | (1, 2), +40 | (3, 4), + - ], +41 + ), +42 | ) +43 | def test_list_of_tuples(param1, param2): +44 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:39:9 @@ -105,16 +101,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 41 | ], | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -36 36 | @pytest.mark.parametrize( -37 37 | ("param1", "param2"), -38 38 | [ -39 |- (1, 2), - 39 |+ [1, 2], -40 40 | (3, 4), -41 41 | ], -42 42 | ) +36 | @pytest.mark.parametrize( +37 | ("param1", "param2"), +38 | [ + - (1, 2), +39 + [1, 2], +40 | (3, 4), +41 | ], +42 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:40:9 @@ -127,16 +122,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 42 | ) | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -37 37 | ("param1", "param2"), -38 38 | [ -39 39 | (1, 2), -40 |- (3, 4), - 40 |+ [3, 4], -41 41 | ], -42 42 | ) -43 43 | def test_list_of_tuples(param1, param2): +37 | ("param1", "param2"), +38 | [ +39 | (1, 2), + - (3, 4), +40 + [3, 4], +41 | ], +42 | ) +43 | def test_list_of_tuples(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:49:5 @@ -152,20 +146,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 54 | def test_list_of_lists(param1, param2): | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -46 46 | -47 47 | @pytest.mark.parametrize( -48 48 | ("param1", "param2"), -49 |- [ - 49 |+ ( -50 50 | [1, 2], -51 51 | [3, 4], -52 |- ], - 52 |+ ), -53 53 | ) -54 54 | def test_list_of_lists(param1, param2): -55 55 | ... +46 | +47 | @pytest.mark.parametrize( +48 | ("param1", "param2"), + - [ +49 + ( +50 | [1, 2], +51 | [3, 4], + - ], +52 + ), +53 | ) +54 | def test_list_of_lists(param1, param2): +55 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:60:5 @@ -181,20 +174,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 65 | def test_csv_name_list_of_lists(param1, param2): | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -57 57 | -58 58 | @pytest.mark.parametrize( -59 59 | "param1,param2", -60 |- [ - 60 |+ ( -61 61 | [1, 2], -62 62 | [3, 4], -63 |- ], - 63 |+ ), -64 64 | ) -65 65 | def test_csv_name_list_of_lists(param1, param2): -66 66 | ... +57 | +58 | @pytest.mark.parametrize( +59 | "param1,param2", + - [ +60 + ( +61 | [1, 2], +62 | [3, 4], + - ], +63 + ), +64 | ) +65 | def test_csv_name_list_of_lists(param1, param2): +66 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:71:5 @@ -210,20 +202,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 76 | def test_single_list_of_lists(param): | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -68 68 | -69 69 | @pytest.mark.parametrize( -70 70 | "param", -71 |- [ - 71 |+ ( -72 72 | [1, 2], -73 73 | [3, 4], -74 |- ], - 74 |+ ), -75 75 | ) -76 76 | def test_single_list_of_lists(param): -77 77 | ... +68 | +69 | @pytest.mark.parametrize( +70 | "param", + - [ +71 + ( +72 | [1, 2], +73 | [3, 4], + - ], +74 + ), +75 | ) +76 | def test_single_list_of_lists(param): +77 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:80:31 @@ -234,16 +225,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 82 | @pytest.mark.parametrize("d", [3,]) | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -77 77 | ... -78 78 | -79 79 | -80 |-@pytest.mark.parametrize("a", [1, 2]) - 80 |+@pytest.mark.parametrize("a", (1, 2)) -81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( +77 | ... +78 | +79 | + - @pytest.mark.parametrize("a", [1, 2]) +80 + @pytest.mark.parametrize("a", (1, 2)) +81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:81:39 @@ -255,16 +245,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 83 | @pytest.mark.parametrize( | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -78 78 | -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) - 81 |+@pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6))) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", +78 | +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) + - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +81 + @pytest.mark.parametrize(("b", "c"), ([3, 4], (5, 6))) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:81:47 @@ -276,16 +265,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 83 | @pytest.mark.parametrize( | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -78 78 | -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 |-@pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) - 81 |+@pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6])) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", +78 | +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) + - @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +81 + @pytest.mark.parametrize(("b", "c"), ((3, 4), [5, 6])) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:82:31 @@ -298,16 +286,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 84 | "d", | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) -82 |-@pytest.mark.parametrize("d", [3,]) - 82 |+@pytest.mark.parametrize("d", (3,)) -83 83 | @pytest.mark.parametrize( -84 84 | "d", -85 85 | [("3", "4")], +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) +81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) + - @pytest.mark.parametrize("d", [3,]) +82 + @pytest.mark.parametrize("d", (3,)) +83 | @pytest.mark.parametrize( +84 | "d", +85 | [("3", "4")], +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:85:5 @@ -320,16 +307,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 87 | @pytest.mark.parametrize( | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", -85 |- [("3", "4")], - 85 |+ (("3", "4"),), -86 86 | ) -87 87 | @pytest.mark.parametrize( -88 88 | "e", +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", + - [("3", "4")], +85 + (("3", "4"),), +86 | ) +87 | @pytest.mark.parametrize( +88 | "e", +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `list` --> PT007.py:89:5 @@ -342,13 +328,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `li 91 | def test_multiple_decorators(a, b, c, d, e): | help: Use `tuple` of `list` for parameter values - -ℹ Unsafe fix -86 86 | ) -87 87 | @pytest.mark.parametrize( -88 88 | "e", -89 |- [("3", "4"),], - 89 |+ (("3", "4"),), -90 90 | ) -91 91 | def test_multiple_decorators(a, b, c, d, e): -92 92 | pass +86 | ) +87 | @pytest.mark.parametrize( +88 | "e", + - [("3", "4"),], +89 + (("3", "4"),), +90 | ) +91 | def test_multiple_decorators(a, b, c, d, e): +92 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap index fda908e395..3619922a75 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT007_tuple_of_tuples.snap @@ -12,16 +12,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 25 | ), | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -20 20 | @pytest.mark.parametrize( -21 21 | ("param1", "param2"), -22 22 | ( -23 |- [1, 2], - 23 |+ (1, 2), -24 24 | [3, 4], -25 25 | ), -26 26 | ) +20 | @pytest.mark.parametrize( +21 | ("param1", "param2"), +22 | ( + - [1, 2], +23 + (1, 2), +24 | [3, 4], +25 | ), +26 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:24:9 @@ -34,16 +33,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 26 | ) | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -21 21 | ("param1", "param2"), -22 22 | ( -23 23 | [1, 2], -24 |- [3, 4], - 24 |+ (3, 4), -25 25 | ), -26 26 | ) -27 27 | def test_tuple_of_lists(param1, param2): +21 | ("param1", "param2"), +22 | ( +23 | [1, 2], + - [3, 4], +24 + (3, 4), +25 | ), +26 | ) +27 | def test_tuple_of_lists(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:31:35 @@ -54,16 +52,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 33 | ... | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -28 28 | ... -29 29 | -30 30 | -31 |-@pytest.mark.parametrize("param", [1, 2]) - 31 |+@pytest.mark.parametrize("param", (1, 2)) -32 32 | def test_list(param): -33 33 | ... -34 34 | +28 | ... +29 | +30 | + - @pytest.mark.parametrize("param", [1, 2]) +31 + @pytest.mark.parametrize("param", (1, 2)) +32 | def test_list(param): +33 | ... +34 | +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:38:5 @@ -79,20 +76,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 43 | def test_list_of_tuples(param1, param2): | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -35 35 | -36 36 | @pytest.mark.parametrize( -37 37 | ("param1", "param2"), -38 |- [ - 38 |+ ( -39 39 | (1, 2), -40 40 | (3, 4), -41 |- ], - 41 |+ ), -42 42 | ) -43 43 | def test_list_of_tuples(param1, param2): -44 44 | ... +35 | +36 | @pytest.mark.parametrize( +37 | ("param1", "param2"), + - [ +38 + ( +39 | (1, 2), +40 | (3, 4), + - ], +41 + ), +42 | ) +43 | def test_list_of_tuples(param1, param2): +44 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:49:5 @@ -108,20 +104,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 54 | def test_list_of_lists(param1, param2): | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -46 46 | -47 47 | @pytest.mark.parametrize( -48 48 | ("param1", "param2"), -49 |- [ - 49 |+ ( -50 50 | [1, 2], -51 51 | [3, 4], -52 |- ], - 52 |+ ), -53 53 | ) -54 54 | def test_list_of_lists(param1, param2): -55 55 | ... +46 | +47 | @pytest.mark.parametrize( +48 | ("param1", "param2"), + - [ +49 + ( +50 | [1, 2], +51 | [3, 4], + - ], +52 + ), +53 | ) +54 | def test_list_of_lists(param1, param2): +55 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:50:9 @@ -134,16 +129,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 52 | ], | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -47 47 | @pytest.mark.parametrize( -48 48 | ("param1", "param2"), -49 49 | [ -50 |- [1, 2], - 50 |+ (1, 2), -51 51 | [3, 4], -52 52 | ], -53 53 | ) +47 | @pytest.mark.parametrize( +48 | ("param1", "param2"), +49 | [ + - [1, 2], +50 + (1, 2), +51 | [3, 4], +52 | ], +53 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:51:9 @@ -156,16 +150,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 53 | ) | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -48 48 | ("param1", "param2"), -49 49 | [ -50 50 | [1, 2], -51 |- [3, 4], - 51 |+ (3, 4), -52 52 | ], -53 53 | ) -54 54 | def test_list_of_lists(param1, param2): +48 | ("param1", "param2"), +49 | [ +50 | [1, 2], + - [3, 4], +51 + (3, 4), +52 | ], +53 | ) +54 | def test_list_of_lists(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:60:5 @@ -181,20 +174,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 65 | def test_csv_name_list_of_lists(param1, param2): | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -57 57 | -58 58 | @pytest.mark.parametrize( -59 59 | "param1,param2", -60 |- [ - 60 |+ ( -61 61 | [1, 2], -62 62 | [3, 4], -63 |- ], - 63 |+ ), -64 64 | ) -65 65 | def test_csv_name_list_of_lists(param1, param2): -66 66 | ... +57 | +58 | @pytest.mark.parametrize( +59 | "param1,param2", + - [ +60 + ( +61 | [1, 2], +62 | [3, 4], + - ], +63 + ), +64 | ) +65 | def test_csv_name_list_of_lists(param1, param2): +66 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:61:9 @@ -207,16 +199,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 63 | ], | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -58 58 | @pytest.mark.parametrize( -59 59 | "param1,param2", -60 60 | [ -61 |- [1, 2], - 61 |+ (1, 2), -62 62 | [3, 4], -63 63 | ], -64 64 | ) +58 | @pytest.mark.parametrize( +59 | "param1,param2", +60 | [ + - [1, 2], +61 + (1, 2), +62 | [3, 4], +63 | ], +64 | ) +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:62:9 @@ -229,16 +220,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 64 | ) | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -59 59 | "param1,param2", -60 60 | [ -61 61 | [1, 2], -62 |- [3, 4], - 62 |+ (3, 4), -63 63 | ], -64 64 | ) -65 65 | def test_csv_name_list_of_lists(param1, param2): +59 | "param1,param2", +60 | [ +61 | [1, 2], + - [3, 4], +62 + (3, 4), +63 | ], +64 | ) +65 | def test_csv_name_list_of_lists(param1, param2): +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:71:5 @@ -254,20 +244,19 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 76 | def test_single_list_of_lists(param): | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -68 68 | -69 69 | @pytest.mark.parametrize( -70 70 | "param", -71 |- [ - 71 |+ ( -72 72 | [1, 2], -73 73 | [3, 4], -74 |- ], - 74 |+ ), -75 75 | ) -76 76 | def test_single_list_of_lists(param): -77 77 | ... +68 | +69 | @pytest.mark.parametrize( +70 | "param", + - [ +71 + ( +72 | [1, 2], +73 | [3, 4], + - ], +74 + ), +75 | ) +76 | def test_single_list_of_lists(param): +77 | ... +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:80:31 @@ -278,16 +267,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 82 | @pytest.mark.parametrize("d", [3,]) | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -77 77 | ... -78 78 | -79 79 | -80 |-@pytest.mark.parametrize("a", [1, 2]) - 80 |+@pytest.mark.parametrize("a", (1, 2)) -81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( +77 | ... +78 | +79 | + - @pytest.mark.parametrize("a", [1, 2]) +80 + @pytest.mark.parametrize("a", (1, 2)) +81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:82:31 @@ -300,16 +288,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 84 | "d", | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -79 79 | -80 80 | @pytest.mark.parametrize("a", [1, 2]) -81 81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) -82 |-@pytest.mark.parametrize("d", [3,]) - 82 |+@pytest.mark.parametrize("d", (3,)) -83 83 | @pytest.mark.parametrize( -84 84 | "d", -85 85 | [("3", "4")], +79 | +80 | @pytest.mark.parametrize("a", [1, 2]) +81 | @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6))) + - @pytest.mark.parametrize("d", [3,]) +82 + @pytest.mark.parametrize("d", (3,)) +83 | @pytest.mark.parametrize( +84 | "d", +85 | [("3", "4")], +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:85:5 @@ -322,16 +309,15 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 87 | @pytest.mark.parametrize( | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -82 82 | @pytest.mark.parametrize("d", [3,]) -83 83 | @pytest.mark.parametrize( -84 84 | "d", -85 |- [("3", "4")], - 85 |+ (("3", "4"),), -86 86 | ) -87 87 | @pytest.mark.parametrize( -88 88 | "e", +82 | @pytest.mark.parametrize("d", [3,]) +83 | @pytest.mark.parametrize( +84 | "d", + - [("3", "4")], +85 + (("3", "4"),), +86 | ) +87 | @pytest.mark.parametrize( +88 | "e", +note: This is an unsafe fix and may change runtime behavior PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tuple` --> PT007.py:89:5 @@ -344,13 +330,12 @@ PT007 [*] Wrong values type in `pytest.mark.parametrize` expected `tuple` of `tu 91 | def test_multiple_decorators(a, b, c, d, e): | help: Use `tuple` of `tuple` for parameter values - -ℹ Unsafe fix -86 86 | ) -87 87 | @pytest.mark.parametrize( -88 88 | "e", -89 |- [("3", "4"),], - 89 |+ (("3", "4"),), -90 90 | ) -91 91 | def test_multiple_decorators(a, b, c, d, e): -92 92 | pass +86 | ) +87 | @pytest.mark.parametrize( +88 | "e", + - [("3", "4"),], +89 + (("3", "4"),), +90 | ) +91 | def test_multiple_decorators(a, b, c, d, e): +92 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap index 513a58b588..b3a8446f0b 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT009.snap @@ -12,16 +12,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` 13 | self.assertTrue(expr, msg) # Error | help: Replace `assertTrue(...)` with `assert ...` - -ℹ Unsafe fix -8 8 | def test_assert_true(self): -9 9 | expr = 1 -10 10 | msg = "Must be True" -11 |- self.assertTrue(expr) # Error - 11 |+ assert expr # Error -12 12 | self.assertTrue(expr=expr) # Error -13 13 | self.assertTrue(expr, msg) # Error -14 14 | self.assertTrue(expr=expr, msg=msg) # Error +8 | def test_assert_true(self): +9 | expr = 1 +10 | msg = "Must be True" + - self.assertTrue(expr) # Error +11 + assert expr # Error +12 | self.assertTrue(expr=expr) # Error +13 | self.assertTrue(expr, msg) # Error +14 | self.assertTrue(expr=expr, msg=msg) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` --> PT009.py:12:9 @@ -34,16 +33,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` 14 | self.assertTrue(expr=expr, msg=msg) # Error | help: Replace `assertTrue(...)` with `assert ...` - -ℹ Unsafe fix -9 9 | expr = 1 -10 10 | msg = "Must be True" -11 11 | self.assertTrue(expr) # Error -12 |- self.assertTrue(expr=expr) # Error - 12 |+ assert expr # Error -13 13 | self.assertTrue(expr, msg) # Error -14 14 | self.assertTrue(expr=expr, msg=msg) # Error -15 15 | self.assertTrue(msg=msg, expr=expr) # Error +9 | expr = 1 +10 | msg = "Must be True" +11 | self.assertTrue(expr) # Error + - self.assertTrue(expr=expr) # Error +12 + assert expr # Error +13 | self.assertTrue(expr, msg) # Error +14 | self.assertTrue(expr=expr, msg=msg) # Error +15 | self.assertTrue(msg=msg, expr=expr) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` --> PT009.py:13:9 @@ -56,16 +54,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` 15 | self.assertTrue(msg=msg, expr=expr) # Error | help: Replace `assertTrue(...)` with `assert ...` - -ℹ Unsafe fix -10 10 | msg = "Must be True" -11 11 | self.assertTrue(expr) # Error -12 12 | self.assertTrue(expr=expr) # Error -13 |- self.assertTrue(expr, msg) # Error - 13 |+ assert expr, msg # Error -14 14 | self.assertTrue(expr=expr, msg=msg) # Error -15 15 | self.assertTrue(msg=msg, expr=expr) # Error -16 16 | self.assertTrue(*(expr, msg)) # Error, unfixable +10 | msg = "Must be True" +11 | self.assertTrue(expr) # Error +12 | self.assertTrue(expr=expr) # Error + - self.assertTrue(expr, msg) # Error +13 + assert expr, msg # Error +14 | self.assertTrue(expr=expr, msg=msg) # Error +15 | self.assertTrue(msg=msg, expr=expr) # Error +16 | self.assertTrue(*(expr, msg)) # Error, unfixable +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` --> PT009.py:14:9 @@ -78,16 +75,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` 16 | self.assertTrue(*(expr, msg)) # Error, unfixable | help: Replace `assertTrue(...)` with `assert ...` - -ℹ Unsafe fix -11 11 | self.assertTrue(expr) # Error -12 12 | self.assertTrue(expr=expr) # Error -13 13 | self.assertTrue(expr, msg) # Error -14 |- self.assertTrue(expr=expr, msg=msg) # Error - 14 |+ assert expr, msg # Error -15 15 | self.assertTrue(msg=msg, expr=expr) # Error -16 16 | self.assertTrue(*(expr, msg)) # Error, unfixable -17 17 | self.assertTrue(**{"expr": expr, "msg": msg}) # Error, unfixable +11 | self.assertTrue(expr) # Error +12 | self.assertTrue(expr=expr) # Error +13 | self.assertTrue(expr, msg) # Error + - self.assertTrue(expr=expr, msg=msg) # Error +14 + assert expr, msg # Error +15 | self.assertTrue(msg=msg, expr=expr) # Error +16 | self.assertTrue(*(expr, msg)) # Error, unfixable +17 | self.assertTrue(**{"expr": expr, "msg": msg}) # Error, unfixable +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` --> PT009.py:15:9 @@ -100,16 +96,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` 17 | self.assertTrue(**{"expr": expr, "msg": msg}) # Error, unfixable | help: Replace `assertTrue(...)` with `assert ...` - -ℹ Unsafe fix -12 12 | self.assertTrue(expr=expr) # Error -13 13 | self.assertTrue(expr, msg) # Error -14 14 | self.assertTrue(expr=expr, msg=msg) # Error -15 |- self.assertTrue(msg=msg, expr=expr) # Error - 15 |+ assert expr, msg # Error -16 16 | self.assertTrue(*(expr, msg)) # Error, unfixable -17 17 | self.assertTrue(**{"expr": expr, "msg": msg}) # Error, unfixable -18 18 | self.assertTrue(msg=msg, expr=expr, unexpected_arg=False) # Error, unfixable +12 | self.assertTrue(expr=expr) # Error +13 | self.assertTrue(expr, msg) # Error +14 | self.assertTrue(expr=expr, msg=msg) # Error + - self.assertTrue(msg=msg, expr=expr) # Error +15 + assert expr, msg # Error +16 | self.assertTrue(*(expr, msg)) # Error, unfixable +17 | self.assertTrue(**{"expr": expr, "msg": msg}) # Error, unfixable +18 | self.assertTrue(msg=msg, expr=expr, unexpected_arg=False) # Error, unfixable +note: This is an unsafe fix and may change runtime behavior PT009 Use a regular `assert` instead of unittest-style `assertTrue` --> PT009.py:16:9 @@ -205,16 +200,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertFalse` 30 | def test_assert_equal(self): | help: Replace `assertFalse(...)` with `assert ...` - -ℹ Unsafe fix -25 25 | return self.assertEqual(True, False) # Error, unfixable -26 26 | -27 27 | def test_assert_false(self): -28 |- self.assertFalse(True) # Error - 28 |+ assert not True # Error -29 29 | -30 30 | def test_assert_equal(self): -31 31 | self.assertEqual(1, 2) # Error +25 | return self.assertEqual(True, False) # Error, unfixable +26 | +27 | def test_assert_false(self): + - self.assertFalse(True) # Error +28 + assert not True # Error +29 | +30 | def test_assert_equal(self): +31 | self.assertEqual(1, 2) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertEqual` --> PT009.py:31:9 @@ -226,16 +220,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertEqual` 33 | def test_assert_not_equal(self): | help: Replace `assertEqual(...)` with `assert ...` - -ℹ Unsafe fix -28 28 | self.assertFalse(True) # Error -29 29 | -30 30 | def test_assert_equal(self): -31 |- self.assertEqual(1, 2) # Error - 31 |+ assert 1 == 2 # Error -32 32 | -33 33 | def test_assert_not_equal(self): -34 34 | self.assertNotEqual(1, 1) # Error +28 | self.assertFalse(True) # Error +29 | +30 | def test_assert_equal(self): + - self.assertEqual(1, 2) # Error +31 + assert 1 == 2 # Error +32 | +33 | def test_assert_not_equal(self): +34 | self.assertNotEqual(1, 1) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertNotEqual` --> PT009.py:34:9 @@ -247,16 +240,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotEqual` 36 | def test_assert_greater(self): | help: Replace `assertNotEqual(...)` with `assert ...` - -ℹ Unsafe fix -31 31 | self.assertEqual(1, 2) # Error -32 32 | -33 33 | def test_assert_not_equal(self): -34 |- self.assertNotEqual(1, 1) # Error - 34 |+ assert 1 != 1 # Error -35 35 | -36 36 | def test_assert_greater(self): -37 37 | self.assertGreater(1, 2) # Error +31 | self.assertEqual(1, 2) # Error +32 | +33 | def test_assert_not_equal(self): + - self.assertNotEqual(1, 1) # Error +34 + assert 1 != 1 # Error +35 | +36 | def test_assert_greater(self): +37 | self.assertGreater(1, 2) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertGreater` --> PT009.py:37:9 @@ -268,16 +260,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertGreater` 39 | def test_assert_greater_equal(self): | help: Replace `assertGreater(...)` with `assert ...` - -ℹ Unsafe fix -34 34 | self.assertNotEqual(1, 1) # Error -35 35 | -36 36 | def test_assert_greater(self): -37 |- self.assertGreater(1, 2) # Error - 37 |+ assert 1 > 2 # Error -38 38 | -39 39 | def test_assert_greater_equal(self): -40 40 | self.assertGreaterEqual(1, 2) # Error +34 | self.assertNotEqual(1, 1) # Error +35 | +36 | def test_assert_greater(self): + - self.assertGreater(1, 2) # Error +37 + assert 1 > 2 # Error +38 | +39 | def test_assert_greater_equal(self): +40 | self.assertGreaterEqual(1, 2) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertGreaterEqual` --> PT009.py:40:9 @@ -289,16 +280,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertGreaterEqual` 42 | def test_assert_less(self): | help: Replace `assertGreaterEqual(...)` with `assert ...` - -ℹ Unsafe fix -37 37 | self.assertGreater(1, 2) # Error -38 38 | -39 39 | def test_assert_greater_equal(self): -40 |- self.assertGreaterEqual(1, 2) # Error - 40 |+ assert 1 >= 2 # Error -41 41 | -42 42 | def test_assert_less(self): -43 43 | self.assertLess(2, 1) # Error +37 | self.assertGreater(1, 2) # Error +38 | +39 | def test_assert_greater_equal(self): + - self.assertGreaterEqual(1, 2) # Error +40 + assert 1 >= 2 # Error +41 | +42 | def test_assert_less(self): +43 | self.assertLess(2, 1) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertLess` --> PT009.py:43:9 @@ -310,16 +300,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertLess` 45 | def test_assert_less_equal(self): | help: Replace `assertLess(...)` with `assert ...` - -ℹ Unsafe fix -40 40 | self.assertGreaterEqual(1, 2) # Error -41 41 | -42 42 | def test_assert_less(self): -43 |- self.assertLess(2, 1) # Error - 43 |+ assert 2 < 1 # Error -44 44 | -45 45 | def test_assert_less_equal(self): -46 46 | self.assertLessEqual(1, 2) # Error +40 | self.assertGreaterEqual(1, 2) # Error +41 | +42 | def test_assert_less(self): + - self.assertLess(2, 1) # Error +43 + assert 2 < 1 # Error +44 | +45 | def test_assert_less_equal(self): +46 | self.assertLessEqual(1, 2) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertLessEqual` --> PT009.py:46:9 @@ -331,16 +320,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertLessEqual` 48 | def test_assert_in(self): | help: Replace `assertLessEqual(...)` with `assert ...` - -ℹ Unsafe fix -43 43 | self.assertLess(2, 1) # Error -44 44 | -45 45 | def test_assert_less_equal(self): -46 |- self.assertLessEqual(1, 2) # Error - 46 |+ assert 1 <= 2 # Error -47 47 | -48 48 | def test_assert_in(self): -49 49 | self.assertIn(1, [2, 3]) # Error +43 | self.assertLess(2, 1) # Error +44 | +45 | def test_assert_less_equal(self): + - self.assertLessEqual(1, 2) # Error +46 + assert 1 <= 2 # Error +47 | +48 | def test_assert_in(self): +49 | self.assertIn(1, [2, 3]) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertIn` --> PT009.py:49:9 @@ -352,16 +340,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIn` 51 | def test_assert_not_in(self): | help: Replace `assertIn(...)` with `assert ...` - -ℹ Unsafe fix -46 46 | self.assertLessEqual(1, 2) # Error -47 47 | -48 48 | def test_assert_in(self): -49 |- self.assertIn(1, [2, 3]) # Error - 49 |+ assert 1 in [2, 3] # Error -50 50 | -51 51 | def test_assert_not_in(self): -52 52 | self.assertNotIn(2, [2, 3]) # Error +46 | self.assertLessEqual(1, 2) # Error +47 | +48 | def test_assert_in(self): + - self.assertIn(1, [2, 3]) # Error +49 + assert 1 in [2, 3] # Error +50 | +51 | def test_assert_not_in(self): +52 | self.assertNotIn(2, [2, 3]) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIn` --> PT009.py:52:9 @@ -373,16 +360,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIn` 54 | def test_assert_is_none(self): | help: Replace `assertNotIn(...)` with `assert ...` - -ℹ Unsafe fix -49 49 | self.assertIn(1, [2, 3]) # Error -50 50 | -51 51 | def test_assert_not_in(self): -52 |- self.assertNotIn(2, [2, 3]) # Error - 52 |+ assert 2 not in [2, 3] # Error -53 53 | -54 54 | def test_assert_is_none(self): -55 55 | self.assertIsNone(0) # Error +49 | self.assertIn(1, [2, 3]) # Error +50 | +51 | def test_assert_not_in(self): + - self.assertNotIn(2, [2, 3]) # Error +52 + assert 2 not in [2, 3] # Error +53 | +54 | def test_assert_is_none(self): +55 | self.assertIsNone(0) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNone` --> PT009.py:55:9 @@ -394,16 +380,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNone` 57 | def test_assert_is_not_none(self): | help: Replace `assertIsNone(...)` with `assert ...` - -ℹ Unsafe fix -52 52 | self.assertNotIn(2, [2, 3]) # Error -53 53 | -54 54 | def test_assert_is_none(self): -55 |- self.assertIsNone(0) # Error - 55 |+ assert 0 is None # Error -56 56 | -57 57 | def test_assert_is_not_none(self): -58 58 | self.assertIsNotNone(0) # Error +52 | self.assertNotIn(2, [2, 3]) # Error +53 | +54 | def test_assert_is_none(self): + - self.assertIsNone(0) # Error +55 + assert 0 is None # Error +56 | +57 | def test_assert_is_not_none(self): +58 | self.assertIsNotNone(0) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNotNone` --> PT009.py:58:9 @@ -415,16 +400,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNotNone` 60 | def test_assert_is(self): | help: Replace `assertIsNotNone(...)` with `assert ...` - -ℹ Unsafe fix -55 55 | self.assertIsNone(0) # Error -56 56 | -57 57 | def test_assert_is_not_none(self): -58 |- self.assertIsNotNone(0) # Error - 58 |+ assert 0 is not None # Error -59 59 | -60 60 | def test_assert_is(self): -61 61 | self.assertIs([], []) # Error +55 | self.assertIsNone(0) # Error +56 | +57 | def test_assert_is_not_none(self): + - self.assertIsNotNone(0) # Error +58 + assert 0 is not None # Error +59 | +60 | def test_assert_is(self): +61 | self.assertIs([], []) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertIs` --> PT009.py:61:9 @@ -436,16 +420,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIs` 63 | def test_assert_is_not(self): | help: Replace `assertIs(...)` with `assert ...` - -ℹ Unsafe fix -58 58 | self.assertIsNotNone(0) # Error -59 59 | -60 60 | def test_assert_is(self): -61 |- self.assertIs([], []) # Error - 61 |+ assert [] is [] # Error -62 62 | -63 63 | def test_assert_is_not(self): -64 64 | self.assertIsNot(1, 1) # Error +58 | self.assertIsNotNone(0) # Error +59 | +60 | def test_assert_is(self): + - self.assertIs([], []) # Error +61 + assert [] is [] # Error +62 | +63 | def test_assert_is_not(self): +64 | self.assertIsNot(1, 1) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNot` --> PT009.py:64:9 @@ -457,16 +440,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsNot` 66 | def test_assert_is_instance(self): | help: Replace `assertIsNot(...)` with `assert ...` - -ℹ Unsafe fix -61 61 | self.assertIs([], []) # Error -62 62 | -63 63 | def test_assert_is_not(self): -64 |- self.assertIsNot(1, 1) # Error - 64 |+ assert 1 is not 1 # Error -65 65 | -66 66 | def test_assert_is_instance(self): -67 67 | self.assertIsInstance(1, str) # Error +61 | self.assertIs([], []) # Error +62 | +63 | def test_assert_is_not(self): + - self.assertIsNot(1, 1) # Error +64 + assert 1 is not 1 # Error +65 | +66 | def test_assert_is_instance(self): +67 | self.assertIsInstance(1, str) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertIsInstance` --> PT009.py:67:9 @@ -478,16 +460,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertIsInstance` 69 | def test_assert_is_not_instance(self): | help: Replace `assertIsInstance(...)` with `assert ...` - -ℹ Unsafe fix -64 64 | self.assertIsNot(1, 1) # Error -65 65 | -66 66 | def test_assert_is_instance(self): -67 |- self.assertIsInstance(1, str) # Error - 67 |+ assert isinstance(1, str) # Error -68 68 | -69 69 | def test_assert_is_not_instance(self): -70 70 | self.assertNotIsInstance(1, int) # Error +64 | self.assertIsNot(1, 1) # Error +65 | +66 | def test_assert_is_instance(self): + - self.assertIsInstance(1, str) # Error +67 + assert isinstance(1, str) # Error +68 | +69 | def test_assert_is_not_instance(self): +70 | self.assertNotIsInstance(1, int) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIsInstance` --> PT009.py:70:9 @@ -499,16 +480,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotIsInstance` 72 | def test_assert_regex(self): | help: Replace `assertNotIsInstance(...)` with `assert ...` - -ℹ Unsafe fix -67 67 | self.assertIsInstance(1, str) # Error -68 68 | -69 69 | def test_assert_is_not_instance(self): -70 |- self.assertNotIsInstance(1, int) # Error - 70 |+ assert not isinstance(1, int) # Error -71 71 | -72 72 | def test_assert_regex(self): -73 73 | self.assertRegex("abc", r"def") # Error +67 | self.assertIsInstance(1, str) # Error +68 | +69 | def test_assert_is_not_instance(self): + - self.assertNotIsInstance(1, int) # Error +70 + assert not isinstance(1, int) # Error +71 | +72 | def test_assert_regex(self): +73 | self.assertRegex("abc", r"def") # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertRegex` --> PT009.py:73:9 @@ -520,16 +500,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertRegex` 75 | def test_assert_not_regex(self): | help: Replace `assertRegex(...)` with `assert ...` - -ℹ Unsafe fix -70 70 | self.assertNotIsInstance(1, int) # Error -71 71 | -72 72 | def test_assert_regex(self): -73 |- self.assertRegex("abc", r"def") # Error - 73 |+ assert re.search(r"def", "abc") # Error -74 74 | -75 75 | def test_assert_not_regex(self): -76 76 | self.assertNotRegex("abc", r"abc") # Error +70 | self.assertNotIsInstance(1, int) # Error +71 | +72 | def test_assert_regex(self): + - self.assertRegex("abc", r"def") # Error +73 + assert re.search(r"def", "abc") # Error +74 | +75 | def test_assert_not_regex(self): +76 | self.assertNotRegex("abc", r"abc") # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex` --> PT009.py:76:9 @@ -541,16 +520,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex` 78 | def test_assert_regexp_matches(self): | help: Replace `assertNotRegex(...)` with `assert ...` - -ℹ Unsafe fix -73 73 | self.assertRegex("abc", r"def") # Error -74 74 | -75 75 | def test_assert_not_regex(self): -76 |- self.assertNotRegex("abc", r"abc") # Error - 76 |+ assert not re.search(r"abc", "abc") # Error -77 77 | -78 78 | def test_assert_regexp_matches(self): -79 79 | self.assertRegexpMatches("abc", r"def") # Error +73 | self.assertRegex("abc", r"def") # Error +74 | +75 | def test_assert_not_regex(self): + - self.assertNotRegex("abc", r"abc") # Error +76 + assert not re.search(r"abc", "abc") # Error +77 | +78 | def test_assert_regexp_matches(self): +79 | self.assertRegexpMatches("abc", r"def") # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertRegexpMatches` --> PT009.py:79:9 @@ -562,16 +540,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertRegexpMatches` 81 | def test_assert_not_regexp_matches(self): | help: Replace `assertRegexpMatches(...)` with `assert ...` - -ℹ Unsafe fix -76 76 | self.assertNotRegex("abc", r"abc") # Error -77 77 | -78 78 | def test_assert_regexp_matches(self): -79 |- self.assertRegexpMatches("abc", r"def") # Error - 79 |+ assert re.search(r"def", "abc") # Error -80 80 | -81 81 | def test_assert_not_regexp_matches(self): -82 82 | self.assertNotRegex("abc", r"abc") # Error +76 | self.assertNotRegex("abc", r"abc") # Error +77 | +78 | def test_assert_regexp_matches(self): + - self.assertRegexpMatches("abc", r"def") # Error +79 + assert re.search(r"def", "abc") # Error +80 | +81 | def test_assert_not_regexp_matches(self): +82 | self.assertNotRegex("abc", r"abc") # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex` --> PT009.py:82:9 @@ -583,16 +560,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertNotRegex` 84 | def test_fail_if(self): | help: Replace `assertNotRegex(...)` with `assert ...` - -ℹ Unsafe fix -79 79 | self.assertRegexpMatches("abc", r"def") # Error -80 80 | -81 81 | def test_assert_not_regexp_matches(self): -82 |- self.assertNotRegex("abc", r"abc") # Error - 82 |+ assert not re.search(r"abc", "abc") # Error -83 83 | -84 84 | def test_fail_if(self): -85 85 | self.failIf("abc") # Error +79 | self.assertRegexpMatches("abc", r"def") # Error +80 | +81 | def test_assert_not_regexp_matches(self): + - self.assertNotRegex("abc", r"abc") # Error +82 + assert not re.search(r"abc", "abc") # Error +83 | +84 | def test_fail_if(self): +85 | self.failIf("abc") # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `failIf` --> PT009.py:85:9 @@ -604,16 +580,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failIf` 87 | def test_fail_unless(self): | help: Replace `failIf(...)` with `assert ...` - -ℹ Unsafe fix -82 82 | self.assertNotRegex("abc", r"abc") # Error -83 83 | -84 84 | def test_fail_if(self): -85 |- self.failIf("abc") # Error - 85 |+ assert not "abc" # Error -86 86 | -87 87 | def test_fail_unless(self): -88 88 | self.failUnless("abc") # Error +82 | self.assertNotRegex("abc", r"abc") # Error +83 | +84 | def test_fail_if(self): + - self.failIf("abc") # Error +85 + assert not "abc" # Error +86 | +87 | def test_fail_unless(self): +88 | self.failUnless("abc") # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `failUnless` --> PT009.py:88:9 @@ -625,16 +600,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failUnless` 90 | def test_fail_unless_equal(self): | help: Replace `failUnless(...)` with `assert ...` - -ℹ Unsafe fix -85 85 | self.failIf("abc") # Error -86 86 | -87 87 | def test_fail_unless(self): -88 |- self.failUnless("abc") # Error - 88 |+ assert "abc" # Error -89 89 | -90 90 | def test_fail_unless_equal(self): -91 91 | self.failUnlessEqual(1, 2) # Error +85 | self.failIf("abc") # Error +86 | +87 | def test_fail_unless(self): + - self.failUnless("abc") # Error +88 + assert "abc" # Error +89 | +90 | def test_fail_unless_equal(self): +91 | self.failUnlessEqual(1, 2) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `failUnlessEqual` --> PT009.py:91:9 @@ -646,16 +620,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failUnlessEqual` 93 | def test_fail_if_equal(self): | help: Replace `failUnlessEqual(...)` with `assert ...` - -ℹ Unsafe fix -88 88 | self.failUnless("abc") # Error -89 89 | -90 90 | def test_fail_unless_equal(self): -91 |- self.failUnlessEqual(1, 2) # Error - 91 |+ assert 1 == 2 # Error -92 92 | -93 93 | def test_fail_if_equal(self): -94 94 | self.failIfEqual(1, 2) # Error +88 | self.failUnless("abc") # Error +89 | +90 | def test_fail_unless_equal(self): + - self.failUnlessEqual(1, 2) # Error +91 + assert 1 == 2 # Error +92 | +93 | def test_fail_if_equal(self): +94 | self.failIfEqual(1, 2) # Error +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `failIfEqual` --> PT009.py:94:9 @@ -665,16 +638,15 @@ PT009 [*] Use a regular `assert` instead of unittest-style `failIfEqual` | ^^^^^^^^^^^^^^^^ | help: Replace `failIfEqual(...)` with `assert ...` - -ℹ Unsafe fix -91 91 | self.failUnlessEqual(1, 2) # Error -92 92 | -93 93 | def test_fail_if_equal(self): -94 |- self.failIfEqual(1, 2) # Error - 94 |+ assert 1 != 2 # Error -95 95 | -96 96 | -97 97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517 +91 | self.failUnlessEqual(1, 2) # Error +92 | +93 | def test_fail_if_equal(self): + - self.failIfEqual(1, 2) # Error +94 + assert 1 != 2 # Error +95 | +96 | +97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517 +note: This is an unsafe fix and may change runtime behavior PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` --> PT009.py:98:2 @@ -686,12 +658,11 @@ PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue` 100 | self.model.piAx_piAy_beta[r][x][y]))) | help: Replace `assertTrue(...)` with `assert ...` - -ℹ Unsafe fix -95 95 | -96 96 | -97 97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517 -98 |-(self.assertTrue( -99 |- "piAx_piAy_beta[r][x][y] = {17}".format( -100 |- self.model.piAx_piAy_beta[r][x][y]))) - 98 |+assert "piAx_piAy_beta[r][x][y] = {17}".format(self.model.piAx_piAy_beta[r][x][y]) +95 | +96 | +97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517 + - (self.assertTrue( + - "piAx_piAy_beta[r][x][y] = {17}".format( + - self.model.piAx_piAy_beta[r][x][y]))) +98 + assert "piAx_piAy_beta[r][x][y] = {17}".format(self.model.piAx_piAy_beta[r][x][y]) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap index 9b185de803..8d1ca47175 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT014.snap @@ -10,16 +10,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` 6 | ... | help: Remove duplicate test case - -ℹ Unsafe fix -1 1 | import pytest -2 2 | -3 3 | -4 |-@pytest.mark.parametrize("x", [1, 1, 2]) - 4 |+@pytest.mark.parametrize("x", [1, 2]) -5 5 | def test_error_literal(x): -6 6 | ... -7 7 | +1 | import pytest +2 | +3 | + - @pytest.mark.parametrize("x", [1, 1, 2]) +4 + @pytest.mark.parametrize("x", [1, 2]) +5 | def test_error_literal(x): +6 | ... +7 | +note: This is an unsafe fix and may change runtime behavior PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` --> PT014.py:14:35 @@ -30,16 +29,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` 16 | ... | help: Remove duplicate test case - -ℹ Unsafe fix -11 11 | c = 3 -12 12 | -13 13 | -14 |-@pytest.mark.parametrize("x", [a, a, b, b, b, c]) - 14 |+@pytest.mark.parametrize("x", [a, b, b, b, c]) -15 15 | def test_error_expr_simple(x): -16 16 | ... -17 17 | +11 | c = 3 +12 | +13 | + - @pytest.mark.parametrize("x", [a, a, b, b, b, c]) +14 + @pytest.mark.parametrize("x", [a, b, b, b, c]) +15 | def test_error_expr_simple(x): +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize` --> PT014.py:14:41 @@ -50,16 +48,15 @@ PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize` 16 | ... | help: Remove duplicate test case - -ℹ Unsafe fix -11 11 | c = 3 -12 12 | -13 13 | -14 |-@pytest.mark.parametrize("x", [a, a, b, b, b, c]) - 14 |+@pytest.mark.parametrize("x", [a, a, b, b, c]) -15 15 | def test_error_expr_simple(x): -16 16 | ... -17 17 | +11 | c = 3 +12 | +13 | + - @pytest.mark.parametrize("x", [a, a, b, b, b, c]) +14 + @pytest.mark.parametrize("x", [a, a, b, b, c]) +15 | def test_error_expr_simple(x): +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize` --> PT014.py:14:44 @@ -70,16 +67,15 @@ PT014 [*] Duplicate of test case at index 2 in `pytest.mark.parametrize` 16 | ... | help: Remove duplicate test case - -ℹ Unsafe fix -11 11 | c = 3 -12 12 | -13 13 | -14 |-@pytest.mark.parametrize("x", [a, a, b, b, b, c]) - 14 |+@pytest.mark.parametrize("x", [a, a, b, b, c]) -15 15 | def test_error_expr_simple(x): -16 16 | ... -17 17 | +11 | c = 3 +12 | +13 | + - @pytest.mark.parametrize("x", [a, a, b, b, b, c]) +14 + @pytest.mark.parametrize("x", [a, a, b, b, c]) +15 | def test_error_expr_simple(x): +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior PT014 Duplicate of test case at index 0 in `pytest.mark.parametrize` --> PT014.py:24:9 @@ -102,16 +98,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` 34 | ... | help: Remove duplicate test case - -ℹ Unsafe fix -29 29 | ... -30 30 | -31 31 | -32 |-@pytest.mark.parametrize("x", [a, b, (a), c, ((a))]) - 32 |+@pytest.mark.parametrize("x", [a, b, c, ((a))]) -33 33 | def test_error_parentheses(x): -34 34 | ... -35 35 | +29 | ... +30 | +31 | + - @pytest.mark.parametrize("x", [a, b, (a), c, ((a))]) +32 + @pytest.mark.parametrize("x", [a, b, c, ((a))]) +33 | def test_error_parentheses(x): +34 | ... +35 | +note: This is an unsafe fix and may change runtime behavior PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` --> PT014.py:32:48 @@ -122,16 +117,15 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` 34 | ... | help: Remove duplicate test case - -ℹ Unsafe fix -29 29 | ... -30 30 | -31 31 | -32 |-@pytest.mark.parametrize("x", [a, b, (a), c, ((a))]) - 32 |+@pytest.mark.parametrize("x", [a, b, (a), c]) -33 33 | def test_error_parentheses(x): -34 34 | ... -35 35 | +29 | ... +30 | +31 | + - @pytest.mark.parametrize("x", [a, b, (a), c, ((a))]) +32 + @pytest.mark.parametrize("x", [a, b, (a), c]) +33 | def test_error_parentheses(x): +34 | ... +35 | +note: This is an unsafe fix and may change runtime behavior PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` --> PT014.py:42:10 @@ -144,15 +138,14 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` 44 | ((a)), | help: Remove duplicate test case - -ℹ Unsafe fix -39 39 | [ -40 40 | a, -41 41 | b, -42 |- (a), -43 42 | c, -44 43 | ((a)), -45 44 | ], +39 | [ +40 | a, +41 | b, + - (a), +42 | c, +43 | ((a)), +44 | ], +note: This is an unsafe fix and may change runtime behavior PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` --> PT014.py:44:11 @@ -165,15 +158,14 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` 46 | ) | help: Remove duplicate test case - -ℹ Unsafe fix -41 41 | b, -42 42 | (a), -43 43 | c, -44 |- ((a)), -45 44 | ], -46 45 | ) -47 46 | def test_error_parentheses_trailing_comma(x): +41 | b, +42 | (a), +43 | c, + - ((a)), +44 | ], +45 | ) +46 | def test_error_parentheses_trailing_comma(x): +note: This is an unsafe fix and may change runtime behavior PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` --> PT014.py:56:53 @@ -184,12 +176,11 @@ PT014 [*] Duplicate of test case at index 0 in `pytest.mark.parametrize` 58 | ... | help: Remove duplicate test case - -ℹ Unsafe fix -53 53 | ... -54 54 | -55 55 | -56 |-@pytest.mark.parametrize('data, spec', [(1.0, 1.0), (1.0, 1.0)]) - 56 |+@pytest.mark.parametrize('data, spec', [(1.0, 1.0)]) -57 57 | def test_numbers(data, spec): -58 58 | ... +53 | ... +54 | +55 | + - @pytest.mark.parametrize('data, spec', [(1.0, 1.0), (1.0, 1.0)]) +56 + @pytest.mark.parametrize('data, spec', [(1.0, 1.0)]) +57 | def test_numbers(data, spec): +58 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap index 5cc41f4ecd..6f1f36fe00 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT018.snap @@ -11,17 +11,16 @@ PT018 [*] Assertion should be broken down into multiple parts 16 | assert something and not something_else | help: Break down assertion into multiple parts - -ℹ Unsafe fix -11 11 | -12 12 | -13 13 | def test_error(): -14 |- assert something and something_else - 14 |+ assert something - 15 |+ assert something_else -15 16 | assert something and something_else and something_third -16 17 | assert something and not something_else -17 18 | assert something and (something_else or something_third) +11 | +12 | +13 | def test_error(): + - assert something and something_else +14 + assert something +15 + assert something_else +16 | assert something and something_else and something_third +17 | assert something and not something_else +18 | assert something and (something_else or something_third) +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:15:5 @@ -34,17 +33,16 @@ PT018 [*] Assertion should be broken down into multiple parts 17 | assert something and (something_else or something_third) | help: Break down assertion into multiple parts - -ℹ Unsafe fix -12 12 | -13 13 | def test_error(): -14 14 | assert something and something_else -15 |- assert something and something_else and something_third - 15 |+ assert something and something_else - 16 |+ assert something_third -16 17 | assert something and not something_else -17 18 | assert something and (something_else or something_third) -18 19 | assert not something and something_else +12 | +13 | def test_error(): +14 | assert something and something_else + - assert something and something_else and something_third +15 + assert something and something_else +16 + assert something_third +17 | assert something and not something_else +18 | assert something and (something_else or something_third) +19 | assert not something and something_else +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:16:5 @@ -57,17 +55,16 @@ PT018 [*] Assertion should be broken down into multiple parts 18 | assert not something and something_else | help: Break down assertion into multiple parts - -ℹ Unsafe fix -13 13 | def test_error(): -14 14 | assert something and something_else -15 15 | assert something and something_else and something_third -16 |- assert something and not something_else - 16 |+ assert something - 17 |+ assert not something_else -17 18 | assert something and (something_else or something_third) -18 19 | assert not something and something_else -19 20 | assert not (something or something_else) +13 | def test_error(): +14 | assert something and something_else +15 | assert something and something_else and something_third + - assert something and not something_else +16 + assert something +17 + assert not something_else +18 | assert something and (something_else or something_third) +19 | assert not something and something_else +20 | assert not (something or something_else) +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:17:5 @@ -80,17 +77,16 @@ PT018 [*] Assertion should be broken down into multiple parts 19 | assert not (something or something_else) | help: Break down assertion into multiple parts - -ℹ Unsafe fix -14 14 | assert something and something_else -15 15 | assert something and something_else and something_third -16 16 | assert something and not something_else -17 |- assert something and (something_else or something_third) - 17 |+ assert something - 18 |+ assert (something_else or something_third) -18 19 | assert not something and something_else -19 20 | assert not (something or something_else) -20 21 | assert not (something or something_else or something_third) +14 | assert something and something_else +15 | assert something and something_else and something_third +16 | assert something and not something_else + - assert something and (something_else or something_third) +17 + assert something +18 + assert (something_else or something_third) +19 | assert not something and something_else +20 | assert not (something or something_else) +21 | assert not (something or something_else or something_third) +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:18:5 @@ -103,17 +99,16 @@ PT018 [*] Assertion should be broken down into multiple parts 20 | assert not (something or something_else or something_third) | help: Break down assertion into multiple parts - -ℹ Unsafe fix -15 15 | assert something and something_else and something_third -16 16 | assert something and not something_else -17 17 | assert something and (something_else or something_third) -18 |- assert not something and something_else - 18 |+ assert not something - 19 |+ assert something_else -19 20 | assert not (something or something_else) -20 21 | assert not (something or something_else or something_third) -21 22 | assert something and something_else == """error +15 | assert something and something_else and something_third +16 | assert something and not something_else +17 | assert something and (something_else or something_third) + - assert not something and something_else +18 + assert not something +19 + assert something_else +20 | assert not (something or something_else) +21 | assert not (something or something_else or something_third) +22 | assert something and something_else == """error +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:19:5 @@ -126,17 +121,16 @@ PT018 [*] Assertion should be broken down into multiple parts 21 | assert something and something_else == """error | help: Break down assertion into multiple parts - -ℹ Unsafe fix -16 16 | assert something and not something_else -17 17 | assert something and (something_else or something_third) -18 18 | assert not something and something_else -19 |- assert not (something or something_else) - 19 |+ assert not something - 20 |+ assert not something_else -20 21 | assert not (something or something_else or something_third) -21 22 | assert something and something_else == """error -22 23 | message +16 | assert something and not something_else +17 | assert something and (something_else or something_third) +18 | assert not something and something_else + - assert not (something or something_else) +19 + assert not something +20 + assert not something_else +21 | assert not (something or something_else or something_third) +22 | assert something and something_else == """error +23 | message +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:20:5 @@ -149,17 +143,16 @@ PT018 [*] Assertion should be broken down into multiple parts 22 | message | help: Break down assertion into multiple parts - -ℹ Unsafe fix -17 17 | assert something and (something_else or something_third) -18 18 | assert not something and something_else -19 19 | assert not (something or something_else) -20 |- assert not (something or something_else or something_third) - 20 |+ assert not (something or something_else) - 21 |+ assert not something_third -21 22 | assert something and something_else == """error -22 23 | message -23 24 | """ +17 | assert something and (something_else or something_third) +18 | assert not something and something_else +19 | assert not (something or something_else) + - assert not (something or something_else or something_third) +20 + assert not (something or something_else) +21 + assert not something_third +22 | assert something and something_else == """error +23 | message +24 | """ +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:21:5 @@ -174,17 +167,16 @@ PT018 [*] Assertion should be broken down into multiple parts 25 | something | help: Break down assertion into multiple parts - -ℹ Unsafe fix -18 18 | assert not something and something_else -19 19 | assert not (something or something_else) -20 20 | assert not (something or something_else or something_third) -21 |- assert something and something_else == """error - 21 |+ assert something - 22 |+ assert something_else == """error -22 23 | message -23 24 | """ -24 25 | assert ( +18 | assert not something and something_else +19 | assert not (something or something_else) +20 | assert not (something or something_else or something_third) + - assert something and something_else == """error +21 + assert something +22 + assert something_else == """error +23 | message +24 | """ +25 | assert ( +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:24:5 @@ -203,19 +195,18 @@ PT018 [*] Assertion should be broken down into multiple parts 32 | # recursive case | help: Break down assertion into multiple parts - -ℹ Unsafe fix -21 21 | assert something and something_else == """error -22 22 | message -23 23 | """ - 24 |+ assert something -24 25 | assert ( -25 |- something -26 |- and something_else - 26 |+ something_else -27 27 | == """error -28 28 | message -29 29 | """ +21 | assert something and something_else == """error +22 | message +23 | """ +24 + assert something +25 | assert ( + - something + - and something_else +26 + something_else +27 | == """error +28 | message +29 | """ +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:33:5 @@ -226,17 +217,16 @@ PT018 [*] Assertion should be broken down into multiple parts 34 | assert not (a or not (b and c)) | help: Break down assertion into multiple parts - -ℹ Unsafe fix -30 30 | ) -31 31 | -32 32 | # recursive case -33 |- assert not (a or not (b or c)) - 33 |+ assert not a - 34 |+ assert (b or c) -34 35 | assert not (a or not (b and c)) -35 36 | -36 37 | # detected, but no fix for messages +30 | ) +31 | +32 | # recursive case + - assert not (a or not (b or c)) +33 + assert not a +34 + assert (b or c) +35 | assert not (a or not (b and c)) +36 | +37 | # detected, but no fix for messages +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:34:5 @@ -249,17 +239,16 @@ PT018 [*] Assertion should be broken down into multiple parts 36 | # detected, but no fix for messages | help: Break down assertion into multiple parts - -ℹ Unsafe fix -31 31 | -32 32 | # recursive case -33 33 | assert not (a or not (b or c)) -34 |- assert not (a or not (b and c)) - 34 |+ assert not a - 35 |+ assert (b and c) -35 36 | -36 37 | # detected, but no fix for messages -37 38 | assert something and something_else, "error message" +31 | +32 | # recursive case +33 | assert not (a or not (b or c)) + - assert not (a or not (b and c)) +34 + assert not a +35 + assert (b and c) +36 | +37 | # detected, but no fix for messages +38 | assert something and something_else, "error message" +note: This is an unsafe fix and may change runtime behavior PT018 Assertion should be broken down into multiple parts --> PT018.py:37:5 @@ -303,17 +292,16 @@ PT018 [*] Assertion should be broken down into multiple parts 45 | assert something and something_else and something_third # Error | help: Break down assertion into multiple parts - -ℹ Unsafe fix -41 41 | -42 42 | -43 43 | assert something # OK -44 |-assert something and something_else # Error - 44 |+assert something - 45 |+assert something_else -45 46 | assert something and something_else and something_third # Error -46 47 | -47 48 | +41 | +42 | +43 | assert something # OK + - assert something and something_else # Error +44 + assert something +45 + assert something_else +46 | assert something and something_else and something_third # Error +47 | +48 | +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:45:1 @@ -324,17 +312,16 @@ PT018 [*] Assertion should be broken down into multiple parts | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Break down assertion into multiple parts - -ℹ Unsafe fix -42 42 | -43 43 | assert something # OK -44 44 | assert something and something_else # Error -45 |-assert something and something_else and something_third # Error - 45 |+assert something and something_else - 46 |+assert something_third -46 47 | -47 48 | -48 49 | def test_multiline(): +42 | +43 | assert something # OK +44 | assert something and something_else # Error + - assert something and something_else and something_third # Error +45 + assert something and something_else +46 + assert something_third +47 | +48 | +49 | def test_multiline(): +note: This is an unsafe fix and may change runtime behavior PT018 Assertion should be broken down into multiple parts --> PT018.py:49:5 @@ -383,19 +370,18 @@ PT018 [*] Assertion should be broken down into multiple parts 65 | assert (not ( | help: Break down assertion into multiple parts - -ℹ Unsafe fix -59 59 | assert not ( -60 60 | self.find_graph_output(node.output[0]) -61 61 | or self.find_graph_input(node.input[0]) -62 |- or self.find_graph_output(node.input[0]) -63 62 | ) - 63 |+ assert not ( - 64 |+ self.find_graph_output(node.input[0]) - 65 |+ ) -64 66 | -65 67 | assert (not ( -66 68 | self.find_graph_output(node.output[0]) +59 | assert not ( +60 | self.find_graph_output(node.output[0]) +61 | or self.find_graph_input(node.input[0]) + - or self.find_graph_output(node.input[0]) +62 | ) +63 + assert not ( +64 + self.find_graph_output(node.input[0]) +65 + ) +66 | +67 | assert (not ( +68 | self.find_graph_output(node.output[0]) +note: This is an unsafe fix and may change runtime behavior PT018 [*] Assertion should be broken down into multiple parts --> PT018.py:65:5 @@ -412,21 +398,20 @@ PT018 [*] Assertion should be broken down into multiple parts 71 | assert (not self.find_graph_output(node.output[0]) or | help: Break down assertion into multiple parts - -ℹ Unsafe fix -62 62 | or self.find_graph_output(node.input[0]) -63 63 | ) -64 64 | -65 |- assert (not ( - 65 |+ assert not ( -66 66 | self.find_graph_output(node.output[0]) -67 67 | or self.find_graph_input(node.input[0]) -68 |- or self.find_graph_output(node.input[0]) -69 |- )) - 68 |+ ) - 69 |+ assert not ( - 70 |+ self.find_graph_output(node.input[0]) - 71 |+ ) -70 72 | -71 73 | assert (not self.find_graph_output(node.output[0]) or -72 74 | self.find_graph_input(node.input[0])) +62 | or self.find_graph_output(node.input[0]) +63 | ) +64 | + - assert (not ( +65 + assert not ( +66 | self.find_graph_output(node.output[0]) +67 | or self.find_graph_input(node.input[0]) + - or self.find_graph_output(node.input[0]) + - )) +68 + ) +69 + assert not ( +70 + self.find_graph_output(node.input[0]) +71 + ) +72 | +73 | assert (not self.find_graph_output(node.output[0]) or +74 | self.find_graph_input(node.input[0])) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap index 9fd4aa5ea5..5357296de9 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT022.snap @@ -10,16 +10,14 @@ PT022 [*] No teardown in fixture `error`, use `return` instead of `yield` | ^^^^^^^^^^^^^^ | help: Replace `yield` with `return` - -ℹ Safe fix -14 14 | @pytest.fixture() -15 15 | def error(): -16 16 | resource = acquire_resource() -17 |- yield resource - 17 |+ return resource -18 18 | -19 19 | -20 20 | import typing +14 | @pytest.fixture() +15 | def error(): +16 | resource = acquire_resource() + - yield resource +17 + return resource +18 | +19 | +20 | import typing PT022 [*] No teardown in fixture `error`, use `return` instead of `yield` --> PT022.py:37:5 @@ -30,19 +28,17 @@ PT022 [*] No teardown in fixture `error`, use `return` instead of `yield` | ^^^^^^^^^^^^^^ | help: Replace `yield` with `return` - -ℹ Safe fix -32 32 | -33 33 | -34 34 | @pytest.fixture() -35 |-def error() -> typing.Generator[typing.Any, None, None]: - 35 |+def error() -> typing.Any: -36 36 | resource = acquire_resource() -37 |- yield resource - 37 |+ return resource -38 38 | -39 39 | -40 40 | @pytest.fixture() +32 | +33 | +34 | @pytest.fixture() + - def error() -> typing.Generator[typing.Any, None, None]: +35 + def error() -> typing.Any: +36 | resource = acquire_resource() + - yield resource +37 + return resource +38 | +39 | +40 | @pytest.fixture() PT022 [*] No teardown in fixture `error`, use `return` instead of `yield` --> PT022.py:43:5 @@ -53,13 +49,11 @@ PT022 [*] No teardown in fixture `error`, use `return` instead of `yield` | ^^^^^^^^^^^^^^ | help: Replace `yield` with `return` - -ℹ Safe fix -38 38 | -39 39 | -40 40 | @pytest.fixture() -41 |-def error() -> Generator[Resource, None, None]: - 41 |+def error() -> Resource: -42 42 | resource = acquire_resource() -43 |- yield resource - 43 |+ return resource +38 | +39 | +40 | @pytest.fixture() + - def error() -> Generator[Resource, None, None]: +41 + def error() -> Resource: +42 | resource = acquire_resource() + - yield resource +43 + return resource diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap index da2feb3179..b51af3ecc7 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_default.snap @@ -10,16 +10,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` 53 | pass | help: Remove parentheses - -ℹ Safe fix -48 48 | # With parentheses -49 49 | -50 50 | -51 |-@pytest.mark.foo() - 51 |+@pytest.mark.foo -52 52 | def test_something(): -53 53 | pass -54 54 | +48 | # With parentheses +49 | +50 | + - @pytest.mark.foo() +51 + @pytest.mark.foo +52 | def test_something(): +53 | pass +54 | PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` --> PT023.py:56:1 @@ -30,16 +28,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` 58 | def test_something(): | help: Remove parentheses - -ℹ Safe fix -53 53 | pass -54 54 | -55 55 | -56 |-@pytest.mark.foo() - 56 |+@pytest.mark.foo -57 57 | class TestClass: -58 58 | def test_something(): -59 59 | pass +53 | pass +54 | +55 | + - @pytest.mark.foo() +56 + @pytest.mark.foo +57 | class TestClass: +58 | def test_something(): +59 | pass PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` --> PT023.py:63:5 @@ -51,16 +47,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` 65 | pass | help: Remove parentheses - -ℹ Safe fix -60 60 | -61 61 | -62 62 | class TestClass: -63 |- @pytest.mark.foo() - 63 |+ @pytest.mark.foo -64 64 | def test_something(): -65 65 | pass -66 66 | +60 | +61 | +62 | class TestClass: + - @pytest.mark.foo() +63 + @pytest.mark.foo +64 | def test_something(): +65 | pass +66 | PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` --> PT023.py:69:5 @@ -72,16 +66,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` 71 | def test_something(): | help: Remove parentheses - -ℹ Safe fix -66 66 | -67 67 | -68 68 | class TestClass: -69 |- @pytest.mark.foo() - 69 |+ @pytest.mark.foo -70 70 | class TestNestedClass: -71 71 | def test_something(): -72 72 | pass +66 | +67 | +68 | class TestClass: + - @pytest.mark.foo() +69 + @pytest.mark.foo +70 | class TestNestedClass: +71 | def test_something(): +72 | pass PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` --> PT023.py:77:9 @@ -94,16 +86,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` 79 | pass | help: Remove parentheses - -ℹ Safe fix -74 74 | -75 75 | class TestClass: -76 76 | class TestNestedClass: -77 |- @pytest.mark.foo() - 77 |+ @pytest.mark.foo -78 78 | def test_something(): -79 79 | pass -80 80 | +74 | +75 | class TestClass: +76 | class TestNestedClass: + - @pytest.mark.foo() +77 + @pytest.mark.foo +78 | def test_something(): +79 | pass +80 | PT023 [*] Use `@pytest.mark.parametrize` over `@pytest.mark.parametrize()` --> PT023.py:82:1 @@ -121,23 +111,22 @@ PT023 [*] Use `@pytest.mark.parametrize` over `@pytest.mark.parametrize()` 90 | def test_bar(param1, param2): ... | help: Remove parentheses - -ℹ Unsafe fix -79 79 | pass -80 80 | -81 81 | # https://github.com/astral-sh/ruff/issues/18770 -82 |-@pytest.mark.parametrize( -83 |- # TODO: fix later -84 |- # ("param1", "param2"), -85 |- # ( -86 |- # (1, 2), -87 |- # (3, 4), -88 |- # ), -89 |-) - 82 |+@pytest.mark.parametrize -90 83 | def test_bar(param1, param2): ... -91 84 | -92 85 | +79 | pass +80 | +81 | # https://github.com/astral-sh/ruff/issues/18770 + - @pytest.mark.parametrize( + - # TODO: fix later + - # ("param1", "param2"), + - # ( + - # (1, 2), + - # (3, 4), + - # ), + - ) +82 + @pytest.mark.parametrize +83 | def test_bar(param1, param2): ... +84 | +85 | +note: This is an unsafe fix and may change runtime behavior PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` --> PT023.py:93:1 @@ -148,16 +137,14 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` 95 | pass | help: Remove parentheses - -ℹ Safe fix -90 90 | def test_bar(param1, param2): ... -91 91 | -92 92 | -93 |-@(pytest.mark.foo()) - 93 |+@(pytest.mark.foo) -94 94 | def test_outer_paren_mark_function(): -95 95 | pass -96 96 | +90 | def test_bar(param1, param2): ... +91 | +92 | + - @(pytest.mark.foo()) +93 + @(pytest.mark.foo) +94 | def test_outer_paren_mark_function(): +95 | pass +96 | PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` --> PT023.py:99:5 @@ -169,12 +156,10 @@ PT023 [*] Use `@pytest.mark.foo` over `@pytest.mark.foo()` 101 | pass | help: Remove parentheses - -ℹ Safe fix -96 96 | -97 97 | -98 98 | class TestClass: -99 |- @(pytest.mark.foo()) - 99 |+ @(pytest.mark.foo) -100 100 | def test_method_outer_paren(): -101 101 | pass +96 | +97 | +98 | class TestClass: + - @(pytest.mark.foo()) +99 + @(pytest.mark.foo) +100 | def test_method_outer_paren(): +101 | pass diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap index ea28de9fa3..0aa1e719af 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT023_parentheses.snap @@ -10,16 +10,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` 19 | pass | help: Add parentheses - -ℹ Safe fix -14 14 | # Without parentheses -15 15 | -16 16 | -17 |-@pytest.mark.foo - 17 |+@pytest.mark.foo() -18 18 | def test_something(): -19 19 | pass -20 20 | +14 | # Without parentheses +15 | +16 | + - @pytest.mark.foo +17 + @pytest.mark.foo() +18 | def test_something(): +19 | pass +20 | PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` --> PT023.py:22:1 @@ -30,16 +28,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` 24 | def test_something(): | help: Add parentheses - -ℹ Safe fix -19 19 | pass -20 20 | -21 21 | -22 |-@pytest.mark.foo - 22 |+@pytest.mark.foo() -23 23 | class TestClass: -24 24 | def test_something(): -25 25 | pass +19 | pass +20 | +21 | + - @pytest.mark.foo +22 + @pytest.mark.foo() +23 | class TestClass: +24 | def test_something(): +25 | pass PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` --> PT023.py:29:5 @@ -51,16 +47,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` 31 | pass | help: Add parentheses - -ℹ Safe fix -26 26 | -27 27 | -28 28 | class TestClass: -29 |- @pytest.mark.foo - 29 |+ @pytest.mark.foo() -30 30 | def test_something(): -31 31 | pass -32 32 | +26 | +27 | +28 | class TestClass: + - @pytest.mark.foo +29 + @pytest.mark.foo() +30 | def test_something(): +31 | pass +32 | PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` --> PT023.py:35:5 @@ -72,16 +66,14 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` 37 | def test_something(): | help: Add parentheses - -ℹ Safe fix -32 32 | -33 33 | -34 34 | class TestClass: -35 |- @pytest.mark.foo - 35 |+ @pytest.mark.foo() -36 36 | class TestNestedClass: -37 37 | def test_something(): -38 38 | pass +32 | +33 | +34 | class TestClass: + - @pytest.mark.foo +35 + @pytest.mark.foo() +36 | class TestNestedClass: +37 | def test_something(): +38 | pass PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` --> PT023.py:43:9 @@ -94,13 +86,11 @@ PT023 [*] Use `@pytest.mark.foo()` over `@pytest.mark.foo` 45 | pass | help: Add parentheses - -ℹ Safe fix -40 40 | -41 41 | class TestClass: -42 42 | class TestNestedClass: -43 |- @pytest.mark.foo - 43 |+ @pytest.mark.foo() -44 44 | def test_something(): -45 45 | pass -46 46 | +40 | +41 | class TestClass: +42 | class TestNestedClass: + - @pytest.mark.foo +43 + @pytest.mark.foo() +44 | def test_something(): +45 | pass +46 | diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap index fa977bf675..d031f59879 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT024.snap @@ -10,15 +10,13 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures 16 | async def my_fixture(): # Error before | help: Remove `pytest.mark.asyncio` - -ℹ Safe fix -11 11 | pass -12 12 | -13 13 | -14 |-@pytest.mark.asyncio() -15 14 | @pytest.fixture() -16 15 | async def my_fixture(): # Error before -17 16 | return 0 +11 | pass +12 | +13 | + - @pytest.mark.asyncio() +14 | @pytest.fixture() +15 | async def my_fixture(): # Error before +16 | return 0 PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures --> PT024.py:20:1 @@ -29,15 +27,13 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures 22 | async def my_fixture(): # Error before no parens | help: Remove `pytest.mark.asyncio` - -ℹ Safe fix -17 17 | return 0 -18 18 | -19 19 | -20 |-@pytest.mark.asyncio -21 20 | @pytest.fixture() -22 21 | async def my_fixture(): # Error before no parens -23 22 | return 0 +17 | return 0 +18 | +19 | + - @pytest.mark.asyncio +20 | @pytest.fixture() +21 | async def my_fixture(): # Error before no parens +22 | return 0 PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures --> PT024.py:27:1 @@ -49,15 +45,13 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures 29 | return 0 | help: Remove `pytest.mark.asyncio` - -ℹ Safe fix -24 24 | -25 25 | -26 26 | @pytest.fixture() -27 |-@pytest.mark.asyncio() -28 27 | async def my_fixture(): # Error after -29 28 | return 0 -30 29 | +24 | +25 | +26 | @pytest.fixture() + - @pytest.mark.asyncio() +27 | async def my_fixture(): # Error after +28 | return 0 +29 | PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures --> PT024.py:33:1 @@ -69,11 +63,9 @@ PT024 [*] `pytest.mark.asyncio` is unnecessary for fixtures 35 | return 0 | help: Remove `pytest.mark.asyncio` - -ℹ Safe fix -30 30 | -31 31 | -32 32 | @pytest.fixture() -33 |-@pytest.mark.asyncio -34 33 | async def my_fixture(): # Error after no parens -35 34 | return 0 +30 | +31 | +32 | @pytest.fixture() + - @pytest.mark.asyncio +33 | async def my_fixture(): # Error after no parens +34 | return 0 diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap index f7b1fcc698..7cf1605386 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT025.snap @@ -10,15 +10,13 @@ PT025 [*] `pytest.mark.usefixtures` has no effect on fixtures 11 | def my_fixture(): # Error before | help: Remove `pytest.mark.usefixtures` - -ℹ Safe fix -6 6 | pass -7 7 | -8 8 | -9 |-@pytest.mark.usefixtures("a") -10 9 | @pytest.fixture() -11 10 | def my_fixture(): # Error before -12 11 | return 0 +6 | pass +7 | +8 | + - @pytest.mark.usefixtures("a") +9 | @pytest.fixture() +10 | def my_fixture(): # Error before +11 | return 0 PT025 [*] `pytest.mark.usefixtures` has no effect on fixtures --> PT025.py:16:1 @@ -30,11 +28,9 @@ PT025 [*] `pytest.mark.usefixtures` has no effect on fixtures 18 | return 0 | help: Remove `pytest.mark.usefixtures` - -ℹ Safe fix -13 13 | -14 14 | -15 15 | @pytest.fixture() -16 |-@pytest.mark.usefixtures("a") -17 16 | def my_fixture(): # Error after -18 17 | return 0 +13 | +14 | +15 | @pytest.fixture() + - @pytest.mark.usefixtures("a") +16 | def my_fixture(): # Error after +17 | return 0 diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap index 7ecf7d42de..58441fefe2 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT026.snap @@ -10,16 +10,15 @@ PT026 [*] Useless `pytest.mark.usefixtures` without parameters 21 | pass | help: Remove `usefixtures` decorator or pass parameters - -ℹ Unsafe fix -16 16 | pass -17 17 | -18 18 | -19 |-@pytest.mark.usefixtures() - 19 |+ -20 20 | def test_error_with_parens(): -21 21 | pass -22 22 | +16 | pass +17 | +18 | + - @pytest.mark.usefixtures() +19 + +20 | def test_error_with_parens(): +21 | pass +22 | +note: This is an unsafe fix and may change runtime behavior PT026 [*] Useless `pytest.mark.usefixtures` without parameters --> PT026.py:24:1 @@ -30,12 +29,11 @@ PT026 [*] Useless `pytest.mark.usefixtures` without parameters 26 | pass | help: Remove `usefixtures` decorator or pass parameters - -ℹ Unsafe fix -21 21 | pass -22 22 | -23 23 | -24 |-@pytest.mark.usefixtures - 24 |+ -25 25 | def test_error_no_parens(): -26 26 | pass +21 | pass +22 | +23 | + - @pytest.mark.usefixtures +24 + +25 | def test_error_no_parens(): +26 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap index 616ea019da..0cdcfb9fb9 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_0.snap @@ -12,19 +12,18 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 8 | with self.assertRaises(expected_exception=ValueError): | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): -5 6 | def test_errors(self): -6 |- with self.assertRaises(ValueError): - 7 |+ with pytest.raises(ValueError): -7 8 | raise ValueError -8 9 | with self.assertRaises(expected_exception=ValueError): -9 10 | raise ValueError +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): +6 | def test_errors(self): + - with self.assertRaises(ValueError): +7 + with pytest.raises(ValueError): +8 | raise ValueError +9 | with self.assertRaises(expected_exception=ValueError): +10 | raise ValueError +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` --> PT027_0.py:8:14 @@ -36,21 +35,20 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 9 | raise ValueError | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): -5 6 | def test_errors(self): -6 7 | with self.assertRaises(ValueError): -7 8 | raise ValueError -8 |- with self.assertRaises(expected_exception=ValueError): - 9 |+ with pytest.raises(ValueError): -9 10 | raise ValueError -10 11 | -11 12 | with self.failUnlessRaises(ValueError): +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): +6 | def test_errors(self): +7 | with self.assertRaises(ValueError): +8 | raise ValueError + - with self.assertRaises(expected_exception=ValueError): +9 + with pytest.raises(ValueError): +10 | raise ValueError +11 | +12 | with self.failUnlessRaises(ValueError): +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `failUnlessRaises` --> PT027_0.py:11:14 @@ -62,22 +60,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `failUnlessRaises` 12 | raise ValueError | help: Replace `failUnlessRaises` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): -------------------------------------------------------------------------------- -8 9 | with self.assertRaises(expected_exception=ValueError): -9 10 | raise ValueError -10 11 | -11 |- with self.failUnlessRaises(ValueError): - 12 |+ with pytest.raises(ValueError): -12 13 | raise ValueError -13 14 | -14 15 | with self.assertRaisesRegex(ValueError, "test"): +9 | with self.assertRaises(expected_exception=ValueError): +10 | raise ValueError +11 | + - with self.failUnlessRaises(ValueError): +12 + with pytest.raises(ValueError): +13 | raise ValueError +14 | +15 | with self.assertRaisesRegex(ValueError, "test"): +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` --> PT027_0.py:14:14 @@ -89,22 +86,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` 15 | raise ValueError("test") | help: Replace `assertRaisesRegex` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): -------------------------------------------------------------------------------- -11 12 | with self.failUnlessRaises(ValueError): -12 13 | raise ValueError -13 14 | -14 |- with self.assertRaisesRegex(ValueError, "test"): - 15 |+ with pytest.raises(ValueError, match="test"): -15 16 | raise ValueError("test") -16 17 | -17 18 | with self.assertRaisesRegex(ValueError, expected_regex="test"): +12 | with self.failUnlessRaises(ValueError): +13 | raise ValueError +14 | + - with self.assertRaisesRegex(ValueError, "test"): +15 + with pytest.raises(ValueError, match="test"): +16 | raise ValueError("test") +17 | +18 | with self.assertRaisesRegex(ValueError, expected_regex="test"): +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` --> PT027_0.py:17:14 @@ -116,22 +112,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` 18 | raise ValueError("test") | help: Replace `assertRaisesRegex` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): -------------------------------------------------------------------------------- -14 15 | with self.assertRaisesRegex(ValueError, "test"): -15 16 | raise ValueError("test") -16 17 | -17 |- with self.assertRaisesRegex(ValueError, expected_regex="test"): - 18 |+ with pytest.raises(ValueError, match="test"): -18 19 | raise ValueError("test") -19 20 | -20 21 | with self.assertRaisesRegex( +15 | with self.assertRaisesRegex(ValueError, "test"): +16 | raise ValueError("test") +17 | + - with self.assertRaisesRegex(ValueError, expected_regex="test"): +18 + with pytest.raises(ValueError, match="test"): +19 | raise ValueError("test") +20 | +21 | with self.assertRaisesRegex( +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` --> PT027_0.py:20:14 @@ -144,24 +139,23 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` 22 | ): | help: Replace `assertRaisesRegex` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): -------------------------------------------------------------------------------- -17 18 | with self.assertRaisesRegex(ValueError, expected_regex="test"): -18 19 | raise ValueError("test") -19 20 | -20 |- with self.assertRaisesRegex( -21 |- expected_exception=ValueError, expected_regex="test" -22 |- ): - 21 |+ with pytest.raises(ValueError, match="test"): -23 22 | raise ValueError("test") -24 23 | -25 24 | with self.assertRaisesRegex( +18 | with self.assertRaisesRegex(ValueError, expected_regex="test"): +19 | raise ValueError("test") +20 | + - with self.assertRaisesRegex( + - expected_exception=ValueError, expected_regex="test" + - ): +21 + with pytest.raises(ValueError, match="test"): +22 | raise ValueError("test") +23 | +24 | with self.assertRaisesRegex( +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` --> PT027_0.py:25:14 @@ -174,24 +168,23 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegex` 27 | ): | help: Replace `assertRaisesRegex` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): -------------------------------------------------------------------------------- -22 23 | ): -23 24 | raise ValueError("test") -24 25 | -25 |- with self.assertRaisesRegex( -26 |- expected_regex="test", expected_exception=ValueError -27 |- ): - 26 |+ with pytest.raises(ValueError, match="test"): -28 27 | raise ValueError("test") -29 28 | -30 29 | with self.assertRaisesRegexp(ValueError, "test"): +23 | ): +24 | raise ValueError("test") +25 | + - with self.assertRaisesRegex( + - expected_regex="test", expected_exception=ValueError + - ): +26 + with pytest.raises(ValueError, match="test"): +27 | raise ValueError("test") +28 | +29 | with self.assertRaisesRegexp(ValueError, "test"): +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegexp` --> PT027_0.py:30:14 @@ -203,22 +196,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaisesRegexp` 31 | raise ValueError("test") | help: Replace `assertRaisesRegexp` with `pytest.raises` - -ℹ Unsafe fix -1 1 | import unittest - 2 |+import pytest -2 3 | -3 4 | -4 5 | class Test(unittest.TestCase): +1 | import unittest +2 + import pytest +3 | +4 | +5 | class Test(unittest.TestCase): -------------------------------------------------------------------------------- -27 28 | ): -28 29 | raise ValueError("test") -29 30 | -30 |- with self.assertRaisesRegexp(ValueError, "test"): - 31 |+ with pytest.raises(ValueError, match="test"): -31 32 | raise ValueError("test") -32 33 | -33 34 | def test_unfixable_errors(self): +28 | ): +29 | raise ValueError("test") +30 | + - with self.assertRaisesRegexp(ValueError, "test"): +31 + with pytest.raises(ValueError, match="test"): +32 | raise ValueError("test") +33 | +34 | def test_unfixable_errors(self): +note: This is an unsafe fix and may change runtime behavior PT027 Use `pytest.raises` instead of unittest-style `assertRaises` --> PT027_0.py:34:14 diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap index 4003cfd7a4..0dcf40a6f4 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT027_1.snap @@ -10,16 +10,15 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 12 | raise ValueError | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -8 8 | raise ValueError -9 9 | -10 10 | def test_errors(self): -11 |- with self.assertRaises(ValueError): - 11 |+ with pytest.raises(ValueError): -12 12 | raise ValueError -13 13 | -14 14 | def test_rewrite_references(self): +8 | raise ValueError +9 | +10 | def test_errors(self): + - with self.assertRaises(ValueError): +11 + with pytest.raises(ValueError): +12 | raise ValueError +13 | +14 | def test_rewrite_references(self): +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` --> PT027_1.py:15:14 @@ -30,21 +29,20 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 16 | raise ValueError | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -12 12 | raise ValueError -13 13 | -14 14 | def test_rewrite_references(self): -15 |- with self.assertRaises(ValueError) as e: - 15 |+ with pytest.raises(ValueError) as e: -16 16 | raise ValueError -17 17 | -18 18 | print(e.foo) -19 |- print(e.exception) - 19 |+ print(e.value) -20 20 | -21 21 | def test_rewrite_references_multiple_items(self): -22 22 | with self.assertRaises(ValueError) as e1, \ +12 | raise ValueError +13 | +14 | def test_rewrite_references(self): + - with self.assertRaises(ValueError) as e: +15 + with pytest.raises(ValueError) as e: +16 | raise ValueError +17 | +18 | print(e.foo) + - print(e.exception) +19 + print(e.value) +20 | +21 | def test_rewrite_references_multiple_items(self): +22 | with self.assertRaises(ValueError) as e1, \ +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` --> PT027_1.py:22:14 @@ -56,22 +54,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 24 | raise ValueError | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -19 19 | print(e.exception) -20 20 | -21 21 | def test_rewrite_references_multiple_items(self): -22 |- with self.assertRaises(ValueError) as e1, \ - 22 |+ with pytest.raises(ValueError) as e1, \ -23 23 | self.assertRaises(ValueError) as e2: -24 24 | raise ValueError -25 25 | -26 26 | print(e1.foo) -27 |- print(e1.exception) - 27 |+ print(e1.value) -28 28 | -29 29 | print(e2.foo) -30 30 | print(e2.exception) +19 | print(e.exception) +20 | +21 | def test_rewrite_references_multiple_items(self): + - with self.assertRaises(ValueError) as e1, \ +22 + with pytest.raises(ValueError) as e1, \ +23 | self.assertRaises(ValueError) as e2: +24 | raise ValueError +25 | +26 | print(e1.foo) + - print(e1.exception) +27 + print(e1.value) +28 | +29 | print(e2.foo) +30 | print(e2.exception) +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` --> PT027_1.py:23:13 @@ -83,24 +80,23 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 24 | raise ValueError | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -20 20 | -21 21 | def test_rewrite_references_multiple_items(self): -22 22 | with self.assertRaises(ValueError) as e1, \ -23 |- self.assertRaises(ValueError) as e2: - 23 |+ pytest.raises(ValueError) as e2: -24 24 | raise ValueError -25 25 | -26 26 | print(e1.foo) -27 27 | print(e1.exception) -28 28 | -29 29 | print(e2.foo) -30 |- print(e2.exception) - 30 |+ print(e2.value) -31 31 | -32 32 | def test_rewrite_references_multiple_items_nested(self): -33 33 | with self.assertRaises(ValueError) as e1, \ +20 | +21 | def test_rewrite_references_multiple_items(self): +22 | with self.assertRaises(ValueError) as e1, \ + - self.assertRaises(ValueError) as e2: +23 + pytest.raises(ValueError) as e2: +24 | raise ValueError +25 | +26 | print(e1.foo) +27 | print(e1.exception) +28 | +29 | print(e2.foo) + - print(e2.exception) +30 + print(e2.value) +31 | +32 | def test_rewrite_references_multiple_items_nested(self): +33 | with self.assertRaises(ValueError) as e1, \ +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` --> PT027_1.py:33:14 @@ -112,22 +108,21 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 35 | raise ValueError | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -30 30 | print(e2.exception) -31 31 | -32 32 | def test_rewrite_references_multiple_items_nested(self): -33 |- with self.assertRaises(ValueError) as e1, \ - 33 |+ with pytest.raises(ValueError) as e1, \ -34 34 | foo(self.assertRaises(ValueError)) as e2: -35 35 | raise ValueError -36 36 | -37 37 | print(e1.foo) -38 |- print(e1.exception) - 38 |+ print(e1.value) -39 39 | -40 40 | print(e2.foo) -41 41 | print(e2.exception) +30 | print(e2.exception) +31 | +32 | def test_rewrite_references_multiple_items_nested(self): + - with self.assertRaises(ValueError) as e1, \ +33 + with pytest.raises(ValueError) as e1, \ +34 | foo(self.assertRaises(ValueError)) as e2: +35 | raise ValueError +36 | +37 | print(e1.foo) + - print(e1.exception) +38 + print(e1.value) +39 | +40 | print(e2.foo) +41 | print(e2.exception) +note: This is an unsafe fix and may change runtime behavior PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` --> PT027_1.py:34:17 @@ -139,13 +134,12 @@ PT027 [*] Use `pytest.raises` instead of unittest-style `assertRaises` 35 | raise ValueError | help: Replace `assertRaises` with `pytest.raises` - -ℹ Unsafe fix -31 31 | -32 32 | def test_rewrite_references_multiple_items_nested(self): -33 33 | with self.assertRaises(ValueError) as e1, \ -34 |- foo(self.assertRaises(ValueError)) as e2: - 34 |+ foo(pytest.raises(ValueError)) as e2: -35 35 | raise ValueError -36 36 | -37 37 | print(e1.foo) +31 | +32 | def test_rewrite_references_multiple_items_nested(self): +33 | with self.assertRaises(ValueError) as e1, \ + - foo(self.assertRaises(ValueError)) as e2: +34 + foo(pytest.raises(ValueError)) as e2: +35 | raise ValueError +36 | +37 | print(e1.foo) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap index 8b2d5c395f..5429073bfb 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__PT028.snap @@ -12,15 +12,14 @@ PT028 Test function parameter `a` has default argument 5 | def test_foo(a = (1)): ... | help: Remove default argument - -ℹ Display-only fix -1 1 | # Errors -2 2 | -3 |-def test_foo(a=1): ... - 3 |+def test_foo(a): ... -4 4 | def test_foo(a = 1): ... -5 5 | def test_foo(a = (1)): ... -6 6 | def test_foo(a: int=1): ... +1 | # Errors +2 | + - def test_foo(a=1): ... +3 + def test_foo(a): ... +4 | def test_foo(a = 1): ... +5 | def test_foo(a = (1)): ... +6 | def test_foo(a: int=1): ... +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:4:18 @@ -32,16 +31,15 @@ PT028 Test function parameter `a` has default argument 6 | def test_foo(a: int=1): ... | help: Remove default argument - -ℹ Display-only fix -1 1 | # Errors -2 2 | -3 3 | def test_foo(a=1): ... -4 |-def test_foo(a = 1): ... - 4 |+def test_foo(a): ... -5 5 | def test_foo(a = (1)): ... -6 6 | def test_foo(a: int=1): ... -7 7 | def test_foo(a: int = 1): ... +1 | # Errors +2 | +3 | def test_foo(a=1): ... + - def test_foo(a = 1): ... +4 + def test_foo(a): ... +5 | def test_foo(a = (1)): ... +6 | def test_foo(a: int=1): ... +7 | def test_foo(a: int = 1): ... +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:5:19 @@ -54,16 +52,15 @@ PT028 Test function parameter `a` has default argument 7 | def test_foo(a: int = 1): ... | help: Remove default argument - -ℹ Display-only fix -2 2 | -3 3 | def test_foo(a=1): ... -4 4 | def test_foo(a = 1): ... -5 |-def test_foo(a = (1)): ... - 5 |+def test_foo(a): ... -6 6 | def test_foo(a: int=1): ... -7 7 | def test_foo(a: int = 1): ... -8 8 | def test_foo(a: (int) = 1): ... +2 | +3 | def test_foo(a=1): ... +4 | def test_foo(a = 1): ... + - def test_foo(a = (1)): ... +5 + def test_foo(a): ... +6 | def test_foo(a: int=1): ... +7 | def test_foo(a: int = 1): ... +8 | def test_foo(a: (int) = 1): ... +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:6:21 @@ -76,16 +73,15 @@ PT028 Test function parameter `a` has default argument 8 | def test_foo(a: (int) = 1): ... | help: Remove default argument - -ℹ Display-only fix -3 3 | def test_foo(a=1): ... -4 4 | def test_foo(a = 1): ... -5 5 | def test_foo(a = (1)): ... -6 |-def test_foo(a: int=1): ... - 6 |+def test_foo(a: int): ... -7 7 | def test_foo(a: int = 1): ... -8 8 | def test_foo(a: (int) = 1): ... -9 9 | def test_foo(a: int = (1)): ... +3 | def test_foo(a=1): ... +4 | def test_foo(a = 1): ... +5 | def test_foo(a = (1)): ... + - def test_foo(a: int=1): ... +6 + def test_foo(a: int): ... +7 | def test_foo(a: int = 1): ... +8 | def test_foo(a: (int) = 1): ... +9 | def test_foo(a: int = (1)): ... +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:7:23 @@ -98,16 +94,15 @@ PT028 Test function parameter `a` has default argument 9 | def test_foo(a: int = (1)): ... | help: Remove default argument - -ℹ Display-only fix -4 4 | def test_foo(a = 1): ... -5 5 | def test_foo(a = (1)): ... -6 6 | def test_foo(a: int=1): ... -7 |-def test_foo(a: int = 1): ... - 7 |+def test_foo(a: int): ... -8 8 | def test_foo(a: (int) = 1): ... -9 9 | def test_foo(a: int = (1)): ... -10 10 | def test_foo(a: (int) = (1)): ... +4 | def test_foo(a = 1): ... +5 | def test_foo(a = (1)): ... +6 | def test_foo(a: int=1): ... + - def test_foo(a: int = 1): ... +7 + def test_foo(a: int): ... +8 | def test_foo(a: (int) = 1): ... +9 | def test_foo(a: int = (1)): ... +10 | def test_foo(a: (int) = (1)): ... +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:8:25 @@ -120,16 +115,15 @@ PT028 Test function parameter `a` has default argument 10 | def test_foo(a: (int) = (1)): ... | help: Remove default argument - -ℹ Display-only fix -5 5 | def test_foo(a = (1)): ... -6 6 | def test_foo(a: int=1): ... -7 7 | def test_foo(a: int = 1): ... -8 |-def test_foo(a: (int) = 1): ... - 8 |+def test_foo(a: (int)): ... -9 9 | def test_foo(a: int = (1)): ... -10 10 | def test_foo(a: (int) = (1)): ... -11 11 | def test_foo(a=1, /, b=2, *, c=3): ... +5 | def test_foo(a = (1)): ... +6 | def test_foo(a: int=1): ... +7 | def test_foo(a: int = 1): ... + - def test_foo(a: (int) = 1): ... +8 + def test_foo(a: (int)): ... +9 | def test_foo(a: int = (1)): ... +10 | def test_foo(a: (int) = (1)): ... +11 | def test_foo(a=1, /, b=2, *, c=3): ... +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:9:24 @@ -142,16 +136,15 @@ PT028 Test function parameter `a` has default argument 11 | def test_foo(a=1, /, b=2, *, c=3): ... | help: Remove default argument - -ℹ Display-only fix -6 6 | def test_foo(a: int=1): ... -7 7 | def test_foo(a: int = 1): ... -8 8 | def test_foo(a: (int) = 1): ... -9 |-def test_foo(a: int = (1)): ... - 9 |+def test_foo(a: int): ... -10 10 | def test_foo(a: (int) = (1)): ... -11 11 | def test_foo(a=1, /, b=2, *, c=3): ... -12 12 | +6 | def test_foo(a: int=1): ... +7 | def test_foo(a: int = 1): ... +8 | def test_foo(a: (int) = 1): ... + - def test_foo(a: int = (1)): ... +9 + def test_foo(a: int): ... +10 | def test_foo(a: (int) = (1)): ... +11 | def test_foo(a=1, /, b=2, *, c=3): ... +12 | +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:10:26 @@ -163,16 +156,15 @@ PT028 Test function parameter `a` has default argument 11 | def test_foo(a=1, /, b=2, *, c=3): ... | help: Remove default argument - -ℹ Display-only fix -7 7 | def test_foo(a: int = 1): ... -8 8 | def test_foo(a: (int) = 1): ... -9 9 | def test_foo(a: int = (1)): ... -10 |-def test_foo(a: (int) = (1)): ... - 10 |+def test_foo(a: (int)): ... -11 11 | def test_foo(a=1, /, b=2, *, c=3): ... -12 12 | -13 13 | +7 | def test_foo(a: int = 1): ... +8 | def test_foo(a: (int) = 1): ... +9 | def test_foo(a: int = (1)): ... + - def test_foo(a: (int) = (1)): ... +10 + def test_foo(a: (int)): ... +11 | def test_foo(a=1, /, b=2, *, c=3): ... +12 | +13 | +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> PT028.py:11:16 @@ -183,16 +175,15 @@ PT028 Test function parameter `a` has default argument | ^ | help: Remove default argument - -ℹ Display-only fix -8 8 | def test_foo(a: (int) = 1): ... -9 9 | def test_foo(a: int = (1)): ... -10 10 | def test_foo(a: (int) = (1)): ... -11 |-def test_foo(a=1, /, b=2, *, c=3): ... - 11 |+def test_foo(a, /, b=2, *, c=3): ... -12 12 | -13 13 | -14 14 | # No errors +8 | def test_foo(a: (int) = 1): ... +9 | def test_foo(a: int = (1)): ... +10 | def test_foo(a: (int) = (1)): ... + - def test_foo(a=1, /, b=2, *, c=3): ... +11 + def test_foo(a, /, b=2, *, c=3): ... +12 | +13 | +14 | # No errors +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `b` has default argument --> PT028.py:11:24 @@ -203,16 +194,15 @@ PT028 Test function parameter `b` has default argument | ^ | help: Remove default argument - -ℹ Display-only fix -8 8 | def test_foo(a: (int) = 1): ... -9 9 | def test_foo(a: int = (1)): ... -10 10 | def test_foo(a: (int) = (1)): ... -11 |-def test_foo(a=1, /, b=2, *, c=3): ... - 11 |+def test_foo(a=1, /, b, *, c=3): ... -12 12 | -13 13 | -14 14 | # No errors +8 | def test_foo(a: (int) = 1): ... +9 | def test_foo(a: int = (1)): ... +10 | def test_foo(a: (int) = (1)): ... + - def test_foo(a=1, /, b=2, *, c=3): ... +11 + def test_foo(a=1, /, b, *, c=3): ... +12 | +13 | +14 | # No errors +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `c` has default argument --> PT028.py:11:32 @@ -223,13 +213,12 @@ PT028 Test function parameter `c` has default argument | ^ | help: Remove default argument - -ℹ Display-only fix -8 8 | def test_foo(a: (int) = 1): ... -9 9 | def test_foo(a: int = (1)): ... -10 10 | def test_foo(a: (int) = (1)): ... -11 |-def test_foo(a=1, /, b=2, *, c=3): ... - 11 |+def test_foo(a=1, /, b=2, *, c): ... -12 12 | -13 13 | -14 14 | # No errors +8 | def test_foo(a: (int) = 1): ... +9 | def test_foo(a: int = (1)): ... +10 | def test_foo(a: (int) = (1)): ... + - def test_foo(a=1, /, b=2, *, c=3): ... +11 + def test_foo(a=1, /, b=2, *, c): ... +12 | +13 | +14 | # No errors +note: This is a display-only fix and is likely to be incorrect diff --git a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap index 9543b3f3d0..59854cee37 100644 --- a/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap +++ b/crates/ruff_linter/src/rules/flake8_pytest_style/snapshots/ruff_linter__rules__flake8_pytest_style__tests__is_pytest_test.snap @@ -11,15 +11,14 @@ PT028 Test function parameter `a` has default argument 4 | def testThisIsAlsoATest(a=1): ... | help: Remove default argument - -ℹ Display-only fix -1 1 | # Errors -2 2 | -3 |-def test_this_is_a_test(a=1): ... - 3 |+def test_this_is_a_test(a): ... -4 4 | def testThisIsAlsoATest(a=1): ... -5 5 | -6 6 | class TestClass: +1 | # Errors +2 | + - def test_this_is_a_test(a=1): ... +3 + def test_this_is_a_test(a): ... +4 | def testThisIsAlsoATest(a=1): ... +5 | +6 | class TestClass: +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> is_pytest_test.py:4:27 @@ -31,16 +30,15 @@ PT028 Test function parameter `a` has default argument 6 | class TestClass: | help: Remove default argument - -ℹ Display-only fix -1 1 | # Errors -2 2 | -3 3 | def test_this_is_a_test(a=1): ... -4 |-def testThisIsAlsoATest(a=1): ... - 4 |+def testThisIsAlsoATest(a): ... -5 5 | -6 6 | class TestClass: -7 7 | def test_this_too_is_a_test(self, a=1): ... +1 | # Errors +2 | +3 | def test_this_is_a_test(a=1): ... + - def testThisIsAlsoATest(a=1): ... +4 + def testThisIsAlsoATest(a): ... +5 | +6 | class TestClass: +7 | def test_this_too_is_a_test(self, a=1): ... +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> is_pytest_test.py:7:41 @@ -51,16 +49,15 @@ PT028 Test function parameter `a` has default argument 8 | def testAndOfCourseThis(self, a=1): ... | help: Remove default argument - -ℹ Display-only fix -4 4 | def testThisIsAlsoATest(a=1): ... -5 5 | -6 6 | class TestClass: -7 |- def test_this_too_is_a_test(self, a=1): ... - 7 |+ def test_this_too_is_a_test(self, a): ... -8 8 | def testAndOfCourseThis(self, a=1): ... -9 9 | -10 10 | +4 | def testThisIsAlsoATest(a=1): ... +5 | +6 | class TestClass: + - def test_this_too_is_a_test(self, a=1): ... +7 + def test_this_too_is_a_test(self, a): ... +8 | def testAndOfCourseThis(self, a=1): ... +9 | +10 | +note: This is a display-only fix and is likely to be incorrect PT028 Test function parameter `a` has default argument --> is_pytest_test.py:8:37 @@ -71,13 +68,12 @@ PT028 Test function parameter `a` has default argument | ^ | help: Remove default argument - -ℹ Display-only fix -5 5 | -6 6 | class TestClass: -7 7 | def test_this_too_is_a_test(self, a=1): ... -8 |- def testAndOfCourseThis(self, a=1): ... - 8 |+ def testAndOfCourseThis(self, a): ... -9 9 | -10 10 | -11 11 | # No errors +5 | +6 | class TestClass: +7 | def test_this_too_is_a_test(self, a=1): ... + - def testAndOfCourseThis(self, a=1): ... +8 + def testAndOfCourseThis(self, a): ... +9 | +10 | +11 | # No errors +note: This is a display-only fix and is likely to be incorrect diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap index 62729525e2..ee38f7c4d3 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_docstring_doubles_all.py.snap @@ -10,10 +10,8 @@ Q002 [*] Double quote docstring found but single quotes preferred 3 | this_is_an_inline_string = "double quote string" | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 |-"""This is a docstring.""" - 1 |+'''This is a docstring.''' -2 2 | -3 3 | this_is_an_inline_string = "double quote string" -4 4 | + - """This is a docstring.""" +1 + '''This is a docstring.''' +2 | +3 | this_is_an_inline_string = "double quote string" +4 | diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap index a0edc0e992..faf6a2a98b 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_inline_doubles_all.py.snap @@ -12,12 +12,10 @@ Q000 [*] Double quotes found but single quotes preferred 5 | this_is_a_multiline_string = """ | help: Replace double quotes with single quotes - -ℹ Safe fix -1 1 | """This is a docstring.""" -2 2 | -3 |-this_is_an_inline_string = "double quote string" - 3 |+this_is_an_inline_string = 'double quote string' -4 4 | -5 5 | this_is_a_multiline_string = """ -6 6 | double quote string +1 | """This is a docstring.""" +2 | + - this_is_an_inline_string = "double quote string" +3 + this_is_an_inline_string = 'double quote string' +4 | +5 | this_is_a_multiline_string = """ +6 | double quote string diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap index 67c0fe2790..bc95bbd79c 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__only_multiline_doubles_all.py.snap @@ -13,13 +13,11 @@ Q001 [*] Double quote multiline found but single quotes preferred | |___^ | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -2 2 | -3 3 | this_is_an_inline_string = "double quote string" -4 4 | -5 |-this_is_a_multiline_string = """ - 5 |+this_is_a_multiline_string = ''' -6 6 | double quote string -7 |-""" - 7 |+''' +2 | +3 | this_is_an_inline_string = "double quote string" +4 | + - this_is_a_multiline_string = """ +5 + this_is_a_multiline_string = ''' +6 | double quote string + - """ +7 + ''' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap index 030181a37c..f04e36618b 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles.py.snap @@ -14,19 +14,17 @@ Q001 [*] Double quote multiline found but single quotes preferred 9 | l = [] | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -2 2 | Double quotes multiline module docstring -3 3 | """ -4 4 | -5 |-""" - 5 |+''' -6 6 | this is not a docstring -7 |-""" - 7 |+''' -8 8 | -9 9 | l = [] -10 10 | +2 | Double quotes multiline module docstring +3 | """ +4 | + - """ +5 + ''' +6 | this is not a docstring + - """ +7 + ''' +8 | +9 | l = [] +10 | Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles.py:16:5 @@ -41,19 +39,17 @@ Q001 [*] Double quote multiline found but single quotes preferred 20 | # The colon in the list indexing below is an edge case for the docstring scanner | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -13 13 | Double quotes multiline class docstring -14 14 | """ -15 15 | -16 |- """ - 16 |+ ''' -17 17 | this is not a docstring -18 |- """ - 18 |+ ''' -19 19 | -20 20 | # The colon in the list indexing below is an edge case for the docstring scanner -21 21 | def f(self, bar=""" +13 | Double quotes multiline class docstring +14 | """ +15 | + - """ +16 + ''' +17 | this is not a docstring + - """ +18 + ''' +19 | +20 | # The colon in the list indexing below is an edge case for the docstring scanner +21 | def f(self, bar=""" Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles.py:21:21 @@ -67,18 +63,16 @@ Q001 [*] Double quote multiline found but single quotes preferred 24 | """ | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -18 18 | """ -19 19 | -20 20 | # The colon in the list indexing below is an edge case for the docstring scanner -21 |- def f(self, bar=""" -22 |- definitely not a docstring""", - 21 |+ def f(self, bar=''' - 22 |+ definitely not a docstring''', -23 23 | val=l[Cls():3]): -24 24 | """ -25 25 | Double quotes multiline function docstring +18 | """ +19 | +20 | # The colon in the list indexing below is an edge case for the docstring scanner + - def f(self, bar=""" + - definitely not a docstring""", +21 + def f(self, bar=''' +22 + definitely not a docstring''', +23 | val=l[Cls():3]): +24 | """ +25 | Double quotes multiline function docstring Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles.py:30:9 @@ -93,19 +87,17 @@ Q001 [*] Double quote multiline found but single quotes preferred 34 | if l: | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -27 27 | -28 28 | some_expression = 'hello world' -29 29 | -30 |- """ - 30 |+ ''' -31 31 | this is not a docstring -32 |- """ - 32 |+ ''' -33 33 | -34 34 | if l: -35 35 | """ +27 | +28 | some_expression = 'hello world' +29 | + - """ +30 + ''' +31 | this is not a docstring + - """ +32 + ''' +33 | +34 | if l: +35 | """ Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles.py:35:13 @@ -118,14 +110,12 @@ Q001 [*] Double quote multiline found but single quotes preferred 38 | pass | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -32 32 | """ -33 33 | -34 34 | if l: -35 |- """ - 35 |+ ''' -36 36 | Looks like a docstring, but in reality it isn't - only modules, classes and functions -37 |- """ - 37 |+ ''' -38 38 | pass +32 | """ +33 | +34 | if l: + - """ +35 + ''' +36 | Looks like a docstring, but in reality it isn't - only modules, classes and functions + - """ +37 + ''' +38 | pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap index c210842afe..f697f21f1a 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_class.py.snap @@ -12,15 +12,13 @@ Q001 [*] Double quote multiline found but single quotes preferred 5 | def foo(self, bar="""not a docstring"""): | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 2 | """ Double quotes single line class docstring """ -3 |- """ Not a docstring """ - 3 |+ ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar="""not a docstring"""): -6 6 | """ Double quotes single line method docstring""" +1 | class SingleLineDocstrings(): +2 | """ Double quotes single line class docstring """ + - """ Not a docstring """ +3 + ''' Not a docstring ''' +4 | +5 | def foo(self, bar="""not a docstring"""): +6 | """ Double quotes single line method docstring""" Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles_class.py:5:23 @@ -33,13 +31,11 @@ Q001 [*] Double quote multiline found but single quotes preferred 7 | pass | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -2 2 | """ Double quotes single line class docstring """ -3 3 | """ Not a docstring """ -4 4 | -5 |- def foo(self, bar="""not a docstring"""): - 5 |+ def foo(self, bar='''not a docstring'''): -6 6 | """ Double quotes single line method docstring""" -7 7 | pass -8 8 | +2 | """ Double quotes single line class docstring """ +3 | """ Not a docstring """ +4 | + - def foo(self, bar="""not a docstring"""): +5 + def foo(self, bar='''not a docstring'''): +6 | """ Double quotes single line method docstring""" +7 | pass +8 | diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap index 0384d64108..f542b722f0 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_function.py.snap @@ -11,15 +11,13 @@ Q001 [*] Double quote multiline found but single quotes preferred 4 | return | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -1 1 | def foo(): -2 2 | """function without params, single line docstring""" -3 |- """ not a docstring""" - 3 |+ ''' not a docstring''' -4 4 | return -5 5 | -6 6 | +1 | def foo(): +2 | """function without params, single line docstring""" + - """ not a docstring""" +3 + ''' not a docstring''' +4 | return +5 | +6 | Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles_function.py:11:5 @@ -31,16 +29,14 @@ Q001 [*] Double quote multiline found but single quotes preferred 12 | return | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -8 8 | """ -9 9 | function without params, multiline docstring -10 10 | """ -11 |- """ not a docstring""" - 11 |+ ''' not a docstring''' -12 12 | return -13 13 | -14 14 | +8 | """ +9 | function without params, multiline docstring +10 | """ + - """ not a docstring""" +11 + ''' not a docstring''' +12 | return +13 | +14 | Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles_function.py:15:39 @@ -53,19 +49,17 @@ Q001 [*] Double quote multiline found but single quotes preferred 18 | pass | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -12 12 | return -13 13 | -14 14 | -15 |-def fun_with_params_no_docstring(a, b=""" - 15 |+def fun_with_params_no_docstring(a, b=''' -16 16 | not a -17 |-""" """docstring"""): - 17 |+''' """docstring"""): -18 18 | pass -19 19 | -20 20 | +12 | return +13 | +14 | + - def fun_with_params_no_docstring(a, b=""" +15 + def fun_with_params_no_docstring(a, b=''' +16 | not a + - """ """docstring"""): +17 + ''' """docstring"""): +18 | pass +19 | +20 | Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles_function.py:17:5 @@ -77,16 +71,14 @@ Q001 [*] Double quote multiline found but single quotes preferred 18 | pass | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -14 14 | -15 15 | def fun_with_params_no_docstring(a, b=""" -16 16 | not a -17 |-""" """docstring"""): - 17 |+""" '''docstring'''): -18 18 | pass -19 19 | -20 20 | +14 | +15 | def fun_with_params_no_docstring(a, b=""" +16 | not a + - """ """docstring"""): +17 + """ '''docstring'''): +18 | pass +19 | +20 | Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles_function.py:22:5 @@ -97,13 +89,11 @@ Q001 [*] Double quote multiline found but single quotes preferred 23 | pass | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -19 19 | -20 20 | -21 21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\ -22 |- """ not a docstring """): - 22 |+ ''' not a docstring '''): -23 23 | pass -24 24 | -25 25 | +19 | +20 | +21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\ + - """ not a docstring """): +22 + ''' not a docstring '''): +23 | pass +24 | +25 | diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap index 1c56a4705a..4239218bbe 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_multiline.py.snap @@ -14,19 +14,17 @@ Q001 [*] Double quote multiline found but single quotes preferred 8 | pass | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -1 1 | """ -2 2 | Double quotes multiline module docstring -3 3 | """ -4 |-""" - 4 |+''' -5 5 | this is not a docstring -6 |-""" - 6 |+''' -7 7 | def foo(): -8 8 | pass -9 9 | """ +1 | """ +2 | Double quotes multiline module docstring +3 | """ + - """ +4 + ''' +5 | this is not a docstring + - """ +6 + ''' +7 | def foo(): +8 | pass +9 | """ Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles_module_multiline.py:9:1 @@ -39,13 +37,11 @@ Q001 [*] Double quote multiline found but single quotes preferred | |___^ | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -6 6 | """ -7 7 | def foo(): -8 8 | pass -9 |-""" - 9 |+''' -10 10 | this is not a docstring -11 |-""" - 11 |+''' +6 | """ +7 | def foo(): +8 | pass + - """ +9 + ''' +10 | this is not a docstring + - """ +11 + ''' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap index a979eb5f39..452e723975 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_doubles_module_singleline.py.snap @@ -11,14 +11,12 @@ Q001 [*] Double quote multiline found but single quotes preferred 4 | def foo(): | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -1 1 | """ Double quotes singleline module docstring """ -2 |-""" this is not a docstring """ - 2 |+''' this is not a docstring ''' -3 3 | -4 4 | def foo(): -5 5 | pass +1 | """ Double quotes singleline module docstring """ + - """ this is not a docstring """ +2 + ''' this is not a docstring ''' +3 | +4 | def foo(): +5 | pass Q001 [*] Double quote multiline found but single quotes preferred --> docstring_doubles_module_singleline.py:6:1 @@ -29,10 +27,8 @@ Q001 [*] Double quote multiline found but single quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -3 3 | -4 4 | def foo(): -5 5 | pass -6 |-""" this is not a docstring """ - 6 |+''' this is not a docstring ''' +3 | +4 | def foo(): +5 | pass + - """ this is not a docstring """ +6 + ''' this is not a docstring ''' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap index 22c1903a00..c54061dd14 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles.py.snap @@ -12,16 +12,14 @@ Q002 [*] Single quote docstring found but double quotes preferred 5 | ''' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 |-''' - 1 |+""" -2 2 | Single quotes multiline module docstring -3 |-''' - 3 |+""" -4 4 | -5 5 | ''' -6 6 | this is not a docstring + - ''' +1 + """ +2 | Single quotes multiline module docstring + - ''' +3 + """ +4 | +5 | ''' +6 | this is not a docstring Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles.py:14:5 @@ -36,19 +34,17 @@ Q002 [*] Single quote docstring found but double quotes preferred 18 | ''' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -11 11 | class Cls(MakeKlass(''' -12 12 | class params \t not a docstring -13 13 | ''')): -14 |- ''' - 14 |+ """ -15 15 | Single quotes multiline class docstring -16 |- ''' - 16 |+ """ -17 17 | -18 18 | ''' -19 19 | this is not a docstring +11 | class Cls(MakeKlass(''' +12 | class params \t not a docstring +13 | ''')): + - ''' +14 + """ +15 | Single quotes multiline class docstring + - ''' +16 + """ +17 | +18 | ''' +19 | this is not a docstring Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles.py:26:9 @@ -63,16 +59,14 @@ Q002 [*] Single quote docstring found but double quotes preferred 30 | some_expression = 'hello world' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -23 23 | def f(self, bar=''' -24 24 | definitely not a docstring''', -25 25 | val=l[Cls():3]): -26 |- ''' - 26 |+ """ -27 27 | Single quotes multiline function docstring -28 |- ''' - 28 |+ """ -29 29 | -30 30 | some_expression = 'hello world' -31 31 | +23 | def f(self, bar=''' +24 | definitely not a docstring''', +25 | val=l[Cls():3]): + - ''' +26 + """ +27 | Single quotes multiline function docstring + - ''' +28 + """ +29 | +30 | some_expression = 'hello world' +31 | diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap index 395b9a33c2..32f2ead096 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_class.py.snap @@ -10,14 +10,12 @@ Q002 [*] Single quote docstring found but double quotes preferred 3 | ''' Not a docstring ''' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 |- ''' Double quotes single line class docstring ''' - 2 |+ """ Double quotes single line class docstring """ -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): +1 | class SingleLineDocstrings(): + - ''' Double quotes single line class docstring ''' +2 + """ Double quotes single line class docstring """ +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_class.py:6:9 @@ -28,16 +26,14 @@ Q002 [*] Single quote docstring found but double quotes preferred 7 | pass | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): -6 |- ''' Double quotes single line method docstring''' - 6 |+ """ Double quotes single line method docstring""" -7 7 | pass -8 8 | -9 9 | class Nested(foo()[:]): ''' inline docstring '''; pass +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): + - ''' Double quotes single line method docstring''' +6 + """ Double quotes single line method docstring""" +7 | pass +8 | +9 | class Nested(foo()[:]): ''' inline docstring '''; pass Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_class.py:9:29 @@ -48,10 +44,8 @@ Q002 [*] Single quote docstring found but double quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -6 6 | ''' Double quotes single line method docstring''' -7 7 | pass -8 8 | -9 |- class Nested(foo()[:]): ''' inline docstring '''; pass - 9 |+ class Nested(foo()[:]): """ inline docstring """; pass +6 | ''' Double quotes single line method docstring''' +7 | pass +8 | + - class Nested(foo()[:]): ''' inline docstring '''; pass +9 + class Nested(foo()[:]): """ inline docstring """; pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap index 1b6cea3816..31f2a574d8 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_function.py.snap @@ -11,14 +11,12 @@ Q002 [*] Single quote docstring found but double quotes preferred 4 | return | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 1 | def foo(): -2 |- '''function without params, single line docstring''' - 2 |+ """function without params, single line docstring""" -3 3 | ''' not a docstring''' -4 4 | return -5 5 | +1 | def foo(): + - '''function without params, single line docstring''' +2 + """function without params, single line docstring""" +3 | ''' not a docstring''' +4 | return +5 | Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_function.py:8:5 @@ -32,19 +30,17 @@ Q002 [*] Single quote docstring found but double quotes preferred 12 | return | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -5 5 | -6 6 | -7 7 | def foo2(): -8 |- ''' - 8 |+ """ -9 9 | function without params, multiline docstring -10 |- ''' - 10 |+ """ -11 11 | ''' not a docstring''' -12 12 | return -13 13 | +5 | +6 | +7 | def foo2(): + - ''' +8 + """ +9 | function without params, multiline docstring + - ''' +10 + """ +11 | ''' not a docstring''' +12 | return +13 | Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_function.py:27:5 @@ -54,13 +50,11 @@ Q002 [*] Single quote docstring found but double quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -24 24 | -25 25 | -26 26 | def function_with_single_docstring(a): -27 |- 'Single line docstring' - 27 |+ "Single line docstring" -28 28 | -29 29 | -30 30 | def double_inside_single(a): +24 | +25 | +26 | def function_with_single_docstring(a): + - 'Single line docstring' +27 + "Single line docstring" +28 | +29 | +30 | def double_inside_single(a): diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap index 1f3455801f..cd38b7f8d2 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_1.py.snap @@ -20,14 +20,12 @@ Q002 [*] Single quote docstring found but double quotes preferred 3 | ''' Not a docstring ''' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 |- ''"Start with empty string" ' and lint docstring safely' - 2 |+ ''"Start with empty string" " and lint docstring safely" -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): +1 | class SingleLineDocstrings(): + - ''"Start with empty string" ' and lint docstring safely' +2 + ''"Start with empty string" " and lint docstring safely" +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): Q002 Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_class_var_1.py:6:9 @@ -48,16 +46,14 @@ Q002 [*] Single quote docstring found but double quotes preferred 7 | pass | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): -6 |- ''"Start with empty string" ' and lint docstring safely' - 6 |+ ''"Start with empty string" " and lint docstring safely" -7 7 | pass -8 8 | -9 9 | class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): + - ''"Start with empty string" ' and lint docstring safely' +6 + ''"Start with empty string" " and lint docstring safely" +7 | pass +8 | +9 | class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass Q002 Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_class_var_1.py:9:29 @@ -78,10 +74,8 @@ Q002 [*] Single quote docstring found but double quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -6 6 | ''"Start with empty string" ' and lint docstring safely' -7 7 | pass -8 8 | -9 |- class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass - 9 |+ class Nested(foo()[:]): ''"Start with empty string" " and lint docstring safely"; pass +6 | ''"Start with empty string" ' and lint docstring safely' +7 | pass +8 | + - class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass +9 + class Nested(foo()[:]): ''"Start with empty string" " and lint docstring safely"; pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap index a5bbb5620e..a0ef1e3951 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_class_var_2.py.snap @@ -10,14 +10,12 @@ Q002 [*] Single quote docstring found but double quotes preferred 3 | ''' Not a docstring ''' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 |- 'Do not'" start with empty string" ' and lint docstring safely' - 2 |+ "Do not"" start with empty string" ' and lint docstring safely' -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): +1 | class SingleLineDocstrings(): + - 'Do not'" start with empty string" ' and lint docstring safely' +2 + "Do not"" start with empty string" ' and lint docstring safely' +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_class_var_2.py:2:40 @@ -28,14 +26,12 @@ Q002 [*] Single quote docstring found but double quotes preferred 3 | ''' Not a docstring ''' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 |- 'Do not'" start with empty string" ' and lint docstring safely' - 2 |+ 'Do not'" start with empty string" " and lint docstring safely" -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): +1 | class SingleLineDocstrings(): + - 'Do not'" start with empty string" ' and lint docstring safely' +2 + 'Do not'" start with empty string" " and lint docstring safely" +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_class_var_2.py:6:9 @@ -46,16 +42,14 @@ Q002 [*] Single quote docstring found but double quotes preferred 7 | pass | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): -6 |- 'Do not'" start with empty string" ' and lint docstring safely' - 6 |+ "Do not"" start with empty string" ' and lint docstring safely' -7 7 | pass -8 8 | -9 9 | class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): + - 'Do not'" start with empty string" ' and lint docstring safely' +6 + "Do not"" start with empty string" ' and lint docstring safely' +7 | pass +8 | +9 | class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_class_var_2.py:6:44 @@ -66,16 +60,14 @@ Q002 [*] Single quote docstring found but double quotes preferred 7 | pass | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -3 3 | ''' Not a docstring ''' -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): -6 |- 'Do not'" start with empty string" ' and lint docstring safely' - 6 |+ 'Do not'" start with empty string" " and lint docstring safely" -7 7 | pass -8 8 | -9 9 | class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass +3 | ''' Not a docstring ''' +4 | +5 | def foo(self, bar='''not a docstring'''): + - 'Do not'" start with empty string" ' and lint docstring safely' +6 + 'Do not'" start with empty string" " and lint docstring safely" +7 | pass +8 | +9 | class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_class_var_2.py:9:29 @@ -86,13 +78,11 @@ Q002 [*] Single quote docstring found but double quotes preferred | ^^^^^^^^ | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -6 6 | 'Do not'" start with empty string" ' and lint docstring safely' -7 7 | pass -8 8 | -9 |- class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass - 9 |+ class Nested(foo()[:]): "Do not"" start with empty string" ' and lint docstring safely'; pass +6 | 'Do not'" start with empty string" ' and lint docstring safely' +7 | pass +8 | + - class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass +9 + class Nested(foo()[:]): "Do not"" start with empty string" ' and lint docstring safely'; pass Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_class_var_2.py:9:64 @@ -103,10 +93,8 @@ Q002 [*] Single quote docstring found but double quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -6 6 | 'Do not'" start with empty string" ' and lint docstring safely' -7 7 | pass -8 8 | -9 |- class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass - 9 |+ class Nested(foo()[:]): 'Do not'" start with empty string" " and lint docstring safely"; pass +6 | 'Do not'" start with empty string" ' and lint docstring safely' +7 | pass +8 | + - class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass +9 + class Nested(foo()[:]): 'Do not'" start with empty string" " and lint docstring safely"; pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap index 5b079058ba..ebb41da86e 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_1.py.snap @@ -20,13 +20,11 @@ Q002 [*] Single quote docstring found but double quotes preferred 3 | def foo(): | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 |-''"Start with empty string" ' and lint docstring safely' - 1 |+''"Start with empty string" " and lint docstring safely" -2 2 | -3 3 | def foo(): -4 4 | pass + - ''"Start with empty string" ' and lint docstring safely' +1 + ''"Start with empty string" " and lint docstring safely" +2 | +3 | def foo(): +4 | pass Q001 [*] Double quote multiline found but single quotes preferred --> docstring_singles_mixed_quotes_module_singleline_var_1.py:5:1 @@ -37,10 +35,8 @@ Q001 [*] Double quote multiline found but single quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -2 2 | -3 3 | def foo(): -4 4 | pass -5 |-""" this is not a docstring """ - 5 |+''' this is not a docstring ''' +2 | +3 | def foo(): +4 | pass + - """ this is not a docstring """ +5 + ''' this is not a docstring ''' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap index ad3726d457..ac377de8c3 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_mixed_quotes_module_singleline_var_2.py.snap @@ -10,13 +10,11 @@ Q002 [*] Single quote docstring found but double quotes preferred 3 | def foo(): | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 |-'Do not'" start with empty string" ' and lint docstring safely' - 1 |+"Do not"" start with empty string" ' and lint docstring safely' -2 2 | -3 3 | def foo(): -4 4 | pass + - 'Do not'" start with empty string" ' and lint docstring safely' +1 + "Do not"" start with empty string" ' and lint docstring safely' +2 | +3 | def foo(): +4 | pass Q002 [*] Single quote docstring found but double quotes preferred --> docstring_singles_mixed_quotes_module_singleline_var_2.py:1:36 @@ -27,13 +25,11 @@ Q002 [*] Single quote docstring found but double quotes preferred 3 | def foo(): | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 |-'Do not'" start with empty string" ' and lint docstring safely' - 1 |+'Do not'" start with empty string" " and lint docstring safely" -2 2 | -3 3 | def foo(): -4 4 | pass + - 'Do not'" start with empty string" ' and lint docstring safely' +1 + 'Do not'" start with empty string" " and lint docstring safely" +2 | +3 | def foo(): +4 | pass Q001 [*] Double quote multiline found but single quotes preferred --> docstring_singles_mixed_quotes_module_singleline_var_2.py:5:1 @@ -44,10 +40,8 @@ Q001 [*] Double quote multiline found but single quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -2 2 | -3 3 | def foo(): -4 4 | pass -5 |-""" this is not a docstring """ - 5 |+''' this is not a docstring ''' +2 | +3 | def foo(): +4 | pass + - """ this is not a docstring """ +5 + ''' this is not a docstring ''' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap index b570d042b5..2282db0c6b 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_multiline.py.snap @@ -12,13 +12,11 @@ Q002 [*] Single quote docstring found but double quotes preferred 5 | this is not a docstring | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 |-''' - 1 |+""" -2 2 | Double quotes multiline module docstring -3 |-''' - 3 |+""" -4 4 | ''' -5 5 | this is not a docstring -6 6 | ''' + - ''' +1 + """ +2 | Double quotes multiline module docstring + - ''' +3 + """ +4 | ''' +5 | this is not a docstring +6 | ''' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap index b0ed1bc769..450bd6127d 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_doubles_over_docstring_singles_module_singleline.py.snap @@ -9,10 +9,8 @@ Q002 [*] Single quote docstring found but double quotes preferred 2 | ''' this is not a docstring ''' | help: Replace single quotes docstring with double quotes - -ℹ Safe fix -1 |-''' Double quotes singleline module docstring ''' - 1 |+""" Double quotes singleline module docstring """ -2 2 | ''' this is not a docstring ''' -3 3 | -4 4 | def foo(): + - ''' Double quotes singleline module docstring ''' +1 + """ Double quotes singleline module docstring """ +2 | ''' this is not a docstring ''' +3 | +4 | def foo(): diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap index 3d976112e3..0b1d9ef7c8 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles.py.snap @@ -12,16 +12,14 @@ Q002 [*] Double quote docstring found but single quotes preferred 5 | """ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 |-""" - 1 |+''' -2 2 | Double quotes multiline module docstring -3 |-""" - 3 |+''' -4 4 | -5 5 | """ -6 6 | this is not a docstring + - """ +1 + ''' +2 | Double quotes multiline module docstring + - """ +3 + ''' +4 | +5 | """ +6 | this is not a docstring Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles.py:12:5 @@ -35,19 +33,17 @@ Q002 [*] Double quote docstring found but single quotes preferred 16 | """ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -9 9 | l = [] -10 10 | -11 11 | class Cls: -12 |- """ - 12 |+ ''' -13 13 | Double quotes multiline class docstring -14 |- """ - 14 |+ ''' -15 15 | -16 16 | """ -17 17 | this is not a docstring +9 | l = [] +10 | +11 | class Cls: + - """ +12 + ''' +13 | Double quotes multiline class docstring + - """ +14 + ''' +15 | +16 | """ +17 | this is not a docstring Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles.py:24:9 @@ -62,16 +58,14 @@ Q002 [*] Double quote docstring found but single quotes preferred 28 | some_expression = 'hello world' | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -21 21 | def f(self, bar=""" -22 22 | definitely not a docstring""", -23 23 | val=l[Cls():3]): -24 |- """ - 24 |+ ''' -25 25 | Double quotes multiline function docstring -26 |- """ - 26 |+ ''' -27 27 | -28 28 | some_expression = 'hello world' -29 29 | +21 | def f(self, bar=""" +22 | definitely not a docstring""", +23 | val=l[Cls():3]): + - """ +24 + ''' +25 | Double quotes multiline function docstring + - """ +26 + ''' +27 | +28 | some_expression = 'hello world' +29 | diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap index 8cebae5756..9de744f4b8 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_class.py.snap @@ -10,14 +10,12 @@ Q002 [*] Double quote docstring found but single quotes preferred 3 | """ Not a docstring """ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 |- """ Double quotes single line class docstring """ - 2 |+ ''' Double quotes single line class docstring ''' -3 3 | """ Not a docstring """ -4 4 | -5 5 | def foo(self, bar="""not a docstring"""): +1 | class SingleLineDocstrings(): + - """ Double quotes single line class docstring """ +2 + ''' Double quotes single line class docstring ''' +3 | """ Not a docstring """ +4 | +5 | def foo(self, bar="""not a docstring"""): Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles_class.py:6:9 @@ -28,16 +26,14 @@ Q002 [*] Double quote docstring found but single quotes preferred 7 | pass | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -3 3 | """ Not a docstring """ -4 4 | -5 5 | def foo(self, bar="""not a docstring"""): -6 |- """ Double quotes single line method docstring""" - 6 |+ ''' Double quotes single line method docstring''' -7 7 | pass -8 8 | -9 9 | class Nested(foo()[:]): """ inline docstring """; pass +3 | """ Not a docstring """ +4 | +5 | def foo(self, bar="""not a docstring"""): + - """ Double quotes single line method docstring""" +6 + ''' Double quotes single line method docstring''' +7 | pass +8 | +9 | class Nested(foo()[:]): """ inline docstring """; pass Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles_class.py:9:29 @@ -48,10 +44,8 @@ Q002 [*] Double quote docstring found but single quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -6 6 | """ Double quotes single line method docstring""" -7 7 | pass -8 8 | -9 |- class Nested(foo()[:]): """ inline docstring """; pass - 9 |+ class Nested(foo()[:]): ''' inline docstring '''; pass +6 | """ Double quotes single line method docstring""" +7 | pass +8 | + - class Nested(foo()[:]): """ inline docstring """; pass +9 + class Nested(foo()[:]): ''' inline docstring '''; pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap index 8eb0509992..0d2edb6497 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_function.py.snap @@ -11,14 +11,12 @@ Q002 [*] Double quote docstring found but single quotes preferred 4 | return | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 1 | def foo(): -2 |- """function without params, single line docstring""" - 2 |+ '''function without params, single line docstring''' -3 3 | """ not a docstring""" -4 4 | return -5 5 | +1 | def foo(): + - """function without params, single line docstring""" +2 + '''function without params, single line docstring''' +3 | """ not a docstring""" +4 | return +5 | Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles_function.py:8:5 @@ -32,19 +30,17 @@ Q002 [*] Double quote docstring found but single quotes preferred 12 | return | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -5 5 | -6 6 | -7 7 | def foo2(): -8 |- """ - 8 |+ ''' -9 9 | function without params, multiline docstring -10 |- """ - 10 |+ ''' -11 11 | """ not a docstring""" -12 12 | return -13 13 | +5 | +6 | +7 | def foo2(): + - """ +8 + ''' +9 | function without params, multiline docstring + - """ +10 + ''' +11 | """ not a docstring""" +12 | return +13 | Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles_function.py:27:5 @@ -54,13 +50,11 @@ Q002 [*] Double quote docstring found but single quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -24 24 | -25 25 | -26 26 | def function_with_single_docstring(a): -27 |- "Single line docstring" - 27 |+ 'Single line docstring' -28 28 | -29 29 | -30 30 | def double_inside_single(a): +24 | +25 | +26 | def function_with_single_docstring(a): + - "Single line docstring" +27 + 'Single line docstring' +28 | +29 | +30 | def double_inside_single(a): diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap index 5855c8253e..c7788569c5 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_class_var_2.py.snap @@ -10,14 +10,12 @@ Q002 [*] Double quote docstring found but single quotes preferred 3 | """ Not a docstring """ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 |- "Do not"' start with empty string' ' and lint docstring safely' - 2 |+ 'Do not'' start with empty string' ' and lint docstring safely' -3 3 | """ Not a docstring """ -4 4 | -5 5 | def foo(self, bar="""not a docstring"""): +1 | class SingleLineDocstrings(): + - "Do not"' start with empty string' ' and lint docstring safely' +2 + 'Do not'' start with empty string' ' and lint docstring safely' +3 | """ Not a docstring """ +4 | +5 | def foo(self, bar="""not a docstring"""): Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles_mixed_quotes_class_var_2.py:6:9 @@ -28,16 +26,14 @@ Q002 [*] Double quote docstring found but single quotes preferred 7 | pass | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -3 3 | """ Not a docstring """ -4 4 | -5 5 | def foo(self, bar="""not a docstring"""): -6 |- "Do not"' start with empty string' ' and lint docstring safely' - 6 |+ 'Do not'' start with empty string' ' and lint docstring safely' -7 7 | pass -8 8 | -9 9 | class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass +3 | """ Not a docstring """ +4 | +5 | def foo(self, bar="""not a docstring"""): + - "Do not"' start with empty string' ' and lint docstring safely' +6 + 'Do not'' start with empty string' ' and lint docstring safely' +7 | pass +8 | +9 | class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass Q002 [*] Double quote docstring found but single quotes preferred --> docstring_doubles_mixed_quotes_class_var_2.py:9:29 @@ -48,10 +44,8 @@ Q002 [*] Double quote docstring found but single quotes preferred | ^^^^^^^^ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -6 6 | "Do not"' start with empty string' ' and lint docstring safely' -7 7 | pass -8 8 | -9 |- class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass - 9 |+ class Nested(foo()[:]): 'Do not'' start with empty string' ' and lint docstring safely'; pass +6 | "Do not"' start with empty string' ' and lint docstring safely' +7 | pass +8 | + - class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass +9 + class Nested(foo()[:]): 'Do not'' start with empty string' ' and lint docstring safely'; pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap index 9314ac3afc..6856dcea9a 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_mixed_quotes_module_singleline_var_2.py.snap @@ -10,10 +10,8 @@ Q002 [*] Double quote docstring found but single quotes preferred 3 | def foo(): | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 |-"Do not"' start with empty string' ' and lint docstring safely' - 1 |+'Do not'' start with empty string' ' and lint docstring safely' -2 2 | -3 3 | def foo(): -4 4 | pass + - "Do not"' start with empty string' ' and lint docstring safely' +1 + 'Do not'' start with empty string' ' and lint docstring safely' +2 | +3 | def foo(): +4 | pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap index 8de5e00a7c..564d62c34e 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_multiline.py.snap @@ -12,13 +12,11 @@ Q002 [*] Double quote docstring found but single quotes preferred 5 | this is not a docstring | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 |-""" - 1 |+''' -2 2 | Double quotes multiline module docstring -3 |-""" - 3 |+''' -4 4 | """ -5 5 | this is not a docstring -6 6 | """ + - """ +1 + ''' +2 | Double quotes multiline module docstring + - """ +3 + ''' +4 | """ +5 | this is not a docstring +6 | """ diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap index 81dac4b5a0..73b8d3e483 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_doubles_module_singleline.py.snap @@ -9,10 +9,8 @@ Q002 [*] Double quote docstring found but single quotes preferred 2 | """ this is not a docstring """ | help: Replace double quotes docstring with single quotes - -ℹ Safe fix -1 |-""" Double quotes singleline module docstring """ - 1 |+''' Double quotes singleline module docstring ''' -2 2 | """ this is not a docstring """ -3 3 | -4 4 | def foo(): + - """ Double quotes singleline module docstring """ +1 + ''' Double quotes singleline module docstring ''' +2 | """ this is not a docstring """ +3 | +4 | def foo(): diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap index 8c17b17455..9ddd470b70 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles.py.snap @@ -14,19 +14,17 @@ Q001 [*] Single quote multiline found but double quotes preferred 9 | l = [] | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -2 2 | Single quotes multiline module docstring -3 3 | ''' -4 4 | -5 |-''' - 5 |+""" -6 6 | this is not a docstring -7 |-''' - 7 |+""" -8 8 | -9 9 | l = [] -10 10 | +2 | Single quotes multiline module docstring +3 | ''' +4 | + - ''' +5 + """ +6 | this is not a docstring + - ''' +7 + """ +8 | +9 | l = [] +10 | Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles.py:11:21 @@ -42,19 +40,17 @@ Q001 [*] Single quote multiline found but double quotes preferred 15 | Single quotes multiline class docstring | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -8 8 | -9 9 | l = [] -10 10 | -11 |-class Cls(MakeKlass(''' - 11 |+class Cls(MakeKlass(""" -12 12 | class params \t not a docstring -13 |-''')): - 13 |+""")): -14 14 | ''' -15 15 | Single quotes multiline class docstring -16 16 | ''' +8 | +9 | l = [] +10 | + - class Cls(MakeKlass(''' +11 + class Cls(MakeKlass(""" +12 | class params \t not a docstring + - ''')): +13 + """)): +14 | ''' +15 | Single quotes multiline class docstring +16 | ''' Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles.py:18:5 @@ -69,19 +65,17 @@ Q001 [*] Single quote multiline found but double quotes preferred 22 | # The colon in the list indexing below is an edge case for the docstring scanner | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -15 15 | Single quotes multiline class docstring -16 16 | ''' -17 17 | -18 |- ''' - 18 |+ """ -19 19 | this is not a docstring -20 |- ''' - 20 |+ """ -21 21 | -22 22 | # The colon in the list indexing below is an edge case for the docstring scanner -23 23 | def f(self, bar=''' +15 | Single quotes multiline class docstring +16 | ''' +17 | + - ''' +18 + """ +19 | this is not a docstring + - ''' +20 + """ +21 | +22 | # The colon in the list indexing below is an edge case for the docstring scanner +23 | def f(self, bar=''' Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles.py:23:21 @@ -95,18 +89,16 @@ Q001 [*] Single quote multiline found but double quotes preferred 26 | ''' | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -20 20 | ''' -21 21 | -22 22 | # The colon in the list indexing below is an edge case for the docstring scanner -23 |- def f(self, bar=''' -24 |- definitely not a docstring''', - 23 |+ def f(self, bar=""" - 24 |+ definitely not a docstring""", -25 25 | val=l[Cls():3]): -26 26 | ''' -27 27 | Single quotes multiline function docstring +20 | ''' +21 | +22 | # The colon in the list indexing below is an edge case for the docstring scanner + - def f(self, bar=''' + - definitely not a docstring''', +23 + def f(self, bar=""" +24 + definitely not a docstring""", +25 | val=l[Cls():3]): +26 | ''' +27 | Single quotes multiline function docstring Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles.py:32:9 @@ -121,19 +113,17 @@ Q001 [*] Single quote multiline found but double quotes preferred 36 | if l: | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -29 29 | -30 30 | some_expression = 'hello world' -31 31 | -32 |- ''' - 32 |+ """ -33 33 | this is not a docstring -34 |- ''' - 34 |+ """ -35 35 | -36 36 | if l: -37 37 | ''' +29 | +30 | some_expression = 'hello world' +31 | + - ''' +32 + """ +33 | this is not a docstring + - ''' +34 + """ +35 | +36 | if l: +37 | ''' Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles.py:37:13 @@ -146,14 +136,12 @@ Q001 [*] Single quote multiline found but double quotes preferred 40 | pass | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -34 34 | ''' -35 35 | -36 36 | if l: -37 |- ''' - 37 |+ """ -38 38 | Looks like a docstring, but in reality it isn't - only modules, classes and functions -39 |- ''' - 39 |+ """ -40 40 | pass +34 | ''' +35 | +36 | if l: + - ''' +37 + """ +38 | Looks like a docstring, but in reality it isn't - only modules, classes and functions + - ''' +39 + """ +40 | pass diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap index 5cd192eba7..cb016a7f1c 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_class.py.snap @@ -12,15 +12,13 @@ Q001 [*] Single quote multiline found but double quotes preferred 5 | def foo(self, bar='''not a docstring'''): | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -1 1 | class SingleLineDocstrings(): -2 2 | ''' Double quotes single line class docstring ''' -3 |- ''' Not a docstring ''' - 3 |+ """ Not a docstring """ -4 4 | -5 5 | def foo(self, bar='''not a docstring'''): -6 6 | ''' Double quotes single line method docstring''' +1 | class SingleLineDocstrings(): +2 | ''' Double quotes single line class docstring ''' + - ''' Not a docstring ''' +3 + """ Not a docstring """ +4 | +5 | def foo(self, bar='''not a docstring'''): +6 | ''' Double quotes single line method docstring''' Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles_class.py:5:23 @@ -33,13 +31,11 @@ Q001 [*] Single quote multiline found but double quotes preferred 7 | pass | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -2 2 | ''' Double quotes single line class docstring ''' -3 3 | ''' Not a docstring ''' -4 4 | -5 |- def foo(self, bar='''not a docstring'''): - 5 |+ def foo(self, bar="""not a docstring"""): -6 6 | ''' Double quotes single line method docstring''' -7 7 | pass -8 8 | +2 | ''' Double quotes single line class docstring ''' +3 | ''' Not a docstring ''' +4 | + - def foo(self, bar='''not a docstring'''): +5 + def foo(self, bar="""not a docstring"""): +6 | ''' Double quotes single line method docstring''' +7 | pass +8 | diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap index 455a32f692..b41bcd7c14 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_function.py.snap @@ -11,15 +11,13 @@ Q001 [*] Single quote multiline found but double quotes preferred 4 | return | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -1 1 | def foo(): -2 2 | '''function without params, single line docstring''' -3 |- ''' not a docstring''' - 3 |+ """ not a docstring""" -4 4 | return -5 5 | -6 6 | +1 | def foo(): +2 | '''function without params, single line docstring''' + - ''' not a docstring''' +3 + """ not a docstring""" +4 | return +5 | +6 | Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles_function.py:11:5 @@ -31,16 +29,14 @@ Q001 [*] Single quote multiline found but double quotes preferred 12 | return | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -8 8 | ''' -9 9 | function without params, multiline docstring -10 10 | ''' -11 |- ''' not a docstring''' - 11 |+ """ not a docstring""" -12 12 | return -13 13 | -14 14 | +8 | ''' +9 | function without params, multiline docstring +10 | ''' + - ''' not a docstring''' +11 + """ not a docstring""" +12 | return +13 | +14 | Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles_function.py:15:39 @@ -53,19 +49,17 @@ Q001 [*] Single quote multiline found but double quotes preferred 18 | pass | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -12 12 | return -13 13 | -14 14 | -15 |-def fun_with_params_no_docstring(a, b=''' - 15 |+def fun_with_params_no_docstring(a, b=""" -16 16 | not a -17 |-''' '''docstring'''): - 17 |+""" '''docstring'''): -18 18 | pass -19 19 | -20 20 | +12 | return +13 | +14 | + - def fun_with_params_no_docstring(a, b=''' +15 + def fun_with_params_no_docstring(a, b=""" +16 | not a + - ''' '''docstring'''): +17 + """ '''docstring'''): +18 | pass +19 | +20 | Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles_function.py:17:5 @@ -77,16 +71,14 @@ Q001 [*] Single quote multiline found but double quotes preferred 18 | pass | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -14 14 | -15 15 | def fun_with_params_no_docstring(a, b=''' -16 16 | not a -17 |-''' '''docstring'''): - 17 |+''' """docstring"""): -18 18 | pass -19 19 | -20 20 | +14 | +15 | def fun_with_params_no_docstring(a, b=''' +16 | not a + - ''' '''docstring'''): +17 + ''' """docstring"""): +18 | pass +19 | +20 | Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles_function.py:22:5 @@ -97,13 +89,11 @@ Q001 [*] Single quote multiline found but double quotes preferred 23 | pass | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -19 19 | -20 20 | -21 21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\ -22 |- ''' not a docstring '''): - 22 |+ """ not a docstring """): -23 23 | pass -24 24 | -25 25 | +19 | +20 | +21 | def fun_with_params_no_docstring2(a, b=c[foo():], c=\ + - ''' not a docstring '''): +22 + """ not a docstring """): +23 | pass +24 | +25 | diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap index 8003cada09..149c82d40a 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_multiline.py.snap @@ -14,19 +14,17 @@ Q001 [*] Single quote multiline found but double quotes preferred 8 | pass | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -1 1 | ''' -2 2 | Double quotes multiline module docstring -3 3 | ''' -4 |-''' - 4 |+""" -5 5 | this is not a docstring -6 |-''' - 6 |+""" -7 7 | def foo(): -8 8 | pass -9 9 | ''' +1 | ''' +2 | Double quotes multiline module docstring +3 | ''' + - ''' +4 + """ +5 | this is not a docstring + - ''' +6 + """ +7 | def foo(): +8 | pass +9 | ''' Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles_module_multiline.py:9:1 @@ -39,13 +37,11 @@ Q001 [*] Single quote multiline found but double quotes preferred | |___^ | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -6 6 | ''' -7 7 | def foo(): -8 8 | pass -9 |-''' - 9 |+""" -10 10 | this is not a docstring -11 |-''' - 11 |+""" +6 | ''' +7 | def foo(): +8 | pass + - ''' +9 + """ +10 | this is not a docstring + - ''' +11 + """ diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap index 72809993e9..823cbd2326 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_docstring_singles_over_docstring_singles_module_singleline.py.snap @@ -11,14 +11,12 @@ Q001 [*] Single quote multiline found but double quotes preferred 4 | def foo(): | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -1 1 | ''' Double quotes singleline module docstring ''' -2 |-''' this is not a docstring ''' - 2 |+""" this is not a docstring """ -3 3 | -4 4 | def foo(): -5 5 | pass +1 | ''' Double quotes singleline module docstring ''' + - ''' this is not a docstring ''' +2 + """ this is not a docstring """ +3 | +4 | def foo(): +5 | pass Q001 [*] Single quote multiline found but double quotes preferred --> docstring_singles_module_singleline.py:6:1 @@ -29,10 +27,8 @@ Q001 [*] Single quote multiline found but double quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -3 3 | -4 4 | def foo(): -5 5 | pass -6 |-''' this is not a docstring ''' - 6 |+""" this is not a docstring """ +3 | +4 | def foo(): +5 | pass + - ''' this is not a docstring ''' +6 + """ this is not a docstring """ diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap index 0732cb70c1..4c6e4f4d73 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles.py.snap @@ -10,13 +10,11 @@ Q000 [*] Single quotes found but double quotes preferred 3 | this_should_be_linted = f'double quote string' | help: Replace single quotes with double quotes - -ℹ Safe fix -1 |-this_should_be_linted = 'single quote string' - 1 |+this_should_be_linted = "single quote string" -2 2 | this_should_be_linted = u'double quote string' -3 3 | this_should_be_linted = f'double quote string' -4 4 | this_should_be_linted = f'double {"quote"} string' + - this_should_be_linted = 'single quote string' +1 + this_should_be_linted = "single quote string" +2 | this_should_be_linted = u'double quote string' +3 | this_should_be_linted = f'double quote string' +4 | this_should_be_linted = f'double {"quote"} string' Q000 [*] Single quotes found but double quotes preferred --> singles.py:2:25 @@ -28,14 +26,12 @@ Q000 [*] Single quotes found but double quotes preferred 4 | this_should_be_linted = f'double {"quote"} string' | help: Replace single quotes with double quotes - -ℹ Safe fix -1 1 | this_should_be_linted = 'single quote string' -2 |-this_should_be_linted = u'double quote string' - 2 |+this_should_be_linted = u"double quote string" -3 3 | this_should_be_linted = f'double quote string' -4 4 | this_should_be_linted = f'double {"quote"} string' -5 5 | +1 | this_should_be_linted = 'single quote string' + - this_should_be_linted = u'double quote string' +2 + this_should_be_linted = u"double quote string" +3 | this_should_be_linted = f'double quote string' +4 | this_should_be_linted = f'double {"quote"} string' +5 | Q000 [*] Single quotes found but double quotes preferred --> singles.py:3:25 @@ -47,12 +43,10 @@ Q000 [*] Single quotes found but double quotes preferred 4 | this_should_be_linted = f'double {"quote"} string' | help: Replace single quotes with double quotes - -ℹ Safe fix -1 1 | this_should_be_linted = 'single quote string' -2 2 | this_should_be_linted = u'double quote string' -3 |-this_should_be_linted = f'double quote string' - 3 |+this_should_be_linted = f"double quote string" -4 4 | this_should_be_linted = f'double {"quote"} string' -5 5 | -6 6 | # https://github.com/astral-sh/ruff/issues/10546 +1 | this_should_be_linted = 'single quote string' +2 | this_should_be_linted = u'double quote string' + - this_should_be_linted = f'double quote string' +3 + this_should_be_linted = f"double quote string" +4 | this_should_be_linted = f'double {"quote"} string' +5 | +6 | # https://github.com/astral-sh/ruff/issues/10546 diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap index 506d6d4953..8e93365420 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped.py.snap @@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 3 | this_is_fine = 'This is a "string"' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -1 |-this_should_raise_Q003 = "This is a \"string\"" - 1 |+this_should_raise_Q003 = 'This is a "string"' -2 2 | this_is_fine = "'This' is a \"string\"" -3 3 | this_is_fine = 'This is a "string"' -4 4 | this_is_fine = '\'This\' is a "string"' + - this_should_raise_Q003 = "This is a \"string\"" +1 + this_should_raise_Q003 = 'This is a "string"' +2 | this_is_fine = "'This' is a \"string\"" +3 | this_is_fine = 'This is a "string"' +4 | this_is_fine = '\'This\' is a "string"' Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:9:5 @@ -28,16 +26,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 10 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -6 6 | this_is_fine = R"This is a \"string\"" -7 7 | this_should_raise = ( -8 8 | "This is a" -9 |- "\"string\"" - 9 |+ '"string"' -10 10 | ) -11 11 | -12 12 | # Same as above, but with f-strings +6 | this_is_fine = R"This is a \"string\"" +7 | this_should_raise = ( +8 | "This is a" + - "\"string\"" +9 + '"string"' +10 | ) +11 | +12 | # Same as above, but with f-strings Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:13:1 @@ -49,16 +45,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 15 | f'This is a "string"' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -10 10 | ) -11 11 | -12 12 | # Same as above, but with f-strings -13 |-f"This is a \"string\"" - 13 |+f'This is a "string"' -14 14 | f"'This' is a \"string\"" -15 15 | f'This is a "string"' -16 16 | f'\'This\' is a "string"' +10 | ) +11 | +12 | # Same as above, but with f-strings + - f"This is a \"string\"" +13 + f'This is a "string"' +14 | f"'This' is a \"string\"" +15 | f'This is a "string"' +16 | f'\'This\' is a "string"' Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:21:5 @@ -70,16 +64,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 22 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -18 18 | fR"This is a \"string\"" -19 19 | foo = ( -20 20 | f"This is a" -21 |- f"\"string\"" - 21 |+ f'"string"' -22 22 | ) -23 23 | -24 24 | # Nested f-strings (Python 3.12+) +18 | fR"This is a \"string\"" +19 | foo = ( +20 | f"This is a" + - f"\"string\"" +21 + f'"string"' +22 | ) +23 | +24 | # Nested f-strings (Python 3.12+) Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:31:1 @@ -92,16 +84,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -28 28 | # f'"foo" {"nested"}' -29 29 | # -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 |-f"\"foo\" {"foo"}" # Q003 - 31 |+f'"foo" {"foo"}' # Q003 -32 32 | f"\"foo\" {f"foo"}" # Q003 -33 33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 -34 34 | +28 | # f'"foo" {"nested"}' +29 | # +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. + - f"\"foo\" {"foo"}" # Q003 +31 + f'"foo" {"foo"}' # Q003 +32 | f"\"foo\" {f"foo"}" # Q003 +33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 +34 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:32:1 @@ -113,16 +103,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -29 29 | # -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 31 | f"\"foo\" {"foo"}" # Q003 -32 |-f"\"foo\" {f"foo"}" # Q003 - 32 |+f'"foo" {f"foo"}' # Q003 -33 33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 -34 34 | -35 35 | f"normal {f"nested"} normal" +29 | # +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +31 | f"\"foo\" {"foo"}" # Q003 + - f"\"foo\" {f"foo"}" # Q003 +32 + f'"foo" {f"foo"}' # Q003 +33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 +34 | +35 | f"normal {f"nested"} normal" Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:33:1 @@ -135,16 +123,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 35 | f"normal {f"nested"} normal" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 31 | f"\"foo\" {"foo"}" # Q003 -32 32 | f"\"foo\" {f"foo"}" # Q003 -33 |-f"\"foo\" {f"\"foo\""} \"\"" # Q003 - 33 |+f'"foo" {f"\"foo\""} ""' # Q003 -34 34 | -35 35 | f"normal {f"nested"} normal" -36 36 | f"\"normal\" {f"nested"} normal" # Q003 +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +31 | f"\"foo\" {"foo"}" # Q003 +32 | f"\"foo\" {f"foo"}" # Q003 + - f"\"foo\" {f"\"foo\""} \"\"" # Q003 +33 + f'"foo" {f"\"foo\""} ""' # Q003 +34 | +35 | f"normal {f"nested"} normal" +36 | f"\"normal\" {f"nested"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:33:12 @@ -157,16 +143,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 35 | f"normal {f"nested"} normal" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 31 | f"\"foo\" {"foo"}" # Q003 -32 32 | f"\"foo\" {f"foo"}" # Q003 -33 |-f"\"foo\" {f"\"foo\""} \"\"" # Q003 - 33 |+f"\"foo\" {f'"foo"'} \"\"" # Q003 -34 34 | -35 35 | f"normal {f"nested"} normal" -36 36 | f"\"normal\" {f"nested"} normal" # Q003 +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +31 | f"\"foo\" {"foo"}" # Q003 +32 | f"\"foo\" {f"foo"}" # Q003 + - f"\"foo\" {f"\"foo\""} \"\"" # Q003 +33 + f"\"foo\" {f'"foo"'} \"\"" # Q003 +34 | +35 | f"normal {f"nested"} normal" +36 | f"\"normal\" {f"nested"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:36:1 @@ -178,16 +162,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -33 33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 -34 34 | -35 35 | f"normal {f"nested"} normal" -36 |-f"\"normal\" {f"nested"} normal" # Q003 - 36 |+f'"normal" {f"nested"} normal' # Q003 -37 37 | f"\"normal\" {f"nested"} 'single quotes'" -38 38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'" # Q003 -39 39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +33 | f"\"foo\" {f"\"foo\""} \"\"" # Q003 +34 | +35 | f"normal {f"nested"} normal" + - f"\"normal\" {f"nested"} normal" # Q003 +36 + f'"normal" {f"nested"} normal' # Q003 +37 | f"\"normal\" {f"nested"} 'single quotes'" +38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'" # Q003 +39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:38:15 @@ -199,16 +181,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -35 35 | f"normal {f"nested"} normal" -36 36 | f"\"normal\" {f"nested"} normal" # Q003 -37 37 | f"\"normal\" {f"nested"} 'single quotes'" -38 |-f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'" # Q003 - 38 |+f"\"normal\" {f'"nested" {"other"} normal'} 'single quotes'" # Q003 -39 39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal" # Q003 -40 40 | -41 41 | +35 | f"normal {f"nested"} normal" +36 | f"\"normal\" {f"nested"} normal" # Q003 +37 | f"\"normal\" {f"nested"} 'single quotes'" + - f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'" # Q003 +38 + f"\"normal\" {f'"nested" {"other"} normal'} 'single quotes'" # Q003 +39 | f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +40 | +41 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:39:1 @@ -219,16 +199,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -36 36 | f"\"normal\" {f"nested"} normal" # Q003 -37 37 | f"\"normal\" {f"nested"} 'single quotes'" -38 38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'" # Q003 -39 |-f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal" # Q003 - 39 |+f'"normal" {f"\"nested\" {"other"} 'single quotes'"} normal' # Q003 -40 40 | -41 41 | -42 42 | # Same as above, but with t-strings +36 | f"\"normal\" {f"nested"} normal" # Q003 +37 | f"\"normal\" {f"nested"} 'single quotes'" +38 | f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'" # Q003 + - f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +39 + f'"normal" {f"\"nested\" {"other"} 'single quotes'"} normal' # Q003 +40 | +41 | +42 | # Same as above, but with t-strings Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:43:1 @@ -240,16 +218,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 45 | f'This is a "string"' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -40 40 | -41 41 | -42 42 | # Same as above, but with t-strings -43 |-t"This is a \"string\"" - 43 |+t'This is a "string"' -44 44 | t"'This' is a \"string\"" -45 45 | f'This is a "string"' -46 46 | f'\'This\' is a "string"' +40 | +41 | +42 | # Same as above, but with t-strings + - t"This is a \"string\"" +43 + t'This is a "string"' +44 | t"'This' is a \"string\"" +45 | f'This is a "string"' +46 | f'\'This\' is a "string"' Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:51:5 @@ -262,16 +238,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 53 | t"\"foo\" {"foo"}" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -48 48 | fR"This is a \"string\"" -49 49 | foo = ( -50 50 | t"This is a" -51 |- t"\"string\"" - 51 |+ t'"string"' -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 +48 | fR"This is a \"string\"" +49 | foo = ( +50 | t"This is a" + - t"\"string\"" +51 + t'"string"' +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:53:1 @@ -284,16 +258,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -50 50 | t"This is a" -51 51 | t"\"string\"" -52 52 | ) -53 |-t"\"foo\" {"foo"}" # Q003 - 53 |+t'"foo" {"foo"}' # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 -55 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 -56 56 | +50 | t"This is a" +51 | t"\"string\"" +52 | ) + - t"\"foo\" {"foo"}" # Q003 +53 + t'"foo" {"foo"}' # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 +55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 +56 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:54:1 @@ -305,16 +277,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -51 51 | t"\"string\"" -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 |-t"\"foo\" {t"foo"}" # Q003 - 54 |+t'"foo" {t"foo"}' # Q003 -55 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" +51 | t"\"string\"" +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 + - t"\"foo\" {t"foo"}" # Q003 +54 + t'"foo" {t"foo"}' # Q003 +55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 +56 | +57 | t"normal {t"nested"} normal" Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:55:1 @@ -327,16 +297,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 57 | t"normal {t"nested"} normal" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 -55 |-t"\"foo\" {t"\"foo\""} \"\"" # Q003 - 55 |+t'"foo" {t"\"foo\""} ""' # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" -58 58 | t"\"normal\" {t"nested"} normal" # Q003 +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 + - t"\"foo\" {t"\"foo\""} \"\"" # Q003 +55 + t'"foo" {t"\"foo\""} ""' # Q003 +56 | +57 | t"normal {t"nested"} normal" +58 | t"\"normal\" {t"nested"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:55:12 @@ -349,16 +317,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 57 | t"normal {t"nested"} normal" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 -55 |-t"\"foo\" {t"\"foo\""} \"\"" # Q003 - 55 |+t"\"foo\" {t'"foo"'} \"\"" # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" -58 58 | t"\"normal\" {t"nested"} normal" # Q003 +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 + - t"\"foo\" {t"\"foo\""} \"\"" # Q003 +55 + t"\"foo\" {t'"foo"'} \"\"" # Q003 +56 | +57 | t"normal {t"nested"} normal" +58 | t"\"normal\" {t"nested"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:58:1 @@ -370,16 +336,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -55 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" -58 |-t"\"normal\" {t"nested"} normal" # Q003 - 58 |+t'"normal" {t"nested"} normal' # Q003 -59 59 | t"\"normal\" {t"nested"} 'single quotes'" -60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 -61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 +56 | +57 | t"normal {t"nested"} normal" + - t"\"normal\" {t"nested"} normal" # Q003 +58 + t'"normal" {t"nested"} normal' # Q003 +59 | t"\"normal\" {t"nested"} 'single quotes'" +60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 +61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:60:15 @@ -391,14 +355,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -57 57 | t"normal {t"nested"} normal" -58 58 | t"\"normal\" {t"nested"} normal" # Q003 -59 59 | t"\"normal\" {t"nested"} 'single quotes'" -60 |-t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 - 60 |+t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'" # Q003 -61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +57 | t"normal {t"nested"} normal" +58 | t"\"normal\" {t"nested"} normal" # Q003 +59 | t"\"normal\" {t"nested"} 'single quotes'" + - t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 +60 + t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'" # Q003 +61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:61:1 @@ -409,10 +371,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -58 58 | t"\"normal\" {t"nested"} normal" # Q003 -59 59 | t"\"normal\" {t"nested"} 'single quotes'" -60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 -61 |-t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 - 61 |+t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal' # Q003 +58 | t"\"normal\" {t"nested"} normal" # Q003 +59 | t"\"normal\" {t"nested"} 'single quotes'" +60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 + - t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +61 + t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal' # Q003 diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap index a80c1353da..cca4d62c10 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_py311.snap @@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 3 | this_is_fine = 'This is a "string"' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -1 |-this_should_raise_Q003 = "This is a \"string\"" - 1 |+this_should_raise_Q003 = 'This is a "string"' -2 2 | this_is_fine = "'This' is a \"string\"" -3 3 | this_is_fine = 'This is a "string"' -4 4 | this_is_fine = '\'This\' is a "string"' + - this_should_raise_Q003 = "This is a \"string\"" +1 + this_should_raise_Q003 = 'This is a "string"' +2 | this_is_fine = "'This' is a \"string\"" +3 | this_is_fine = 'This is a "string"' +4 | this_is_fine = '\'This\' is a "string"' Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:9:5 @@ -28,16 +26,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 10 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -6 6 | this_is_fine = R"This is a \"string\"" -7 7 | this_should_raise = ( -8 8 | "This is a" -9 |- "\"string\"" - 9 |+ '"string"' -10 10 | ) -11 11 | -12 12 | # Same as above, but with f-strings +6 | this_is_fine = R"This is a \"string\"" +7 | this_should_raise = ( +8 | "This is a" + - "\"string\"" +9 + '"string"' +10 | ) +11 | +12 | # Same as above, but with f-strings Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:13:1 @@ -49,16 +45,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 15 | f'This is a "string"' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -10 10 | ) -11 11 | -12 12 | # Same as above, but with f-strings -13 |-f"This is a \"string\"" - 13 |+f'This is a "string"' -14 14 | f"'This' is a \"string\"" -15 15 | f'This is a "string"' -16 16 | f'\'This\' is a "string"' +10 | ) +11 | +12 | # Same as above, but with f-strings + - f"This is a \"string\"" +13 + f'This is a "string"' +14 | f"'This' is a \"string\"" +15 | f'This is a "string"' +16 | f'\'This\' is a "string"' Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:21:5 @@ -70,16 +64,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 22 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -18 18 | fR"This is a \"string\"" -19 19 | foo = ( -20 20 | f"This is a" -21 |- f"\"string\"" - 21 |+ f'"string"' -22 22 | ) -23 23 | -24 24 | # Nested f-strings (Python 3.12+) +18 | fR"This is a \"string\"" +19 | foo = ( +20 | f"This is a" + - f"\"string\"" +21 + f'"string"' +22 | ) +23 | +24 | # Nested f-strings (Python 3.12+) Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:43:1 @@ -91,16 +83,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 45 | f'This is a "string"' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -40 40 | -41 41 | -42 42 | # Same as above, but with t-strings -43 |-t"This is a \"string\"" - 43 |+t'This is a "string"' -44 44 | t"'This' is a \"string\"" -45 45 | f'This is a "string"' -46 46 | f'\'This\' is a "string"' +40 | +41 | +42 | # Same as above, but with t-strings + - t"This is a \"string\"" +43 + t'This is a "string"' +44 | t"'This' is a \"string\"" +45 | f'This is a "string"' +46 | f'\'This\' is a "string"' Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:51:5 @@ -113,16 +103,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 53 | t"\"foo\" {"foo"}" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -48 48 | fR"This is a \"string\"" -49 49 | foo = ( -50 50 | t"This is a" -51 |- t"\"string\"" - 51 |+ t'"string"' -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 +48 | fR"This is a \"string\"" +49 | foo = ( +50 | t"This is a" + - t"\"string\"" +51 + t'"string"' +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:53:1 @@ -135,16 +123,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -50 50 | t"This is a" -51 51 | t"\"string\"" -52 52 | ) -53 |-t"\"foo\" {"foo"}" # Q003 - 53 |+t'"foo" {"foo"}' # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 -55 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 -56 56 | +50 | t"This is a" +51 | t"\"string\"" +52 | ) + - t"\"foo\" {"foo"}" # Q003 +53 + t'"foo" {"foo"}' # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 +55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 +56 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:54:1 @@ -156,16 +142,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -51 51 | t"\"string\"" -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 |-t"\"foo\" {t"foo"}" # Q003 - 54 |+t'"foo" {t"foo"}' # Q003 -55 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" +51 | t"\"string\"" +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 + - t"\"foo\" {t"foo"}" # Q003 +54 + t'"foo" {t"foo"}' # Q003 +55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 +56 | +57 | t"normal {t"nested"} normal" Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:55:1 @@ -178,16 +162,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 57 | t"normal {t"nested"} normal" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 -55 |-t"\"foo\" {t"\"foo\""} \"\"" # Q003 - 55 |+t'"foo" {t"\"foo\""} ""' # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" -58 58 | t"\"normal\" {t"nested"} normal" # Q003 +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 + - t"\"foo\" {t"\"foo\""} \"\"" # Q003 +55 + t'"foo" {t"\"foo\""} ""' # Q003 +56 | +57 | t"normal {t"nested"} normal" +58 | t"\"normal\" {t"nested"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:55:12 @@ -200,16 +182,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 57 | t"normal {t"nested"} normal" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -52 52 | ) -53 53 | t"\"foo\" {"foo"}" # Q003 -54 54 | t"\"foo\" {t"foo"}" # Q003 -55 |-t"\"foo\" {t"\"foo\""} \"\"" # Q003 - 55 |+t"\"foo\" {t'"foo"'} \"\"" # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" -58 58 | t"\"normal\" {t"nested"} normal" # Q003 +52 | ) +53 | t"\"foo\" {"foo"}" # Q003 +54 | t"\"foo\" {t"foo"}" # Q003 + - t"\"foo\" {t"\"foo\""} \"\"" # Q003 +55 + t"\"foo\" {t'"foo"'} \"\"" # Q003 +56 | +57 | t"normal {t"nested"} normal" +58 | t"\"normal\" {t"nested"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:58:1 @@ -221,16 +201,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -55 55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 -56 56 | -57 57 | t"normal {t"nested"} normal" -58 |-t"\"normal\" {t"nested"} normal" # Q003 - 58 |+t'"normal" {t"nested"} normal' # Q003 -59 59 | t"\"normal\" {t"nested"} 'single quotes'" -60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 -61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +55 | t"\"foo\" {t"\"foo\""} \"\"" # Q003 +56 | +57 | t"normal {t"nested"} normal" + - t"\"normal\" {t"nested"} normal" # Q003 +58 + t'"normal" {t"nested"} normal' # Q003 +59 | t"\"normal\" {t"nested"} 'single quotes'" +60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 +61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:60:15 @@ -242,14 +220,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -57 57 | t"normal {t"nested"} normal" -58 58 | t"\"normal\" {t"nested"} normal" # Q003 -59 59 | t"\"normal\" {t"nested"} 'single quotes'" -60 |-t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 - 60 |+t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'" # Q003 -61 61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +57 | t"normal {t"nested"} normal" +58 | t"\"normal\" {t"nested"} normal" # Q003 +59 | t"\"normal\" {t"nested"} 'single quotes'" + - t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 +60 + t"\"normal\" {t'"nested" {"other"} normal'} 'single quotes'" # Q003 +61 | t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> singles_escaped.py:61:1 @@ -260,10 +236,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -58 58 | t"\"normal\" {t"nested"} normal" # Q003 -59 59 | t"\"normal\" {t"nested"} 'single quotes'" -60 60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 -61 |-t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 - 61 |+t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal' # Q003 +58 | t"\"normal\" {t"nested"} normal" # Q003 +59 | t"\"normal\" {t"nested"} 'single quotes'" +60 | t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'" # Q003 + - t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal" # Q003 +61 + t'"normal" {t"\"nested\" {"other"} 'single quotes'"} normal' # Q003 diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap index 01c794ca9c..01d927befa 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_escaped_unnecessary.py.snap @@ -10,13 +10,11 @@ Q004 [*] Unnecessary escape on inner quote character 3 | this_is_fine = 'This is a "string"' | help: Remove backslash - -ℹ Safe fix -1 |-this_should_raise_Q004 = "This is a \'string\'" - 1 |+this_should_raise_Q004 = "This is a 'string'" -2 2 | this_should_raise_Q004 = "'This' is a \'string\'" -3 3 | this_is_fine = 'This is a "string"' -4 4 | this_is_fine = '\'This\' is a "string"' + - this_should_raise_Q004 = "This is a \'string\'" +1 + this_should_raise_Q004 = "This is a 'string'" +2 | this_should_raise_Q004 = "'This' is a \'string\'" +3 | this_is_fine = 'This is a "string"' +4 | this_is_fine = '\'This\' is a "string"' Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:2:26 @@ -28,14 +26,12 @@ Q004 [*] Unnecessary escape on inner quote character 4 | this_is_fine = '\'This\' is a "string"' | help: Remove backslash - -ℹ Safe fix -1 1 | this_should_raise_Q004 = "This is a \'string\'" -2 |-this_should_raise_Q004 = "'This' is a \'string\'" - 2 |+this_should_raise_Q004 = "'This' is a 'string'" -3 3 | this_is_fine = 'This is a "string"' -4 4 | this_is_fine = '\'This\' is a "string"' -5 5 | this_is_fine = r"This is a \'string\'" +1 | this_should_raise_Q004 = "This is a \'string\'" + - this_should_raise_Q004 = "'This' is a \'string\'" +2 + this_should_raise_Q004 = "'This' is a 'string'" +3 | this_is_fine = 'This is a "string"' +4 | this_is_fine = '\'This\' is a "string"' +5 | this_is_fine = r"This is a \'string\'" Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:9:5 @@ -47,16 +43,14 @@ Q004 [*] Unnecessary escape on inner quote character 10 | ) | help: Remove backslash - -ℹ Safe fix -6 6 | this_is_fine = R"This is a \'string\'" -7 7 | this_should_raise_Q004 = ( -8 8 | "This is a" -9 |- "\'string\'" - 9 |+ "'string'" -10 10 | ) -11 11 | -12 12 | # Same as above, but with f-strings +6 | this_is_fine = R"This is a \'string\'" +7 | this_should_raise_Q004 = ( +8 | "This is a" + - "\'string\'" +9 + "'string'" +10 | ) +11 | +12 | # Same as above, but with f-strings Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:13:1 @@ -68,16 +62,14 @@ Q004 [*] Unnecessary escape on inner quote character 15 | f'This is a "string"' | help: Remove backslash - -ℹ Safe fix -10 10 | ) -11 11 | -12 12 | # Same as above, but with f-strings -13 |-f"This is a \'string\'" # Q004 - 13 |+f"This is a 'string'" # Q004 -14 14 | f"'This' is a \'string\'" # Q004 -15 15 | f'This is a "string"' -16 16 | f'\'This\' is a "string"' +10 | ) +11 | +12 | # Same as above, but with f-strings + - f"This is a \'string\'" # Q004 +13 + f"This is a 'string'" # Q004 +14 | f"'This' is a \'string\'" # Q004 +15 | f'This is a "string"' +16 | f'\'This\' is a "string"' Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:14:1 @@ -90,16 +82,14 @@ Q004 [*] Unnecessary escape on inner quote character 16 | f'\'This\' is a "string"' | help: Remove backslash - -ℹ Safe fix -11 11 | -12 12 | # Same as above, but with f-strings -13 13 | f"This is a \'string\'" # Q004 -14 |-f"'This' is a \'string\'" # Q004 - 14 |+f"'This' is a 'string'" # Q004 -15 15 | f'This is a "string"' -16 16 | f'\'This\' is a "string"' -17 17 | fr"This is a \'string\'" +11 | +12 | # Same as above, but with f-strings +13 | f"This is a \'string\'" # Q004 + - f"'This' is a \'string\'" # Q004 +14 + f"'This' is a 'string'" # Q004 +15 | f'This is a "string"' +16 | f'\'This\' is a "string"' +17 | fr"This is a \'string\'" Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:21:5 @@ -111,16 +101,14 @@ Q004 [*] Unnecessary escape on inner quote character 22 | ) | help: Remove backslash - -ℹ Safe fix -18 18 | fR"This is a \'string\'" -19 19 | this_should_raise_Q004 = ( -20 20 | f"This is a" -21 |- f"\'string\'" # Q004 - 21 |+ f"'string'" # Q004 -22 22 | ) -23 23 | -24 24 | # Nested f-strings (Python 3.12+) +18 | fR"This is a \'string\'" +19 | this_should_raise_Q004 = ( +20 | f"This is a" + - f"\'string\'" # Q004 +21 + f"'string'" # Q004 +22 | ) +23 | +24 | # Nested f-strings (Python 3.12+) Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:31:1 @@ -133,16 +121,14 @@ Q004 [*] Unnecessary escape on inner quote character 33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 | help: Remove backslash - -ℹ Safe fix -28 28 | # f'"foo" {"nested"}' -29 29 | # -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 |-f"\'foo\' {"foo"}" # Q004 - 31 |+f"'foo' {"foo"}" # Q004 -32 32 | f"\'foo\' {f"foo"}" # Q004 -33 33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 -34 34 | +28 | # f'"foo" {"nested"}' +29 | # +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. + - f"\'foo\' {"foo"}" # Q004 +31 + f"'foo' {"foo"}" # Q004 +32 | f"\'foo\' {f"foo"}" # Q004 +33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 +34 | Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:32:1 @@ -154,16 +140,14 @@ Q004 [*] Unnecessary escape on inner quote character 33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 | help: Remove backslash - -ℹ Safe fix -29 29 | # -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 31 | f"\'foo\' {"foo"}" # Q004 -32 |-f"\'foo\' {f"foo"}" # Q004 - 32 |+f"'foo' {f"foo"}" # Q004 -33 33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 -34 34 | -35 35 | f"normal {f"nested"} normal" +29 | # +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +31 | f"\'foo\' {"foo"}" # Q004 + - f"\'foo\' {f"foo"}" # Q004 +32 + f"'foo' {f"foo"}" # Q004 +33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 +34 | +35 | f"normal {f"nested"} normal" Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:33:1 @@ -176,16 +160,14 @@ Q004 [*] Unnecessary escape on inner quote character 35 | f"normal {f"nested"} normal" | help: Remove backslash - -ℹ Safe fix -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 31 | f"\'foo\' {"foo"}" # Q004 -32 32 | f"\'foo\' {f"foo"}" # Q004 -33 |-f"\'foo\' {f"\'foo\'"} \'\'" # Q004 - 33 |+f"'foo' {f"\'foo\'"} ''" # Q004 -34 34 | -35 35 | f"normal {f"nested"} normal" -36 36 | f"\'normal\' {f"nested"} normal" # Q004 +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +31 | f"\'foo\' {"foo"}" # Q004 +32 | f"\'foo\' {f"foo"}" # Q004 + - f"\'foo\' {f"\'foo\'"} \'\'" # Q004 +33 + f"'foo' {f"\'foo\'"} ''" # Q004 +34 | +35 | f"normal {f"nested"} normal" +36 | f"\'normal\' {f"nested"} normal" # Q004 Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:33:12 @@ -198,16 +180,14 @@ Q004 [*] Unnecessary escape on inner quote character 35 | f"normal {f"nested"} normal" | help: Remove backslash - -ℹ Safe fix -30 30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -31 31 | f"\'foo\' {"foo"}" # Q004 -32 32 | f"\'foo\' {f"foo"}" # Q004 -33 |-f"\'foo\' {f"\'foo\'"} \'\'" # Q004 - 33 |+f"\'foo\' {f"'foo'"} \'\'" # Q004 -34 34 | -35 35 | f"normal {f"nested"} normal" -36 36 | f"\'normal\' {f"nested"} normal" # Q004 +30 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +31 | f"\'foo\' {"foo"}" # Q004 +32 | f"\'foo\' {f"foo"}" # Q004 + - f"\'foo\' {f"\'foo\'"} \'\'" # Q004 +33 + f"\'foo\' {f"'foo'"} \'\'" # Q004 +34 | +35 | f"normal {f"nested"} normal" +36 | f"\'normal\' {f"nested"} normal" # Q004 Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:36:1 @@ -219,16 +199,14 @@ Q004 [*] Unnecessary escape on inner quote character 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 | help: Remove backslash - -ℹ Safe fix -33 33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 -34 34 | -35 35 | f"normal {f"nested"} normal" -36 |-f"\'normal\' {f"nested"} normal" # Q004 - 36 |+f"'normal' {f"nested"} normal" # Q004 -37 37 | f"\'normal\' {f"nested"} 'single quotes'" -38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 -39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 +33 | f"\'foo\' {f"\'foo\'"} \'\'" # Q004 +34 | +35 | f"normal {f"nested"} normal" + - f"\'normal\' {f"nested"} normal" # Q004 +36 + f"'normal' {f"nested"} normal" # Q004 +37 | f"\'normal\' {f"nested"} 'single quotes'" +38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 +39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:37:1 @@ -241,16 +219,14 @@ Q004 [*] Unnecessary escape on inner quote character 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 | help: Remove backslash - -ℹ Safe fix -34 34 | -35 35 | f"normal {f"nested"} normal" -36 36 | f"\'normal\' {f"nested"} normal" # Q004 -37 |-f"\'normal\' {f"nested"} 'single quotes'" - 37 |+f"'normal' {f"nested"} 'single quotes'" -38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 -39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 -40 40 | +34 | +35 | f"normal {f"nested"} normal" +36 | f"\'normal\' {f"nested"} normal" # Q004 + - f"\'normal\' {f"nested"} 'single quotes'" +37 + f"'normal' {f"nested"} 'single quotes'" +38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 +39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 +40 | Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:38:1 @@ -262,16 +238,14 @@ Q004 [*] Unnecessary escape on inner quote character 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 | help: Remove backslash - -ℹ Safe fix -35 35 | f"normal {f"nested"} normal" -36 36 | f"\'normal\' {f"nested"} normal" # Q004 -37 37 | f"\'normal\' {f"nested"} 'single quotes'" -38 |-f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 - 38 |+f"'normal' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 -39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 -40 40 | -41 41 | # Make sure we do not unescape quotes +35 | f"normal {f"nested"} normal" +36 | f"\'normal\' {f"nested"} normal" # Q004 +37 | f"\'normal\' {f"nested"} 'single quotes'" + - f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 +38 + f"'normal' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 +39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 +40 | +41 | # Make sure we do not unescape quotes Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:38:15 @@ -283,16 +257,14 @@ Q004 [*] Unnecessary escape on inner quote character 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 | help: Remove backslash - -ℹ Safe fix -35 35 | f"normal {f"nested"} normal" -36 36 | f"\'normal\' {f"nested"} normal" # Q004 -37 37 | f"\'normal\' {f"nested"} 'single quotes'" -38 |-f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 - 38 |+f"\'normal\' {f"'nested' {"other"} normal"} 'single quotes'" # Q004 -39 39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 -40 40 | -41 41 | # Make sure we do not unescape quotes +35 | f"normal {f"nested"} normal" +36 | f"\'normal\' {f"nested"} normal" # Q004 +37 | f"\'normal\' {f"nested"} 'single quotes'" + - f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 +38 + f"\'normal\' {f"'nested' {"other"} normal"} 'single quotes'" # Q004 +39 | f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 +40 | +41 | # Make sure we do not unescape quotes Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:39:1 @@ -305,16 +277,14 @@ Q004 [*] Unnecessary escape on inner quote character 41 | # Make sure we do not unescape quotes | help: Remove backslash - -ℹ Safe fix -36 36 | f"\'normal\' {f"nested"} normal" # Q004 -37 37 | f"\'normal\' {f"nested"} 'single quotes'" -38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 -39 |-f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 - 39 |+f"'normal' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 -40 40 | -41 41 | # Make sure we do not unescape quotes -42 42 | this_is_fine = "This is an \\'escaped\\' quote" +36 | f"\'normal\' {f"nested"} normal" # Q004 +37 | f"\'normal\' {f"nested"} 'single quotes'" +38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 + - f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 +39 + f"'normal' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 +40 | +41 | # Make sure we do not unescape quotes +42 | this_is_fine = "This is an \\'escaped\\' quote" Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:39:15 @@ -327,16 +297,14 @@ Q004 [*] Unnecessary escape on inner quote character 41 | # Make sure we do not unescape quotes | help: Remove backslash - -ℹ Safe fix -36 36 | f"\'normal\' {f"nested"} normal" # Q004 -37 37 | f"\'normal\' {f"nested"} 'single quotes'" -38 38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 -39 |-f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 - 39 |+f"\'normal\' {f"'nested' {"other"} 'single quotes'"} normal" # Q004 -40 40 | -41 41 | # Make sure we do not unescape quotes -42 42 | this_is_fine = "This is an \\'escaped\\' quote" +36 | f"\'normal\' {f"nested"} normal" # Q004 +37 | f"\'normal\' {f"nested"} 'single quotes'" +38 | f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'" # Q004 + - f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal" # Q004 +39 + f"\'normal\' {f"'nested' {"other"} 'single quotes'"} normal" # Q004 +40 | +41 | # Make sure we do not unescape quotes +42 | this_is_fine = "This is an \\'escaped\\' quote" Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:43:26 @@ -349,16 +317,14 @@ Q004 [*] Unnecessary escape on inner quote character 45 | # Invalid escapes in bytestrings are also triggered: | help: Remove backslash - -ℹ Safe fix -40 40 | -41 41 | # Make sure we do not unescape quotes -42 42 | this_is_fine = "This is an \\'escaped\\' quote" -43 |-this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash" # Q004 - 43 |+this_should_raise_Q004 = "This is an \\'escaped\\' quote with an extra backslash" # Q004 -44 44 | -45 45 | # Invalid escapes in bytestrings are also triggered: -46 46 | x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2" # Q004 +40 | +41 | # Make sure we do not unescape quotes +42 | this_is_fine = "This is an \\'escaped\\' quote" + - this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash" # Q004 +43 + this_should_raise_Q004 = "This is an \\'escaped\\' quote with an extra backslash" # Q004 +44 | +45 | # Invalid escapes in bytestrings are also triggered: +46 | x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2" # Q004 Q004 [*] Unnecessary escape on inner quote character --> singles_escaped_unnecessary.py:46:5 @@ -368,10 +334,8 @@ Q004 [*] Unnecessary escape on inner quote character | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove backslash - -ℹ Safe fix -43 43 | this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash" # Q004 -44 44 | -45 45 | # Invalid escapes in bytestrings are also triggered: -46 |-x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2" # Q004 - 46 |+x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce'rm\x0e\xcd\xe9.\xf8\xd2" # Q004 +43 | this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash" # Q004 +44 | +45 | # Invalid escapes in bytestrings are also triggered: + - x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce\'rm\x0e\xcd\xe9.\xf8\xd2" # Q004 +46 + x = b"\xe7\xeb\x0c\xa1\x1b\x83tN\xce=x\xe9\xbe\x01\xb9\x13B_\xba\xe7\x0c2\xce'rm\x0e\xcd\xe9.\xf8\xd2" # Q004 diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap index cde1de341b..44bf434055 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_implicit.py.snap @@ -11,14 +11,12 @@ Q000 [*] Single quotes found but double quotes preferred 4 | 'not' | help: Replace single quotes with double quotes - -ℹ Safe fix -1 1 | x = ( -2 |- 'This' - 2 |+ "This" -3 3 | 'is' -4 4 | 'not' -5 5 | ) +1 | x = ( + - 'This' +2 + "This" +3 | 'is' +4 | 'not' +5 | ) Q000 [*] Single quotes found but double quotes preferred --> singles_implicit.py:3:5 @@ -31,15 +29,13 @@ Q000 [*] Single quotes found but double quotes preferred 5 | ) | help: Replace single quotes with double quotes - -ℹ Safe fix -1 1 | x = ( -2 2 | 'This' -3 |- 'is' - 3 |+ "is" -4 4 | 'not' -5 5 | ) -6 6 | +1 | x = ( +2 | 'This' + - 'is' +3 + "is" +4 | 'not' +5 | ) +6 | Q000 [*] Single quotes found but double quotes preferred --> singles_implicit.py:4:5 @@ -51,16 +47,14 @@ Q000 [*] Single quotes found but double quotes preferred 5 | ) | help: Replace single quotes with double quotes - -ℹ Safe fix -1 1 | x = ( -2 2 | 'This' -3 3 | 'is' -4 |- 'not' - 4 |+ "not" -5 5 | ) -6 6 | -7 7 | x = ( +1 | x = ( +2 | 'This' +3 | 'is' + - 'not' +4 + "not" +5 | ) +6 | +7 | x = ( Q000 [*] Single quotes found but double quotes preferred --> singles_implicit.py:8:5 @@ -72,16 +66,14 @@ Q000 [*] Single quotes found but double quotes preferred 10 | 'not' | help: Replace single quotes with double quotes - -ℹ Safe fix -5 5 | ) -6 6 | -7 7 | x = ( -8 |- 'This' \ - 8 |+ "This" \ -9 9 | 'is' \ -10 10 | 'not' -11 11 | ) +5 | ) +6 | +7 | x = ( + - 'This' \ +8 + "This" \ +9 | 'is' \ +10 | 'not' +11 | ) Q000 [*] Single quotes found but double quotes preferred --> singles_implicit.py:9:5 @@ -94,16 +86,14 @@ Q000 [*] Single quotes found but double quotes preferred 11 | ) | help: Replace single quotes with double quotes - -ℹ Safe fix -6 6 | -7 7 | x = ( -8 8 | 'This' \ -9 |- 'is' \ - 9 |+ "is" \ -10 10 | 'not' -11 11 | ) -12 12 | +6 | +7 | x = ( +8 | 'This' \ + - 'is' \ +9 + "is" \ +10 | 'not' +11 | ) +12 | Q000 [*] Single quotes found but double quotes preferred --> singles_implicit.py:10:5 @@ -115,16 +105,14 @@ Q000 [*] Single quotes found but double quotes preferred 11 | ) | help: Replace single quotes with double quotes - -ℹ Safe fix -7 7 | x = ( -8 8 | 'This' \ -9 9 | 'is' \ -10 |- 'not' - 10 |+ "not" -11 11 | ) -12 12 | -13 13 | x = ( +7 | x = ( +8 | 'This' \ +9 | 'is' \ + - 'not' +10 + "not" +11 | ) +12 | +13 | x = ( Q000 [*] Single quotes found but double quotes preferred --> singles_implicit.py:27:1 @@ -135,10 +123,8 @@ Q000 [*] Single quotes found but double quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace single quotes with double quotes - -ℹ Safe fix -24 24 | -25 25 | if True: -26 26 | 'This can use "single" quotes' -27 |-'But this needs to be changed' - 27 |+"But this needs to be changed" +24 | +25 | if True: +26 | 'This can use "single" quotes' + - 'But this needs to be changed' +27 + "But this needs to be changed" diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap index 81c1440f4c..4721f42264 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_multiline_string.py.snap @@ -13,13 +13,11 @@ Q001 [*] Single quote multiline found but double quotes preferred 5 | s = """ This 'should' | help: Replace single multiline quotes with double quotes - -ℹ Safe fix -1 |-s = ''' This 'should' - 1 |+s = """ This 'should' -2 2 | be -3 |-'linted' ''' - 3 |+'linted' """ -4 4 | -5 5 | s = """ This 'should' -6 6 | 'not' be + - s = ''' This 'should' +1 + s = """ This 'should' +2 | be + - 'linted' ''' +3 + 'linted' """ +4 | +5 | s = """ This 'should' +6 | 'not' be diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap index 84cb0501e2..d667e33863 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_doubles_over_singles_would_be_triple_quotes.py.snap @@ -18,11 +18,9 @@ Q000 [*] Single quotes found but double quotes preferred 2 | s = 'Do not'" start with empty string" ' and lint docstring safely' | help: Replace single quotes with double quotes - -ℹ Safe fix -1 |-s = ''"Start with empty string" ' and lint docstring safely' - 1 |+s = ''"Start with empty string" " and lint docstring safely" -2 2 | s = 'Do not'" start with empty string" ' and lint docstring safely' + - s = ''"Start with empty string" ' and lint docstring safely' +1 + s = ''"Start with empty string" " and lint docstring safely" +2 | s = 'Do not'" start with empty string" ' and lint docstring safely' Q000 [*] Single quotes found but double quotes preferred --> singles_would_be_triple_quotes.py:2:5 @@ -32,11 +30,9 @@ Q000 [*] Single quotes found but double quotes preferred | ^^^^^^^^ | help: Replace single quotes with double quotes - -ℹ Safe fix -1 1 | s = ''"Start with empty string" ' and lint docstring safely' -2 |-s = 'Do not'" start with empty string" ' and lint docstring safely' - 2 |+s = "Do not"" start with empty string" ' and lint docstring safely' +1 | s = ''"Start with empty string" ' and lint docstring safely' + - s = 'Do not'" start with empty string" ' and lint docstring safely' +2 + s = "Do not"" start with empty string" ' and lint docstring safely' Q000 [*] Single quotes found but double quotes preferred --> singles_would_be_triple_quotes.py:2:40 @@ -46,8 +42,6 @@ Q000 [*] Single quotes found but double quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace single quotes with double quotes - -ℹ Safe fix -1 1 | s = ''"Start with empty string" ' and lint docstring safely' -2 |-s = 'Do not'" start with empty string" ' and lint docstring safely' - 2 |+s = 'Do not'" start with empty string" " and lint docstring safely" +1 | s = ''"Start with empty string" ' and lint docstring safely' + - s = 'Do not'" start with empty string" ' and lint docstring safely' +2 + s = 'Do not'" start with empty string" " and lint docstring safely" diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap index 655e2a0943..180e3687f5 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles.py.snap @@ -10,13 +10,11 @@ Q000 [*] Double quotes found but single quotes preferred 3 | this_should_be_linted = f"double quote string" | help: Replace double quotes with single quotes - -ℹ Safe fix -1 |-this_should_be_linted = "double quote string" - 1 |+this_should_be_linted = 'double quote string' -2 2 | this_should_be_linted = u"double quote string" -3 3 | this_should_be_linted = f"double quote string" -4 4 | this_should_be_linted = f"double {'quote'} string" + - this_should_be_linted = "double quote string" +1 + this_should_be_linted = 'double quote string' +2 | this_should_be_linted = u"double quote string" +3 | this_should_be_linted = f"double quote string" +4 | this_should_be_linted = f"double {'quote'} string" Q000 [*] Double quotes found but single quotes preferred --> doubles.py:2:25 @@ -28,13 +26,11 @@ Q000 [*] Double quotes found but single quotes preferred 4 | this_should_be_linted = f"double {'quote'} string" | help: Replace double quotes with single quotes - -ℹ Safe fix -1 1 | this_should_be_linted = "double quote string" -2 |-this_should_be_linted = u"double quote string" - 2 |+this_should_be_linted = u'double quote string' -3 3 | this_should_be_linted = f"double quote string" -4 4 | this_should_be_linted = f"double {'quote'} string" +1 | this_should_be_linted = "double quote string" + - this_should_be_linted = u"double quote string" +2 + this_should_be_linted = u'double quote string' +3 | this_should_be_linted = f"double quote string" +4 | this_should_be_linted = f"double {'quote'} string" Q000 [*] Double quotes found but single quotes preferred --> doubles.py:3:25 @@ -46,10 +42,8 @@ Q000 [*] Double quotes found but single quotes preferred 4 | this_should_be_linted = f"double {'quote'} string" | help: Replace double quotes with single quotes - -ℹ Safe fix -1 1 | this_should_be_linted = "double quote string" -2 2 | this_should_be_linted = u"double quote string" -3 |-this_should_be_linted = f"double quote string" - 3 |+this_should_be_linted = f'double quote string' -4 4 | this_should_be_linted = f"double {'quote'} string" +1 | this_should_be_linted = "double quote string" +2 | this_should_be_linted = u"double quote string" + - this_should_be_linted = f"double quote string" +3 + this_should_be_linted = f'double quote string' +4 | this_should_be_linted = f"double {'quote'} string" diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap index 39a71b82a2..c45230db10 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped.py.snap @@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 3 | this_is_fine = '"This" is a \'string\'' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -1 |-this_should_raise_Q003 = 'This is a \'string\'' - 1 |+this_should_raise_Q003 = "This is a 'string'" -2 2 | this_should_raise_Q003 = 'This is \\ a \\\'string\'' -3 3 | this_is_fine = '"This" is a \'string\'' -4 4 | this_is_fine = "This is a 'string'" + - this_should_raise_Q003 = 'This is a \'string\'' +1 + this_should_raise_Q003 = "This is a 'string'" +2 | this_should_raise_Q003 = 'This is \\ a \\\'string\'' +3 | this_is_fine = '"This" is a \'string\'' +4 | this_is_fine = "This is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:2:26 @@ -28,14 +26,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 4 | this_is_fine = "This is a 'string'" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -1 1 | this_should_raise_Q003 = 'This is a \'string\'' -2 |-this_should_raise_Q003 = 'This is \\ a \\\'string\'' - 2 |+this_should_raise_Q003 = "This is \\ a \\'string'" -3 3 | this_is_fine = '"This" is a \'string\'' -4 4 | this_is_fine = "This is a 'string'" -5 5 | this_is_fine = "\"This\" is a 'string'" +1 | this_should_raise_Q003 = 'This is a \'string\'' + - this_should_raise_Q003 = 'This is \\ a \\\'string\'' +2 + this_should_raise_Q003 = "This is \\ a \\'string'" +3 | this_is_fine = '"This" is a \'string\'' +4 | this_is_fine = "This is a 'string'" +5 | this_is_fine = "\"This\" is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:10:5 @@ -47,16 +43,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 11 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -7 7 | this_is_fine = R'This is a \'string\'' -8 8 | this_should_raise = ( -9 9 | 'This is a' -10 |- '\'string\'' - 10 |+ "'string'" -11 11 | ) -12 12 | -13 13 | # Same as above, but with f-strings +7 | this_is_fine = R'This is a \'string\'' +8 | this_should_raise = ( +9 | 'This is a' + - '\'string\'' +10 + "'string'" +11 | ) +12 | +13 | # Same as above, but with f-strings Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:14:1 @@ -68,16 +62,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 16 | f'"This" is a \'string\'' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -11 11 | ) -12 12 | -13 13 | # Same as above, but with f-strings -14 |-f'This is a \'string\'' # Q003 - 14 |+f"This is a 'string'" # Q003 -15 15 | f'This is \\ a \\\'string\'' # Q003 -16 16 | f'"This" is a \'string\'' -17 17 | f"This is a 'string'" +11 | ) +12 | +13 | # Same as above, but with f-strings + - f'This is a \'string\'' # Q003 +14 + f"This is a 'string'" # Q003 +15 | f'This is \\ a \\\'string\'' # Q003 +16 | f'"This" is a \'string\'' +17 | f"This is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:15:1 @@ -90,16 +82,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 17 | f"This is a 'string'" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -12 12 | -13 13 | # Same as above, but with f-strings -14 14 | f'This is a \'string\'' # Q003 -15 |-f'This is \\ a \\\'string\'' # Q003 - 15 |+f"This is \\ a \\'string'" # Q003 -16 16 | f'"This" is a \'string\'' -17 17 | f"This is a 'string'" -18 18 | f"\"This\" is a 'string'" +12 | +13 | # Same as above, but with f-strings +14 | f'This is a \'string\'' # Q003 + - f'This is \\ a \\\'string\'' # Q003 +15 + f"This is \\ a \\'string'" # Q003 +16 | f'"This" is a \'string\'' +17 | f"This is a 'string'" +18 | f"\"This\" is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:23:5 @@ -111,16 +101,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 24 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -20 20 | fR'This is a \'string\'' -21 21 | foo = ( -22 22 | f'This is a' -23 |- f'\'string\'' # Q003 - 23 |+ f"'string'" # Q003 -24 24 | ) -25 25 | -26 26 | # Nested f-strings (Python 3.12+) +20 | fR'This is a \'string\'' +21 | foo = ( +22 | f'This is a' + - f'\'string\'' # Q003 +23 + f"'string'" # Q003 +24 | ) +25 | +26 | # Nested f-strings (Python 3.12+) Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:33:1 @@ -133,16 +121,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -30 30 | # f"'foo' {'nested'}" -31 31 | # -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 |-f'\'foo\' {'nested'}' # Q003 - 33 |+f"'foo' {'nested'}" # Q003 -34 34 | f'\'foo\' {f'nested'}' # Q003 -35 35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 -36 36 | +30 | # f"'foo' {'nested'}" +31 | # +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. + - f'\'foo\' {'nested'}' # Q003 +33 + f"'foo' {'nested'}" # Q003 +34 | f'\'foo\' {f'nested'}' # Q003 +35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 +36 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:34:1 @@ -154,16 +140,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -31 31 | # -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 33 | f'\'foo\' {'nested'}' # Q003 -34 |-f'\'foo\' {f'nested'}' # Q003 - 34 |+f"'foo' {f'nested'}" # Q003 -35 35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 -36 36 | -37 37 | f'normal {f'nested'} normal' +31 | # +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +33 | f'\'foo\' {'nested'}' # Q003 + - f'\'foo\' {f'nested'}' # Q003 +34 + f"'foo' {f'nested'}" # Q003 +35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 +36 | +37 | f'normal {f'nested'} normal' Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:35:1 @@ -176,16 +160,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 37 | f'normal {f'nested'} normal' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 33 | f'\'foo\' {'nested'}' # Q003 -34 34 | f'\'foo\' {f'nested'}' # Q003 -35 |-f'\'foo\' {f'\'nested\''} \'\'' # Q003 - 35 |+f"'foo' {f'\'nested\''} ''" # Q003 -36 36 | -37 37 | f'normal {f'nested'} normal' -38 38 | f'\'normal\' {f'nested'} normal' # Q003 +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +33 | f'\'foo\' {'nested'}' # Q003 +34 | f'\'foo\' {f'nested'}' # Q003 + - f'\'foo\' {f'\'nested\''} \'\'' # Q003 +35 + f"'foo' {f'\'nested\''} ''" # Q003 +36 | +37 | f'normal {f'nested'} normal' +38 | f'\'normal\' {f'nested'} normal' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:35:12 @@ -198,16 +180,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 37 | f'normal {f'nested'} normal' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 33 | f'\'foo\' {'nested'}' # Q003 -34 34 | f'\'foo\' {f'nested'}' # Q003 -35 |-f'\'foo\' {f'\'nested\''} \'\'' # Q003 - 35 |+f'\'foo\' {f"'nested'"} \'\'' # Q003 -36 36 | -37 37 | f'normal {f'nested'} normal' -38 38 | f'\'normal\' {f'nested'} normal' # Q003 +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +33 | f'\'foo\' {'nested'}' # Q003 +34 | f'\'foo\' {f'nested'}' # Q003 + - f'\'foo\' {f'\'nested\''} \'\'' # Q003 +35 + f'\'foo\' {f"'nested'"} \'\'' # Q003 +36 | +37 | f'normal {f'nested'} normal' +38 | f'\'normal\' {f'nested'} normal' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:38:1 @@ -219,16 +199,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -35 35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 -36 36 | -37 37 | f'normal {f'nested'} normal' -38 |-f'\'normal\' {f'nested'} normal' # Q003 - 38 |+f"'normal' {f'nested'} normal" # Q003 -39 39 | f'\'normal\' {f'nested'} "double quotes"' -40 40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"' # Q003 -41 41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal' # Q00l +35 | f'\'foo\' {f'\'nested\''} \'\'' # Q003 +36 | +37 | f'normal {f'nested'} normal' + - f'\'normal\' {f'nested'} normal' # Q003 +38 + f"'normal' {f'nested'} normal" # Q003 +39 | f'\'normal\' {f'nested'} "double quotes"' +40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"' # Q003 +41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal' # Q00l Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:40:15 @@ -240,16 +218,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal' # Q00l | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -37 37 | f'normal {f'nested'} normal' -38 38 | f'\'normal\' {f'nested'} normal' # Q003 -39 39 | f'\'normal\' {f'nested'} "double quotes"' -40 |-f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"' # Q003 - 40 |+f'\'normal\' {f"'nested' {'other'} normal"} "double quotes"' # Q003 -41 41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal' # Q00l -42 42 | -43 43 | +37 | f'normal {f'nested'} normal' +38 | f'\'normal\' {f'nested'} normal' # Q003 +39 | f'\'normal\' {f'nested'} "double quotes"' + - f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"' # Q003 +40 + f'\'normal\' {f"'nested' {'other'} normal"} "double quotes"' # Q003 +41 | f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal' # Q00l +42 | +43 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:41:1 @@ -260,16 +236,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -38 38 | f'\'normal\' {f'nested'} normal' # Q003 -39 39 | f'\'normal\' {f'nested'} "double quotes"' -40 40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"' # Q003 -41 |-f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal' # Q00l - 41 |+f"'normal' {f'\'nested\' {'other'} "double quotes"'} normal" # Q00l -42 42 | -43 43 | -44 44 | +38 | f'\'normal\' {f'nested'} normal' # Q003 +39 | f'\'normal\' {f'nested'} "double quotes"' +40 | f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"' # Q003 + - f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal' # Q00l +41 + f"'normal' {f'\'nested\' {'other'} "double quotes"'} normal" # Q00l +42 | +43 | +44 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:46:1 @@ -281,16 +255,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 48 | t'"This" is a \'string\'' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -43 43 | -44 44 | -45 45 | # Same as above, but with t-strings -46 |-t'This is a \'string\'' # Q003 - 46 |+t"This is a 'string'" # Q003 -47 47 | t'This is \\ a \\\'string\'' # Q003 -48 48 | t'"This" is a \'string\'' -49 49 | f"This is a 'string'" +43 | +44 | +45 | # Same as above, but with t-strings + - t'This is a \'string\'' # Q003 +46 + t"This is a 'string'" # Q003 +47 | t'This is \\ a \\\'string\'' # Q003 +48 | t'"This" is a \'string\'' +49 | f"This is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:47:1 @@ -303,16 +275,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 49 | f"This is a 'string'" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -44 44 | -45 45 | # Same as above, but with t-strings -46 46 | t'This is a \'string\'' # Q003 -47 |-t'This is \\ a \\\'string\'' # Q003 - 47 |+t"This is \\ a \\'string'" # Q003 -48 48 | t'"This" is a \'string\'' -49 49 | f"This is a 'string'" -50 50 | f"\"This\" is a 'string'" +44 | +45 | # Same as above, but with t-strings +46 | t'This is a \'string\'' # Q003 + - t'This is \\ a \\\'string\'' # Q003 +47 + t"This is \\ a \\'string'" # Q003 +48 | t'"This" is a \'string\'' +49 | f"This is a 'string'" +50 | f"\"This\" is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:55:5 @@ -325,16 +295,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 57 | t'\'foo\' {'nested'}' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -52 52 | fR'This is a \'string\'' -53 53 | foo = ( -54 54 | t'This is a' -55 |- t'\'string\'' # Q003 - 55 |+ t"'string'" # Q003 -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 +52 | fR'This is a \'string\'' +53 | foo = ( +54 | t'This is a' + - t'\'string\'' # Q003 +55 + t"'string'" # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:57:1 @@ -347,16 +315,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -54 54 | t'This is a' -55 55 | t'\'string\'' # Q003 -56 56 | ) -57 |-t'\'foo\' {'nested'}' # Q003 - 57 |+t"'foo' {'nested'}" # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 -59 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 -60 60 | +54 | t'This is a' +55 | t'\'string\'' # Q003 +56 | ) + - t'\'foo\' {'nested'}' # Q003 +57 + t"'foo' {'nested'}" # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 +59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 +60 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:58:1 @@ -368,16 +334,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -55 55 | t'\'string\'' # Q003 -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 |-t'\'foo\' {t'nested'}' # Q003 - 58 |+t"'foo' {t'nested'}" # Q003 -59 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' +55 | t'\'string\'' # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 + - t'\'foo\' {t'nested'}' # Q003 +58 + t"'foo' {t'nested'}" # Q003 +59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 +60 | +61 | t'normal {t'nested'} normal' Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:59:1 @@ -390,16 +354,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 61 | t'normal {t'nested'} normal' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 -59 |-t'\'foo\' {t'\'nested\''} \'\'' # Q003 - 59 |+t"'foo' {t'\'nested\''} ''" # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' -62 62 | t'\'normal\' {t'nested'} normal' # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 + - t'\'foo\' {t'\'nested\''} \'\'' # Q003 +59 + t"'foo' {t'\'nested\''} ''" # Q003 +60 | +61 | t'normal {t'nested'} normal' +62 | t'\'normal\' {t'nested'} normal' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:59:12 @@ -412,16 +374,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 61 | t'normal {t'nested'} normal' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 -59 |-t'\'foo\' {t'\'nested\''} \'\'' # Q003 - 59 |+t'\'foo\' {t"'nested'"} \'\'' # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' -62 62 | t'\'normal\' {t'nested'} normal' # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 + - t'\'foo\' {t'\'nested\''} \'\'' # Q003 +59 + t'\'foo\' {t"'nested'"} \'\'' # Q003 +60 | +61 | t'normal {t'nested'} normal' +62 | t'\'normal\' {t'nested'} normal' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:62:1 @@ -433,16 +393,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -59 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' -62 |-t'\'normal\' {t'nested'} normal' # Q003 - 62 |+t"'normal' {t'nested'} normal" # Q003 -63 63 | t'\'normal\' {t'nested'} "double quotes"' -64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 -65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l +59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 +60 | +61 | t'normal {t'nested'} normal' + - t'\'normal\' {t'nested'} normal' # Q003 +62 + t"'normal' {t'nested'} normal" # Q003 +63 | t'\'normal\' {t'nested'} "double quotes"' +64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 +65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:64:15 @@ -454,14 +412,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -61 61 | t'normal {t'nested'} normal' -62 62 | t'\'normal\' {t'nested'} normal' # Q003 -63 63 | t'\'normal\' {t'nested'} "double quotes"' -64 |-t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 - 64 |+t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"' # Q003 -65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l +61 | t'normal {t'nested'} normal' +62 | t'\'normal\' {t'nested'} normal' # Q003 +63 | t'\'normal\' {t'nested'} "double quotes"' + - t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 +64 + t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"' # Q003 +65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:65:1 @@ -472,10 +428,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -62 62 | t'\'normal\' {t'nested'} normal' # Q003 -63 63 | t'\'normal\' {t'nested'} "double quotes"' -64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 -65 |-t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l - 65 |+t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal" # Q00l +62 | t'\'normal\' {t'nested'} normal' # Q003 +63 | t'\'normal\' {t'nested'} "double quotes"' +64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 + - t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l +65 + t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal" # Q00l diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap index 57bcec82b5..a965c9b855 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_py311.snap @@ -10,13 +10,11 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 3 | this_is_fine = '"This" is a \'string\'' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -1 |-this_should_raise_Q003 = 'This is a \'string\'' - 1 |+this_should_raise_Q003 = "This is a 'string'" -2 2 | this_should_raise_Q003 = 'This is \\ a \\\'string\'' -3 3 | this_is_fine = '"This" is a \'string\'' -4 4 | this_is_fine = "This is a 'string'" + - this_should_raise_Q003 = 'This is a \'string\'' +1 + this_should_raise_Q003 = "This is a 'string'" +2 | this_should_raise_Q003 = 'This is \\ a \\\'string\'' +3 | this_is_fine = '"This" is a \'string\'' +4 | this_is_fine = "This is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:2:26 @@ -28,14 +26,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 4 | this_is_fine = "This is a 'string'" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -1 1 | this_should_raise_Q003 = 'This is a \'string\'' -2 |-this_should_raise_Q003 = 'This is \\ a \\\'string\'' - 2 |+this_should_raise_Q003 = "This is \\ a \\'string'" -3 3 | this_is_fine = '"This" is a \'string\'' -4 4 | this_is_fine = "This is a 'string'" -5 5 | this_is_fine = "\"This\" is a 'string'" +1 | this_should_raise_Q003 = 'This is a \'string\'' + - this_should_raise_Q003 = 'This is \\ a \\\'string\'' +2 + this_should_raise_Q003 = "This is \\ a \\'string'" +3 | this_is_fine = '"This" is a \'string\'' +4 | this_is_fine = "This is a 'string'" +5 | this_is_fine = "\"This\" is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:10:5 @@ -47,16 +43,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 11 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -7 7 | this_is_fine = R'This is a \'string\'' -8 8 | this_should_raise = ( -9 9 | 'This is a' -10 |- '\'string\'' - 10 |+ "'string'" -11 11 | ) -12 12 | -13 13 | # Same as above, but with f-strings +7 | this_is_fine = R'This is a \'string\'' +8 | this_should_raise = ( +9 | 'This is a' + - '\'string\'' +10 + "'string'" +11 | ) +12 | +13 | # Same as above, but with f-strings Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:14:1 @@ -68,16 +62,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 16 | f'"This" is a \'string\'' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -11 11 | ) -12 12 | -13 13 | # Same as above, but with f-strings -14 |-f'This is a \'string\'' # Q003 - 14 |+f"This is a 'string'" # Q003 -15 15 | f'This is \\ a \\\'string\'' # Q003 -16 16 | f'"This" is a \'string\'' -17 17 | f"This is a 'string'" +11 | ) +12 | +13 | # Same as above, but with f-strings + - f'This is a \'string\'' # Q003 +14 + f"This is a 'string'" # Q003 +15 | f'This is \\ a \\\'string\'' # Q003 +16 | f'"This" is a \'string\'' +17 | f"This is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:15:1 @@ -90,16 +82,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 17 | f"This is a 'string'" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -12 12 | -13 13 | # Same as above, but with f-strings -14 14 | f'This is a \'string\'' # Q003 -15 |-f'This is \\ a \\\'string\'' # Q003 - 15 |+f"This is \\ a \\'string'" # Q003 -16 16 | f'"This" is a \'string\'' -17 17 | f"This is a 'string'" -18 18 | f"\"This\" is a 'string'" +12 | +13 | # Same as above, but with f-strings +14 | f'This is a \'string\'' # Q003 + - f'This is \\ a \\\'string\'' # Q003 +15 + f"This is \\ a \\'string'" # Q003 +16 | f'"This" is a \'string\'' +17 | f"This is a 'string'" +18 | f"\"This\" is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:23:5 @@ -111,16 +101,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 24 | ) | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -20 20 | fR'This is a \'string\'' -21 21 | foo = ( -22 22 | f'This is a' -23 |- f'\'string\'' # Q003 - 23 |+ f"'string'" # Q003 -24 24 | ) -25 25 | -26 26 | # Nested f-strings (Python 3.12+) +20 | fR'This is a \'string\'' +21 | foo = ( +22 | f'This is a' + - f'\'string\'' # Q003 +23 + f"'string'" # Q003 +24 | ) +25 | +26 | # Nested f-strings (Python 3.12+) Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:46:1 @@ -132,16 +120,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 48 | t'"This" is a \'string\'' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -43 43 | -44 44 | -45 45 | # Same as above, but with t-strings -46 |-t'This is a \'string\'' # Q003 - 46 |+t"This is a 'string'" # Q003 -47 47 | t'This is \\ a \\\'string\'' # Q003 -48 48 | t'"This" is a \'string\'' -49 49 | f"This is a 'string'" +43 | +44 | +45 | # Same as above, but with t-strings + - t'This is a \'string\'' # Q003 +46 + t"This is a 'string'" # Q003 +47 | t'This is \\ a \\\'string\'' # Q003 +48 | t'"This" is a \'string\'' +49 | f"This is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:47:1 @@ -154,16 +140,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 49 | f"This is a 'string'" | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -44 44 | -45 45 | # Same as above, but with t-strings -46 46 | t'This is a \'string\'' # Q003 -47 |-t'This is \\ a \\\'string\'' # Q003 - 47 |+t"This is \\ a \\'string'" # Q003 -48 48 | t'"This" is a \'string\'' -49 49 | f"This is a 'string'" -50 50 | f"\"This\" is a 'string'" +44 | +45 | # Same as above, but with t-strings +46 | t'This is a \'string\'' # Q003 + - t'This is \\ a \\\'string\'' # Q003 +47 + t"This is \\ a \\'string'" # Q003 +48 | t'"This" is a \'string\'' +49 | f"This is a 'string'" +50 | f"\"This\" is a 'string'" Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:55:5 @@ -176,16 +160,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 57 | t'\'foo\' {'nested'}' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -52 52 | fR'This is a \'string\'' -53 53 | foo = ( -54 54 | t'This is a' -55 |- t'\'string\'' # Q003 - 55 |+ t"'string'" # Q003 -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 +52 | fR'This is a \'string\'' +53 | foo = ( +54 | t'This is a' + - t'\'string\'' # Q003 +55 + t"'string'" # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:57:1 @@ -198,16 +180,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -54 54 | t'This is a' -55 55 | t'\'string\'' # Q003 -56 56 | ) -57 |-t'\'foo\' {'nested'}' # Q003 - 57 |+t"'foo' {'nested'}" # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 -59 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 -60 60 | +54 | t'This is a' +55 | t'\'string\'' # Q003 +56 | ) + - t'\'foo\' {'nested'}' # Q003 +57 + t"'foo' {'nested'}" # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 +59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 +60 | Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:58:1 @@ -219,16 +199,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -55 55 | t'\'string\'' # Q003 -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 |-t'\'foo\' {t'nested'}' # Q003 - 58 |+t"'foo' {t'nested'}" # Q003 -59 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' +55 | t'\'string\'' # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 + - t'\'foo\' {t'nested'}' # Q003 +58 + t"'foo' {t'nested'}" # Q003 +59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 +60 | +61 | t'normal {t'nested'} normal' Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:59:1 @@ -241,16 +219,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 61 | t'normal {t'nested'} normal' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 -59 |-t'\'foo\' {t'\'nested\''} \'\'' # Q003 - 59 |+t"'foo' {t'\'nested\''} ''" # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' -62 62 | t'\'normal\' {t'nested'} normal' # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 + - t'\'foo\' {t'\'nested\''} \'\'' # Q003 +59 + t"'foo' {t'\'nested\''} ''" # Q003 +60 | +61 | t'normal {t'nested'} normal' +62 | t'\'normal\' {t'nested'} normal' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:59:12 @@ -263,16 +239,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 61 | t'normal {t'nested'} normal' | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -56 56 | ) -57 57 | t'\'foo\' {'nested'}' # Q003 -58 58 | t'\'foo\' {t'nested'}' # Q003 -59 |-t'\'foo\' {t'\'nested\''} \'\'' # Q003 - 59 |+t'\'foo\' {t"'nested'"} \'\'' # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' -62 62 | t'\'normal\' {t'nested'} normal' # Q003 +56 | ) +57 | t'\'foo\' {'nested'}' # Q003 +58 | t'\'foo\' {t'nested'}' # Q003 + - t'\'foo\' {t'\'nested\''} \'\'' # Q003 +59 + t'\'foo\' {t"'nested'"} \'\'' # Q003 +60 | +61 | t'normal {t'nested'} normal' +62 | t'\'normal\' {t'nested'} normal' # Q003 Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:62:1 @@ -284,16 +258,14 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -59 59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 -60 60 | -61 61 | t'normal {t'nested'} normal' -62 |-t'\'normal\' {t'nested'} normal' # Q003 - 62 |+t"'normal' {t'nested'} normal" # Q003 -63 63 | t'\'normal\' {t'nested'} "double quotes"' -64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 -65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l +59 | t'\'foo\' {t'\'nested\''} \'\'' # Q003 +60 | +61 | t'normal {t'nested'} normal' + - t'\'normal\' {t'nested'} normal' # Q003 +62 + t"'normal' {t'nested'} normal" # Q003 +63 | t'\'normal\' {t'nested'} "double quotes"' +64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 +65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:64:15 @@ -305,14 +277,12 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -61 61 | t'normal {t'nested'} normal' -62 62 | t'\'normal\' {t'nested'} normal' # Q003 -63 63 | t'\'normal\' {t'nested'} "double quotes"' -64 |-t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 - 64 |+t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"' # Q003 -65 65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l +61 | t'normal {t'nested'} normal' +62 | t'\'normal\' {t'nested'} normal' # Q003 +63 | t'\'normal\' {t'nested'} "double quotes"' + - t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 +64 + t'\'normal\' {t"'nested' {'other'} normal"} "double quotes"' # Q003 +65 | t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l Q003 [*] Change outer quotes to avoid escaping inner quotes --> doubles_escaped.py:65:1 @@ -323,10 +293,8 @@ Q003 [*] Change outer quotes to avoid escaping inner quotes | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Change outer quotes to avoid escaping inner quotes - -ℹ Safe fix -62 62 | t'\'normal\' {t'nested'} normal' # Q003 -63 63 | t'\'normal\' {t'nested'} "double quotes"' -64 64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 -65 |-t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l - 65 |+t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal" # Q00l +62 | t'\'normal\' {t'nested'} normal' # Q003 +63 | t'\'normal\' {t'nested'} "double quotes"' +64 | t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"' # Q003 + - t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal' # Q00l +65 + t"'normal' {t'\'nested\' {'other'} "double quotes"'} normal" # Q00l diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap index 5acb1b7482..58e2b3b4dd 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_escaped_unnecessary.py.snap @@ -10,13 +10,11 @@ Q004 [*] Unnecessary escape on inner quote character 3 | this_is_fine = '"This" is a \"string\"' | help: Remove backslash - -ℹ Safe fix -1 |-this_should_raise_Q004 = 'This is a \"string\"' - 1 |+this_should_raise_Q004 = 'This is a "string"' -2 2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"' -3 3 | this_is_fine = '"This" is a \"string\"' -4 4 | this_is_fine = "This is a 'string'" + - this_should_raise_Q004 = 'This is a \"string\"' +1 + this_should_raise_Q004 = 'This is a "string"' +2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"' +3 | this_is_fine = '"This" is a \"string\"' +4 | this_is_fine = "This is a 'string'" Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:2:26 @@ -28,14 +26,12 @@ Q004 [*] Unnecessary escape on inner quote character 4 | this_is_fine = "This is a 'string'" | help: Remove backslash - -ℹ Safe fix -1 1 | this_should_raise_Q004 = 'This is a \"string\"' -2 |-this_should_raise_Q004 = 'This is \\ a \\\"string\"' - 2 |+this_should_raise_Q004 = 'This is \\ a \\"string"' -3 3 | this_is_fine = '"This" is a \"string\"' -4 4 | this_is_fine = "This is a 'string'" -5 5 | this_is_fine = "\"This\" is a 'string'" +1 | this_should_raise_Q004 = 'This is a \"string\"' + - this_should_raise_Q004 = 'This is \\ a \\\"string\"' +2 + this_should_raise_Q004 = 'This is \\ a \\"string"' +3 | this_is_fine = '"This" is a \"string\"' +4 | this_is_fine = "This is a 'string'" +5 | this_is_fine = "\"This\" is a 'string'" Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:3:16 @@ -48,15 +44,13 @@ Q004 [*] Unnecessary escape on inner quote character 5 | this_is_fine = "\"This\" is a 'string'" | help: Remove backslash - -ℹ Safe fix -1 1 | this_should_raise_Q004 = 'This is a \"string\"' -2 2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"' -3 |-this_is_fine = '"This" is a \"string\"' - 3 |+this_is_fine = '"This" is a "string"' -4 4 | this_is_fine = "This is a 'string'" -5 5 | this_is_fine = "\"This\" is a 'string'" -6 6 | this_is_fine = r'This is a \"string\"' +1 | this_should_raise_Q004 = 'This is a \"string\"' +2 | this_should_raise_Q004 = 'This is \\ a \\\"string\"' + - this_is_fine = '"This" is a \"string\"' +3 + this_is_fine = '"This" is a "string"' +4 | this_is_fine = "This is a 'string'" +5 | this_is_fine = "\"This\" is a 'string'" +6 | this_is_fine = r'This is a \"string\"' Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:10:5 @@ -68,16 +62,14 @@ Q004 [*] Unnecessary escape on inner quote character 11 | ) | help: Remove backslash - -ℹ Safe fix -7 7 | this_is_fine = R'This is a \"string\"' -8 8 | this_should_raise_Q004 = ( -9 9 | 'This is a' -10 |- '\"string\"' - 10 |+ '"string"' -11 11 | ) -12 12 | -13 13 | # Same as above, but with f-strings +7 | this_is_fine = R'This is a \"string\"' +8 | this_should_raise_Q004 = ( +9 | 'This is a' + - '\"string\"' +10 + '"string"' +11 | ) +12 | +13 | # Same as above, but with f-strings Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:14:1 @@ -89,16 +81,14 @@ Q004 [*] Unnecessary escape on inner quote character 16 | f'"This" is a \"string\"' | help: Remove backslash - -ℹ Safe fix -11 11 | ) -12 12 | -13 13 | # Same as above, but with f-strings -14 |-f'This is a \"string\"' # Q004 - 14 |+f'This is a "string"' # Q004 -15 15 | f'This is \\ a \\\"string\"' # Q004 -16 16 | f'"This" is a \"string\"' -17 17 | f"This is a 'string'" +11 | ) +12 | +13 | # Same as above, but with f-strings + - f'This is a \"string\"' # Q004 +14 + f'This is a "string"' # Q004 +15 | f'This is \\ a \\\"string\"' # Q004 +16 | f'"This" is a \"string\"' +17 | f"This is a 'string'" Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:15:1 @@ -111,16 +101,14 @@ Q004 [*] Unnecessary escape on inner quote character 17 | f"This is a 'string'" | help: Remove backslash - -ℹ Safe fix -12 12 | -13 13 | # Same as above, but with f-strings -14 14 | f'This is a \"string\"' # Q004 -15 |-f'This is \\ a \\\"string\"' # Q004 - 15 |+f'This is \\ a \\"string"' # Q004 -16 16 | f'"This" is a \"string\"' -17 17 | f"This is a 'string'" -18 18 | f"\"This\" is a 'string'" +12 | +13 | # Same as above, but with f-strings +14 | f'This is a \"string\"' # Q004 + - f'This is \\ a \\\"string\"' # Q004 +15 + f'This is \\ a \\"string"' # Q004 +16 | f'"This" is a \"string\"' +17 | f"This is a 'string'" +18 | f"\"This\" is a 'string'" Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:16:1 @@ -133,16 +121,14 @@ Q004 [*] Unnecessary escape on inner quote character 18 | f"\"This\" is a 'string'" | help: Remove backslash - -ℹ Safe fix -13 13 | # Same as above, but with f-strings -14 14 | f'This is a \"string\"' # Q004 -15 15 | f'This is \\ a \\\"string\"' # Q004 -16 |-f'"This" is a \"string\"' - 16 |+f'"This" is a "string"' -17 17 | f"This is a 'string'" -18 18 | f"\"This\" is a 'string'" -19 19 | fr'This is a \"string\"' +13 | # Same as above, but with f-strings +14 | f'This is a \"string\"' # Q004 +15 | f'This is \\ a \\\"string\"' # Q004 + - f'"This" is a \"string\"' +16 + f'"This" is a "string"' +17 | f"This is a 'string'" +18 | f"\"This\" is a 'string'" +19 | fr'This is a \"string\"' Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:23:5 @@ -154,16 +140,14 @@ Q004 [*] Unnecessary escape on inner quote character 24 | ) | help: Remove backslash - -ℹ Safe fix -20 20 | fR'This is a \"string\"' -21 21 | this_should_raise_Q004 = ( -22 22 | f'This is a' -23 |- f'\"string\"' # Q004 - 23 |+ f'"string"' # Q004 -24 24 | ) -25 25 | -26 26 | # Nested f-strings (Python 3.12+) +20 | fR'This is a \"string\"' +21 | this_should_raise_Q004 = ( +22 | f'This is a' + - f'\"string\"' # Q004 +23 + f'"string"' # Q004 +24 | ) +25 | +26 | # Nested f-strings (Python 3.12+) Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:33:1 @@ -176,16 +160,14 @@ Q004 [*] Unnecessary escape on inner quote character 35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 | help: Remove backslash - -ℹ Safe fix -30 30 | # f"'foo' {'nested'}" -31 31 | # -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 |-f'\"foo\" {'nested'}' # Q004 - 33 |+f'"foo" {'nested'}' # Q004 -34 34 | f'\"foo\" {f'nested'}' # Q004 -35 35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 -36 36 | +30 | # f"'foo' {'nested'}" +31 | # +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. + - f'\"foo\" {'nested'}' # Q004 +33 + f'"foo" {'nested'}' # Q004 +34 | f'\"foo\" {f'nested'}' # Q004 +35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 +36 | Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:34:1 @@ -197,16 +179,14 @@ Q004 [*] Unnecessary escape on inner quote character 35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 | help: Remove backslash - -ℹ Safe fix -31 31 | # -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 33 | f'\"foo\" {'nested'}' # Q004 -34 |-f'\"foo\" {f'nested'}' # Q004 - 34 |+f'"foo" {f'nested'}' # Q004 -35 35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 -36 36 | -37 37 | f'normal {f'nested'} normal' +31 | # +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +33 | f'\"foo\" {'nested'}' # Q004 + - f'\"foo\" {f'nested'}' # Q004 +34 + f'"foo" {f'nested'}' # Q004 +35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 +36 | +37 | f'normal {f'nested'} normal' Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:35:1 @@ -219,16 +199,14 @@ Q004 [*] Unnecessary escape on inner quote character 37 | f'normal {f'nested'} normal' | help: Remove backslash - -ℹ Safe fix -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 33 | f'\"foo\" {'nested'}' # Q004 -34 34 | f'\"foo\" {f'nested'}' # Q004 -35 |-f'\"foo\" {f'\"nested\"'} \"\"' # Q004 - 35 |+f'"foo" {f'\"nested\"'} ""' # Q004 -36 36 | -37 37 | f'normal {f'nested'} normal' -38 38 | f'\"normal\" {f'nested'} normal' # Q004 +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +33 | f'\"foo\" {'nested'}' # Q004 +34 | f'\"foo\" {f'nested'}' # Q004 + - f'\"foo\" {f'\"nested\"'} \"\"' # Q004 +35 + f'"foo" {f'\"nested\"'} ""' # Q004 +36 | +37 | f'normal {f'nested'} normal' +38 | f'\"normal\" {f'nested'} normal' # Q004 Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:35:12 @@ -241,16 +219,14 @@ Q004 [*] Unnecessary escape on inner quote character 37 | f'normal {f'nested'} normal' | help: Remove backslash - -ℹ Safe fix -32 32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. -33 33 | f'\"foo\" {'nested'}' # Q004 -34 34 | f'\"foo\" {f'nested'}' # Q004 -35 |-f'\"foo\" {f'\"nested\"'} \"\"' # Q004 - 35 |+f'\"foo\" {f'"nested"'} \"\"' # Q004 -36 36 | -37 37 | f'normal {f'nested'} normal' -38 38 | f'\"normal\" {f'nested'} normal' # Q004 +32 | # but as the actual string itself is invalid pre 3.12, we don't catch it. +33 | f'\"foo\" {'nested'}' # Q004 +34 | f'\"foo\" {f'nested'}' # Q004 + - f'\"foo\" {f'\"nested\"'} \"\"' # Q004 +35 + f'\"foo\" {f'"nested"'} \"\"' # Q004 +36 | +37 | f'normal {f'nested'} normal' +38 | f'\"normal\" {f'nested'} normal' # Q004 Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:38:1 @@ -262,16 +238,14 @@ Q004 [*] Unnecessary escape on inner quote character 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 | help: Remove backslash - -ℹ Safe fix -35 35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 -36 36 | -37 37 | f'normal {f'nested'} normal' -38 |-f'\"normal\" {f'nested'} normal' # Q004 - 38 |+f'"normal" {f'nested'} normal' # Q004 -39 39 | f'\"normal\" {f'nested'} "double quotes"' -40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 -41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 +35 | f'\"foo\" {f'\"nested\"'} \"\"' # Q004 +36 | +37 | f'normal {f'nested'} normal' + - f'\"normal\" {f'nested'} normal' # Q004 +38 + f'"normal" {f'nested'} normal' # Q004 +39 | f'\"normal\" {f'nested'} "double quotes"' +40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 +41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:39:1 @@ -284,16 +258,14 @@ Q004 [*] Unnecessary escape on inner quote character 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 | help: Remove backslash - -ℹ Safe fix -36 36 | -37 37 | f'normal {f'nested'} normal' -38 38 | f'\"normal\" {f'nested'} normal' # Q004 -39 |-f'\"normal\" {f'nested'} "double quotes"' - 39 |+f'"normal" {f'nested'} "double quotes"' -40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 -41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 -42 42 | +36 | +37 | f'normal {f'nested'} normal' +38 | f'\"normal\" {f'nested'} normal' # Q004 + - f'\"normal\" {f'nested'} "double quotes"' +39 + f'"normal" {f'nested'} "double quotes"' +40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 +41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 +42 | Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:40:1 @@ -305,16 +277,14 @@ Q004 [*] Unnecessary escape on inner quote character 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 | help: Remove backslash - -ℹ Safe fix -37 37 | f'normal {f'nested'} normal' -38 38 | f'\"normal\" {f'nested'} normal' # Q004 -39 39 | f'\"normal\" {f'nested'} "double quotes"' -40 |-f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 - 40 |+f'"normal" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 -41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 -42 42 | -43 43 | # Make sure we do not unescape quotes +37 | f'normal {f'nested'} normal' +38 | f'\"normal\" {f'nested'} normal' # Q004 +39 | f'\"normal\" {f'nested'} "double quotes"' + - f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 +40 + f'"normal" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 +41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 +42 | +43 | # Make sure we do not unescape quotes Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:40:15 @@ -326,16 +296,14 @@ Q004 [*] Unnecessary escape on inner quote character 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 | help: Remove backslash - -ℹ Safe fix -37 37 | f'normal {f'nested'} normal' -38 38 | f'\"normal\" {f'nested'} normal' # Q004 -39 39 | f'\"normal\" {f'nested'} "double quotes"' -40 |-f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 - 40 |+f'\"normal\" {f'"nested" {'other'} normal'} "double quotes"' # Q004 -41 41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 -42 42 | -43 43 | # Make sure we do not unescape quotes +37 | f'normal {f'nested'} normal' +38 | f'\"normal\" {f'nested'} normal' # Q004 +39 | f'\"normal\" {f'nested'} "double quotes"' + - f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 +40 + f'\"normal\" {f'"nested" {'other'} normal'} "double quotes"' # Q004 +41 | f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 +42 | +43 | # Make sure we do not unescape quotes Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:41:1 @@ -348,16 +316,14 @@ Q004 [*] Unnecessary escape on inner quote character 43 | # Make sure we do not unescape quotes | help: Remove backslash - -ℹ Safe fix -38 38 | f'\"normal\" {f'nested'} normal' # Q004 -39 39 | f'\"normal\" {f'nested'} "double quotes"' -40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 -41 |-f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 - 41 |+f'"normal" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 -42 42 | -43 43 | # Make sure we do not unescape quotes -44 44 | this_is_fine = 'This is an \\"escaped\\" quote' +38 | f'\"normal\" {f'nested'} normal' # Q004 +39 | f'\"normal\" {f'nested'} "double quotes"' +40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 + - f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 +41 + f'"normal" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 +42 | +43 | # Make sure we do not unescape quotes +44 | this_is_fine = 'This is an \\"escaped\\" quote' Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:41:15 @@ -370,16 +336,14 @@ Q004 [*] Unnecessary escape on inner quote character 43 | # Make sure we do not unescape quotes | help: Remove backslash - -ℹ Safe fix -38 38 | f'\"normal\" {f'nested'} normal' # Q004 -39 39 | f'\"normal\" {f'nested'} "double quotes"' -40 40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 -41 |-f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 - 41 |+f'\"normal\" {f'"nested" {'other'} "double quotes"'} normal' # Q004 -42 42 | -43 43 | # Make sure we do not unescape quotes -44 44 | this_is_fine = 'This is an \\"escaped\\" quote' +38 | f'\"normal\" {f'nested'} normal' # Q004 +39 | f'\"normal\" {f'nested'} "double quotes"' +40 | f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"' # Q004 + - f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal' # Q004 +41 + f'\"normal\" {f'"nested" {'other'} "double quotes"'} normal' # Q004 +42 | +43 | # Make sure we do not unescape quotes +44 | this_is_fine = 'This is an \\"escaped\\" quote' Q004 [*] Unnecessary escape on inner quote character --> doubles_escaped_unnecessary.py:45:26 @@ -390,10 +354,8 @@ Q004 [*] Unnecessary escape on inner quote character | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove backslash - -ℹ Safe fix -42 42 | -43 43 | # Make sure we do not unescape quotes -44 44 | this_is_fine = 'This is an \\"escaped\\" quote' -45 |-this_should_raise_Q004 = 'This is an \\\"escaped\\\" quote with an extra backslash' - 45 |+this_should_raise_Q004 = 'This is an \\"escaped\\" quote with an extra backslash' +42 | +43 | # Make sure we do not unescape quotes +44 | this_is_fine = 'This is an \\"escaped\\" quote' + - this_should_raise_Q004 = 'This is an \\\"escaped\\\" quote with an extra backslash' +45 + this_should_raise_Q004 = 'This is an \\"escaped\\" quote with an extra backslash' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap index 4779f6fd3a..22ebcdbbe3 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_implicit.py.snap @@ -11,14 +11,12 @@ Q000 [*] Double quotes found but single quotes preferred 4 | "not" | help: Replace double quotes with single quotes - -ℹ Safe fix -1 1 | x = ( -2 |- "This" - 2 |+ 'This' -3 3 | "is" -4 4 | "not" -5 5 | ) +1 | x = ( + - "This" +2 + 'This' +3 | "is" +4 | "not" +5 | ) Q000 [*] Double quotes found but single quotes preferred --> doubles_implicit.py:3:5 @@ -31,15 +29,13 @@ Q000 [*] Double quotes found but single quotes preferred 5 | ) | help: Replace double quotes with single quotes - -ℹ Safe fix -1 1 | x = ( -2 2 | "This" -3 |- "is" - 3 |+ 'is' -4 4 | "not" -5 5 | ) -6 6 | +1 | x = ( +2 | "This" + - "is" +3 + 'is' +4 | "not" +5 | ) +6 | Q000 [*] Double quotes found but single quotes preferred --> doubles_implicit.py:4:5 @@ -51,16 +47,14 @@ Q000 [*] Double quotes found but single quotes preferred 5 | ) | help: Replace double quotes with single quotes - -ℹ Safe fix -1 1 | x = ( -2 2 | "This" -3 3 | "is" -4 |- "not" - 4 |+ 'not' -5 5 | ) -6 6 | -7 7 | x = ( +1 | x = ( +2 | "This" +3 | "is" + - "not" +4 + 'not' +5 | ) +6 | +7 | x = ( Q000 [*] Double quotes found but single quotes preferred --> doubles_implicit.py:8:5 @@ -72,16 +66,14 @@ Q000 [*] Double quotes found but single quotes preferred 10 | "not" | help: Replace double quotes with single quotes - -ℹ Safe fix -5 5 | ) -6 6 | -7 7 | x = ( -8 |- "This" \ - 8 |+ 'This' \ -9 9 | "is" \ -10 10 | "not" -11 11 | ) +5 | ) +6 | +7 | x = ( + - "This" \ +8 + 'This' \ +9 | "is" \ +10 | "not" +11 | ) Q000 [*] Double quotes found but single quotes preferred --> doubles_implicit.py:9:5 @@ -94,16 +86,14 @@ Q000 [*] Double quotes found but single quotes preferred 11 | ) | help: Replace double quotes with single quotes - -ℹ Safe fix -6 6 | -7 7 | x = ( -8 8 | "This" \ -9 |- "is" \ - 9 |+ 'is' \ -10 10 | "not" -11 11 | ) -12 12 | +6 | +7 | x = ( +8 | "This" \ + - "is" \ +9 + 'is' \ +10 | "not" +11 | ) +12 | Q000 [*] Double quotes found but single quotes preferred --> doubles_implicit.py:10:5 @@ -115,16 +105,14 @@ Q000 [*] Double quotes found but single quotes preferred 11 | ) | help: Replace double quotes with single quotes - -ℹ Safe fix -7 7 | x = ( -8 8 | "This" \ -9 9 | "is" \ -10 |- "not" - 10 |+ 'not' -11 11 | ) -12 12 | -13 13 | x = ( +7 | x = ( +8 | "This" \ +9 | "is" \ + - "not" +10 + 'not' +11 | ) +12 | +13 | x = ( Q000 [*] Double quotes found but single quotes preferred --> doubles_implicit.py:27:1 @@ -135,10 +123,8 @@ Q000 [*] Double quotes found but single quotes preferred | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace double quotes with single quotes - -ℹ Safe fix -24 24 | -25 25 | if True: -26 26 | "This can use 'double' quotes" -27 |-"But this needs to be changed" - 27 |+'But this needs to be changed' +24 | +25 | if True: +26 | "This can use 'double' quotes" + - "But this needs to be changed" +27 + 'But this needs to be changed' diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap index f5e48ab14d..0d196f0df5 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_multiline_string.py.snap @@ -13,13 +13,11 @@ Q001 [*] Double quote multiline found but single quotes preferred 5 | s = ''' This "should" | help: Replace double multiline quotes with single quotes - -ℹ Safe fix -1 |-s = """ This "should" - 1 |+s = ''' This "should" -2 2 | be -3 |-"linted" """ - 3 |+"linted" ''' -4 4 | -5 5 | s = ''' This "should" -6 6 | "not" be + - s = """ This "should" +1 + s = ''' This "should" +2 | be + - "linted" """ +3 + "linted" ''' +4 | +5 | s = ''' This "should" +6 | "not" be diff --git a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap index 95e36269b3..c07457668d 100644 --- a/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap +++ b/crates/ruff_linter/src/rules/flake8_quotes/snapshots/ruff_linter__rules__flake8_quotes__tests__require_singles_over_doubles_would_be_triple_quotes.py.snap @@ -18,8 +18,6 @@ Q000 [*] Double quotes found but single quotes preferred | ^^^^^^^^ | help: Replace double quotes with single quotes - -ℹ Safe fix -1 1 | s = ""'Start with empty string' ' and lint docstring safely' -2 |-s = "Do not"' start with empty string' ' and lint docstring safely' - 2 |+s = 'Do not'' start with empty string' ' and lint docstring safely' +1 | s = ""'Start with empty string' ' and lint docstring safely' + - s = "Do not"' start with empty string' ' and lint docstring safely' +2 + s = 'Do not'' start with empty string' ' and lint docstring safely' diff --git a/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap b/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap index 2ff56deeef..ecc30477db 100644 --- a/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap +++ b/crates/ruff_linter/src/rules/flake8_raise/snapshots/ruff_linter__rules__flake8_raise__tests__unnecessary-paren-on-raise-exception_RSE102.py.snap @@ -12,16 +12,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 7 | try: | help: Remove unnecessary parentheses - -ℹ Safe fix -2 2 | y = 6 + "7" -3 3 | except TypeError: -4 4 | # RSE102 -5 |- raise ValueError() - 5 |+ raise ValueError -6 6 | -7 7 | try: -8 8 | x = 1 / 0 +2 | y = 6 + "7" +3 | except TypeError: +4 | # RSE102 + - raise ValueError() +5 + raise ValueError +6 | +7 | try: +8 | x = 1 / 0 RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:13:16 @@ -33,16 +31,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 15 | # RSE102 | help: Remove unnecessary parentheses - -ℹ Safe fix -10 10 | raise -11 11 | -12 12 | # RSE102 -13 |-raise TypeError() - 13 |+raise TypeError -14 14 | -15 15 | # RSE102 -16 16 | raise TypeError () +10 | raise +11 | +12 | # RSE102 + - raise TypeError() +13 + raise TypeError +14 | +15 | # RSE102 +16 | raise TypeError () RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:16:17 @@ -54,16 +50,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 18 | # RSE102 | help: Remove unnecessary parentheses - -ℹ Safe fix -13 13 | raise TypeError() -14 14 | -15 15 | # RSE102 -16 |-raise TypeError () - 16 |+raise TypeError -17 17 | -18 18 | # RSE102 -19 19 | raise TypeError \ +13 | raise TypeError() +14 | +15 | # RSE102 + - raise TypeError () +16 + raise TypeError +17 | +18 | # RSE102 +19 | raise TypeError \ RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:20:5 @@ -76,16 +70,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 22 | # RSE102 | help: Remove unnecessary parentheses - -ℹ Safe fix -17 17 | -18 18 | # RSE102 -19 19 | raise TypeError \ -20 |- () - 20 |+ -21 21 | -22 22 | # RSE102 -23 23 | raise TypeError \ +17 | +18 | # RSE102 +19 | raise TypeError \ + - () +20 + +21 | +22 | # RSE102 +23 | raise TypeError \ RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:24:5 @@ -98,16 +90,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 26 | # RSE102 | help: Remove unnecessary parentheses - -ℹ Safe fix -21 21 | -22 22 | # RSE102 -23 23 | raise TypeError \ -24 |- (); - 24 |+ ; -25 25 | -26 26 | # RSE102 -27 27 | raise TypeError( +21 | +22 | # RSE102 +23 | raise TypeError \ + - (); +24 + ; +25 | +26 | # RSE102 +27 | raise TypeError( RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:27:16 @@ -122,18 +112,16 @@ RSE102 [*] Unnecessary parentheses on raised exception 31 | # RSE102 | help: Remove unnecessary parentheses - -ℹ Safe fix -24 24 | (); -25 25 | -26 26 | # RSE102 -27 |-raise TypeError( -28 |- -29 |-) - 27 |+raise TypeError -30 28 | -31 29 | # RSE102 -32 30 | raise (TypeError) ( +24 | (); +25 | +26 | # RSE102 + - raise TypeError( + - + - ) +27 + raise TypeError +28 | +29 | # RSE102 +30 | raise (TypeError) ( RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:32:19 @@ -148,18 +136,16 @@ RSE102 [*] Unnecessary parentheses on raised exception 36 | # RSE102 | help: Remove unnecessary parentheses - -ℹ Safe fix -29 29 | ) -30 30 | -31 31 | # RSE102 -32 |-raise (TypeError) ( -33 |- -34 |-) - 32 |+raise (TypeError) -35 33 | -36 34 | # RSE102 -37 35 | raise TypeError( +29 | ) +30 | +31 | # RSE102 + - raise (TypeError) ( + - + - ) +32 + raise (TypeError) +33 | +34 | # RSE102 +35 | raise TypeError( RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:37:16 @@ -174,18 +160,17 @@ RSE102 [*] Unnecessary parentheses on raised exception 41 | # OK | help: Remove unnecessary parentheses - -ℹ Unsafe fix -34 34 | ) -35 35 | -36 36 | # RSE102 -37 |-raise TypeError( -38 |- # Hello, world! -39 |-) - 37 |+raise TypeError -40 38 | -41 39 | # OK -42 40 | raise AssertionError +34 | ) +35 | +36 | # RSE102 + - raise TypeError( + - # Hello, world! + - ) +37 + raise TypeError +38 | +39 | # OK +40 | raise AssertionError +note: This is an unsafe fix and may change runtime behavior RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:74:17 @@ -197,16 +182,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 76 | raise IndexError()\ | help: Remove unnecessary parentheses - -ℹ Safe fix -71 71 | -72 72 | -73 73 | # RSE102 -74 |-raise IndexError()from ZeroDivisionError - 74 |+raise IndexError from ZeroDivisionError -75 75 | -76 76 | raise IndexError()\ -77 77 | from ZeroDivisionError +71 | +72 | +73 | # RSE102 + - raise IndexError()from ZeroDivisionError +74 + raise IndexError from ZeroDivisionError +75 | +76 | raise IndexError()\ +77 | from ZeroDivisionError RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:76:17 @@ -218,16 +201,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 77 | from ZeroDivisionError | help: Remove unnecessary parentheses - -ℹ Safe fix -73 73 | # RSE102 -74 74 | raise IndexError()from ZeroDivisionError -75 75 | -76 |-raise IndexError()\ - 76 |+raise IndexError\ -77 77 | from ZeroDivisionError -78 78 | -79 79 | raise IndexError() from ZeroDivisionError +73 | # RSE102 +74 | raise IndexError()from ZeroDivisionError +75 | + - raise IndexError()\ +76 + raise IndexError\ +77 | from ZeroDivisionError +78 | +79 | raise IndexError() from ZeroDivisionError RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:79:17 @@ -240,16 +221,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 81 | raise IndexError(); | help: Remove unnecessary parentheses - -ℹ Safe fix -76 76 | raise IndexError()\ -77 77 | from ZeroDivisionError -78 78 | -79 |-raise IndexError() from ZeroDivisionError - 79 |+raise IndexError from ZeroDivisionError -80 80 | -81 81 | raise IndexError(); -82 82 | +76 | raise IndexError()\ +77 | from ZeroDivisionError +78 | + - raise IndexError() from ZeroDivisionError +79 + raise IndexError from ZeroDivisionError +80 | +81 | raise IndexError(); +82 | RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:81:17 @@ -262,16 +241,14 @@ RSE102 [*] Unnecessary parentheses on raised exception 83 | # RSE102 | help: Remove unnecessary parentheses - -ℹ Safe fix -78 78 | -79 79 | raise IndexError() from ZeroDivisionError -80 80 | -81 |-raise IndexError(); - 81 |+raise IndexError; -82 82 | -83 83 | # RSE102 -84 84 | raise Foo() +78 | +79 | raise IndexError() from ZeroDivisionError +80 | + - raise IndexError(); +81 + raise IndexError; +82 | +83 | # RSE102 +84 | raise Foo() RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:84:10 @@ -283,16 +260,15 @@ RSE102 [*] Unnecessary parentheses on raised exception 86 | # OK | help: Remove unnecessary parentheses - -ℹ Unsafe fix -81 81 | raise IndexError(); -82 82 | -83 83 | # RSE102 -84 |-raise Foo() - 84 |+raise Foo -85 85 | -86 86 | # OK -87 87 | raise ctypes.WinError() +81 | raise IndexError(); +82 | +83 | # RSE102 + - raise Foo() +84 + raise Foo +85 | +86 | # OK +87 | raise ctypes.WinError() +note: This is an unsafe fix and may change runtime behavior RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:107:27 @@ -303,16 +279,15 @@ RSE102 [*] Unnecessary parentheses on raised exception | ^^ | help: Remove unnecessary parentheses - -ℹ Unsafe fix -104 104 | # RSE102 -105 105 | future = executor.submit(float, "a") -106 106 | if future.exception(): -107 |- raise future.Exception() - 107 |+ raise future.Exception -108 108 | -109 109 | -110 110 | raise TypeError( +104 | # RSE102 +105 | future = executor.submit(float, "a") +106 | if future.exception(): + - raise future.Exception() +107 + raise future.Exception +108 | +109 | +110 | raise TypeError( +note: This is an unsafe fix and may change runtime behavior RSE102 [*] Unnecessary parentheses on raised exception --> RSE102.py:110:16 @@ -324,12 +299,11 @@ RSE102 [*] Unnecessary parentheses on raised exception | |_^ | help: Remove unnecessary parentheses - -ℹ Unsafe fix -107 107 | raise future.Exception() -108 108 | -109 109 | -110 |-raise TypeError( -111 |- # comment -112 |-) - 110 |+raise TypeError +107 | raise future.Exception() +108 | +109 | + - raise TypeError( + - # comment + - ) +110 + raise TypeError +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap index a1076f9ab8..5ad0c466eb 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET501_RET501.py.snap @@ -10,16 +10,14 @@ RET501 [*] Do not explicitly `return None` in function if it is the only possibl | ^^^^^^^^^^^ | help: Remove explicit `return None` - -ℹ Safe fix -1 1 | def x(y): -2 2 | if not y: -3 3 | return -4 |- return None # error - 4 |+ return # error -5 5 | -6 6 | -7 7 | class BaseCache: +1 | def x(y): +2 | if not y: +3 | return + - return None # error +4 + return # error +5 | +6 | +7 | class BaseCache: RET501 [*] Do not explicitly `return None` in function if it is the only possible return value --> RET501.py:14:9 @@ -32,16 +30,14 @@ RET501 [*] Do not explicitly `return None` in function if it is the only possibl 16 | @property | help: Remove explicit `return None` - -ℹ Safe fix -11 11 | -12 12 | def get(self, key: str) -> None: -13 13 | print(f"{key} not found") -14 |- return None - 14 |+ return -15 15 | -16 16 | @property -17 17 | def prop(self) -> None: +11 | +12 | def get(self, key: str) -> None: +13 | print(f"{key} not found") + - return None +14 + return +15 | +16 | @property +17 | def prop(self) -> None: RET501 [*] Do not explicitly `return None` in function if it is the only possible return value --> RET501.py:59:9 @@ -54,12 +50,11 @@ RET501 [*] Do not explicitly `return None` in function if it is the only possibl | |_________^ | help: Remove explicit `return None` - -ℹ Unsafe fix -56 56 | def foo(bar): -57 57 | if not bar: -58 58 | return -59 |- return ( -60 |- None # comment -61 |- ) - 59 |+ return +56 | def foo(bar): +57 | if not bar: +58 | return + - return ( + - None # comment + - ) +59 + return +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap index fcff245de3..5c597905e6 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET502_RET502.py.snap @@ -11,12 +11,10 @@ RET502 [*] Do not implicitly `return None` in function able to return non-`None` 4 | return 1 | help: Add explicit `None` return value - -ℹ Safe fix -1 1 | def x(y): -2 2 | if not y: -3 |- return # error - 3 |+ return None # error -4 4 | return 1 -5 5 | -6 6 | +1 | def x(y): +2 | if not y: + - return # error +3 + return None # error +4 | return 1 +5 | +6 | diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap index 5d6e25f2b4..23ee1b737b 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET503_RET503.py.snap @@ -12,15 +12,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` 23 | # error | help: Add explicit `return` statement - -ℹ Unsafe fix -20 20 | def x(y): -21 21 | if not y: -22 22 | return 1 - 23 |+ return None -23 24 | # error -24 25 | -25 26 | +20 | def x(y): +21 | if not y: +22 | return 1 +23 + return None +24 | # error +25 | +26 | +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:26:1 @@ -33,15 +32,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -28 28 | print() # error -29 29 | else: -30 30 | return 2 - 31 |+ return None -31 32 | -32 33 | -33 34 | def x(y): +28 | print() # error +29 | else: +30 | return 2 +31 + return None +32 | +33 | +34 | def x(y): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:33:1 @@ -54,15 +52,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |___________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -35 35 | return 1 -36 36 | -37 37 | print() # error - 38 |+ return None -38 39 | -39 40 | -40 41 | # for +35 | return 1 +36 | +37 | print() # error +38 + return None +39 | +40 | +41 | # for +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:41:1 @@ -76,15 +73,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` 45 | # error | help: Add explicit `return` statement - -ℹ Unsafe fix -42 42 | for i in range(10): -43 43 | if i > 10: -44 44 | return i - 45 |+ return None -45 46 | # error -46 47 | -47 48 | +42 | for i in range(10): +43 | if i > 10: +44 | return i +45 + return None +46 | # error +47 | +48 | +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:48:1 @@ -98,15 +94,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_______________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -51 51 | return i -52 52 | else: -53 53 | print() # error - 54 |+ return None -54 55 | -55 56 | -56 57 | # A nonexistent function +51 | return i +52 | else: +53 | print() # error +54 + return None +55 | +56 | +57 | # A nonexistent function +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:57:1 @@ -119,15 +114,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |______________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -58 58 | if x > 0: -59 59 | return False -60 60 | no_such_function() # error - 61 |+ return None -61 62 | -62 63 | -63 64 | # A function that does return the control +58 | if x > 0: +59 | return False +60 | no_such_function() # error +61 + return None +62 | +63 | +64 | # A function that does return the control +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:64:1 @@ -140,15 +134,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_____________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -65 65 | if x > 0: -66 66 | return False -67 67 | print("", end="") # error - 68 |+ return None -68 69 | -69 70 | -70 71 | ### +65 | if x > 0: +66 | return False +67 | print("", end="") # error +68 + return None +69 | +70 | +71 | ### +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:82:1 @@ -162,15 +155,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |______________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -84 84 | if y > 0: -85 85 | return 1 -86 86 | y += 1 - 87 |+ return None -87 88 | -88 89 | -89 90 | # exclude empty functions +84 | if y > 0: +85 | return 1 +86 | y += 1 +87 + return None +88 | +89 | +90 | # exclude empty functions +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:113:1 @@ -184,15 +176,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -115 115 | if i > y: -116 116 | break -117 117 | return z - 118 |+ return None -118 119 | -119 120 | -120 121 | def bar3(x, y, z): +115 | if i > y: +116 | break +117 | return z +118 + return None +119 | +120 | +121 | def bar3(x, y, z): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:120:1 @@ -208,15 +199,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |___________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -125 125 | else: -126 126 | return z -127 127 | return None - 128 |+ return None -128 129 | -129 130 | -130 131 | def bar1(x, y, z): +125 | else: +126 | return z +127 | return None +128 + return None +129 | +130 | +131 | def bar1(x, y, z): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:130:1 @@ -229,15 +219,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -132 132 | if i < y: -133 133 | continue -134 134 | return z - 135 |+ return None -135 136 | -136 137 | -137 138 | def bar3(x, y, z): +132 | if i < y: +133 | continue +134 | return z +135 + return None +136 | +137 | +138 | def bar3(x, y, z): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:137:1 @@ -253,15 +242,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |___________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -142 142 | else: -143 143 | return z -144 144 | return None - 145 |+ return None -145 146 | -146 147 | -147 148 | def prompts(self, foo): +142 | else: +143 | return z +144 | return None +145 + return None +146 | +147 | +148 | def prompts(self, foo): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:271:1 @@ -275,15 +263,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |____________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -274 274 | -275 275 | for value in values: -276 276 | print(value) - 277 |+ return None -277 278 | -278 279 | -279 280 | def while_true(): +274 | +275 | for value in values: +276 | print(value) +277 + return None +278 | +279 | +280 | def while_true(): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:287:1 @@ -298,15 +285,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |___________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -290 290 | return 1 -291 291 | case 1: -292 292 | print() # error - 293 |+ return None -293 294 | -294 295 | -295 296 | def foo(baz: str) -> str: +290 | return 1 +291 | case 1: +292 | print() # error +293 + return None +294 | +295 | +296 | def foo(baz: str) -> str: +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:300:5 @@ -318,15 +304,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_____________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -300 300 | def example(): -301 301 | if True: -302 302 | return "" - 303 |+ return None -303 304 | -304 305 | -305 306 | def example(): +300 | def example(): +301 | if True: +302 | return "" +303 + return None +304 | +305 | +306 | def example(): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:305:5 @@ -337,15 +322,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_____________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -305 305 | def example(): -306 306 | if True: -307 307 | return "" - 308 |+ return None -308 309 | -309 310 | -310 311 | def example(): +305 | def example(): +306 | if True: +307 | return "" +308 + return None +309 | +310 | +311 | def example(): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:310:5 @@ -356,15 +340,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_____________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -310 310 | def example(): -311 311 | if True: -312 312 | return "" # type: ignore - 313 |+ return None -313 314 | -314 315 | -315 316 | def example(): +310 | def example(): +311 | if True: +312 | return "" # type: ignore +313 + return None +314 | +315 | +316 | def example(): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:315:5 @@ -375,15 +358,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_____________________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -315 315 | def example(): -316 316 | if True: -317 317 | return "" ; - 318 |+ return None -318 319 | -319 320 | -320 321 | def example(): +315 | def example(): +316 | if True: +317 | return "" ; +318 + return None +319 | +320 | +321 | def example(): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:320:5 @@ -395,15 +377,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` 323 | ; # type: ignore | help: Add explicit `return` statement - -ℹ Unsafe fix -321 321 | if True: -322 322 | return "" \ -323 323 | ; # type: ignore - 324 |+ return None -324 325 | -325 326 | -326 327 | def end_of_file(): +321 | if True: +322 | return "" \ +323 | ; # type: ignore +324 + return None +325 | +326 | +327 | def end_of_file(): +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:326:1 @@ -415,15 +396,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -328 328 | return 1 -329 329 | x = 2 \ -330 330 | - 331 |+ return None -331 332 | -332 333 | -333 334 | # function return type annotation NoReturn +328 | return 1 +329 | x = 2 \ +330 | +331 + return None +332 | +333 | +334 | # function return type annotation NoReturn +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:398:1 @@ -437,15 +417,14 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_____________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -401 401 | else: -402 402 | with c: -403 403 | d - 404 |+ return None -404 405 | -405 406 | -406 407 | +401 | else: +402 | with c: +403 | d +404 + return None +405 | +406 | +407 | +note: This is an unsafe fix and may change runtime behavior RET503 [*] Missing explicit `return` at the end of function able to return non-`None` value --> RET503.py:413:1 @@ -461,11 +440,10 @@ RET503 [*] Missing explicit `return` at the end of function able to return non-` | |_________^ | help: Add explicit `return` statement - -ℹ Unsafe fix -415 415 | abort() -416 416 | if x == 5: -417 417 | return 5 -418 |- bar() - 418 |+ bar() - 419 |+ return None +415 | abort() +416 | if x == 5: +417 | return 5 + - bar() +418 + bar() +419 + return None +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap index 0aef5af4ed..24a1daf1b3 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET504_RET504.py.snap @@ -10,17 +10,16 @@ RET504 [*] Unnecessary assignment to `a` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -2 2 | # Errors -3 3 | ### -4 4 | def x(): -5 |- a = 1 -6 |- return a # RET504 - 5 |+ return 1 -7 6 | -8 7 | -9 8 | # Can be refactored false positives +2 | # Errors +3 | ### +4 | def x(): + - a = 1 + - return a # RET504 +5 + return 1 +6 | +7 | +8 | # Can be refactored false positives +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `formatted` before `return` statement --> RET504.py:23:12 @@ -31,17 +30,16 @@ RET504 [*] Unnecessary assignment to `formatted` before `return` statement | ^^^^^^^^^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -19 19 | def x(): -20 20 | formatted = _USER_AGENT_FORMATTER.format(format_string, **values) -21 21 | # clean up after any blank components -22 |- formatted = formatted.replace("()", "").replace(" ", " ").strip() -23 |- return formatted - 22 |+ return formatted.replace("()", "").replace(" ", " ").strip() -24 23 | -25 24 | -26 25 | # https://github.com/afonasev/flake8-return/issues/47#issue-641117366 +19 | def x(): +20 | formatted = _USER_AGENT_FORMATTER.format(format_string, **values) +21 | # clean up after any blank components + - formatted = formatted.replace("()", "").replace(" ", " ").strip() + - return formatted +22 + return formatted.replace("()", "").replace(" ", " ").strip() +23 | +24 | +25 | # https://github.com/afonasev/flake8-return/issues/47#issue-641117366 +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `queryset` before `return` statement --> RET504.py:246:12 @@ -52,17 +50,16 @@ RET504 [*] Unnecessary assignment to `queryset` before `return` statement | ^^^^^^^^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -242 242 | -243 243 | def get_queryset(): -244 244 | queryset = Model.filter(a=1) -245 |- queryset = queryset.filter(c=3) -246 |- return queryset - 245 |+ return queryset.filter(c=3) -247 246 | -248 247 | -249 248 | def get_queryset(): +242 | +243 | def get_queryset(): +244 | queryset = Model.filter(a=1) + - queryset = queryset.filter(c=3) + - return queryset +245 + return queryset.filter(c=3) +246 | +247 | +248 | def get_queryset(): +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `queryset` before `return` statement --> RET504.py:251:12 @@ -73,17 +70,16 @@ RET504 [*] Unnecessary assignment to `queryset` before `return` statement | ^^^^^^^^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -247 247 | -248 248 | -249 249 | def get_queryset(): -250 |- queryset = Model.filter(a=1) -251 |- return queryset # RET504 - 250 |+ return Model.filter(a=1) -252 251 | -253 252 | -254 253 | # Function arguments +247 | +248 | +249 | def get_queryset(): + - queryset = Model.filter(a=1) + - return queryset # RET504 +250 + return Model.filter(a=1) +251 | +252 | +253 | # Function arguments +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `val` before `return` statement --> RET504.py:269:12 @@ -94,17 +90,16 @@ RET504 [*] Unnecessary assignment to `val` before `return` statement | ^^^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -265 265 | def str_to_bool(val): -266 266 | if isinstance(val, bool): -267 267 | return val -268 |- val = 1 -269 |- return val # RET504 - 268 |+ return 1 -270 269 | -271 270 | -272 271 | def str_to_bool(val): +265 | def str_to_bool(val): +266 | if isinstance(val, bool): +267 | return val + - val = 1 + - return val # RET504 +268 + return 1 +269 | +270 | +271 | def str_to_bool(val): +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `x` before `return` statement --> RET504.py:321:12 @@ -115,17 +110,16 @@ RET504 [*] Unnecessary assignment to `x` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -317 317 | # `with` statements -318 318 | def foo(): -319 319 | with open("foo.txt", "r") as f: -320 |- x = f.read() -321 |- return x # RET504 - 320 |+ return f.read() -322 321 | -323 322 | -324 323 | def foo(): +317 | # `with` statements +318 | def foo(): +319 | with open("foo.txt", "r") as f: + - x = f.read() + - return x # RET504 +320 + return f.read() +321 | +322 | +323 | def foo(): +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `b` before `return` statement --> RET504.py:342:12 @@ -136,17 +130,16 @@ RET504 [*] Unnecessary assignment to `b` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -338 338 | # Fix cases -339 339 | def foo(): -340 340 | a = 1 -341 |- b=a -342 |- return b # RET504 - 341 |+ return a -343 342 | -344 343 | -345 344 | def foo(): +338 | # Fix cases +339 | def foo(): +340 | a = 1 + - b=a + - return b # RET504 +341 + return a +342 | +343 | +344 | def foo(): +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `b` before `return` statement --> RET504.py:348:12 @@ -157,17 +150,16 @@ RET504 [*] Unnecessary assignment to `b` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -344 344 | -345 345 | def foo(): -346 346 | a = 1 -347 |- b =a -348 |- return b # RET504 - 347 |+ return a -349 348 | -350 349 | -351 350 | def foo(): +344 | +345 | def foo(): +346 | a = 1 + - b =a + - return b # RET504 +347 + return a +348 | +349 | +350 | def foo(): +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `b` before `return` statement --> RET504.py:354:12 @@ -178,17 +170,16 @@ RET504 [*] Unnecessary assignment to `b` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -350 350 | -351 351 | def foo(): -352 352 | a = 1 -353 |- b= a -354 |- return b # RET504 - 353 |+ return a -355 354 | -356 355 | -357 356 | def foo(): +350 | +351 | def foo(): +352 | a = 1 + - b= a + - return b # RET504 +353 + return a +354 | +355 | +356 | def foo(): +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `a` before `return` statement --> RET504.py:359:12 @@ -199,17 +190,16 @@ RET504 [*] Unnecessary assignment to `a` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -355 355 | -356 356 | -357 357 | def foo(): -358 |- a = 1 # Comment -359 |- return a - 358 |+ return 1 # Comment -360 359 | -361 360 | -362 361 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098 +355 | +356 | +357 | def foo(): + - a = 1 # Comment + - return a +358 + return 1 # Comment +359 | +360 | +361 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098 +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `D` before `return` statement --> RET504.py:365:12 @@ -220,17 +210,16 @@ RET504 [*] Unnecessary assignment to `D` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -361 361 | -362 362 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098 -363 363 | def mavko_debari(P_kbar): -364 |- D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2 -365 |- return D - 364 |+ return 0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2 -366 365 | -367 366 | -368 367 | # contextlib suppress in with statement +361 | +362 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098 +363 | def mavko_debari(P_kbar): + - D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2 + - return D +364 + return 0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2 +365 | +366 | +367 | # contextlib suppress in with statement +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `y` before `return` statement --> RET504.py:400:12 @@ -241,17 +230,16 @@ RET504 [*] Unnecessary assignment to `y` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -396 396 | x = 2 -397 397 | with contextlib.suppress(Exception): -398 398 | x = 1 -399 |- y = y + 2 -400 |- return y # RET504 - 399 |+ return y + 2 -401 400 | -402 401 | -403 402 | def foo(): +396 | x = 2 +397 | with contextlib.suppress(Exception): +398 | x = 1 + - y = y + 2 + - return y # RET504 +399 + return y + 2 +400 | +401 | +402 | def foo(): +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `services` before `return` statement --> RET504.py:423:16 @@ -262,17 +250,16 @@ RET504 [*] Unnecessary assignment to `services` before `return` statement | ^^^^^^^^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -419 419 | # See: https://github.com/astral-sh/ruff/issues/10732 -420 420 | def func(a: dict[str, int]) -> list[dict[str, int]]: -421 421 | if "services" in a: -422 |- services = a["services"] -423 |- return services - 422 |+ return a["services"] -424 423 | -425 424 | -426 425 | # See: https://github.com/astral-sh/ruff/issues/14052 +419 | # See: https://github.com/astral-sh/ruff/issues/10732 +420 | def func(a: dict[str, int]) -> list[dict[str, int]]: +421 | if "services" in a: + - services = a["services"] + - return services +422 + return a["services"] +423 | +424 | +425 | # See: https://github.com/astral-sh/ruff/issues/14052 +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `x` before `return` statement --> RET504.py:458:12 @@ -285,18 +272,17 @@ RET504 [*] Unnecessary assignment to `x` before `return` statement 460 | def f(): | help: Remove unnecessary assignment - -ℹ Unsafe fix -453 453 | -454 454 | # See: https://github.com/astral-sh/ruff/issues/18411 -455 455 | def f(): -456 |- (#= -457 |- x) = 1 -458 |- return x - 456 |+ return 1 -459 457 | -460 458 | def f(): -461 459 | x = (1 +453 | +454 | # See: https://github.com/astral-sh/ruff/issues/18411 +455 | def f(): + - (#= + - x) = 1 + - return x +456 + return 1 +457 | +458 | def f(): +459 | x = (1 +note: This is an unsafe fix and may change runtime behavior RET504 [*] Unnecessary assignment to `x` before `return` statement --> RET504.py:463:12 @@ -307,12 +293,11 @@ RET504 [*] Unnecessary assignment to `x` before `return` statement | ^ | help: Remove unnecessary assignment - -ℹ Unsafe fix -458 458 | return x -459 459 | -460 460 | def f(): -461 |- x = (1 - 461 |+ return (1 -462 462 | ) -463 |- return x +458 | return x +459 | +460 | def f(): + - x = (1 +461 + return (1 +462 | ) + - return x +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap index e67b72a86f..e0241da6e7 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET505_RET505.py.snap @@ -12,16 +12,14 @@ RET505 [*] Unnecessary `elif` after `return` statement 10 | return w | help: Remove unnecessary `elif` - -ℹ Safe fix -5 5 | if x: # [no-else-return] -6 6 | a = 1 -7 7 | return y -8 |- elif z: - 8 |+ if z: -9 9 | b = 2 -10 10 | return w -11 11 | else: +5 | if x: # [no-else-return] +6 | a = 1 +7 | return y + - elif z: +8 + if z: +9 | b = 2 +10 | return w +11 | else: RET505 [*] Unnecessary `elif` after `return` statement --> RET505.py:23:5 @@ -34,16 +32,14 @@ RET505 [*] Unnecessary `elif` after `return` statement 25 | else: | help: Remove unnecessary `elif` - -ℹ Safe fix -20 20 | else: -21 21 | b = 2 -22 22 | return -23 |- elif z: - 23 |+ if z: -24 24 | c = 2 -25 25 | else: -26 26 | c = 3 +20 | else: +21 | b = 2 +22 | return + - elif z: +23 + if z: +24 | c = 2 +25 | else: +26 | c = 3 RET505 [*] Unnecessary `elif` after `return` statement --> RET505.py:41:5 @@ -56,16 +52,14 @@ RET505 [*] Unnecessary `elif` after `return` statement 43 | return w | help: Remove unnecessary `elif` - -ℹ Safe fix -38 38 | if x: # [no-else-return] -39 39 | a = 1 -40 40 | return y -41 |- elif z: - 41 |+ if z: -42 42 | b = 2 -43 43 | return w -44 44 | else: +38 | if x: # [no-else-return] +39 | a = 1 +40 | return y + - elif z: +41 + if z: +42 | b = 2 +43 | return w +44 | else: RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:53:5 @@ -78,19 +72,17 @@ RET505 [*] Unnecessary `else` after `return` statement 55 | return z | help: Remove unnecessary `else` - -ℹ Safe fix -50 50 | if x: # [no-else-return] -51 51 | a = 1 -52 52 | return y -53 |- else: -54 |- b = 2 -55 |- return z - 53 |+ b = 2 - 54 |+ return z -56 55 | -57 56 | -58 57 | def foo3(x, y, z): +50 | if x: # [no-else-return] +51 | a = 1 +52 | return y + - else: + - b = 2 + - return z +53 + b = 2 +54 + return z +55 | +56 | +57 | def foo3(x, y, z): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:64:9 @@ -103,19 +95,17 @@ RET505 [*] Unnecessary `else` after `return` statement 66 | return x | help: Remove unnecessary `else` - -ℹ Safe fix -61 61 | if y: # [no-else-return] -62 62 | b = 2 -63 63 | return y -64 |- else: -65 |- c = 3 -66 |- return x - 64 |+ c = 3 - 65 |+ return x -67 66 | else: -68 67 | d = 4 -69 68 | return z +61 | if y: # [no-else-return] +62 | b = 2 +63 | return y + - else: + - c = 3 + - return x +64 + c = 3 +65 + return x +66 | else: +67 | d = 4 +68 | return z RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:79:5 @@ -128,17 +118,15 @@ RET505 [*] Unnecessary `else` after `return` statement 81 | return | help: Remove unnecessary `else` - -ℹ Safe fix -76 76 | else: -77 77 | b = 2 -78 78 | return -79 |- else: -80 |- c = 3 - 79 |+ c = 3 -81 80 | return -82 81 | -83 82 | +76 | else: +77 | b = 2 +78 | return + - else: + - c = 3 +79 + c = 3 +80 | return +81 | +82 | RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:89:9 @@ -151,17 +139,15 @@ RET505 [*] Unnecessary `else` after `return` statement 91 | else: | help: Remove unnecessary `else` - -ℹ Safe fix -86 86 | if y: # [no-else-return] -87 87 | a = 4 -88 88 | return -89 |- else: -90 |- b = 2 - 89 |+ b = 2 -91 90 | else: -92 91 | c = 3 -93 92 | return +86 | if y: # [no-else-return] +87 | a = 4 +88 | return + - else: + - b = 2 +89 + b = 2 +90 | else: +91 | c = 3 +92 | return RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:99:5 @@ -174,23 +160,21 @@ RET505 [*] Unnecessary `else` after `return` statement 101 | return False | help: Remove unnecessary `else` - -ℹ Safe fix -96 96 | def bar4(x): -97 97 | if x: # [no-else-return] -98 98 | return True -99 |- else: -100 |- try: -101 |- return False -102 |- except ValueError: -103 |- return None - 99 |+ try: - 100 |+ return False - 101 |+ except ValueError: - 102 |+ return None -104 103 | -105 104 | -106 105 | def fibo(n): +96 | def bar4(x): +97 | if x: # [no-else-return] +98 | return True + - else: + - try: + - return False + - except ValueError: + - return None +99 + try: +100 + return False +101 + except ValueError: +102 + return None +103 | +104 | +105 | def fibo(n): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:109:5 @@ -203,19 +187,17 @@ RET505 [*] Unnecessary `else` after `return` statement 111 | last2 = 0; | help: Remove unnecessary `else` - -ℹ Safe fix -106 106 | def fibo(n): -107 107 | if n<2: -108 108 | return n; -109 |- else: -110 |- last = 1; -111 |- last2 = 0; - 109 |+ last = 1; - 110 |+ last2 = 0; -112 111 | -113 112 | -114 113 | ### +106 | def fibo(n): +107 | if n<2: +108 | return n; + - else: + - last = 1; + - last2 = 0; +109 + last = 1; +110 + last2 = 0; +111 | +112 | +113 | ### RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:145:5 @@ -228,19 +210,17 @@ RET505 [*] Unnecessary `else` after `return` statement 147 | pass | help: Remove unnecessary `else` - -ℹ Safe fix -142 142 | def bar4(x): -143 143 | if True: -144 144 | return -145 |- else: -146 |- # comment -147 |- pass - 145 |+ # comment - 146 |+ pass -148 147 | -149 148 | -150 149 | def bar5(): +142 | def bar4(x): +143 | if True: +144 | return + - else: + - # comment + - pass +145 + # comment +146 + pass +147 | +148 | +149 | def bar5(): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:153:5 @@ -252,18 +232,16 @@ RET505 [*] Unnecessary `else` after `return` statement 154 | pass | help: Remove unnecessary `else` - -ℹ Safe fix -150 150 | def bar5(): -151 151 | if True: -152 152 | return -153 |- else: # comment -154 |- pass - 153 |+ # comment - 154 |+ pass -155 155 | -156 156 | -157 157 | def bar6(): +150 | def bar5(): +151 | if True: +152 | return + - else: # comment + - pass +153 + # comment +154 + pass +155 | +156 | +157 | def bar6(): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:160:5 @@ -276,20 +254,18 @@ RET505 [*] Unnecessary `else` after `return` statement 162 | # comment | help: Remove unnecessary `else` - -ℹ Safe fix -157 157 | def bar6(): -158 158 | if True: -159 159 | return -160 |- else\ -161 |- :\ -162 |- # comment -163 |- pass - 160 |+ # comment - 161 |+ pass -164 162 | -165 163 | -166 164 | def bar7(): +157 | def bar6(): +158 | if True: +159 | return + - else\ + - :\ + - # comment + - pass +160 + # comment +161 + pass +162 | +163 | +164 | def bar7(): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:169:5 @@ -302,19 +278,17 @@ RET505 [*] Unnecessary `else` after `return` statement 171 | pass | help: Remove unnecessary `else` - -ℹ Safe fix -166 166 | def bar7(): -167 167 | if True: -168 168 | return -169 |- else\ -170 |- : # comment -171 |- pass - 169 |+ # comment - 170 |+ pass -172 171 | -173 172 | -174 173 | def bar8(): +166 | def bar7(): +167 | if True: +168 | return + - else\ + - : # comment + - pass +169 + # comment +170 + pass +171 | +172 | +173 | def bar8(): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:177:5 @@ -325,16 +299,14 @@ RET505 [*] Unnecessary `else` after `return` statement | ^^^^ | help: Remove unnecessary `else` - -ℹ Safe fix -174 174 | def bar8(): -175 175 | if True: -176 176 | return -177 |- else: pass - 177 |+ pass -178 178 | -179 179 | -180 180 | def bar9(): +174 | def bar8(): +175 | if True: +176 | return + - else: pass +177 + pass +178 | +179 | +180 | def bar9(): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:183:5 @@ -346,17 +318,15 @@ RET505 [*] Unnecessary `else` after `return` statement 184 | pass | help: Remove unnecessary `else` - -ℹ Safe fix -180 180 | def bar9(): -181 181 | if True: -182 182 | return -183 |- else:\ -184 |- pass - 183 |+ pass -185 184 | -186 185 | -187 186 | x = 0 +180 | def bar9(): +181 | if True: +182 | return + - else:\ + - pass +183 + pass +184 | +185 | +186 | x = 0 RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:200:5 @@ -367,16 +337,14 @@ RET505 [*] Unnecessary `else` after `return` statement | ^^^^ | help: Remove unnecessary `else` - -ℹ Safe fix -197 197 | # Regression test for: https://github.com/astral-sh/ruff/issues/9732 -198 198 | def sb(self): -199 199 | if self._sb is not None: return self._sb -200 |- else: self._sb = '\033[01;%dm'; self._sa = '\033[0;0m'; - 200 |+ self._sb = '\033[01;%dm'; self._sa = '\033[0;0m'; -201 201 | -202 202 | -203 203 | def indent(x, y, w, z): +197 | # Regression test for: https://github.com/astral-sh/ruff/issues/9732 +198 | def sb(self): +199 | if self._sb is not None: return self._sb + - else: self._sb = '\033[01;%dm'; self._sa = '\033[0;0m'; +200 + self._sb = '\033[01;%dm'; self._sa = '\033[0;0m'; +201 | +202 | +203 | def indent(x, y, w, z): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:207:5 @@ -389,20 +357,18 @@ RET505 [*] Unnecessary `else` after `return` statement 209 | c = 3 | help: Remove unnecessary `else` - -ℹ Safe fix -204 204 | if x: # [no-else-return] -205 205 | a = 1 -206 206 | return y -207 |- else: -208 207 | -209 |- c = 3 -210 |- return z - 208 |+ c = 3 - 209 |+ return z -211 210 | -212 211 | -213 212 | def indent(x, y, w, z): +204 | if x: # [no-else-return] +205 | a = 1 +206 | return y + - else: +207 | + - c = 3 + - return z +208 + c = 3 +209 + return z +210 | +211 | +212 | def indent(x, y, w, z): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:217:5 @@ -415,21 +381,19 @@ RET505 [*] Unnecessary `else` after `return` statement 219 | c = 3 | help: Remove unnecessary `else` - -ℹ Safe fix -214 214 | if x: # [no-else-return] -215 215 | a = 1 -216 216 | return y -217 |- else: -218 |- # comment -219 |- c = 3 -220 |- return z - 217 |+ # comment - 218 |+ c = 3 - 219 |+ return z -221 220 | -222 221 | -223 222 | def indent(x, y, w, z): +214 | if x: # [no-else-return] +215 | a = 1 +216 | return y + - else: + - # comment + - c = 3 + - return z +217 + # comment +218 + c = 3 +219 + return z +220 | +221 | +222 | def indent(x, y, w, z): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:227:5 @@ -442,21 +406,19 @@ RET505 [*] Unnecessary `else` after `return` statement 229 | c = 3 | help: Remove unnecessary `else` - -ℹ Safe fix -224 224 | if x: # [no-else-return] -225 225 | a = 1 -226 226 | return y -227 |- else: -228 |- # comment -229 |- c = 3 -230 |- return z - 227 |+ # comment - 228 |+ c = 3 - 229 |+ return z -231 230 | -232 231 | -233 232 | def indent(x, y, w, z): +224 | if x: # [no-else-return] +225 | a = 1 +226 | return y + - else: + - # comment + - c = 3 + - return z +227 + # comment +228 + c = 3 +229 + return z +230 | +231 | +232 | def indent(x, y, w, z): RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:237:5 @@ -469,20 +431,18 @@ RET505 [*] Unnecessary `else` after `return` statement 239 | c = 3 | help: Remove unnecessary `else` - -ℹ Safe fix -234 234 | if x: # [no-else-return] -235 235 | a = 1 -236 236 | return y -237 |- else: -238 237 | # comment -239 |- c = 3 -240 |- return z - 238 |+ c = 3 - 239 |+ return z -241 240 | -242 241 | def f(): -243 242 | if True: +234 | if x: # [no-else-return] +235 | a = 1 +236 | return y + - else: +237 | # comment + - c = 3 + - return z +238 + c = 3 +239 + return z +240 | +241 | def f(): +242 | if True: RET505 [*] Unnecessary `else` after `return` statement --> RET505.py:245:2 @@ -494,17 +454,15 @@ RET505 [*] Unnecessary `else` after `return` statement 246 | return False | help: Remove unnecessary `else` - -ℹ Safe fix -242 242 | def f(): -243 243 | if True: -244 244 | return True -245 |- else: -246 |- return False - 245 |+ return False -247 246 | -248 247 | -249 248 | def has_untracted_files(): +242 | def f(): +243 | if True: +244 | return True + - else: + - return False +245 + return False +246 | +247 | +248 | def has_untracted_files(): RET505 Unnecessary `else` after `return` statement --> RET505.py:252:5 diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap index 30781b52ad..41fc1cec19 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET506_RET506.py.snap @@ -12,16 +12,14 @@ RET506 [*] Unnecessary `elif` after `raise` statement 10 | raise Exception(w) | help: Remove unnecessary `elif` - -ℹ Safe fix -5 5 | if x: # [no-else-raise] -6 6 | a = 1 -7 7 | raise Exception(y) -8 |- elif z: - 8 |+ if z: -9 9 | b = 2 -10 10 | raise Exception(w) -11 11 | else: +5 | if x: # [no-else-raise] +6 | a = 1 +7 | raise Exception(y) + - elif z: +8 + if z: +9 | b = 2 +10 | raise Exception(w) +11 | else: RET506 [*] Unnecessary `elif` after `raise` statement --> RET506.py:23:5 @@ -34,16 +32,14 @@ RET506 [*] Unnecessary `elif` after `raise` statement 25 | else: | help: Remove unnecessary `elif` - -ℹ Safe fix -20 20 | else: -21 21 | b = 2 -22 22 | raise Exception(x) -23 |- elif z: - 23 |+ if z: -24 24 | raise Exception(y) -25 25 | else: -26 26 | c = 3 +20 | else: +21 | b = 2 +22 | raise Exception(x) + - elif z: +23 + if z: +24 | raise Exception(y) +25 | else: +26 | c = 3 RET506 [*] Unnecessary `else` after `raise` statement --> RET506.py:34:5 @@ -56,19 +52,17 @@ RET506 [*] Unnecessary `else` after `raise` statement 36 | raise Exception(z) | help: Remove unnecessary `else` - -ℹ Safe fix -31 31 | if x: # [no-else-raise] -32 32 | a = 1 -33 33 | raise Exception(y) -34 |- else: -35 |- b = 2 -36 |- raise Exception(z) - 34 |+ b = 2 - 35 |+ raise Exception(z) -37 36 | -38 37 | -39 38 | def foo3(x, y, z): +31 | if x: # [no-else-raise] +32 | a = 1 +33 | raise Exception(y) + - else: + - b = 2 + - raise Exception(z) +34 + b = 2 +35 + raise Exception(z) +36 | +37 | +38 | def foo3(x, y, z): RET506 [*] Unnecessary `else` after `raise` statement --> RET506.py:45:9 @@ -81,19 +75,17 @@ RET506 [*] Unnecessary `else` after `raise` statement 47 | raise Exception(x) | help: Remove unnecessary `else` - -ℹ Safe fix -42 42 | if y: # [no-else-raise] -43 43 | b = 2 -44 44 | raise Exception(y) -45 |- else: -46 |- c = 3 -47 |- raise Exception(x) - 45 |+ c = 3 - 46 |+ raise Exception(x) -48 47 | else: -49 48 | d = 4 -50 49 | raise Exception(z) +42 | if y: # [no-else-raise] +43 | b = 2 +44 | raise Exception(y) + - else: + - c = 3 + - raise Exception(x) +45 + c = 3 +46 + raise Exception(x) +47 | else: +48 | d = 4 +49 | raise Exception(z) RET506 [*] Unnecessary `else` after `raise` statement --> RET506.py:60:5 @@ -106,17 +98,15 @@ RET506 [*] Unnecessary `else` after `raise` statement 62 | raise Exception(y) | help: Remove unnecessary `else` - -ℹ Safe fix -57 57 | else: -58 58 | b = 2 -59 59 | raise Exception(x) -60 |- else: -61 |- c = 3 - 60 |+ c = 3 -62 61 | raise Exception(y) -63 62 | -64 63 | +57 | else: +58 | b = 2 +59 | raise Exception(x) + - else: + - c = 3 +60 + c = 3 +61 | raise Exception(y) +62 | +63 | RET506 [*] Unnecessary `else` after `raise` statement --> RET506.py:70:9 @@ -129,17 +119,15 @@ RET506 [*] Unnecessary `else` after `raise` statement 72 | else: | help: Remove unnecessary `else` - -ℹ Safe fix -67 67 | if y: # [no-else-raise] -68 68 | a = 4 -69 69 | raise Exception(x) -70 |- else: -71 |- b = 2 - 70 |+ b = 2 -72 71 | else: -73 72 | c = 3 -74 73 | raise Exception(y) +67 | if y: # [no-else-raise] +68 | a = 4 +69 | raise Exception(x) + - else: + - b = 2 +70 + b = 2 +71 | else: +72 | c = 3 +73 | raise Exception(y) RET506 [*] Unnecessary `else` after `raise` statement --> RET506.py:80:5 @@ -152,20 +140,18 @@ RET506 [*] Unnecessary `else` after `raise` statement 82 | raise Exception(False) | help: Remove unnecessary `else` - -ℹ Safe fix -77 77 | def bar4(x): -78 78 | if x: # [no-else-raise] -79 79 | raise Exception(True) -80 |- else: -81 |- try: -82 |- raise Exception(False) -83 |- except ValueError: -84 |- raise Exception(None) - 80 |+ try: - 81 |+ raise Exception(False) - 82 |+ except ValueError: - 83 |+ raise Exception(None) -85 84 | -86 85 | -87 86 | ### +77 | def bar4(x): +78 | if x: # [no-else-raise] +79 | raise Exception(True) + - else: + - try: + - raise Exception(False) + - except ValueError: + - raise Exception(None) +80 + try: +81 + raise Exception(False) +82 + except ValueError: +83 + raise Exception(None) +84 | +85 | +86 | ### diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap index 0a2c279fb5..85dbb3204f 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET507_RET507.py.snap @@ -12,16 +12,14 @@ RET507 [*] Unnecessary `elif` after `continue` statement 10 | else: | help: Remove unnecessary `elif` - -ℹ Safe fix -5 5 | for i in x: -6 6 | if i < y: # [no-else-continue] -7 7 | continue -8 |- elif i < w: - 8 |+ if i < w: -9 9 | continue -10 10 | else: -11 11 | a = z +5 | for i in x: +6 | if i < y: # [no-else-continue] +7 | continue + - elif i < w: +8 + if i < w: +9 | continue +10 | else: +11 | a = z RET507 [*] Unnecessary `elif` after `continue` statement --> RET507.py:22:9 @@ -34,16 +32,14 @@ RET507 [*] Unnecessary `elif` after `continue` statement 24 | else: | help: Remove unnecessary `elif` - -ℹ Safe fix -19 19 | else: -20 20 | b = 2 -21 21 | continue -22 |- elif z: - 22 |+ if z: -23 23 | c = 2 -24 24 | else: -25 25 | c = 3 +19 | else: +20 | b = 2 +21 | continue + - elif z: +22 + if z: +23 | c = 2 +24 | else: +25 | c = 3 RET507 [*] Unnecessary `else` after `continue` statement --> RET507.py:36:9 @@ -55,17 +51,15 @@ RET507 [*] Unnecessary `else` after `continue` statement 37 | a = z | help: Remove unnecessary `else` - -ℹ Safe fix -33 33 | for i in x: -34 34 | if i < y: # [no-else-continue] -35 35 | continue -36 |- else: -37 |- a = z - 36 |+ a = z -38 37 | -39 38 | -40 39 | def foo3(x, y, z): +33 | for i in x: +34 | if i < y: # [no-else-continue] +35 | continue + - else: + - a = z +36 + a = z +37 | +38 | +39 | def foo3(x, y, z): RET507 [*] Unnecessary `else` after `continue` statement --> RET507.py:47:13 @@ -78,19 +72,17 @@ RET507 [*] Unnecessary `else` after `continue` statement 49 | continue | help: Remove unnecessary `else` - -ℹ Safe fix -44 44 | if z: # [no-else-continue] -45 45 | b = 2 -46 46 | continue -47 |- else: -48 |- c = 3 -49 |- continue - 47 |+ c = 3 - 48 |+ continue -50 49 | else: -51 50 | d = 4 -52 51 | continue +44 | if z: # [no-else-continue] +45 | b = 2 +46 | continue + - else: + - c = 3 + - continue +47 + c = 3 +48 + continue +49 | else: +50 | d = 4 +51 | continue RET507 [*] Unnecessary `else` after `continue` statement --> RET507.py:63:9 @@ -103,17 +95,15 @@ RET507 [*] Unnecessary `else` after `continue` statement 65 | continue | help: Remove unnecessary `else` - -ℹ Safe fix -60 60 | else: -61 61 | b = 2 -62 62 | continue -63 |- else: -64 |- c = 3 - 63 |+ c = 3 -65 64 | continue -66 65 | -67 66 | +60 | else: +61 | b = 2 +62 | continue + - else: + - c = 3 +63 + c = 3 +64 | continue +65 | +66 | RET507 [*] Unnecessary `else` after `continue` statement --> RET507.py:74:13 @@ -126,17 +116,15 @@ RET507 [*] Unnecessary `else` after `continue` statement 76 | else: | help: Remove unnecessary `else` - -ℹ Safe fix -71 71 | if y: # [no-else-continue] -72 72 | a = 4 -73 73 | continue -74 |- else: -75 |- b = 2 - 74 |+ b = 2 -76 75 | else: -77 76 | c = 3 -78 77 | continue +71 | if y: # [no-else-continue] +72 | a = 4 +73 | continue + - else: + - b = 2 +74 + b = 2 +75 | else: +76 | c = 3 +77 | continue RET507 [*] Unnecessary `else` after `continue` statement --> RET507.py:85:9 @@ -149,20 +137,18 @@ RET507 [*] Unnecessary `else` after `continue` statement 87 | return | help: Remove unnecessary `else` - -ℹ Safe fix -82 82 | for i in range(10): -83 83 | if x: # [no-else-continue] -84 84 | continue -85 |- else: -86 |- try: -87 |- return -88 |- except ValueError: -89 |- continue - 85 |+ try: - 86 |+ return - 87 |+ except ValueError: - 88 |+ continue -90 89 | -91 90 | -92 91 | def bar1(x, y, z): +82 | for i in range(10): +83 | if x: # [no-else-continue] +84 | continue + - else: + - try: + - return + - except ValueError: + - continue +85 + try: +86 + return +87 + except ValueError: +88 + continue +89 | +90 | +91 | def bar1(x, y, z): diff --git a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap index 3b0edfbc06..6cee48b323 100644 --- a/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap +++ b/crates/ruff_linter/src/rules/flake8_return/snapshots/ruff_linter__rules__flake8_return__tests__RET508_RET508.py.snap @@ -12,16 +12,14 @@ RET508 [*] Unnecessary `elif` after `break` statement 10 | else: | help: Remove unnecessary `elif` - -ℹ Safe fix -5 5 | for i in x: -6 6 | if i > y: # [no-else-break] -7 7 | break -8 |- elif i > w: - 8 |+ if i > w: -9 9 | break -10 10 | else: -11 11 | a = z +5 | for i in x: +6 | if i > y: # [no-else-break] +7 | break + - elif i > w: +8 + if i > w: +9 | break +10 | else: +11 | a = z RET508 [*] Unnecessary `elif` after `break` statement --> RET508.py:22:9 @@ -34,16 +32,14 @@ RET508 [*] Unnecessary `elif` after `break` statement 24 | else: | help: Remove unnecessary `elif` - -ℹ Safe fix -19 19 | else: -20 20 | b = 2 -21 21 | break -22 |- elif z: - 22 |+ if z: -23 23 | c = 2 -24 24 | else: -25 25 | c = 3 +19 | else: +20 | b = 2 +21 | break + - elif z: +22 + if z: +23 | c = 2 +24 | else: +25 | c = 3 RET508 [*] Unnecessary `else` after `break` statement --> RET508.py:33:9 @@ -55,17 +51,15 @@ RET508 [*] Unnecessary `else` after `break` statement 34 | a = z | help: Remove unnecessary `else` - -ℹ Safe fix -30 30 | for i in x: -31 31 | if i > y: # [no-else-break] -32 32 | break -33 |- else: -34 |- a = z - 33 |+ a = z -35 34 | -36 35 | -37 36 | def foo3(x, y, z): +30 | for i in x: +31 | if i > y: # [no-else-break] +32 | break + - else: + - a = z +33 + a = z +34 | +35 | +36 | def foo3(x, y, z): RET508 [*] Unnecessary `else` after `break` statement --> RET508.py:44:13 @@ -78,19 +72,17 @@ RET508 [*] Unnecessary `else` after `break` statement 46 | break | help: Remove unnecessary `else` - -ℹ Safe fix -41 41 | if z: # [no-else-break] -42 42 | b = 2 -43 43 | break -44 |- else: -45 |- c = 3 -46 |- break - 44 |+ c = 3 - 45 |+ break -47 46 | else: -48 47 | d = 4 -49 48 | break +41 | if z: # [no-else-break] +42 | b = 2 +43 | break + - else: + - c = 3 + - break +44 + c = 3 +45 + break +46 | else: +47 | d = 4 +48 | break RET508 [*] Unnecessary `else` after `break` statement --> RET508.py:60:9 @@ -103,17 +95,15 @@ RET508 [*] Unnecessary `else` after `break` statement 62 | break | help: Remove unnecessary `else` - -ℹ Safe fix -57 57 | else: -58 58 | b = 2 -59 59 | break -60 |- else: -61 |- c = 3 - 60 |+ c = 3 -62 61 | break -63 62 | -64 63 | +57 | else: +58 | b = 2 +59 | break + - else: + - c = 3 +60 + c = 3 +61 | break +62 | +63 | RET508 [*] Unnecessary `else` after `break` statement --> RET508.py:71:13 @@ -126,17 +116,15 @@ RET508 [*] Unnecessary `else` after `break` statement 73 | else: | help: Remove unnecessary `else` - -ℹ Safe fix -68 68 | if y: # [no-else-break] -69 69 | a = 4 -70 70 | break -71 |- else: -72 |- b = 2 - 71 |+ b = 2 -73 72 | else: -74 73 | c = 3 -75 74 | break +68 | if y: # [no-else-break] +69 | a = 4 +70 | break + - else: + - b = 2 +71 + b = 2 +72 | else: +73 | c = 3 +74 | break RET508 [*] Unnecessary `else` after `break` statement --> RET508.py:82:9 @@ -149,23 +137,21 @@ RET508 [*] Unnecessary `else` after `break` statement 84 | return | help: Remove unnecessary `else` - -ℹ Safe fix -79 79 | for i in range(10): -80 80 | if x: # [no-else-break] -81 81 | break -82 |- else: -83 |- try: -84 |- return -85 |- except ValueError: -86 |- break - 82 |+ try: - 83 |+ return - 84 |+ except ValueError: - 85 |+ break -87 86 | -88 87 | -89 88 | ### +79 | for i in range(10): +80 | if x: # [no-else-break] +81 | break + - else: + - try: + - return + - except ValueError: + - break +82 + try: +83 + return +84 + except ValueError: +85 + break +86 | +87 | +88 | ### RET508 [*] Unnecessary `else` after `break` statement --> RET508.py:158:13 @@ -177,11 +163,9 @@ RET508 [*] Unnecessary `else` after `break` statement 159 | a = z | help: Remove unnecessary `else` - -ℹ Safe fix -155 155 | else: -156 156 | if i > w: -157 157 | break -158 |- else: -159 |- a = z - 158 |+ a = z +155 | else: +156 | if i > w: +157 | break + - else: + - a = z +158 + a = z diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap index 660a531793..3a8f81c63e 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM101_SIM101.py.snap @@ -9,13 +9,12 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 2 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -1 |-if isinstance(a, int) or isinstance(a, float): # SIM101 - 1 |+if isinstance(a, (int, float)): # SIM101 -2 2 | pass -3 3 | -4 4 | if isinstance(a, (int, float)) or isinstance(a, bool): # SIM101 + - if isinstance(a, int) or isinstance(a, float): # SIM101 +1 + if isinstance(a, (int, float)): # SIM101 +2 | pass +3 | +4 | if isinstance(a, (int, float)) or isinstance(a, bool): # SIM101 +note: This is an unsafe fix and may change runtime behavior SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call --> SIM101.py:4:4 @@ -27,16 +26,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 5 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -1 1 | if isinstance(a, int) or isinstance(a, float): # SIM101 -2 2 | pass -3 3 | -4 |-if isinstance(a, (int, float)) or isinstance(a, bool): # SIM101 - 4 |+if isinstance(a, (int, float, bool)): # SIM101 -5 5 | pass -6 6 | -7 7 | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool): # SIM101 +1 | if isinstance(a, int) or isinstance(a, float): # SIM101 +2 | pass +3 | + - if isinstance(a, (int, float)) or isinstance(a, bool): # SIM101 +4 + if isinstance(a, (int, float, bool)): # SIM101 +5 | pass +6 | +7 | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool): # SIM101 +note: This is an unsafe fix and may change runtime behavior SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call --> SIM101.py:7:4 @@ -48,16 +46,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 8 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -4 4 | if isinstance(a, (int, float)) or isinstance(a, bool): # SIM101 -5 5 | pass -6 6 | -7 |-if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool): # SIM101 - 7 |+if isinstance(a, (int, float)) or isinstance(b, bool): # SIM101 -8 8 | pass -9 9 | -10 10 | if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float): # SIM101 +4 | if isinstance(a, (int, float)) or isinstance(a, bool): # SIM101 +5 | pass +6 | + - if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool): # SIM101 +7 + if isinstance(a, (int, float)) or isinstance(b, bool): # SIM101 +8 | pass +9 | +10 | if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float): # SIM101 +note: This is an unsafe fix and may change runtime behavior SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call --> SIM101.py:10:4 @@ -69,16 +66,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 11 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -7 7 | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool): # SIM101 -8 8 | pass -9 9 | -10 |-if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float): # SIM101 - 10 |+if isinstance(b, bool) or isinstance(a, (int, float)): # SIM101 -11 11 | pass -12 12 | -13 13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float): # SIM101 +7 | if isinstance(a, int) or isinstance(a, float) or isinstance(b, bool): # SIM101 +8 | pass +9 | + - if isinstance(b, bool) or isinstance(a, int) or isinstance(a, float): # SIM101 +10 + if isinstance(b, bool) or isinstance(a, (int, float)): # SIM101 +11 | pass +12 | +13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float): # SIM101 +note: This is an unsafe fix and may change runtime behavior SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call --> SIM101.py:16:5 @@ -90,16 +86,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 17 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -13 13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float): # SIM101 -14 14 | pass -15 15 | -16 |-if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool): # SIM101 - 16 |+if (isinstance(a, (int, float))) and isinstance(b, bool): # SIM101 -17 17 | pass -18 18 | -19 19 | if isinstance(a.b, int) or isinstance(a.b, float): # SIM101 +13 | if isinstance(a, int) or isinstance(b, bool) or isinstance(a, float): # SIM101 +14 | pass +15 | + - if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool): # SIM101 +16 + if (isinstance(a, (int, float))) and isinstance(b, bool): # SIM101 +17 | pass +18 | +19 | if isinstance(a.b, int) or isinstance(a.b, float): # SIM101 +note: This is an unsafe fix and may change runtime behavior SIM101 [*] Multiple `isinstance` calls for expression, merge into a single call --> SIM101.py:19:4 @@ -111,16 +106,15 @@ SIM101 [*] Multiple `isinstance` calls for expression, merge into a single call 20 | pass | help: Merge `isinstance` calls - -ℹ Unsafe fix -16 16 | if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool): # SIM101 -17 17 | pass -18 18 | -19 |-if isinstance(a.b, int) or isinstance(a.b, float): # SIM101 - 19 |+if isinstance(a.b, (int, float)): # SIM101 -20 20 | pass -21 21 | -22 22 | if isinstance(a(), int) or isinstance(a(), float): # SIM101 +16 | if (isinstance(a, int) or isinstance(a, float)) and isinstance(b, bool): # SIM101 +17 | pass +18 | + - if isinstance(a.b, int) or isinstance(a.b, float): # SIM101 +19 + if isinstance(a.b, (int, float)): # SIM101 +20 | pass +21 | +22 | if isinstance(a(), int) or isinstance(a(), float): # SIM101 +note: This is an unsafe fix and may change runtime behavior SIM101 Multiple `isinstance` calls for expression, merge into a single call --> SIM101.py:22:4 @@ -143,16 +137,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 39 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -35 35 | if isinstance(a, int) or unrelated_condition or isinstance(a, float): -36 36 | pass -37 37 | -38 |-if x or isinstance(a, int) or isinstance(a, float): - 38 |+if x or isinstance(a, (int, float)): -39 39 | pass -40 40 | -41 41 | if x or y or isinstance(a, int) or isinstance(a, float) or z: +35 | if isinstance(a, int) or unrelated_condition or isinstance(a, float): +36 | pass +37 | + - if x or isinstance(a, int) or isinstance(a, float): +38 + if x or isinstance(a, (int, float)): +39 | pass +40 | +41 | if x or y or isinstance(a, int) or isinstance(a, float) or z: +note: This is an unsafe fix and may change runtime behavior SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call --> SIM101.py:41:4 @@ -164,16 +157,15 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 42 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -38 38 | if x or isinstance(a, int) or isinstance(a, float): -39 39 | pass -40 40 | -41 |-if x or y or isinstance(a, int) or isinstance(a, float) or z: - 41 |+if x or y or isinstance(a, (int, float)) or z: -42 42 | pass -43 43 | -44 44 | def f(): +38 | if x or isinstance(a, int) or isinstance(a, float): +39 | pass +40 | + - if x or y or isinstance(a, int) or isinstance(a, float) or z: +41 + if x or y or isinstance(a, (int, float)) or z: +42 | pass +43 | +44 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call --> SIM101.py:53:3 @@ -184,11 +176,10 @@ SIM101 [*] Multiple `isinstance` calls for `a`, merge into a single call 54 | pass | help: Merge `isinstance` calls for `a` - -ℹ Unsafe fix -50 50 | pass -51 51 | -52 52 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722460483 -53 |-if(isinstance(a, int)) or (isinstance(a, float)): - 53 |+if isinstance(a, (int, float)): -54 54 | pass +50 | pass +51 | +52 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722460483 + - if(isinstance(a, int)) or (isinstance(a, float)): +53 + if isinstance(a, (int, float)): +54 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap index 94e6118857..5a31fa2684 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM102_SIM102.py.snap @@ -11,17 +11,16 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 4 | c | help: Combine `if` statements using `and` - -ℹ Unsafe fix -1 1 | # SIM102 -2 |-if a: -3 |- if b: -4 |- c - 2 |+if a and b: - 3 |+ c -5 4 | -6 5 | # SIM102 -7 6 | if a: +1 | # SIM102 + - if a: + - if b: + - c +2 + if a and b: +3 + c +4 | +5 | # SIM102 +6 | if a: +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:7:1 @@ -34,21 +33,20 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 10 | d | help: Combine `if` statements using `and` - -ℹ Unsafe fix -4 4 | c -5 5 | -6 6 | # SIM102 -7 |-if a: -8 |- if b: -9 |- if c: -10 |- d - 7 |+if a and b: - 8 |+ if c: - 9 |+ d -11 10 | -12 11 | # SIM102 -13 12 | if a: +4 | c +5 | +6 | # SIM102 + - if a: + - if b: + - if c: + - d +7 + if a and b: +8 + if c: +9 + d +10 | +11 | # SIM102 +12 | if a: +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:8:5 @@ -61,19 +59,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 10 | d | help: Combine `if` statements using `and` - -ℹ Unsafe fix -5 5 | -6 6 | # SIM102 -7 7 | if a: -8 |- if b: -9 |- if c: -10 |- d - 8 |+ if b and c: - 9 |+ d -11 10 | -12 11 | # SIM102 -13 12 | if a: +5 | +6 | # SIM102 +7 | if a: + - if b: + - if c: + - d +8 + if b and c: +9 + d +10 | +11 | # SIM102 +12 | if a: +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:15:1 @@ -86,19 +83,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 17 | d | help: Combine `if` statements using `and` - -ℹ Unsafe fix -12 12 | # SIM102 -13 13 | if a: -14 14 | pass -15 |-elif b: -16 |- if c: -17 |- d - 15 |+elif b and c: - 16 |+ d -18 17 | -19 18 | # SIM102 -20 19 | if a: +12 | # SIM102 +13 | if a: +14 | pass + - elif b: + - if c: + - d +15 + elif b and c: +16 + d +17 | +18 | # SIM102 +19 | if a: +note: This is an unsafe fix and may change runtime behavior SIM102 Use a single `if` statement instead of nested `if` statements --> SIM102.py:20:1 @@ -123,21 +119,20 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 29 | c | help: Combine `if` statements using `and` - -ℹ Unsafe fix -23 23 | c -24 24 | -25 25 | # SIM102 -26 |-if a: -27 |- if b: -28 |- # Fixable due to placement of this comment. -29 |- c - 26 |+if a and b: - 27 |+ # Fixable due to placement of this comment. - 28 |+ c -30 29 | -31 30 | # OK -32 31 | if a: +23 | c +24 | +25 | # SIM102 + - if a: + - if b: + - # Fixable due to placement of this comment. + - c +26 + if a and b: +27 + # Fixable due to placement of this comment. +28 + c +29 | +30 | # OK +31 | if a: +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:51:5 @@ -151,31 +146,30 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 54 | is valid""" | help: Combine `if` statements using `and` - -ℹ Unsafe fix -48 48 | -49 49 | while x > 0: -50 50 | # SIM102 -51 |- if y > 0: -52 |- if z > 0: -53 |- """this - 51 |+ if y > 0 and z > 0: - 52 |+ """this -54 53 | is valid""" -55 54 | -56 |- """the indentation on - 55 |+ """the indentation on -57 56 | this line is significant""" -58 57 | -59 |- "this is" \ - 58 |+ "this is" \ -60 59 | "allowed too" -61 60 | -62 |- ("so is" - 61 |+ ("so is" -63 62 | "this for some reason") -64 63 | -65 64 | +48 | +49 | while x > 0: +50 | # SIM102 + - if y > 0: + - if z > 0: + - """this +51 + if y > 0 and z > 0: +52 + """this +53 | is valid""" +54 | + - """the indentation on +55 + """the indentation on +56 | this line is significant""" +57 | + - "this is" \ +58 + "this is" \ +59 | "allowed too" +60 | + - ("so is" +61 + ("so is" +62 | "this for some reason") +63 | +64 | +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:67:1 @@ -188,31 +182,30 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 70 | is valid""" | help: Combine `if` statements using `and` - -ℹ Unsafe fix -64 64 | -65 65 | -66 66 | # SIM102 -67 |-if x > 0: -68 |- if y > 0: -69 |- """this - 67 |+if x > 0 and y > 0: - 68 |+ """this -70 69 | is valid""" -71 70 | -72 |- """the indentation on - 71 |+ """the indentation on -73 72 | this line is significant""" -74 73 | -75 |- "this is" \ - 74 |+ "this is" \ -76 75 | "allowed too" -77 76 | -78 |- ("so is" - 77 |+ ("so is" -79 78 | "this for some reason") -80 79 | -81 80 | while x > 0: +64 | +65 | +66 | # SIM102 + - if x > 0: + - if y > 0: + - """this +67 + if x > 0 and y > 0: +68 + """this +69 | is valid""" +70 | + - """the indentation on +71 + """the indentation on +72 | this line is significant""" +73 | + - "this is" \ +74 + "this is" \ +75 | "allowed too" +76 | + - ("so is" +77 + ("so is" +78 | "this for some reason") +79 | +80 | while x > 0: +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:83:5 @@ -227,23 +220,22 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 87 | print("Bad module!") | help: Combine `if` statements using `and` - -ℹ Unsafe fix -80 80 | -81 81 | while x > 0: -82 82 | # SIM102 -83 |- if node.module: -84 |- if node.module == "multiprocessing" or node.module.startswith( -85 |- "multiprocessing." -86 |- ): -87 |- print("Bad module!") - 83 |+ if node.module and (node.module == "multiprocessing" or node.module.startswith( - 84 |+ "multiprocessing." - 85 |+ )): - 86 |+ print("Bad module!") -88 87 | -89 88 | # SIM102 (auto-fixable) -90 89 | if node.module012345678: +80 | +81 | while x > 0: +82 | # SIM102 + - if node.module: + - if node.module == "multiprocessing" or node.module.startswith( + - "multiprocessing." + - ): + - print("Bad module!") +83 + if node.module and (node.module == "multiprocessing" or node.module.startswith( +84 + "multiprocessing." +85 + )): +86 + print("Bad module!") +87 | +88 | # SIM102 (auto-fixable) +89 | if node.module012345678: +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:90:1 @@ -257,23 +249,22 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 94 | print("Bad module!") | help: Combine `if` statements using `and` - -ℹ Unsafe fix -87 87 | print("Bad module!") -88 88 | -89 89 | # SIM102 (auto-fixable) -90 |-if node.module012345678: -91 |- if node.module == "multiprocß9💣2ℝ" or node.module.startswith( -92 |- "multiprocessing." -93 |- ): -94 |- print("Bad module!") - 90 |+if node.module012345678 and (node.module == "multiprocß9💣2ℝ" or node.module.startswith( - 91 |+ "multiprocessing." - 92 |+)): - 93 |+ print("Bad module!") -95 94 | -96 95 | # SIM102 (not auto-fixable) -97 96 | if node.module0123456789: +87 | print("Bad module!") +88 | +89 | # SIM102 (auto-fixable) + - if node.module012345678: + - if node.module == "multiprocß9💣2ℝ" or node.module.startswith( + - "multiprocessing." + - ): + - print("Bad module!") +90 + if node.module012345678 and (node.module == "multiprocß9💣2ℝ" or node.module.startswith( +91 + "multiprocessing." +92 + )): +93 + print("Bad module!") +94 | +95 | # SIM102 (not auto-fixable) +96 | if node.module0123456789: +note: This is an unsafe fix and may change runtime behavior SIM102 Use a single `if` statement instead of nested `if` statements --> SIM102.py:97:1 @@ -300,19 +291,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 109 | elif d: | help: Combine `if` statements using `and` - -ℹ Unsafe fix -103 103 | # SIM102 -104 104 | # Regression test for https://github.com/apache/airflow/blob/145b16caaa43f0c42bffd97344df916c602cddde/airflow/configuration.py#L1161 -105 105 | if a: -106 |- if b: -107 |- if c: -108 |- print("if") - 106 |+ if b and c: - 107 |+ print("if") -109 108 | elif d: -110 109 | print("elif") -111 110 | +103 | # SIM102 +104 | # Regression test for https://github.com/apache/airflow/blob/145b16caaa43f0c42bffd97344df916c602cddde/airflow/configuration.py#L1161 +105 | if a: + - if b: + - if c: + - print("if") +106 + if b and c: +107 + print("if") +108 | elif d: +109 | print("elif") +110 | +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:132:5 @@ -326,19 +316,18 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 135 | else: | help: Combine `if` statements using `and` - -ℹ Unsafe fix -129 129 | # OK -130 130 | if a: -131 131 | # SIM 102 -132 |- if b: -133 |- if c: -134 |- print("foo") - 132 |+ if b and c: - 133 |+ print("foo") -135 134 | else: -136 135 | print("bar") -137 136 | +129 | # OK +130 | if a: +131 | # SIM 102 + - if b: + - if c: + - print("foo") +132 + if b and c: +133 + print("foo") +134 | else: +135 | print("bar") +136 | +note: This is an unsafe fix and may change runtime behavior SIM102 [*] Use a single `if` statement instead of nested `if` statements --> SIM102.py:165:5 @@ -351,13 +340,12 @@ SIM102 [*] Use a single `if` statement instead of nested `if` statements 167 | d | help: Combine `if` statements using `and` - -ℹ Unsafe fix -162 162 | def f(): -163 163 | if a: -164 164 | pass -165 |- elif b: -166 |- if c: -167 |- d - 165 |+ elif b and c: - 166 |+ d +162 | def f(): +163 | if a: +164 | pass + - elif b: + - if c: + - d +165 + elif b and c: +166 + d +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap index 4ae8c970c5..51cd372286 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM103_SIM103.py.snap @@ -13,18 +13,17 @@ SIM103 [*] Return the condition `bool(a)` directly | |____________________^ | help: Replace with `return bool(a)` - -ℹ Unsafe fix -1 1 | def f(): -2 2 | # SIM103 -3 |- if a: -4 |- return True -5 |- else: -6 |- return False - 3 |+ return bool(a) -7 4 | -8 5 | -9 6 | def f(): +1 | def f(): +2 | # SIM103 + - if a: + - return True + - else: + - return False +3 + return bool(a) +4 | +5 | +6 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `a == b` directly --> SIM103.py:11:5 @@ -38,19 +37,18 @@ SIM103 [*] Return the condition `a == b` directly | |____________________^ | help: Replace with `return a == b` - -ℹ Unsafe fix -8 8 | -9 9 | def f(): -10 10 | # SIM103 -11 |- if a == b: -12 |- return True -13 |- else: -14 |- return False - 11 |+ return a == b -15 12 | -16 13 | -17 14 | def f(): +8 | +9 | def f(): +10 | # SIM103 + - if a == b: + - return True + - else: + - return False +11 + return a == b +12 | +13 | +14 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `bool(b)` directly --> SIM103.py:21:5 @@ -64,19 +62,18 @@ SIM103 [*] Return the condition `bool(b)` directly | |____________________^ | help: Replace with `return bool(b)` - -ℹ Unsafe fix -18 18 | # SIM103 -19 19 | if a: -20 20 | return 1 -21 |- elif b: -22 |- return True -23 |- else: -24 |- return False - 21 |+ return bool(b) -25 22 | -26 23 | -27 24 | def f(): +18 | # SIM103 +19 | if a: +20 | return 1 + - elif b: + - return True + - else: + - return False +21 + return bool(b) +22 | +23 | +24 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `bool(b)` directly --> SIM103.py:32:9 @@ -90,19 +87,18 @@ SIM103 [*] Return the condition `bool(b)` directly | |________________________^ | help: Replace with `return bool(b)` - -ℹ Unsafe fix -29 29 | if a: -30 30 | return 1 -31 31 | else: -32 |- if b: -33 |- return True -34 |- else: -35 |- return False - 32 |+ return bool(b) -36 33 | -37 34 | -38 35 | def f(): +29 | if a: +30 | return 1 +31 | else: + - if b: + - return True + - else: + - return False +32 + return bool(b) +33 | +34 | +35 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `not a` directly --> SIM103.py:57:5 @@ -116,19 +112,18 @@ SIM103 [*] Return the condition `not a` directly | |___________________^ | help: Replace with `return not a` - -ℹ Unsafe fix -54 54 | -55 55 | def f(): -56 56 | # SIM103 -57 |- if a: -58 |- return False -59 |- else: -60 |- return True - 57 |+ return not a -61 58 | -62 59 | -63 60 | def f(): +54 | +55 | def f(): +56 | # SIM103 + - if a: + - return False + - else: + - return True +57 + return not a +58 | +59 | +60 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 Return the condition directly --> SIM103.py:83:5 @@ -155,19 +150,18 @@ SIM103 [*] Return the condition `not (keys is not None and notice.key not in key | |___________________^ | help: Replace with `return not (keys is not None and notice.key not in keys)` - -ℹ Unsafe fix -88 88 | -89 89 | def f(): -90 90 | # SIM103 -91 |- if keys is not None and notice.key not in keys: -92 |- return False -93 |- else: -94 |- return True - 91 |+ return not (keys is not None and notice.key not in keys) -95 92 | -96 93 | -97 94 | ### +88 | +89 | def f(): +90 | # SIM103 + - if keys is not None and notice.key not in keys: + - return False + - else: + - return True +91 + return not (keys is not None and notice.key not in keys) +92 | +93 | +94 | ### +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `bool(a)` directly --> SIM103.py:104:5 @@ -180,18 +174,17 @@ SIM103 [*] Return the condition `bool(a)` directly | |________________^ | help: Replace with `return bool(a)` - -ℹ Unsafe fix -101 101 | -102 102 | def f(): -103 103 | # SIM103 -104 |- if a: -105 |- return True -106 |- return False - 104 |+ return bool(a) -107 105 | -108 106 | -109 107 | def f(): +101 | +102 | def f(): +103 | # SIM103 + - if a: + - return True + - return False +104 + return bool(a) +105 | +106 | +107 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `not a` directly --> SIM103.py:111:5 @@ -204,18 +197,17 @@ SIM103 [*] Return the condition `not a` directly | |_______________^ | help: Replace with `return not a` - -ℹ Unsafe fix -108 108 | -109 109 | def f(): -110 110 | # SIM103 -111 |- if a: -112 |- return False -113 |- return True - 111 |+ return not a -114 112 | -115 113 | -116 114 | def f(): +108 | +109 | def f(): +110 | # SIM103 + - if a: + - return False + - return True +111 + return not a +112 | +113 | +114 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `10 < a` directly --> SIM103.py:117:5 @@ -227,18 +219,17 @@ SIM103 [*] Return the condition `10 < a` directly | |_______________^ | help: Replace with `return 10 < a` - -ℹ Unsafe fix -114 114 | -115 115 | -116 116 | def f(): -117 |- if not 10 < a: -118 |- return False -119 |- return True - 117 |+ return 10 < a -120 118 | -121 119 | -122 120 | def f(): +114 | +115 | +116 | def f(): + - if not 10 < a: + - return False + - return True +117 + return 10 < a +118 | +119 | +120 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `not 10 < a` directly --> SIM103.py:123:5 @@ -250,18 +241,17 @@ SIM103 [*] Return the condition `not 10 < a` directly | |_______________^ | help: Replace with `return not 10 < a` - -ℹ Unsafe fix -120 120 | -121 121 | -122 122 | def f(): -123 |- if 10 < a: -124 |- return False -125 |- return True - 123 |+ return not 10 < a -126 124 | -127 125 | -128 126 | def f(): +120 | +121 | +122 | def f(): + - if 10 < a: + - return False + - return True +123 + return not 10 < a +124 | +125 | +126 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `10 not in a` directly --> SIM103.py:129:5 @@ -273,18 +263,17 @@ SIM103 [*] Return the condition `10 not in a` directly | |_______________^ | help: Replace with `return 10 not in a` - -ℹ Unsafe fix -126 126 | -127 127 | -128 128 | def f(): -129 |- if 10 in a: -130 |- return False -131 |- return True - 129 |+ return 10 not in a -132 130 | -133 131 | -134 132 | def f(): +126 | +127 | +128 | def f(): + - if 10 in a: + - return False + - return True +129 + return 10 not in a +130 | +131 | +132 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `10 in a` directly --> SIM103.py:135:5 @@ -296,18 +285,17 @@ SIM103 [*] Return the condition `10 in a` directly | |_______________^ | help: Replace with `return 10 in a` - -ℹ Unsafe fix -132 132 | -133 133 | -134 134 | def f(): -135 |- if 10 not in a: -136 |- return False -137 |- return True - 135 |+ return 10 in a -138 136 | -139 137 | -140 138 | def f(): +132 | +133 | +134 | def f(): + - if 10 not in a: + - return False + - return True +135 + return 10 in a +136 | +137 | +138 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `a is not 10` directly --> SIM103.py:141:5 @@ -319,18 +307,17 @@ SIM103 [*] Return the condition `a is not 10` directly | |_______________^ | help: Replace with `return a is not 10` - -ℹ Unsafe fix -138 138 | -139 139 | -140 140 | def f(): -141 |- if a is 10: -142 |- return False -143 |- return True - 141 |+ return a is not 10 -144 142 | -145 143 | -146 144 | def f(): +138 | +139 | +140 | def f(): + - if a is 10: + - return False + - return True +141 + return a is not 10 +142 | +143 | +144 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `a is 10` directly --> SIM103.py:147:5 @@ -342,18 +329,17 @@ SIM103 [*] Return the condition `a is 10` directly | |_______________^ | help: Replace with `return a is 10` - -ℹ Unsafe fix -144 144 | -145 145 | -146 146 | def f(): -147 |- if a is not 10: -148 |- return False -149 |- return True - 147 |+ return a is 10 -150 148 | -151 149 | -152 150 | def f(): +144 | +145 | +146 | def f(): + - if a is not 10: + - return False + - return True +147 + return a is 10 +148 | +149 | +150 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `a != 10` directly --> SIM103.py:153:5 @@ -365,18 +351,17 @@ SIM103 [*] Return the condition `a != 10` directly | |_______________^ | help: Replace with `return a != 10` - -ℹ Unsafe fix -150 150 | -151 151 | -152 152 | def f(): -153 |- if a == 10: -154 |- return False -155 |- return True - 153 |+ return a != 10 -156 154 | -157 155 | -158 156 | def f(): +150 | +151 | +152 | def f(): + - if a == 10: + - return False + - return True +153 + return a != 10 +154 | +155 | +156 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM103 [*] Return the condition `a == 10` directly --> SIM103.py:159:5 @@ -388,12 +373,11 @@ SIM103 [*] Return the condition `a == 10` directly | |_______________^ | help: Replace with `return a == 10` - -ℹ Unsafe fix -156 156 | -157 157 | -158 158 | def f(): -159 |- if a != 10: -160 |- return False -161 |- return True - 159 |+ return a == 10 +156 | +157 | +158 | def f(): + - if a != 10: + - return False + - return True +159 + return a == 10 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap index 829eff5b88..0a05a9ca89 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_0.py.snap @@ -12,22 +12,21 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass | |________^ | help: Replace with `contextlib.suppress(ValueError)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | -4 5 | -5 6 | # SIM105 -6 |-try: - 7 |+with contextlib.suppress(ValueError): -7 8 | foo() -8 |-except ValueError: -9 |- pass -10 9 | -11 10 | -12 11 | # SIM105 +1 + import contextlib +2 | def foo(): +3 | pass +4 | +5 | +6 | # SIM105 + - try: +7 + with contextlib.suppress(ValueError): +8 | foo() + - except ValueError: + - pass +9 | +10 | +11 | # SIM105 +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass` --> SIM105_0.py:13:1 @@ -42,24 +41,23 @@ SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`exce 18 | # SIM105 | help: Replace with `contextlib.suppress(ValueError, OSError)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -10 11 | -11 12 | -12 13 | # SIM105 -13 |-try: - 14 |+with contextlib.suppress(ValueError, OSError): -14 15 | foo() -15 |-except (ValueError, OSError): -16 |- pass -17 16 | -18 17 | # SIM105 -19 18 | try: +11 | +12 | +13 | # SIM105 + - try: +14 + with contextlib.suppress(ValueError, OSError): +15 | foo() + - except (ValueError, OSError): + - pass +16 | +17 | # SIM105 +18 | try: +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass` --> SIM105_0.py:19:1 @@ -74,24 +72,23 @@ SIM105 [*] Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`exce 24 | # SIM105 | help: Replace with `contextlib.suppress(ValueError, OSError)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -16 17 | pass -17 18 | -18 19 | # SIM105 -19 |-try: - 20 |+with contextlib.suppress(ValueError, OSError): -20 21 | foo() -21 |-except (ValueError, OSError) as e: -22 |- pass -23 22 | -24 23 | # SIM105 -25 24 | try: +17 | pass +18 | +19 | # SIM105 + - try: +20 + with contextlib.suppress(ValueError, OSError): +21 | foo() + - except (ValueError, OSError) as e: + - pass +22 | +23 | # SIM105 +24 | try: +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`pass` --> SIM105_0.py:25:1 @@ -106,25 +103,24 @@ SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`p 30 | # SIM105 | help: Replace with `contextlib.suppress(BaseException)` - -ℹ Unsafe fix - 1 |+import contextlib - 2 |+import builtins -1 3 | def foo(): -2 4 | pass -3 5 | +1 + import contextlib +2 + import builtins +3 | def foo(): +4 | pass +5 | -------------------------------------------------------------------------------- -22 24 | pass -23 25 | -24 26 | # SIM105 -25 |-try: - 27 |+with contextlib.suppress(builtins.BaseException): -26 28 | foo() -27 |-except: -28 |- pass -29 29 | -30 30 | # SIM105 -31 31 | try: +24 | pass +25 | +26 | # SIM105 + - try: +27 + with contextlib.suppress(builtins.BaseException): +28 | foo() + - except: + - pass +29 | +30 | # SIM105 +31 | try: +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(a.Error, b.Error)` instead of `try`-`except`-`pass` --> SIM105_0.py:31:1 @@ -139,24 +135,23 @@ SIM105 [*] Use `contextlib.suppress(a.Error, b.Error)` instead of `try`-`except` 36 | # OK | help: Replace with `contextlib.suppress(a.Error, b.Error)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -28 29 | pass -29 30 | -30 31 | # SIM105 -31 |-try: - 32 |+with contextlib.suppress(a.Error, b.Error): -32 33 | foo() -33 |-except (a.Error, b.Error): -34 |- pass -35 34 | -36 35 | # OK -37 36 | try: +29 | pass +30 | +31 | # SIM105 + - try: +32 + with contextlib.suppress(a.Error, b.Error): +33 | foo() + - except (a.Error, b.Error): + - pass +34 | +35 | # OK +36 | try: +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass` --> SIM105_0.py:85:5 @@ -170,24 +165,23 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass | |___________^ | help: Replace with `contextlib.suppress(ValueError)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -82 83 | -83 84 | def with_ellipsis(): -84 85 | # OK -85 |- try: - 86 |+ with contextlib.suppress(ValueError): -86 87 | foo() -87 |- except ValueError: -88 |- ... -89 88 | -90 89 | -91 90 | def with_ellipsis_and_return(): +83 | +84 | def with_ellipsis(): +85 | # OK + - try: +86 + with contextlib.suppress(ValueError): +87 | foo() + - except ValueError: + - ... +88 | +89 | +90 | def with_ellipsis_and_return(): +note: This is an unsafe fix and may change runtime behavior SIM105 Use `contextlib.suppress(ValueError, OSError)` instead of `try`-`except`-`pass` --> SIM105_0.py:100:5 @@ -217,24 +211,23 @@ SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass` 122 | try: os.makedirs(model_dir); | help: Replace with `contextlib.suppress(OSError)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -114 115 | -115 116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7123 -116 117 | def write_models(directory, Models): -117 |- try: - 118 |+ with contextlib.suppress(OSError): -118 119 | os.makedirs(model_dir); -119 |- except OSError: -120 |- pass; -121 120 | -122 121 | try: os.makedirs(model_dir); -123 122 | except OSError: +115 | +116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7123 +117 | def write_models(directory, Models): + - try: +118 + with contextlib.suppress(OSError): +119 | os.makedirs(model_dir); + - except OSError: + - pass; +120 | +121 | try: os.makedirs(model_dir); +122 | except OSError: +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass` --> SIM105_0.py:122:5 @@ -249,23 +242,22 @@ SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass` 126 | try: os.makedirs(model_dir); | help: Replace with `contextlib.suppress(OSError)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -119 120 | except OSError: -120 121 | pass; -121 122 | -122 |- try: os.makedirs(model_dir); -123 |- except OSError: -124 |- pass; - 123 |+ with contextlib.suppress(OSError): os.makedirs(model_dir); -125 124 | -126 125 | try: os.makedirs(model_dir); -127 126 | except OSError: +120 | except OSError: +121 | pass; +122 | + - try: os.makedirs(model_dir); + - except OSError: + - pass; +123 + with contextlib.suppress(OSError): os.makedirs(model_dir); +124 | +125 | try: os.makedirs(model_dir); +126 | except OSError: +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass` --> SIM105_0.py:126:5 @@ -280,23 +272,22 @@ SIM105 [*] Use `contextlib.suppress(OSError)` instead of `try`-`except`-`pass` 130 | # | help: Replace with `contextlib.suppress(OSError)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -123 124 | except OSError: -124 125 | pass; -125 126 | -126 |- try: os.makedirs(model_dir); -127 |- except OSError: -128 |- pass; \ - 127 |+ with contextlib.suppress(OSError): os.makedirs(model_dir); -129 128 | \ -130 129 | # -131 130 | +124 | except OSError: +125 | pass; +126 | + - try: os.makedirs(model_dir); + - except OSError: + - pass; \ +127 + with contextlib.suppress(OSError): os.makedirs(model_dir); +128 | \ +129 | # +130 | +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress()` instead of `try`-`except`-`pass` --> SIM105_0.py:133:1 @@ -309,24 +300,23 @@ SIM105 [*] Use `contextlib.suppress()` instead of `try`-`except`-`pass` | |________^ | help: Replace with `contextlib.suppress()` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -130 131 | # -131 132 | -132 133 | # Regression tests for: https://github.com/astral-sh/ruff/issues/18209 -133 |-try: - 134 |+with contextlib.suppress(): -134 135 | 1 / 0 -135 |-except (): -136 |- pass -137 136 | -138 137 | -139 138 | BaseException = ValueError +131 | # +132 | +133 | # Regression tests for: https://github.com/astral-sh/ruff/issues/18209 + - try: +134 + with contextlib.suppress(): +135 | 1 / 0 + - except (): + - pass +136 | +137 | +138 | BaseException = ValueError +note: This is an unsafe fix and may change runtime behavior SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`pass` --> SIM105_0.py:140:1 @@ -339,18 +329,17 @@ SIM105 [*] Use `contextlib.suppress(BaseException)` instead of `try`-`except`-`p | |________^ | help: Replace with `contextlib.suppress(BaseException)` - -ℹ Unsafe fix - 1 |+import contextlib -1 2 | def foo(): -2 3 | pass -3 4 | +1 + import contextlib +2 | def foo(): +3 | pass +4 | -------------------------------------------------------------------------------- -137 138 | -138 139 | -139 140 | BaseException = ValueError -140 |-try: - 141 |+with contextlib.suppress(BaseException): -141 142 | int("a") -142 |-except BaseException: -143 |- pass +138 | +139 | +140 | BaseException = ValueError + - try: +141 + with contextlib.suppress(BaseException): +142 | int("a") + - except BaseException: + - pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap index 8dc7d3ba61..79aab24239 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_1.py.snap @@ -12,15 +12,14 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass | |________^ | help: Replace with `contextlib.suppress(ValueError)` - -ℹ Unsafe fix -1 1 | """Case: There's a random import, so it should add `contextlib` after it.""" -2 2 | import math - 3 |+import contextlib -3 4 | -4 5 | # SIM105 -5 |-try: - 6 |+with contextlib.suppress(ValueError): -6 7 | math.sqrt(-1) -7 |-except ValueError: -8 |- pass +1 | """Case: There's a random import, so it should add `contextlib` after it.""" +2 | import math +3 + import contextlib +4 | +5 | # SIM105 + - try: +6 + with contextlib.suppress(ValueError): +7 | math.sqrt(-1) + - except ValueError: + - pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap index 2373fbb0ee..88621f5d35 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_2.py.snap @@ -12,13 +12,12 @@ SIM105 [*] Use `contextlib.suppress(ValueError)` instead of `try`-`except`-`pass | |________^ | help: Replace with `contextlib.suppress(ValueError)` - -ℹ Unsafe fix -7 7 | -8 8 | -9 9 | # SIM105 -10 |-try: - 10 |+with contextlib.suppress(ValueError): -11 11 | foo() -12 |-except ValueError: -13 |- pass +7 | +8 | +9 | # SIM105 + - try: +10 + with contextlib.suppress(ValueError): +11 | foo() + - except ValueError: + - pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap index 86932241c7..78413d7d1f 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM105_SIM105_4.py.snap @@ -11,11 +11,10 @@ SIM105 [*] Use `contextlib.suppress(ImportError)` instead of `try`-`except`-`pas | |___________________________^ | help: Replace with `contextlib.suppress(ImportError)` - -ℹ Unsafe fix -1 1 | #!/usr/bin/env python -2 |-try: - 2 |+import contextlib - 3 |+with contextlib.suppress(ImportError): -3 4 | from __builtin__ import bytes, str, open, super, range, zip, round, int, pow, object, input -4 |-except ImportError: pass +1 | #!/usr/bin/env python + - try: +2 + import contextlib +3 + with contextlib.suppress(ImportError): +4 | from __builtin__ import bytes, str, open, super, range, zip, round, int, pow, object, input + - except ImportError: pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap index d9cf4f4c3c..1d00efe601 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM108_SIM108.py.snap @@ -14,17 +14,16 @@ SIM108 [*] Use ternary operator `b = c if a else d` instead of `if`-`else`-block 7 | # OK | help: Replace `if`-`else`-block with `b = c if a else d` - -ℹ Unsafe fix -1 1 | # SIM108 -2 |-if a: -3 |- b = c -4 |-else: -5 |- b = d - 2 |+b = c if a else d -6 3 | -7 4 | # OK -8 5 | b = c if a else d +1 | # SIM108 + - if a: + - b = c + - else: + - b = d +2 + b = c if a else d +3 | +4 | # OK +5 | b = c if a else d +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `b = 1 if a else 2` instead of `if`-`else`-block --> SIM108.py:30:5 @@ -38,19 +37,18 @@ SIM108 [*] Use ternary operator `b = 1 if a else 2` instead of `if`-`else`-block | |_____________^ | help: Replace `if`-`else`-block with `b = 1 if a else 2` - -ℹ Unsafe fix -27 27 | if True: -28 28 | pass -29 29 | else: -30 |- if a: -31 |- b = 1 -32 |- else: -33 |- b = 2 - 30 |+ b = 1 if a else 2 -34 31 | -35 32 | -36 33 | import sys +27 | if True: +28 | pass +29 | else: + - if a: + - b = 1 + - else: + - b = 2 +30 + b = 1 if a else 2 +31 | +32 | +33 | import sys +note: This is an unsafe fix and may change runtime behavior SIM108 Use ternary operator `abc = x if x > 0 else -x` instead of `if`-`else`-block --> SIM108.py:58:1 @@ -77,19 +75,18 @@ SIM108 [*] Use ternary operator `b = "cccccccccccccccccccccccccccccccccß" if a | |_____________________________________________^ | help: Replace `if`-`else`-block with `b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣"` - -ℹ Unsafe fix -79 79 | -80 80 | -81 81 | # SIM108 -82 |-if a: -83 |- b = "cccccccccccccccccccccccccccccccccß" -84 |-else: -85 |- b = "ddddddddddddddddddddddddddddddddd💣" - 82 |+b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣" -86 83 | -87 84 | -88 85 | # OK (too long) +79 | +80 | +81 | # SIM108 + - if a: + - b = "cccccccccccccccccccccccccccccccccß" + - else: + - b = "ddddddddddddddddddddddddddddddddd💣" +82 + b = "cccccccccccccccccccccccccccccccccß" if a else "ddddddddddddddddddddddddddddddddd💣" +83 | +84 | +85 | # OK (too long) +note: This is an unsafe fix and may change runtime behavior SIM108 Use ternary operator `exitcode = 0 if True else 1` instead of `if`-`else`-block --> SIM108.py:105:1 @@ -139,19 +136,18 @@ SIM108 [*] Use binary operator `z = cond or other_cond` instead of `if`-`else`-b 146 | # SIM108 - should suggest | help: Replace `if`-`else`-block with `z = cond or other_cond` - -ℹ Unsafe fix -138 138 | -139 139 | # SIM108 - should suggest -140 140 | # z = cond or other_cond -141 |-if cond: -142 |- z = cond -143 |-else: -144 |- z = other_cond - 141 |+z = cond or other_cond -145 142 | -146 143 | # SIM108 - should suggest -147 144 | # z = cond and other_cond +138 | +139 | # SIM108 - should suggest +140 | # z = cond or other_cond + - if cond: + - z = cond + - else: + - z = other_cond +141 + z = cond or other_cond +142 | +143 | # SIM108 - should suggest +144 | # z = cond and other_cond +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use binary operator `z = cond and other_cond` instead of `if`-`else`-block --> SIM108.py:148:1 @@ -167,19 +163,18 @@ SIM108 [*] Use binary operator `z = cond and other_cond` instead of `if`-`else`- 153 | # SIM108 - should suggest | help: Replace `if`-`else`-block with `z = cond and other_cond` - -ℹ Unsafe fix -145 145 | -146 146 | # SIM108 - should suggest -147 147 | # z = cond and other_cond -148 |-if not cond: -149 |- z = cond -150 |-else: -151 |- z = other_cond - 148 |+z = cond and other_cond -152 149 | -153 150 | # SIM108 - should suggest -154 151 | # z = not cond and other_cond +145 | +146 | # SIM108 - should suggest +147 | # z = cond and other_cond + - if not cond: + - z = cond + - else: + - z = other_cond +148 + z = cond and other_cond +149 | +150 | # SIM108 - should suggest +151 | # z = not cond and other_cond +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use binary operator `z = not cond and other_cond` instead of `if`-`else`-block --> SIM108.py:155:1 @@ -195,19 +190,18 @@ SIM108 [*] Use binary operator `z = not cond and other_cond` instead of `if`-`el 160 | # SIM108 does not suggest | help: Replace `if`-`else`-block with `z = not cond and other_cond` - -ℹ Unsafe fix -152 152 | -153 153 | # SIM108 - should suggest -154 154 | # z = not cond and other_cond -155 |-if cond: -156 |- z = not cond -157 |-else: -158 |- z = other_cond - 155 |+z = not cond and other_cond -159 156 | -160 157 | # SIM108 does not suggest -161 158 | # a binary option in these cases, +152 | +153 | # SIM108 - should suggest +154 | # z = not cond and other_cond + - if cond: + - z = not cond + - else: + - z = other_cond +155 + z = not cond and other_cond +156 | +157 | # SIM108 does not suggest +158 | # a binary option in these cases, +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `z = 1 if True else other` instead of `if`-`else`-block --> SIM108.py:167:1 @@ -223,19 +217,18 @@ SIM108 [*] Use ternary operator `z = 1 if True else other` instead of `if`-`else 172 | if False: | help: Replace `if`-`else`-block with `z = 1 if True else other` - -ℹ Unsafe fix -164 164 | # so, e.g. `True == 1`. -165 165 | # (Of course, these specific expressions -166 166 | # should be simplified for other reasons...) -167 |-if True: -168 |- z = 1 -169 |-else: -170 |- z = other - 167 |+z = 1 if True else other -171 168 | -172 169 | if False: -173 170 | z = 1 +164 | # so, e.g. `True == 1`. +165 | # (Of course, these specific expressions +166 | # should be simplified for other reasons...) + - if True: + - z = 1 + - else: + - z = other +167 + z = 1 if True else other +168 | +169 | if False: +170 | z = 1 +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `z = 1 if False else other` instead of `if`-`else`-block --> SIM108.py:172:1 @@ -251,19 +244,18 @@ SIM108 [*] Use ternary operator `z = 1 if False else other` instead of `if`-`els 177 | if 1: | help: Replace `if`-`else`-block with `z = 1 if False else other` - -ℹ Unsafe fix -169 169 | else: -170 170 | z = other -171 171 | -172 |-if False: -173 |- z = 1 -174 |-else: -175 |- z = other - 172 |+z = 1 if False else other -176 173 | -177 174 | if 1: -178 175 | z = True +169 | else: +170 | z = other +171 | + - if False: + - z = 1 + - else: + - z = other +172 + z = 1 if False else other +173 | +174 | if 1: +175 | z = True +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `z = True if 1 else other` instead of `if`-`else`-block --> SIM108.py:177:1 @@ -279,19 +271,18 @@ SIM108 [*] Use ternary operator `z = True if 1 else other` instead of `if`-`else 182 | # SIM108 does not suggest a binary option in this | help: Replace `if`-`else`-block with `z = True if 1 else other` - -ℹ Unsafe fix -174 174 | else: -175 175 | z = other -176 176 | -177 |-if 1: -178 |- z = True -179 |-else: -180 |- z = other - 177 |+z = True if 1 else other -181 178 | -182 179 | # SIM108 does not suggest a binary option in this -183 180 | # case, since we'd be reducing the number of calls +174 | else: +175 | z = other +176 | + - if 1: + - z = True + - else: + - z = other +177 + z = True if 1 else other +178 | +179 | # SIM108 does not suggest a binary option in this +180 | # case, since we'd be reducing the number of calls +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `z = foo() if foo() else other` instead of `if`-`else`-block --> SIM108.py:185:1 @@ -307,19 +298,18 @@ SIM108 [*] Use ternary operator `z = foo() if foo() else other` instead of `if`- 190 | # SIM108 does not suggest a binary option in this | help: Replace `if`-`else`-block with `z = foo() if foo() else other` - -ℹ Unsafe fix -182 182 | # SIM108 does not suggest a binary option in this -183 183 | # case, since we'd be reducing the number of calls -184 184 | # from Two to one. -185 |-if foo(): -186 |- z = foo() -187 |-else: -188 |- z = other - 185 |+z = foo() if foo() else other -189 186 | -190 187 | # SIM108 does not suggest a binary option in this -191 188 | # case, since we'd be reducing the number of calls +182 | # SIM108 does not suggest a binary option in this +183 | # case, since we'd be reducing the number of calls +184 | # from Two to one. + - if foo(): + - z = foo() + - else: + - z = other +185 + z = foo() if foo() else other +186 | +187 | # SIM108 does not suggest a binary option in this +188 | # case, since we'd be reducing the number of calls +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `z = not foo() if foo() else other` instead of `if`-`else`-block --> SIM108.py:193:1 @@ -333,19 +323,18 @@ SIM108 [*] Use ternary operator `z = not foo() if foo() else other` instead of ` | |_____________^ | help: Replace `if`-`else`-block with `z = not foo() if foo() else other` - -ℹ Unsafe fix -190 190 | # SIM108 does not suggest a binary option in this -191 191 | # case, since we'd be reducing the number of calls -192 192 | # from Two to one. -193 |-if foo(): -194 |- z = not foo() -195 |-else: -196 |- z = other - 193 |+z = not foo() if foo() else other -197 194 | -198 195 | -199 196 | # These two cases double as tests for f-string quote preservation. The first +190 | # SIM108 does not suggest a binary option in this +191 | # case, since we'd be reducing the number of calls +192 | # from Two to one. + - if foo(): + - z = not foo() + - else: + - z = other +193 + z = not foo() if foo() else other +194 | +195 | +196 | # These two cases double as tests for f-string quote preservation. The first +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `var = "str" if cond else f"{first}-{second}"` instead of `if`-`else`-block --> SIM108.py:202:1 @@ -361,19 +350,18 @@ SIM108 [*] Use ternary operator `var = "str" if cond else f"{first}-{second}"` i 207 | if cond: | help: Replace `if`-`else`-block with `var = "str" if cond else f"{first}-{second}"` - -ℹ Unsafe fix -199 199 | # These two cases double as tests for f-string quote preservation. The first -200 200 | # f-string should preserve its double quotes, and the second should preserve -201 201 | # single quotes -202 |-if cond: -203 |- var = "str" -204 |-else: -205 |- var = f"{first}-{second}" - 202 |+var = "str" if cond else f"{first}-{second}" -206 203 | -207 204 | if cond: -208 205 | var = "str" +199 | # These two cases double as tests for f-string quote preservation. The first +200 | # f-string should preserve its double quotes, and the second should preserve +201 | # single quotes + - if cond: + - var = "str" + - else: + - var = f"{first}-{second}" +202 + var = "str" if cond else f"{first}-{second}" +203 | +204 | if cond: +205 | var = "str" +note: This is an unsafe fix and may change runtime behavior SIM108 [*] Use ternary operator `var = "str" if cond else f'{first}-{second}'` instead of `if`-`else`-block --> SIM108.py:207:1 @@ -387,13 +375,12 @@ SIM108 [*] Use ternary operator `var = "str" if cond else f'{first}-{second}'` i | |_____________________________^ | help: Replace `if`-`else`-block with `var = "str" if cond else f'{first}-{second}'` - -ℹ Unsafe fix -204 204 | else: -205 205 | var = f"{first}-{second}" -206 206 | -207 |-if cond: -208 |- var = "str" -209 |-else: -210 |- var = f'{first}-{second}' - 207 |+var = "str" if cond else f'{first}-{second}' +204 | else: +205 | var = f"{first}-{second}" +206 | + - if cond: + - var = "str" + - else: + - var = f'{first}-{second}' +207 + var = "str" if cond else f'{first}-{second}' +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap index 84e84015c3..4ea4815d52 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM109_SIM109.py.snap @@ -10,14 +10,13 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons 3 | d | help: Replace with `a in (b, c)` - -ℹ Unsafe fix -1 1 | # SIM109 -2 |-if a == b or a == c: - 2 |+if a in (b, c): -3 3 | d -4 4 | -5 5 | # SIM109 +1 | # SIM109 + - if a == b or a == c: +2 + if a in (b, c): +3 | d +4 | +5 | # SIM109 +note: This is an unsafe fix and may change runtime behavior SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons --> SIM109.py:6:5 @@ -28,16 +27,15 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons 7 | d | help: Replace with `a in (b, c)` - -ℹ Unsafe fix -3 3 | d -4 4 | -5 5 | # SIM109 -6 |-if (a == b or a == c) and None: - 6 |+if (a in (b, c)) and None: -7 7 | d -8 8 | -9 9 | # SIM109 +3 | d +4 | +5 | # SIM109 + - if (a == b or a == c) and None: +6 + if (a in (b, c)) and None: +7 | d +8 | +9 | # SIM109 +note: This is an unsafe fix and may change runtime behavior SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons --> SIM109.py:10:4 @@ -48,16 +46,15 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons 11 | d | help: Replace with `a in (b, c)` - -ℹ Unsafe fix -7 7 | d -8 8 | -9 9 | # SIM109 -10 |-if a == b or a == c or None: - 10 |+if a in (b, c) or None: -11 11 | d -12 12 | -13 13 | # SIM109 +7 | d +8 | +9 | # SIM109 + - if a == b or a == c or None: +10 + if a in (b, c) or None: +11 | d +12 | +13 | # SIM109 +note: This is an unsafe fix and may change runtime behavior SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons --> SIM109.py:14:4 @@ -68,13 +65,12 @@ SIM109 [*] Use `a in (b, c)` instead of multiple equality comparisons 15 | d | help: Replace with `a in (b, c)` - -ℹ Unsafe fix -11 11 | d -12 12 | -13 13 | # SIM109 -14 |-if a == b or None or a == c: - 14 |+if a in (b, c) or None: -15 15 | d -16 16 | -17 17 | # OK +11 | d +12 | +13 | # SIM109 + - if a == b or None or a == c: +14 + if a in (b, c) or None: +15 | d +16 | +17 | # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap index 742bd1fc86..7846bc35f2 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM110.py.snap @@ -13,18 +13,17 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop | |________________^ | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -1 1 | def f(): -2 2 | # SIM110 -3 |- for x in iterable: -4 |- if check(x): -5 |- return True -6 |- return False - 3 |+ return any(check(x) for x in iterable) -7 4 | -8 5 | -9 6 | def f(): +1 | def f(): +2 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - return False +3 + return any(check(x) for x in iterable) +4 | +5 | +6 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM110.py:25:5 @@ -38,19 +37,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo | |_______________^ | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -22 22 | -23 23 | def f(): -24 24 | # SIM111 -25 |- for x in iterable: -26 |- if check(x): -27 |- return False -28 |- return True - 25 |+ return all(not check(x) for x in iterable) -29 26 | -30 27 | -31 28 | def f(): +22 | +23 | def f(): +24 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - return True +25 + return all(not check(x) for x in iterable) +26 | +27 | +28 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loop --> SIM110.py:33:5 @@ -64,19 +62,18 @@ SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loo | |_______________^ | help: Replace with `return all(x.is_empty() for x in iterable)` - -ℹ Unsafe fix -30 30 | -31 31 | def f(): -32 32 | # SIM111 -33 |- for x in iterable: -34 |- if not x.is_empty(): -35 |- return False -36 |- return True - 33 |+ return all(x.is_empty() for x in iterable) -37 34 | -38 35 | -39 36 | def f(): +30 | +31 | def f(): +32 | # SIM111 + - for x in iterable: + - if not x.is_empty(): + - return False + - return True +33 + return all(x.is_empty() for x in iterable) +34 | +35 | +36 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop --> SIM110.py:55:5 @@ -91,20 +88,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop | |____________________^ | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -52 52 | -53 53 | def f(): -54 54 | # SIM110 -55 |- for x in iterable: -56 |- if check(x): -57 |- return True -58 |- else: -59 |- return False - 55 |+ return any(check(x) for x in iterable) -60 56 | -61 57 | -62 58 | def f(): +52 | +53 | def f(): +54 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - else: + - return False +55 + return any(check(x) for x in iterable) +56 | +57 | +58 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM110.py:64:5 @@ -119,20 +115,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo | |___________________^ | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -61 61 | -62 62 | def f(): -63 63 | # SIM111 -64 |- for x in iterable: -65 |- if check(x): -66 |- return False -67 |- else: -68 |- return True - 64 |+ return all(not check(x) for x in iterable) -69 65 | -70 66 | -71 67 | def f(): +61 | +62 | def f(): +63 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - else: + - return True +64 + return all(not check(x) for x in iterable) +65 | +66 | +67 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop --> SIM110.py:73:5 @@ -148,20 +143,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop 78 | return True | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -70 70 | -71 71 | def f(): -72 72 | # SIM110 -73 |- for x in iterable: -74 |- if check(x): -75 |- return True -76 |- else: -77 |- return False - 73 |+ return any(check(x) for x in iterable) -78 74 | return True -79 75 | -80 76 | +70 | +71 | def f(): +72 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - else: + - return False +73 + return any(check(x) for x in iterable) +74 | return True +75 | +76 | +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM110.py:83:5 @@ -177,20 +171,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo 88 | return False | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -80 80 | -81 81 | def f(): -82 82 | # SIM111 -83 |- for x in iterable: -84 |- if check(x): -85 |- return False -86 |- else: -87 |- return True - 83 |+ return all(not check(x) for x in iterable) -88 84 | return False -89 85 | -90 86 | +80 | +81 | def f(): +82 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - else: + - return True +83 + return all(not check(x) for x in iterable) +84 | return False +85 | +86 | +note: This is an unsafe fix and may change runtime behavior SIM110 Use `return any(check(x) for x in iterable)` instead of `for` loop --> SIM110.py:124:5 @@ -229,19 +222,18 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop | |________________^ | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -141 141 | x = 1 -142 142 | -143 143 | # SIM110 -144 |- for x in iterable: -145 |- if check(x): -146 |- return True -147 |- return False - 144 |+ return any(check(x) for x in iterable) -148 145 | -149 146 | -150 147 | def f(): +141 | x = 1 +142 | +143 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - return False +144 + return any(check(x) for x in iterable) +145 | +146 | +147 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM110.py:154:5 @@ -254,19 +246,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo | |_______________^ | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -151 151 | x = 1 -152 152 | -153 153 | # SIM111 -154 |- for x in iterable: -155 |- if check(x): -156 |- return False -157 |- return True - 154 |+ return all(not check(x) for x in iterable) -158 155 | -159 156 | -160 157 | def f(): +151 | x = 1 +152 | +153 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - return True +154 + return all(not check(x) for x in iterable) +155 | +156 | +157 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ")` instead of `for` loop --> SIM110.py:162:5 @@ -280,19 +271,18 @@ SIM110 [*] Use `return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ90 | |________________^ | help: Replace with `return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ")` - -ℹ Unsafe fix -159 159 | -160 160 | def f(): -161 161 | # SIM110 -162 |- for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ": -163 |- if x.isdigit(): -164 |- return True -165 |- return False - 162 |+ return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ") -166 163 | -167 164 | -168 165 | def f(): +159 | +160 | def f(): +161 | # SIM110 + - for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ": + - if x.isdigit(): + - return True + - return False +162 + return any(x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ") +163 | +164 | +165 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop --> SIM110.py:184:5 @@ -308,19 +298,18 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop 189 | async def f(): | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -181 181 | -182 182 | async def f(): -183 183 | # SIM110 -184 |- for x in iterable: -185 |- if check(x): -186 |- return True -187 |- return False - 184 |+ return any(check(x) for x in iterable) -188 185 | -189 186 | async def f(): -190 187 | # SIM110 +181 | +182 | async def f(): +183 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - return False +184 + return any(check(x) for x in iterable) +185 | +186 | async def f(): +187 | # SIM110 +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return any(check(x) for x in await iterable)` instead of `for` loop --> SIM110.py:191:5 @@ -336,16 +325,15 @@ SIM110 [*] Use `return any(check(x) for x in await iterable)` instead of `for` l 196 | def f(): | help: Replace with `return any(check(x) for x in await iterable)` - -ℹ Unsafe fix -188 188 | -189 189 | async def f(): -190 190 | # SIM110 -191 |- for x in await iterable: -192 |- if check(x): -193 |- return True -194 |- return False - 191 |+ return any(check(x) for x in await iterable) -195 192 | -196 193 | def f(): -197 194 | # OK (can't turn this into any() because the yield would end up inside a genexp) +188 | +189 | async def f(): +190 | # SIM110 + - for x in await iterable: + - if check(x): + - return True + - return False +191 + return any(check(x) for x in await iterable) +192 | +193 | def f(): +194 | # OK (can't turn this into any() because the yield would end up inside a genexp) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap index a8c0b4d02c..8143e3cb2a 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM110_SIM111.py.snap @@ -13,18 +13,17 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop | |________________^ | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -1 1 | def f(): -2 2 | # SIM110 -3 |- for x in iterable: -4 |- if check(x): -5 |- return True -6 |- return False - 3 |+ return any(check(x) for x in iterable) -7 4 | -8 5 | -9 6 | def f(): +1 | def f(): +2 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - return False +3 + return any(check(x) for x in iterable) +4 | +5 | +6 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM111.py:25:5 @@ -38,19 +37,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo | |_______________^ | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -22 22 | -23 23 | def f(): -24 24 | # SIM111 -25 |- for x in iterable: -26 |- if check(x): -27 |- return False -28 |- return True - 25 |+ return all(not check(x) for x in iterable) -29 26 | -30 27 | -31 28 | def f(): +22 | +23 | def f(): +24 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - return True +25 + return all(not check(x) for x in iterable) +26 | +27 | +28 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loop --> SIM111.py:33:5 @@ -64,19 +62,18 @@ SIM110 [*] Use `return all(x.is_empty() for x in iterable)` instead of `for` loo | |_______________^ | help: Replace with `return all(x.is_empty() for x in iterable)` - -ℹ Unsafe fix -30 30 | -31 31 | def f(): -32 32 | # SIM111 -33 |- for x in iterable: -34 |- if not x.is_empty(): -35 |- return False -36 |- return True - 33 |+ return all(x.is_empty() for x in iterable) -37 34 | -38 35 | -39 36 | def f(): +30 | +31 | def f(): +32 | # SIM111 + - for x in iterable: + - if not x.is_empty(): + - return False + - return True +33 + return all(x.is_empty() for x in iterable) +34 | +35 | +36 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop --> SIM111.py:55:5 @@ -91,20 +88,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop | |____________________^ | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -52 52 | -53 53 | def f(): -54 54 | # SIM110 -55 |- for x in iterable: -56 |- if check(x): -57 |- return True -58 |- else: -59 |- return False - 55 |+ return any(check(x) for x in iterable) -60 56 | -61 57 | -62 58 | def f(): +52 | +53 | def f(): +54 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - else: + - return False +55 + return any(check(x) for x in iterable) +56 | +57 | +58 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM111.py:64:5 @@ -119,20 +115,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo | |___________________^ | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -61 61 | -62 62 | def f(): -63 63 | # SIM111 -64 |- for x in iterable: -65 |- if check(x): -66 |- return False -67 |- else: -68 |- return True - 64 |+ return all(not check(x) for x in iterable) -69 65 | -70 66 | -71 67 | def f(): +61 | +62 | def f(): +63 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - else: + - return True +64 + return all(not check(x) for x in iterable) +65 | +66 | +67 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop --> SIM111.py:73:5 @@ -148,20 +143,19 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop 78 | return True | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -70 70 | -71 71 | def f(): -72 72 | # SIM110 -73 |- for x in iterable: -74 |- if check(x): -75 |- return True -76 |- else: -77 |- return False - 73 |+ return any(check(x) for x in iterable) -78 74 | return True -79 75 | -80 76 | +70 | +71 | def f(): +72 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - else: + - return False +73 + return any(check(x) for x in iterable) +74 | return True +75 | +76 | +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM111.py:83:5 @@ -177,20 +171,19 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo 88 | return False | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -80 80 | -81 81 | def f(): -82 82 | # SIM111 -83 |- for x in iterable: -84 |- if check(x): -85 |- return False -86 |- else: -87 |- return True - 83 |+ return all(not check(x) for x in iterable) -88 84 | return False -89 85 | -90 86 | +80 | +81 | def f(): +82 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - else: + - return True +83 + return all(not check(x) for x in iterable) +84 | return False +85 | +86 | +note: This is an unsafe fix and may change runtime behavior SIM110 Use `return any(check(x) for x in iterable)` instead of `for` loop --> SIM111.py:124:5 @@ -229,19 +222,18 @@ SIM110 [*] Use `return any(check(x) for x in iterable)` instead of `for` loop | |________________^ | help: Replace with `return any(check(x) for x in iterable)` - -ℹ Unsafe fix -141 141 | x = 1 -142 142 | -143 143 | # SIM110 -144 |- for x in iterable: -145 |- if check(x): -146 |- return True -147 |- return False - 144 |+ return any(check(x) for x in iterable) -148 145 | -149 146 | -150 147 | def f(): +141 | x = 1 +142 | +143 | # SIM110 + - for x in iterable: + - if check(x): + - return True + - return False +144 + return any(check(x) for x in iterable) +145 | +146 | +147 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loop --> SIM111.py:154:5 @@ -254,19 +246,18 @@ SIM110 [*] Use `return all(not check(x) for x in iterable)` instead of `for` loo | |_______________^ | help: Replace with `return all(not check(x) for x in iterable)` - -ℹ Unsafe fix -151 151 | x = 1 -152 152 | -153 153 | # SIM111 -154 |- for x in iterable: -155 |- if check(x): -156 |- return False -157 |- return True - 154 |+ return all(not check(x) for x in iterable) -158 155 | -159 156 | -160 157 | def f(): +151 | x = 1 +152 | +153 | # SIM111 + - for x in iterable: + - if check(x): + - return False + - return True +154 + return all(not check(x) for x in iterable) +155 | +156 | +157 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(x in y for x in iterable)` instead of `for` loop --> SIM111.py:162:5 @@ -280,19 +271,18 @@ SIM110 [*] Use `return all(x in y for x in iterable)` instead of `for` loop | |_______________^ | help: Replace with `return all(x in y for x in iterable)` - -ℹ Unsafe fix -159 159 | -160 160 | def f(): -161 161 | # SIM111 -162 |- for x in iterable: -163 |- if x not in y: -164 |- return False -165 |- return True - 162 |+ return all(x in y for x in iterable) -166 163 | -167 164 | -168 165 | def f(): +159 | +160 | def f(): +161 | # SIM111 + - for x in iterable: + - if x not in y: + - return False + - return True +162 + return all(x in y for x in iterable) +163 | +164 | +165 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(x <= y for x in iterable)` instead of `for` loop --> SIM111.py:170:5 @@ -306,19 +296,18 @@ SIM110 [*] Use `return all(x <= y for x in iterable)` instead of `for` loop | |_______________^ | help: Replace with `return all(x <= y for x in iterable)` - -ℹ Unsafe fix -167 167 | -168 168 | def f(): -169 169 | # SIM111 -170 |- for x in iterable: -171 |- if x > y: -172 |- return False -173 |- return True - 170 |+ return all(x <= y for x in iterable) -174 171 | -175 172 | -176 173 | def f(): +167 | +168 | def f(): +169 | # SIM111 + - for x in iterable: + - if x > y: + - return False + - return True +170 + return all(x <= y for x in iterable) +171 | +172 | +173 | def f(): +note: This is an unsafe fix and may change runtime behavior SIM110 [*] Use `return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9")` instead of `for` loop --> SIM111.py:178:5 @@ -332,16 +321,15 @@ SIM110 [*] Use `return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2 | |_______________^ | help: Replace with `return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9")` - -ℹ Unsafe fix -175 175 | -176 176 | def f(): -177 177 | # SIM111 -178 |- for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9": -179 |- if x.isdigit(): -180 |- return False -181 |- return True - 178 |+ return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9") -182 179 | -183 180 | -184 181 | def f(): +175 | +176 | def f(): +177 | # SIM111 + - for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9": + - if x.isdigit(): + - return False + - return True +178 + return all(not x.isdigit() for x in "012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9") +179 | +180 | +181 | def f(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap index 2df4110d7c..aa748af00a 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM112_SIM112.py.snap @@ -11,16 +11,15 @@ SIM112 [*] Use capitalized environment variable `FOO` instead of `foo` 6 | os.environ.get('foo') | help: Replace `foo` with `FOO` - -ℹ Unsafe fix -1 1 | import os -2 2 | -3 3 | # Bad -4 |-os.environ['foo'] - 4 |+os.environ['FOO'] -5 5 | -6 6 | os.environ.get('foo') -7 7 | +1 | import os +2 | +3 | # Bad + - os.environ['foo'] +4 + os.environ['FOO'] +5 | +6 | os.environ.get('foo') +7 | +note: This is an unsafe fix and may change runtime behavior SIM112 Use capitalized environment variable `FOO` instead of `foo` --> SIM112.py:6:16 @@ -81,16 +80,15 @@ SIM112 [*] Use capitalized environment variable `FOO` instead of `foo` 16 | if env := os.environ.get('foo'): | help: Replace `foo` with `FOO` - -ℹ Unsafe fix -11 11 | -12 12 | env = os.environ.get('foo') -13 13 | -14 |-env = os.environ['foo'] - 14 |+env = os.environ['FOO'] -15 15 | -16 16 | if env := os.environ.get('foo'): -17 17 | pass +11 | +12 | env = os.environ.get('foo') +13 | + - env = os.environ['foo'] +14 + env = os.environ['FOO'] +15 | +16 | if env := os.environ.get('foo'): +17 | pass +note: This is an unsafe fix and may change runtime behavior SIM112 Use capitalized environment variable `FOO` instead of `foo` --> SIM112.py:16:26 @@ -113,13 +111,12 @@ SIM112 [*] Use capitalized environment variable `FOO` instead of `foo` 20 | pass | help: Replace `foo` with `FOO` - -ℹ Unsafe fix -16 16 | if env := os.environ.get('foo'): -17 17 | pass -18 18 | -19 |-if env := os.environ['foo']: - 19 |+if env := os.environ['FOO']: -20 20 | pass -21 21 | -22 22 | +16 | if env := os.environ.get('foo'): +17 | pass +18 | + - if env := os.environ['foo']: +19 + if env := os.environ['FOO']: +20 | pass +21 | +22 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap index d5c11a5859..45d6aad6bf 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM114_SIM114.py.snap @@ -14,16 +14,14 @@ SIM114 [*] Combine `if` branches using logical `or` operator 7 | if a: # we preserve comments, too! | help: Combine `if` branches - -ℹ Safe fix -1 1 | # Errors -2 |-if a: -3 |- b -4 |-elif c: - 2 |+if a or c: -5 3 | b -6 4 | -7 5 | if a: # we preserve comments, too! +1 | # Errors + - if a: + - b + - elif c: +2 + if a or c: +3 | b +4 | +5 | if a: # we preserve comments, too! SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:7:1 @@ -39,18 +37,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator 12 | if x == 1: | help: Combine `if` branches - -ℹ Safe fix -4 4 | elif c: -5 5 | b -6 6 | -7 |-if a: # we preserve comments, too! -8 |- b -9 |-elif c: # but not on the second branch - 7 |+if a or c: # we preserve comments, too! -10 8 | b -11 9 | -12 10 | if x == 1: +4 | elif c: +5 | b +6 | + - if a: # we preserve comments, too! + - b + - elif c: # but not on the second branch +7 + if a or c: # we preserve comments, too! +8 | b +9 | +10 | if x == 1: SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:12:1 @@ -68,19 +64,17 @@ SIM114 [*] Combine `if` branches using logical `or` operator 19 | if x == 1: | help: Combine `if` branches - -ℹ Safe fix -9 9 | elif c: # but not on the second branch -10 10 | b -11 11 | -12 |-if x == 1: -13 |- for _ in range(20): -14 |- print("hello") -15 |-elif x == 2: - 12 |+if x == 1 or x == 2: -16 13 | for _ in range(20): -17 14 | print("hello") -18 15 | +9 | elif c: # but not on the second branch +10 | b +11 | + - if x == 1: + - for _ in range(20): + - print("hello") + - elif x == 2: +12 + if x == 1 or x == 2: +13 | for _ in range(20): +14 | print("hello") +15 | SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:19:1 @@ -100,20 +94,18 @@ SIM114 [*] Combine `if` branches using logical `or` operator 28 | if x == 1: | help: Combine `if` branches - -ℹ Safe fix -16 16 | for _ in range(20): -17 17 | print("hello") -18 18 | -19 |-if x == 1: -20 |- if True: -21 |- for _ in range(20): -22 |- print("hello") -23 |-elif x == 2: - 19 |+if x == 1 or x == 2: -24 20 | if True: -25 21 | for _ in range(20): -26 22 | print("hello") +16 | for _ in range(20): +17 | print("hello") +18 | + - if x == 1: + - if True: + - for _ in range(20): + - print("hello") + - elif x == 2: +19 + if x == 1 or x == 2: +20 | if True: +21 | for _ in range(20): +22 | print("hello") SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:28:1 @@ -139,23 +131,21 @@ SIM114 [*] Combine `if` branches using logical `or` operator 43 | if ( | help: Combine `if` branches - -ℹ Safe fix -25 25 | for _ in range(20): -26 26 | print("hello") -27 27 | -28 |-if x == 1: -29 |- if True: -30 |- for _ in range(20): -31 |- print("hello") -32 |- elif False: -33 |- for _ in range(20): -34 |- print("hello") -35 |-elif x == 2: - 28 |+if x == 1 or x == 2: -36 29 | if True: -37 30 | for _ in range(20): -38 31 | print("hello") +25 | for _ in range(20): +26 | print("hello") +27 | + - if x == 1: + - if True: + - for _ in range(20): + - print("hello") + - elif False: + - for _ in range(20): + - print("hello") + - elif x == 2: +28 + if x == 1 or x == 2: +29 | if True: +30 | for _ in range(20): +31 | print("hello") SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:29:5 @@ -172,19 +162,17 @@ SIM114 [*] Combine `if` branches using logical `or` operator 36 | if True: | help: Combine `if` branches - -ℹ Safe fix -26 26 | print("hello") -27 27 | -28 28 | if x == 1: -29 |- if True: -30 |- for _ in range(20): -31 |- print("hello") -32 |- elif False: - 29 |+ if True or False: -33 30 | for _ in range(20): -34 31 | print("hello") -35 32 | elif x == 2: +26 | print("hello") +27 | +28 | if x == 1: + - if True: + - for _ in range(20): + - print("hello") + - elif False: +29 + if True or False: +30 | for _ in range(20): +31 | print("hello") +32 | elif x == 2: SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:36:5 @@ -202,19 +190,17 @@ SIM114 [*] Combine `if` branches using logical `or` operator 43 | if ( | help: Combine `if` branches - -ℹ Safe fix -33 33 | for _ in range(20): -34 34 | print("hello") -35 35 | elif x == 2: -36 |- if True: -37 |- for _ in range(20): -38 |- print("hello") -39 |- elif False: - 36 |+ if True or False: -40 37 | for _ in range(20): -41 38 | print("hello") -42 39 | +33 | for _ in range(20): +34 | print("hello") +35 | elif x == 2: + - if True: + - for _ in range(20): + - print("hello") + - elif False: +36 + if True or False: +37 | for _ in range(20): +38 | print("hello") +39 | SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:43:1 @@ -245,18 +231,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator 63 | if result.eofs == "O": | help: Combine `if` branches - -ℹ Safe fix -55 55 | and i == 12 -56 56 | and j == 13 -57 57 | and k == 14 -58 |-): -59 |- pass -60 |-elif 1 == 2: - 58 |+) or 1 == 2: -61 59 | pass -62 60 | -63 61 | if result.eofs == "O": +55 | and i == 12 +56 | and j == 13 +57 | and k == 14 + - ): + - pass + - elif 1 == 2: +58 + ) or 1 == 2: +59 | pass +60 | +61 | if result.eofs == "O": SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:67:1 @@ -272,18 +256,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator 72 | errors = 1 | help: Combine `if` branches - -ℹ Safe fix -64 64 | pass -65 65 | elif result.eofs == "S": -66 66 | skipped = 1 -67 |-elif result.eofs == "F": -68 |- errors = 1 -69 |-elif result.eofs == "E": - 67 |+elif result.eofs == "F" or result.eofs == "E": -70 68 | errors = 1 -71 69 | elif result.eofs == "X": -72 70 | errors = 1 +64 | pass +65 | elif result.eofs == "S": +66 | skipped = 1 + - elif result.eofs == "F": + - errors = 1 + - elif result.eofs == "E": +67 + elif result.eofs == "F" or result.eofs == "E": +68 | errors = 1 +69 | elif result.eofs == "X": +70 | errors = 1 SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:69:1 @@ -299,18 +281,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator 74 | errors = 1 | help: Combine `if` branches - -ℹ Safe fix -66 66 | skipped = 1 -67 67 | elif result.eofs == "F": -68 68 | errors = 1 -69 |-elif result.eofs == "E": -70 |- errors = 1 -71 |-elif result.eofs == "X": - 69 |+elif result.eofs == "E" or result.eofs == "X": -72 70 | errors = 1 -73 71 | elif result.eofs == "C": -74 72 | errors = 1 +66 | skipped = 1 +67 | elif result.eofs == "F": +68 | errors = 1 + - elif result.eofs == "E": + - errors = 1 + - elif result.eofs == "X": +69 + elif result.eofs == "E" or result.eofs == "X": +70 | errors = 1 +71 | elif result.eofs == "C": +72 | errors = 1 SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:71:1 @@ -324,18 +304,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator | |______________^ | help: Combine `if` branches - -ℹ Safe fix -68 68 | errors = 1 -69 69 | elif result.eofs == "E": -70 70 | errors = 1 -71 |-elif result.eofs == "X": -72 |- errors = 1 -73 |-elif result.eofs == "C": - 71 |+elif result.eofs == "X" or result.eofs == "C": -74 72 | errors = 1 -75 73 | -76 74 | +68 | errors = 1 +69 | elif result.eofs == "E": +70 | errors = 1 + - elif result.eofs == "X": + - errors = 1 + - elif result.eofs == "C": +71 + elif result.eofs == "X" or result.eofs == "C": +72 | errors = 1 +73 | +74 | SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:118:5 @@ -351,18 +329,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator 123 | return 4 | help: Combine `if` branches - -ℹ Safe fix -115 115 | def func(): -116 116 | a = True -117 117 | b = False -118 |- if a > b: # end-of-line -119 |- return 3 -120 |- elif a == b: - 118 |+ if a > b or a == b: # end-of-line -121 119 | return 3 -122 120 | elif a < b: # end-of-line -123 121 | return 4 +115 | def func(): +116 | a = True +117 | b = False + - if a > b: # end-of-line + - return 3 + - elif a == b: +118 + if a > b or a == b: # end-of-line +119 | return 3 +120 | elif a < b: # end-of-line +121 | return 4 SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:122:5 @@ -376,18 +352,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator | |________________^ | help: Combine `if` branches - -ℹ Safe fix -119 119 | return 3 -120 120 | elif a == b: -121 121 | return 3 -122 |- elif a < b: # end-of-line -123 |- return 4 -124 |- elif b is None: - 122 |+ elif a < b or b is None: # end-of-line -125 123 | return 4 -126 124 | -127 125 | +119 | return 3 +120 | elif a == b: +121 | return 3 + - elif a < b: # end-of-line + - return 4 + - elif b is None: +122 + elif a < b or b is None: # end-of-line +123 | return 4 +124 | +125 | SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:132:5 @@ -401,18 +375,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator | |________________^ | help: Combine `if` branches - -ℹ Safe fix -129 129 | """Ensure that the named expression is parenthesized when merged.""" -130 130 | a = True -131 131 | b = False -132 |- if a > b: # end-of-line -133 |- return 3 -134 |- elif a := 1: - 132 |+ if a > b or (a := 1): # end-of-line -135 133 | return 3 -136 134 | -137 135 | +129 | """Ensure that the named expression is parenthesized when merged.""" +130 | a = True +131 | b = False + - if a > b: # end-of-line + - return 3 + - elif a := 1: +132 + if a > b or (a := 1): # end-of-line +133 | return 3 +134 | +135 | SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:138:1 @@ -424,18 +396,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator | |_____^ | help: Combine `if` branches - -ℹ Safe fix -135 135 | return 3 -136 136 | -137 137 | -138 |-if a: # we preserve comments, too! -139 |- b -140 |-elif c: # but not on the second branch - 138 |+if a or c: # we preserve comments, too! -141 139 | b -142 140 | -143 141 | +135 | return 3 +136 | +137 | + - if a: # we preserve comments, too! + - b + - elif c: # but not on the second branch +138 + if a or c: # we preserve comments, too! +139 | b +140 | +141 | SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:144:1 @@ -445,17 +415,15 @@ SIM114 [*] Combine `if` branches using logical `or` operator | |_________^ | help: Combine `if` branches - -ℹ Safe fix -141 141 | b -142 142 | -143 143 | -144 |-if a: b # here's a comment -145 |-elif c: b - 144 |+if a or c: b # here's a comment -146 145 | -147 146 | -148 147 | if(x > 200): pass +141 | b +142 | +143 | + - if a: b # here's a comment + - elif c: b +144 + if a or c: b # here's a comment +145 | +146 | +147 | if(x > 200): pass SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:148:1 @@ -466,18 +434,16 @@ SIM114 [*] Combine `if` branches using logical `or` operator | |________^ | help: Combine `if` branches - -ℹ Safe fix -145 145 | elif c: b -146 146 | -147 147 | -148 |-if(x > 200): pass -149 |-elif(100 < x and x < 200 and 300 < y and y < 800): -150 |- pass - 148 |+if(x > 200) or (100 < x and x < 200 and 300 < y and y < 800): pass -151 149 | -152 150 | -153 151 | # See: https://github.com/astral-sh/ruff/issues/12732 +145 | elif c: b +146 | +147 | + - if(x > 200): pass + - elif(100 < x and x < 200 and 300 < y and y < 800): + - pass +148 + if(x > 200) or (100 < x and x < 200 and 300 < y and y < 800): pass +149 | +150 | +151 | # See: https://github.com/astral-sh/ruff/issues/12732 SIM114 [*] Combine `if` branches using logical `or` operator --> SIM114.py:154:1 @@ -492,15 +458,13 @@ SIM114 [*] Combine `if` branches using logical `or` operator 159 | print(2) | help: Combine `if` branches - -ℹ Safe fix -151 151 | -152 152 | -153 153 | # See: https://github.com/astral-sh/ruff/issues/12732 -154 |-if False if True else False: -155 |- print(1) -156 |-elif True: - 154 |+if (False if True else False) or True: -157 155 | print(1) -158 156 | else: -159 157 | print(2) +151 | +152 | +153 | # See: https://github.com/astral-sh/ruff/issues/12732 + - if False if True else False: + - print(1) + - elif True: +154 + if (False if True else False) or True: +155 | print(1) +156 | else: +157 | print(2) diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap index 5669f91959..f6f16d932a 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM117_SIM117.py.snap @@ -11,17 +11,16 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 4 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -1 1 | # SIM117 -2 |-with A() as a: -3 |- with B() as b: -4 |- print("hello") - 2 |+with A() as a, B() as b: - 3 |+ print("hello") -5 4 | -6 5 | # SIM117 -7 6 | with A(): +1 | # SIM117 + - with A() as a: + - with B() as b: + - print("hello") +2 + with A() as a, B() as b: +3 + print("hello") +4 | +5 | # SIM117 +6 | with A(): +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:7:1 @@ -34,21 +33,20 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 10 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -4 4 | print("hello") -5 5 | -6 6 | # SIM117 -7 |-with A(): -8 |- with B(): -9 |- with C(): -10 |- print("hello") - 7 |+with A(), B(): - 8 |+ with C(): - 9 |+ print("hello") -11 10 | -12 11 | # SIM117 -13 12 | with A() as a: +4 | print("hello") +5 | +6 | # SIM117 + - with A(): + - with B(): + - with C(): + - print("hello") +7 + with A(), B(): +8 + with C(): +9 + print("hello") +10 | +11 | # SIM117 +12 | with A() as a: +note: This is an unsafe fix and may change runtime behavior SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:13:1 @@ -73,21 +71,20 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 22 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -16 16 | print("hello") -17 17 | -18 18 | # SIM117 -19 |-with A() as a: -20 |- with B() as b: -21 |- # Fixable due to placement of this comment. -22 |- print("hello") - 19 |+with A() as a, B() as b: - 20 |+ # Fixable due to placement of this comment. - 21 |+ print("hello") -23 22 | -24 23 | # OK -25 24 | with A() as a: +16 | print("hello") +17 | +18 | # SIM117 + - with A() as a: + - with B() as b: + - # Fixable due to placement of this comment. + - print("hello") +19 + with A() as a, B() as b: +20 + # Fixable due to placement of this comment. +21 + print("hello") +22 | +23 | # OK +24 | with A() as a: +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:47:1 @@ -99,19 +96,18 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 49 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -44 44 | print("hello") -45 45 | -46 46 | # SIM117 -47 |-async with A() as a: -48 |- async with B() as b: -49 |- print("hello") - 47 |+async with A() as a, B() as b: - 48 |+ print("hello") -50 49 | -51 50 | while True: -52 51 | # SIM117 +44 | print("hello") +45 | +46 | # SIM117 + - async with A() as a: + - async with B() as b: + - print("hello") +47 + async with A() as a, B() as b: +48 + print("hello") +49 | +50 | while True: +51 | # SIM117 +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:53:5 @@ -125,31 +121,30 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 56 | is valid""" | help: Combine `with` statements - -ℹ Unsafe fix -50 50 | -51 51 | while True: -52 52 | # SIM117 -53 |- with A() as a: -54 |- with B() as b: -55 |- """this - 53 |+ with A() as a, B() as b: - 54 |+ """this -56 55 | is valid""" -57 56 | -58 |- """the indentation on - 57 |+ """the indentation on -59 58 | this line is significant""" -60 59 | -61 |- "this is" \ - 60 |+ "this is" \ -62 61 | "allowed too" -63 62 | -64 |- ("so is" - 63 |+ ("so is" -65 64 | "this for some reason") -66 65 | -67 66 | # SIM117 +50 | +51 | while True: +52 | # SIM117 + - with A() as a: + - with B() as b: + - """this +53 + with A() as a, B() as b: +54 + """this +55 | is valid""" +56 | + - """the indentation on +57 + """the indentation on +58 | this line is significant""" +59 | + - "this is" \ +60 + "this is" \ +61 | "allowed too" +62 | + - ("so is" +63 + ("so is" +64 | "this for some reason") +65 | +66 | # SIM117 +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:68:1 @@ -164,20 +159,19 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 73 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -67 67 | # SIM117 -68 68 | with ( -69 69 | A() as a, -70 |- B() as b, - 70 |+ B() as b,C() as c -71 71 | ): -72 |- with C() as c: -73 |- print("hello") - 72 |+ print("hello") -74 73 | -75 74 | # SIM117 -76 75 | with A() as a: +67 | # SIM117 +68 | with ( +69 | A() as a, + - B() as b, +70 + B() as b,C() as c +71 | ): + - with C() as c: + - print("hello") +72 + print("hello") +73 | +74 | # SIM117 +75 | with A() as a: +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:76:1 @@ -192,25 +186,24 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 81 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -73 73 | print("hello") -74 74 | -75 75 | # SIM117 -76 |-with A() as a: -77 |- with ( -78 |- B() as b, -79 |- C() as c, -80 |- ): -81 |- print("hello") - 76 |+with ( - 77 |+ A() as a, B() as b, - 78 |+ C() as c, - 79 |+): - 80 |+ print("hello") -82 81 | -83 82 | # SIM117 -84 83 | with ( +73 | print("hello") +74 | +75 | # SIM117 + - with A() as a: + - with ( + - B() as b, + - C() as c, + - ): + - print("hello") +76 + with ( +77 + A() as a, B() as b, +78 + C() as c, +79 + ): +80 + print("hello") +81 | +82 | # SIM117 +83 | with ( +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:84:1 @@ -228,24 +221,23 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 92 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -83 83 | # SIM117 -84 84 | with ( -85 85 | A() as a, -86 |- B() as b, - 86 |+ B() as b,C() as c, - 87 |+ D() as d, -87 88 | ): -88 |- with ( -89 |- C() as c, -90 |- D() as d, -91 |- ): -92 |- print("hello") - 89 |+ print("hello") -93 90 | -94 91 | # SIM117 (auto-fixable) -95 92 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: +83 | # SIM117 +84 | with ( +85 | A() as a, + - B() as b, +86 + B() as b,C() as c, +87 + D() as d, +88 | ): + - with ( + - C() as c, + - D() as d, + - ): + - print("hello") +89 + print("hello") +90 | +91 | # SIM117 (auto-fixable) +92 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:95:1 @@ -257,19 +249,18 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 97 | print("hello") | help: Combine `with` statements - -ℹ Unsafe fix -92 92 | print("hello") -93 93 | -94 94 | # SIM117 (auto-fixable) -95 |-with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: -96 |- with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: -97 |- print("hello") - 95 |+with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a, B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: - 96 |+ print("hello") -98 97 | -99 98 | # SIM117 (not auto-fixable too long) -100 99 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a: +92 | print("hello") +93 | +94 | # SIM117 (auto-fixable) + - with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: + - with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: + - print("hello") +95 + with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a, B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: +96 + print("hello") +97 | +98 | # SIM117 (not auto-fixable too long) +99 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a: +note: This is an unsafe fix and may change runtime behavior SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:100:1 @@ -304,32 +295,31 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 128 | type ListOrSet[T] = list[T] | set[T] | help: Combine `with` statements - -ℹ Unsafe fix -123 123 | f(b2, c2, d2) -124 124 | -125 125 | # SIM117 -126 |-with A() as a: -127 |- with B() as b: -128 |- type ListOrSet[T] = list[T] | set[T] - 126 |+with A() as a, B() as b: - 127 |+ type ListOrSet[T] = list[T] | set[T] -129 128 | -130 |- class ClassA[T: str]: -131 |- def method1(self) -> T: -132 |- ... - 129 |+ class ClassA[T: str]: - 130 |+ def method1(self) -> T: - 131 |+ ... -133 132 | -134 |- f" something { my_dict["key"] } something else " - 133 |+ f" something { my_dict["key"] } something else " -135 134 | -136 |- f"foo {f"bar {x}"} baz" - 135 |+ f"foo {f"bar {x}"} baz" -137 136 | -138 137 | # Allow cascading for some statements. -139 138 | import anyio +123 | f(b2, c2, d2) +124 | +125 | # SIM117 + - with A() as a: + - with B() as b: + - type ListOrSet[T] = list[T] | set[T] +126 + with A() as a, B() as b: +127 + type ListOrSet[T] = list[T] | set[T] +128 | + - class ClassA[T: str]: + - def method1(self) -> T: + - ... +129 + class ClassA[T: str]: +130 + def method1(self) -> T: +131 + ... +132 | + - f" something { my_dict["key"] } something else " +133 + f" something { my_dict["key"] } something else " +134 | + - f"foo {f"bar {x}"} baz" +135 + f"foo {f"bar {x}"} baz" +136 | +137 | # Allow cascading for some statements. +138 | import anyio +note: This is an unsafe fix and may change runtime behavior SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:163:1 @@ -341,13 +331,12 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 165 | pass | help: Combine `with` statements - -ℹ Unsafe fix -160 160 | pass -161 161 | -162 162 | # Do not suppress combination, if a context manager is already combined with another. -163 |-async with asyncio.timeout(1), A(): -164 |- async with B(): -165 |- pass - 163 |+async with asyncio.timeout(1), A(), B(): - 164 |+ pass +160 | pass +161 | +162 | # Do not suppress combination, if a context manager is already combined with another. + - async with asyncio.timeout(1), A(): + - async with B(): + - pass +163 + async with asyncio.timeout(1), A(), B(): +164 + pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap index 1400a9d93b..7dd62e1b1e 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM118_SIM118.py.snap @@ -12,15 +12,13 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 5 | key not in obj.keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -1 1 | obj = {} -2 2 | -3 |-key in obj.keys() # SIM118 - 3 |+key in obj # SIM118 -4 4 | -5 5 | key not in obj.keys() # SIM118 -6 6 | +1 | obj = {} +2 | + - key in obj.keys() # SIM118 +3 + key in obj # SIM118 +4 | +5 | key not in obj.keys() # SIM118 +6 | SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` --> SIM118.py:5:1 @@ -33,16 +31,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` 7 | foo["bar"] in obj.keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -2 2 | -3 3 | key in obj.keys() # SIM118 -4 4 | -5 |-key not in obj.keys() # SIM118 - 5 |+key not in obj # SIM118 -6 6 | -7 7 | foo["bar"] in obj.keys() # SIM118 -8 8 | +2 | +3 | key in obj.keys() # SIM118 +4 | + - key not in obj.keys() # SIM118 +5 + key not in obj # SIM118 +6 | +7 | foo["bar"] in obj.keys() # SIM118 +8 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:7:1 @@ -55,16 +51,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 9 | foo["bar"] not in obj.keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -4 4 | -5 5 | key not in obj.keys() # SIM118 -6 6 | -7 |-foo["bar"] in obj.keys() # SIM118 - 7 |+foo["bar"] in obj # SIM118 -8 8 | -9 9 | foo["bar"] not in obj.keys() # SIM118 -10 10 | +4 | +5 | key not in obj.keys() # SIM118 +6 | + - foo["bar"] in obj.keys() # SIM118 +7 + foo["bar"] in obj # SIM118 +8 | +9 | foo["bar"] not in obj.keys() # SIM118 +10 | SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` --> SIM118.py:9:1 @@ -77,16 +71,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` 11 | foo['bar'] in obj.keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -6 6 | -7 7 | foo["bar"] in obj.keys() # SIM118 -8 8 | -9 |-foo["bar"] not in obj.keys() # SIM118 - 9 |+foo["bar"] not in obj # SIM118 -10 10 | -11 11 | foo['bar'] in obj.keys() # SIM118 -12 12 | +6 | +7 | foo["bar"] in obj.keys() # SIM118 +8 | + - foo["bar"] not in obj.keys() # SIM118 +9 + foo["bar"] not in obj # SIM118 +10 | +11 | foo['bar'] in obj.keys() # SIM118 +12 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:11:1 @@ -99,16 +91,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 13 | foo['bar'] not in obj.keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -8 8 | -9 9 | foo["bar"] not in obj.keys() # SIM118 -10 10 | -11 |-foo['bar'] in obj.keys() # SIM118 - 11 |+foo['bar'] in obj # SIM118 -12 12 | -13 13 | foo['bar'] not in obj.keys() # SIM118 -14 14 | +8 | +9 | foo["bar"] not in obj.keys() # SIM118 +10 | + - foo['bar'] in obj.keys() # SIM118 +11 + foo['bar'] in obj # SIM118 +12 | +13 | foo['bar'] not in obj.keys() # SIM118 +14 | SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` --> SIM118.py:13:1 @@ -121,16 +111,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` 15 | foo() in obj.keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -10 10 | -11 11 | foo['bar'] in obj.keys() # SIM118 -12 12 | -13 |-foo['bar'] not in obj.keys() # SIM118 - 13 |+foo['bar'] not in obj # SIM118 -14 14 | -15 15 | foo() in obj.keys() # SIM118 -16 16 | +10 | +11 | foo['bar'] in obj.keys() # SIM118 +12 | + - foo['bar'] not in obj.keys() # SIM118 +13 + foo['bar'] not in obj # SIM118 +14 | +15 | foo() in obj.keys() # SIM118 +16 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:15:1 @@ -143,16 +131,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 17 | foo() not in obj.keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -12 12 | -13 13 | foo['bar'] not in obj.keys() # SIM118 -14 14 | -15 |-foo() in obj.keys() # SIM118 - 15 |+foo() in obj # SIM118 -16 16 | -17 17 | foo() not in obj.keys() # SIM118 -18 18 | +12 | +13 | foo['bar'] not in obj.keys() # SIM118 +14 | + - foo() in obj.keys() # SIM118 +15 + foo() in obj # SIM118 +16 | +17 | foo() not in obj.keys() # SIM118 +18 | SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` --> SIM118.py:17:1 @@ -165,16 +151,14 @@ SIM118 [*] Use `key not in dict` instead of `key not in dict.keys()` 19 | for key in obj.keys(): # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -14 14 | -15 15 | foo() in obj.keys() # SIM118 -16 16 | -17 |-foo() not in obj.keys() # SIM118 - 17 |+foo() not in obj # SIM118 -18 18 | -19 19 | for key in obj.keys(): # SIM118 -20 20 | pass +14 | +15 | foo() in obj.keys() # SIM118 +16 | + - foo() not in obj.keys() # SIM118 +17 + foo() not in obj # SIM118 +18 | +19 | for key in obj.keys(): # SIM118 +20 | pass SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:19:5 @@ -186,16 +170,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 20 | pass | help: Remove `.keys()` - -ℹ Safe fix -16 16 | -17 17 | foo() not in obj.keys() # SIM118 -18 18 | -19 |-for key in obj.keys(): # SIM118 - 19 |+for key in obj: # SIM118 -20 20 | pass -21 21 | -22 22 | for key in list(obj.keys()): +16 | +17 | foo() not in obj.keys() # SIM118 +18 | + - for key in obj.keys(): # SIM118 +19 + for key in obj: # SIM118 +20 | pass +21 | +22 | for key in list(obj.keys()): SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:26:8 @@ -208,16 +190,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 28 | {k for k in obj.keys()} # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -23 23 | if some_property(key): -24 24 | del obj[key] -25 25 | -26 |-[k for k in obj.keys()] # SIM118 - 26 |+[k for k in obj] # SIM118 -27 27 | -28 28 | {k for k in obj.keys()} # SIM118 -29 29 | +23 | if some_property(key): +24 | del obj[key] +25 | + - [k for k in obj.keys()] # SIM118 +26 + [k for k in obj] # SIM118 +27 | +28 | {k for k in obj.keys()} # SIM118 +29 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:28:8 @@ -230,16 +210,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 30 | {k: k for k in obj.keys()} # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -25 25 | -26 26 | [k for k in obj.keys()] # SIM118 -27 27 | -28 |-{k for k in obj.keys()} # SIM118 - 28 |+{k for k in obj} # SIM118 -29 29 | -30 30 | {k: k for k in obj.keys()} # SIM118 -31 31 | +25 | +26 | [k for k in obj.keys()] # SIM118 +27 | + - {k for k in obj.keys()} # SIM118 +28 + {k for k in obj} # SIM118 +29 | +30 | {k: k for k in obj.keys()} # SIM118 +31 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:30:11 @@ -252,16 +230,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 32 | (k for k in obj.keys()) # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -27 27 | -28 28 | {k for k in obj.keys()} # SIM118 -29 29 | -30 |-{k: k for k in obj.keys()} # SIM118 - 30 |+{k: k for k in obj} # SIM118 -31 31 | -32 32 | (k for k in obj.keys()) # SIM118 -33 33 | +27 | +28 | {k for k in obj.keys()} # SIM118 +29 | + - {k: k for k in obj.keys()} # SIM118 +30 + {k: k for k in obj} # SIM118 +31 | +32 | (k for k in obj.keys()) # SIM118 +33 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:32:8 @@ -274,16 +250,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 34 | key in (obj or {}).keys() # SIM118 | help: Remove `.keys()` - -ℹ Safe fix -29 29 | -30 30 | {k: k for k in obj.keys()} # SIM118 -31 31 | -32 |-(k for k in obj.keys()) # SIM118 - 32 |+(k for k in obj) # SIM118 -33 33 | -34 34 | key in (obj or {}).keys() # SIM118 -35 35 | +29 | +30 | {k: k for k in obj.keys()} # SIM118 +31 | + - (k for k in obj.keys()) # SIM118 +32 + (k for k in obj) # SIM118 +33 | +34 | key in (obj or {}).keys() # SIM118 +35 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:34:1 @@ -296,16 +270,15 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 36 | (key) in (obj or {}).keys() # SIM118 | help: Remove `.keys()` - -ℹ Unsafe fix -31 31 | -32 32 | (k for k in obj.keys()) # SIM118 -33 33 | -34 |-key in (obj or {}).keys() # SIM118 - 34 |+key in (obj or {}) # SIM118 -35 35 | -36 36 | (key) in (obj or {}).keys() # SIM118 -37 37 | +31 | +32 | (k for k in obj.keys()) # SIM118 +33 | + - key in (obj or {}).keys() # SIM118 +34 + key in (obj or {}) # SIM118 +35 | +36 | (key) in (obj or {}).keys() # SIM118 +37 | +note: This is an unsafe fix and may change runtime behavior SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:36:1 @@ -318,16 +291,15 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 38 | from typing import KeysView | help: Remove `.keys()` - -ℹ Unsafe fix -33 33 | -34 34 | key in (obj or {}).keys() # SIM118 -35 35 | -36 |-(key) in (obj or {}).keys() # SIM118 - 36 |+(key) in (obj or {}) # SIM118 -37 37 | -38 38 | from typing import KeysView -39 39 | +33 | +34 | key in (obj or {}).keys() # SIM118 +35 | + - (key) in (obj or {}).keys() # SIM118 +36 + (key) in (obj or {}) # SIM118 +37 | +38 | from typing import KeysView +39 | +note: This is an unsafe fix and may change runtime behavior SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:50:1 @@ -339,16 +311,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 52 | key in (obj.keys())and foo | help: Remove `.keys()` - -ℹ Safe fix -47 47 | -48 48 | -49 49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124 -50 |-key in obj.keys()and foo - 50 |+key in obj and foo -51 51 | (key in obj.keys())and foo -52 52 | key in (obj.keys())and foo -53 53 | +47 | +48 | +49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124 + - key in obj.keys()and foo +50 + key in obj and foo +51 | (key in obj.keys())and foo +52 | key in (obj.keys())and foo +53 | SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:51:2 @@ -360,16 +330,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 52 | key in (obj.keys())and foo | help: Remove `.keys()` - -ℹ Safe fix -48 48 | -49 49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124 -50 50 | key in obj.keys()and foo -51 |-(key in obj.keys())and foo - 51 |+(key in obj)and foo -52 52 | key in (obj.keys())and foo -53 53 | -54 54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200 +48 | +49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124 +50 | key in obj.keys()and foo + - (key in obj.keys())and foo +51 + (key in obj)and foo +52 | key in (obj.keys())and foo +53 | +54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200 SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:52:1 @@ -382,16 +350,14 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200 | help: Remove `.keys()` - -ℹ Safe fix -49 49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124 -50 50 | key in obj.keys()and foo -51 51 | (key in obj.keys())and foo -52 |-key in (obj.keys())and foo - 52 |+key in (obj)and foo -53 53 | -54 54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200 -55 55 | for key in ( +49 | # Regression test for: https://github.com/astral-sh/ruff/issues/7124 +50 | key in obj.keys()and foo +51 | (key in obj.keys())and foo + - key in (obj.keys())and foo +52 + key in (obj)and foo +53 | +54 | # Regression test for: https://github.com/astral-sh/ruff/issues/7200 +55 | for key in ( SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:55:5 @@ -407,16 +373,15 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` 60 | continue | help: Remove `.keys()` - -ℹ Unsafe fix -55 55 | for key in ( -56 56 | self.experiment.surveys[0] -57 57 | .stations[0] -58 |- .keys() - 58 |+ -59 59 | ): -60 60 | continue -61 61 | +55 | for key in ( +56 | self.experiment.surveys[0] +57 | .stations[0] + - .keys() +58 + +59 | ): +60 | continue +61 | +note: This is an unsafe fix and may change runtime behavior SIM118 [*] Use `key in dict` instead of `key in dict.keys()` --> SIM118.py:65:1 @@ -426,10 +391,8 @@ SIM118 [*] Use `key in dict` instead of `key in dict.keys()` | ^^^^^^^^^^^^^^^ | help: Remove `.keys()` - -ℹ Safe fix -62 62 | from builtins import dict as SneakyDict -63 63 | -64 64 | d = SneakyDict() -65 |-key in d.keys() # SIM118 - 65 |+key in d # SIM118 +62 | from builtins import dict as SneakyDict +63 | +64 | d = SneakyDict() + - key in d.keys() # SIM118 +65 + key in d # SIM118 diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap index fcf5326220..5409fd61e0 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM201_SIM201.py.snap @@ -10,14 +10,13 @@ SIM201 [*] Use `a != b` instead of `not a == b` 3 | pass | help: Replace with `!=` operator - -ℹ Unsafe fix -1 1 | # SIM201 -2 |-if not a == b: - 2 |+if a != b: -3 3 | pass -4 4 | -5 5 | # SIM201 +1 | # SIM201 + - if not a == b: +2 + if a != b: +3 | pass +4 | +5 | # SIM201 +note: This is an unsafe fix and may change runtime behavior SIM201 [*] Use `a != b + c` instead of `not a == b + c` --> SIM201.py:6:4 @@ -28,16 +27,15 @@ SIM201 [*] Use `a != b + c` instead of `not a == b + c` 7 | pass | help: Replace with `!=` operator - -ℹ Unsafe fix -3 3 | pass -4 4 | -5 5 | # SIM201 -6 |-if not a == (b + c): - 6 |+if a != b + c: -7 7 | pass -8 8 | -9 9 | # SIM201 +3 | pass +4 | +5 | # SIM201 + - if not a == (b + c): +6 + if a != b + c: +7 | pass +8 | +9 | # SIM201 +note: This is an unsafe fix and may change runtime behavior SIM201 [*] Use `a + b != c` instead of `not a + b == c` --> SIM201.py:10:4 @@ -48,13 +46,12 @@ SIM201 [*] Use `a + b != c` instead of `not a + b == c` 11 | pass | help: Replace with `!=` operator - -ℹ Unsafe fix -7 7 | pass -8 8 | -9 9 | # SIM201 -10 |-if not (a + b) == c: - 10 |+if a + b != c: -11 11 | pass -12 12 | -13 13 | # OK +7 | pass +8 | +9 | # SIM201 + - if not (a + b) == c: +10 + if a + b != c: +11 | pass +12 | +13 | # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap index a843381049..431da3e6b3 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM202_SIM202.py.snap @@ -10,14 +10,13 @@ SIM202 [*] Use `a == b` instead of `not a != b` 3 | pass | help: Replace with `==` operator - -ℹ Unsafe fix -1 1 | # SIM202 -2 |-if not a != b: - 2 |+if a == b: -3 3 | pass -4 4 | -5 5 | # SIM202 +1 | # SIM202 + - if not a != b: +2 + if a == b: +3 | pass +4 | +5 | # SIM202 +note: This is an unsafe fix and may change runtime behavior SIM202 [*] Use `a == b + c` instead of `not a != b + c` --> SIM202.py:6:4 @@ -28,16 +27,15 @@ SIM202 [*] Use `a == b + c` instead of `not a != b + c` 7 | pass | help: Replace with `==` operator - -ℹ Unsafe fix -3 3 | pass -4 4 | -5 5 | # SIM202 -6 |-if not a != (b + c): - 6 |+if a == b + c: -7 7 | pass -8 8 | -9 9 | # SIM202 +3 | pass +4 | +5 | # SIM202 + - if not a != (b + c): +6 + if a == b + c: +7 | pass +8 | +9 | # SIM202 +note: This is an unsafe fix and may change runtime behavior SIM202 [*] Use `a + b == c` instead of `not a + b != c` --> SIM202.py:10:4 @@ -48,13 +46,12 @@ SIM202 [*] Use `a + b == c` instead of `not a + b != c` 11 | pass | help: Replace with `==` operator - -ℹ Unsafe fix -7 7 | pass -8 8 | -9 9 | # SIM202 -10 |-if not (a + b) != c: - 10 |+if a + b == c: -11 11 | pass -12 12 | -13 13 | # OK +7 | pass +8 | +9 | # SIM202 + - if not (a + b) != c: +10 + if a + b == c: +11 | pass +12 | +13 | # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap index ba0415f28b..b1d752c6ea 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM208_SIM208.py.snap @@ -9,13 +9,11 @@ SIM208 [*] Use `a` instead of `not (not a)` 2 | pass | help: Replace with `a` - -ℹ Safe fix -1 |-if not (not a): # SIM208 - 1 |+if a: # SIM208 -2 2 | pass -3 3 | -4 4 | if not (not (a == b)): # SIM208 + - if not (not a): # SIM208 +1 + if a: # SIM208 +2 | pass +3 | +4 | if not (not (a == b)): # SIM208 SIM208 [*] Use `a == b` instead of `not (not a == b)` --> SIM208.py:4:4 @@ -27,16 +25,14 @@ SIM208 [*] Use `a == b` instead of `not (not a == b)` 5 | pass | help: Replace with `a == b` - -ℹ Safe fix -1 1 | if not (not a): # SIM208 -2 2 | pass -3 3 | -4 |-if not (not (a == b)): # SIM208 - 4 |+if a == b: # SIM208 -5 5 | pass -6 6 | -7 7 | if not a: # OK +1 | if not (not a): # SIM208 +2 | pass +3 | + - if not (not (a == b)): # SIM208 +4 + if a == b: # SIM208 +5 | pass +6 | +7 | if not a: # OK SIM208 [*] Use `b` instead of `not (not b)` --> SIM208.py:16:5 @@ -49,16 +45,14 @@ SIM208 [*] Use `b` instead of `not (not b)` 18 | f(not not a) # SIM208 | help: Replace with `b` - -ℹ Safe fix -13 13 | if not a != b: # OK -14 14 | pass -15 15 | -16 |-a = not not b # SIM208 - 16 |+a = bool(b) # SIM208 -17 17 | -18 18 | f(not not a) # SIM208 -19 19 | +13 | if not a != b: # OK +14 | pass +15 | + - a = not not b # SIM208 +16 + a = bool(b) # SIM208 +17 | +18 | f(not not a) # SIM208 +19 | SIM208 [*] Use `a` instead of `not (not a)` --> SIM208.py:18:3 @@ -71,16 +65,14 @@ SIM208 [*] Use `a` instead of `not (not a)` 20 | if 1 + (not (not a)): # SIM208 | help: Replace with `a` - -ℹ Safe fix -15 15 | -16 16 | a = not not b # SIM208 -17 17 | -18 |-f(not not a) # SIM208 - 18 |+f(bool(a)) # SIM208 -19 19 | -20 20 | if 1 + (not (not a)): # SIM208 -21 21 | pass +15 | +16 | a = not not b # SIM208 +17 | + - f(not not a) # SIM208 +18 + f(bool(a)) # SIM208 +19 | +20 | if 1 + (not (not a)): # SIM208 +21 | pass SIM208 [*] Use `a` instead of `not (not a)` --> SIM208.py:20:9 @@ -92,11 +84,9 @@ SIM208 [*] Use `a` instead of `not (not a)` 21 | pass | help: Replace with `a` - -ℹ Safe fix -17 17 | -18 18 | f(not not a) # SIM208 -19 19 | -20 |-if 1 + (not (not a)): # SIM208 - 20 |+if 1 + (bool(a)): # SIM208 -21 21 | pass +17 | +18 | f(not not a) # SIM208 +19 | + - if 1 + (not (not a)): # SIM208 +20 + if 1 + (bool(a)): # SIM208 +21 | pass diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap index f6246838c4..616fe26298 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM210_SIM210.py.snap @@ -10,13 +10,12 @@ SIM210 [*] Use `bool(...)` instead of `True if ... else False` 3 | a = True if b != c else False # SIM210 | help: Replace with `bool(...) - -ℹ Unsafe fix -1 |-a = True if b else False # SIM210 - 1 |+a = bool(b) # SIM210 -2 2 | -3 3 | a = True if b != c else False # SIM210 -4 4 | + - a = True if b else False # SIM210 +1 + a = bool(b) # SIM210 +2 | +3 | a = True if b != c else False # SIM210 +4 | +note: This is an unsafe fix and may change runtime behavior SIM210 [*] Remove unnecessary `True if ... else False` --> SIM210.py:3:5 @@ -29,15 +28,14 @@ SIM210 [*] Remove unnecessary `True if ... else False` 5 | a = True if b + c else False # SIM210 | help: Remove unnecessary `True if ... else False` - -ℹ Unsafe fix -1 1 | a = True if b else False # SIM210 -2 2 | -3 |-a = True if b != c else False # SIM210 - 3 |+a = b != c # SIM210 -4 4 | -5 5 | a = True if b + c else False # SIM210 -6 6 | +1 | a = True if b else False # SIM210 +2 | + - a = True if b != c else False # SIM210 +3 + a = b != c # SIM210 +4 | +5 | a = True if b + c else False # SIM210 +6 | +note: This is an unsafe fix and may change runtime behavior SIM210 [*] Use `bool(...)` instead of `True if ... else False` --> SIM210.py:5:5 @@ -50,16 +48,15 @@ SIM210 [*] Use `bool(...)` instead of `True if ... else False` 7 | a = False if b else True # OK | help: Replace with `bool(...) - -ℹ Unsafe fix -2 2 | -3 3 | a = True if b != c else False # SIM210 -4 4 | -5 |-a = True if b + c else False # SIM210 - 5 |+a = bool(b + c) # SIM210 -6 6 | -7 7 | a = False if b else True # OK -8 8 | +2 | +3 | a = True if b != c else False # SIM210 +4 | + - a = True if b + c else False # SIM210 +5 + a = bool(b + c) # SIM210 +6 | +7 | a = False if b else True # OK +8 | +note: This is an unsafe fix and may change runtime behavior SIM210 Use `bool(...)` instead of `True if ... else False` --> SIM210.py:15:9 @@ -81,12 +78,11 @@ SIM210 [*] Remove unnecessary `True if ... else False` | |____________________________________________________________________________^ | help: Remove unnecessary `True if ... else False` - -ℹ Unsafe fix -16 16 | -17 17 | -18 18 | # Regression test for: https://github.com/astral-sh/ruff/issues/7076 -19 |-samesld = True if (psl.privatesuffix(urlparse(response.url).netloc) == -20 |- psl.privatesuffix(src.netloc)) else False - 19 |+samesld = (psl.privatesuffix(urlparse(response.url).netloc) == - 20 |+ psl.privatesuffix(src.netloc)) +16 | +17 | +18 | # Regression test for: https://github.com/astral-sh/ruff/issues/7076 + - samesld = True if (psl.privatesuffix(urlparse(response.url).netloc) == + - psl.privatesuffix(src.netloc)) else False +19 + samesld = (psl.privatesuffix(urlparse(response.url).netloc) == +20 + psl.privatesuffix(src.netloc)) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap index 86e134ff58..9476d3e474 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM211_SIM211.py.snap @@ -10,13 +10,12 @@ SIM211 [*] Use `not ...` instead of `False if ... else True` 3 | a = False if b != c else True # SIM211 | help: Replace with `not ...` - -ℹ Unsafe fix -1 |-a = False if b else True # SIM211 - 1 |+a = not b # SIM211 -2 2 | -3 3 | a = False if b != c else True # SIM211 -4 4 | + - a = False if b else True # SIM211 +1 + a = not b # SIM211 +2 | +3 | a = False if b != c else True # SIM211 +4 | +note: This is an unsafe fix and may change runtime behavior SIM211 [*] Use `not ...` instead of `False if ... else True` --> SIM211.py:3:5 @@ -29,15 +28,14 @@ SIM211 [*] Use `not ...` instead of `False if ... else True` 5 | a = False if b + c else True # SIM211 | help: Replace with `not ...` - -ℹ Unsafe fix -1 1 | a = False if b else True # SIM211 -2 2 | -3 |-a = False if b != c else True # SIM211 - 3 |+a = not b != c # SIM211 -4 4 | -5 5 | a = False if b + c else True # SIM211 -6 6 | +1 | a = False if b else True # SIM211 +2 | + - a = False if b != c else True # SIM211 +3 + a = not b != c # SIM211 +4 | +5 | a = False if b + c else True # SIM211 +6 | +note: This is an unsafe fix and may change runtime behavior SIM211 [*] Use `not ...` instead of `False if ... else True` --> SIM211.py:5:5 @@ -50,12 +48,11 @@ SIM211 [*] Use `not ...` instead of `False if ... else True` 7 | a = True if b else False # OK | help: Replace with `not ...` - -ℹ Unsafe fix -2 2 | -3 3 | a = False if b != c else True # SIM211 -4 4 | -5 |-a = False if b + c else True # SIM211 - 5 |+a = not b + c # SIM211 -6 6 | -7 7 | a = True if b else False # OK +2 | +3 | a = False if b != c else True # SIM211 +4 | + - a = False if b + c else True # SIM211 +5 + a = not b + c # SIM211 +6 | +7 | a = True if b else False # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap index 7f8aefa640..3366311164 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM212_SIM212.py.snap @@ -10,13 +10,12 @@ SIM212 [*] Use `a if a else b` instead of `b if not a else a` 3 | c = b + c if not a else a # SIM212 | help: Replace with `a if a else b` - -ℹ Unsafe fix -1 |-c = b if not a else a # SIM212 - 1 |+c = a if a else b # SIM212 -2 2 | -3 3 | c = b + c if not a else a # SIM212 -4 4 | + - c = b if not a else a # SIM212 +1 + c = a if a else b # SIM212 +2 | +3 | c = b + c if not a else a # SIM212 +4 | +note: This is an unsafe fix and may change runtime behavior SIM212 [*] Use `a if a else b + c` instead of `b + c if not a else a` --> SIM212.py:3:5 @@ -29,12 +28,11 @@ SIM212 [*] Use `a if a else b + c` instead of `b + c if not a else a` 5 | c = b if not x else a # OK | help: Replace with `a if a else b + c` - -ℹ Unsafe fix -1 1 | c = b if not a else a # SIM212 -2 2 | -3 |-c = b + c if not a else a # SIM212 - 3 |+c = a if a else b + c # SIM212 -4 4 | -5 5 | c = b if not x else a # OK -6 6 | +1 | c = b if not a else a # SIM212 +2 | + - c = b + c if not a else a # SIM212 +3 + c = a if a else b + c # SIM212 +4 | +5 | c = b if not x else a # OK +6 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap index ab1d1e3165..65c5719d65 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM220_SIM220.py.snap @@ -9,13 +9,12 @@ SIM220 [*] Use `False` instead of `a and not a` 2 | pass | help: Replace with `False` - -ℹ Unsafe fix -1 |-if a and not a: - 1 |+if False: -2 2 | pass -3 3 | -4 4 | if (a and not a) and b: + - if a and not a: +1 + if False: +2 | pass +3 | +4 | if (a and not a) and b: +note: This is an unsafe fix and may change runtime behavior SIM220 [*] Use `False` instead of `a and not a` --> SIM220.py:4:5 @@ -27,16 +26,15 @@ SIM220 [*] Use `False` instead of `a and not a` 5 | pass | help: Replace with `False` - -ℹ Unsafe fix -1 1 | if a and not a: -2 2 | pass -3 3 | -4 |-if (a and not a) and b: - 4 |+if (False) and b: -5 5 | pass -6 6 | -7 7 | if (a and not a) or b: +1 | if a and not a: +2 | pass +3 | + - if (a and not a) and b: +4 + if (False) and b: +5 | pass +6 | +7 | if (a and not a) or b: +note: This is an unsafe fix and may change runtime behavior SIM220 [*] Use `False` instead of `a and not a` --> SIM220.py:7:5 @@ -48,13 +46,12 @@ SIM220 [*] Use `False` instead of `a and not a` 8 | pass | help: Replace with `False` - -ℹ Unsafe fix -4 4 | if (a and not a) and b: -5 5 | pass -6 6 | -7 |-if (a and not a) or b: - 7 |+if (False) or b: -8 8 | pass -9 9 | -10 10 | if a: +4 | if (a and not a) and b: +5 | pass +6 | + - if (a and not a) or b: +7 + if (False) or b: +8 | pass +9 | +10 | if a: +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap index d7c0ec8b26..9e1a6cf4a4 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM221_SIM221.py.snap @@ -9,13 +9,12 @@ SIM221 [*] Use `True` instead of `a or not a` 2 | pass | help: Replace with `True` - -ℹ Unsafe fix -1 |-if a or not a: - 1 |+if True: -2 2 | pass -3 3 | -4 4 | if (a or not a) or b: + - if a or not a: +1 + if True: +2 | pass +3 | +4 | if (a or not a) or b: +note: This is an unsafe fix and may change runtime behavior SIM221 [*] Use `True` instead of `a or not a` --> SIM221.py:4:5 @@ -27,16 +26,15 @@ SIM221 [*] Use `True` instead of `a or not a` 5 | pass | help: Replace with `True` - -ℹ Unsafe fix -1 1 | if a or not a: -2 2 | pass -3 3 | -4 |-if (a or not a) or b: - 4 |+if (True) or b: -5 5 | pass -6 6 | -7 7 | if (a or not a) and b: +1 | if a or not a: +2 | pass +3 | + - if (a or not a) or b: +4 + if (True) or b: +5 | pass +6 | +7 | if (a or not a) and b: +note: This is an unsafe fix and may change runtime behavior SIM221 [*] Use `True` instead of `a or not a` --> SIM221.py:7:5 @@ -48,13 +46,12 @@ SIM221 [*] Use `True` instead of `a or not a` 8 | pass | help: Replace with `True` - -ℹ Unsafe fix -4 4 | if (a or not a) or b: -5 5 | pass -6 6 | -7 |-if (a or not a) and b: - 7 |+if (True) and b: -8 8 | pass -9 9 | -10 10 | if a: +4 | if (a or not a) or b: +5 | pass +6 | + - if (a or not a) and b: +7 + if (True) and b: +8 | pass +9 | +10 | if a: +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap index 3c894ee321..691d91f976 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM222_SIM222.py.snap @@ -9,13 +9,12 @@ SIM222 [*] Use `True` instead of `... or True` 2 | pass | help: Replace with `True` - -ℹ Unsafe fix -1 |-if a or True: # SIM222 - 1 |+if True: # SIM222 -2 2 | pass -3 3 | -4 4 | if (a or b) or True: # SIM222 + - if a or True: # SIM222 +1 + if True: # SIM222 +2 | pass +3 | +4 | if (a or b) or True: # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:4:4 @@ -27,16 +26,15 @@ SIM222 [*] Use `True` instead of `... or True` 5 | pass | help: Replace with `True` - -ℹ Unsafe fix -1 1 | if a or True: # SIM222 -2 2 | pass -3 3 | -4 |-if (a or b) or True: # SIM222 - 4 |+if True: # SIM222 -5 5 | pass -6 6 | -7 7 | if a or (b or True): # SIM222 +1 | if a or True: # SIM222 +2 | pass +3 | + - if (a or b) or True: # SIM222 +4 + if True: # SIM222 +5 | pass +6 | +7 | if a or (b or True): # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:7:10 @@ -48,16 +46,15 @@ SIM222 [*] Use `True` instead of `... or True` 8 | pass | help: Replace with `True` - -ℹ Unsafe fix -4 4 | if (a or b) or True: # SIM222 -5 5 | pass -6 6 | -7 |-if a or (b or True): # SIM222 - 7 |+if a or (True): # SIM222 -8 8 | pass -9 9 | -10 10 | if a and True: # OK +4 | if (a or b) or True: # SIM222 +5 | pass +6 | + - if a or (b or True): # SIM222 +7 + if a or (True): # SIM222 +8 | pass +9 | +10 | if a and True: # OK +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `True or ...` --> SIM222.py:24:16 @@ -69,16 +66,15 @@ SIM222 [*] Use `True` instead of `True or ...` 25 | pass | help: Replace with `True` - -ℹ Unsafe fix -21 21 | if a or f() or b or g() or True: # OK -22 22 | pass -23 23 | -24 |-if a or f() or True or g() or b: # SIM222 - 24 |+if a or f() or True: # SIM222 -25 25 | pass -26 26 | -27 27 | if True or f() or a or g() or b: # SIM222 +21 | if a or f() or b or g() or True: # OK +22 | pass +23 | + - if a or f() or True or g() or b: # SIM222 +24 + if a or f() or True: # SIM222 +25 | pass +26 | +27 | if True or f() or a or g() or b: # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `True or ...` --> SIM222.py:27:4 @@ -90,16 +86,15 @@ SIM222 [*] Use `True` instead of `True or ...` 28 | pass | help: Replace with `True` - -ℹ Unsafe fix -24 24 | if a or f() or True or g() or b: # SIM222 -25 25 | pass -26 26 | -27 |-if True or f() or a or g() or b: # SIM222 - 27 |+if True: # SIM222 -28 28 | pass -29 29 | -30 30 | if a or True or f() or b or g(): # SIM222 +24 | if a or f() or True or g() or b: # SIM222 +25 | pass +26 | + - if True or f() or a or g() or b: # SIM222 +27 + if True: # SIM222 +28 | pass +29 | +30 | if a or True or f() or b or g(): # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:30:4 @@ -111,16 +106,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 31 | pass | help: Replace with `True` - -ℹ Unsafe fix -27 27 | if True or f() or a or g() or b: # SIM222 -28 28 | pass -29 29 | -30 |-if a or True or f() or b or g(): # SIM222 - 30 |+if True: # SIM222 -31 31 | pass -32 32 | -33 33 | +27 | if True or f() or a or g() or b: # SIM222 +28 | pass +29 | + - if a or True or f() or b or g(): # SIM222 +30 + if True: # SIM222 +31 | pass +32 | +33 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:47:6 @@ -131,16 +125,15 @@ SIM222 [*] Use `True` instead of `... or True` 49 | a or "foo" or True or "bar" # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -44 44 | pass -45 45 | -46 46 | -47 |-a or "" or True # SIM222 - 47 |+a or True # SIM222 -48 48 | -49 49 | a or "foo" or True or "bar" # SIM222 -50 50 | +44 | pass +45 | +46 | + - a or "" or True # SIM222 +47 + a or True # SIM222 +48 | +49 | a or "foo" or True or "bar" # SIM222 +50 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `"foo"` instead of `"foo" or ...` --> SIM222.py:49:6 @@ -153,16 +146,15 @@ SIM222 [*] Use `"foo"` instead of `"foo" or ...` 51 | a or 0 or True # SIM222 | help: Replace with `"foo"` - -ℹ Unsafe fix -46 46 | -47 47 | a or "" or True # SIM222 -48 48 | -49 |-a or "foo" or True or "bar" # SIM222 - 49 |+a or "foo" # SIM222 -50 50 | -51 51 | a or 0 or True # SIM222 -52 52 | +46 | +47 | a or "" or True # SIM222 +48 | + - a or "foo" or True or "bar" # SIM222 +49 + a or "foo" # SIM222 +50 | +51 | a or 0 or True # SIM222 +52 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:51:6 @@ -175,16 +167,15 @@ SIM222 [*] Use `True` instead of `... or True` 53 | a or 1 or True or 2 # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -48 48 | -49 49 | a or "foo" or True or "bar" # SIM222 -50 50 | -51 |-a or 0 or True # SIM222 - 51 |+a or True # SIM222 -52 52 | -53 53 | a or 1 or True or 2 # SIM222 -54 54 | +48 | +49 | a or "foo" or True or "bar" # SIM222 +50 | + - a or 0 or True # SIM222 +51 + a or True # SIM222 +52 | +53 | a or 1 or True or 2 # SIM222 +54 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `1` instead of `1 or ...` --> SIM222.py:53:6 @@ -197,16 +188,15 @@ SIM222 [*] Use `1` instead of `1 or ...` 55 | a or 0.0 or True # SIM222 | help: Replace with `1` - -ℹ Unsafe fix -50 50 | -51 51 | a or 0 or True # SIM222 -52 52 | -53 |-a or 1 or True or 2 # SIM222 - 53 |+a or 1 # SIM222 -54 54 | -55 55 | a or 0.0 or True # SIM222 -56 56 | +50 | +51 | a or 0 or True # SIM222 +52 | + - a or 1 or True or 2 # SIM222 +53 + a or 1 # SIM222 +54 | +55 | a or 0.0 or True # SIM222 +56 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:55:6 @@ -219,16 +209,15 @@ SIM222 [*] Use `True` instead of `... or True` 57 | a or 0.1 or True or 0.2 # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -52 52 | -53 53 | a or 1 or True or 2 # SIM222 -54 54 | -55 |-a or 0.0 or True # SIM222 - 55 |+a or True # SIM222 -56 56 | -57 57 | a or 0.1 or True or 0.2 # SIM222 -58 58 | +52 | +53 | a or 1 or True or 2 # SIM222 +54 | + - a or 0.0 or True # SIM222 +55 + a or True # SIM222 +56 | +57 | a or 0.1 or True or 0.2 # SIM222 +58 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `0.1` instead of `0.1 or ...` --> SIM222.py:57:6 @@ -241,16 +230,15 @@ SIM222 [*] Use `0.1` instead of `0.1 or ...` 59 | a or [] or True # SIM222 | help: Replace with `0.1` - -ℹ Unsafe fix -54 54 | -55 55 | a or 0.0 or True # SIM222 -56 56 | -57 |-a or 0.1 or True or 0.2 # SIM222 - 57 |+a or 0.1 # SIM222 -58 58 | -59 59 | a or [] or True # SIM222 -60 60 | +54 | +55 | a or 0.0 or True # SIM222 +56 | + - a or 0.1 or True or 0.2 # SIM222 +57 + a or 0.1 # SIM222 +58 | +59 | a or [] or True # SIM222 +60 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:59:6 @@ -263,16 +251,15 @@ SIM222 [*] Use `True` instead of `... or True` 61 | a or list([]) or True # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -56 56 | -57 57 | a or 0.1 or True or 0.2 # SIM222 -58 58 | -59 |-a or [] or True # SIM222 - 59 |+a or True # SIM222 -60 60 | -61 61 | a or list([]) or True # SIM222 -62 62 | +56 | +57 | a or 0.1 or True or 0.2 # SIM222 +58 | + - a or [] or True # SIM222 +59 + a or True # SIM222 +60 | +61 | a or list([]) or True # SIM222 +62 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:61:6 @@ -285,16 +272,15 @@ SIM222 [*] Use `True` instead of `... or True` 63 | a or [1] or True or [2] # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -58 58 | -59 59 | a or [] or True # SIM222 -60 60 | -61 |-a or list([]) or True # SIM222 - 61 |+a or True # SIM222 -62 62 | -63 63 | a or [1] or True or [2] # SIM222 -64 64 | +58 | +59 | a or [] or True # SIM222 +60 | + - a or list([]) or True # SIM222 +61 + a or True # SIM222 +62 | +63 | a or [1] or True or [2] # SIM222 +64 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `[1]` instead of `[1] or ...` --> SIM222.py:63:6 @@ -307,16 +293,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...` 65 | a or list([1]) or True or list([2]) # SIM222 | help: Replace with `[1]` - -ℹ Unsafe fix -60 60 | -61 61 | a or list([]) or True # SIM222 -62 62 | -63 |-a or [1] or True or [2] # SIM222 - 63 |+a or [1] # SIM222 -64 64 | -65 65 | a or list([1]) or True or list([2]) # SIM222 -66 66 | +60 | +61 | a or list([]) or True # SIM222 +62 | + - a or [1] or True or [2] # SIM222 +63 + a or [1] # SIM222 +64 | +65 | a or list([1]) or True or list([2]) # SIM222 +66 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `list([1])` instead of `list([1]) or ...` --> SIM222.py:65:6 @@ -329,16 +314,15 @@ SIM222 [*] Use `list([1])` instead of `list([1]) or ...` 67 | a or {} or True # SIM222 | help: Replace with `list([1])` - -ℹ Unsafe fix -62 62 | -63 63 | a or [1] or True or [2] # SIM222 -64 64 | -65 |-a or list([1]) or True or list([2]) # SIM222 - 65 |+a or list([1]) # SIM222 -66 66 | -67 67 | a or {} or True # SIM222 -68 68 | +62 | +63 | a or [1] or True or [2] # SIM222 +64 | + - a or list([1]) or True or list([2]) # SIM222 +65 + a or list([1]) # SIM222 +66 | +67 | a or {} or True # SIM222 +68 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:67:6 @@ -351,16 +335,15 @@ SIM222 [*] Use `True` instead of `... or True` 69 | a or dict() or True # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -64 64 | -65 65 | a or list([1]) or True or list([2]) # SIM222 -66 66 | -67 |-a or {} or True # SIM222 - 67 |+a or True # SIM222 -68 68 | -69 69 | a or dict() or True # SIM222 -70 70 | +64 | +65 | a or list([1]) or True or list([2]) # SIM222 +66 | + - a or {} or True # SIM222 +67 + a or True # SIM222 +68 | +69 | a or dict() or True # SIM222 +70 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:69:6 @@ -373,16 +356,15 @@ SIM222 [*] Use `True` instead of `... or True` 71 | a or {1: 1} or True or {2: 2} # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -66 66 | -67 67 | a or {} or True # SIM222 -68 68 | -69 |-a or dict() or True # SIM222 - 69 |+a or True # SIM222 -70 70 | -71 71 | a or {1: 1} or True or {2: 2} # SIM222 -72 72 | +66 | +67 | a or {} or True # SIM222 +68 | + - a or dict() or True # SIM222 +69 + a or True # SIM222 +70 | +71 | a or {1: 1} or True or {2: 2} # SIM222 +72 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `{1: 1}` instead of `{1: 1} or ...` --> SIM222.py:71:6 @@ -395,16 +377,15 @@ SIM222 [*] Use `{1: 1}` instead of `{1: 1} or ...` 73 | a or dict({1: 1}) or True or dict({2: 2}) # SIM222 | help: Replace with `{1: 1}` - -ℹ Unsafe fix -68 68 | -69 69 | a or dict() or True # SIM222 -70 70 | -71 |-a or {1: 1} or True or {2: 2} # SIM222 - 71 |+a or {1: 1} # SIM222 -72 72 | -73 73 | a or dict({1: 1}) or True or dict({2: 2}) # SIM222 -74 74 | +68 | +69 | a or dict() or True # SIM222 +70 | + - a or {1: 1} or True or {2: 2} # SIM222 +71 + a or {1: 1} # SIM222 +72 | +73 | a or dict({1: 1}) or True or dict({2: 2}) # SIM222 +74 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `dict({1: 1})` instead of `dict({1: 1}) or ...` --> SIM222.py:73:6 @@ -417,16 +398,15 @@ SIM222 [*] Use `dict({1: 1})` instead of `dict({1: 1}) or ...` 75 | a or set() or True # SIM222 | help: Replace with `dict({1: 1})` - -ℹ Unsafe fix -70 70 | -71 71 | a or {1: 1} or True or {2: 2} # SIM222 -72 72 | -73 |-a or dict({1: 1}) or True or dict({2: 2}) # SIM222 - 73 |+a or dict({1: 1}) # SIM222 -74 74 | -75 75 | a or set() or True # SIM222 -76 76 | +70 | +71 | a or {1: 1} or True or {2: 2} # SIM222 +72 | + - a or dict({1: 1}) or True or dict({2: 2}) # SIM222 +73 + a or dict({1: 1}) # SIM222 +74 | +75 | a or set() or True # SIM222 +76 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:75:6 @@ -439,16 +419,15 @@ SIM222 [*] Use `True` instead of `... or True` 77 | a or set(set()) or True # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -72 72 | -73 73 | a or dict({1: 1}) or True or dict({2: 2}) # SIM222 -74 74 | -75 |-a or set() or True # SIM222 - 75 |+a or True # SIM222 -76 76 | -77 77 | a or set(set()) or True # SIM222 -78 78 | +72 | +73 | a or dict({1: 1}) or True or dict({2: 2}) # SIM222 +74 | + - a or set() or True # SIM222 +75 + a or True # SIM222 +76 | +77 | a or set(set()) or True # SIM222 +78 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:77:6 @@ -461,16 +440,15 @@ SIM222 [*] Use `True` instead of `... or True` 79 | a or {1} or True or {2} # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -74 74 | -75 75 | a or set() or True # SIM222 -76 76 | -77 |-a or set(set()) or True # SIM222 - 77 |+a or True # SIM222 -78 78 | -79 79 | a or {1} or True or {2} # SIM222 -80 80 | +74 | +75 | a or set() or True # SIM222 +76 | + - a or set(set()) or True # SIM222 +77 + a or True # SIM222 +78 | +79 | a or {1} or True or {2} # SIM222 +80 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `{1}` instead of `{1} or ...` --> SIM222.py:79:6 @@ -483,16 +461,15 @@ SIM222 [*] Use `{1}` instead of `{1} or ...` 81 | a or set({1}) or True or set({2}) # SIM222 | help: Replace with `{1}` - -ℹ Unsafe fix -76 76 | -77 77 | a or set(set()) or True # SIM222 -78 78 | -79 |-a or {1} or True or {2} # SIM222 - 79 |+a or {1} # SIM222 -80 80 | -81 81 | a or set({1}) or True or set({2}) # SIM222 -82 82 | +76 | +77 | a or set(set()) or True # SIM222 +78 | + - a or {1} or True or {2} # SIM222 +79 + a or {1} # SIM222 +80 | +81 | a or set({1}) or True or set({2}) # SIM222 +82 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `set({1})` instead of `set({1}) or ...` --> SIM222.py:81:6 @@ -505,16 +482,15 @@ SIM222 [*] Use `set({1})` instead of `set({1}) or ...` 83 | a or () or True # SIM222 | help: Replace with `set({1})` - -ℹ Unsafe fix -78 78 | -79 79 | a or {1} or True or {2} # SIM222 -80 80 | -81 |-a or set({1}) or True or set({2}) # SIM222 - 81 |+a or set({1}) # SIM222 -82 82 | -83 83 | a or () or True # SIM222 -84 84 | +78 | +79 | a or {1} or True or {2} # SIM222 +80 | + - a or set({1}) or True or set({2}) # SIM222 +81 + a or set({1}) # SIM222 +82 | +83 | a or () or True # SIM222 +84 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:83:6 @@ -527,16 +503,15 @@ SIM222 [*] Use `True` instead of `... or True` 85 | a or tuple(()) or True # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -80 80 | -81 81 | a or set({1}) or True or set({2}) # SIM222 -82 82 | -83 |-a or () or True # SIM222 - 83 |+a or True # SIM222 -84 84 | -85 85 | a or tuple(()) or True # SIM222 -86 86 | +80 | +81 | a or set({1}) or True or set({2}) # SIM222 +82 | + - a or () or True # SIM222 +83 + a or True # SIM222 +84 | +85 | a or tuple(()) or True # SIM222 +86 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:85:6 @@ -549,16 +524,15 @@ SIM222 [*] Use `True` instead of `... or True` 87 | a or (1,) or True or (2,) # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -82 82 | -83 83 | a or () or True # SIM222 -84 84 | -85 |-a or tuple(()) or True # SIM222 - 85 |+a or True # SIM222 -86 86 | -87 87 | a or (1,) or True or (2,) # SIM222 -88 88 | +82 | +83 | a or () or True # SIM222 +84 | + - a or tuple(()) or True # SIM222 +85 + a or True # SIM222 +86 | +87 | a or (1,) or True or (2,) # SIM222 +88 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `(1,)` instead of `(1,) or ...` --> SIM222.py:87:6 @@ -571,16 +545,15 @@ SIM222 [*] Use `(1,)` instead of `(1,) or ...` 89 | a or tuple((1,)) or True or tuple((2,)) # SIM222 | help: Replace with `(1,)` - -ℹ Unsafe fix -84 84 | -85 85 | a or tuple(()) or True # SIM222 -86 86 | -87 |-a or (1,) or True or (2,) # SIM222 - 87 |+a or (1,) # SIM222 -88 88 | -89 89 | a or tuple((1,)) or True or tuple((2,)) # SIM222 -90 90 | +84 | +85 | a or tuple(()) or True # SIM222 +86 | + - a or (1,) or True or (2,) # SIM222 +87 + a or (1,) # SIM222 +88 | +89 | a or tuple((1,)) or True or tuple((2,)) # SIM222 +90 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `tuple((1,))` instead of `tuple((1,)) or ...` --> SIM222.py:89:6 @@ -593,16 +566,15 @@ SIM222 [*] Use `tuple((1,))` instead of `tuple((1,)) or ...` 91 | a or frozenset() or True # SIM222 | help: Replace with `tuple((1,))` - -ℹ Unsafe fix -86 86 | -87 87 | a or (1,) or True or (2,) # SIM222 -88 88 | -89 |-a or tuple((1,)) or True or tuple((2,)) # SIM222 - 89 |+a or tuple((1,)) # SIM222 -90 90 | -91 91 | a or frozenset() or True # SIM222 -92 92 | +86 | +87 | a or (1,) or True or (2,) # SIM222 +88 | + - a or tuple((1,)) or True or tuple((2,)) # SIM222 +89 + a or tuple((1,)) # SIM222 +90 | +91 | a or frozenset() or True # SIM222 +92 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:91:6 @@ -615,16 +587,15 @@ SIM222 [*] Use `True` instead of `... or True` 93 | a or frozenset(frozenset()) or True # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -88 88 | -89 89 | a or tuple((1,)) or True or tuple((2,)) # SIM222 -90 90 | -91 |-a or frozenset() or True # SIM222 - 91 |+a or True # SIM222 -92 92 | -93 93 | a or frozenset(frozenset()) or True # SIM222 -94 94 | +88 | +89 | a or tuple((1,)) or True or tuple((2,)) # SIM222 +90 | + - a or frozenset() or True # SIM222 +91 + a or True # SIM222 +92 | +93 | a or frozenset(frozenset()) or True # SIM222 +94 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True` --> SIM222.py:93:6 @@ -637,16 +608,15 @@ SIM222 [*] Use `True` instead of `... or True` 95 | a or frozenset({1}) or True or frozenset({2}) # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -90 90 | -91 91 | a or frozenset() or True # SIM222 -92 92 | -93 |-a or frozenset(frozenset()) or True # SIM222 - 93 |+a or True # SIM222 -94 94 | -95 95 | a or frozenset({1}) or True or frozenset({2}) # SIM222 -96 96 | +90 | +91 | a or frozenset() or True # SIM222 +92 | + - a or frozenset(frozenset()) or True # SIM222 +93 + a or True # SIM222 +94 | +95 | a or frozenset({1}) or True or frozenset({2}) # SIM222 +96 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `frozenset({1})` instead of `frozenset({1}) or ...` --> SIM222.py:95:6 @@ -659,16 +629,15 @@ SIM222 [*] Use `frozenset({1})` instead of `frozenset({1}) or ...` 97 | a or frozenset(frozenset({1})) or True or frozenset(frozenset({2})) # SIM222 | help: Replace with `frozenset({1})` - -ℹ Unsafe fix -92 92 | -93 93 | a or frozenset(frozenset()) or True # SIM222 -94 94 | -95 |-a or frozenset({1}) or True or frozenset({2}) # SIM222 - 95 |+a or frozenset({1}) # SIM222 -96 96 | -97 97 | a or frozenset(frozenset({1})) or True or frozenset(frozenset({2})) # SIM222 -98 98 | +92 | +93 | a or frozenset(frozenset()) or True # SIM222 +94 | + - a or frozenset({1}) or True or frozenset({2}) # SIM222 +95 + a or frozenset({1}) # SIM222 +96 | +97 | a or frozenset(frozenset({1})) or True or frozenset(frozenset({2})) # SIM222 +98 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `frozenset(frozenset({1}))` instead of `frozenset(frozenset({1})) or ...` --> SIM222.py:97:6 @@ -679,16 +648,15 @@ SIM222 [*] Use `frozenset(frozenset({1}))` instead of `frozenset(frozenset({1})) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `frozenset(frozenset({1}))` - -ℹ Unsafe fix -94 94 | -95 95 | a or frozenset({1}) or True or frozenset({2}) # SIM222 -96 96 | -97 |-a or frozenset(frozenset({1})) or True or frozenset(frozenset({2})) # SIM222 - 97 |+a or frozenset(frozenset({1})) # SIM222 -98 98 | -99 99 | -100 100 | # Inside test `a` is simplified. +94 | +95 | a or frozenset({1}) or True or frozenset({2}) # SIM222 +96 | + - a or frozenset(frozenset({1})) or True or frozenset(frozenset({2})) # SIM222 +97 + a or frozenset(frozenset({1})) # SIM222 +98 | +99 | +100 | # Inside test `a` is simplified. +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:102:6 @@ -701,16 +669,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 104 | assert a or [1] or True or [2] # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -99 99 | -100 100 | # Inside test `a` is simplified. -101 101 | -102 |-bool(a or [1] or True or [2]) # SIM222 - 102 |+bool(True) # SIM222 -103 103 | -104 104 | assert a or [1] or True or [2] # SIM222 -105 105 | +99 | +100 | # Inside test `a` is simplified. +101 | + - bool(a or [1] or True or [2]) # SIM222 +102 + bool(True) # SIM222 +103 | +104 | assert a or [1] or True or [2] # SIM222 +105 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:104:8 @@ -723,16 +690,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -101 101 | -102 102 | bool(a or [1] or True or [2]) # SIM222 -103 103 | -104 |-assert a or [1] or True or [2] # SIM222 - 104 |+assert True # SIM222 -105 105 | -106 106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 -107 107 | pass +101 | +102 | bool(a or [1] or True or [2]) # SIM222 +103 | + - assert a or [1] or True or [2] # SIM222 +104 + assert True # SIM222 +105 | +106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 +107 | pass +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:106:5 @@ -744,16 +710,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 107 | pass | help: Replace with `True` - -ℹ Unsafe fix -103 103 | -104 104 | assert a or [1] or True or [2] # SIM222 -105 105 | -106 |-if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 - 106 |+if (True) and (a or [1] or True or [2]): # SIM222 -107 107 | pass -108 108 | -109 109 | 0 if a or [1] or True or [2] else 1 # SIM222 +103 | +104 | assert a or [1] or True or [2] # SIM222 +105 | + - if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 +106 + if (True) and (a or [1] or True or [2]): # SIM222 +107 | pass +108 | +109 | 0 if a or [1] or True or [2] else 1 # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:106:35 @@ -765,16 +730,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 107 | pass | help: Replace with `True` - -ℹ Unsafe fix -103 103 | -104 104 | assert a or [1] or True or [2] # SIM222 -105 105 | -106 |-if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 - 106 |+if (a or [1] or True or [2]) and (True): # SIM222 -107 107 | pass -108 108 | -109 109 | 0 if a or [1] or True or [2] else 1 # SIM222 +103 | +104 | assert a or [1] or True or [2] # SIM222 +105 | + - if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 +106 + if (a or [1] or True or [2]) and (True): # SIM222 +107 | pass +108 | +109 | 0 if a or [1] or True or [2] else 1 # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:109:6 @@ -787,16 +751,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 111 | while a or [1] or True or [2]: # SIM222 | help: Replace with `True` - -ℹ Unsafe fix -106 106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 -107 107 | pass -108 108 | -109 |-0 if a or [1] or True or [2] else 1 # SIM222 - 109 |+0 if True else 1 # SIM222 -110 110 | -111 111 | while a or [1] or True or [2]: # SIM222 -112 112 | pass +106 | if (a or [1] or True or [2]) and (a or [1] or True or [2]): # SIM222 +107 | pass +108 | + - 0 if a or [1] or True or [2] else 1 # SIM222 +109 + 0 if True else 1 # SIM222 +110 | +111 | while a or [1] or True or [2]: # SIM222 +112 | pass +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:111:7 @@ -808,16 +771,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 112 | pass | help: Replace with `True` - -ℹ Unsafe fix -108 108 | -109 109 | 0 if a or [1] or True or [2] else 1 # SIM222 -110 110 | -111 |-while a or [1] or True or [2]: # SIM222 - 111 |+while True: # SIM222 -112 112 | pass -113 113 | -114 114 | [ +108 | +109 | 0 if a or [1] or True or [2] else 1 # SIM222 +110 | + - while a or [1] or True or [2]: # SIM222 +111 + while True: # SIM222 +112 | pass +113 | +114 | [ +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:118:8 @@ -830,16 +792,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 120 | ] | help: Replace with `True` - -ℹ Unsafe fix -115 115 | 0 -116 116 | for a in range(10) -117 117 | for b in range(10) -118 |- if a or [1] or True or [2] # SIM222 - 118 |+ if True # SIM222 -119 119 | if b or [1] or True or [2] # SIM222 -120 120 | ] -121 121 | +115 | 0 +116 | for a in range(10) +117 | for b in range(10) + - if a or [1] or True or [2] # SIM222 +118 + if True # SIM222 +119 | if b or [1] or True or [2] # SIM222 +120 | ] +121 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:119:8 @@ -851,16 +812,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 120 | ] | help: Replace with `True` - -ℹ Unsafe fix -116 116 | for a in range(10) -117 117 | for b in range(10) -118 118 | if a or [1] or True or [2] # SIM222 -119 |- if b or [1] or True or [2] # SIM222 - 119 |+ if True # SIM222 -120 120 | ] -121 121 | -122 122 | { +116 | for a in range(10) +117 | for b in range(10) +118 | if a or [1] or True or [2] # SIM222 + - if b or [1] or True or [2] # SIM222 +119 + if True # SIM222 +120 | ] +121 | +122 | { +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:126:8 @@ -873,16 +833,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 128 | } | help: Replace with `True` - -ℹ Unsafe fix -123 123 | 0 -124 124 | for a in range(10) -125 125 | for b in range(10) -126 |- if a or [1] or True or [2] # SIM222 - 126 |+ if True # SIM222 -127 127 | if b or [1] or True or [2] # SIM222 -128 128 | } -129 129 | +123 | 0 +124 | for a in range(10) +125 | for b in range(10) + - if a or [1] or True or [2] # SIM222 +126 + if True # SIM222 +127 | if b or [1] or True or [2] # SIM222 +128 | } +129 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:127:8 @@ -894,16 +853,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 128 | } | help: Replace with `True` - -ℹ Unsafe fix -124 124 | for a in range(10) -125 125 | for b in range(10) -126 126 | if a or [1] or True or [2] # SIM222 -127 |- if b or [1] or True or [2] # SIM222 - 127 |+ if True # SIM222 -128 128 | } -129 129 | -130 130 | { +124 | for a in range(10) +125 | for b in range(10) +126 | if a or [1] or True or [2] # SIM222 + - if b or [1] or True or [2] # SIM222 +127 + if True # SIM222 +128 | } +129 | +130 | { +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:134:8 @@ -916,16 +874,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 136 | } | help: Replace with `True` - -ℹ Unsafe fix -131 131 | 0: 0 -132 132 | for a in range(10) -133 133 | for b in range(10) -134 |- if a or [1] or True or [2] # SIM222 - 134 |+ if True # SIM222 -135 135 | if b or [1] or True or [2] # SIM222 -136 136 | } -137 137 | +131 | 0: 0 +132 | for a in range(10) +133 | for b in range(10) + - if a or [1] or True or [2] # SIM222 +134 + if True # SIM222 +135 | if b or [1] or True or [2] # SIM222 +136 | } +137 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:135:8 @@ -937,16 +894,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 136 | } | help: Replace with `True` - -ℹ Unsafe fix -132 132 | for a in range(10) -133 133 | for b in range(10) -134 134 | if a or [1] or True or [2] # SIM222 -135 |- if b or [1] or True or [2] # SIM222 - 135 |+ if True # SIM222 -136 136 | } -137 137 | -138 138 | ( +132 | for a in range(10) +133 | for b in range(10) +134 | if a or [1] or True or [2] # SIM222 + - if b or [1] or True or [2] # SIM222 +135 + if True # SIM222 +136 | } +137 | +138 | ( +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:142:8 @@ -959,16 +915,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 144 | ) | help: Replace with `True` - -ℹ Unsafe fix -139 139 | 0 -140 140 | for a in range(10) -141 141 | for b in range(10) -142 |- if a or [1] or True or [2] # SIM222 - 142 |+ if True # SIM222 -143 143 | if b or [1] or True or [2] # SIM222 -144 144 | ) -145 145 | +139 | 0 +140 | for a in range(10) +141 | for b in range(10) + - if a or [1] or True or [2] # SIM222 +142 + if True # SIM222 +143 | if b or [1] or True or [2] # SIM222 +144 | ) +145 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `True` instead of `... or True or ...` --> SIM222.py:143:8 @@ -980,16 +935,15 @@ SIM222 [*] Use `True` instead of `... or True or ...` 144 | ) | help: Replace with `True` - -ℹ Unsafe fix -140 140 | for a in range(10) -141 141 | for b in range(10) -142 142 | if a or [1] or True or [2] # SIM222 -143 |- if b or [1] or True or [2] # SIM222 - 143 |+ if True # SIM222 -144 144 | ) -145 145 | -146 146 | # Outside test `a` is not simplified. +140 | for a in range(10) +141 | for b in range(10) +142 | if a or [1] or True or [2] # SIM222 + - if b or [1] or True or [2] # SIM222 +143 + if True # SIM222 +144 | ) +145 | +146 | # Outside test `a` is not simplified. +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `[1]` instead of `[1] or ...` --> SIM222.py:148:6 @@ -1002,16 +956,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...` 150 | if (a or [1] or True or [2]) == (a or [1]): # SIM222 | help: Replace with `[1]` - -ℹ Unsafe fix -145 145 | -146 146 | # Outside test `a` is not simplified. -147 147 | -148 |-a or [1] or True or [2] # SIM222 - 148 |+a or [1] # SIM222 -149 149 | -150 150 | if (a or [1] or True or [2]) == (a or [1]): # SIM222 -151 151 | pass +145 | +146 | # Outside test `a` is not simplified. +147 | + - a or [1] or True or [2] # SIM222 +148 + a or [1] # SIM222 +149 | +150 | if (a or [1] or True or [2]) == (a or [1]): # SIM222 +151 | pass +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `[1]` instead of `[1] or ...` --> SIM222.py:150:10 @@ -1023,16 +976,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...` 151 | pass | help: Replace with `[1]` - -ℹ Unsafe fix -147 147 | -148 148 | a or [1] or True or [2] # SIM222 -149 149 | -150 |-if (a or [1] or True or [2]) == (a or [1]): # SIM222 - 150 |+if (a or [1]) == (a or [1]): # SIM222 -151 151 | pass -152 152 | -153 153 | if f(a or [1] or True or [2]): # SIM222 +147 | +148 | a or [1] or True or [2] # SIM222 +149 | + - if (a or [1] or True or [2]) == (a or [1]): # SIM222 +150 + if (a or [1]) == (a or [1]): # SIM222 +151 | pass +152 | +153 | if f(a or [1] or True or [2]): # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `[1]` instead of `[1] or ...` --> SIM222.py:153:11 @@ -1044,16 +996,15 @@ SIM222 [*] Use `[1]` instead of `[1] or ...` 154 | pass | help: Replace with `[1]` - -ℹ Unsafe fix -150 150 | if (a or [1] or True or [2]) == (a or [1]): # SIM222 -151 151 | pass -152 152 | -153 |-if f(a or [1] or True or [2]): # SIM222 - 153 |+if f(a or [1]): # SIM222 -154 154 | pass -155 155 | -156 156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099 +150 | if (a or [1] or True or [2]) == (a or [1]): # SIM222 +151 | pass +152 | + - if f(a or [1] or True or [2]): # SIM222 +153 + if f(a or [1]): # SIM222 +154 | pass +155 | +156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099 +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...` --> SIM222.py:157:30 @@ -1064,16 +1015,15 @@ SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...` 158 | m, s = divmod(s0, 60) | help: Replace with `(int, int, int)` - -ℹ Unsafe fix -154 154 | pass -155 155 | -156 156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099 -157 |-def secondToTime(s0: int) -> (int, int, int) or str: - 157 |+def secondToTime(s0: int) -> (int, int, int): -158 158 | m, s = divmod(s0, 60) -159 159 | -160 160 | +154 | pass +155 | +156 | # Regression test for: https://github.com/astral-sh/ruff/issues/7099 + - def secondToTime(s0: int) -> (int, int, int) or str: +157 + def secondToTime(s0: int) -> (int, int, int): +158 | m, s = divmod(s0, 60) +159 | +160 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...` --> SIM222.py:161:31 @@ -1083,16 +1033,15 @@ SIM222 [*] Use `(int, int, int)` instead of `(int, int, int) or ...` 162 | m, s = divmod(s0, 60) | help: Replace with `(int, int, int)` - -ℹ Unsafe fix -158 158 | m, s = divmod(s0, 60) -159 159 | -160 160 | -161 |-def secondToTime(s0: int) -> ((int, int, int) or str): - 161 |+def secondToTime(s0: int) -> ((int, int, int)): -162 162 | m, s = divmod(s0, 60) -163 163 | -164 164 | +158 | m, s = divmod(s0, 60) +159 | +160 | + - def secondToTime(s0: int) -> ((int, int, int) or str): +161 + def secondToTime(s0: int) -> ((int, int, int)): +162 | m, s = divmod(s0, 60) +163 | +164 | +note: This is an unsafe fix and may change runtime behavior SIM222 [*] Use `"bar"` instead of `... or "bar"` --> SIM222.py:168:7 @@ -1104,13 +1053,12 @@ SIM222 [*] Use `"bar"` instead of `... or "bar"` 169 | print(f"{1}{''}" or "bar") | help: Replace with `"bar"` - -ℹ Unsafe fix -165 165 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479 -166 166 | print(f"{a}{b}" or "bar") -167 167 | print(f"{a}{''}" or "bar") -168 |-print(f"{''}{''}" or "bar") - 168 |+print("bar") -169 169 | print(f"{1}{''}" or "bar") -170 170 | -171 171 | +165 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479 +166 | print(f"{a}{b}" or "bar") +167 | print(f"{a}{''}" or "bar") + - print(f"{''}{''}" or "bar") +168 + print("bar") +169 | print(f"{1}{''}" or "bar") +170 | +171 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap index c95fe3335a..4fe01c8146 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM223_SIM223.py.snap @@ -9,13 +9,12 @@ SIM223 [*] Use `False` instead of `... and False` 2 | pass | help: Replace with `False` - -ℹ Unsafe fix -1 |-if a and False: # SIM223 - 1 |+if False: # SIM223 -2 2 | pass -3 3 | -4 4 | if (a or b) and False: # SIM223 + - if a and False: # SIM223 +1 + if False: # SIM223 +2 | pass +3 | +4 | if (a or b) and False: # SIM223 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False` --> SIM223.py:4:4 @@ -27,16 +26,15 @@ SIM223 [*] Use `False` instead of `... and False` 5 | pass | help: Replace with `False` - -ℹ Unsafe fix -1 1 | if a and False: # SIM223 -2 2 | pass -3 3 | -4 |-if (a or b) and False: # SIM223 - 4 |+if False: # SIM223 -5 5 | pass -6 6 | -7 7 | if a or (b and False): # SIM223 +1 | if a and False: # SIM223 +2 | pass +3 | + - if (a or b) and False: # SIM223 +4 + if False: # SIM223 +5 | pass +6 | +7 | if a or (b and False): # SIM223 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False` --> SIM223.py:7:10 @@ -48,16 +46,15 @@ SIM223 [*] Use `False` instead of `... and False` 8 | pass | help: Replace with `False` - -ℹ Unsafe fix -4 4 | if (a or b) and False: # SIM223 -5 5 | pass -6 6 | -7 |-if a or (b and False): # SIM223 - 7 |+if a or (False): # SIM223 -8 8 | pass -9 9 | -10 10 | if a or False: +4 | if (a or b) and False: # SIM223 +5 | pass +6 | + - if a or (b and False): # SIM223 +7 + if a or (False): # SIM223 +8 | pass +9 | +10 | if a or False: +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `False and ...` --> SIM223.py:19:18 @@ -69,16 +66,15 @@ SIM223 [*] Use `False` instead of `False and ...` 20 | pass | help: Replace with `False` - -ℹ Unsafe fix -16 16 | if a and f() and b and g() and False: # OK -17 17 | pass -18 18 | -19 |-if a and f() and False and g() and b: # SIM223 - 19 |+if a and f() and False: # SIM223 -20 20 | pass -21 21 | -22 22 | if False and f() and a and g() and b: # SIM223 +16 | if a and f() and b and g() and False: # OK +17 | pass +18 | + - if a and f() and False and g() and b: # SIM223 +19 + if a and f() and False: # SIM223 +20 | pass +21 | +22 | if False and f() and a and g() and b: # SIM223 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `False and ...` --> SIM223.py:22:4 @@ -90,16 +86,15 @@ SIM223 [*] Use `False` instead of `False and ...` 23 | pass | help: Replace with `False` - -ℹ Unsafe fix -19 19 | if a and f() and False and g() and b: # SIM223 -20 20 | pass -21 21 | -22 |-if False and f() and a and g() and b: # SIM223 - 22 |+if False: # SIM223 -23 23 | pass -24 24 | -25 25 | if a and False and f() and b and g(): # SIM223 +19 | if a and f() and False and g() and b: # SIM223 +20 | pass +21 | + - if False and f() and a and g() and b: # SIM223 +22 + if False: # SIM223 +23 | pass +24 | +25 | if a and False and f() and b and g(): # SIM223 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:25:4 @@ -111,16 +106,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 26 | pass | help: Replace with `False` - -ℹ Unsafe fix -22 22 | if False and f() and a and g() and b: # SIM223 -23 23 | pass -24 24 | -25 |-if a and False and f() and b and g(): # SIM223 - 25 |+if False: # SIM223 -26 26 | pass -27 27 | -28 28 | +22 | if False and f() and a and g() and b: # SIM223 +23 | pass +24 | + - if a and False and f() and b and g(): # SIM223 +25 + if False: # SIM223 +26 | pass +27 | +28 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `""` instead of `"" and ...` --> SIM223.py:42:7 @@ -131,16 +125,15 @@ SIM223 [*] Use `""` instead of `"" and ...` 44 | a and "foo" and False and "bar" # SIM223 | help: Replace with `""` - -ℹ Unsafe fix -39 39 | pass -40 40 | -41 41 | -42 |-a and "" and False # SIM223 - 42 |+a and "" # SIM223 -43 43 | -44 44 | a and "foo" and False and "bar" # SIM223 -45 45 | +39 | pass +40 | +41 | + - a and "" and False # SIM223 +42 + a and "" # SIM223 +43 | +44 | a and "foo" and False and "bar" # SIM223 +45 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:44:7 @@ -153,16 +146,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 46 | a and 0 and False # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -41 41 | -42 42 | a and "" and False # SIM223 -43 43 | -44 |-a and "foo" and False and "bar" # SIM223 - 44 |+a and False # SIM223 -45 45 | -46 46 | a and 0 and False # SIM223 -47 47 | +41 | +42 | a and "" and False # SIM223 +43 | + - a and "foo" and False and "bar" # SIM223 +44 + a and False # SIM223 +45 | +46 | a and 0 and False # SIM223 +47 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `0` instead of `0 and ...` --> SIM223.py:46:7 @@ -175,16 +167,15 @@ SIM223 [*] Use `0` instead of `0 and ...` 48 | a and 1 and False and 2 # SIM223 | help: Replace with `0` - -ℹ Unsafe fix -43 43 | -44 44 | a and "foo" and False and "bar" # SIM223 -45 45 | -46 |-a and 0 and False # SIM223 - 46 |+a and 0 # SIM223 -47 47 | -48 48 | a and 1 and False and 2 # SIM223 -49 49 | +43 | +44 | a and "foo" and False and "bar" # SIM223 +45 | + - a and 0 and False # SIM223 +46 + a and 0 # SIM223 +47 | +48 | a and 1 and False and 2 # SIM223 +49 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:48:7 @@ -197,16 +188,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 50 | a and 0.0 and False # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -45 45 | -46 46 | a and 0 and False # SIM223 -47 47 | -48 |-a and 1 and False and 2 # SIM223 - 48 |+a and False # SIM223 -49 49 | -50 50 | a and 0.0 and False # SIM223 -51 51 | +45 | +46 | a and 0 and False # SIM223 +47 | + - a and 1 and False and 2 # SIM223 +48 + a and False # SIM223 +49 | +50 | a and 0.0 and False # SIM223 +51 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `0.0` instead of `0.0 and ...` --> SIM223.py:50:7 @@ -219,16 +209,15 @@ SIM223 [*] Use `0.0` instead of `0.0 and ...` 52 | a and 0.1 and False and 0.2 # SIM223 | help: Replace with `0.0` - -ℹ Unsafe fix -47 47 | -48 48 | a and 1 and False and 2 # SIM223 -49 49 | -50 |-a and 0.0 and False # SIM223 - 50 |+a and 0.0 # SIM223 -51 51 | -52 52 | a and 0.1 and False and 0.2 # SIM223 -53 53 | +47 | +48 | a and 1 and False and 2 # SIM223 +49 | + - a and 0.0 and False # SIM223 +50 + a and 0.0 # SIM223 +51 | +52 | a and 0.1 and False and 0.2 # SIM223 +53 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:52:7 @@ -241,16 +230,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 54 | a and [] and False # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -49 49 | -50 50 | a and 0.0 and False # SIM223 -51 51 | -52 |-a and 0.1 and False and 0.2 # SIM223 - 52 |+a and False # SIM223 -53 53 | -54 54 | a and [] and False # SIM223 -55 55 | +49 | +50 | a and 0.0 and False # SIM223 +51 | + - a and 0.1 and False and 0.2 # SIM223 +52 + a and False # SIM223 +53 | +54 | a and [] and False # SIM223 +55 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `[]` instead of `[] and ...` --> SIM223.py:54:7 @@ -263,16 +251,15 @@ SIM223 [*] Use `[]` instead of `[] and ...` 56 | a and list([]) and False # SIM223 | help: Replace with `[]` - -ℹ Unsafe fix -51 51 | -52 52 | a and 0.1 and False and 0.2 # SIM223 -53 53 | -54 |-a and [] and False # SIM223 - 54 |+a and [] # SIM223 -55 55 | -56 56 | a and list([]) and False # SIM223 -57 57 | +51 | +52 | a and 0.1 and False and 0.2 # SIM223 +53 | + - a and [] and False # SIM223 +54 + a and [] # SIM223 +55 | +56 | a and list([]) and False # SIM223 +57 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `list([])` instead of `list([]) and ...` --> SIM223.py:56:7 @@ -285,16 +272,15 @@ SIM223 [*] Use `list([])` instead of `list([]) and ...` 58 | a and [1] and False and [2] # SIM223 | help: Replace with `list([])` - -ℹ Unsafe fix -53 53 | -54 54 | a and [] and False # SIM223 -55 55 | -56 |-a and list([]) and False # SIM223 - 56 |+a and list([]) # SIM223 -57 57 | -58 58 | a and [1] and False and [2] # SIM223 -59 59 | +53 | +54 | a and [] and False # SIM223 +55 | + - a and list([]) and False # SIM223 +56 + a and list([]) # SIM223 +57 | +58 | a and [1] and False and [2] # SIM223 +59 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:58:7 @@ -307,16 +293,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 60 | a and list([1]) and False and list([2]) # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -55 55 | -56 56 | a and list([]) and False # SIM223 -57 57 | -58 |-a and [1] and False and [2] # SIM223 - 58 |+a and False # SIM223 -59 59 | -60 60 | a and list([1]) and False and list([2]) # SIM223 -61 61 | +55 | +56 | a and list([]) and False # SIM223 +57 | + - a and [1] and False and [2] # SIM223 +58 + a and False # SIM223 +59 | +60 | a and list([1]) and False and list([2]) # SIM223 +61 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:60:7 @@ -329,16 +314,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 62 | a and {} and False # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -57 57 | -58 58 | a and [1] and False and [2] # SIM223 -59 59 | -60 |-a and list([1]) and False and list([2]) # SIM223 - 60 |+a and False # SIM223 -61 61 | -62 62 | a and {} and False # SIM223 -63 63 | +57 | +58 | a and [1] and False and [2] # SIM223 +59 | + - a and list([1]) and False and list([2]) # SIM223 +60 + a and False # SIM223 +61 | +62 | a and {} and False # SIM223 +63 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `{}` instead of `{} and ...` --> SIM223.py:62:7 @@ -351,16 +335,15 @@ SIM223 [*] Use `{}` instead of `{} and ...` 64 | a and dict() and False # SIM223 | help: Replace with `{}` - -ℹ Unsafe fix -59 59 | -60 60 | a and list([1]) and False and list([2]) # SIM223 -61 61 | -62 |-a and {} and False # SIM223 - 62 |+a and {} # SIM223 -63 63 | -64 64 | a and dict() and False # SIM223 -65 65 | +59 | +60 | a and list([1]) and False and list([2]) # SIM223 +61 | + - a and {} and False # SIM223 +62 + a and {} # SIM223 +63 | +64 | a and dict() and False # SIM223 +65 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `dict()` instead of `dict() and ...` --> SIM223.py:64:7 @@ -373,16 +356,15 @@ SIM223 [*] Use `dict()` instead of `dict() and ...` 66 | a and {1: 1} and False and {2: 2} # SIM223 | help: Replace with `dict()` - -ℹ Unsafe fix -61 61 | -62 62 | a and {} and False # SIM223 -63 63 | -64 |-a and dict() and False # SIM223 - 64 |+a and dict() # SIM223 -65 65 | -66 66 | a and {1: 1} and False and {2: 2} # SIM223 -67 67 | +61 | +62 | a and {} and False # SIM223 +63 | + - a and dict() and False # SIM223 +64 + a and dict() # SIM223 +65 | +66 | a and {1: 1} and False and {2: 2} # SIM223 +67 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:66:7 @@ -395,16 +377,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 68 | a and dict({1: 1}) and False and dict({2: 2}) # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -63 63 | -64 64 | a and dict() and False # SIM223 -65 65 | -66 |-a and {1: 1} and False and {2: 2} # SIM223 - 66 |+a and False # SIM223 -67 67 | -68 68 | a and dict({1: 1}) and False and dict({2: 2}) # SIM223 -69 69 | +63 | +64 | a and dict() and False # SIM223 +65 | + - a and {1: 1} and False and {2: 2} # SIM223 +66 + a and False # SIM223 +67 | +68 | a and dict({1: 1}) and False and dict({2: 2}) # SIM223 +69 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:68:7 @@ -417,16 +398,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 70 | a and set() and False # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -65 65 | -66 66 | a and {1: 1} and False and {2: 2} # SIM223 -67 67 | -68 |-a and dict({1: 1}) and False and dict({2: 2}) # SIM223 - 68 |+a and False # SIM223 -69 69 | -70 70 | a and set() and False # SIM223 -71 71 | +65 | +66 | a and {1: 1} and False and {2: 2} # SIM223 +67 | + - a and dict({1: 1}) and False and dict({2: 2}) # SIM223 +68 + a and False # SIM223 +69 | +70 | a and set() and False # SIM223 +71 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `set()` instead of `set() and ...` --> SIM223.py:70:7 @@ -439,16 +419,15 @@ SIM223 [*] Use `set()` instead of `set() and ...` 72 | a and set(set()) and False # SIM223 | help: Replace with `set()` - -ℹ Unsafe fix -67 67 | -68 68 | a and dict({1: 1}) and False and dict({2: 2}) # SIM223 -69 69 | -70 |-a and set() and False # SIM223 - 70 |+a and set() # SIM223 -71 71 | -72 72 | a and set(set()) and False # SIM223 -73 73 | +67 | +68 | a and dict({1: 1}) and False and dict({2: 2}) # SIM223 +69 | + - a and set() and False # SIM223 +70 + a and set() # SIM223 +71 | +72 | a and set(set()) and False # SIM223 +73 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `set(set())` instead of `set(set()) and ...` --> SIM223.py:72:7 @@ -461,16 +440,15 @@ SIM223 [*] Use `set(set())` instead of `set(set()) and ...` 74 | a and {1} and False and {2} # SIM223 | help: Replace with `set(set())` - -ℹ Unsafe fix -69 69 | -70 70 | a and set() and False # SIM223 -71 71 | -72 |-a and set(set()) and False # SIM223 - 72 |+a and set(set()) # SIM223 -73 73 | -74 74 | a and {1} and False and {2} # SIM223 -75 75 | +69 | +70 | a and set() and False # SIM223 +71 | + - a and set(set()) and False # SIM223 +72 + a and set(set()) # SIM223 +73 | +74 | a and {1} and False and {2} # SIM223 +75 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:74:7 @@ -483,16 +461,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 76 | a and set({1}) and False and set({2}) # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -71 71 | -72 72 | a and set(set()) and False # SIM223 -73 73 | -74 |-a and {1} and False and {2} # SIM223 - 74 |+a and False # SIM223 -75 75 | -76 76 | a and set({1}) and False and set({2}) # SIM223 -77 77 | +71 | +72 | a and set(set()) and False # SIM223 +73 | + - a and {1} and False and {2} # SIM223 +74 + a and False # SIM223 +75 | +76 | a and set({1}) and False and set({2}) # SIM223 +77 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:76:7 @@ -505,16 +482,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 78 | a and () and False # SIM222 | help: Replace with `False` - -ℹ Unsafe fix -73 73 | -74 74 | a and {1} and False and {2} # SIM223 -75 75 | -76 |-a and set({1}) and False and set({2}) # SIM223 - 76 |+a and False # SIM223 -77 77 | -78 78 | a and () and False # SIM222 -79 79 | +73 | +74 | a and {1} and False and {2} # SIM223 +75 | + - a and set({1}) and False and set({2}) # SIM223 +76 + a and False # SIM223 +77 | +78 | a and () and False # SIM222 +79 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `()` instead of `() and ...` --> SIM223.py:78:7 @@ -527,16 +503,15 @@ SIM223 [*] Use `()` instead of `() and ...` 80 | a and tuple(()) and False # SIM222 | help: Replace with `()` - -ℹ Unsafe fix -75 75 | -76 76 | a and set({1}) and False and set({2}) # SIM223 -77 77 | -78 |-a and () and False # SIM222 - 78 |+a and () # SIM222 -79 79 | -80 80 | a and tuple(()) and False # SIM222 -81 81 | +75 | +76 | a and set({1}) and False and set({2}) # SIM223 +77 | + - a and () and False # SIM222 +78 + a and () # SIM222 +79 | +80 | a and tuple(()) and False # SIM222 +81 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `tuple(())` instead of `tuple(()) and ...` --> SIM223.py:80:7 @@ -549,16 +524,15 @@ SIM223 [*] Use `tuple(())` instead of `tuple(()) and ...` 82 | a and (1,) and False and (2,) # SIM222 | help: Replace with `tuple(())` - -ℹ Unsafe fix -77 77 | -78 78 | a and () and False # SIM222 -79 79 | -80 |-a and tuple(()) and False # SIM222 - 80 |+a and tuple(()) # SIM222 -81 81 | -82 82 | a and (1,) and False and (2,) # SIM222 -83 83 | +77 | +78 | a and () and False # SIM222 +79 | + - a and tuple(()) and False # SIM222 +80 + a and tuple(()) # SIM222 +81 | +82 | a and (1,) and False and (2,) # SIM222 +83 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:82:7 @@ -571,16 +545,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 84 | a and tuple((1,)) and False and tuple((2,)) # SIM222 | help: Replace with `False` - -ℹ Unsafe fix -79 79 | -80 80 | a and tuple(()) and False # SIM222 -81 81 | -82 |-a and (1,) and False and (2,) # SIM222 - 82 |+a and False # SIM222 -83 83 | -84 84 | a and tuple((1,)) and False and tuple((2,)) # SIM222 -85 85 | +79 | +80 | a and tuple(()) and False # SIM222 +81 | + - a and (1,) and False and (2,) # SIM222 +82 + a and False # SIM222 +83 | +84 | a and tuple((1,)) and False and tuple((2,)) # SIM222 +85 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:84:7 @@ -593,16 +566,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 86 | a and frozenset() and False # SIM222 | help: Replace with `False` - -ℹ Unsafe fix -81 81 | -82 82 | a and (1,) and False and (2,) # SIM222 -83 83 | -84 |-a and tuple((1,)) and False and tuple((2,)) # SIM222 - 84 |+a and False # SIM222 -85 85 | -86 86 | a and frozenset() and False # SIM222 -87 87 | +81 | +82 | a and (1,) and False and (2,) # SIM222 +83 | + - a and tuple((1,)) and False and tuple((2,)) # SIM222 +84 + a and False # SIM222 +85 | +86 | a and frozenset() and False # SIM222 +87 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `frozenset()` instead of `frozenset() and ...` --> SIM223.py:86:7 @@ -615,16 +587,15 @@ SIM223 [*] Use `frozenset()` instead of `frozenset() and ...` 88 | a and frozenset(frozenset()) and False # SIM222 | help: Replace with `frozenset()` - -ℹ Unsafe fix -83 83 | -84 84 | a and tuple((1,)) and False and tuple((2,)) # SIM222 -85 85 | -86 |-a and frozenset() and False # SIM222 - 86 |+a and frozenset() # SIM222 -87 87 | -88 88 | a and frozenset(frozenset()) and False # SIM222 -89 89 | +83 | +84 | a and tuple((1,)) and False and tuple((2,)) # SIM222 +85 | + - a and frozenset() and False # SIM222 +86 + a and frozenset() # SIM222 +87 | +88 | a and frozenset(frozenset()) and False # SIM222 +89 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `frozenset(frozenset())` instead of `frozenset(frozenset()) and ...` --> SIM223.py:88:7 @@ -637,16 +608,15 @@ SIM223 [*] Use `frozenset(frozenset())` instead of `frozenset(frozenset()) and . 90 | a and frozenset({1}) and False and frozenset({2}) # SIM222 | help: Replace with `frozenset(frozenset())` - -ℹ Unsafe fix -85 85 | -86 86 | a and frozenset() and False # SIM222 -87 87 | -88 |-a and frozenset(frozenset()) and False # SIM222 - 88 |+a and frozenset(frozenset()) # SIM222 -89 89 | -90 90 | a and frozenset({1}) and False and frozenset({2}) # SIM222 -91 91 | +85 | +86 | a and frozenset() and False # SIM222 +87 | + - a and frozenset(frozenset()) and False # SIM222 +88 + a and frozenset(frozenset()) # SIM222 +89 | +90 | a and frozenset({1}) and False and frozenset({2}) # SIM222 +91 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:90:7 @@ -659,16 +629,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 92 | a and frozenset(frozenset({1})) and False and frozenset(frozenset({2})) # SIM222 | help: Replace with `False` - -ℹ Unsafe fix -87 87 | -88 88 | a and frozenset(frozenset()) and False # SIM222 -89 89 | -90 |-a and frozenset({1}) and False and frozenset({2}) # SIM222 - 90 |+a and False # SIM222 -91 91 | -92 92 | a and frozenset(frozenset({1})) and False and frozenset(frozenset({2})) # SIM222 -93 93 | +87 | +88 | a and frozenset(frozenset()) and False # SIM222 +89 | + - a and frozenset({1}) and False and frozenset({2}) # SIM222 +90 + a and False # SIM222 +91 | +92 | a and frozenset(frozenset({1})) and False and frozenset(frozenset({2})) # SIM222 +93 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:92:7 @@ -679,16 +648,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `False` - -ℹ Unsafe fix -89 89 | -90 90 | a and frozenset({1}) and False and frozenset({2}) # SIM222 -91 91 | -92 |-a and frozenset(frozenset({1})) and False and frozenset(frozenset({2})) # SIM222 - 92 |+a and False # SIM222 -93 93 | -94 94 | -95 95 | # Inside test `a` is simplified. +89 | +90 | a and frozenset({1}) and False and frozenset({2}) # SIM222 +91 | + - a and frozenset(frozenset({1})) and False and frozenset(frozenset({2})) # SIM222 +92 + a and False # SIM222 +93 | +94 | +95 | # Inside test `a` is simplified. +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:97:6 @@ -701,16 +669,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 99 | assert a and [] and False and [] # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -94 94 | -95 95 | # Inside test `a` is simplified. -96 96 | -97 |-bool(a and [] and False and []) # SIM223 - 97 |+bool(False) # SIM223 -98 98 | -99 99 | assert a and [] and False and [] # SIM223 -100 100 | +94 | +95 | # Inside test `a` is simplified. +96 | + - bool(a and [] and False and []) # SIM223 +97 + bool(False) # SIM223 +98 | +99 | assert a and [] and False and [] # SIM223 +100 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:99:8 @@ -723,16 +690,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 101 | if (a and [] and False and []) or (a and [] and False and []): # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -96 96 | -97 97 | bool(a and [] and False and []) # SIM223 -98 98 | -99 |-assert a and [] and False and [] # SIM223 - 99 |+assert False # SIM223 -100 100 | -101 101 | if (a and [] and False and []) or (a and [] and False and []): # SIM223 -102 102 | pass +96 | +97 | bool(a and [] and False and []) # SIM223 +98 | + - assert a and [] and False and [] # SIM223 +99 + assert False # SIM223 +100 | +101 | if (a and [] and False and []) or (a and [] and False and []): # SIM223 +102 | pass +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:101:5 @@ -744,16 +710,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 102 | pass | help: Replace with `False` - -ℹ Unsafe fix -98 98 | -99 99 | assert a and [] and False and [] # SIM223 -100 100 | -101 |-if (a and [] and False and []) or (a and [] and False and []): # SIM223 - 101 |+if (False) or (a and [] and False and []): # SIM223 -102 102 | pass -103 103 | -104 104 | 0 if a and [] and False and [] else 1 # SIM222 +98 | +99 | assert a and [] and False and [] # SIM223 +100 | + - if (a and [] and False and []) or (a and [] and False and []): # SIM223 +101 + if (False) or (a and [] and False and []): # SIM223 +102 | pass +103 | +104 | 0 if a and [] and False and [] else 1 # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:101:36 @@ -765,16 +730,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 102 | pass | help: Replace with `False` - -ℹ Unsafe fix -98 98 | -99 99 | assert a and [] and False and [] # SIM223 -100 100 | -101 |-if (a and [] and False and []) or (a and [] and False and []): # SIM223 - 101 |+if (a and [] and False and []) or (False): # SIM223 -102 102 | pass -103 103 | -104 104 | 0 if a and [] and False and [] else 1 # SIM222 +98 | +99 | assert a and [] and False and [] # SIM223 +100 | + - if (a and [] and False and []) or (a and [] and False and []): # SIM223 +101 + if (a and [] and False and []) or (False): # SIM223 +102 | pass +103 | +104 | 0 if a and [] and False and [] else 1 # SIM222 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:104:6 @@ -787,16 +751,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 106 | while a and [] and False and []: # SIM223 | help: Replace with `False` - -ℹ Unsafe fix -101 101 | if (a and [] and False and []) or (a and [] and False and []): # SIM223 -102 102 | pass -103 103 | -104 |-0 if a and [] and False and [] else 1 # SIM222 - 104 |+0 if False else 1 # SIM222 -105 105 | -106 106 | while a and [] and False and []: # SIM223 -107 107 | pass +101 | if (a and [] and False and []) or (a and [] and False and []): # SIM223 +102 | pass +103 | + - 0 if a and [] and False and [] else 1 # SIM222 +104 + 0 if False else 1 # SIM222 +105 | +106 | while a and [] and False and []: # SIM223 +107 | pass +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:106:7 @@ -808,16 +771,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 107 | pass | help: Replace with `False` - -ℹ Unsafe fix -103 103 | -104 104 | 0 if a and [] and False and [] else 1 # SIM222 -105 105 | -106 |-while a and [] and False and []: # SIM223 - 106 |+while False: # SIM223 -107 107 | pass -108 108 | -109 109 | [ +103 | +104 | 0 if a and [] and False and [] else 1 # SIM222 +105 | + - while a and [] and False and []: # SIM223 +106 + while False: # SIM223 +107 | pass +108 | +109 | [ +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:113:8 @@ -830,16 +792,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 115 | ] | help: Replace with `False` - -ℹ Unsafe fix -110 110 | 0 -111 111 | for a in range(10) -112 112 | for b in range(10) -113 |- if a and [] and False and [] # SIM223 - 113 |+ if False # SIM223 -114 114 | if b and [] and False and [] # SIM223 -115 115 | ] -116 116 | +110 | 0 +111 | for a in range(10) +112 | for b in range(10) + - if a and [] and False and [] # SIM223 +113 + if False # SIM223 +114 | if b and [] and False and [] # SIM223 +115 | ] +116 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:114:8 @@ -851,16 +812,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 115 | ] | help: Replace with `False` - -ℹ Unsafe fix -111 111 | for a in range(10) -112 112 | for b in range(10) -113 113 | if a and [] and False and [] # SIM223 -114 |- if b and [] and False and [] # SIM223 - 114 |+ if False # SIM223 -115 115 | ] -116 116 | -117 117 | { +111 | for a in range(10) +112 | for b in range(10) +113 | if a and [] and False and [] # SIM223 + - if b and [] and False and [] # SIM223 +114 + if False # SIM223 +115 | ] +116 | +117 | { +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:121:8 @@ -873,16 +833,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 123 | } | help: Replace with `False` - -ℹ Unsafe fix -118 118 | 0 -119 119 | for a in range(10) -120 120 | for b in range(10) -121 |- if a and [] and False and [] # SIM223 - 121 |+ if False # SIM223 -122 122 | if b and [] and False and [] # SIM223 -123 123 | } -124 124 | +118 | 0 +119 | for a in range(10) +120 | for b in range(10) + - if a and [] and False and [] # SIM223 +121 + if False # SIM223 +122 | if b and [] and False and [] # SIM223 +123 | } +124 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:122:8 @@ -894,16 +853,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 123 | } | help: Replace with `False` - -ℹ Unsafe fix -119 119 | for a in range(10) -120 120 | for b in range(10) -121 121 | if a and [] and False and [] # SIM223 -122 |- if b and [] and False and [] # SIM223 - 122 |+ if False # SIM223 -123 123 | } -124 124 | -125 125 | { +119 | for a in range(10) +120 | for b in range(10) +121 | if a and [] and False and [] # SIM223 + - if b and [] and False and [] # SIM223 +122 + if False # SIM223 +123 | } +124 | +125 | { +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:129:8 @@ -916,16 +874,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 131 | } | help: Replace with `False` - -ℹ Unsafe fix -126 126 | 0: 0 -127 127 | for a in range(10) -128 128 | for b in range(10) -129 |- if a and [] and False and [] # SIM223 - 129 |+ if False # SIM223 -130 130 | if b and [] and False and [] # SIM223 -131 131 | } -132 132 | +126 | 0: 0 +127 | for a in range(10) +128 | for b in range(10) + - if a and [] and False and [] # SIM223 +129 + if False # SIM223 +130 | if b and [] and False and [] # SIM223 +131 | } +132 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:130:8 @@ -937,16 +894,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 131 | } | help: Replace with `False` - -ℹ Unsafe fix -127 127 | for a in range(10) -128 128 | for b in range(10) -129 129 | if a and [] and False and [] # SIM223 -130 |- if b and [] and False and [] # SIM223 - 130 |+ if False # SIM223 -131 131 | } -132 132 | -133 133 | ( +127 | for a in range(10) +128 | for b in range(10) +129 | if a and [] and False and [] # SIM223 + - if b and [] and False and [] # SIM223 +130 + if False # SIM223 +131 | } +132 | +133 | ( +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:137:8 @@ -959,16 +915,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 139 | ) | help: Replace with `False` - -ℹ Unsafe fix -134 134 | 0 -135 135 | for a in range(10) -136 136 | for b in range(10) -137 |- if a and [] and False and [] # SIM223 - 137 |+ if False # SIM223 -138 138 | if b and [] and False and [] # SIM223 -139 139 | ) -140 140 | +134 | 0 +135 | for a in range(10) +136 | for b in range(10) + - if a and [] and False and [] # SIM223 +137 + if False # SIM223 +138 | if b and [] and False and [] # SIM223 +139 | ) +140 | +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `False` instead of `... and False and ...` --> SIM223.py:138:8 @@ -980,16 +935,15 @@ SIM223 [*] Use `False` instead of `... and False and ...` 139 | ) | help: Replace with `False` - -ℹ Unsafe fix -135 135 | for a in range(10) -136 136 | for b in range(10) -137 137 | if a and [] and False and [] # SIM223 -138 |- if b and [] and False and [] # SIM223 - 138 |+ if False # SIM223 -139 139 | ) -140 140 | -141 141 | # Outside test `a` is not simplified. +135 | for a in range(10) +136 | for b in range(10) +137 | if a and [] and False and [] # SIM223 + - if b and [] and False and [] # SIM223 +138 + if False # SIM223 +139 | ) +140 | +141 | # Outside test `a` is not simplified. +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `[]` instead of `[] and ...` --> SIM223.py:143:7 @@ -1002,16 +956,15 @@ SIM223 [*] Use `[]` instead of `[] and ...` 145 | if (a and [] and False and []) == (a and []): # SIM223 | help: Replace with `[]` - -ℹ Unsafe fix -140 140 | -141 141 | # Outside test `a` is not simplified. -142 142 | -143 |-a and [] and False and [] # SIM223 - 143 |+a and [] # SIM223 -144 144 | -145 145 | if (a and [] and False and []) == (a and []): # SIM223 -146 146 | pass +140 | +141 | # Outside test `a` is not simplified. +142 | + - a and [] and False and [] # SIM223 +143 + a and [] # SIM223 +144 | +145 | if (a and [] and False and []) == (a and []): # SIM223 +146 | pass +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `[]` instead of `[] and ...` --> SIM223.py:145:11 @@ -1023,16 +976,15 @@ SIM223 [*] Use `[]` instead of `[] and ...` 146 | pass | help: Replace with `[]` - -ℹ Unsafe fix -142 142 | -143 143 | a and [] and False and [] # SIM223 -144 144 | -145 |-if (a and [] and False and []) == (a and []): # SIM223 - 145 |+if (a and []) == (a and []): # SIM223 -146 146 | pass -147 147 | -148 148 | if f(a and [] and False and []): # SIM223 +142 | +143 | a and [] and False and [] # SIM223 +144 | + - if (a and [] and False and []) == (a and []): # SIM223 +145 + if (a and []) == (a and []): # SIM223 +146 | pass +147 | +148 | if f(a and [] and False and []): # SIM223 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `[]` instead of `[] and ...` --> SIM223.py:148:12 @@ -1044,16 +996,15 @@ SIM223 [*] Use `[]` instead of `[] and ...` 149 | pass | help: Replace with `[]` - -ℹ Unsafe fix -145 145 | if (a and [] and False and []) == (a and []): # SIM223 -146 146 | pass -147 147 | -148 |-if f(a and [] and False and []): # SIM223 - 148 |+if f(a and []): # SIM223 -149 149 | pass -150 150 | -151 151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479 +145 | if (a and [] and False and []) == (a and []): # SIM223 +146 | pass +147 | + - if f(a and [] and False and []): # SIM223 +148 + if f(a and []): # SIM223 +149 | pass +150 | +151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479 +note: This is an unsafe fix and may change runtime behavior SIM223 [*] Use `f"{''}{''}"` instead of `f"{''}{''}" and ...` --> SIM223.py:154:7 @@ -1065,13 +1016,12 @@ SIM223 [*] Use `f"{''}{''}"` instead of `f"{''}{''}" and ...` 155 | print(f"{1}{''}" and "bar") | help: Replace with `f"{''}{''}"` - -ℹ Unsafe fix -151 151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479 -152 152 | print(f"{a}{b}" and "bar") -153 153 | print(f"{a}{''}" and "bar") -154 |-print(f"{''}{''}" and "bar") - 154 |+print(f"{''}{''}") -155 155 | print(f"{1}{''}" and "bar") -156 156 | -157 157 | +151 | # Regression test for: https://github.com/astral-sh/ruff/issues/9479 +152 | print(f"{a}{b}" and "bar") +153 | print(f"{a}{''}" and "bar") + - print(f"{''}{''}" and "bar") +154 + print(f"{''}{''}") +155 | print(f"{1}{''}" and "bar") +156 | +157 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap index 8dc1a167be..1c1dba4ce0 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM300_SIM300.py.snap @@ -11,14 +11,12 @@ SIM300 [*] Yoda condition detected 4 | ("a", "b") == compare # SIM300 | help: Rewrite as `compare == "yoda"` - -ℹ Safe fix -1 1 | # Errors -2 |-"yoda" == compare # SIM300 - 2 |+compare == "yoda" # SIM300 -3 3 | 42 == age # SIM300 -4 4 | ("a", "b") == compare # SIM300 -5 5 | "yoda" <= compare # SIM300 +1 | # Errors + - "yoda" == compare # SIM300 +2 + compare == "yoda" # SIM300 +3 | 42 == age # SIM300 +4 | ("a", "b") == compare # SIM300 +5 | "yoda" <= compare # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:3:1 @@ -31,15 +29,13 @@ SIM300 [*] Yoda condition detected 5 | "yoda" <= compare # SIM300 | help: Rewrite as `age == 42` - -ℹ Safe fix -1 1 | # Errors -2 2 | "yoda" == compare # SIM300 -3 |-42 == age # SIM300 - 3 |+age == 42 # SIM300 -4 4 | ("a", "b") == compare # SIM300 -5 5 | "yoda" <= compare # SIM300 -6 6 | "yoda" < compare # SIM300 +1 | # Errors +2 | "yoda" == compare # SIM300 + - 42 == age # SIM300 +3 + age == 42 # SIM300 +4 | ("a", "b") == compare # SIM300 +5 | "yoda" <= compare # SIM300 +6 | "yoda" < compare # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:4:1 @@ -52,16 +48,14 @@ SIM300 [*] Yoda condition detected 6 | "yoda" < compare # SIM300 | help: Rewrite as `compare == ("a", "b")` - -ℹ Safe fix -1 1 | # Errors -2 2 | "yoda" == compare # SIM300 -3 3 | 42 == age # SIM300 -4 |-("a", "b") == compare # SIM300 - 4 |+compare == ("a", "b") # SIM300 -5 5 | "yoda" <= compare # SIM300 -6 6 | "yoda" < compare # SIM300 -7 7 | 42 > age # SIM300 +1 | # Errors +2 | "yoda" == compare # SIM300 +3 | 42 == age # SIM300 + - ("a", "b") == compare # SIM300 +4 + compare == ("a", "b") # SIM300 +5 | "yoda" <= compare # SIM300 +6 | "yoda" < compare # SIM300 +7 | 42 > age # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:5:1 @@ -74,16 +68,14 @@ SIM300 [*] Yoda condition detected 7 | 42 > age # SIM300 | help: Rewrite as `compare >= "yoda"` - -ℹ Safe fix -2 2 | "yoda" == compare # SIM300 -3 3 | 42 == age # SIM300 -4 4 | ("a", "b") == compare # SIM300 -5 |-"yoda" <= compare # SIM300 - 5 |+compare >= "yoda" # SIM300 -6 6 | "yoda" < compare # SIM300 -7 7 | 42 > age # SIM300 -8 8 | -42 > age # SIM300 +2 | "yoda" == compare # SIM300 +3 | 42 == age # SIM300 +4 | ("a", "b") == compare # SIM300 + - "yoda" <= compare # SIM300 +5 + compare >= "yoda" # SIM300 +6 | "yoda" < compare # SIM300 +7 | 42 > age # SIM300 +8 | -42 > age # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:6:1 @@ -96,16 +88,14 @@ SIM300 [*] Yoda condition detected 8 | -42 > age # SIM300 | help: Rewrite as `compare > "yoda"` - -ℹ Safe fix -3 3 | 42 == age # SIM300 -4 4 | ("a", "b") == compare # SIM300 -5 5 | "yoda" <= compare # SIM300 -6 |-"yoda" < compare # SIM300 - 6 |+compare > "yoda" # SIM300 -7 7 | 42 > age # SIM300 -8 8 | -42 > age # SIM300 -9 9 | +42 > age # SIM300 +3 | 42 == age # SIM300 +4 | ("a", "b") == compare # SIM300 +5 | "yoda" <= compare # SIM300 + - "yoda" < compare # SIM300 +6 + compare > "yoda" # SIM300 +7 | 42 > age # SIM300 +8 | -42 > age # SIM300 +9 | +42 > age # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:7:1 @@ -118,16 +108,14 @@ SIM300 [*] Yoda condition detected 9 | +42 > age # SIM300 | help: Rewrite as `age < 42` - -ℹ Safe fix -4 4 | ("a", "b") == compare # SIM300 -5 5 | "yoda" <= compare # SIM300 -6 6 | "yoda" < compare # SIM300 -7 |-42 > age # SIM300 - 7 |+age < 42 # SIM300 -8 8 | -42 > age # SIM300 -9 9 | +42 > age # SIM300 -10 10 | YODA == age # SIM300 +4 | ("a", "b") == compare # SIM300 +5 | "yoda" <= compare # SIM300 +6 | "yoda" < compare # SIM300 + - 42 > age # SIM300 +7 + age < 42 # SIM300 +8 | -42 > age # SIM300 +9 | +42 > age # SIM300 +10 | YODA == age # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:8:1 @@ -140,16 +128,14 @@ SIM300 [*] Yoda condition detected 10 | YODA == age # SIM300 | help: Rewrite as `age < -42` - -ℹ Safe fix -5 5 | "yoda" <= compare # SIM300 -6 6 | "yoda" < compare # SIM300 -7 7 | 42 > age # SIM300 -8 |--42 > age # SIM300 - 8 |+age < -42 # SIM300 -9 9 | +42 > age # SIM300 -10 10 | YODA == age # SIM300 -11 11 | YODA > age # SIM300 +5 | "yoda" <= compare # SIM300 +6 | "yoda" < compare # SIM300 +7 | 42 > age # SIM300 + - -42 > age # SIM300 +8 + age < -42 # SIM300 +9 | +42 > age # SIM300 +10 | YODA == age # SIM300 +11 | YODA > age # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:9:1 @@ -162,16 +148,14 @@ SIM300 [*] Yoda condition detected 11 | YODA > age # SIM300 | help: Rewrite as `age < +42` - -ℹ Safe fix -6 6 | "yoda" < compare # SIM300 -7 7 | 42 > age # SIM300 -8 8 | -42 > age # SIM300 -9 |-+42 > age # SIM300 - 9 |+age < +42 # SIM300 -10 10 | YODA == age # SIM300 -11 11 | YODA > age # SIM300 -12 12 | YODA >= age # SIM300 +6 | "yoda" < compare # SIM300 +7 | 42 > age # SIM300 +8 | -42 > age # SIM300 + - +42 > age # SIM300 +9 + age < +42 # SIM300 +10 | YODA == age # SIM300 +11 | YODA > age # SIM300 +12 | YODA >= age # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:10:1 @@ -184,16 +168,14 @@ SIM300 [*] Yoda condition detected 12 | YODA >= age # SIM300 | help: Rewrite as `age == YODA` - -ℹ Safe fix -7 7 | 42 > age # SIM300 -8 8 | -42 > age # SIM300 -9 9 | +42 > age # SIM300 -10 |-YODA == age # SIM300 - 10 |+age == YODA # SIM300 -11 11 | YODA > age # SIM300 -12 12 | YODA >= age # SIM300 -13 13 | JediOrder.YODA == age # SIM300 +7 | 42 > age # SIM300 +8 | -42 > age # SIM300 +9 | +42 > age # SIM300 + - YODA == age # SIM300 +10 + age == YODA # SIM300 +11 | YODA > age # SIM300 +12 | YODA >= age # SIM300 +13 | JediOrder.YODA == age # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:11:1 @@ -206,16 +188,14 @@ SIM300 [*] Yoda condition detected 13 | JediOrder.YODA == age # SIM300 | help: Rewrite as `age < YODA` - -ℹ Safe fix -8 8 | -42 > age # SIM300 -9 9 | +42 > age # SIM300 -10 10 | YODA == age # SIM300 -11 |-YODA > age # SIM300 - 11 |+age < YODA # SIM300 -12 12 | YODA >= age # SIM300 -13 13 | JediOrder.YODA == age # SIM300 -14 14 | 0 < (number - 100) # SIM300 +8 | -42 > age # SIM300 +9 | +42 > age # SIM300 +10 | YODA == age # SIM300 + - YODA > age # SIM300 +11 + age < YODA # SIM300 +12 | YODA >= age # SIM300 +13 | JediOrder.YODA == age # SIM300 +14 | 0 < (number - 100) # SIM300 SIM300 [*] Yoda condition detected --> SIM300.py:12:1 @@ -228,16 +208,14 @@ SIM300 [*] Yoda condition detected 14 | 0 < (number - 100) # SIM300 | help: Rewrite as `age <= YODA` - -ℹ Safe fix -9 9 | +42 > age # SIM300 -10 10 | YODA == age # SIM300 -11 11 | YODA > age # SIM300 -12 |-YODA >= age # SIM300 - 12 |+age <= YODA # SIM300 -13 13 | JediOrder.YODA == age # SIM300 -14 14 | 0 < (number - 100) # SIM300 -15 15 | B age # SIM300 +10 | YODA == age # SIM300 +11 | YODA > age # SIM300 + - YODA >= age # SIM300 +12 + age <= YODA # SIM300 +13 | JediOrder.YODA == age # SIM300 +14 | 0 < (number - 100) # SIM300 +15 | B SIM300.py:13:1 @@ -250,16 +228,14 @@ SIM300 [*] Yoda condition detected 15 | B age # SIM300 -12 12 | YODA >= age # SIM300 -13 |-JediOrder.YODA == age # SIM300 - 13 |+age == JediOrder.YODA # SIM300 -14 14 | 0 < (number - 100) # SIM300 -15 15 | B age # SIM300 +12 | YODA >= age # SIM300 + - JediOrder.YODA == age # SIM300 +13 + age == JediOrder.YODA # SIM300 +14 | 0 < (number - 100) # SIM300 +15 | B SIM300.py:14:1 @@ -272,16 +248,14 @@ SIM300 [*] Yoda condition detected 16 | B or(B) 0` - -ℹ Safe fix -11 11 | YODA > age # SIM300 -12 12 | YODA >= age # SIM300 -13 13 | JediOrder.YODA == age # SIM300 -14 |-0 < (number - 100) # SIM300 - 14 |+(number - 100) > 0 # SIM300 -15 15 | B age # SIM300 +12 | YODA >= age # SIM300 +13 | JediOrder.YODA == age # SIM300 + - 0 < (number - 100) # SIM300 +14 + (number - 100) > 0 # SIM300 +15 | B SIM300.py:15:1 @@ -294,16 +268,14 @@ SIM300 [*] Yoda condition detected 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG | help: Rewrite as `A[0][0] > B` - -ℹ Safe fix -12 12 | YODA >= age # SIM300 -13 13 | JediOrder.YODA == age # SIM300 -14 14 | 0 < (number - 100) # SIM300 -15 |-B B or B -16 16 | B or(B)= age # SIM300 +13 | JediOrder.YODA == age # SIM300 +14 | 0 < (number - 100) # SIM300 + - B B or B +16 | B or(B) SIM300.py:16:5 @@ -315,16 +287,14 @@ SIM300 [*] Yoda condition detected 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG | help: Rewrite as `A[0][0] > (B)` - -ℹ Safe fix -13 13 | JediOrder.YODA == age # SIM300 -14 14 | 0 < (number - 100) # SIM300 -15 15 | B (B) -17 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG -18 18 | -19 19 | # Errors in preview +13 | JediOrder.YODA == age # SIM300 +14 | 0 < (number - 100) # SIM300 +15 | B (B) +17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG +18 | +19 | # Errors in preview SIM300 [*] Yoda condition detected --> SIM300.py:17:1 @@ -337,16 +307,14 @@ SIM300 [*] Yoda condition detected 19 | # Errors in preview | help: Rewrite as `DummyHandler.CONFIG == {"non-empty-dict": "is-ok"}` - -ℹ Safe fix -14 14 | 0 < (number - 100) # SIM300 -15 15 | B SIM300.py:20:1 @@ -357,16 +325,14 @@ SIM300 [*] Yoda condition detected 21 | {} == DummyHandler.CONFIG | help: Rewrite as `UPPER_LIST == ['upper']` - -ℹ Safe fix -17 17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG -18 18 | -19 19 | # Errors in preview -20 |-['upper'] == UPPER_LIST - 20 |+UPPER_LIST == ['upper'] -21 21 | {} == DummyHandler.CONFIG -22 22 | -23 23 | # Errors in stable +17 | {"non-empty-dict": "is-ok"} == DummyHandler.CONFIG +18 | +19 | # Errors in preview + - ['upper'] == UPPER_LIST +20 + UPPER_LIST == ['upper'] +21 | {} == DummyHandler.CONFIG +22 | +23 | # Errors in stable SIM300 [*] Yoda condition detected --> SIM300.py:21:1 @@ -379,13 +345,11 @@ SIM300 [*] Yoda condition detected 23 | # Errors in stable | help: Rewrite as `DummyHandler.CONFIG == {}` - -ℹ Safe fix -18 18 | -19 19 | # Errors in preview -20 20 | ['upper'] == UPPER_LIST -21 |-{} == DummyHandler.CONFIG - 21 |+DummyHandler.CONFIG == {} -22 22 | -23 23 | # Errors in stable -24 24 | UPPER_LIST == ['upper'] +18 | +19 | # Errors in preview +20 | ['upper'] == UPPER_LIST + - {} == DummyHandler.CONFIG +21 + DummyHandler.CONFIG == {} +22 | +23 | # Errors in stable +24 | UPPER_LIST == ['upper'] diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap index 36573493b8..e395a29c7e 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM401_SIM401.py.snap @@ -14,19 +14,18 @@ SIM401 [*] Use `var = a_dict.get(key, "default1")` instead of an `if` block 13 | # SIM401 (pattern-2) | help: Replace with `var = a_dict.get(key, "default1")` - -ℹ Unsafe fix -5 5 | a_dict = {} -6 6 | -7 7 | # SIM401 (pattern-1) -8 |-if key in a_dict: -9 |- var = a_dict[key] -10 |-else: -11 |- var = "default1" - 8 |+var = a_dict.get(key, "default1") -12 9 | -13 10 | # SIM401 (pattern-2) -14 11 | if key not in a_dict: +5 | a_dict = {} +6 | +7 | # SIM401 (pattern-1) + - if key in a_dict: + - var = a_dict[key] + - else: + - var = "default1" +8 + var = a_dict.get(key, "default1") +9 | +10 | # SIM401 (pattern-2) +11 | if key not in a_dict: +note: This is an unsafe fix and may change runtime behavior SIM401 [*] Use `var = a_dict.get(key, "default2")` instead of an `if` block --> SIM401.py:14:1 @@ -41,19 +40,18 @@ SIM401 [*] Use `var = a_dict.get(key, "default2")` instead of an `if` block 19 | # OK (default contains effect) | help: Replace with `var = a_dict.get(key, "default2")` - -ℹ Unsafe fix -11 11 | var = "default1" -12 12 | -13 13 | # SIM401 (pattern-2) -14 |-if key not in a_dict: -15 |- var = "default2" -16 |-else: -17 |- var = a_dict[key] - 14 |+var = a_dict.get(key, "default2") -18 15 | -19 16 | # OK (default contains effect) -20 17 | if key in a_dict: +11 | var = "default1" +12 | +13 | # SIM401 (pattern-2) + - if key not in a_dict: + - var = "default2" + - else: + - var = a_dict[key] +14 + var = a_dict.get(key, "default2") +15 | +16 | # OK (default contains effect) +17 | if key in a_dict: +note: This is an unsafe fix and may change runtime behavior SIM401 [*] Use `var = a_dict.get(keys[idx], "default")` instead of an `if` block --> SIM401.py:26:1 @@ -68,19 +66,18 @@ SIM401 [*] Use `var = a_dict.get(keys[idx], "default")` instead of an `if` block 31 | dicts = {"key": a_dict} | help: Replace with `var = a_dict.get(keys[idx], "default")` - -ℹ Unsafe fix -23 23 | var = val1 + val2 -24 24 | -25 25 | # SIM401 (complex expression in key) -26 |-if keys[idx] in a_dict: -27 |- var = a_dict[keys[idx]] -28 |-else: -29 |- var = "default" - 26 |+var = a_dict.get(keys[idx], "default") -30 27 | -31 28 | dicts = {"key": a_dict} -32 29 | +23 | var = val1 + val2 +24 | +25 | # SIM401 (complex expression in key) + - if keys[idx] in a_dict: + - var = a_dict[keys[idx]] + - else: + - var = "default" +26 + var = a_dict.get(keys[idx], "default") +27 | +28 | dicts = {"key": a_dict} +29 | +note: This is an unsafe fix and may change runtime behavior SIM401 [*] Use `vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789")` instead of an `if` block --> SIM401.py:40:1 @@ -95,19 +92,18 @@ SIM401 [*] Use `vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ67 45 | # SIM401 | help: Replace with `vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789")` - -ℹ Unsafe fix -37 37 | var = "default" -38 38 | -39 39 | # SIM401 (complex expression in var) -40 |-if key in a_dict: -41 |- vars[idx] = a_dict[key] -42 |-else: -43 |- vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789" - 40 |+vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789") -44 41 | -45 42 | # SIM401 -46 43 | if foo(): +37 | var = "default" +38 | +39 | # SIM401 (complex expression in var) + - if key in a_dict: + - vars[idx] = a_dict[key] + - else: + - vars[idx] = "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789" +40 + vars[idx] = a_dict.get(key, "defaultß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789ß9💣2ℝ6789") +41 | +42 | # SIM401 +43 | if foo(): +note: This is an unsafe fix and may change runtime behavior SIM401 [*] Use `vars[idx] = a_dict.get(key, "default")` instead of an `if` block --> SIM401.py:49:5 @@ -123,19 +119,18 @@ SIM401 [*] Use `vars[idx] = a_dict.get(key, "default")` instead of an `if` block 54 | ### | help: Replace with `vars[idx] = a_dict.get(key, "default")` - -ℹ Unsafe fix -46 46 | if foo(): -47 47 | pass -48 48 | else: -49 |- if key in a_dict: -50 |- vars[idx] = a_dict[key] -51 |- else: -52 |- vars[idx] = "default" - 49 |+ vars[idx] = a_dict.get(key, "default") -53 50 | -54 51 | ### -55 52 | # Negative cases +46 | if foo(): +47 | pass +48 | else: + - if key in a_dict: + - vars[idx] = a_dict[key] + - else: + - vars[idx] = "default" +49 + vars[idx] = a_dict.get(key, "default") +50 | +51 | ### +52 | # Negative cases +note: This is an unsafe fix and may change runtime behavior SIM401 [*] Use `a_dict.get(key, "default3")` instead of an `if` block --> SIM401.py:149:7 @@ -147,16 +142,15 @@ SIM401 [*] Use `a_dict.get(key, "default3")` instead of an `if` block 151 | # SIM401 | help: Replace with `a_dict.get(key, "default3")` - -ℹ Unsafe fix -146 146 | ### -147 147 | -148 148 | # SIM401 -149 |-var = a_dict[key] if key in a_dict else "default3" - 149 |+var = a_dict.get(key, "default3") -150 150 | -151 151 | # SIM401 -152 152 | var = "default-1" if key not in a_dict else a_dict[key] +146 | ### +147 | +148 | # SIM401 + - var = a_dict[key] if key in a_dict else "default3" +149 + var = a_dict.get(key, "default3") +150 | +151 | # SIM401 +152 | var = "default-1" if key not in a_dict else a_dict[key] +note: This is an unsafe fix and may change runtime behavior SIM401 [*] Use `a_dict.get(key, "default-1")` instead of an `if` block --> SIM401.py:152:7 @@ -168,13 +162,12 @@ SIM401 [*] Use `a_dict.get(key, "default-1")` instead of an `if` block 154 | # OK (default contains effect) | help: Replace with `a_dict.get(key, "default-1")` - -ℹ Unsafe fix -149 149 | var = a_dict[key] if key in a_dict else "default3" -150 150 | -151 151 | # SIM401 -152 |-var = "default-1" if key not in a_dict else a_dict[key] - 152 |+var = a_dict.get(key, "default-1") -153 153 | -154 154 | # OK (default contains effect) -155 155 | var = a_dict[key] if key in a_dict else val1 + val2 +149 | var = a_dict[key] if key in a_dict else "default3" +150 | +151 | # SIM401 + - var = "default-1" if key not in a_dict else a_dict[key] +152 + var = a_dict.get(key, "default-1") +153 | +154 | # OK (default contains effect) +155 | var = a_dict[key] if key in a_dict else val1 + val2 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap index bda8037b7f..b912897bd5 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM905_SIM905.py.snap @@ -15,20 +15,18 @@ SIM905 [*] Consider using a list literal instead of `str.split` 12 | "a,b,c,d".split(",") | help: Replace with list literal - -ℹ Safe fix -3 3 | no_sep = None -4 4 | -5 5 | # positives -6 |-""" -7 |- itemA -8 |- itemB -9 |- itemC -10 |-""".split() - 6 |+["itemA", "itemB", "itemC"] -11 7 | -12 8 | "a,b,c,d".split(",") -13 9 | "a,b,c,d".split(None) +3 | no_sep = None +4 | +5 | # positives + - """ + - itemA + - itemB + - itemC + - """.split() +6 + ["itemA", "itemB", "itemC"] +7 | +8 | "a,b,c,d".split(",") +9 | "a,b,c,d".split(None) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:12:1 @@ -41,16 +39,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 14 | "a,b,c,d".split(",", 1) | help: Replace with list literal - -ℹ Safe fix -9 9 | itemC -10 10 | """.split() -11 11 | -12 |-"a,b,c,d".split(",") - 12 |+["a", "b", "c", "d"] -13 13 | "a,b,c,d".split(None) -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) +9 | itemC +10 | """.split() +11 | + - "a,b,c,d".split(",") +12 + ["a", "b", "c", "d"] +13 | "a,b,c,d".split(None) +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:13:1 @@ -62,16 +58,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 15 | "a,b,c,d".split(None, 1) | help: Replace with list literal - -ℹ Safe fix -10 10 | """.split() -11 11 | -12 12 | "a,b,c,d".split(",") -13 |-"a,b,c,d".split(None) - 13 |+["a,b,c,d"] -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") +10 | """.split() +11 | +12 | "a,b,c,d".split(",") + - "a,b,c,d".split(None) +13 + ["a,b,c,d"] +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:14:1 @@ -84,16 +78,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 16 | "a,b,c,d".split(sep=",") | help: Replace with list literal - -ℹ Safe fix -11 11 | -12 12 | "a,b,c,d".split(",") -13 13 | "a,b,c,d".split(None) -14 |-"a,b,c,d".split(",", 1) - 14 |+["a", "b,c,d"] -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") -17 17 | "a,b,c,d".split(sep=None) +11 | +12 | "a,b,c,d".split(",") +13 | "a,b,c,d".split(None) + - "a,b,c,d".split(",", 1) +14 + ["a", "b,c,d"] +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") +17 | "a,b,c,d".split(sep=None) SIM905 Consider using a list literal instead of `str.split` --> SIM905.py:15:1 @@ -118,16 +110,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 18 | "a,b,c,d".split(sep=",", maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -13 13 | "a,b,c,d".split(None) -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) -16 |-"a,b,c,d".split(sep=",") - 16 |+["a", "b", "c", "d"] -17 17 | "a,b,c,d".split(sep=None) -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) +13 | "a,b,c,d".split(None) +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) + - "a,b,c,d".split(sep=",") +16 + ["a", "b", "c", "d"] +17 | "a,b,c,d".split(sep=None) +18 | "a,b,c,d".split(sep=",", maxsplit=1) +19 | "a,b,c,d".split(sep=None, maxsplit=1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:17:1 @@ -140,16 +130,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 19 | "a,b,c,d".split(sep=None, maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") -17 |-"a,b,c,d".split(sep=None) - 17 |+["a,b,c,d"] -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") + - "a,b,c,d".split(sep=None) +17 + ["a,b,c,d"] +18 | "a,b,c,d".split(sep=",", maxsplit=1) +19 | "a,b,c,d".split(sep=None, maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:18:1 @@ -162,16 +150,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 20 | "a,b,c,d".split(maxsplit=1, sep=",") | help: Replace with list literal - -ℹ Safe fix -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") -17 17 | "a,b,c,d".split(sep=None) -18 |-"a,b,c,d".split(sep=",", maxsplit=1) - 18 |+["a", "b,c,d"] -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") +17 | "a,b,c,d".split(sep=None) + - "a,b,c,d".split(sep=",", maxsplit=1) +18 + ["a", "b,c,d"] +19 | "a,b,c,d".split(sep=None, maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") +21 | "a,b,c,d".split(maxsplit=1, sep=None) SIM905 Consider using a list literal instead of `str.split` --> SIM905.py:19:1 @@ -196,16 +182,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 22 | "a,b,c,d".split(",", maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -17 17 | "a,b,c,d".split(sep=None) -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 |-"a,b,c,d".split(maxsplit=1, sep=",") - 20 |+["a", "b,c,d"] -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) -22 22 | "a,b,c,d".split(",", maxsplit=1) -23 23 | "a,b,c,d".split(None, maxsplit=1) +17 | "a,b,c,d".split(sep=None) +18 | "a,b,c,d".split(sep=",", maxsplit=1) +19 | "a,b,c,d".split(sep=None, maxsplit=1) + - "a,b,c,d".split(maxsplit=1, sep=",") +20 + ["a", "b,c,d"] +21 | "a,b,c,d".split(maxsplit=1, sep=None) +22 | "a,b,c,d".split(",", maxsplit=1) +23 | "a,b,c,d".split(None, maxsplit=1) SIM905 Consider using a list literal instead of `str.split` --> SIM905.py:21:1 @@ -230,16 +214,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 24 | "a,b,c,d".split(maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) -22 |-"a,b,c,d".split(",", maxsplit=1) - 22 |+["a", "b,c,d"] -23 23 | "a,b,c,d".split(None, maxsplit=1) -24 24 | "a,b,c,d".split(maxsplit=1) -25 25 | "a,b,c,d".split(maxsplit=1.0) +19 | "a,b,c,d".split(sep=None, maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") +21 | "a,b,c,d".split(maxsplit=1, sep=None) + - "a,b,c,d".split(",", maxsplit=1) +22 + ["a", "b,c,d"] +23 | "a,b,c,d".split(None, maxsplit=1) +24 | "a,b,c,d".split(maxsplit=1) +25 | "a,b,c,d".split(maxsplit=1.0) SIM905 Consider using a list literal instead of `str.split` --> SIM905.py:23:1 @@ -288,16 +270,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 29 | ' 1 2 3 '.split() | help: Replace with list literal - -ℹ Safe fix -24 24 | "a,b,c,d".split(maxsplit=1) -25 25 | "a,b,c,d".split(maxsplit=1.0) -26 26 | "a,b,c,d".split(maxsplit=1) -27 |-"a,b,c,d".split(maxsplit=0) - 27 |+["a,b,c,d"] -28 28 | "VERB AUX PRON ADP DET".split(" ") -29 29 | ' 1 2 3 '.split() -30 30 | '1<>2<>3<4'.split('<>') +24 | "a,b,c,d".split(maxsplit=1) +25 | "a,b,c,d".split(maxsplit=1.0) +26 | "a,b,c,d".split(maxsplit=1) + - "a,b,c,d".split(maxsplit=0) +27 + ["a,b,c,d"] +28 | "VERB AUX PRON ADP DET".split(" ") +29 | ' 1 2 3 '.split() +30 | '1<>2<>3<4'.split('<>') SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:28:1 @@ -310,16 +290,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 30 | '1<>2<>3<4'.split('<>') | help: Replace with list literal - -ℹ Safe fix -25 25 | "a,b,c,d".split(maxsplit=1.0) -26 26 | "a,b,c,d".split(maxsplit=1) -27 27 | "a,b,c,d".split(maxsplit=0) -28 |-"VERB AUX PRON ADP DET".split(" ") - 28 |+["VERB", "AUX", "PRON", "ADP", "DET"] -29 29 | ' 1 2 3 '.split() -30 30 | '1<>2<>3<4'.split('<>') -31 31 | +25 | "a,b,c,d".split(maxsplit=1.0) +26 | "a,b,c,d".split(maxsplit=1) +27 | "a,b,c,d".split(maxsplit=0) + - "VERB AUX PRON ADP DET".split(" ") +28 + ["VERB", "AUX", "PRON", "ADP", "DET"] +29 | ' 1 2 3 '.split() +30 | '1<>2<>3<4'.split('<>') +31 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:29:1 @@ -331,16 +309,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 30 | '1<>2<>3<4'.split('<>') | help: Replace with list literal - -ℹ Safe fix -26 26 | "a,b,c,d".split(maxsplit=1) -27 27 | "a,b,c,d".split(maxsplit=0) -28 28 | "VERB AUX PRON ADP DET".split(" ") -29 |-' 1 2 3 '.split() - 29 |+['1', '2', '3'] -30 30 | '1<>2<>3<4'.split('<>') -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +26 | "a,b,c,d".split(maxsplit=1) +27 | "a,b,c,d".split(maxsplit=0) +28 | "VERB AUX PRON ADP DET".split(" ") + - ' 1 2 3 '.split() +29 + ['1', '2', '3'] +30 | '1<>2<>3<4'.split('<>') +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:30:1 @@ -353,16 +329,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] | help: Replace with list literal - -ℹ Safe fix -27 27 | "a,b,c,d".split(maxsplit=0) -28 28 | "VERB AUX PRON ADP DET".split(" ") -29 29 | ' 1 2 3 '.split() -30 |-'1<>2<>3<4'.split('<>') - 30 |+['1', '2', '3<4'] -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] -33 33 | "".split() # [] +27 | "a,b,c,d".split(maxsplit=0) +28 | "VERB AUX PRON ADP DET".split(" ") +29 | ' 1 2 3 '.split() + - '1<>2<>3<4'.split('<>') +30 + ['1', '2', '3<4'] +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +33 | "".split() # [] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:32:1 @@ -375,16 +349,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 34 | """ | help: Replace with list literal - -ℹ Safe fix -29 29 | ' 1 2 3 '.split() -30 30 | '1<>2<>3<4'.split('<>') -31 31 | -32 |-" a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] - 32 |+[" a", "a a", "a a "] # [" a", "a a", "a a "] -33 33 | "".split() # [] -34 34 | """ -35 35 | """.split() # [] +29 | ' 1 2 3 '.split() +30 | '1<>2<>3<4'.split('<>') +31 | + - " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +32 + [" a", "a a", "a a "] # [" a", "a a", "a a "] +33 | "".split() # [] +34 | """ +35 | """.split() # [] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:33:1 @@ -396,16 +368,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 35 | """.split() # [] | help: Replace with list literal - -ℹ Safe fix -30 30 | '1<>2<>3<4'.split('<>') -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] -33 |-"".split() # [] - 33 |+[] # [] -34 34 | """ -35 35 | """.split() # [] -36 36 | " ".split() # [] +30 | '1<>2<>3<4'.split('<>') +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] + - "".split() # [] +33 + [] # [] +34 | """ +35 | """.split() # [] +36 | " ".split() # [] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:34:1 @@ -419,17 +389,15 @@ SIM905 [*] Consider using a list literal instead of `str.split` 37 | "/abc/".split() # ["/abc/"] | help: Replace with list literal - -ℹ Safe fix -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] -33 33 | "".split() # [] -34 |-""" -35 |-""".split() # [] - 34 |+[] # [] -36 35 | " ".split() # [] -37 36 | "/abc/".split() # ["/abc/"] -38 37 | ("a,b,c" +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +33 | "".split() # [] + - """ + - """.split() # [] +34 + [] # [] +35 | " ".split() # [] +36 | "/abc/".split() # ["/abc/"] +37 | ("a,b,c" SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:36:1 @@ -442,16 +410,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 38 | ("a,b,c" | help: Replace with list literal - -ℹ Safe fix -33 33 | "".split() # [] -34 34 | """ -35 35 | """.split() # [] -36 |-" ".split() # [] - 36 |+[] # [] -37 37 | "/abc/".split() # ["/abc/"] -38 38 | ("a,b,c" -39 39 | # comment +33 | "".split() # [] +34 | """ +35 | """.split() # [] + - " ".split() # [] +36 + [] # [] +37 | "/abc/".split() # ["/abc/"] +38 | ("a,b,c" +39 | # comment SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:37:1 @@ -464,16 +430,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 39 | # comment | help: Replace with list literal - -ℹ Safe fix -34 34 | """ -35 35 | """.split() # [] -36 36 | " ".split() # [] -37 |-"/abc/".split() # ["/abc/"] - 37 |+["/abc/"] # ["/abc/"] -38 38 | ("a,b,c" -39 39 | # comment -40 40 | .split() +34 | """ +35 | """.split() # [] +36 | " ".split() # [] + - "/abc/".split() # ["/abc/"] +37 + ["/abc/"] # ["/abc/"] +38 | ("a,b,c" +39 | # comment +40 | .split() SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:38:2 @@ -489,18 +453,17 @@ SIM905 [*] Consider using a list literal instead of `str.split` 42 | ("a,b,c" | help: Replace with list literal - -ℹ Unsafe fix -35 35 | """.split() # [] -36 36 | " ".split() # [] -37 37 | "/abc/".split() # ["/abc/"] -38 |-("a,b,c" -39 |-# comment -40 |-.split() - 38 |+(["a,b,c"] -41 39 | ) # ["a,b,c"] -42 40 | ("a,b,c" -43 41 | # comment1 +35 | """.split() # [] +36 | " ".split() # [] +37 | "/abc/".split() # ["/abc/"] + - ("a,b,c" + - # comment + - .split() +38 + (["a,b,c"] +39 | ) # ["a,b,c"] +40 | ("a,b,c" +41 | # comment1 +note: This is an unsafe fix and may change runtime behavior SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:42:2 @@ -516,18 +479,17 @@ SIM905 [*] Consider using a list literal instead of `str.split` 46 | ("a," | help: Replace with list literal - -ℹ Unsafe fix -39 39 | # comment -40 40 | .split() -41 41 | ) # ["a,b,c"] -42 |-("a,b,c" -43 |-# comment1 -44 |-.split(",") - 42 |+(["a", "b", "c"] -45 43 | ) # ["a", "b", "c"] -46 44 | ("a," -47 45 | # comment +39 | # comment +40 | .split() +41 | ) # ["a,b,c"] + - ("a,b,c" + - # comment1 + - .split(",") +42 + (["a", "b", "c"] +43 | ) # ["a", "b", "c"] +44 | ("a," +45 | # comment +note: This is an unsafe fix and may change runtime behavior SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:46:2 @@ -544,20 +506,19 @@ SIM905 [*] Consider using a list literal instead of `str.split` 51 | ) # ["a", "b", "c"] | help: Replace with list literal - -ℹ Unsafe fix -43 43 | # comment1 -44 44 | .split(",") -45 45 | ) # ["a", "b", "c"] -46 |-("a," -47 |-# comment -48 |-"b," -49 |-"c" -50 |-.split(",") - 46 |+(["a", "b", "c"] -51 47 | ) # ["a", "b", "c"] -52 48 | -53 49 | "hello "\ +43 | # comment1 +44 | .split(",") +45 | ) # ["a", "b", "c"] + - ("a," + - # comment + - "b," + - "c" + - .split(",") +46 + (["a", "b", "c"] +47 | ) # ["a", "b", "c"] +48 | +49 | "hello "\ +note: This is an unsafe fix and may change runtime behavior SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:53:1 @@ -570,17 +531,15 @@ SIM905 [*] Consider using a list literal instead of `str.split` 55 | # ["hello", "world"] | help: Replace with list literal - -ℹ Safe fix -50 50 | .split(",") -51 51 | ) # ["a", "b", "c"] -52 52 | -53 |-"hello "\ -54 |- "world".split() - 53 |+["hello", "world"] -55 54 | # ["hello", "world"] -56 55 | -57 56 | # prefixes and isc +50 | .split(",") +51 | ) # ["a", "b", "c"] +52 | + - "hello "\ + - "world".split() +53 + ["hello", "world"] +54 | # ["hello", "world"] +55 | +56 | # prefixes and isc SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:58:1 @@ -592,16 +551,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 60 | ("a " "b").split() # ["a", "b"] | help: Replace with list literal - -ℹ Safe fix -55 55 | # ["hello", "world"] -56 56 | -57 57 | # prefixes and isc -58 |-u"a b".split() # [u"a", u"b"] - 58 |+[u"a", u"b"] # [u"a", u"b"] -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] +55 | # ["hello", "world"] +56 | +57 | # prefixes and isc + - u"a b".split() # [u"a", u"b"] +58 + [u"a", u"b"] # [u"a", u"b"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:59:1 @@ -614,16 +571,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 61 | "a " "b".split() # ["a", "b"] | help: Replace with list literal - -ℹ Safe fix -56 56 | -57 57 | # prefixes and isc -58 58 | u"a b".split() # [u"a", u"b"] -59 |-r"a \n b".split() # [r"a", r"\n", r"b"] - 59 |+[r"a", r"\n", r"b"] # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] +56 | +57 | # prefixes and isc +58 | u"a b".split() # [u"a", u"b"] + - r"a \n b".split() # [r"a", r"\n", r"b"] +59 + [r"a", r"\n", r"b"] # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:60:1 @@ -636,16 +591,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 62 | u"a " "b".split() # [u"a", u"b"] | help: Replace with list literal - -ℹ Safe fix -57 57 | # prefixes and isc -58 58 | u"a b".split() # [u"a", u"b"] -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 |-("a " "b").split() # ["a", "b"] - 60 |+["a", "b"] # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] +57 | # prefixes and isc +58 | u"a b".split() # [u"a", u"b"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] + - ("a " "b").split() # ["a", "b"] +60 + ["a", "b"] # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:61:1 @@ -658,16 +611,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 63 | "a " u"b".split() # ["a", "b"] | help: Replace with list literal - -ℹ Safe fix -58 58 | u"a b".split() # [u"a", u"b"] -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 |-"a " "b".split() # ["a", "b"] - 61 |+["a", "b"] # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] +58 | u"a b".split() # [u"a", u"b"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] + - "a " "b".split() # ["a", "b"] +61 + ["a", "b"] # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:62:1 @@ -680,16 +631,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 64 | u"a " r"\n".split() # [u"a", u"\\n"] | help: Replace with list literal - -ℹ Safe fix -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 |-u"a " "b".split() # [u"a", u"b"] - 62 |+[u"a", u"b"] # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] + - u"a " "b".split() # [u"a", u"b"] +62 + [u"a", u"b"] # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:63:1 @@ -702,16 +651,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 65 | r"\n " u"\n".split() # [r"\n"] | help: Replace with list literal - -ℹ Safe fix -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 |-"a " u"b".split() # ["a", "b"] - 63 |+["a", "b"] # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] + - "a " u"b".split() # ["a", "b"] +63 + ["a", "b"] # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:64:1 @@ -724,16 +671,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 66 | r"\n " "\n".split() # [r"\n"] | help: Replace with list literal - -ℹ Safe fix -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 |-u"a " r"\n".split() # [u"a", u"\\n"] - 64 |+[u"a", u"\\n"] # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] + - u"a " r"\n".split() # [u"a", u"\\n"] +64 + [u"a", u"\\n"] # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:65:1 @@ -746,16 +691,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 67 | "a " r"\n".split() # ["a", "\\n"] | help: Replace with list literal - -ℹ Safe fix -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 |-r"\n " u"\n".split() # [r"\n"] - 65 |+[r"\n"] # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] + - r"\n " u"\n".split() # [r"\n"] +65 + [r"\n"] # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] +68 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:66:1 @@ -767,16 +710,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 67 | "a " r"\n".split() # ["a", "\\n"] | help: Replace with list literal - -ℹ Safe fix -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 |-r"\n " "\n".split() # [r"\n"] - 66 |+[r"\n"] # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] + - r"\n " "\n".split() # [r"\n"] +66 + [r"\n"] # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:67:1 @@ -789,16 +730,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] | help: Replace with list literal - -ℹ Safe fix -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] -67 |-"a " r"\n".split() # ["a", "\\n"] - 67 |+["a", "\\n"] # ["a", "\\n"] -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] + - "a " r"\n".split() # ["a", "\\n"] +67 + ["a", "\\n"] # ["a", "\\n"] +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:69:1 @@ -811,16 +750,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] | help: Replace with list literal - -ℹ Safe fix -66 66 | r"\n " "\n".split() # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | -69 |-"a,b,c".split(',', maxsplit=0) # ["a,b,c"] - 69 |+["a,b,c"] # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] -71 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] -72 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +66 | r"\n " "\n".split() # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] +68 | + - "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +69 + ["a,b,c"] # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] +72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:70:1 @@ -832,16 +769,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] | help: Replace with list literal - -ℹ Safe fix -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 |-"a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] - 70 |+["a", "b", "c"] # ["a", "b", "c"] -71 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] -72 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] -73 73 | +67 | "a " r"\n".split() # ["a", "\\n"] +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] + - "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +70 + ["a", "b", "c"] # ["a", "b", "c"] +71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] +72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +73 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:71:1 @@ -853,16 +788,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] | help: Replace with list literal - -ℹ Safe fix -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] -71 |-"a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] - 71 |+["a", "b", "c"] # ["a", "b", "c"] -72 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] -73 73 | -74 74 | # negatives +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] + - "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] +71 + ["a", "b", "c"] # ["a", "b", "c"] +72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +73 | +74 | # negatives SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:72:1 @@ -875,16 +808,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 74 | # negatives | help: Replace with list literal - -ℹ Safe fix -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] -71 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] -72 |-"a,b,c".split(',', maxsplit=-0) # ["a,b,c"] - 72 |+["a,b,c"] # ["a,b,c"] -73 73 | -74 74 | # negatives -75 75 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] + - "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +72 + ["a,b,c"] # ["a,b,c"] +73 | +74 | # negatives +75 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:103:1 @@ -901,21 +832,19 @@ SIM905 [*] Consider using a list literal instead of `str.split` 110 | # https://github.com/astral-sh/ruff/issues/18042 | help: Replace with list literal - -ℹ Safe fix -100 100 | -101 101 | -102 102 | # another positive demonstrating quote preservation -103 |-""" -104 |-"itemA" -105 |-'itemB' -106 |-'''itemC''' -107 |-"'itemD'" -108 |-""".split() - 103 |+['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""] -109 104 | -110 105 | # https://github.com/astral-sh/ruff/issues/18042 -111 106 | print("a,b".rsplit(",")) +100 | +101 | +102 | # another positive demonstrating quote preservation + - """ + - "itemA" + - 'itemB' + - '''itemC''' + - "'itemD'" + - """.split() +103 + ['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""] +104 | +105 | # https://github.com/astral-sh/ruff/issues/18042 +106 | print("a,b".rsplit(",")) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:111:7 @@ -926,16 +855,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 112 | print("a,b,c".rsplit(",", 1)) | help: Replace with list literal - -ℹ Safe fix -108 108 | """.split() -109 109 | -110 110 | # https://github.com/astral-sh/ruff/issues/18042 -111 |-print("a,b".rsplit(",")) - 111 |+print(["a", "b"]) -112 112 | print("a,b,c".rsplit(",", 1)) -113 113 | -114 114 | # https://github.com/astral-sh/ruff/issues/18069 +108 | """.split() +109 | +110 | # https://github.com/astral-sh/ruff/issues/18042 + - print("a,b".rsplit(",")) +111 + print(["a", "b"]) +112 | print("a,b,c".rsplit(",", 1)) +113 | +114 | # https://github.com/astral-sh/ruff/issues/18069 SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:112:7 @@ -948,16 +875,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 114 | # https://github.com/astral-sh/ruff/issues/18069 | help: Replace with list literal - -ℹ Safe fix -109 109 | -110 110 | # https://github.com/astral-sh/ruff/issues/18042 -111 111 | print("a,b".rsplit(",")) -112 |-print("a,b,c".rsplit(",", 1)) - 112 |+print(["a,b", "c"]) -113 113 | -114 114 | # https://github.com/astral-sh/ruff/issues/18069 -115 115 | +109 | +110 | # https://github.com/astral-sh/ruff/issues/18042 +111 | print("a,b".rsplit(",")) + - print("a,b,c".rsplit(",", 1)) +112 + print(["a,b", "c"]) +113 | +114 | # https://github.com/astral-sh/ruff/issues/18069 +115 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:116:7 @@ -970,16 +895,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 118 | print(" ".split(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -113 113 | -114 114 | # https://github.com/astral-sh/ruff/issues/18069 -115 115 | -116 |-print("".split(maxsplit=0)) - 116 |+print([]) -117 117 | print("".split(sep=None, maxsplit=0)) -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) +113 | +114 | # https://github.com/astral-sh/ruff/issues/18069 +115 | + - print("".split(maxsplit=0)) +116 + print([]) +117 | print("".split(sep=None, maxsplit=0)) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:117:7 @@ -991,16 +914,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 119 | print(" ".split(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -114 114 | # https://github.com/astral-sh/ruff/issues/18069 -115 115 | -116 116 | print("".split(maxsplit=0)) -117 |-print("".split(sep=None, maxsplit=0)) - 117 |+print([]) -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) +114 | # https://github.com/astral-sh/ruff/issues/18069 +115 | +116 | print("".split(maxsplit=0)) + - print("".split(sep=None, maxsplit=0)) +117 + print([]) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:118:7 @@ -1013,16 +934,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 120 | print(" x ".split(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -115 115 | -116 116 | print("".split(maxsplit=0)) -117 117 | print("".split(sep=None, maxsplit=0)) -118 |-print(" ".split(maxsplit=0)) - 118 |+print([]) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) +115 | +116 | print("".split(maxsplit=0)) +117 | print("".split(sep=None, maxsplit=0)) + - print(" ".split(maxsplit=0)) +118 + print([]) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:119:7 @@ -1035,16 +954,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 121 | print(" x ".split(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -116 116 | print("".split(maxsplit=0)) -117 117 | print("".split(sep=None, maxsplit=0)) -118 118 | print(" ".split(maxsplit=0)) -119 |-print(" ".split(sep=None, maxsplit=0)) - 119 |+print([]) -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) +116 | print("".split(maxsplit=0)) +117 | print("".split(sep=None, maxsplit=0)) +118 | print(" ".split(maxsplit=0)) + - print(" ".split(sep=None, maxsplit=0)) +119 + print([]) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:120:7 @@ -1057,16 +974,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 122 | print(" x ".split(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -117 117 | print("".split(sep=None, maxsplit=0)) -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 |-print(" x ".split(maxsplit=0)) - 120 |+print(["x "]) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) +117 | print("".split(sep=None, maxsplit=0)) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) + - print(" x ".split(maxsplit=0)) +120 + print(["x "]) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:121:7 @@ -1079,16 +994,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 123 | print(" x ".split(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) -121 |-print(" x ".split(sep=None, maxsplit=0)) - 121 |+print(["x "]) -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) + - print(" x ".split(sep=None, maxsplit=0)) +121 + print(["x "]) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:122:7 @@ -1101,16 +1014,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 124 | print("".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 |-print(" x ".split(maxsplit=0)) - 122 |+print(["x "]) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) + - print(" x ".split(maxsplit=0)) +122 + print(["x "]) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:123:7 @@ -1123,16 +1034,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 125 | print("".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) -123 |-print(" x ".split(sep=None, maxsplit=0)) - 123 |+print(["x "]) -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) + - print(" x ".split(sep=None, maxsplit=0)) +123 + print(["x "]) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:124:7 @@ -1145,16 +1054,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 126 | print(" ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 |-print("".rsplit(maxsplit=0)) - 124 |+print([]) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) + - print("".rsplit(maxsplit=0)) +124 + print([]) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:125:7 @@ -1167,16 +1074,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 127 | print(" ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) -125 |-print("".rsplit(sep=None, maxsplit=0)) - 125 |+print([]) -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) + - print("".rsplit(sep=None, maxsplit=0)) +125 + print([]) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:126:7 @@ -1189,16 +1094,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 128 | print(" x ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 |-print(" ".rsplit(maxsplit=0)) - 126 |+print([]) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) + - print(" ".rsplit(maxsplit=0)) +126 + print([]) +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:127:7 @@ -1211,16 +1114,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 129 | print(" x ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) -127 |-print(" ".rsplit(sep=None, maxsplit=0)) - 127 |+print([]) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) + - print(" ".rsplit(sep=None, maxsplit=0)) +127 + print([]) +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:128:7 @@ -1233,16 +1134,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 130 | print(" x ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 |-print(" x ".rsplit(maxsplit=0)) - 128 |+print([" x"]) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 131 | print(" x ".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) + - print(" x ".rsplit(maxsplit=0)) +128 + print([" x"]) +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) +131 | print(" x ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:129:7 @@ -1255,16 +1154,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 131 | print(" x ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 |-print(" x ".rsplit(maxsplit=0)) - 129 |+print([" x"]) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 131 | print(" x ".rsplit(maxsplit=0)) -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) + - print(" x ".rsplit(maxsplit=0)) +129 + print([" x"]) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) +131 | print(" x ".rsplit(maxsplit=0)) +132 | print(" x ".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:130:7 @@ -1277,16 +1174,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 132 | print(" x ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 |-print(" x ".rsplit(sep=None, maxsplit=0)) - 130 |+print([" x"]) -131 131 | print(" x ".rsplit(maxsplit=0)) -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) -133 133 | +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) + - print(" x ".rsplit(sep=None, maxsplit=0)) +130 + print([" x"]) +131 | print(" x ".rsplit(maxsplit=0)) +132 | print(" x ".rsplit(sep=None, maxsplit=0)) +133 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:131:7 @@ -1298,16 +1193,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 132 | print(" x ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 |-print(" x ".rsplit(maxsplit=0)) - 131 |+print([" x"]) -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) -133 133 | -134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) + - print(" x ".rsplit(maxsplit=0)) +131 + print([" x"]) +132 | print(" x ".rsplit(sep=None, maxsplit=0)) +133 | +134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:132:7 @@ -1320,16 +1213,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings | help: Replace with list literal - -ℹ Safe fix -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 131 | print(" x ".rsplit(maxsplit=0)) -132 |-print(" x ".rsplit(sep=None, maxsplit=0)) - 132 |+print([" x"]) -133 133 | -134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings -135 135 | r"""simple@example.com +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) +131 | print(" x ".rsplit(maxsplit=0)) + - print(" x ".rsplit(sep=None, maxsplit=0)) +132 + print([" x"]) +133 | +134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings +135 | r"""simple@example.com SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:135:1 @@ -1361,38 +1252,36 @@ SIM905 [*] Consider using a list literal instead of `str.split` | |_______________________________________^ | help: Replace with list literal - -ℹ Safe fix -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) -133 133 | -134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings -135 |-r"""simple@example.com -136 |-very.common@example.com -137 |-FirstName.LastName@EasierReading.org -138 |-x@example.com -139 |-long.email-address-with-hyphens@and.subdomains.example.com -140 |-user.name+tag+sorting@example.com -141 |-name/surname@example.com -142 |-xample@s.example -143 |-" "@example.org -144 |-"john..doe"@example.org -145 |-mailhost!username@example.org -146 |-"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com -147 |-user%example.com@example.org -148 |-user-@example.org -149 |-I❤️CHOCOLATE@example.com -150 |-this\ still\"not\\allowed@example.com -151 |-stellyamburrr985@example.com -152 |-Abc.123@example.com -153 |-user+mailbox/department=shipping@example.com -154 |-!#$%&'*+-/=?^_`.{|}~@example.com -155 |-"Abc@def"@example.com -156 |-"Fred\ Bloggs"@example.com -157 |-"Joe.\\Blow"@example.com""".split("\n") - 135 |+[r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com'] -158 136 | -159 137 | -160 138 | r"""first +132 | print(" x ".rsplit(sep=None, maxsplit=0)) +133 | +134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings + - r"""simple@example.com + - very.common@example.com + - FirstName.LastName@EasierReading.org + - x@example.com + - long.email-address-with-hyphens@and.subdomains.example.com + - user.name+tag+sorting@example.com + - name/surname@example.com + - xample@s.example + - " "@example.org + - "john..doe"@example.org + - mailhost!username@example.org + - "very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com + - user%example.com@example.org + - user-@example.org + - I❤️CHOCOLATE@example.com + - this\ still\"not\\allowed@example.com + - stellyamburrr985@example.com + - Abc.123@example.com + - user+mailbox/department=shipping@example.com + - !#$%&'*+-/=?^_`.{|}~@example.com + - "Abc@def"@example.com + - "Fred\ Bloggs"@example.com + - "Joe.\\Blow"@example.com""".split("\n") +135 + [r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com'] +136 | +137 | +138 | r"""first SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:160:1 @@ -1406,19 +1295,17 @@ SIM905 [*] Consider using a list literal instead of `str.split` 165 | # https://github.com/astral-sh/ruff/issues/19845 | help: Replace with list literal - -ℹ Safe fix -157 157 | "Joe.\\Blow"@example.com""".split("\n") -158 158 | -159 159 | -160 |-r"""first -161 |-'no need' to escape -162 |-"swap" quote style -163 |-"use' ugly triple quotes""".split("\n") - 160 |+[r"first", r"'no need' to escape", r'"swap" quote style', r""""use' ugly triple quotes"""] -164 161 | -165 162 | # https://github.com/astral-sh/ruff/issues/19845 -166 163 | print("S\x1cP\x1dL\x1eI\x1fT".split()) +157 | "Joe.\\Blow"@example.com""".split("\n") +158 | +159 | + - r"""first + - 'no need' to escape + - "swap" quote style + - "use' ugly triple quotes""".split("\n") +160 + [r"first", r"'no need' to escape", r'"swap" quote style', r""""use' ugly triple quotes"""] +161 | +162 | # https://github.com/astral-sh/ruff/issues/19845 +163 | print("S\x1cP\x1dL\x1eI\x1fT".split()) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:166:7 @@ -1430,16 +1317,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -163 163 | "use' ugly triple quotes""".split("\n") -164 164 | -165 165 | # https://github.com/astral-sh/ruff/issues/19845 -166 |-print("S\x1cP\x1dL\x1eI\x1fT".split()) - 166 |+print(["S", "P", "L", "I", "T"]) -167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) -168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) -169 169 | +163 | "use' ugly triple quotes""".split("\n") +164 | +165 | # https://github.com/astral-sh/ruff/issues/19845 + - print("S\x1cP\x1dL\x1eI\x1fT".split()) +166 + print(["S", "P", "L", "I", "T"]) +167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) +168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) +169 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:167:7 @@ -1451,16 +1336,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -164 164 | -165 165 | # https://github.com/astral-sh/ruff/issues/19845 -166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) -167 |-print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) - 167 |+print([">"]) -168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) -169 169 | -170 170 | # leading/trailing whitespace should not count towards maxsplit +164 | +165 | # https://github.com/astral-sh/ruff/issues/19845 +166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) + - print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) +167 + print([">"]) +168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) +169 | +170 | # leading/trailing whitespace should not count towards maxsplit SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:168:7 @@ -1473,16 +1356,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 170 | # leading/trailing whitespace should not count towards maxsplit | help: Replace with list literal - -ℹ Safe fix -165 165 | # https://github.com/astral-sh/ruff/issues/19845 -166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) -167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) -168 |-print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) - 168 |+print(["<"]) -169 169 | -170 170 | # leading/trailing whitespace should not count towards maxsplit -171 171 | " a b c d ".split(maxsplit=2) # ["a", "b", "c d "] +165 | # https://github.com/astral-sh/ruff/issues/19845 +166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) +167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) + - print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) +168 + print(["<"]) +169 | +170 | # leading/trailing whitespace should not count towards maxsplit +171 | " a b c d ".split(maxsplit=2) # ["a", "b", "c d "] SIM905 Consider using a list literal instead of `str.split` --> SIM905.py:171:1 diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap index 4840899e7c..b8cc6bcb16 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM910_SIM910.py.snap @@ -11,14 +11,12 @@ SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)` 4 | # SIM910 | help: Replace `{}.get(key, None)` with `{}.get(key)` - -ℹ Safe fix -1 1 | # SIM910 -2 |-{}.get(key, None) - 2 |+{}.get(key) -3 3 | -4 4 | # SIM910 -5 5 | {}.get("key", None) +1 | # SIM910 + - {}.get(key, None) +2 + {}.get(key) +3 | +4 | # SIM910 +5 | {}.get("key", None) SIM910 [*] Use `{}.get("key")` instead of `{}.get("key", None)` --> SIM910.py:5:1 @@ -30,16 +28,14 @@ SIM910 [*] Use `{}.get("key")` instead of `{}.get("key", None)` 7 | # OK | help: Replace `{}.get("key", None)` with `{}.get("key")` - -ℹ Safe fix -2 2 | {}.get(key, None) -3 3 | -4 4 | # SIM910 -5 |-{}.get("key", None) - 5 |+{}.get("key") -6 6 | -7 7 | # OK -8 8 | {}.get(key) +2 | {}.get(key, None) +3 | +4 | # SIM910 + - {}.get("key", None) +5 + {}.get("key") +6 | +7 | # OK +8 | {}.get(key) SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)` --> SIM910.py:20:9 @@ -50,16 +46,14 @@ SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)` 21 | pass | help: Replace `{}.get(key, None)` with `{}.get(key)` - -ℹ Safe fix -17 17 | {}.get("key", False) -18 18 | -19 19 | # SIM910 -20 |-if a := {}.get(key, None): - 20 |+if a := {}.get(key): -21 21 | pass -22 22 | -23 23 | # SIM910 +17 | {}.get("key", False) +18 | +19 | # SIM910 + - if a := {}.get(key, None): +20 + if a := {}.get(key): +21 | pass +22 | +23 | # SIM910 SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)` --> SIM910.py:24:5 @@ -71,16 +65,14 @@ SIM910 [*] Use `{}.get(key)` instead of `{}.get(key, None)` 26 | # SIM910 | help: Replace `{}.get(key, None)` with `{}.get(key)` - -ℹ Safe fix -21 21 | pass -22 22 | -23 23 | # SIM910 -24 |-a = {}.get(key, None) - 24 |+a = {}.get(key) -25 25 | -26 26 | # SIM910 -27 27 | ({}).get(key, None) +21 | pass +22 | +23 | # SIM910 + - a = {}.get(key, None) +24 + a = {}.get(key) +25 | +26 | # SIM910 +27 | ({}).get(key, None) SIM910 [*] Use `({}).get(key)` instead of `({}).get(key, None)` --> SIM910.py:27:1 @@ -92,16 +84,14 @@ SIM910 [*] Use `({}).get(key)` instead of `({}).get(key, None)` 29 | # SIM910 | help: Replace `({}).get(key, None)` with `({}).get(key)` - -ℹ Safe fix -24 24 | a = {}.get(key, None) -25 25 | -26 26 | # SIM910 -27 |-({}).get(key, None) - 27 |+({}).get(key) -28 28 | -29 29 | # SIM910 -30 30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11} +24 | a = {}.get(key, None) +25 | +26 | # SIM910 + - ({}).get(key, None) +27 + ({}).get(key) +28 | +29 | # SIM910 +30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11} SIM910 [*] Use `ages.get("Cat")` instead of `ages.get("Cat", None)` --> SIM910.py:31:7 @@ -114,16 +104,14 @@ SIM910 [*] Use `ages.get("Cat")` instead of `ages.get("Cat", None)` 33 | # OK | help: Replace `ages.get("Cat", None)` with `ages.get("Cat")` - -ℹ Safe fix -28 28 | -29 29 | # SIM910 -30 30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11} -31 |-age = ages.get("Cat", None) - 31 |+age = ages.get("Cat") -32 32 | -33 33 | # OK -34 34 | ages = ["Tom", "Maria", "Dog"] +28 | +29 | # SIM910 +30 | ages = {"Tom": 23, "Maria": 23, "Dog": 11} + - age = ages.get("Cat", None) +31 + age = ages.get("Cat") +32 | +33 | # OK +34 | ages = ["Tom", "Maria", "Dog"] SIM910 [*] Use `kwargs.get('a')` instead of `kwargs.get('a', None)` --> SIM910.py:39:9 @@ -136,16 +124,14 @@ SIM910 [*] Use `kwargs.get('a')` instead of `kwargs.get('a', None)` 41 | # SIM910 | help: Replace `kwargs.get('a', None)` with `kwargs.get('a')` - -ℹ Safe fix -36 36 | -37 37 | # SIM910 -38 38 | def foo(**kwargs): -39 |- a = kwargs.get('a', None) - 39 |+ a = kwargs.get('a') -40 40 | -41 41 | # SIM910 -42 42 | def foo(some_dict: dict): +36 | +37 | # SIM910 +38 | def foo(**kwargs): + - a = kwargs.get('a', None) +39 + a = kwargs.get('a') +40 | +41 | # SIM910 +42 | def foo(some_dict: dict): SIM910 [*] Use `some_dict.get('a')` instead of `some_dict.get('a', None)` --> SIM910.py:43:9 @@ -158,16 +144,14 @@ SIM910 [*] Use `some_dict.get('a')` instead of `some_dict.get('a', None)` 45 | # OK | help: Replace `some_dict.get('a', None)` with `some_dict.get('a')` - -ℹ Safe fix -40 40 | -41 41 | # SIM910 -42 42 | def foo(some_dict: dict): -43 |- a = some_dict.get('a', None) - 43 |+ a = some_dict.get('a') -44 44 | -45 45 | # OK -46 46 | def foo(some_other: object): +40 | +41 | # SIM910 +42 | def foo(some_dict: dict): + - a = some_dict.get('a', None) +43 + a = some_dict.get('a') +44 | +45 | # OK +46 | def foo(some_other: object): SIM910 [*] Use `dict.get("Cat")` instead of `dict.get("Cat", None)` --> SIM910.py:57:11 @@ -178,10 +162,8 @@ SIM910 [*] Use `dict.get("Cat")` instead of `dict.get("Cat", None)` | ^^^^^^^^^^^^^^^^^^^^^ | help: Replace `dict.get("Cat", None)` with `dict.get("Cat")` - -ℹ Safe fix -54 54 | # https://github.com/astral-sh/ruff/issues/18777 -55 55 | def foo(): -56 56 | dict = {"Tom": 23, "Maria": 23, "Dog": 11} -57 |- age = dict.get("Cat", None) - 57 |+ age = dict.get("Cat") +54 | # https://github.com/astral-sh/ruff/issues/18777 +55 | def foo(): +56 | dict = {"Tom": 23, "Maria": 23, "Dog": 11} + - age = dict.get("Cat", None) +57 + age = dict.get("Cat") diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap index 4996e8d7d0..ffecf5ebeb 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__SIM911_SIM911.py.snap @@ -10,14 +10,12 @@ SIM911 [*] Use `d.items()` instead of `zip(d.keys(), d.values())` 3 | ... | help: Replace `zip(d.keys(), d.values())` with `d.items()` - -ℹ Safe fix -1 1 | def foo(d: dict[str, str]) -> None: -2 |- for k, v in zip(d.keys(), d.values()): # SIM911 - 2 |+ for k, v in d.items(): # SIM911 -3 3 | ... -4 4 | -5 5 | for k, v in zip(d.keys(), d.values(), strict=True): # SIM911 +1 | def foo(d: dict[str, str]) -> None: + - for k, v in zip(d.keys(), d.values()): # SIM911 +2 + for k, v in d.items(): # SIM911 +3 | ... +4 | +5 | for k, v in zip(d.keys(), d.values(), strict=True): # SIM911 SIM911 [*] Use `d.items()` instead of `zip(d.keys(), d.values(), strict=True)` --> SIM911.py:5:17 @@ -29,16 +27,14 @@ SIM911 [*] Use `d.items()` instead of `zip(d.keys(), d.values(), strict=True)` 6 | ... | help: Replace `zip(d.keys(), d.values(), strict=True)` with `d.items()` - -ℹ Safe fix -2 2 | for k, v in zip(d.keys(), d.values()): # SIM911 -3 3 | ... -4 4 | -5 |- for k, v in zip(d.keys(), d.values(), strict=True): # SIM911 - 5 |+ for k, v in d.items(): # SIM911 -6 6 | ... -7 7 | -8 8 | for k, v in zip(d.keys(), d.values(), struct=True): # OK +2 | for k, v in zip(d.keys(), d.values()): # SIM911 +3 | ... +4 | + - for k, v in zip(d.keys(), d.values(), strict=True): # SIM911 +5 + for k, v in d.items(): # SIM911 +6 | ... +7 | +8 | for k, v in zip(d.keys(), d.values(), struct=True): # OK SIM911 [*] Use `d2.items()` instead of `zip(d2.keys(), d2.values())` --> SIM911.py:20:13 @@ -50,16 +46,14 @@ SIM911 [*] Use `d2.items()` instead of `zip(d2.keys(), d2.values())` 21 | ... | help: Replace `zip(d2.keys(), d2.values())` with `d2.items()` - -ℹ Safe fix -17 17 | for k, v in zip(d1.items(), d2.values()): # OK -18 18 | ... -19 19 | -20 |-for k, v in zip(d2.keys(), d2.values()): # SIM911 - 20 |+for k, v in d2.items(): # SIM911 -21 21 | ... -22 22 | -23 23 | items = zip(x.keys(), x.values()) # OK +17 | for k, v in zip(d1.items(), d2.values()): # OK +18 | ... +19 | + - for k, v in zip(d2.keys(), d2.values()): # SIM911 +20 + for k, v in d2.items(): # SIM911 +21 | ... +22 | +23 | items = zip(x.keys(), x.values()) # OK SIM911 [*] Use `dict.items()` instead of `zip(dict.keys(), dict.values())` --> SIM911.py:30:27 @@ -71,16 +65,14 @@ SIM911 [*] Use `dict.items()` instead of `zip(dict.keys(), dict.values())` 31 | ... | help: Replace `zip(dict.keys(), dict.values())` with `dict.items()` - -ℹ Safe fix -27 27 | # https://github.com/astral-sh/ruff/issues/18777 -28 28 | def foo(): -29 29 | dict = {} -30 |- for country, stars in zip(dict.keys(), dict.values()): - 30 |+ for country, stars in dict.items(): -31 31 | ... -32 32 | -33 33 | +27 | # https://github.com/astral-sh/ruff/issues/18777 +28 | def foo(): +29 | dict = {} + - for country, stars in zip(dict.keys(), dict.values()): +30 + for country, stars in dict.items(): +31 | ... +32 | +33 | SIM911 [*] Use ` flag_stars.items()` instead of `(zip)(flag_stars.keys(), flag_stars.values())` --> SIM911.py:36:22 @@ -91,10 +83,8 @@ SIM911 [*] Use ` flag_stars.items()` instead of `(zip)(flag_stars.keys(), flag_s | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace `(zip)(flag_stars.keys(), flag_stars.values())` with ` flag_stars.items()` - -ℹ Safe fix -33 33 | -34 34 | # https://github.com/astral-sh/ruff/issues/18776 -35 35 | flag_stars = {} -36 |-for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):... - 36 |+for country, stars in flag_stars.items():... +33 | +34 | # https://github.com/astral-sh/ruff/issues/18776 +35 | flag_stars = {} + - for country, stars in(zip)(flag_stars.keys(), flag_stars.values()):... +36 + for country, stars in flag_stars.items():... diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM117_SIM117.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM117_SIM117.py.snap index db3862e18e..62d5972419 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM117_SIM117.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM117_SIM117.py.snap @@ -11,17 +11,15 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 4 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -1 1 | # SIM117 -2 |-with A() as a: -3 |- with B() as b: -4 |- print("hello") - 2 |+with A() as a, B() as b: - 3 |+ print("hello") -5 4 | -6 5 | # SIM117 -7 6 | with A(): +1 | # SIM117 + - with A() as a: + - with B() as b: + - print("hello") +2 + with A() as a, B() as b: +3 + print("hello") +4 | +5 | # SIM117 +6 | with A(): SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:7:1 @@ -34,21 +32,19 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 10 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -4 4 | print("hello") -5 5 | -6 6 | # SIM117 -7 |-with A(): -8 |- with B(): -9 |- with C(): -10 |- print("hello") - 7 |+with A(), B(): - 8 |+ with C(): - 9 |+ print("hello") -11 10 | -12 11 | # SIM117 -13 12 | with A() as a: +4 | print("hello") +5 | +6 | # SIM117 + - with A(): + - with B(): + - with C(): + - print("hello") +7 + with A(), B(): +8 + with C(): +9 + print("hello") +10 | +11 | # SIM117 +12 | with A() as a: SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:13:1 @@ -73,21 +69,19 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 22 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -16 16 | print("hello") -17 17 | -18 18 | # SIM117 -19 |-with A() as a: -20 |- with B() as b: -21 |- # Fixable due to placement of this comment. -22 |- print("hello") - 19 |+with A() as a, B() as b: - 20 |+ # Fixable due to placement of this comment. - 21 |+ print("hello") -23 22 | -24 23 | # OK -25 24 | with A() as a: +16 | print("hello") +17 | +18 | # SIM117 + - with A() as a: + - with B() as b: + - # Fixable due to placement of this comment. + - print("hello") +19 + with A() as a, B() as b: +20 + # Fixable due to placement of this comment. +21 + print("hello") +22 | +23 | # OK +24 | with A() as a: SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:47:1 @@ -99,19 +93,17 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 49 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -44 44 | print("hello") -45 45 | -46 46 | # SIM117 -47 |-async with A() as a: -48 |- async with B() as b: -49 |- print("hello") - 47 |+async with A() as a, B() as b: - 48 |+ print("hello") -50 49 | -51 50 | while True: -52 51 | # SIM117 +44 | print("hello") +45 | +46 | # SIM117 + - async with A() as a: + - async with B() as b: + - print("hello") +47 + async with A() as a, B() as b: +48 + print("hello") +49 | +50 | while True: +51 | # SIM117 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:53:5 @@ -125,31 +117,29 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 56 | is valid""" | help: Combine `with` statements - -ℹ Safe fix -50 50 | -51 51 | while True: -52 52 | # SIM117 -53 |- with A() as a: -54 |- with B() as b: -55 |- """this - 53 |+ with A() as a, B() as b: - 54 |+ """this -56 55 | is valid""" -57 56 | -58 |- """the indentation on - 57 |+ """the indentation on -59 58 | this line is significant""" -60 59 | -61 |- "this is" \ - 60 |+ "this is" \ -62 61 | "allowed too" -63 62 | -64 |- ("so is" - 63 |+ ("so is" -65 64 | "this for some reason") -66 65 | -67 66 | # SIM117 +50 | +51 | while True: +52 | # SIM117 + - with A() as a: + - with B() as b: + - """this +53 + with A() as a, B() as b: +54 + """this +55 | is valid""" +56 | + - """the indentation on +57 + """the indentation on +58 | this line is significant""" +59 | + - "this is" \ +60 + "this is" \ +61 | "allowed too" +62 | + - ("so is" +63 + ("so is" +64 | "this for some reason") +65 | +66 | # SIM117 SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:68:1 @@ -164,20 +154,18 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 73 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -67 67 | # SIM117 -68 68 | with ( -69 69 | A() as a, -70 |- B() as b, - 70 |+ B() as b,C() as c -71 71 | ): -72 |- with C() as c: -73 |- print("hello") - 72 |+ print("hello") -74 73 | -75 74 | # SIM117 -76 75 | with A() as a: +67 | # SIM117 +68 | with ( +69 | A() as a, + - B() as b, +70 + B() as b,C() as c +71 | ): + - with C() as c: + - print("hello") +72 + print("hello") +73 | +74 | # SIM117 +75 | with A() as a: SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:76:1 @@ -192,25 +180,23 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 81 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -73 73 | print("hello") -74 74 | -75 75 | # SIM117 -76 |-with A() as a: -77 |- with ( -78 |- B() as b, -79 |- C() as c, -80 |- ): -81 |- print("hello") - 76 |+with ( - 77 |+ A() as a, B() as b, - 78 |+ C() as c, - 79 |+): - 80 |+ print("hello") -82 81 | -83 82 | # SIM117 -84 83 | with ( +73 | print("hello") +74 | +75 | # SIM117 + - with A() as a: + - with ( + - B() as b, + - C() as c, + - ): + - print("hello") +76 + with ( +77 + A() as a, B() as b, +78 + C() as c, +79 + ): +80 + print("hello") +81 | +82 | # SIM117 +83 | with ( SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:84:1 @@ -228,24 +214,22 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 92 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -83 83 | # SIM117 -84 84 | with ( -85 85 | A() as a, -86 |- B() as b, - 86 |+ B() as b,C() as c, - 87 |+ D() as d, -87 88 | ): -88 |- with ( -89 |- C() as c, -90 |- D() as d, -91 |- ): -92 |- print("hello") - 89 |+ print("hello") -93 90 | -94 91 | # SIM117 (auto-fixable) -95 92 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: +83 | # SIM117 +84 | with ( +85 | A() as a, + - B() as b, +86 + B() as b,C() as c, +87 + D() as d, +88 | ): + - with ( + - C() as c, + - D() as d, + - ): + - print("hello") +89 + print("hello") +90 | +91 | # SIM117 (auto-fixable) +92 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:95:1 @@ -257,19 +241,17 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 97 | print("hello") | help: Combine `with` statements - -ℹ Safe fix -92 92 | print("hello") -93 93 | -94 94 | # SIM117 (auto-fixable) -95 |-with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: -96 |- with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: -97 |- print("hello") - 95 |+with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a, B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: - 96 |+ print("hello") -98 97 | -99 98 | # SIM117 (not auto-fixable too long) -100 99 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a: +92 | print("hello") +93 | +94 | # SIM117 (auto-fixable) + - with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a: + - with B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: + - print("hello") +95 + with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as a, B("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ89") as b: +96 + print("hello") +97 | +98 | # SIM117 (not auto-fixable too long) +99 | with A("01ß9💣2ℝ8901ß9💣2ℝ8901ß9💣2ℝ890") as a: SIM117 Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:100:1 @@ -304,32 +286,30 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 128 | type ListOrSet[T] = list[T] | set[T] | help: Combine `with` statements - -ℹ Safe fix -123 123 | f(b2, c2, d2) -124 124 | -125 125 | # SIM117 -126 |-with A() as a: -127 |- with B() as b: -128 |- type ListOrSet[T] = list[T] | set[T] - 126 |+with A() as a, B() as b: - 127 |+ type ListOrSet[T] = list[T] | set[T] -129 128 | -130 |- class ClassA[T: str]: -131 |- def method1(self) -> T: -132 |- ... - 129 |+ class ClassA[T: str]: - 130 |+ def method1(self) -> T: - 131 |+ ... -133 132 | -134 |- f" something { my_dict["key"] } something else " - 133 |+ f" something { my_dict["key"] } something else " -135 134 | -136 |- f"foo {f"bar {x}"} baz" - 135 |+ f"foo {f"bar {x}"} baz" -137 136 | -138 137 | # Allow cascading for some statements. -139 138 | import anyio +123 | f(b2, c2, d2) +124 | +125 | # SIM117 + - with A() as a: + - with B() as b: + - type ListOrSet[T] = list[T] | set[T] +126 + with A() as a, B() as b: +127 + type ListOrSet[T] = list[T] | set[T] +128 | + - class ClassA[T: str]: + - def method1(self) -> T: + - ... +129 + class ClassA[T: str]: +130 + def method1(self) -> T: +131 + ... +132 | + - f" something { my_dict["key"] } something else " +133 + f" something { my_dict["key"] } something else " +134 | + - f"foo {f"bar {x}"} baz" +135 + f"foo {f"bar {x}"} baz" +136 | +137 | # Allow cascading for some statements. +138 | import anyio SIM117 [*] Use a single `with` statement with multiple contexts instead of nested `with` statements --> SIM117.py:163:1 @@ -341,13 +321,11 @@ SIM117 [*] Use a single `with` statement with multiple contexts instead of neste 165 | pass | help: Combine `with` statements - -ℹ Safe fix -160 160 | pass -161 161 | -162 162 | # Do not suppress combination, if a context manager is already combined with another. -163 |-async with asyncio.timeout(1), A(): -164 |- async with B(): -165 |- pass - 163 |+async with asyncio.timeout(1), A(), B(): - 164 |+ pass +160 | pass +161 | +162 | # Do not suppress combination, if a context manager is already combined with another. + - async with asyncio.timeout(1), A(): + - async with B(): + - pass +163 + async with asyncio.timeout(1), A(), B(): +164 + pass diff --git a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap index e45eabb21c..ca261f10f6 100644 --- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap +++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linter__rules__flake8_simplify__tests__preview__SIM905_SIM905.py.snap @@ -15,20 +15,18 @@ SIM905 [*] Consider using a list literal instead of `str.split` 12 | "a,b,c,d".split(",") | help: Replace with list literal - -ℹ Safe fix -3 3 | no_sep = None -4 4 | -5 5 | # positives -6 |-""" -7 |- itemA -8 |- itemB -9 |- itemC -10 |-""".split() - 6 |+["itemA", "itemB", "itemC"] -11 7 | -12 8 | "a,b,c,d".split(",") -13 9 | "a,b,c,d".split(None) +3 | no_sep = None +4 | +5 | # positives + - """ + - itemA + - itemB + - itemC + - """.split() +6 + ["itemA", "itemB", "itemC"] +7 | +8 | "a,b,c,d".split(",") +9 | "a,b,c,d".split(None) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:12:1 @@ -41,16 +39,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 14 | "a,b,c,d".split(",", 1) | help: Replace with list literal - -ℹ Safe fix -9 9 | itemC -10 10 | """.split() -11 11 | -12 |-"a,b,c,d".split(",") - 12 |+["a", "b", "c", "d"] -13 13 | "a,b,c,d".split(None) -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) +9 | itemC +10 | """.split() +11 | + - "a,b,c,d".split(",") +12 + ["a", "b", "c", "d"] +13 | "a,b,c,d".split(None) +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:13:1 @@ -62,16 +58,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 15 | "a,b,c,d".split(None, 1) | help: Replace with list literal - -ℹ Safe fix -10 10 | """.split() -11 11 | -12 12 | "a,b,c,d".split(",") -13 |-"a,b,c,d".split(None) - 13 |+["a,b,c,d"] -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") +10 | """.split() +11 | +12 | "a,b,c,d".split(",") + - "a,b,c,d".split(None) +13 + ["a,b,c,d"] +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:14:1 @@ -84,16 +78,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 16 | "a,b,c,d".split(sep=",") | help: Replace with list literal - -ℹ Safe fix -11 11 | -12 12 | "a,b,c,d".split(",") -13 13 | "a,b,c,d".split(None) -14 |-"a,b,c,d".split(",", 1) - 14 |+["a", "b,c,d"] -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") -17 17 | "a,b,c,d".split(sep=None) +11 | +12 | "a,b,c,d".split(",") +13 | "a,b,c,d".split(None) + - "a,b,c,d".split(",", 1) +14 + ["a", "b,c,d"] +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") +17 | "a,b,c,d".split(sep=None) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:15:1 @@ -106,16 +98,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 17 | "a,b,c,d".split(sep=None) | help: Replace with list literal - -ℹ Safe fix -12 12 | "a,b,c,d".split(",") -13 13 | "a,b,c,d".split(None) -14 14 | "a,b,c,d".split(",", 1) -15 |-"a,b,c,d".split(None, 1) - 15 |+["a,b,c,d"] -16 16 | "a,b,c,d".split(sep=",") -17 17 | "a,b,c,d".split(sep=None) -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) +12 | "a,b,c,d".split(",") +13 | "a,b,c,d".split(None) +14 | "a,b,c,d".split(",", 1) + - "a,b,c,d".split(None, 1) +15 + ["a,b,c,d"] +16 | "a,b,c,d".split(sep=",") +17 | "a,b,c,d".split(sep=None) +18 | "a,b,c,d".split(sep=",", maxsplit=1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:16:1 @@ -128,16 +118,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 18 | "a,b,c,d".split(sep=",", maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -13 13 | "a,b,c,d".split(None) -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) -16 |-"a,b,c,d".split(sep=",") - 16 |+["a", "b", "c", "d"] -17 17 | "a,b,c,d".split(sep=None) -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) +13 | "a,b,c,d".split(None) +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) + - "a,b,c,d".split(sep=",") +16 + ["a", "b", "c", "d"] +17 | "a,b,c,d".split(sep=None) +18 | "a,b,c,d".split(sep=",", maxsplit=1) +19 | "a,b,c,d".split(sep=None, maxsplit=1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:17:1 @@ -150,16 +138,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 19 | "a,b,c,d".split(sep=None, maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -14 14 | "a,b,c,d".split(",", 1) -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") -17 |-"a,b,c,d".split(sep=None) - 17 |+["a,b,c,d"] -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") +14 | "a,b,c,d".split(",", 1) +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") + - "a,b,c,d".split(sep=None) +17 + ["a,b,c,d"] +18 | "a,b,c,d".split(sep=",", maxsplit=1) +19 | "a,b,c,d".split(sep=None, maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:18:1 @@ -172,16 +158,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 20 | "a,b,c,d".split(maxsplit=1, sep=",") | help: Replace with list literal - -ℹ Safe fix -15 15 | "a,b,c,d".split(None, 1) -16 16 | "a,b,c,d".split(sep=",") -17 17 | "a,b,c,d".split(sep=None) -18 |-"a,b,c,d".split(sep=",", maxsplit=1) - 18 |+["a", "b,c,d"] -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) +15 | "a,b,c,d".split(None, 1) +16 | "a,b,c,d".split(sep=",") +17 | "a,b,c,d".split(sep=None) + - "a,b,c,d".split(sep=",", maxsplit=1) +18 + ["a", "b,c,d"] +19 | "a,b,c,d".split(sep=None, maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") +21 | "a,b,c,d".split(maxsplit=1, sep=None) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:19:1 @@ -194,16 +178,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 21 | "a,b,c,d".split(maxsplit=1, sep=None) | help: Replace with list literal - -ℹ Safe fix -16 16 | "a,b,c,d".split(sep=",") -17 17 | "a,b,c,d".split(sep=None) -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 |-"a,b,c,d".split(sep=None, maxsplit=1) - 19 |+["a,b,c,d"] -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) -22 22 | "a,b,c,d".split(",", maxsplit=1) +16 | "a,b,c,d".split(sep=",") +17 | "a,b,c,d".split(sep=None) +18 | "a,b,c,d".split(sep=",", maxsplit=1) + - "a,b,c,d".split(sep=None, maxsplit=1) +19 + ["a,b,c,d"] +20 | "a,b,c,d".split(maxsplit=1, sep=",") +21 | "a,b,c,d".split(maxsplit=1, sep=None) +22 | "a,b,c,d".split(",", maxsplit=1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:20:1 @@ -216,16 +198,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 22 | "a,b,c,d".split(",", maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -17 17 | "a,b,c,d".split(sep=None) -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 |-"a,b,c,d".split(maxsplit=1, sep=",") - 20 |+["a", "b,c,d"] -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) -22 22 | "a,b,c,d".split(",", maxsplit=1) -23 23 | "a,b,c,d".split(None, maxsplit=1) +17 | "a,b,c,d".split(sep=None) +18 | "a,b,c,d".split(sep=",", maxsplit=1) +19 | "a,b,c,d".split(sep=None, maxsplit=1) + - "a,b,c,d".split(maxsplit=1, sep=",") +20 + ["a", "b,c,d"] +21 | "a,b,c,d".split(maxsplit=1, sep=None) +22 | "a,b,c,d".split(",", maxsplit=1) +23 | "a,b,c,d".split(None, maxsplit=1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:21:1 @@ -238,16 +218,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 23 | "a,b,c,d".split(None, maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -18 18 | "a,b,c,d".split(sep=",", maxsplit=1) -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") -21 |-"a,b,c,d".split(maxsplit=1, sep=None) - 21 |+["a,b,c,d"] -22 22 | "a,b,c,d".split(",", maxsplit=1) -23 23 | "a,b,c,d".split(None, maxsplit=1) -24 24 | "a,b,c,d".split(maxsplit=1) +18 | "a,b,c,d".split(sep=",", maxsplit=1) +19 | "a,b,c,d".split(sep=None, maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") + - "a,b,c,d".split(maxsplit=1, sep=None) +21 + ["a,b,c,d"] +22 | "a,b,c,d".split(",", maxsplit=1) +23 | "a,b,c,d".split(None, maxsplit=1) +24 | "a,b,c,d".split(maxsplit=1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:22:1 @@ -260,16 +238,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 24 | "a,b,c,d".split(maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -19 19 | "a,b,c,d".split(sep=None, maxsplit=1) -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) -22 |-"a,b,c,d".split(",", maxsplit=1) - 22 |+["a", "b,c,d"] -23 23 | "a,b,c,d".split(None, maxsplit=1) -24 24 | "a,b,c,d".split(maxsplit=1) -25 25 | "a,b,c,d".split(maxsplit=1.0) +19 | "a,b,c,d".split(sep=None, maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") +21 | "a,b,c,d".split(maxsplit=1, sep=None) + - "a,b,c,d".split(",", maxsplit=1) +22 + ["a", "b,c,d"] +23 | "a,b,c,d".split(None, maxsplit=1) +24 | "a,b,c,d".split(maxsplit=1) +25 | "a,b,c,d".split(maxsplit=1.0) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:23:1 @@ -282,16 +258,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 25 | "a,b,c,d".split(maxsplit=1.0) | help: Replace with list literal - -ℹ Safe fix -20 20 | "a,b,c,d".split(maxsplit=1, sep=",") -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) -22 22 | "a,b,c,d".split(",", maxsplit=1) -23 |-"a,b,c,d".split(None, maxsplit=1) - 23 |+["a,b,c,d"] -24 24 | "a,b,c,d".split(maxsplit=1) -25 25 | "a,b,c,d".split(maxsplit=1.0) -26 26 | "a,b,c,d".split(maxsplit=1) +20 | "a,b,c,d".split(maxsplit=1, sep=",") +21 | "a,b,c,d".split(maxsplit=1, sep=None) +22 | "a,b,c,d".split(",", maxsplit=1) + - "a,b,c,d".split(None, maxsplit=1) +23 + ["a,b,c,d"] +24 | "a,b,c,d".split(maxsplit=1) +25 | "a,b,c,d".split(maxsplit=1.0) +26 | "a,b,c,d".split(maxsplit=1) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:24:1 @@ -304,16 +278,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 26 | "a,b,c,d".split(maxsplit=1) | help: Replace with list literal - -ℹ Safe fix -21 21 | "a,b,c,d".split(maxsplit=1, sep=None) -22 22 | "a,b,c,d".split(",", maxsplit=1) -23 23 | "a,b,c,d".split(None, maxsplit=1) -24 |-"a,b,c,d".split(maxsplit=1) - 24 |+["a,b,c,d"] -25 25 | "a,b,c,d".split(maxsplit=1.0) -26 26 | "a,b,c,d".split(maxsplit=1) -27 27 | "a,b,c,d".split(maxsplit=0) +21 | "a,b,c,d".split(maxsplit=1, sep=None) +22 | "a,b,c,d".split(",", maxsplit=1) +23 | "a,b,c,d".split(None, maxsplit=1) + - "a,b,c,d".split(maxsplit=1) +24 + ["a,b,c,d"] +25 | "a,b,c,d".split(maxsplit=1.0) +26 | "a,b,c,d".split(maxsplit=1) +27 | "a,b,c,d".split(maxsplit=0) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:26:1 @@ -326,16 +298,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 28 | "VERB AUX PRON ADP DET".split(" ") | help: Replace with list literal - -ℹ Safe fix -23 23 | "a,b,c,d".split(None, maxsplit=1) -24 24 | "a,b,c,d".split(maxsplit=1) -25 25 | "a,b,c,d".split(maxsplit=1.0) -26 |-"a,b,c,d".split(maxsplit=1) - 26 |+["a,b,c,d"] -27 27 | "a,b,c,d".split(maxsplit=0) -28 28 | "VERB AUX PRON ADP DET".split(" ") -29 29 | ' 1 2 3 '.split() +23 | "a,b,c,d".split(None, maxsplit=1) +24 | "a,b,c,d".split(maxsplit=1) +25 | "a,b,c,d".split(maxsplit=1.0) + - "a,b,c,d".split(maxsplit=1) +26 + ["a,b,c,d"] +27 | "a,b,c,d".split(maxsplit=0) +28 | "VERB AUX PRON ADP DET".split(" ") +29 | ' 1 2 3 '.split() SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:27:1 @@ -348,16 +318,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 29 | ' 1 2 3 '.split() | help: Replace with list literal - -ℹ Safe fix -24 24 | "a,b,c,d".split(maxsplit=1) -25 25 | "a,b,c,d".split(maxsplit=1.0) -26 26 | "a,b,c,d".split(maxsplit=1) -27 |-"a,b,c,d".split(maxsplit=0) - 27 |+["a,b,c,d"] -28 28 | "VERB AUX PRON ADP DET".split(" ") -29 29 | ' 1 2 3 '.split() -30 30 | '1<>2<>3<4'.split('<>') +24 | "a,b,c,d".split(maxsplit=1) +25 | "a,b,c,d".split(maxsplit=1.0) +26 | "a,b,c,d".split(maxsplit=1) + - "a,b,c,d".split(maxsplit=0) +27 + ["a,b,c,d"] +28 | "VERB AUX PRON ADP DET".split(" ") +29 | ' 1 2 3 '.split() +30 | '1<>2<>3<4'.split('<>') SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:28:1 @@ -370,16 +338,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 30 | '1<>2<>3<4'.split('<>') | help: Replace with list literal - -ℹ Safe fix -25 25 | "a,b,c,d".split(maxsplit=1.0) -26 26 | "a,b,c,d".split(maxsplit=1) -27 27 | "a,b,c,d".split(maxsplit=0) -28 |-"VERB AUX PRON ADP DET".split(" ") - 28 |+["VERB", "AUX", "PRON", "ADP", "DET"] -29 29 | ' 1 2 3 '.split() -30 30 | '1<>2<>3<4'.split('<>') -31 31 | +25 | "a,b,c,d".split(maxsplit=1.0) +26 | "a,b,c,d".split(maxsplit=1) +27 | "a,b,c,d".split(maxsplit=0) + - "VERB AUX PRON ADP DET".split(" ") +28 + ["VERB", "AUX", "PRON", "ADP", "DET"] +29 | ' 1 2 3 '.split() +30 | '1<>2<>3<4'.split('<>') +31 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:29:1 @@ -391,16 +357,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 30 | '1<>2<>3<4'.split('<>') | help: Replace with list literal - -ℹ Safe fix -26 26 | "a,b,c,d".split(maxsplit=1) -27 27 | "a,b,c,d".split(maxsplit=0) -28 28 | "VERB AUX PRON ADP DET".split(" ") -29 |-' 1 2 3 '.split() - 29 |+['1', '2', '3'] -30 30 | '1<>2<>3<4'.split('<>') -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +26 | "a,b,c,d".split(maxsplit=1) +27 | "a,b,c,d".split(maxsplit=0) +28 | "VERB AUX PRON ADP DET".split(" ") + - ' 1 2 3 '.split() +29 + ['1', '2', '3'] +30 | '1<>2<>3<4'.split('<>') +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:30:1 @@ -413,16 +377,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] | help: Replace with list literal - -ℹ Safe fix -27 27 | "a,b,c,d".split(maxsplit=0) -28 28 | "VERB AUX PRON ADP DET".split(" ") -29 29 | ' 1 2 3 '.split() -30 |-'1<>2<>3<4'.split('<>') - 30 |+['1', '2', '3<4'] -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] -33 33 | "".split() # [] +27 | "a,b,c,d".split(maxsplit=0) +28 | "VERB AUX PRON ADP DET".split(" ") +29 | ' 1 2 3 '.split() + - '1<>2<>3<4'.split('<>') +30 + ['1', '2', '3<4'] +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +33 | "".split() # [] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:32:1 @@ -435,16 +397,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 34 | """ | help: Replace with list literal - -ℹ Safe fix -29 29 | ' 1 2 3 '.split() -30 30 | '1<>2<>3<4'.split('<>') -31 31 | -32 |-" a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] - 32 |+[" a", "a a", "a a "] # [" a", "a a", "a a "] -33 33 | "".split() # [] -34 34 | """ -35 35 | """.split() # [] +29 | ' 1 2 3 '.split() +30 | '1<>2<>3<4'.split('<>') +31 | + - " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +32 + [" a", "a a", "a a "] # [" a", "a a", "a a "] +33 | "".split() # [] +34 | """ +35 | """.split() # [] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:33:1 @@ -456,16 +416,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 35 | """.split() # [] | help: Replace with list literal - -ℹ Safe fix -30 30 | '1<>2<>3<4'.split('<>') -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] -33 |-"".split() # [] - 33 |+[] # [] -34 34 | """ -35 35 | """.split() # [] -36 36 | " ".split() # [] +30 | '1<>2<>3<4'.split('<>') +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] + - "".split() # [] +33 + [] # [] +34 | """ +35 | """.split() # [] +36 | " ".split() # [] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:34:1 @@ -479,17 +437,15 @@ SIM905 [*] Consider using a list literal instead of `str.split` 37 | "/abc/".split() # ["/abc/"] | help: Replace with list literal - -ℹ Safe fix -31 31 | -32 32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] -33 33 | "".split() # [] -34 |-""" -35 |-""".split() # [] - 34 |+[] # [] -36 35 | " ".split() # [] -37 36 | "/abc/".split() # ["/abc/"] -38 37 | ("a,b,c" +31 | +32 | " a*a a*a a ".split("*", -1) # [" a", "a a", "a a "] +33 | "".split() # [] + - """ + - """.split() # [] +34 + [] # [] +35 | " ".split() # [] +36 | "/abc/".split() # ["/abc/"] +37 | ("a,b,c" SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:36:1 @@ -502,16 +458,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 38 | ("a,b,c" | help: Replace with list literal - -ℹ Safe fix -33 33 | "".split() # [] -34 34 | """ -35 35 | """.split() # [] -36 |-" ".split() # [] - 36 |+[] # [] -37 37 | "/abc/".split() # ["/abc/"] -38 38 | ("a,b,c" -39 39 | # comment +33 | "".split() # [] +34 | """ +35 | """.split() # [] + - " ".split() # [] +36 + [] # [] +37 | "/abc/".split() # ["/abc/"] +38 | ("a,b,c" +39 | # comment SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:37:1 @@ -524,16 +478,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 39 | # comment | help: Replace with list literal - -ℹ Safe fix -34 34 | """ -35 35 | """.split() # [] -36 36 | " ".split() # [] -37 |-"/abc/".split() # ["/abc/"] - 37 |+["/abc/"] # ["/abc/"] -38 38 | ("a,b,c" -39 39 | # comment -40 40 | .split() +34 | """ +35 | """.split() # [] +36 | " ".split() # [] + - "/abc/".split() # ["/abc/"] +37 + ["/abc/"] # ["/abc/"] +38 | ("a,b,c" +39 | # comment +40 | .split() SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:38:2 @@ -549,18 +501,17 @@ SIM905 [*] Consider using a list literal instead of `str.split` 42 | ("a,b,c" | help: Replace with list literal - -ℹ Unsafe fix -35 35 | """.split() # [] -36 36 | " ".split() # [] -37 37 | "/abc/".split() # ["/abc/"] -38 |-("a,b,c" -39 |-# comment -40 |-.split() - 38 |+(["a,b,c"] -41 39 | ) # ["a,b,c"] -42 40 | ("a,b,c" -43 41 | # comment1 +35 | """.split() # [] +36 | " ".split() # [] +37 | "/abc/".split() # ["/abc/"] + - ("a,b,c" + - # comment + - .split() +38 + (["a,b,c"] +39 | ) # ["a,b,c"] +40 | ("a,b,c" +41 | # comment1 +note: This is an unsafe fix and may change runtime behavior SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:42:2 @@ -576,18 +527,17 @@ SIM905 [*] Consider using a list literal instead of `str.split` 46 | ("a," | help: Replace with list literal - -ℹ Unsafe fix -39 39 | # comment -40 40 | .split() -41 41 | ) # ["a,b,c"] -42 |-("a,b,c" -43 |-# comment1 -44 |-.split(",") - 42 |+(["a", "b", "c"] -45 43 | ) # ["a", "b", "c"] -46 44 | ("a," -47 45 | # comment +39 | # comment +40 | .split() +41 | ) # ["a,b,c"] + - ("a,b,c" + - # comment1 + - .split(",") +42 + (["a", "b", "c"] +43 | ) # ["a", "b", "c"] +44 | ("a," +45 | # comment +note: This is an unsafe fix and may change runtime behavior SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:46:2 @@ -604,20 +554,19 @@ SIM905 [*] Consider using a list literal instead of `str.split` 51 | ) # ["a", "b", "c"] | help: Replace with list literal - -ℹ Unsafe fix -43 43 | # comment1 -44 44 | .split(",") -45 45 | ) # ["a", "b", "c"] -46 |-("a," -47 |-# comment -48 |-"b," -49 |-"c" -50 |-.split(",") - 46 |+(["a", "b", "c"] -51 47 | ) # ["a", "b", "c"] -52 48 | -53 49 | "hello "\ +43 | # comment1 +44 | .split(",") +45 | ) # ["a", "b", "c"] + - ("a," + - # comment + - "b," + - "c" + - .split(",") +46 + (["a", "b", "c"] +47 | ) # ["a", "b", "c"] +48 | +49 | "hello "\ +note: This is an unsafe fix and may change runtime behavior SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:53:1 @@ -630,17 +579,15 @@ SIM905 [*] Consider using a list literal instead of `str.split` 55 | # ["hello", "world"] | help: Replace with list literal - -ℹ Safe fix -50 50 | .split(",") -51 51 | ) # ["a", "b", "c"] -52 52 | -53 |-"hello "\ -54 |- "world".split() - 53 |+["hello", "world"] -55 54 | # ["hello", "world"] -56 55 | -57 56 | # prefixes and isc +50 | .split(",") +51 | ) # ["a", "b", "c"] +52 | + - "hello "\ + - "world".split() +53 + ["hello", "world"] +54 | # ["hello", "world"] +55 | +56 | # prefixes and isc SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:58:1 @@ -652,16 +599,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 60 | ("a " "b").split() # ["a", "b"] | help: Replace with list literal - -ℹ Safe fix -55 55 | # ["hello", "world"] -56 56 | -57 57 | # prefixes and isc -58 |-u"a b".split() # [u"a", u"b"] - 58 |+[u"a", u"b"] # [u"a", u"b"] -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] +55 | # ["hello", "world"] +56 | +57 | # prefixes and isc + - u"a b".split() # [u"a", u"b"] +58 + [u"a", u"b"] # [u"a", u"b"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:59:1 @@ -674,16 +619,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 61 | "a " "b".split() # ["a", "b"] | help: Replace with list literal - -ℹ Safe fix -56 56 | -57 57 | # prefixes and isc -58 58 | u"a b".split() # [u"a", u"b"] -59 |-r"a \n b".split() # [r"a", r"\n", r"b"] - 59 |+[r"a", r"\n", r"b"] # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] +56 | +57 | # prefixes and isc +58 | u"a b".split() # [u"a", u"b"] + - r"a \n b".split() # [r"a", r"\n", r"b"] +59 + [r"a", r"\n", r"b"] # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:60:1 @@ -696,16 +639,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 62 | u"a " "b".split() # [u"a", u"b"] | help: Replace with list literal - -ℹ Safe fix -57 57 | # prefixes and isc -58 58 | u"a b".split() # [u"a", u"b"] -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 |-("a " "b").split() # ["a", "b"] - 60 |+["a", "b"] # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] +57 | # prefixes and isc +58 | u"a b".split() # [u"a", u"b"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] + - ("a " "b").split() # ["a", "b"] +60 + ["a", "b"] # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:61:1 @@ -718,16 +659,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 63 | "a " u"b".split() # ["a", "b"] | help: Replace with list literal - -ℹ Safe fix -58 58 | u"a b".split() # [u"a", u"b"] -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 |-"a " "b".split() # ["a", "b"] - 61 |+["a", "b"] # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] +58 | u"a b".split() # [u"a", u"b"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] + - "a " "b".split() # ["a", "b"] +61 + ["a", "b"] # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:62:1 @@ -740,16 +679,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 64 | u"a " r"\n".split() # [u"a", u"\\n"] | help: Replace with list literal - -ℹ Safe fix -59 59 | r"a \n b".split() # [r"a", r"\n", r"b"] -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 |-u"a " "b".split() # [u"a", u"b"] - 62 |+[u"a", u"b"] # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] +59 | r"a \n b".split() # [r"a", r"\n", r"b"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] + - u"a " "b".split() # [u"a", u"b"] +62 + [u"a", u"b"] # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:63:1 @@ -762,16 +699,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 65 | r"\n " u"\n".split() # [r"\n"] | help: Replace with list literal - -ℹ Safe fix -60 60 | ("a " "b").split() # ["a", "b"] -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 |-"a " u"b".split() # ["a", "b"] - 63 |+["a", "b"] # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] +60 | ("a " "b").split() # ["a", "b"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] + - "a " u"b".split() # ["a", "b"] +63 + ["a", "b"] # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:64:1 @@ -784,16 +719,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 66 | r"\n " "\n".split() # [r"\n"] | help: Replace with list literal - -ℹ Safe fix -61 61 | "a " "b".split() # ["a", "b"] -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 |-u"a " r"\n".split() # [u"a", u"\\n"] - 64 |+[u"a", u"\\n"] # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] +61 | "a " "b".split() # ["a", "b"] +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] + - u"a " r"\n".split() # [u"a", u"\\n"] +64 + [u"a", u"\\n"] # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:65:1 @@ -806,16 +739,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 67 | "a " r"\n".split() # ["a", "\\n"] | help: Replace with list literal - -ℹ Safe fix -62 62 | u"a " "b".split() # [u"a", u"b"] -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 |-r"\n " u"\n".split() # [r"\n"] - 65 |+[r"\n"] # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | +62 | u"a " "b".split() # [u"a", u"b"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] + - r"\n " u"\n".split() # [r"\n"] +65 + [r"\n"] # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] +68 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:66:1 @@ -827,16 +758,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 67 | "a " r"\n".split() # ["a", "\\n"] | help: Replace with list literal - -ℹ Safe fix -63 63 | "a " u"b".split() # ["a", "b"] -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 |-r"\n " "\n".split() # [r"\n"] - 66 |+[r"\n"] # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +63 | "a " u"b".split() # ["a", "b"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] + - r"\n " "\n".split() # [r"\n"] +66 + [r"\n"] # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:67:1 @@ -849,16 +778,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] | help: Replace with list literal - -ℹ Safe fix -64 64 | u"a " r"\n".split() # [u"a", u"\\n"] -65 65 | r"\n " u"\n".split() # [r"\n"] -66 66 | r"\n " "\n".split() # [r"\n"] -67 |-"a " r"\n".split() # ["a", "\\n"] - 67 |+["a", "\\n"] # ["a", "\\n"] -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +64 | u"a " r"\n".split() # [u"a", u"\\n"] +65 | r"\n " u"\n".split() # [r"\n"] +66 | r"\n " "\n".split() # [r"\n"] + - "a " r"\n".split() # ["a", "\\n"] +67 + ["a", "\\n"] # ["a", "\\n"] +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:69:1 @@ -871,16 +798,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] | help: Replace with list literal - -ℹ Safe fix -66 66 | r"\n " "\n".split() # [r"\n"] -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | -69 |-"a,b,c".split(',', maxsplit=0) # ["a,b,c"] - 69 |+["a,b,c"] # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] -71 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] -72 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +66 | r"\n " "\n".split() # [r"\n"] +67 | "a " r"\n".split() # ["a", "\\n"] +68 | + - "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +69 + ["a,b,c"] # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] +72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:70:1 @@ -892,16 +817,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] | help: Replace with list literal - -ℹ Safe fix -67 67 | "a " r"\n".split() # ["a", "\\n"] -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 |-"a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] - 70 |+["a", "b", "c"] # ["a", "b", "c"] -71 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] -72 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] -73 73 | +67 | "a " r"\n".split() # ["a", "\\n"] +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] + - "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +70 + ["a", "b", "c"] # ["a", "b", "c"] +71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] +72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +73 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:71:1 @@ -913,16 +836,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] | help: Replace with list literal - -ℹ Safe fix -68 68 | -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] -71 |-"a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] - 71 |+["a", "b", "c"] # ["a", "b", "c"] -72 72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] -73 73 | -74 74 | # negatives +68 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] + - "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] +71 + ["a", "b", "c"] # ["a", "b", "c"] +72 | "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +73 | +74 | # negatives SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:72:1 @@ -935,16 +856,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 74 | # negatives | help: Replace with list literal - -ℹ Safe fix -69 69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] -70 70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] -71 71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] -72 |-"a,b,c".split(',', maxsplit=-0) # ["a,b,c"] - 72 |+["a,b,c"] # ["a,b,c"] -73 73 | -74 74 | # negatives -75 75 | +69 | "a,b,c".split(',', maxsplit=0) # ["a,b,c"] +70 | "a,b,c".split(',', maxsplit=-1) # ["a", "b", "c"] +71 | "a,b,c".split(',', maxsplit=-2) # ["a", "b", "c"] + - "a,b,c".split(',', maxsplit=-0) # ["a,b,c"] +72 + ["a,b,c"] # ["a,b,c"] +73 | +74 | # negatives +75 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:103:1 @@ -961,21 +880,19 @@ SIM905 [*] Consider using a list literal instead of `str.split` 110 | # https://github.com/astral-sh/ruff/issues/18042 | help: Replace with list literal - -ℹ Safe fix -100 100 | -101 101 | -102 102 | # another positive demonstrating quote preservation -103 |-""" -104 |-"itemA" -105 |-'itemB' -106 |-'''itemC''' -107 |-"'itemD'" -108 |-""".split() - 103 |+['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""] -109 104 | -110 105 | # https://github.com/astral-sh/ruff/issues/18042 -111 106 | print("a,b".rsplit(",")) +100 | +101 | +102 | # another positive demonstrating quote preservation + - """ + - "itemA" + - 'itemB' + - '''itemC''' + - "'itemD'" + - """.split() +103 + ['"itemA"', "'itemB'", "'''itemC'''", "\"'itemD'\""] +104 | +105 | # https://github.com/astral-sh/ruff/issues/18042 +106 | print("a,b".rsplit(",")) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:111:7 @@ -986,16 +903,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 112 | print("a,b,c".rsplit(",", 1)) | help: Replace with list literal - -ℹ Safe fix -108 108 | """.split() -109 109 | -110 110 | # https://github.com/astral-sh/ruff/issues/18042 -111 |-print("a,b".rsplit(",")) - 111 |+print(["a", "b"]) -112 112 | print("a,b,c".rsplit(",", 1)) -113 113 | -114 114 | # https://github.com/astral-sh/ruff/issues/18069 +108 | """.split() +109 | +110 | # https://github.com/astral-sh/ruff/issues/18042 + - print("a,b".rsplit(",")) +111 + print(["a", "b"]) +112 | print("a,b,c".rsplit(",", 1)) +113 | +114 | # https://github.com/astral-sh/ruff/issues/18069 SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:112:7 @@ -1008,16 +923,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 114 | # https://github.com/astral-sh/ruff/issues/18069 | help: Replace with list literal - -ℹ Safe fix -109 109 | -110 110 | # https://github.com/astral-sh/ruff/issues/18042 -111 111 | print("a,b".rsplit(",")) -112 |-print("a,b,c".rsplit(",", 1)) - 112 |+print(["a,b", "c"]) -113 113 | -114 114 | # https://github.com/astral-sh/ruff/issues/18069 -115 115 | +109 | +110 | # https://github.com/astral-sh/ruff/issues/18042 +111 | print("a,b".rsplit(",")) + - print("a,b,c".rsplit(",", 1)) +112 + print(["a,b", "c"]) +113 | +114 | # https://github.com/astral-sh/ruff/issues/18069 +115 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:116:7 @@ -1030,16 +943,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 118 | print(" ".split(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -113 113 | -114 114 | # https://github.com/astral-sh/ruff/issues/18069 -115 115 | -116 |-print("".split(maxsplit=0)) - 116 |+print([]) -117 117 | print("".split(sep=None, maxsplit=0)) -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) +113 | +114 | # https://github.com/astral-sh/ruff/issues/18069 +115 | + - print("".split(maxsplit=0)) +116 + print([]) +117 | print("".split(sep=None, maxsplit=0)) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:117:7 @@ -1051,16 +962,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 119 | print(" ".split(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -114 114 | # https://github.com/astral-sh/ruff/issues/18069 -115 115 | -116 116 | print("".split(maxsplit=0)) -117 |-print("".split(sep=None, maxsplit=0)) - 117 |+print([]) -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) +114 | # https://github.com/astral-sh/ruff/issues/18069 +115 | +116 | print("".split(maxsplit=0)) + - print("".split(sep=None, maxsplit=0)) +117 + print([]) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:118:7 @@ -1073,16 +982,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 120 | print(" x ".split(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -115 115 | -116 116 | print("".split(maxsplit=0)) -117 117 | print("".split(sep=None, maxsplit=0)) -118 |-print(" ".split(maxsplit=0)) - 118 |+print([]) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) +115 | +116 | print("".split(maxsplit=0)) +117 | print("".split(sep=None, maxsplit=0)) + - print(" ".split(maxsplit=0)) +118 + print([]) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:119:7 @@ -1095,16 +1002,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 121 | print(" x ".split(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -116 116 | print("".split(maxsplit=0)) -117 117 | print("".split(sep=None, maxsplit=0)) -118 118 | print(" ".split(maxsplit=0)) -119 |-print(" ".split(sep=None, maxsplit=0)) - 119 |+print([]) -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) +116 | print("".split(maxsplit=0)) +117 | print("".split(sep=None, maxsplit=0)) +118 | print(" ".split(maxsplit=0)) + - print(" ".split(sep=None, maxsplit=0)) +119 + print([]) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:120:7 @@ -1117,16 +1022,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 122 | print(" x ".split(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -117 117 | print("".split(sep=None, maxsplit=0)) -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 |-print(" x ".split(maxsplit=0)) - 120 |+print(["x "]) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) +117 | print("".split(sep=None, maxsplit=0)) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) + - print(" x ".split(maxsplit=0)) +120 + print(["x "]) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:121:7 @@ -1139,16 +1042,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 123 | print(" x ".split(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -118 118 | print(" ".split(maxsplit=0)) -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) -121 |-print(" x ".split(sep=None, maxsplit=0)) - 121 |+print(["x "]) -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) +118 | print(" ".split(maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) + - print(" x ".split(sep=None, maxsplit=0)) +121 + print(["x "]) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:122:7 @@ -1161,16 +1062,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 124 | print("".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -119 119 | print(" ".split(sep=None, maxsplit=0)) -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 |-print(" x ".split(maxsplit=0)) - 122 |+print(["x "]) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) +119 | print(" ".split(sep=None, maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) + - print(" x ".split(maxsplit=0)) +122 + print(["x "]) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:123:7 @@ -1183,16 +1082,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 125 | print("".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -120 120 | print(" x ".split(maxsplit=0)) -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) -123 |-print(" x ".split(sep=None, maxsplit=0)) - 123 |+print(["x "]) -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) +120 | print(" x ".split(maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) + - print(" x ".split(sep=None, maxsplit=0)) +123 + print(["x "]) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:124:7 @@ -1205,16 +1102,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 126 | print(" ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -121 121 | print(" x ".split(sep=None, maxsplit=0)) -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 |-print("".rsplit(maxsplit=0)) - 124 |+print([]) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) +121 | print(" x ".split(sep=None, maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) + - print("".rsplit(maxsplit=0)) +124 + print([]) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:125:7 @@ -1227,16 +1122,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 127 | print(" ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -122 122 | print(" x ".split(maxsplit=0)) -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) -125 |-print("".rsplit(sep=None, maxsplit=0)) - 125 |+print([]) -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) +122 | print(" x ".split(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) + - print("".rsplit(sep=None, maxsplit=0)) +125 + print([]) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:126:7 @@ -1249,16 +1142,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 128 | print(" x ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -123 123 | print(" x ".split(sep=None, maxsplit=0)) -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 |-print(" ".rsplit(maxsplit=0)) - 126 |+print([]) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) +123 | print(" x ".split(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) + - print(" ".rsplit(maxsplit=0)) +126 + print([]) +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:127:7 @@ -1271,16 +1162,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 129 | print(" x ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -124 124 | print("".rsplit(maxsplit=0)) -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) -127 |-print(" ".rsplit(sep=None, maxsplit=0)) - 127 |+print([]) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) +124 | print("".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) + - print(" ".rsplit(sep=None, maxsplit=0)) +127 + print([]) +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:128:7 @@ -1293,16 +1182,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 130 | print(" x ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -125 125 | print("".rsplit(sep=None, maxsplit=0)) -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 |-print(" x ".rsplit(maxsplit=0)) - 128 |+print([" x"]) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 131 | print(" x ".rsplit(maxsplit=0)) +125 | print("".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) + - print(" x ".rsplit(maxsplit=0)) +128 + print([" x"]) +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) +131 | print(" x ".rsplit(maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:129:7 @@ -1315,16 +1202,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 131 | print(" x ".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -126 126 | print(" ".rsplit(maxsplit=0)) -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 |-print(" x ".rsplit(maxsplit=0)) - 129 |+print([" x"]) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 131 | print(" x ".rsplit(maxsplit=0)) -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) +126 | print(" ".rsplit(maxsplit=0)) +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) + - print(" x ".rsplit(maxsplit=0)) +129 + print([" x"]) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) +131 | print(" x ".rsplit(maxsplit=0)) +132 | print(" x ".rsplit(sep=None, maxsplit=0)) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:130:7 @@ -1337,16 +1222,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 132 | print(" x ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -127 127 | print(" ".rsplit(sep=None, maxsplit=0)) -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 |-print(" x ".rsplit(sep=None, maxsplit=0)) - 130 |+print([" x"]) -131 131 | print(" x ".rsplit(maxsplit=0)) -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) -133 133 | +127 | print(" ".rsplit(sep=None, maxsplit=0)) +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) + - print(" x ".rsplit(sep=None, maxsplit=0)) +130 + print([" x"]) +131 | print(" x ".rsplit(maxsplit=0)) +132 | print(" x ".rsplit(sep=None, maxsplit=0)) +133 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:131:7 @@ -1358,16 +1241,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 132 | print(" x ".rsplit(sep=None, maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -128 128 | print(" x ".rsplit(maxsplit=0)) -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 |-print(" x ".rsplit(maxsplit=0)) - 131 |+print([" x"]) -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) -133 133 | -134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings +128 | print(" x ".rsplit(maxsplit=0)) +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) + - print(" x ".rsplit(maxsplit=0)) +131 + print([" x"]) +132 | print(" x ".rsplit(sep=None, maxsplit=0)) +133 | +134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:132:7 @@ -1380,16 +1261,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings | help: Replace with list literal - -ℹ Safe fix -129 129 | print(" x ".rsplit(maxsplit=0)) -130 130 | print(" x ".rsplit(sep=None, maxsplit=0)) -131 131 | print(" x ".rsplit(maxsplit=0)) -132 |-print(" x ".rsplit(sep=None, maxsplit=0)) - 132 |+print([" x"]) -133 133 | -134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings -135 135 | r"""simple@example.com +129 | print(" x ".rsplit(maxsplit=0)) +130 | print(" x ".rsplit(sep=None, maxsplit=0)) +131 | print(" x ".rsplit(maxsplit=0)) + - print(" x ".rsplit(sep=None, maxsplit=0)) +132 + print([" x"]) +133 | +134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings +135 | r"""simple@example.com SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:135:1 @@ -1421,38 +1300,36 @@ SIM905 [*] Consider using a list literal instead of `str.split` | |_______________________________________^ | help: Replace with list literal - -ℹ Safe fix -132 132 | print(" x ".rsplit(sep=None, maxsplit=0)) -133 133 | -134 134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings -135 |-r"""simple@example.com -136 |-very.common@example.com -137 |-FirstName.LastName@EasierReading.org -138 |-x@example.com -139 |-long.email-address-with-hyphens@and.subdomains.example.com -140 |-user.name+tag+sorting@example.com -141 |-name/surname@example.com -142 |-xample@s.example -143 |-" "@example.org -144 |-"john..doe"@example.org -145 |-mailhost!username@example.org -146 |-"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com -147 |-user%example.com@example.org -148 |-user-@example.org -149 |-I❤️CHOCOLATE@example.com -150 |-this\ still\"not\\allowed@example.com -151 |-stellyamburrr985@example.com -152 |-Abc.123@example.com -153 |-user+mailbox/department=shipping@example.com -154 |-!#$%&'*+-/=?^_`.{|}~@example.com -155 |-"Abc@def"@example.com -156 |-"Fred\ Bloggs"@example.com -157 |-"Joe.\\Blow"@example.com""".split("\n") - 135 |+[r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com'] -158 136 | -159 137 | -160 138 | r"""first +132 | print(" x ".rsplit(sep=None, maxsplit=0)) +133 | +134 | # https://github.com/astral-sh/ruff/issues/19581 - embedded quotes in raw strings + - r"""simple@example.com + - very.common@example.com + - FirstName.LastName@EasierReading.org + - x@example.com + - long.email-address-with-hyphens@and.subdomains.example.com + - user.name+tag+sorting@example.com + - name/surname@example.com + - xample@s.example + - " "@example.org + - "john..doe"@example.org + - mailhost!username@example.org + - "very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com + - user%example.com@example.org + - user-@example.org + - I❤️CHOCOLATE@example.com + - this\ still\"not\\allowed@example.com + - stellyamburrr985@example.com + - Abc.123@example.com + - user+mailbox/department=shipping@example.com + - !#$%&'*+-/=?^_`.{|}~@example.com + - "Abc@def"@example.com + - "Fred\ Bloggs"@example.com + - "Joe.\\Blow"@example.com""".split("\n") +135 + [r"simple@example.com", r"very.common@example.com", r"FirstName.LastName@EasierReading.org", r"x@example.com", r"long.email-address-with-hyphens@and.subdomains.example.com", r"user.name+tag+sorting@example.com", r"name/surname@example.com", r"xample@s.example", r'" "@example.org', r'"john..doe"@example.org', r"mailhost!username@example.org", r'"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com', r"user%example.com@example.org", r"user-@example.org", r"I❤️CHOCOLATE@example.com", r'this\ still\"not\\allowed@example.com', r"stellyamburrr985@example.com", r"Abc.123@example.com", r"user+mailbox/department=shipping@example.com", r"!#$%&'*+-/=?^_`.{|}~@example.com", r'"Abc@def"@example.com', r'"Fred\ Bloggs"@example.com', r'"Joe.\\Blow"@example.com'] +136 | +137 | +138 | r"""first SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:160:1 @@ -1466,19 +1343,17 @@ SIM905 [*] Consider using a list literal instead of `str.split` 165 | # https://github.com/astral-sh/ruff/issues/19845 | help: Replace with list literal - -ℹ Safe fix -157 157 | "Joe.\\Blow"@example.com""".split("\n") -158 158 | -159 159 | -160 |-r"""first -161 |-'no need' to escape -162 |-"swap" quote style -163 |-"use' ugly triple quotes""".split("\n") - 160 |+[r"first", r"'no need' to escape", r'"swap" quote style', r""""use' ugly triple quotes"""] -164 161 | -165 162 | # https://github.com/astral-sh/ruff/issues/19845 -166 163 | print("S\x1cP\x1dL\x1eI\x1fT".split()) +157 | "Joe.\\Blow"@example.com""".split("\n") +158 | +159 | + - r"""first + - 'no need' to escape + - "swap" quote style + - "use' ugly triple quotes""".split("\n") +160 + [r"first", r"'no need' to escape", r'"swap" quote style', r""""use' ugly triple quotes"""] +161 | +162 | # https://github.com/astral-sh/ruff/issues/19845 +163 | print("S\x1cP\x1dL\x1eI\x1fT".split()) SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:166:7 @@ -1490,16 +1365,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -163 163 | "use' ugly triple quotes""".split("\n") -164 164 | -165 165 | # https://github.com/astral-sh/ruff/issues/19845 -166 |-print("S\x1cP\x1dL\x1eI\x1fT".split()) - 166 |+print(["S", "P", "L", "I", "T"]) -167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) -168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) -169 169 | +163 | "use' ugly triple quotes""".split("\n") +164 | +165 | # https://github.com/astral-sh/ruff/issues/19845 + - print("S\x1cP\x1dL\x1eI\x1fT".split()) +166 + print(["S", "P", "L", "I", "T"]) +167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) +168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) +169 | SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:167:7 @@ -1511,16 +1384,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) | help: Replace with list literal - -ℹ Safe fix -164 164 | -165 165 | # https://github.com/astral-sh/ruff/issues/19845 -166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) -167 |-print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) - 167 |+print([">"]) -168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) -169 169 | -170 170 | # leading/trailing whitespace should not count towards maxsplit +164 | +165 | # https://github.com/astral-sh/ruff/issues/19845 +166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) + - print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) +167 + print([">"]) +168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) +169 | +170 | # leading/trailing whitespace should not count towards maxsplit SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:168:7 @@ -1533,16 +1404,14 @@ SIM905 [*] Consider using a list literal instead of `str.split` 170 | # leading/trailing whitespace should not count towards maxsplit | help: Replace with list literal - -ℹ Safe fix -165 165 | # https://github.com/astral-sh/ruff/issues/19845 -166 166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) -167 167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) -168 |-print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) - 168 |+print(["<"]) -169 169 | -170 170 | # leading/trailing whitespace should not count towards maxsplit -171 171 | " a b c d ".split(maxsplit=2) # ["a", "b", "c d "] +165 | # https://github.com/astral-sh/ruff/issues/19845 +166 | print("S\x1cP\x1dL\x1eI\x1fT".split()) +167 | print("\x1c\x1d\x1e\x1f>".split(maxsplit=0)) + - print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) +168 + print(["<"]) +169 | +170 | # leading/trailing whitespace should not count towards maxsplit +171 | " a b c d ".split(maxsplit=2) # ["a", "b", "c d "] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:171:1 @@ -1553,14 +1422,12 @@ SIM905 [*] Consider using a list literal instead of `str.split` 172 | " a b c d ".rsplit(maxsplit=2) # [" a b", "c", "d"] | help: Replace with list literal - -ℹ Safe fix -168 168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) -169 169 | -170 170 | # leading/trailing whitespace should not count towards maxsplit -171 |-" a b c d ".split(maxsplit=2) # ["a", "b", "c d "] - 171 |+["a", "b", "c d "] # ["a", "b", "c d "] -172 172 | " a b c d ".rsplit(maxsplit=2) # [" a b", "c", "d"] +168 | print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0)) +169 | +170 | # leading/trailing whitespace should not count towards maxsplit + - " a b c d ".split(maxsplit=2) # ["a", "b", "c d "] +171 + ["a", "b", "c d "] # ["a", "b", "c d "] +172 | " a b c d ".rsplit(maxsplit=2) # [" a b", "c", "d"] SIM905 [*] Consider using a list literal instead of `str.split` --> SIM905.py:172:1 @@ -1571,10 +1438,8 @@ SIM905 [*] Consider using a list literal instead of `str.split` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with list literal - -ℹ Safe fix -169 169 | -170 170 | # leading/trailing whitespace should not count towards maxsplit -171 171 | " a b c d ".split(maxsplit=2) # ["a", "b", "c d "] -172 |-" a b c d ".rsplit(maxsplit=2) # [" a b", "c", "d"] - 172 |+[" a b", "c", "d"] # [" a b", "c", "d"] +169 | +170 | # leading/trailing whitespace should not count towards maxsplit +171 | " a b c d ".split(maxsplit=2) # ["a", "b", "c d "] + - " a b c d ".rsplit(maxsplit=2) # [" a b", "c", "d"] +172 + [" a b", "c", "d"] # [" a b", "c", "d"] diff --git a/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap b/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap index 0829419730..e02c73ccdb 100644 --- a/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap +++ b/crates/ruff_linter/src/rules/flake8_tidy_imports/snapshots/ruff_linter__rules__flake8_tidy_imports__tests__ban_parent_imports_package.snap @@ -23,16 +23,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules 8 | from .. import server | help: Replace relative imports from parent modules with absolute imports - -ℹ Unsafe fix -3 3 | import attrs -4 4 | -5 5 | from ....import unknown -6 |-from ..protocol import commands, definitions, responses - 6 |+from my_package.sublib.protocol import commands, definitions, responses -7 7 | from ..server import example -8 8 | from .. import server -9 9 | from . import logger, models +3 | import attrs +4 | +5 | from ....import unknown + - from ..protocol import commands, definitions, responses +6 + from my_package.sublib.protocol import commands, definitions, responses +7 | from ..server import example +8 | from .. import server +9 | from . import logger, models +note: This is an unsafe fix and may change runtime behavior TID252 [*] Prefer absolute imports over relative imports from parent modules --> application.py:6:1 @@ -44,16 +43,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules 8 | from .. import server | help: Replace relative imports from parent modules with absolute imports - -ℹ Unsafe fix -3 3 | import attrs -4 4 | -5 5 | from ....import unknown -6 |-from ..protocol import commands, definitions, responses - 6 |+from my_package.sublib.protocol import commands, definitions, responses -7 7 | from ..server import example -8 8 | from .. import server -9 9 | from . import logger, models +3 | import attrs +4 | +5 | from ....import unknown + - from ..protocol import commands, definitions, responses +6 + from my_package.sublib.protocol import commands, definitions, responses +7 | from ..server import example +8 | from .. import server +9 | from . import logger, models +note: This is an unsafe fix and may change runtime behavior TID252 [*] Prefer absolute imports over relative imports from parent modules --> application.py:6:1 @@ -65,16 +63,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules 8 | from .. import server | help: Replace relative imports from parent modules with absolute imports - -ℹ Unsafe fix -3 3 | import attrs -4 4 | -5 5 | from ....import unknown -6 |-from ..protocol import commands, definitions, responses - 6 |+from my_package.sublib.protocol import commands, definitions, responses -7 7 | from ..server import example -8 8 | from .. import server -9 9 | from . import logger, models +3 | import attrs +4 | +5 | from ....import unknown + - from ..protocol import commands, definitions, responses +6 + from my_package.sublib.protocol import commands, definitions, responses +7 | from ..server import example +8 | from .. import server +9 | from . import logger, models +note: This is an unsafe fix and may change runtime behavior TID252 [*] Prefer absolute imports over relative imports from parent modules --> application.py:7:1 @@ -87,16 +84,15 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules 9 | from . import logger, models | help: Replace relative imports from parent modules with absolute imports - -ℹ Unsafe fix -4 4 | -5 5 | from ....import unknown -6 6 | from ..protocol import commands, definitions, responses -7 |-from ..server import example - 7 |+from my_package.sublib.server import example -8 8 | from .. import server -9 9 | from . import logger, models -10 10 | from ..protocol.UpperCaseModule import some_function +4 | +5 | from ....import unknown +6 | from ..protocol import commands, definitions, responses + - from ..server import example +7 + from my_package.sublib.server import example +8 | from .. import server +9 | from . import logger, models +10 | from ..protocol.UpperCaseModule import some_function +note: This is an unsafe fix and may change runtime behavior TID252 [*] Prefer absolute imports over relative imports from parent modules --> application.py:8:1 @@ -109,15 +105,14 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules 10 | from ..protocol.UpperCaseModule import some_function | help: Replace relative imports from parent modules with absolute imports - -ℹ Unsafe fix -5 5 | from ....import unknown -6 6 | from ..protocol import commands, definitions, responses -7 7 | from ..server import example -8 |-from .. import server - 8 |+from my_package.sublib import server -9 9 | from . import logger, models -10 10 | from ..protocol.UpperCaseModule import some_function +5 | from ....import unknown +6 | from ..protocol import commands, definitions, responses +7 | from ..server import example + - from .. import server +8 + from my_package.sublib import server +9 | from . import logger, models +10 | from ..protocol.UpperCaseModule import some_function +note: This is an unsafe fix and may change runtime behavior TID252 [*] Prefer absolute imports over relative imports from parent modules --> application.py:10:1 @@ -128,10 +123,9 @@ TID252 [*] Prefer absolute imports over relative imports from parent modules | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace relative imports from parent modules with absolute imports - -ℹ Unsafe fix -7 7 | from ..server import example -8 8 | from .. import server -9 9 | from . import logger, models -10 |-from ..protocol.UpperCaseModule import some_function - 10 |+from my_package.sublib.protocol.UpperCaseModule import some_function +7 | from ..server import example +8 | from .. import server +9 | from . import logger, models + - from ..protocol.UpperCaseModule import some_function +10 + from my_package.sublib.protocol.UpperCaseModule import some_function +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap b/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap index 3876b47eba..500a7c7140 100644 --- a/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap +++ b/crates/ruff_linter/src/rules/flake8_todos/snapshots/ruff_linter__rules__flake8_todos__tests__invalid-todo-capitalization_TD006.py.snap @@ -12,15 +12,13 @@ TD006 [*] Invalid TODO capitalization: `ToDo` should be `TODO` 7 | # foo # todo: invalid capitalization | help: Replace `ToDo` with `TODO` - -ℹ Safe fix -2 2 | # TODO (evanrittenhouse): this is a valid TODO -3 3 | # Todoism is a word which starts with todo, but is not a todo -4 4 | # TDO006 - error -5 |-# ToDo (evanrittenhouse): invalid capitalization - 5 |+# TODO (evanrittenhouse): invalid capitalization -6 6 | # todo (evanrittenhouse): another invalid capitalization -7 7 | # foo # todo: invalid capitalization +2 | # TODO (evanrittenhouse): this is a valid TODO +3 | # Todoism is a word which starts with todo, but is not a todo +4 | # TDO006 - error + - # ToDo (evanrittenhouse): invalid capitalization +5 + # TODO (evanrittenhouse): invalid capitalization +6 | # todo (evanrittenhouse): another invalid capitalization +7 | # foo # todo: invalid capitalization TD006 [*] Invalid TODO capitalization: `todo` should be `TODO` --> TD006.py:6:3 @@ -32,14 +30,12 @@ TD006 [*] Invalid TODO capitalization: `todo` should be `TODO` 7 | # foo # todo: invalid capitalization | help: Replace `todo` with `TODO` - -ℹ Safe fix -3 3 | # Todoism is a word which starts with todo, but is not a todo -4 4 | # TDO006 - error -5 5 | # ToDo (evanrittenhouse): invalid capitalization -6 |-# todo (evanrittenhouse): another invalid capitalization - 6 |+# TODO (evanrittenhouse): another invalid capitalization -7 7 | # foo # todo: invalid capitalization +3 | # Todoism is a word which starts with todo, but is not a todo +4 | # TDO006 - error +5 | # ToDo (evanrittenhouse): invalid capitalization + - # todo (evanrittenhouse): another invalid capitalization +6 + # TODO (evanrittenhouse): another invalid capitalization +7 | # foo # todo: invalid capitalization TD006 [*] Invalid TODO capitalization: `todo` should be `TODO` --> TD006.py:7:9 @@ -50,10 +46,8 @@ TD006 [*] Invalid TODO capitalization: `todo` should be `TODO` | ^^^^ | help: Replace `todo` with `TODO` - -ℹ Safe fix -4 4 | # TDO006 - error -5 5 | # ToDo (evanrittenhouse): invalid capitalization -6 6 | # todo (evanrittenhouse): another invalid capitalization -7 |-# foo # todo: invalid capitalization - 7 |+# foo # TODO: invalid capitalization +4 | # TDO006 - error +5 | # ToDo (evanrittenhouse): invalid capitalization +6 | # todo (evanrittenhouse): another invalid capitalization + - # foo # todo: invalid capitalization +7 + # foo # TODO: invalid capitalization diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap index 4dbb82a063..ca004802ad 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001-TC002-TC003_TC001-3_future.py.snap @@ -10,21 +10,20 @@ TC003 [*] Move standard library import `collections.Counter` into a type-checkin 3 | from elsewhere import third_party | help: Move into type-checking block - -ℹ Unsafe fix -1 |-from collections import Counter - 1 |+from __future__ import annotations -2 2 | -3 3 | from elsewhere import third_party -4 4 | -5 5 | from . import first_party - 6 |+from typing import TYPE_CHECKING - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ from collections import Counter -6 10 | -7 11 | -8 12 | def f(x: first_party.foo): ... + - from collections import Counter +1 + from __future__ import annotations +2 | +3 | from elsewhere import third_party +4 | +5 | from . import first_party +6 + from typing import TYPE_CHECKING +7 + +8 + if TYPE_CHECKING: +9 + from collections import Counter +10 | +11 | +12 | def f(x: first_party.foo): ... +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `elsewhere.third_party` into a type-checking block --> TC001-3_future.py:3:23 @@ -37,21 +36,20 @@ TC002 [*] Move third-party import `elsewhere.third_party` into a type-checking b 5 | from . import first_party | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from collections import Counter -2 3 | -3 |-from elsewhere import third_party -4 4 | -5 5 | from . import first_party - 6 |+from typing import TYPE_CHECKING - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ from elsewhere import third_party -6 10 | -7 11 | -8 12 | def f(x: first_party.foo): ... +1 + from __future__ import annotations +2 | from collections import Counter +3 | + - from elsewhere import third_party +4 | +5 | from . import first_party +6 + from typing import TYPE_CHECKING +7 + +8 + if TYPE_CHECKING: +9 + from elsewhere import third_party +10 | +11 | +12 | def f(x: first_party.foo): ... +note: This is an unsafe fix and may change runtime behavior TC001 [*] Move application import `.first_party` into a type-checking block --> TC001-3_future.py:5:15 @@ -62,18 +60,17 @@ TC001 [*] Move application import `.first_party` into a type-checking block | ^^^^^^^^^^^ | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from collections import Counter -2 3 | -3 4 | from elsewhere import third_party -4 5 | -5 |-from . import first_party - 6 |+from typing import TYPE_CHECKING - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ from . import first_party -6 10 | -7 11 | -8 12 | def f(x: first_party.foo): ... +1 + from __future__ import annotations +2 | from collections import Counter +3 | +4 | from elsewhere import third_party +5 | + - from . import first_party +6 + from typing import TYPE_CHECKING +7 + +8 + if TYPE_CHECKING: +9 + from . import first_party +10 | +11 | +12 | def f(x: first_party.foo): ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap index f9b554bbbc..bfe8aee71b 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001.py.snap @@ -11,23 +11,22 @@ TC001 [*] Move application import `.TYP001` into a type-checking block 22 | x: TYP001 | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | For typing-only import detection tests, see `TC002.py`. -4 4 | """ - 5 |+from typing import TYPE_CHECKING - 6 |+ - 7 |+if TYPE_CHECKING: - 8 |+ from . import TYP001 -5 9 | -6 10 | -7 11 | def f(): +2 | +3 | For typing-only import detection tests, see `TC002.py`. +4 | """ +5 + from typing import TYPE_CHECKING +6 + +7 + if TYPE_CHECKING: +8 + from . import TYP001 +9 | +10 | +11 | def f(): -------------------------------------------------------------------------------- -17 21 | -18 22 | -19 23 | def f(): -20 |- from . import TYP001 -21 24 | -22 25 | x: TYP001 -23 26 | +21 | +22 | +23 | def f(): + - from . import TYP001 +24 | +25 | x: TYP001 +26 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap index b775c34e96..6d579e57c2 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future.py.snap @@ -11,18 +11,17 @@ TC001 [*] Move application import `.first_party` into a type-checking block 4 | def f(x: first_party.foo): ... | help: Move into type-checking block - -ℹ Unsafe fix -1 |-def f(): - 1 |+from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: -2 5 | from . import first_party - 6 |+def f(): -3 7 | -4 8 | def f(x: first_party.foo): ... -5 9 | + - def f(): +1 + from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 | from . import first_party +6 + def f(): +7 | +8 | def f(x: first_party.foo): ... +9 | +note: This is an unsafe fix and may change runtime behavior TC001 [*] Move application import `.foo` into a type-checking block --> TC001_future.py:57:19 @@ -34,25 +33,24 @@ TC001 [*] Move application import `.foo` into a type-checking block 59 | def f(x: Union[foo.Ty, int]): ... | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | def f(): -2 3 | from . import first_party -3 4 | +1 + from __future__ import annotations +2 | def f(): +3 | from . import first_party +4 | -------------------------------------------------------------------------------- -50 51 | -51 52 | -52 53 | # unions -53 |-from typing import Union - 54 |+from typing import Union, TYPE_CHECKING -54 55 | - 56 |+if TYPE_CHECKING: - 57 |+ from . import foo - 58 |+ -55 59 | -56 60 | def n(): -57 |- from . import foo -58 61 | -59 62 | def f(x: Union[foo.Ty, int]): ... -60 63 | def g(x: foo.Ty | int): ... +51 | +52 | +53 | # unions + - from typing import Union +54 + from typing import Union, TYPE_CHECKING +55 | +56 + if TYPE_CHECKING: +57 + from . import foo +58 + +59 | +60 | def n(): + - from . import foo +61 | +62 | def f(x: Union[foo.Ty, int]): ... +63 | def g(x: foo.Ty | int): ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap index b3105c9e1f..f9a8f3ab78 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC001_TC001_future_present.py.snap @@ -10,15 +10,14 @@ TC001 [*] Move application import `.first_party` into a type-checking block | ^^^^^^^^^^^ | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from . import first_party - 3 |+from typing import TYPE_CHECKING - 4 |+ - 5 |+if TYPE_CHECKING: - 6 |+ from . import first_party -4 7 | -5 8 | -6 9 | def f(x: first_party.foo): ... +1 | from __future__ import annotations +2 | + - from . import first_party +3 + from typing import TYPE_CHECKING +4 + +5 + if TYPE_CHECKING: +6 + from . import first_party +7 | +8 | +9 | def f(x: first_party.foo): ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap index f060bd6715..2d3f306807 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC002_TC002.py.snap @@ -11,20 +11,19 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 7 | x: pd.DataFrame | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): -5 |- import pandas as pd # TC002 -6 9 | -7 10 | x: pd.DataFrame -8 11 | +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): + - import pandas as pd # TC002 +9 | +10 | x: pd.DataFrame +11 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:11:24 @@ -36,24 +35,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 13 | x: DataFrame | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -8 12 | -9 13 | -10 14 | def f(): -11 |- from pandas import DataFrame # TC002 -12 15 | -13 16 | x: DataFrame -14 17 | +12 | +13 | +14 | def f(): + - from pandas import DataFrame # TC002 +15 | +16 | x: DataFrame +17 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:17:37 @@ -65,24 +63,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 19 | x: df | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame as df -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame as df +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -14 18 | -15 19 | -16 20 | def f(): -17 |- from pandas import DataFrame as df # TC002 -18 21 | -19 22 | x: df -20 23 | +18 | +19 | +20 | def f(): + - from pandas import DataFrame as df # TC002 +21 | +22 | x: df +23 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> TC002.py:23:22 @@ -94,24 +91,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 25 | x: pd.DataFrame = 1 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -20 24 | -21 25 | -22 26 | def f(): -23 |- import pandas as pd # TC002 -24 27 | -25 28 | x: pd.DataFrame = 1 -26 29 | +24 | +25 | +26 | def f(): + - import pandas as pd # TC002 +27 | +28 | x: pd.DataFrame = 1 +29 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:29:24 @@ -123,24 +119,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 31 | x: DataFrame = 2 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -26 30 | -27 31 | -28 32 | def f(): -29 |- from pandas import DataFrame # TC002 -30 33 | -31 34 | x: DataFrame = 2 -32 35 | +30 | +31 | +32 | def f(): + - from pandas import DataFrame # TC002 +33 | +34 | x: DataFrame = 2 +35 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:35:37 @@ -152,24 +147,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 37 | x: df = 3 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame as df -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame as df +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -32 36 | -33 37 | -34 38 | def f(): -35 |- from pandas import DataFrame as df # TC002 -36 39 | -37 40 | x: df = 3 -38 41 | +36 | +37 | +38 | def f(): + - from pandas import DataFrame as df # TC002 +39 | +40 | x: df = 3 +41 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> TC002.py:41:22 @@ -181,24 +175,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 43 | x: "pd.DataFrame" = 1 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -38 42 | -39 43 | -40 44 | def f(): -41 |- import pandas as pd # TC002 -42 45 | -43 46 | x: "pd.DataFrame" = 1 -44 47 | +42 | +43 | +44 | def f(): + - import pandas as pd # TC002 +45 | +46 | x: "pd.DataFrame" = 1 +47 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> TC002.py:47:22 @@ -210,24 +203,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 49 | x = dict["pd.DataFrame", "pd.DataFrame"] | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -44 48 | -45 49 | -46 50 | def f(): -47 |- import pandas as pd # TC002 -48 51 | -49 52 | x = dict["pd.DataFrame", "pd.DataFrame"] -50 53 | +48 | +49 | +50 | def f(): + - import pandas as pd # TC002 +51 | +52 | x = dict["pd.DataFrame", "pd.DataFrame"] +53 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `module.Member` into a type-checking block --> TC002.py:172:24 @@ -240,21 +232,20 @@ TC002 [*] Move third-party import `module.Member` into a type-checking block 174 | x: Member = 1 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from module import Member -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from module import Member +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -169 173 | def f(): -170 174 | global Member -171 175 | -172 |- from module import Member -173 176 | -174 177 | x: Member = 1 -175 178 | +173 | def f(): +174 | global Member +175 | + - from module import Member +176 | +177 | x: Member = 1 +178 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap index 90bd90e695..c2f1077e90 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__add_future_import__TC003_TC003.py.snap @@ -11,19 +11,18 @@ TC003 [*] Move standard library import `os` into a type-checking block 10 | x: os | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | For typing-only import detection tests, see `TC002.py`. -4 4 | """ - 5 |+from typing import TYPE_CHECKING - 6 |+ - 7 |+if TYPE_CHECKING: - 8 |+ import os -5 9 | -6 10 | -7 11 | def f(): -8 |- import os -9 12 | -10 13 | x: os -11 14 | +2 | +3 | For typing-only import detection tests, see `TC002.py`. +4 | """ +5 + from typing import TYPE_CHECKING +6 + +7 + if TYPE_CHECKING: +8 + import os +9 | +10 | +11 | def f(): + - import os +12 | +13 | x: os +14 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap index 169c38f1ad..687ede833c 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__empty-type-checking-block_TC005.py.snap @@ -9,15 +9,13 @@ TC005 [*] Found empty type-checking block | ^^^^ | help: Delete empty type-checking block - -ℹ Safe fix -1 1 | from typing import TYPE_CHECKING, List -2 2 | -3 |-if TYPE_CHECKING: -4 |- pass # TC005 -5 3 | -6 4 | -7 5 | def example(): +1 | from typing import TYPE_CHECKING, List +2 | + - if TYPE_CHECKING: + - pass # TC005 +3 | +4 | +5 | def example(): TC005 [*] Found empty type-checking block --> TC005.py:9:9 @@ -29,16 +27,14 @@ TC005 [*] Found empty type-checking block 10 | return | help: Delete empty type-checking block - -ℹ Safe fix -5 5 | -6 6 | -7 7 | def example(): -8 |- if TYPE_CHECKING: -9 |- pass # TC005 -10 8 | return -11 9 | -12 10 | +5 | +6 | +7 | def example(): + - if TYPE_CHECKING: + - pass # TC005 +8 | return +9 | +10 | TC005 [*] Found empty type-checking block --> TC005.py:15:9 @@ -50,16 +46,14 @@ TC005 [*] Found empty type-checking block 16 | x = 2 | help: Delete empty type-checking block - -ℹ Safe fix -11 11 | -12 12 | -13 13 | class Test: -14 |- if TYPE_CHECKING: -15 |- pass # TC005 -16 14 | x = 2 -17 15 | -18 16 | +11 | +12 | +13 | class Test: + - if TYPE_CHECKING: + - pass # TC005 +14 | x = 2 +15 | +16 | TC005 [*] Found empty type-checking block --> TC005.py:31:5 @@ -71,13 +65,11 @@ TC005 [*] Found empty type-checking block 33 | # https://github.com/astral-sh/ruff/issues/11368 | help: Delete empty type-checking block - -ℹ Safe fix -27 27 | -28 28 | from typing_extensions import TYPE_CHECKING -29 29 | -30 |-if TYPE_CHECKING: -31 |- pass # TC005 -32 30 | -33 31 | # https://github.com/astral-sh/ruff/issues/11368 -34 32 | if TYPE_CHECKING: +27 | +28 | from typing_extensions import TYPE_CHECKING +29 | + - if TYPE_CHECKING: + - pass # TC005 +30 | +31 | # https://github.com/astral-sh/ruff/issues/11368 +32 | if TYPE_CHECKING: diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap index 013562d793..a9aba38fd7 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__exempt_modules.snap @@ -11,19 +11,18 @@ TC002 [*] Move third-party import `flask` into a type-checking block 16 | x: flask | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ import flask -1 5 | def f(): -2 6 | import pandas as pd -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + import flask +5 | def f(): +6 | import pandas as pd +7 | -------------------------------------------------------------------------------- -11 15 | -12 16 | -13 17 | def f(): -14 |- import flask -15 18 | -16 19 | x: flask +15 | +16 | +17 | def f(): + - import flask +18 | +19 | x: flask +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap index bf88fa10a8..a19eef7095 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__github_issue_15681_fix_test.snap @@ -12,16 +12,15 @@ TC003 [*] Move standard library import `pathlib` into a type-checking block 6 | TYPE_CHECKING = False | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | -2 2 | from __future__ import annotations -3 3 | -4 |-import pathlib # TC003 -5 4 | -6 5 | TYPE_CHECKING = False -7 6 | if TYPE_CHECKING: - 7 |+ import pathlib -8 8 | from types import TracebackType -9 9 | -10 10 | def foo(tb: TracebackType) -> pathlib.Path: ... +1 | +2 | from __future__ import annotations +3 | + - import pathlib # TC003 +4 | +5 | TYPE_CHECKING = False +6 | if TYPE_CHECKING: +7 + import pathlib +8 | from types import TracebackType +9 | +10 | def foo(tb: TracebackType) -> pathlib.Path: ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap index 38f00f2e07..1a71220df1 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from.snap @@ -11,20 +11,19 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 7 | ) | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | from __future__ import annotations -3 3 | -4 4 | from pandas import ( -5 |- DataFrame, # DataFrame -6 5 | Series, # Series -7 6 | ) - 7 |+from typing import TYPE_CHECKING - 8 |+ - 9 |+if TYPE_CHECKING: - 10 |+ from pandas import ( - 11 |+ DataFrame, # DataFrame - 12 |+ ) -8 13 | -9 14 | def f(x: DataFrame): -10 15 | pass +2 | from __future__ import annotations +3 | +4 | from pandas import ( + - DataFrame, # DataFrame +5 | Series, # Series +6 | ) +7 + from typing import TYPE_CHECKING +8 + +9 + if TYPE_CHECKING: +10 + from pandas import ( +11 + DataFrame, # DataFrame +12 + ) +13 | +14 | def f(x: DataFrame): +15 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap index 57b5fc2893..5c98fbf524 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__import_from_type_checking_block.snap @@ -11,19 +11,18 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 9 | ) | help: Move into type-checking block - -ℹ Unsafe fix -4 4 | from typing import TYPE_CHECKING -5 5 | -6 6 | from pandas import ( -7 |- DataFrame, # DataFrame -8 7 | Series, # Series -9 8 | ) -10 9 | -11 10 | if TYPE_CHECKING: - 11 |+ from pandas import ( - 12 |+ DataFrame, # DataFrame - 13 |+ ) -12 14 | import os -13 15 | -14 16 | def f(x: DataFrame): +4 | from typing import TYPE_CHECKING +5 | +6 | from pandas import ( + - DataFrame, # DataFrame +7 | Series, # Series +8 | ) +9 | +10 | if TYPE_CHECKING: +11 + from pandas import ( +12 + DataFrame, # DataFrame +13 + ) +14 | import os +15 | +16 | def f(x: DataFrame): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap index 23b306e112..c3a7e639b1 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_members.snap @@ -11,24 +11,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 9 | ) | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-from pandas import ( -7 |- DataFrame, # DataFrame -8 |- Series, # Series -9 |-) -10 6 | - 7 |+if TYPE_CHECKING: - 8 |+ from pandas import ( - 9 |+ DataFrame, # DataFrame - 10 |+ Series, # Series - 11 |+ ) - 12 |+ -11 13 | def f(x: DataFrame, y: Series): -12 14 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - from pandas import ( + - DataFrame, # DataFrame + - Series, # Series + - ) +6 | +7 + if TYPE_CHECKING: +8 + from pandas import ( +9 + DataFrame, # DataFrame +10 + Series, # Series +11 + ) +12 + +13 | def f(x: DataFrame, y: Series): +14 | pass +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.Series` into a type-checking block --> :8:5 @@ -40,21 +39,20 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block 9 | ) | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-from pandas import ( -7 |- DataFrame, # DataFrame -8 |- Series, # Series -9 |-) -10 6 | - 7 |+if TYPE_CHECKING: - 8 |+ from pandas import ( - 9 |+ DataFrame, # DataFrame - 10 |+ Series, # Series - 11 |+ ) - 12 |+ -11 13 | def f(x: DataFrame, y: Series): -12 14 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - from pandas import ( + - DataFrame, # DataFrame + - Series, # Series + - ) +6 | +7 + if TYPE_CHECKING: +8 + from pandas import ( +9 + DataFrame, # DataFrame +10 + Series, # Series +11 + ) +12 + +13 | def f(x: DataFrame, y: Series): +14 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap index b0fae941ba..17a481674e 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_different_types.snap @@ -12,19 +12,18 @@ TC003 [*] Move standard library import `os` into a type-checking block 8 | def f(x: os, y: pandas): | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import os, pandas - 6 |+import pandas - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ import os -7 10 | -8 11 | def f(x: os, y: pandas): -9 12 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - import os, pandas +6 + import pandas +7 + +8 + if TYPE_CHECKING: +9 + import os +10 | +11 | def f(x: os, y: pandas): +12 | pass +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> :6:12 @@ -37,16 +36,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 8 | def f(x: os, y: pandas): | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import os, pandas - 6 |+import os - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ import pandas -7 10 | -8 11 | def f(x: os, y: pandas): -9 12 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - import os, pandas +6 + import os +7 + +8 + if TYPE_CHECKING: +9 + import pandas +10 | +11 | def f(x: os, y: pandas): +12 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap index fe26ff1dcd..00d8e9adb4 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__multiple_modules_same_type.snap @@ -12,18 +12,17 @@ TC003 [*] Move standard library import `os` into a type-checking block 8 | def f(x: os, y: sys): | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import os, sys -7 6 | - 7 |+if TYPE_CHECKING: - 8 |+ import os, sys - 9 |+ -8 10 | def f(x: os, y: sys): -9 11 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - import os, sys +6 | +7 + if TYPE_CHECKING: +8 + import os, sys +9 + +10 | def f(x: os, y: sys): +11 | pass +note: This is an unsafe fix and may change runtime behavior TC003 [*] Move standard library import `sys` into a type-checking block --> :6:12 @@ -36,15 +35,14 @@ TC003 [*] Move standard library import `sys` into a type-checking block 8 | def f(x: os, y: sys): | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import os, sys -7 6 | - 7 |+if TYPE_CHECKING: - 8 |+ import os, sys - 9 |+ -8 10 | def f(x: os, y: sys): -9 11 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - import os, sys +6 | +7 + if TYPE_CHECKING: +8 + import os, sys +9 + +10 | def f(x: os, y: sys): +11 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap index 6861baaee0..5c4b9abf1c 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__no_typing_import.snap @@ -12,16 +12,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 6 | def f(x: pd.DataFrame): | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | -2 2 | from __future__ import annotations -3 3 | -4 |-import pandas as pd - 4 |+from typing import TYPE_CHECKING - 5 |+ - 6 |+if TYPE_CHECKING: - 7 |+ import pandas as pd -5 8 | -6 9 | def f(x: pd.DataFrame): -7 10 | pass +1 | +2 | from __future__ import annotations +3 | + - import pandas as pd +4 + from typing import TYPE_CHECKING +5 + +6 + if TYPE_CHECKING: +7 + import pandas as pd +8 | +9 | def f(x: pd.DataFrame): +10 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap index 7943a3d635..fc9bc371c3 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__pre_py310_quoted-type-alias_TC008_union_syntax_pre_py310.py.snap @@ -12,15 +12,13 @@ TC008 [*] Remove quotes from type alias 12 | f: TypeAlias = 'dict[str, int | None]' # OK | help: Remove quotes - -ℹ Safe fix -7 7 | -8 8 | if TYPE_CHECKING: -9 9 | c: TypeAlias = 'int | None' # OK -10 |- d: TypeAlias = 'Annotated[int, 1 | 2]' # TC008 - 10 |+ d: TypeAlias = Annotated[int, 1 | 2] # TC008 -11 11 | e: TypeAlias = 'Annotated[int, 1 + 2]' # TC008 -12 12 | f: TypeAlias = 'dict[str, int | None]' # OK +7 | +8 | if TYPE_CHECKING: +9 | c: TypeAlias = 'int | None' # OK + - d: TypeAlias = 'Annotated[int, 1 | 2]' # TC008 +10 + d: TypeAlias = Annotated[int, 1 | 2] # TC008 +11 | e: TypeAlias = 'Annotated[int, 1 + 2]' # TC008 +12 | f: TypeAlias = 'dict[str, int | None]' # OK TC008 [*] Remove quotes from type alias --> TC008_union_syntax_pre_py310.py:11:20 @@ -32,11 +30,9 @@ TC008 [*] Remove quotes from type alias 12 | f: TypeAlias = 'dict[str, int | None]' # OK | help: Remove quotes - -ℹ Safe fix -8 8 | if TYPE_CHECKING: -9 9 | c: TypeAlias = 'int | None' # OK -10 10 | d: TypeAlias = 'Annotated[int, 1 | 2]' # TC008 -11 |- e: TypeAlias = 'Annotated[int, 1 + 2]' # TC008 - 11 |+ e: TypeAlias = Annotated[int, 1 + 2] # TC008 -12 12 | f: TypeAlias = 'dict[str, int | None]' # OK +8 | if TYPE_CHECKING: +9 | c: TypeAlias = 'int | None' # OK +10 | d: TypeAlias = 'Annotated[int, 1 | 2]' # TC008 + - e: TypeAlias = 'Annotated[int, 1 + 2]' # TC008 +11 + e: TypeAlias = Annotated[int, 1 + 2] # TC008 +12 | f: TypeAlias = 'dict[str, int | None]' # OK diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap index 24cd5aa546..1e6dc27a29 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_runtime-import-in-type-checking-block_quote.py.snap @@ -11,16 +11,15 @@ TC004 [*] Quote references to `pandas.DataFrame`. Import is in a type-checking b 59 | def func(value: DataFrame): | help: Quote references - -ℹ Unsafe fix -56 56 | if TYPE_CHECKING: -57 57 | from pandas import DataFrame -58 58 | -59 |- def func(value: DataFrame): - 59 |+ def func(value: "DataFrame"): -60 60 | ... -61 61 | -62 62 | +56 | if TYPE_CHECKING: +57 | from pandas import DataFrame +58 | + - def func(value: DataFrame): +59 + def func(value: "DataFrame"): +60 | ... +61 | +62 | +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is used for more than type hinting. --> quote.py:110:28 @@ -32,17 +31,16 @@ TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is u 112 | x: TypeAlias = DataFrame | None | help: Move out of type-checking block - -ℹ Unsafe fix - 1 |+from pandas import DataFrame -1 2 | def f(): -2 3 | from pandas import DataFrame -3 4 | +1 + from pandas import DataFrame +2 | def f(): +3 | from pandas import DataFrame +4 | -------------------------------------------------------------------------------- -107 108 | from typing import TypeAlias, TYPE_CHECKING -108 109 | -109 110 | if TYPE_CHECKING: -110 |- from pandas import DataFrame - 111 |+ pass -111 112 | -112 113 | x: TypeAlias = DataFrame | None +108 | from typing import TypeAlias, TYPE_CHECKING +109 | +110 | if TYPE_CHECKING: + - from pandas import DataFrame +111 + pass +112 | +113 | x: TypeAlias = DataFrame | None +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap index 452c839561..beccb0c7d9 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote.py.snap @@ -11,20 +11,19 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 4 | def baz() -> DataFrame: | help: Move into type-checking block - -ℹ Unsafe fix -1 |-def f(): - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: -2 4 | from pandas import DataFrame - 5 |+def f(): -3 6 | -4 |- def baz() -> DataFrame: - 7 |+ def baz() -> "DataFrame": -5 8 | ... -6 9 | -7 10 | + - def f(): +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 | from pandas import DataFrame +5 + def f(): +6 | + - def baz() -> DataFrame: +7 + def baz() -> "DataFrame": +8 | ... +9 | +10 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> quote.py:9:24 @@ -36,26 +35,25 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 11 | def baz() -> DataFrame[int]: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -6 10 | -7 11 | -8 12 | def f(): -9 |- from pandas import DataFrame -10 13 | -11 |- def baz() -> DataFrame[int]: - 14 |+ def baz() -> "DataFrame[int]": -12 15 | ... -13 16 | -14 17 | +10 | +11 | +12 | def f(): + - from pandas import DataFrame +13 | + - def baz() -> DataFrame[int]: +14 + def baz() -> "DataFrame[int]": +15 | ... +16 | +17 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> quote.py:16:22 @@ -67,26 +65,25 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 18 | def baz() -> pd.DataFrame: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ import pandas as pd -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + import pandas as pd +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -13 17 | -14 18 | -15 19 | def f(): -16 |- import pandas as pd -17 20 | -18 |- def baz() -> pd.DataFrame: - 21 |+ def baz() -> "pd.DataFrame": -19 22 | ... -20 23 | -21 24 | +17 | +18 | +19 | def f(): + - import pandas as pd +20 | + - def baz() -> pd.DataFrame: +21 + def baz() -> "pd.DataFrame": +22 | ... +23 | +24 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> quote.py:23:22 @@ -98,26 +95,25 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 25 | def baz() -> pd.DataFrame.Extra: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ import pandas as pd -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + import pandas as pd +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -20 24 | -21 25 | -22 26 | def f(): -23 |- import pandas as pd -24 27 | -25 |- def baz() -> pd.DataFrame.Extra: - 28 |+ def baz() -> "pd.DataFrame.Extra": -26 29 | ... -27 30 | -28 31 | +24 | +25 | +26 | def f(): + - import pandas as pd +27 | + - def baz() -> pd.DataFrame.Extra: +28 + def baz() -> "pd.DataFrame.Extra": +29 | ... +30 | +31 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> quote.py:30:22 @@ -129,26 +125,25 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 32 | def baz() -> pd.DataFrame | int: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ import pandas as pd -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + import pandas as pd +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -27 31 | -28 32 | -29 33 | def f(): -30 |- import pandas as pd -31 34 | -32 |- def baz() -> pd.DataFrame | int: - 35 |+ def baz() -> "pd.DataFrame | int": -33 36 | ... -34 37 | -35 38 | +31 | +32 | +33 | def f(): + - import pandas as pd +34 | + - def baz() -> pd.DataFrame | int: +35 + def baz() -> "pd.DataFrame | int": +36 | ... +37 | +38 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> quote.py:38:24 @@ -160,26 +155,25 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 40 | def baz() -> DataFrame(): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -35 39 | -36 40 | -37 41 | def f(): -38 |- from pandas import DataFrame -39 42 | -40 |- def baz() -> DataFrame(): - 43 |+ def baz() -> "DataFrame()": -41 44 | ... -42 45 | -43 46 | +39 | +40 | +41 | def f(): + - from pandas import DataFrame +42 | + - def baz() -> DataFrame(): +43 + def baz() -> "DataFrame()": +44 | ... +45 | +46 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> quote.py:47:24 @@ -192,26 +186,25 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 49 | def baz() -> DataFrame[Literal["int"]]: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -44 48 | def f(): -45 49 | from typing import Literal -46 50 | -47 |- from pandas import DataFrame -48 51 | -49 |- def baz() -> DataFrame[Literal["int"]]: - 52 |+ def baz() -> "DataFrame[Literal['int']]": -50 53 | ... -51 54 | -52 55 | +48 | def f(): +49 | from typing import Literal +50 | + - from pandas import DataFrame +51 | + - def baz() -> DataFrame[Literal["int"]]: +52 + def baz() -> "DataFrame[Literal['int']]": +53 | ... +54 | +55 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> quote.py:64:24 @@ -223,26 +216,25 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 66 | def baz() -> DataFrame | Series: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame, Series -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame, Series +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -61 65 | -62 66 | -63 67 | def f(): -64 |- from pandas import DataFrame, Series -65 68 | -66 |- def baz() -> DataFrame | Series: - 69 |+ def baz() -> "DataFrame | Series": -67 70 | ... -68 71 | -69 72 | +65 | +66 | +67 | def f(): + - from pandas import DataFrame, Series +68 | + - def baz() -> DataFrame | Series: +69 + def baz() -> "DataFrame | Series": +70 | ... +71 | +72 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.Series` into a type-checking block --> quote.py:64:35 @@ -254,26 +246,25 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block 66 | def baz() -> DataFrame | Series: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame, Series -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame, Series +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -61 65 | -62 66 | -63 67 | def f(): -64 |- from pandas import DataFrame, Series -65 68 | -66 |- def baz() -> DataFrame | Series: - 69 |+ def baz() -> "DataFrame | Series": -67 70 | ... -68 71 | -69 72 | +65 | +66 | +67 | def f(): + - from pandas import DataFrame, Series +68 | + - def baz() -> DataFrame | Series: +69 + def baz() -> "DataFrame | Series": +70 | ... +71 | +72 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> quote.py:71:24 @@ -285,39 +276,38 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 73 | def baz() -> ( | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame, Series -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame, Series +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -68 72 | -69 73 | -70 74 | def f(): -71 |- from pandas import DataFrame, Series -72 75 | -73 76 | def baz() -> ( -74 |- DataFrame | -75 |- Series - 77 |+ "DataFrame | Series" -76 78 | ): -77 79 | ... -78 80 | -79 81 | class C: -80 |- x: DataFrame[ -81 |- int -82 |- ] = 1 - 82 |+ x: "DataFrame[int]" = 1 -83 83 | -84 |- def func() -> DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]: - 84 |+ def func() -> "DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]": -85 85 | ... -86 86 | -87 87 | +72 | +73 | +74 | def f(): + - from pandas import DataFrame, Series +75 | +76 | def baz() -> ( + - DataFrame | + - Series +77 + "DataFrame | Series" +78 | ): +79 | ... +80 | +81 | class C: + - x: DataFrame[ + - int + - ] = 1 +82 + x: "DataFrame[int]" = 1 +83 | + - def func() -> DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]: +84 + def func() -> "DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]": +85 | ... +86 | +87 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.Series` into a type-checking block --> quote.py:71:35 @@ -329,39 +319,38 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block 73 | def baz() -> ( | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame, Series -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame, Series +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -68 72 | -69 73 | -70 74 | def f(): -71 |- from pandas import DataFrame, Series -72 75 | -73 76 | def baz() -> ( -74 |- DataFrame | -75 |- Series - 77 |+ "DataFrame | Series" -76 78 | ): -77 79 | ... -78 80 | -79 81 | class C: -80 |- x: DataFrame[ -81 |- int -82 |- ] = 1 - 82 |+ x: "DataFrame[int]" = 1 -83 83 | -84 |- def func() -> DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]: - 84 |+ def func() -> "DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]": -85 85 | ... -86 86 | -87 87 | +72 | +73 | +74 | def f(): + - from pandas import DataFrame, Series +75 | +76 | def baz() -> ( + - DataFrame | + - Series +77 + "DataFrame | Series" +78 | ): +79 | ... +80 | +81 | class C: + - x: DataFrame[ + - int + - ] = 1 +82 + x: "DataFrame[int]" = 1 +83 | + - def func() -> DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]: +84 + def func() -> "DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]": +85 | ... +86 | +87 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> quote.py:89:24 @@ -373,26 +362,25 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 91 | def func(self) -> DataFrame | list[Series]: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame, Series -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame, Series +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -86 90 | -87 91 | -88 92 | def f(): -89 |- from pandas import DataFrame, Series -90 93 | -91 |- def func(self) -> DataFrame | list[Series]: - 94 |+ def func(self) -> "DataFrame | list[Series]": -92 95 | pass -93 96 | -94 97 | +90 | +91 | +92 | def f(): + - from pandas import DataFrame, Series +93 | + - def func(self) -> DataFrame | list[Series]: +94 + def func(self) -> "DataFrame | list[Series]": +95 | pass +96 | +97 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.Series` into a type-checking block --> quote.py:89:35 @@ -404,23 +392,22 @@ TC002 [*] Move third-party import `pandas.Series` into a type-checking block 91 | def func(self) -> DataFrame | list[Series]: | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from pandas import DataFrame, Series -1 5 | def f(): -2 6 | from pandas import DataFrame -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from pandas import DataFrame, Series +5 | def f(): +6 | from pandas import DataFrame +7 | -------------------------------------------------------------------------------- -86 90 | -87 91 | -88 92 | def f(): -89 |- from pandas import DataFrame, Series -90 93 | -91 |- def func(self) -> DataFrame | list[Series]: - 94 |+ def func(self) -> "DataFrame | list[Series]": -92 95 | pass -93 96 | -94 97 | +90 | +91 | +92 | def f(): + - from pandas import DataFrame, Series +93 | + - def func(self) -> DataFrame | list[Series]: +94 + def func(self) -> "DataFrame | list[Series]": +95 | pass +96 | +97 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap index 3cb135c374..0779cfdfd6 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote2.py.snap @@ -11,20 +11,19 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 4 | def test_remove_inner_quotes_double(self, user: AbstractBaseUser["int"]): | help: Move into type-checking block - -ℹ Unsafe fix -1 |-def f(): - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: -2 4 | from django.contrib.auth.models import AbstractBaseUser - 5 |+def f(): -3 6 | -4 |- def test_remove_inner_quotes_double(self, user: AbstractBaseUser["int"]): - 7 |+ def test_remove_inner_quotes_double(self, user: "AbstractBaseUser[int]"): -5 8 | pass -6 9 | -7 10 | + - def f(): +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 | from django.contrib.auth.models import AbstractBaseUser +5 + def f(): +6 | + - def test_remove_inner_quotes_double(self, user: AbstractBaseUser["int"]): +7 + def test_remove_inner_quotes_double(self, user: "AbstractBaseUser[int]"): +8 | pass +9 | +10 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:9:44 @@ -36,26 +35,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 11 | def test_remove_inner_quotes_single(self, user: AbstractBaseUser['int']): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -6 10 | -7 11 | -8 12 | def f(): -9 |- from django.contrib.auth.models import AbstractBaseUser -10 13 | -11 |- def test_remove_inner_quotes_single(self, user: AbstractBaseUser['int']): - 14 |+ def test_remove_inner_quotes_single(self, user: "AbstractBaseUser[int]"): -12 15 | pass -13 16 | -14 17 | +10 | +11 | +12 | def f(): + - from django.contrib.auth.models import AbstractBaseUser +13 | + - def test_remove_inner_quotes_single(self, user: AbstractBaseUser['int']): +14 + def test_remove_inner_quotes_single(self, user: "AbstractBaseUser[int]"): +15 | pass +16 | +17 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:16:44 @@ -67,26 +65,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 18 | def test_remove_inner_quotes_mixed(self, user: AbstractBaseUser['int', "str"]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -13 17 | -14 18 | -15 19 | def f(): -16 |- from django.contrib.auth.models import AbstractBaseUser -17 20 | -18 |- def test_remove_inner_quotes_mixed(self, user: AbstractBaseUser['int', "str"]): - 21 |+ def test_remove_inner_quotes_mixed(self, user: "AbstractBaseUser[int, str]"): -19 22 | pass -20 23 | -21 24 | +17 | +18 | +19 | def f(): + - from django.contrib.auth.models import AbstractBaseUser +20 | + - def test_remove_inner_quotes_mixed(self, user: AbstractBaseUser['int', "str"]): +21 + def test_remove_inner_quotes_mixed(self, user: "AbstractBaseUser[int, str]"): +22 | pass +23 | +24 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:25:44 @@ -99,26 +96,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 27 | def test_literal_annotation_args_contain_quotes(self, type1: AbstractBaseUser[Literal["user", "admin"], Annotated["int", "1", 2]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -22 26 | def f(): -23 27 | from typing import Annotated, Literal -24 28 | -25 |- from django.contrib.auth.models import AbstractBaseUser -26 29 | -27 |- def test_literal_annotation_args_contain_quotes(self, type1: AbstractBaseUser[Literal["user", "admin"], Annotated["int", "1", 2]]): - 30 |+ def test_literal_annotation_args_contain_quotes(self, type1: "AbstractBaseUser[Literal['user', 'admin'], Annotated[int, '1', 2]]"): -28 31 | pass -29 32 | -30 33 | +26 | def f(): +27 | from typing import Annotated, Literal +28 | + - from django.contrib.auth.models import AbstractBaseUser +29 | + - def test_literal_annotation_args_contain_quotes(self, type1: AbstractBaseUser[Literal["user", "admin"], Annotated["int", "1", 2]]): +30 + def test_literal_annotation_args_contain_quotes(self, type1: "AbstractBaseUser[Literal['user', 'admin'], Annotated[int, '1', 2]]"): +31 | pass +32 | +33 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:34:44 @@ -131,26 +127,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 36 | def test_union_contain_inner_quotes(self, type1: AbstractBaseUser["int" | Literal["int"]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -31 35 | def f(): -32 36 | from typing import Literal -33 37 | -34 |- from django.contrib.auth.models import AbstractBaseUser -35 38 | -36 |- def test_union_contain_inner_quotes(self, type1: AbstractBaseUser["int" | Literal["int"]]): - 39 |+ def test_union_contain_inner_quotes(self, type1: "AbstractBaseUser[int | Literal['int']]"): -37 40 | pass -38 41 | -39 42 | +35 | def f(): +36 | from typing import Literal +37 | + - from django.contrib.auth.models import AbstractBaseUser +38 | + - def test_union_contain_inner_quotes(self, type1: AbstractBaseUser["int" | Literal["int"]]): +39 + def test_union_contain_inner_quotes(self, type1: "AbstractBaseUser[int | Literal['int']]"): +40 | pass +41 | +42 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:43:44 @@ -163,26 +158,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 45 | def test_inner_literal_mixed_quotes(user: AbstractBaseUser[Literal['user', "admin"]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -40 44 | def f(): -41 45 | from typing import Literal -42 46 | -43 |- from django.contrib.auth.models import AbstractBaseUser -44 47 | -45 |- def test_inner_literal_mixed_quotes(user: AbstractBaseUser[Literal['user', "admin"]]): - 48 |+ def test_inner_literal_mixed_quotes(user: "AbstractBaseUser[Literal['user', 'admin']]"): -46 49 | pass -47 50 | -48 51 | +44 | def f(): +45 | from typing import Literal +46 | + - from django.contrib.auth.models import AbstractBaseUser +47 | + - def test_inner_literal_mixed_quotes(user: AbstractBaseUser[Literal['user', "admin"]]): +48 + def test_inner_literal_mixed_quotes(user: "AbstractBaseUser[Literal['user', 'admin']]"): +49 | pass +50 | +51 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:52:44 @@ -195,26 +189,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 54 | def test_inner_literal_single_quote(user: AbstractBaseUser[Literal['int'], str]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -49 53 | def f(): -50 54 | from typing import Literal -51 55 | -52 |- from django.contrib.auth.models import AbstractBaseUser -53 56 | -54 |- def test_inner_literal_single_quote(user: AbstractBaseUser[Literal['int'], str]): - 57 |+ def test_inner_literal_single_quote(user: "AbstractBaseUser[Literal['int'], str]"): -55 58 | pass -56 59 | -57 60 | +53 | def f(): +54 | from typing import Literal +55 | + - from django.contrib.auth.models import AbstractBaseUser +56 | + - def test_inner_literal_single_quote(user: AbstractBaseUser[Literal['int'], str]): +57 + def test_inner_literal_single_quote(user: "AbstractBaseUser[Literal['int'], str]"): +58 | pass +59 | +60 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:61:44 @@ -227,26 +220,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 63 | def test_mixed_quotes_literal(user: AbstractBaseUser[Literal['user'], "int"]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -58 62 | def f(): -59 63 | from typing import Literal -60 64 | -61 |- from django.contrib.auth.models import AbstractBaseUser -62 65 | -63 |- def test_mixed_quotes_literal(user: AbstractBaseUser[Literal['user'], "int"]): - 66 |+ def test_mixed_quotes_literal(user: "AbstractBaseUser[Literal['user'], int]"): -64 67 | pass -65 68 | -66 69 | +62 | def f(): +63 | from typing import Literal +64 | + - from django.contrib.auth.models import AbstractBaseUser +65 | + - def test_mixed_quotes_literal(user: AbstractBaseUser[Literal['user'], "int"]): +66 + def test_mixed_quotes_literal(user: "AbstractBaseUser[Literal['user'], int]"): +67 | pass +68 | +69 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote2.py:70:44 @@ -259,23 +251,22 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 72 | def test_annotated_literal_mixed_quotes(user: AbstractBaseUser[Annotated[str, "max_length=20", Literal['user', "admin"]]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from django.contrib.auth.models import AbstractBaseUser -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from django.contrib.auth.models import AbstractBaseUser +7 | -------------------------------------------------------------------------------- -67 71 | def f(): -68 72 | from typing import Annotated, Literal -69 73 | -70 |- from django.contrib.auth.models import AbstractBaseUser -71 74 | -72 |- def test_annotated_literal_mixed_quotes(user: AbstractBaseUser[Annotated[str, "max_length=20", Literal['user', "admin"]]]): - 75 |+ def test_annotated_literal_mixed_quotes(user: "AbstractBaseUser[Annotated[str, 'max_length=20', Literal['user', 'admin']]]"): -73 76 | pass -74 77 | -75 78 | +71 | def f(): +72 | from typing import Annotated, Literal +73 | + - from django.contrib.auth.models import AbstractBaseUser +74 | + - def test_annotated_literal_mixed_quotes(user: AbstractBaseUser[Annotated[str, "max_length=20", Literal['user', "admin"]]]): +75 + def test_annotated_literal_mixed_quotes(user: "AbstractBaseUser[Annotated[str, 'max_length=20', Literal['user', 'admin']]]"): +76 | pass +77 | +78 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap index 61e7ae28ed..4614aecb89 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quote_typing-only-third-party-import_quote3.py.snap @@ -12,22 +12,21 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 6 | def test_union_literal_mixed_quotes(user: AbstractBaseUser[Union[Literal['active', "inactive"], str]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from typing import Literal, Union -3 7 | -4 |- from django.contrib.auth.models import AbstractBaseUser -5 8 | -6 |- def test_union_literal_mixed_quotes(user: AbstractBaseUser[Union[Literal['active', "inactive"], str]]): - 9 |+ def test_union_literal_mixed_quotes(user: 'AbstractBaseUser[Union[Literal["active", "inactive"], str]]'): -7 10 | pass -8 11 | -9 12 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from typing import Literal, Union +7 | + - from django.contrib.auth.models import AbstractBaseUser +8 | + - def test_union_literal_mixed_quotes(user: AbstractBaseUser[Union[Literal['active', "inactive"], str]]): +9 + def test_union_literal_mixed_quotes(user: 'AbstractBaseUser[Union[Literal["active", "inactive"], str]]'): +10 | pass +11 | +12 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote3.py:13:44 @@ -40,26 +39,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 15 | def test_callable_literal_mixed_quotes(callable_fn: AbstractBaseUser[Callable[["int", Literal['admin', "user"]], 'bool']]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from typing import Literal, Union -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from typing import Literal, Union +7 | -------------------------------------------------------------------------------- -10 14 | def f(): -11 15 | from typing import Callable, Literal -12 16 | -13 |- from django.contrib.auth.models import AbstractBaseUser -14 17 | -15 |- def test_callable_literal_mixed_quotes(callable_fn: AbstractBaseUser[Callable[["int", Literal['admin', "user"]], 'bool']]): - 18 |+ def test_callable_literal_mixed_quotes(callable_fn: 'AbstractBaseUser[Callable[[int, Literal["admin", "user"]], bool]]'): -16 19 | pass -17 20 | -18 21 | +14 | def f(): +15 | from typing import Callable, Literal +16 | + - from django.contrib.auth.models import AbstractBaseUser +17 | + - def test_callable_literal_mixed_quotes(callable_fn: AbstractBaseUser[Callable[["int", Literal['admin', "user"]], 'bool']]): +18 + def test_callable_literal_mixed_quotes(callable_fn: 'AbstractBaseUser[Callable[[int, Literal["admin", "user"]], bool]]'): +19 | pass +20 | +21 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` into a type-checking block --> quote3.py:22:44 @@ -72,26 +70,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models.AbstractBaseUser` 24 | def test_callable_annotated_literal(callable_fn: AbstractBaseUser[Callable[[int, Annotated[str, Literal['active', "inactive"]]], b… | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth.models import AbstractBaseUser -1 5 | def f(): -2 6 | from typing import Literal, Union -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth.models import AbstractBaseUser +5 | def f(): +6 | from typing import Literal, Union +7 | -------------------------------------------------------------------------------- -19 23 | def f(): -20 24 | from typing import Annotated, Callable, Literal -21 25 | -22 |- from django.contrib.auth.models import AbstractBaseUser -23 26 | -24 |- def test_callable_annotated_literal(callable_fn: AbstractBaseUser[Callable[[int, Annotated[str, Literal['active', "inactive"]]], bool]]): - 27 |+ def test_callable_annotated_literal(callable_fn: 'AbstractBaseUser[Callable[[int, Annotated[str, Literal["active", "inactive"]]], bool]]'): -25 28 | pass -26 29 | -27 30 | +23 | def f(): +24 | from typing import Annotated, Callable, Literal +25 | + - from django.contrib.auth.models import AbstractBaseUser +26 | + - def test_callable_annotated_literal(callable_fn: AbstractBaseUser[Callable[[int, Annotated[str, Literal['active', "inactive"]]], bool]]): +27 + def test_callable_annotated_literal(callable_fn: 'AbstractBaseUser[Callable[[int, Annotated[str, Literal["active", "inactive"]]], bool]]'): +28 | pass +29 | +30 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models` into a type-checking block --> quote3.py:31:37 @@ -104,26 +101,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models` into a type-check 33 | def test_attribute(arg: models.AbstractBaseUser["int"]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth import models -1 5 | def f(): -2 6 | from typing import Literal, Union -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth import models +5 | def f(): +6 | from typing import Literal, Union +7 | -------------------------------------------------------------------------------- -28 32 | def f(): -29 33 | from typing import literal -30 34 | -31 |- from django.contrib.auth import models -32 35 | -33 |- def test_attribute(arg: models.AbstractBaseUser["int"]): - 36 |+ def test_attribute(arg: 'models.AbstractBaseUser[int]'): -34 37 | pass -35 38 | -36 39 | +32 | def f(): +33 | from typing import literal +34 | + - from django.contrib.auth import models +35 | + - def test_attribute(arg: models.AbstractBaseUser["int"]): +36 + def test_attribute(arg: 'models.AbstractBaseUser[int]'): +37 | pass +38 | +39 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `django.contrib.auth.models` into a type-checking block --> quote3.py:40:37 @@ -136,26 +132,25 @@ TC002 [*] Move third-party import `django.contrib.auth.models` into a type-check 42 | def test_attribute_typing_literal(arg: models.AbstractBaseUser[Literal["admin"]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from django.contrib.auth import models -1 5 | def f(): -2 6 | from typing import Literal, Union -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from django.contrib.auth import models +5 | def f(): +6 | from typing import Literal, Union +7 | -------------------------------------------------------------------------------- -37 41 | def f(): -38 42 | from typing import Literal -39 43 | -40 |- from django.contrib.auth import models -41 44 | -42 |- def test_attribute_typing_literal(arg: models.AbstractBaseUser[Literal["admin"]]): - 45 |+ def test_attribute_typing_literal(arg: 'models.AbstractBaseUser[Literal["admin"]]'): -43 46 | pass -44 47 | -45 48 | +41 | def f(): +42 | from typing import Literal +43 | + - from django.contrib.auth import models +44 | + - def test_attribute_typing_literal(arg: models.AbstractBaseUser[Literal["admin"]]): +45 + def test_attribute_typing_literal(arg: 'models.AbstractBaseUser[Literal["admin"]]'): +46 | pass +47 | +48 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `third_party.Type` into a type-checking block --> quote3.py:59:29 @@ -168,26 +163,25 @@ TC002 [*] Move third-party import `third_party.Type` into a type-checking block 61 | def test_string_contains_opposite_quote(self, type1: Type[Literal["'"]], type2: Type[Literal["\'"]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from third_party import Type -1 5 | def f(): -2 6 | from typing import Literal, Union -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from third_party import Type +5 | def f(): +6 | from typing import Literal, Union +7 | -------------------------------------------------------------------------------- -56 60 | -57 61 | def f(): -58 62 | from typing import Literal -59 |- from third_party import Type -60 63 | -61 |- def test_string_contains_opposite_quote(self, type1: Type[Literal["'"]], type2: Type[Literal["\'"]]): - 64 |+ def test_string_contains_opposite_quote(self, type1: 'Type[Literal["\'"]]', type2: 'Type[Literal["\'"]]'): -62 65 | pass -63 66 | -64 67 | +60 | +61 | def f(): +62 | from typing import Literal + - from third_party import Type +63 | + - def test_string_contains_opposite_quote(self, type1: Type[Literal["'"]], type2: Type[Literal["\'"]]): +64 + def test_string_contains_opposite_quote(self, type1: 'Type[Literal["\'"]]', type2: 'Type[Literal["\'"]]'): +65 | pass +66 | +67 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `third_party.Type` into a type-checking block --> quote3.py:67:29 @@ -200,21 +194,20 @@ TC002 [*] Move third-party import `third_party.Type` into a type-checking block 69 | def test_quote_contains_backslash(self, type1: Type[Literal["\n"]], type2: Type[Literal["\""]]): | help: Move into type-checking block - -ℹ Unsafe fix - 1 |+from typing import TYPE_CHECKING - 2 |+ - 3 |+if TYPE_CHECKING: - 4 |+ from third_party import Type -1 5 | def f(): -2 6 | from typing import Literal, Union -3 7 | +1 + from typing import TYPE_CHECKING +2 + +3 + if TYPE_CHECKING: +4 + from third_party import Type +5 | def f(): +6 | from typing import Literal, Union +7 | -------------------------------------------------------------------------------- -64 68 | -65 69 | def f(): -66 70 | from typing import Literal -67 |- from third_party import Type -68 71 | -69 |- def test_quote_contains_backslash(self, type1: Type[Literal["\n"]], type2: Type[Literal["\""]]): - 72 |+ def test_quote_contains_backslash(self, type1: 'Type[Literal["\\n"]]', type2: 'Type[Literal[\'"\']]'): -70 73 | pass +68 | +69 | def f(): +70 | from typing import Literal + - from third_party import Type +71 | + - def test_quote_contains_backslash(self, type1: Type[Literal["\n"]], type2: Type[Literal["\""]]): +72 + def test_quote_contains_backslash(self, type1: 'Type[Literal["\\n"]]', type2: 'Type[Literal[\'"\']]'): +73 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap index bc584f9775..53f8bb88a0 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008.py.snap @@ -12,16 +12,14 @@ TC008 [*] Remove quotes from type alias 17 | c: TypeAlias = 'Foo' # TC008 | help: Remove quotes - -ℹ Safe fix -12 12 | else: -13 13 | Bar = Foo -14 14 | -15 |-a: TypeAlias = 'int' # TC008 - 15 |+a: TypeAlias = int # TC008 -16 16 | b: TypeAlias = 'Dict' # OK -17 17 | c: TypeAlias = 'Foo' # TC008 -18 18 | d: TypeAlias = 'Foo[str]' # OK +12 | else: +13 | Bar = Foo +14 | + - a: TypeAlias = 'int' # TC008 +15 + a: TypeAlias = int # TC008 +16 | b: TypeAlias = 'Dict' # OK +17 | c: TypeAlias = 'Foo' # TC008 +18 | d: TypeAlias = 'Foo[str]' # OK TC008 [*] Remove quotes from type alias --> TC008.py:17:16 @@ -34,16 +32,14 @@ TC008 [*] Remove quotes from type alias 19 | e: TypeAlias = 'Foo.bar' # OK | help: Remove quotes - -ℹ Safe fix -14 14 | -15 15 | a: TypeAlias = 'int' # TC008 -16 16 | b: TypeAlias = 'Dict' # OK -17 |-c: TypeAlias = 'Foo' # TC008 - 17 |+c: TypeAlias = Foo # TC008 -18 18 | d: TypeAlias = 'Foo[str]' # OK -19 19 | e: TypeAlias = 'Foo.bar' # OK -20 20 | f: TypeAlias = 'Foo | None' # TC008 +14 | +15 | a: TypeAlias = 'int' # TC008 +16 | b: TypeAlias = 'Dict' # OK + - c: TypeAlias = 'Foo' # TC008 +17 + c: TypeAlias = Foo # TC008 +18 | d: TypeAlias = 'Foo[str]' # OK +19 | e: TypeAlias = 'Foo.bar' # OK +20 | f: TypeAlias = 'Foo | None' # TC008 TC008 [*] Remove quotes from type alias --> TC008.py:20:16 @@ -56,16 +52,14 @@ TC008 [*] Remove quotes from type alias 22 | h: TypeAlias = 'Bar' # TC008 | help: Remove quotes - -ℹ Safe fix -17 17 | c: TypeAlias = 'Foo' # TC008 -18 18 | d: TypeAlias = 'Foo[str]' # OK -19 19 | e: TypeAlias = 'Foo.bar' # OK -20 |-f: TypeAlias = 'Foo | None' # TC008 - 20 |+f: TypeAlias = Foo | None # TC008 -21 21 | g: TypeAlias = 'OptStr' # OK -22 22 | h: TypeAlias = 'Bar' # TC008 -23 23 | i: TypeAlias = Foo['str'] # TC008 +17 | c: TypeAlias = 'Foo' # TC008 +18 | d: TypeAlias = 'Foo[str]' # OK +19 | e: TypeAlias = 'Foo.bar' # OK + - f: TypeAlias = 'Foo | None' # TC008 +20 + f: TypeAlias = Foo | None # TC008 +21 | g: TypeAlias = 'OptStr' # OK +22 | h: TypeAlias = 'Bar' # TC008 +23 | i: TypeAlias = Foo['str'] # TC008 TC008 [*] Remove quotes from type alias --> TC008.py:22:16 @@ -78,16 +72,14 @@ TC008 [*] Remove quotes from type alias 24 | j: TypeAlias = 'Baz' # OK | help: Remove quotes - -ℹ Safe fix -19 19 | e: TypeAlias = 'Foo.bar' # OK -20 20 | f: TypeAlias = 'Foo | None' # TC008 -21 21 | g: TypeAlias = 'OptStr' # OK -22 |-h: TypeAlias = 'Bar' # TC008 - 22 |+h: TypeAlias = Bar # TC008 -23 23 | i: TypeAlias = Foo['str'] # TC008 -24 24 | j: TypeAlias = 'Baz' # OK -25 25 | k: TypeAlias = 'k | None' # OK +19 | e: TypeAlias = 'Foo.bar' # OK +20 | f: TypeAlias = 'Foo | None' # TC008 +21 | g: TypeAlias = 'OptStr' # OK + - h: TypeAlias = 'Bar' # TC008 +22 + h: TypeAlias = Bar # TC008 +23 | i: TypeAlias = Foo['str'] # TC008 +24 | j: TypeAlias = 'Baz' # OK +25 | k: TypeAlias = 'k | None' # OK TC008 [*] Remove quotes from type alias --> TC008.py:23:20 @@ -100,16 +92,14 @@ TC008 [*] Remove quotes from type alias 25 | k: TypeAlias = 'k | None' # OK | help: Remove quotes - -ℹ Safe fix -20 20 | f: TypeAlias = 'Foo | None' # TC008 -21 21 | g: TypeAlias = 'OptStr' # OK -22 22 | h: TypeAlias = 'Bar' # TC008 -23 |-i: TypeAlias = Foo['str'] # TC008 - 23 |+i: TypeAlias = Foo[str] # TC008 -24 24 | j: TypeAlias = 'Baz' # OK -25 25 | k: TypeAlias = 'k | None' # OK -26 26 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) +20 | f: TypeAlias = 'Foo | None' # TC008 +21 | g: TypeAlias = 'OptStr' # OK +22 | h: TypeAlias = 'Bar' # TC008 + - i: TypeAlias = Foo['str'] # TC008 +23 + i: TypeAlias = Foo[str] # TC008 +24 | j: TypeAlias = 'Baz' # OK +25 | k: TypeAlias = 'k | None' # OK +26 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) TC008 [*] Remove quotes from type alias --> TC008.py:26:16 @@ -122,16 +112,14 @@ TC008 [*] Remove quotes from type alias 28 | | None) | help: Remove quotes - -ℹ Safe fix -23 23 | i: TypeAlias = Foo['str'] # TC008 -24 24 | j: TypeAlias = 'Baz' # OK -25 25 | k: TypeAlias = 'k | None' # OK -26 |-l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) - 26 |+l: TypeAlias = int | None # TC008 (because TC010 is not enabled) -27 27 | m: TypeAlias = ('int' # TC008 -28 28 | | None) -29 29 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) +23 | i: TypeAlias = Foo['str'] # TC008 +24 | j: TypeAlias = 'Baz' # OK +25 | k: TypeAlias = 'k | None' # OK + - l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) +26 + l: TypeAlias = int | None # TC008 (because TC010 is not enabled) +27 | m: TypeAlias = ('int' # TC008 +28 | | None) +29 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) TC008 [*] Remove quotes from type alias --> TC008.py:27:17 @@ -144,16 +132,14 @@ TC008 [*] Remove quotes from type alias 29 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) | help: Remove quotes - -ℹ Safe fix -24 24 | j: TypeAlias = 'Baz' # OK -25 25 | k: TypeAlias = 'k | None' # OK -26 26 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) -27 |-m: TypeAlias = ('int' # TC008 - 27 |+m: TypeAlias = (int # TC008 -28 28 | | None) -29 29 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) -30 30 | ' | None') +24 | j: TypeAlias = 'Baz' # OK +25 | k: TypeAlias = 'k | None' # OK +26 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) + - m: TypeAlias = ('int' # TC008 +27 + m: TypeAlias = (int # TC008 +28 | | None) +29 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) +30 | ' | None') TC008 [*] Remove quotes from type alias --> TC008.py:29:17 @@ -168,17 +154,16 @@ TC008 [*] Remove quotes from type alias 32 | type B = 'Dict' # TC008 | help: Remove quotes - -ℹ Unsafe fix -26 26 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) -27 27 | m: TypeAlias = ('int' # TC008 -28 28 | | None) -29 |-n: TypeAlias = ('int' # TC008 (fix removes comment currently) -30 |- ' | None') - 29 |+n: TypeAlias = (int | None) -31 30 | -32 31 | type B = 'Dict' # TC008 -33 32 | type D = 'Foo[str]' # TC008 +26 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) +27 | m: TypeAlias = ('int' # TC008 +28 | | None) + - n: TypeAlias = ('int' # TC008 (fix removes comment currently) + - ' | None') +29 + n: TypeAlias = (int | None) +30 | +31 | type B = 'Dict' # TC008 +32 | type D = 'Foo[str]' # TC008 +note: This is an unsafe fix and may change runtime behavior TC008 [*] Remove quotes from type alias --> TC008.py:32:10 @@ -191,16 +176,14 @@ TC008 [*] Remove quotes from type alias 34 | type E = 'Foo.bar' # TC008 | help: Remove quotes - -ℹ Safe fix -29 29 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) -30 30 | ' | None') -31 31 | -32 |-type B = 'Dict' # TC008 - 32 |+type B = Dict # TC008 -33 33 | type D = 'Foo[str]' # TC008 -34 34 | type E = 'Foo.bar' # TC008 -35 35 | type G = 'OptStr' # TC008 +29 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) +30 | ' | None') +31 | + - type B = 'Dict' # TC008 +32 + type B = Dict # TC008 +33 | type D = 'Foo[str]' # TC008 +34 | type E = 'Foo.bar' # TC008 +35 | type G = 'OptStr' # TC008 TC008 [*] Remove quotes from type alias --> TC008.py:33:10 @@ -212,16 +195,14 @@ TC008 [*] Remove quotes from type alias 35 | type G = 'OptStr' # TC008 | help: Remove quotes - -ℹ Safe fix -30 30 | ' | None') -31 31 | -32 32 | type B = 'Dict' # TC008 -33 |-type D = 'Foo[str]' # TC008 - 33 |+type D = Foo[str] # TC008 -34 34 | type E = 'Foo.bar' # TC008 -35 35 | type G = 'OptStr' # TC008 -36 36 | type I = Foo['str'] # TC008 +30 | ' | None') +31 | +32 | type B = 'Dict' # TC008 + - type D = 'Foo[str]' # TC008 +33 + type D = Foo[str] # TC008 +34 | type E = 'Foo.bar' # TC008 +35 | type G = 'OptStr' # TC008 +36 | type I = Foo['str'] # TC008 TC008 [*] Remove quotes from type alias --> TC008.py:34:10 @@ -234,16 +215,14 @@ TC008 [*] Remove quotes from type alias 36 | type I = Foo['str'] # TC008 | help: Remove quotes - -ℹ Safe fix -31 31 | -32 32 | type B = 'Dict' # TC008 -33 33 | type D = 'Foo[str]' # TC008 -34 |-type E = 'Foo.bar' # TC008 - 34 |+type E = Foo.bar # TC008 -35 35 | type G = 'OptStr' # TC008 -36 36 | type I = Foo['str'] # TC008 -37 37 | type J = 'Baz' # TC008 +31 | +32 | type B = 'Dict' # TC008 +33 | type D = 'Foo[str]' # TC008 + - type E = 'Foo.bar' # TC008 +34 + type E = Foo.bar # TC008 +35 | type G = 'OptStr' # TC008 +36 | type I = Foo['str'] # TC008 +37 | type J = 'Baz' # TC008 TC008 [*] Remove quotes from type alias --> TC008.py:35:10 @@ -256,16 +235,14 @@ TC008 [*] Remove quotes from type alias 37 | type J = 'Baz' # TC008 | help: Remove quotes - -ℹ Safe fix -32 32 | type B = 'Dict' # TC008 -33 33 | type D = 'Foo[str]' # TC008 -34 34 | type E = 'Foo.bar' # TC008 -35 |-type G = 'OptStr' # TC008 - 35 |+type G = OptStr # TC008 -36 36 | type I = Foo['str'] # TC008 -37 37 | type J = 'Baz' # TC008 -38 38 | type K = 'K | None' # TC008 +32 | type B = 'Dict' # TC008 +33 | type D = 'Foo[str]' # TC008 +34 | type E = 'Foo.bar' # TC008 + - type G = 'OptStr' # TC008 +35 + type G = OptStr # TC008 +36 | type I = Foo['str'] # TC008 +37 | type J = 'Baz' # TC008 +38 | type K = 'K | None' # TC008 TC008 [*] Remove quotes from type alias --> TC008.py:36:14 @@ -278,16 +255,14 @@ TC008 [*] Remove quotes from type alias 38 | type K = 'K | None' # TC008 | help: Remove quotes - -ℹ Safe fix -33 33 | type D = 'Foo[str]' # TC008 -34 34 | type E = 'Foo.bar' # TC008 -35 35 | type G = 'OptStr' # TC008 -36 |-type I = Foo['str'] # TC008 - 36 |+type I = Foo[str] # TC008 -37 37 | type J = 'Baz' # TC008 -38 38 | type K = 'K | None' # TC008 -39 39 | type L = 'int' | None # TC008 (because TC010 is not enabled) +33 | type D = 'Foo[str]' # TC008 +34 | type E = 'Foo.bar' # TC008 +35 | type G = 'OptStr' # TC008 + - type I = Foo['str'] # TC008 +36 + type I = Foo[str] # TC008 +37 | type J = 'Baz' # TC008 +38 | type K = 'K | None' # TC008 +39 | type L = 'int' | None # TC008 (because TC010 is not enabled) TC008 [*] Remove quotes from type alias --> TC008.py:37:10 @@ -300,16 +275,14 @@ TC008 [*] Remove quotes from type alias 39 | type L = 'int' | None # TC008 (because TC010 is not enabled) | help: Remove quotes - -ℹ Safe fix -34 34 | type E = 'Foo.bar' # TC008 -35 35 | type G = 'OptStr' # TC008 -36 36 | type I = Foo['str'] # TC008 -37 |-type J = 'Baz' # TC008 - 37 |+type J = Baz # TC008 -38 38 | type K = 'K | None' # TC008 -39 39 | type L = 'int' | None # TC008 (because TC010 is not enabled) -40 40 | type M = ('int' # TC008 +34 | type E = 'Foo.bar' # TC008 +35 | type G = 'OptStr' # TC008 +36 | type I = Foo['str'] # TC008 + - type J = 'Baz' # TC008 +37 + type J = Baz # TC008 +38 | type K = 'K | None' # TC008 +39 | type L = 'int' | None # TC008 (because TC010 is not enabled) +40 | type M = ('int' # TC008 TC008 [*] Remove quotes from type alias --> TC008.py:38:10 @@ -322,16 +295,14 @@ TC008 [*] Remove quotes from type alias 40 | type M = ('int' # TC008 | help: Remove quotes - -ℹ Safe fix -35 35 | type G = 'OptStr' # TC008 -36 36 | type I = Foo['str'] # TC008 -37 37 | type J = 'Baz' # TC008 -38 |-type K = 'K | None' # TC008 - 38 |+type K = K | None # TC008 -39 39 | type L = 'int' | None # TC008 (because TC010 is not enabled) -40 40 | type M = ('int' # TC008 -41 41 | | None) +35 | type G = 'OptStr' # TC008 +36 | type I = Foo['str'] # TC008 +37 | type J = 'Baz' # TC008 + - type K = 'K | None' # TC008 +38 + type K = K | None # TC008 +39 | type L = 'int' | None # TC008 (because TC010 is not enabled) +40 | type M = ('int' # TC008 +41 | | None) TC008 [*] Remove quotes from type alias --> TC008.py:39:10 @@ -344,16 +315,14 @@ TC008 [*] Remove quotes from type alias 41 | | None) | help: Remove quotes - -ℹ Safe fix -36 36 | type I = Foo['str'] # TC008 -37 37 | type J = 'Baz' # TC008 -38 38 | type K = 'K | None' # TC008 -39 |-type L = 'int' | None # TC008 (because TC010 is not enabled) - 39 |+type L = int | None # TC008 (because TC010 is not enabled) -40 40 | type M = ('int' # TC008 -41 41 | | None) -42 42 | type N = ('int' # TC008 (fix removes comment currently) +36 | type I = Foo['str'] # TC008 +37 | type J = 'Baz' # TC008 +38 | type K = 'K | None' # TC008 + - type L = 'int' | None # TC008 (because TC010 is not enabled) +39 + type L = int | None # TC008 (because TC010 is not enabled) +40 | type M = ('int' # TC008 +41 | | None) +42 | type N = ('int' # TC008 (fix removes comment currently) TC008 [*] Remove quotes from type alias --> TC008.py:40:11 @@ -366,16 +335,14 @@ TC008 [*] Remove quotes from type alias 42 | type N = ('int' # TC008 (fix removes comment currently) | help: Remove quotes - -ℹ Safe fix -37 37 | type J = 'Baz' # TC008 -38 38 | type K = 'K | None' # TC008 -39 39 | type L = 'int' | None # TC008 (because TC010 is not enabled) -40 |-type M = ('int' # TC008 - 40 |+type M = (int # TC008 -41 41 | | None) -42 42 | type N = ('int' # TC008 (fix removes comment currently) -43 43 | ' | None') +37 | type J = 'Baz' # TC008 +38 | type K = 'K | None' # TC008 +39 | type L = 'int' | None # TC008 (because TC010 is not enabled) + - type M = ('int' # TC008 +40 + type M = (int # TC008 +41 | | None) +42 | type N = ('int' # TC008 (fix removes comment currently) +43 | ' | None') TC008 [*] Remove quotes from type alias --> TC008.py:42:11 @@ -388,17 +355,16 @@ TC008 [*] Remove quotes from type alias | |_____________^ | help: Remove quotes - -ℹ Unsafe fix -39 39 | type L = 'int' | None # TC008 (because TC010 is not enabled) -40 40 | type M = ('int' # TC008 -41 41 | | None) -42 |-type N = ('int' # TC008 (fix removes comment currently) -43 |- ' | None') - 42 |+type N = (int | None) -44 43 | -45 44 | -46 45 | class Baz: +39 | type L = 'int' | None # TC008 (because TC010 is not enabled) +40 | type M = ('int' # TC008 +41 | | None) + - type N = ('int' # TC008 (fix removes comment currently) + - ' | None') +42 + type N = (int | None) +43 | +44 | +45 | class Baz: +note: This is an unsafe fix and may change runtime behavior TC008 [*] Remove quotes from type alias --> TC008.py:48:14 @@ -411,16 +377,14 @@ TC008 [*] Remove quotes from type alias 50 | class Nested: | help: Remove quotes - -ℹ Safe fix -45 45 | -46 46 | class Baz: -47 47 | a: TypeAlias = 'Baz' # OK -48 |- type A = 'Baz' # TC008 - 48 |+ type A = Baz # TC008 -49 49 | -50 50 | class Nested: -51 51 | a: TypeAlias = 'Baz' # OK +45 | +46 | class Baz: +47 | a: TypeAlias = 'Baz' # OK + - type A = 'Baz' # TC008 +48 + type A = Baz # TC008 +49 | +50 | class Nested: +51 | a: TypeAlias = 'Baz' # OK TC008 [*] Remove quotes from type alias --> TC008.py:52:18 @@ -433,16 +397,14 @@ TC008 [*] Remove quotes from type alias 54 | # O should have parenthesis added | help: Remove quotes - -ℹ Safe fix -49 49 | -50 50 | class Nested: -51 51 | a: TypeAlias = 'Baz' # OK -52 |- type A = 'Baz' # TC008 - 52 |+ type A = Baz # TC008 -53 53 | -54 54 | # O should have parenthesis added -55 55 | o: TypeAlias = """int +49 | +50 | class Nested: +51 | a: TypeAlias = 'Baz' # OK + - type A = 'Baz' # TC008 +52 + type A = Baz # TC008 +53 | +54 | # O should have parenthesis added +55 | o: TypeAlias = """int TC008 [*] Remove quotes from type alias --> TC008.py:55:16 @@ -456,18 +418,16 @@ TC008 [*] Remove quotes from type alias 58 | | None""" | help: Remove quotes - -ℹ Safe fix -52 52 | type A = 'Baz' # TC008 -53 53 | -54 54 | # O should have parenthesis added -55 |-o: TypeAlias = """int -56 |-| None""" - 55 |+o: TypeAlias = (int - 56 |+| None) -57 57 | type O = """int -58 58 | | None""" -59 59 | +52 | type A = 'Baz' # TC008 +53 | +54 | # O should have parenthesis added + - o: TypeAlias = """int + - | None""" +55 + o: TypeAlias = (int +56 + | None) +57 | type O = """int +58 | | None""" +59 | TC008 [*] Remove quotes from type alias --> TC008.py:57:10 @@ -482,18 +442,16 @@ TC008 [*] Remove quotes from type alias 60 | # P, Q, and R should not have parenthesis added | help: Remove quotes - -ℹ Safe fix -54 54 | # O should have parenthesis added -55 55 | o: TypeAlias = """int -56 56 | | None""" -57 |-type O = """int -58 |-| None""" - 57 |+type O = (int - 58 |+| None) -59 59 | -60 60 | # P, Q, and R should not have parenthesis added -61 61 | p: TypeAlias = ("""int +54 | # O should have parenthesis added +55 | o: TypeAlias = """int +56 | | None""" + - type O = """int + - | None""" +57 + type O = (int +58 + | None) +59 | +60 | # P, Q, and R should not have parenthesis added +61 | p: TypeAlias = ("""int TC008 [*] Remove quotes from type alias --> TC008.py:61:17 @@ -507,18 +465,16 @@ TC008 [*] Remove quotes from type alias 64 | | None""") | help: Remove quotes - -ℹ Safe fix -58 58 | | None""" -59 59 | -60 60 | # P, Q, and R should not have parenthesis added -61 |-p: TypeAlias = ("""int -62 |-| None""") - 61 |+p: TypeAlias = (int - 62 |+| None) -63 63 | type P = ("""int -64 64 | | None""") -65 65 | +58 | | None""" +59 | +60 | # P, Q, and R should not have parenthesis added + - p: TypeAlias = ("""int + - | None""") +61 + p: TypeAlias = (int +62 + | None) +63 | type P = ("""int +64 | | None""") +65 | TC008 [*] Remove quotes from type alias --> TC008.py:63:11 @@ -533,18 +489,16 @@ TC008 [*] Remove quotes from type alias 66 | q: TypeAlias = """(int | help: Remove quotes - -ℹ Safe fix -60 60 | # P, Q, and R should not have parenthesis added -61 61 | p: TypeAlias = ("""int -62 62 | | None""") -63 |-type P = ("""int -64 |-| None""") - 63 |+type P = (int - 64 |+| None) -65 65 | -66 66 | q: TypeAlias = """(int -67 67 | | None)""" +60 | # P, Q, and R should not have parenthesis added +61 | p: TypeAlias = ("""int +62 | | None""") + - type P = ("""int + - | None""") +63 + type P = (int +64 + | None) +65 | +66 | q: TypeAlias = """(int +67 | | None)""" TC008 [*] Remove quotes from type alias --> TC008.py:66:16 @@ -559,18 +513,16 @@ TC008 [*] Remove quotes from type alias 69 | | None)""" | help: Remove quotes - -ℹ Safe fix -63 63 | type P = ("""int -64 64 | | None""") -65 65 | -66 |-q: TypeAlias = """(int -67 |-| None)""" - 66 |+q: TypeAlias = (int - 67 |+| None) -68 68 | type Q = """(int -69 69 | | None)""" -70 70 | +63 | type P = ("""int +64 | | None""") +65 | + - q: TypeAlias = """(int + - | None)""" +66 + q: TypeAlias = (int +67 + | None) +68 | type Q = """(int +69 | | None)""" +70 | TC008 [*] Remove quotes from type alias --> TC008.py:68:10 @@ -585,18 +537,16 @@ TC008 [*] Remove quotes from type alias 71 | r: TypeAlias = """int | None""" | help: Remove quotes - -ℹ Safe fix -65 65 | -66 66 | q: TypeAlias = """(int -67 67 | | None)""" -68 |-type Q = """(int -69 |-| None)""" - 68 |+type Q = (int - 69 |+| None) -70 70 | -71 71 | r: TypeAlias = """int | None""" -72 72 | type R = """int | None""" +65 | +66 | q: TypeAlias = """(int +67 | | None)""" + - type Q = """(int + - | None)""" +68 + type Q = (int +69 + | None) +70 | +71 | r: TypeAlias = """int | None""" +72 | type R = """int | None""" TC008 [*] Remove quotes from type alias --> TC008.py:71:16 @@ -608,14 +558,12 @@ TC008 [*] Remove quotes from type alias 72 | type R = """int | None""" | help: Remove quotes - -ℹ Safe fix -68 68 | type Q = """(int -69 69 | | None)""" -70 70 | -71 |-r: TypeAlias = """int | None""" - 71 |+r: TypeAlias = int | None -72 72 | type R = """int | None""" +68 | type Q = """(int +69 | | None)""" +70 | + - r: TypeAlias = """int | None""" +71 + r: TypeAlias = int | None +72 | type R = """int | None""" TC008 [*] Remove quotes from type alias --> TC008.py:72:10 @@ -625,10 +573,8 @@ TC008 [*] Remove quotes from type alias | ^^^^^^^^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -69 69 | | None)""" -70 70 | -71 71 | r: TypeAlias = """int | None""" -72 |-type R = """int | None""" - 72 |+type R = int | None +69 | | None)""" +70 | +71 | r: TypeAlias = """int | None""" + - type R = """int | None""" +72 + type R = int | None diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap index 9d729f56b3..c305a21048 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__quoted-type-alias_TC008_typing_execution_context.py.snap @@ -12,16 +12,14 @@ TC008 [*] Remove quotes from type alias 15 | c: TypeAlias = 'Foo' # TC008 | help: Remove quotes - -ℹ Safe fix -10 10 | OptStr: TypeAlias = str | None -11 11 | Bar: TypeAlias = Foo[int] -12 12 | -13 |- a: TypeAlias = 'int' # TC008 - 13 |+ a: TypeAlias = int # TC008 -14 14 | b: TypeAlias = 'Dict' # TC008 -15 15 | c: TypeAlias = 'Foo' # TC008 -16 16 | d: TypeAlias = 'Foo[str]' # TC008 +10 | OptStr: TypeAlias = str | None +11 | Bar: TypeAlias = Foo[int] +12 | + - a: TypeAlias = 'int' # TC008 +13 + a: TypeAlias = int # TC008 +14 | b: TypeAlias = 'Dict' # TC008 +15 | c: TypeAlias = 'Foo' # TC008 +16 | d: TypeAlias = 'Foo[str]' # TC008 TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:14:20 @@ -33,16 +31,14 @@ TC008 [*] Remove quotes from type alias 16 | d: TypeAlias = 'Foo[str]' # TC008 | help: Remove quotes - -ℹ Safe fix -11 11 | Bar: TypeAlias = Foo[int] -12 12 | -13 13 | a: TypeAlias = 'int' # TC008 -14 |- b: TypeAlias = 'Dict' # TC008 - 14 |+ b: TypeAlias = Dict # TC008 -15 15 | c: TypeAlias = 'Foo' # TC008 -16 16 | d: TypeAlias = 'Foo[str]' # TC008 -17 17 | e: TypeAlias = 'Foo.bar' # TC008 +11 | Bar: TypeAlias = Foo[int] +12 | +13 | a: TypeAlias = 'int' # TC008 + - b: TypeAlias = 'Dict' # TC008 +14 + b: TypeAlias = Dict # TC008 +15 | c: TypeAlias = 'Foo' # TC008 +16 | d: TypeAlias = 'Foo[str]' # TC008 +17 | e: TypeAlias = 'Foo.bar' # TC008 TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:15:20 @@ -55,16 +51,14 @@ TC008 [*] Remove quotes from type alias 17 | e: TypeAlias = 'Foo.bar' # TC008 | help: Remove quotes - -ℹ Safe fix -12 12 | -13 13 | a: TypeAlias = 'int' # TC008 -14 14 | b: TypeAlias = 'Dict' # TC008 -15 |- c: TypeAlias = 'Foo' # TC008 - 15 |+ c: TypeAlias = Foo # TC008 -16 16 | d: TypeAlias = 'Foo[str]' # TC008 -17 17 | e: TypeAlias = 'Foo.bar' # TC008 -18 18 | f: TypeAlias = 'Foo | None' # TC008 +12 | +13 | a: TypeAlias = 'int' # TC008 +14 | b: TypeAlias = 'Dict' # TC008 + - c: TypeAlias = 'Foo' # TC008 +15 + c: TypeAlias = Foo # TC008 +16 | d: TypeAlias = 'Foo[str]' # TC008 +17 | e: TypeAlias = 'Foo.bar' # TC008 +18 | f: TypeAlias = 'Foo | None' # TC008 TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:16:20 @@ -77,16 +71,14 @@ TC008 [*] Remove quotes from type alias 18 | f: TypeAlias = 'Foo | None' # TC008 | help: Remove quotes - -ℹ Safe fix -13 13 | a: TypeAlias = 'int' # TC008 -14 14 | b: TypeAlias = 'Dict' # TC008 -15 15 | c: TypeAlias = 'Foo' # TC008 -16 |- d: TypeAlias = 'Foo[str]' # TC008 - 16 |+ d: TypeAlias = Foo[str] # TC008 -17 17 | e: TypeAlias = 'Foo.bar' # TC008 -18 18 | f: TypeAlias = 'Foo | None' # TC008 -19 19 | g: TypeAlias = 'OptStr' # TC008 +13 | a: TypeAlias = 'int' # TC008 +14 | b: TypeAlias = 'Dict' # TC008 +15 | c: TypeAlias = 'Foo' # TC008 + - d: TypeAlias = 'Foo[str]' # TC008 +16 + d: TypeAlias = Foo[str] # TC008 +17 | e: TypeAlias = 'Foo.bar' # TC008 +18 | f: TypeAlias = 'Foo | None' # TC008 +19 | g: TypeAlias = 'OptStr' # TC008 TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:17:20 @@ -99,16 +91,14 @@ TC008 [*] Remove quotes from type alias 19 | g: TypeAlias = 'OptStr' # TC008 | help: Remove quotes - -ℹ Safe fix -14 14 | b: TypeAlias = 'Dict' # TC008 -15 15 | c: TypeAlias = 'Foo' # TC008 -16 16 | d: TypeAlias = 'Foo[str]' # TC008 -17 |- e: TypeAlias = 'Foo.bar' # TC008 - 17 |+ e: TypeAlias = Foo.bar # TC008 -18 18 | f: TypeAlias = 'Foo | None' # TC008 -19 19 | g: TypeAlias = 'OptStr' # TC008 -20 20 | h: TypeAlias = 'Bar' # TC008 +14 | b: TypeAlias = 'Dict' # TC008 +15 | c: TypeAlias = 'Foo' # TC008 +16 | d: TypeAlias = 'Foo[str]' # TC008 + - e: TypeAlias = 'Foo.bar' # TC008 +17 + e: TypeAlias = Foo.bar # TC008 +18 | f: TypeAlias = 'Foo | None' # TC008 +19 | g: TypeAlias = 'OptStr' # TC008 +20 | h: TypeAlias = 'Bar' # TC008 TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:18:20 @@ -121,16 +111,14 @@ TC008 [*] Remove quotes from type alias 20 | h: TypeAlias = 'Bar' # TC008 | help: Remove quotes - -ℹ Safe fix -15 15 | c: TypeAlias = 'Foo' # TC008 -16 16 | d: TypeAlias = 'Foo[str]' # TC008 -17 17 | e: TypeAlias = 'Foo.bar' # TC008 -18 |- f: TypeAlias = 'Foo | None' # TC008 - 18 |+ f: TypeAlias = Foo | None # TC008 -19 19 | g: TypeAlias = 'OptStr' # TC008 -20 20 | h: TypeAlias = 'Bar' # TC008 -21 21 | i: TypeAlias = Foo['str'] # TC008 +15 | c: TypeAlias = 'Foo' # TC008 +16 | d: TypeAlias = 'Foo[str]' # TC008 +17 | e: TypeAlias = 'Foo.bar' # TC008 + - f: TypeAlias = 'Foo | None' # TC008 +18 + f: TypeAlias = Foo | None # TC008 +19 | g: TypeAlias = 'OptStr' # TC008 +20 | h: TypeAlias = 'Bar' # TC008 +21 | i: TypeAlias = Foo['str'] # TC008 TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:19:20 @@ -143,16 +131,14 @@ TC008 [*] Remove quotes from type alias 21 | i: TypeAlias = Foo['str'] # TC008 | help: Remove quotes - -ℹ Safe fix -16 16 | d: TypeAlias = 'Foo[str]' # TC008 -17 17 | e: TypeAlias = 'Foo.bar' # TC008 -18 18 | f: TypeAlias = 'Foo | None' # TC008 -19 |- g: TypeAlias = 'OptStr' # TC008 - 19 |+ g: TypeAlias = OptStr # TC008 -20 20 | h: TypeAlias = 'Bar' # TC008 -21 21 | i: TypeAlias = Foo['str'] # TC008 -22 22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) +16 | d: TypeAlias = 'Foo[str]' # TC008 +17 | e: TypeAlias = 'Foo.bar' # TC008 +18 | f: TypeAlias = 'Foo | None' # TC008 + - g: TypeAlias = 'OptStr' # TC008 +19 + g: TypeAlias = OptStr # TC008 +20 | h: TypeAlias = 'Bar' # TC008 +21 | i: TypeAlias = Foo['str'] # TC008 +22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:20:20 @@ -165,16 +151,14 @@ TC008 [*] Remove quotes from type alias 22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) | help: Remove quotes - -ℹ Safe fix -17 17 | e: TypeAlias = 'Foo.bar' # TC008 -18 18 | f: TypeAlias = 'Foo | None' # TC008 -19 19 | g: TypeAlias = 'OptStr' # TC008 -20 |- h: TypeAlias = 'Bar' # TC008 - 20 |+ h: TypeAlias = Bar # TC008 -21 21 | i: TypeAlias = Foo['str'] # TC008 -22 22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) -23 23 | k: TypeAlias = 'k | None' # False negative in type checking block +17 | e: TypeAlias = 'Foo.bar' # TC008 +18 | f: TypeAlias = 'Foo | None' # TC008 +19 | g: TypeAlias = 'OptStr' # TC008 + - h: TypeAlias = 'Bar' # TC008 +20 + h: TypeAlias = Bar # TC008 +21 | i: TypeAlias = Foo['str'] # TC008 +22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) +23 | k: TypeAlias = 'k | None' # False negative in type checking block TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:21:24 @@ -187,16 +171,14 @@ TC008 [*] Remove quotes from type alias 23 | k: TypeAlias = 'k | None' # False negative in type checking block | help: Remove quotes - -ℹ Safe fix -18 18 | f: TypeAlias = 'Foo | None' # TC008 -19 19 | g: TypeAlias = 'OptStr' # TC008 -20 20 | h: TypeAlias = 'Bar' # TC008 -21 |- i: TypeAlias = Foo['str'] # TC008 - 21 |+ i: TypeAlias = Foo[str] # TC008 -22 22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) -23 23 | k: TypeAlias = 'k | None' # False negative in type checking block -24 24 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) +18 | f: TypeAlias = 'Foo | None' # TC008 +19 | g: TypeAlias = 'OptStr' # TC008 +20 | h: TypeAlias = 'Bar' # TC008 + - i: TypeAlias = Foo['str'] # TC008 +21 + i: TypeAlias = Foo[str] # TC008 +22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) +23 | k: TypeAlias = 'k | None' # False negative in type checking block +24 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:24:20 @@ -209,16 +191,14 @@ TC008 [*] Remove quotes from type alias 26 | | None) | help: Remove quotes - -ℹ Safe fix -21 21 | i: TypeAlias = Foo['str'] # TC008 -22 22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) -23 23 | k: TypeAlias = 'k | None' # False negative in type checking block -24 |- l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) - 24 |+ l: TypeAlias = int | None # TC008 (because TC010 is not enabled) -25 25 | m: TypeAlias = ('int' # TC008 -26 26 | | None) -27 27 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) +21 | i: TypeAlias = Foo['str'] # TC008 +22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) +23 | k: TypeAlias = 'k | None' # False negative in type checking block + - l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) +24 + l: TypeAlias = int | None # TC008 (because TC010 is not enabled) +25 | m: TypeAlias = ('int' # TC008 +26 | | None) +27 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:25:21 @@ -231,16 +211,14 @@ TC008 [*] Remove quotes from type alias 27 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) | help: Remove quotes - -ℹ Safe fix -22 22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) -23 23 | k: TypeAlias = 'k | None' # False negative in type checking block -24 24 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) -25 |- m: TypeAlias = ('int' # TC008 - 25 |+ m: TypeAlias = (int # TC008 -26 26 | | None) -27 27 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) -28 28 | ' | None') +22 | j: TypeAlias = 'Baz' # OK (this would be treated as use before define) +23 | k: TypeAlias = 'k | None' # False negative in type checking block +24 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) + - m: TypeAlias = ('int' # TC008 +25 + m: TypeAlias = (int # TC008 +26 | | None) +27 | n: TypeAlias = ('int' # TC008 (fix removes comment currently) +28 | ' | None') TC008 [*] Remove quotes from type alias --> TC008_typing_execution_context.py:27:21 @@ -253,14 +231,13 @@ TC008 [*] Remove quotes from type alias | |_________________^ | help: Remove quotes - -ℹ Unsafe fix -24 24 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) -25 25 | m: TypeAlias = ('int' # TC008 -26 26 | | None) -27 |- n: TypeAlias = ('int' # TC008 (fix removes comment currently) -28 |- ' | None') - 27 |+ n: TypeAlias = (int | None) -29 28 | -30 29 | -31 30 | class Baz: ... +24 | l: TypeAlias = 'int' | None # TC008 (because TC010 is not enabled) +25 | m: TypeAlias = ('int' # TC008 +26 | | None) + - n: TypeAlias = ('int' # TC008 (fix removes comment currently) + - ' | None') +27 + n: TypeAlias = (int | None) +28 | +29 | +30 | class Baz: ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap index cb009f96d5..cc7dcd3dc2 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-cast-value_TC006.py.snap @@ -10,16 +10,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^ | help: Add quotes - -ℹ Safe fix -1 1 | def f(): -2 2 | from typing import cast -3 3 | -4 |- cast(int, 3.0) # TC006 - 4 |+ cast("int", 3.0) # TC006 -5 5 | -6 6 | -7 7 | def f(): +1 | def f(): +2 | from typing import cast +3 | + - cast(int, 3.0) # TC006 +4 + cast("int", 3.0) # TC006 +5 | +6 | +7 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:10:10 @@ -30,16 +28,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add quotes - -ℹ Safe fix -7 7 | def f(): -8 8 | from typing import cast -9 9 | -10 |- cast(list[tuple[bool | float | int | str]], 3.0) # TC006 - 10 |+ cast("list[tuple[bool | float | int | str]]", 3.0) # TC006 -11 11 | -12 12 | -13 13 | def f(): +7 | def f(): +8 | from typing import cast +9 | + - cast(list[tuple[bool | float | int | str]], 3.0) # TC006 +10 + cast("list[tuple[bool | float | int | str]]", 3.0) # TC006 +11 | +12 | +13 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:16:10 @@ -50,16 +46,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add quotes - -ℹ Safe fix -13 13 | def f(): -14 14 | from typing import Union, cast -15 15 | -16 |- cast(list[tuple[Union[bool, float, int, str]]], 3.0) # TC006 - 16 |+ cast("list[tuple[Union[bool, float, int, str]]]", 3.0) # TC006 -17 17 | -18 18 | -19 19 | def f(): +13 | def f(): +14 | from typing import Union, cast +15 | + - cast(list[tuple[Union[bool, float, int, str]]], 3.0) # TC006 +16 + cast("list[tuple[Union[bool, float, int, str]]]", 3.0) # TC006 +17 | +18 | +19 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:40:14 @@ -70,16 +64,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^ | help: Add quotes - -ℹ Safe fix -37 37 | def f(): -38 38 | from typing import cast as typecast -39 39 | -40 |- typecast(int, 3.0) # TC006 - 40 |+ typecast("int", 3.0) # TC006 -41 41 | -42 42 | -43 43 | def f(): +37 | def f(): +38 | from typing import cast as typecast +39 | + - typecast(int, 3.0) # TC006 +40 + typecast("int", 3.0) # TC006 +41 | +42 | +43 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:46:17 @@ -90,16 +82,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^ | help: Add quotes - -ℹ Safe fix -43 43 | def f(): -44 44 | import typing -45 45 | -46 |- typing.cast(int, 3.0) # TC006 - 46 |+ typing.cast("int", 3.0) # TC006 -47 47 | -48 48 | -49 49 | def f(): +43 | def f(): +44 | import typing +45 | + - typing.cast(int, 3.0) # TC006 +46 + typing.cast("int", 3.0) # TC006 +47 | +48 | +49 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:52:12 @@ -110,16 +100,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^^^^^^^^^^^^^^^^^^^ | help: Add quotes - -ℹ Safe fix -49 49 | def f(): -50 50 | import typing as t -51 51 | -52 |- t.cast(t.Literal["3.0", '3'], 3.0) # TC006 - 52 |+ t.cast("t.Literal['3.0', '3']", 3.0) # TC006 -53 53 | -54 54 | -55 55 | def f(): +49 | def f(): +50 | import typing as t +51 | + - t.cast(t.Literal["3.0", '3'], 3.0) # TC006 +52 + t.cast("t.Literal['3.0', '3']", 3.0) # TC006 +53 | +54 | +55 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:59:9 @@ -132,17 +120,16 @@ TC006 [*] Add quotes to type expression in `typing.cast()` 62 | ) | help: Add quotes - -ℹ Unsafe fix -56 56 | from typing import cast -57 57 | -58 58 | cast( -59 |- int # TC006 (unsafe, because it will get rid of this comment) -60 |- | None, - 59 |+ "int | None", -61 60 | 3.0 -62 61 | ) -63 62 | +56 | from typing import cast +57 | +58 | cast( + - int # TC006 (unsafe, because it will get rid of this comment) + - | None, +59 + "int | None", +60 | 3.0 +61 | ) +62 | +note: This is an unsafe fix and may change runtime behavior TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:68:17 @@ -153,16 +140,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^^ | help: Add quotes - -ℹ Safe fix -65 65 | def f(): -66 66 | # Regression test for #14554 -67 67 | import typing -68 |- typing.cast(M-()) - 68 |+ typing.cast("M - ()") -69 69 | -70 70 | -71 71 | def f(): +65 | def f(): +66 | # Regression test for #14554 +67 | import typing + - typing.cast(M-()) +68 + typing.cast("M - ()") +69 | +70 | +71 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:75:10 @@ -173,16 +158,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^^^^^^^^^^ | help: Add quotes - -ℹ Safe fix -72 72 | # Simple case with Literal that should lead to nested quotes -73 73 | from typing import cast, Literal -74 74 | -75 |- cast(Literal["A"], 'A') - 75 |+ cast("Literal['A']", 'A') -76 76 | -77 77 | -78 78 | def f(): +72 | # Simple case with Literal that should lead to nested quotes +73 | from typing import cast, Literal +74 | + - cast(Literal["A"], 'A') +75 + cast("Literal['A']", 'A') +76 | +77 | +78 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:82:10 @@ -193,16 +176,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add quotes - -ℹ Safe fix -79 79 | # Really complex case with nested forward references -80 80 | from typing import cast, Annotated, Literal -81 81 | -82 |- cast(list[Annotated["list['Literal[\"A\"]']", "Foo"]], ['A']) - 82 |+ cast("list[Annotated[list[Literal['A']], 'Foo']]", ['A']) -83 83 | -84 84 | -85 85 | def f(): +79 | # Really complex case with nested forward references +80 | from typing import cast, Annotated, Literal +81 | + - cast(list[Annotated["list['Literal[\"A\"]']", "Foo"]], ['A']) +82 + cast("list[Annotated[list[Literal['A']], 'Foo']]", ['A']) +83 | +84 | +85 | def f(): TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:89:9 @@ -214,16 +195,14 @@ TC006 [*] Add quotes to type expression in `typing.cast()` 91 | ) | help: Add quotes - -ℹ Safe fix -86 86 | from typing import cast -87 87 | -88 88 | cast( -89 |- int # TC006 - 89 |+ "int" # TC006 -90 90 | , 6.0 -91 91 | ) -92 92 | +86 | from typing import cast +87 | +88 | cast( + - int # TC006 +89 + "int" # TC006 +90 | , 6.0 +91 | ) +92 | TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:98:14 @@ -235,14 +214,12 @@ TC006 [*] Add quotes to type expression in `typing.cast()` 99 | cast(val=3.0, typ=int) # TC006 | help: Add quotes - -ℹ Safe fix -95 95 | # Keyword arguments -96 96 | from typing import cast -97 97 | -98 |- cast(typ=int, val=3.0) # TC006 - 98 |+ cast(typ="int", val=3.0) # TC006 -99 99 | cast(val=3.0, typ=int) # TC006 +95 | # Keyword arguments +96 | from typing import cast +97 | + - cast(typ=int, val=3.0) # TC006 +98 + cast(typ="int", val=3.0) # TC006 +99 | cast(val=3.0, typ=int) # TC006 TC006 [*] Add quotes to type expression in `typing.cast()` --> TC006.py:99:23 @@ -252,10 +229,8 @@ TC006 [*] Add quotes to type expression in `typing.cast()` | ^^^ | help: Add quotes - -ℹ Safe fix -96 96 | from typing import cast -97 97 | -98 98 | cast(typ=int, val=3.0) # TC006 -99 |- cast(val=3.0, typ=int) # TC006 - 99 |+ cast(val=3.0, typ="int") # TC006 +96 | from typing import cast +97 | +98 | cast(typ=int, val=3.0) # TC006 + - cast(val=3.0, typ=int) # TC006 +99 + cast(val=3.0, typ="int") # TC006 diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap index 4092c2bc4a..e22e3acae2 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_1.py.snap @@ -10,12 +10,11 @@ TC004 [*] Move import `datetime.datetime` out of type-checking block. Import is 5 | x = datetime | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from datetime import datetime -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from datetime import datetime - 5 |+ pass -5 6 | x = datetime +1 | from typing import TYPE_CHECKING +2 + from datetime import datetime +3 | +4 | if TYPE_CHECKING: + - from datetime import datetime +5 + pass +6 | x = datetime +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap index 3d60b335c8..50595a325d 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_11.py.snap @@ -11,13 +11,12 @@ TC004 [*] Move import `typing.List` out of type-checking block. Import is used f 6 | __all__ = ("List",) | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from typing import List -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from typing import List - 5 |+ pass -5 6 | -6 7 | __all__ = ("List",) +1 | from typing import TYPE_CHECKING +2 + from typing import List +3 | +4 | if TYPE_CHECKING: + - from typing import List +5 + pass +6 | +7 | __all__ = ("List",) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap index 8382e0a7a2..9847125b9d 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_12.py.snap @@ -11,15 +11,14 @@ TC004 [*] Move import `collections.abc.Callable` out of type-checking block. Imp 8 | AnyCallable: TypeAlias = Callable[..., Any] | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from typing import Any, TYPE_CHECKING, TypeAlias - 4 |+from collections.abc import Callable -4 5 | -5 6 | if TYPE_CHECKING: -6 |- from collections.abc import Callable - 7 |+ pass -7 8 | -8 9 | AnyCallable: TypeAlias = Callable[..., Any] +1 | from __future__ import annotations +2 | +3 | from typing import Any, TYPE_CHECKING, TypeAlias +4 + from collections.abc import Callable +5 | +6 | if TYPE_CHECKING: + - from collections.abc import Callable +7 + pass +8 | +9 | AnyCallable: TypeAlias = Callable[..., Any] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap index 84b0738d53..15a9001324 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_17.py.snap @@ -9,16 +9,15 @@ TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is u | ^^^^^^^^^ | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from typing_extensions import TYPE_CHECKING - 4 |+from pandas import DataFrame -4 5 | -5 6 | if TYPE_CHECKING: -6 |- from pandas import DataFrame - 7 |+ pass -7 8 | -8 9 | -9 10 | def example() -> DataFrame: +1 | from __future__ import annotations +2 | +3 | from typing_extensions import TYPE_CHECKING +4 + from pandas import DataFrame +5 | +6 | if TYPE_CHECKING: + - from pandas import DataFrame +7 + pass +8 | +9 | +10 | def example() -> DataFrame: +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap index a7c102496f..4cf7269823 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_2.py.snap @@ -9,14 +9,13 @@ TC004 [*] Move import `datetime.date` out of type-checking block. Import is used | ^^^^ | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from datetime import date -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from datetime import date - 5 |+ pass -5 6 | -6 7 | -7 8 | def example(): +1 | from typing import TYPE_CHECKING +2 + from datetime import date +3 | +4 | if TYPE_CHECKING: + - from datetime import date +5 + pass +6 | +7 | +8 | def example(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap index e5971221d0..fc6eb83923 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_4.py.snap @@ -9,14 +9,13 @@ TC004 [*] Move import `typing.Any` out of type-checking block. Import is used fo | ^^^ | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING, Type - 2 |+from typing import Any -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from typing import Any - 5 |+ pass -5 6 | -6 7 | -7 8 | def example(*args: Any, **kwargs: Any): +1 | from typing import TYPE_CHECKING, Type +2 + from typing import Any +3 | +4 | if TYPE_CHECKING: + - from typing import Any +5 + pass +6 | +7 | +8 | def example(*args: Any, **kwargs: Any): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap index a9dcddd513..98817b85bd 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_5.py.snap @@ -9,17 +9,16 @@ TC004 [*] Move import `typing.List` out of type-checking block. Import is used f | ^^^^ | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from typing import List, Sequence, Set -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from typing import List, Sequence, Set - 5 |+ pass -5 6 | -6 7 | -7 8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]): +1 | from typing import TYPE_CHECKING +2 + from typing import List, Sequence, Set +3 | +4 | if TYPE_CHECKING: + - from typing import List, Sequence, Set +5 + pass +6 | +7 | +8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]): +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `typing.Sequence` out of type-checking block. Import is used for more than type hinting. --> TC004_5.py:4:30 @@ -29,17 +28,16 @@ TC004 [*] Move import `typing.Sequence` out of type-checking block. Import is us | ^^^^^^^^ | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from typing import List, Sequence, Set -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from typing import List, Sequence, Set - 5 |+ pass -5 6 | -6 7 | -7 8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]): +1 | from typing import TYPE_CHECKING +2 + from typing import List, Sequence, Set +3 | +4 | if TYPE_CHECKING: + - from typing import List, Sequence, Set +5 + pass +6 | +7 | +8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]): +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `typing.Set` out of type-checking block. Import is used for more than type hinting. --> TC004_5.py:4:40 @@ -49,14 +47,13 @@ TC004 [*] Move import `typing.Set` out of type-checking block. Import is used fo | ^^^ | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from typing import List, Sequence, Set -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from typing import List, Sequence, Set - 5 |+ pass -5 6 | -6 7 | -7 8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]): +1 | from typing import TYPE_CHECKING +2 + from typing import List, Sequence, Set +3 | +4 | if TYPE_CHECKING: + - from typing import List, Sequence, Set +5 + pass +6 | +7 | +8 | def example(a: List[int], /, b: Sequence[int], *, c: Set[int]): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap index 93d461cb89..201e5cc19a 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_TC004_9.py.snap @@ -11,17 +11,16 @@ TC004 [*] Move import `typing.Tuple` out of type-checking block. Import is used 6 | x: Tuple | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from typing import Tuple, List -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from typing import Tuple, List, Dict - 5 |+ from typing import Dict -5 6 | -6 7 | x: Tuple -7 8 | +1 | from typing import TYPE_CHECKING +2 + from typing import Tuple, List +3 | +4 | if TYPE_CHECKING: + - from typing import Tuple, List, Dict +5 + from typing import Dict +6 | +7 | x: Tuple +8 | +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `typing.List` out of type-checking block. Import is used for more than type hinting. --> TC004_9.py:4:31 @@ -33,14 +32,13 @@ TC004 [*] Move import `typing.List` out of type-checking block. Import is used f 6 | x: Tuple | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | from typing import TYPE_CHECKING - 2 |+from typing import Tuple, List -2 3 | -3 4 | if TYPE_CHECKING: -4 |- from typing import Tuple, List, Dict - 5 |+ from typing import Dict -5 6 | -6 7 | x: Tuple -7 8 | +1 | from typing import TYPE_CHECKING +2 + from typing import Tuple, List +3 | +4 | if TYPE_CHECKING: + - from typing import Tuple, List, Dict +5 + from typing import Dict +6 | +7 | x: Tuple +8 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap index 0dbc9b654e..8fd4dd118e 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_module__app.py.snap @@ -10,18 +10,17 @@ TC004 [*] Move import `datetime` out of type-checking block. Import is used for 10 | from array import array # TC004 | help: Move out of type-checking block - -ℹ Unsafe fix -4 4 | -5 5 | import fastapi -6 6 | from fastapi import FastAPI as Api - 7 |+import datetime -7 8 | -8 9 | if TYPE_CHECKING: -9 |- import datetime # TC004 -10 10 | from array import array # TC004 -11 11 | -12 12 | app = fastapi.FastAPI("First application") +4 | +5 | import fastapi +6 | from fastapi import FastAPI as Api +7 + import datetime +8 | +9 | if TYPE_CHECKING: + - import datetime # TC004 +10 | from array import array # TC004 +11 | +12 | app = fastapi.FastAPI("First application") +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting. --> app.py:10:23 @@ -34,16 +33,15 @@ TC004 [*] Move import `array.array` out of type-checking block. Import is used f 12 | app = fastapi.FastAPI("First application") | help: Move out of type-checking block - -ℹ Unsafe fix -4 4 | -5 5 | import fastapi -6 6 | from fastapi import FastAPI as Api - 7 |+from array import array -7 8 | -8 9 | if TYPE_CHECKING: -9 10 | import datetime # TC004 -10 |- from array import array # TC004 -11 11 | -12 12 | app = fastapi.FastAPI("First application") -13 13 | +4 | +5 | import fastapi +6 | from fastapi import FastAPI as Api +7 + from array import array +8 | +9 | if TYPE_CHECKING: +10 | import datetime # TC004 + - from array import array # TC004 +11 | +12 | app = fastapi.FastAPI("First application") +13 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap index 175d447961..53e45cce3a 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_quote.py.snap @@ -11,21 +11,20 @@ TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is u 59 | def func(value: DataFrame): | help: Move out of type-checking block - -ℹ Unsafe fix - 1 |+from pandas import DataFrame -1 2 | def f(): -2 3 | from pandas import DataFrame -3 4 | +1 + from pandas import DataFrame +2 | def f(): +3 | from pandas import DataFrame +4 | -------------------------------------------------------------------------------- -54 55 | from typing import TYPE_CHECKING -55 56 | -56 57 | if TYPE_CHECKING: -57 |- from pandas import DataFrame - 58 |+ pass -58 59 | -59 60 | def func(value: DataFrame): -60 61 | ... +55 | from typing import TYPE_CHECKING +56 | +57 | if TYPE_CHECKING: + - from pandas import DataFrame +58 + pass +59 | +60 | def func(value: DataFrame): +61 | ... +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is used for more than type hinting. --> quote.py:110:28 @@ -37,17 +36,16 @@ TC004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is u 112 | x: TypeAlias = DataFrame | None | help: Move out of type-checking block - -ℹ Unsafe fix - 1 |+from pandas import DataFrame -1 2 | def f(): -2 3 | from pandas import DataFrame -3 4 | +1 + from pandas import DataFrame +2 | def f(): +3 | from pandas import DataFrame +4 | -------------------------------------------------------------------------------- -107 108 | from typing import TypeAlias, TYPE_CHECKING -108 109 | -109 110 | if TYPE_CHECKING: -110 |- from pandas import DataFrame - 111 |+ pass -111 112 | -112 113 | x: TypeAlias = DataFrame | None +108 | from typing import TypeAlias, TYPE_CHECKING +109 | +110 | if TYPE_CHECKING: + - from pandas import DataFrame +111 + pass +112 | +113 | x: TypeAlias = DataFrame | None +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap index 437547481b..0755f4fc48 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_base_classes_1.py.snap @@ -10,18 +10,17 @@ TC004 [*] Move import `datetime` out of type-checking block. Import is used for 11 | from array import array # TC004 | help: Move out of type-checking block - -ℹ Unsafe fix -5 5 | -6 6 | import pydantic -7 7 | from pydantic import BaseModel - 8 |+import datetime -8 9 | -9 10 | if TYPE_CHECKING: -10 |- import datetime # TC004 -11 11 | from array import array # TC004 -12 12 | -13 13 | import pandas # TC004 +5 | +6 | import pydantic +7 | from pydantic import BaseModel +8 + import datetime +9 | +10 | if TYPE_CHECKING: + - import datetime # TC004 +11 | from array import array # TC004 +12 | +13 | import pandas # TC004 +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting. --> runtime_evaluated_base_classes_1.py:11:23 @@ -34,19 +33,18 @@ TC004 [*] Move import `array.array` out of type-checking block. Import is used f 13 | import pandas # TC004 | help: Move out of type-checking block - -ℹ Unsafe fix -5 5 | -6 6 | import pydantic -7 7 | from pydantic import BaseModel - 8 |+from array import array -8 9 | -9 10 | if TYPE_CHECKING: -10 11 | import datetime # TC004 -11 |- from array import array # TC004 -12 12 | -13 13 | import pandas # TC004 -14 14 | import pyproj +5 | +6 | import pydantic +7 | from pydantic import BaseModel +8 + from array import array +9 | +10 | if TYPE_CHECKING: +11 | import datetime # TC004 + - from array import array # TC004 +12 | +13 | import pandas # TC004 +14 | import pyproj +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `pandas` out of type-checking block. Import is used for more than type hinting. --> runtime_evaluated_base_classes_1.py:13:12 @@ -58,18 +56,17 @@ TC004 [*] Move import `pandas` out of type-checking block. Import is used for mo 14 | import pyproj | help: Move out of type-checking block - -ℹ Unsafe fix -5 5 | -6 6 | import pydantic -7 7 | from pydantic import BaseModel - 8 |+import pandas -8 9 | -9 10 | if TYPE_CHECKING: -10 11 | import datetime # TC004 -11 12 | from array import array # TC004 -12 13 | -13 |- import pandas # TC004 -14 14 | import pyproj -15 15 | -16 16 | +5 | +6 | import pydantic +7 | from pydantic import BaseModel +8 + import pandas +9 | +10 | if TYPE_CHECKING: +11 | import datetime # TC004 +12 | from array import array # TC004 +13 | + - import pandas # TC004 +14 | import pyproj +15 | +16 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap index c6d82c4794..8e3bf508ea 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_runtime_evaluated_decorators_1.py.snap @@ -10,18 +10,17 @@ TC004 [*] Move import `datetime` out of type-checking block. Import is used for 13 | from array import array # TC004 | help: Move out of type-checking block - -ℹ Unsafe fix -7 7 | from attrs import frozen -8 8 | -9 9 | import numpy - 10 |+import datetime -10 11 | -11 12 | if TYPE_CHECKING: -12 |- import datetime # TC004 -13 13 | from array import array # TC004 -14 14 | -15 15 | import pandas # TC004 +7 | from attrs import frozen +8 | +9 | import numpy +10 + import datetime +11 | +12 | if TYPE_CHECKING: + - import datetime # TC004 +13 | from array import array # TC004 +14 | +15 | import pandas # TC004 +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `array.array` out of type-checking block. Import is used for more than type hinting. --> runtime_evaluated_decorators_1.py:13:23 @@ -34,19 +33,18 @@ TC004 [*] Move import `array.array` out of type-checking block. Import is used f 15 | import pandas # TC004 | help: Move out of type-checking block - -ℹ Unsafe fix -7 7 | from attrs import frozen -8 8 | -9 9 | import numpy - 10 |+from array import array -10 11 | -11 12 | if TYPE_CHECKING: -12 13 | import datetime # TC004 -13 |- from array import array # TC004 -14 14 | -15 15 | import pandas # TC004 -16 16 | import pyproj +7 | from attrs import frozen +8 | +9 | import numpy +10 + from array import array +11 | +12 | if TYPE_CHECKING: +13 | import datetime # TC004 + - from array import array # TC004 +14 | +15 | import pandas # TC004 +16 | import pyproj +note: This is an unsafe fix and may change runtime behavior TC004 [*] Move import `pandas` out of type-checking block. Import is used for more than type hinting. --> runtime_evaluated_decorators_1.py:15:12 @@ -58,18 +56,17 @@ TC004 [*] Move import `pandas` out of type-checking block. Import is used for mo 16 | import pyproj | help: Move out of type-checking block - -ℹ Unsafe fix -7 7 | from attrs import frozen -8 8 | -9 9 | import numpy - 10 |+import pandas -10 11 | -11 12 | if TYPE_CHECKING: -12 13 | import datetime # TC004 -13 14 | from array import array # TC004 -14 15 | -15 |- import pandas # TC004 -16 16 | import pyproj -17 17 | -18 18 | +7 | from attrs import frozen +8 | +9 | import numpy +10 + import pandas +11 | +12 | if TYPE_CHECKING: +13 | import datetime # TC004 +14 | from array import array # TC004 +15 | + - import pandas # TC004 +16 | import pyproj +17 | +18 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap index 000858b290..d2d97031f8 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__runtime-import-in-type-checking-block_whitespace.py.snap @@ -11,13 +11,12 @@ TC004 [*] Move import `builtins` out of type-checking block. Import is used for 6 | builtins.print("!") | help: Move out of type-checking block - -ℹ Unsafe fix -1 1 | # Regression test for: https://github.com/astral-sh/ruff/issues/19175 -2 2 | # there is a (potentially invisible) unicode formfeed character (000C) between `TYPE_CHECKING` and the backslash -3 |-from typing import TYPE_CHECKING \ - 3 |+from typing import TYPE_CHECKING; import builtins \ -4 4 | -5 |-if TYPE_CHECKING: import builtins - 5 |+if TYPE_CHECKING: pass -6 6 | builtins.print("!") +1 | # Regression test for: https://github.com/astral-sh/ruff/issues/19175 +2 | # there is a (potentially invisible) unicode formfeed character (000C) between `TYPE_CHECKING` and the backslash + - from typing import TYPE_CHECKING \ +3 + from typing import TYPE_CHECKING; import builtins \ +4 | + - if TYPE_CHECKING: import builtins +5 + if TYPE_CHECKING: pass +6 | builtins.print("!") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap index 326a0d894f..129c0f12b4 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_init_var.py.snap @@ -11,21 +11,20 @@ TC003 [*] Move standard library import `dataclasses.FrozenInstanceError` into a 6 | from pathlib import Path | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | from __future__ import annotations -4 4 | -5 |-from dataclasses import FrozenInstanceError, InitVar, dataclass - 5 |+from dataclasses import InitVar, dataclass -6 6 | from pathlib import Path - 7 |+from typing import TYPE_CHECKING - 8 |+ - 9 |+if TYPE_CHECKING: - 10 |+ from dataclasses import FrozenInstanceError -7 11 | -8 12 | -9 13 | @dataclass +2 | +3 | from __future__ import annotations +4 | + - from dataclasses import FrozenInstanceError, InitVar, dataclass +5 + from dataclasses import InitVar, dataclass +6 | from pathlib import Path +7 + from typing import TYPE_CHECKING +8 + +9 + if TYPE_CHECKING: +10 + from dataclasses import FrozenInstanceError +11 | +12 | +13 | @dataclass +note: This is an unsafe fix and may change runtime behavior TC003 [*] Move standard library import `pathlib.Path` into a type-checking block --> init_var.py:6:21 @@ -35,16 +34,15 @@ TC003 [*] Move standard library import `pathlib.Path` into a type-checking block | ^^^^ | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | from __future__ import annotations -4 4 | -5 5 | from dataclasses import FrozenInstanceError, InitVar, dataclass -6 |-from pathlib import Path - 6 |+from typing import TYPE_CHECKING - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ from pathlib import Path -7 10 | -8 11 | -9 12 | @dataclass +3 | from __future__ import annotations +4 | +5 | from dataclasses import FrozenInstanceError, InitVar, dataclass + - from pathlib import Path +6 + from typing import TYPE_CHECKING +7 + +8 + if TYPE_CHECKING: +9 + from pathlib import Path +10 | +11 | +12 | @dataclass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap index 57c6a1adeb..04cafeba04 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-standard-library-import_kw_only.py.snap @@ -10,17 +10,16 @@ TC003 [*] Move standard library import `dataclasses.Field` into a type-checking | ^^^^^ | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | from __future__ import annotations -4 4 | -5 |-from dataclasses import KW_ONLY, dataclass, Field - 5 |+from dataclasses import KW_ONLY, dataclass - 6 |+from typing import TYPE_CHECKING - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ from dataclasses import Field -6 10 | -7 11 | -8 12 | @dataclass +2 | +3 | from __future__ import annotations +4 | + - from dataclasses import KW_ONLY, dataclass, Field +5 + from dataclasses import KW_ONLY, dataclass +6 + from typing import TYPE_CHECKING +7 + +8 + if TYPE_CHECKING: +9 + from dataclasses import Field +10 | +11 | +12 | @dataclass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap index fbbef0ec9d..f467cd7c04 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__strict_typing-only-third-party-import_strict.py.snap @@ -12,24 +12,23 @@ TC002 [*] Move third-party import `pkg.A` into a type-checking block 29 | def test(value: A): | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pkg import A -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pkg import A +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -24 28 | def f(): -25 29 | # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime. -26 30 | import pkg -27 |- from pkg import A -28 31 | -29 32 | def test(value: A): -30 33 | return pkg.B() +28 | def f(): +29 | # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime. +30 | import pkg + - from pkg import A +31 | +32 | def test(value: A): +33 | return pkg.B() +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg.A` into a type-checking block --> strict.py:35:21 @@ -42,25 +41,24 @@ TC002 [*] Move third-party import `pkg.A` into a type-checking block 37 | def test(value: A): | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pkg import A -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pkg import A +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -32 36 | -33 37 | def f(): -34 38 | # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime. -35 |- from pkg import A, B - 39 |+ from pkg import B -36 40 | -37 41 | def test(value: A): -38 42 | return B() +36 | +37 | def f(): +38 | # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime. + - from pkg import A, B +39 + from pkg import B +40 | +41 | def test(value: A): +42 | return B() +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg.bar.A` into a type-checking block --> strict.py:54:25 @@ -73,24 +71,23 @@ TC002 [*] Move third-party import `pkg.bar.A` into a type-checking block 56 | def test(value: A): | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pkg.bar import A -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pkg.bar import A +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -51 55 | def f(): -52 56 | # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime -53 57 | import pkg -54 |- from pkg.bar import A -55 58 | -56 59 | def test(value: A): -57 60 | return pkg.B() +55 | def f(): +56 | # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime +57 | import pkg + - from pkg.bar import A +58 | +59 | def test(value: A): +60 | return pkg.B() +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg` into a type-checking block --> strict.py:62:12 @@ -102,24 +99,23 @@ TC002 [*] Move third-party import `pkg` into a type-checking block 63 | import pkg.bar as B | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pkg -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pkg +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -59 63 | -60 64 | def f(): -61 65 | # In un-strict mode, this shouldn't raise an error, since `pkg.bar` is used at runtime. -62 |- import pkg -63 66 | import pkg.bar as B -64 67 | -65 68 | def test(value: pkg.A): +63 | +64 | def f(): +65 | # In un-strict mode, this shouldn't raise an error, since `pkg.bar` is used at runtime. + - import pkg +66 | import pkg.bar as B +67 | +68 | def test(value: pkg.A): +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg.foo` into a type-checking block --> strict.py:71:23 @@ -131,24 +127,23 @@ TC002 [*] Move third-party import `pkg.foo` into a type-checking block 72 | import pkg.foo.bar as B | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pkg.foo as F -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pkg.foo as F +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -68 72 | -69 73 | def f(): -70 74 | # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime. -71 |- import pkg.foo as F -72 75 | import pkg.foo.bar as B -73 76 | -74 77 | def test(value: F.Foo): +72 | +73 | def f(): +74 | # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime. + - import pkg.foo as F +75 | import pkg.foo.bar as B +76 | +77 | def test(value: F.Foo): +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg` into a type-checking block --> strict.py:80:12 @@ -160,24 +155,23 @@ TC002 [*] Move third-party import `pkg` into a type-checking block 81 | import pkg.foo.bar as B | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pkg -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pkg +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -77 81 | -78 82 | def f(): -79 83 | # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime. -80 |- import pkg -81 84 | import pkg.foo.bar as B -82 85 | -83 86 | def test(value: pkg.A): +81 | +82 | def f(): +83 | # In un-strict mode, this shouldn't raise an error, since `pkg.foo.bar` is used at runtime. + - import pkg +84 | import pkg.foo.bar as B +85 | +86 | def test(value: pkg.A): +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg` into a type-checking block --> strict.py:91:12 @@ -189,24 +183,23 @@ TC002 [*] Move third-party import `pkg` into a type-checking block 92 | import pkgfoo.bar as B | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pkg -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pkg +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -88 92 | # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime. -89 93 | # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is -90 94 | # testing the implementation. -91 |- import pkg -92 95 | import pkgfoo.bar as B -93 96 | -94 97 | def test(value: pkg.A): +92 | # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime. +93 | # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is +94 | # testing the implementation. + - import pkg +95 | import pkgfoo.bar as B +96 | +97 | def test(value: pkg.A): +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg.foo` into a type-checking block --> strict.py:101:23 @@ -219,21 +212,20 @@ TC002 [*] Move third-party import `pkg.foo` into a type-checking block 103 | def test(value: F.Foo): | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pkg.foo as F -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pkg.foo as F +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -98 102 | def f(): -99 103 | # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime. -100 104 | import pkg.bar as B -101 |- import pkg.foo as F -102 105 | -103 106 | def test(value: F.Foo): -104 107 | return B.Bar() +102 | def f(): +103 | # In un-strict mode, this shouldn't raise an error, since `pkg` is used at runtime. +104 | import pkg.bar as B + - import pkg.foo as F +105 | +106 | def test(value: F.Foo): +107 | return B.Bar() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap index 066155d1b9..1c862f6b5d 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc004_precedence_over_tc007.snap @@ -12,14 +12,13 @@ TC004 [*] Move import `foo.Foo` out of type-checking block. Import is used for m 8 | a: TypeAlias = Foo | None # OK | help: Move out of type-checking block - -ℹ Unsafe fix -2 2 | from __future__ import annotations -3 3 | -4 4 | from typing import TYPE_CHECKING, TypeAlias - 5 |+from foo import Foo -5 6 | if TYPE_CHECKING: -6 |- from foo import Foo # TC004 - 7 |+ pass # TC004 -7 8 | -8 9 | a: TypeAlias = Foo | None # OK +2 | from __future__ import annotations +3 | +4 | from typing import TYPE_CHECKING, TypeAlias +5 + from foo import Foo +6 | if TYPE_CHECKING: + - from foo import Foo # TC004 +7 + pass # TC004 +8 | +9 | a: TypeAlias = Foo | None # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap index 7cba591164..3f6b1785b7 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__tc010_precedence_over_tc008.snap @@ -11,14 +11,12 @@ TC008 [*] Remove quotes from type alias 7 | b: TypeAlias = 'int' | None # TC010 | help: Remove quotes - -ℹ Safe fix -3 3 | -4 4 | from typing import TypeAlias -5 5 | -6 |-a: TypeAlias = 'int | None' # TC008 - 6 |+a: TypeAlias = int | None # TC008 -7 7 | b: TypeAlias = 'int' | None # TC010 +3 | +4 | from typing import TypeAlias +5 | + - a: TypeAlias = 'int | None' # TC008 +6 + a: TypeAlias = int | None # TC008 +7 | b: TypeAlias = 'int' | None # TC010 TC010 Invalid string member in `X | Y`-style union type --> :7:16 diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap index d49fc5ac43..afcf894e1c 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_after_usage.snap @@ -12,16 +12,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 8 | def f(x: pd.DataFrame): | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import pandas as pd -7 6 | - 7 |+if TYPE_CHECKING: - 8 |+ import pandas as pd - 9 |+ -8 10 | def f(x: pd.DataFrame): -9 11 | pass -10 12 | +3 | +4 | from typing import TYPE_CHECKING +5 | + - import pandas as pd +6 | +7 + if TYPE_CHECKING: +8 + import pandas as pd +9 + +10 | def f(x: pd.DataFrame): +11 | pass +12 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap index 622926c8f9..dd29d90b22 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_comment.snap @@ -12,16 +12,15 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 8 | if TYPE_CHECKING: | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import pandas as pd -7 6 | -8 7 | if TYPE_CHECKING: -9 8 | # This is a comment. - 9 |+ import pandas as pd -10 10 | import os -11 11 | -12 12 | def f(x: pd.DataFrame): +3 | +4 | from typing import TYPE_CHECKING +5 | + - import pandas as pd +6 | +7 | if TYPE_CHECKING: +8 | # This is a comment. +9 + import pandas as pd +10 | import os +11 | +12 | def f(x: pd.DataFrame): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap index 3154d35ecd..785f6e1ea8 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_inline.snap @@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 8 | if TYPE_CHECKING: import os | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import pandas as pd -7 6 | -8 |-if TYPE_CHECKING: import os - 7 |+if TYPE_CHECKING: import pandas as pd; import os -9 8 | -10 9 | def f(x: pd.DataFrame): -11 10 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - import pandas as pd +6 | + - if TYPE_CHECKING: import os +7 + if TYPE_CHECKING: import pandas as pd; import os +8 | +9 | def f(x: pd.DataFrame): +10 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap index b2018bd971..9e8a9f7a0a 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__type_checking_block_own_line.snap @@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 8 | if TYPE_CHECKING: | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import pandas as pd -7 6 | -8 7 | if TYPE_CHECKING: - 8 |+ import pandas as pd -9 9 | import os -10 10 | -11 11 | def f(x: pd.DataFrame): +3 | +4 | from typing import TYPE_CHECKING +5 | + - import pandas as pd +6 | +7 | if TYPE_CHECKING: +8 + import pandas as pd +9 | import os +10 | +11 | def f(x: pd.DataFrame): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap index f9b554bbbc..bfe8aee71b 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-first-party-import_TC001.py.snap @@ -11,23 +11,22 @@ TC001 [*] Move application import `.TYP001` into a type-checking block 22 | x: TYP001 | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | For typing-only import detection tests, see `TC002.py`. -4 4 | """ - 5 |+from typing import TYPE_CHECKING - 6 |+ - 7 |+if TYPE_CHECKING: - 8 |+ from . import TYP001 -5 9 | -6 10 | -7 11 | def f(): +2 | +3 | For typing-only import detection tests, see `TC002.py`. +4 | """ +5 + from typing import TYPE_CHECKING +6 + +7 + if TYPE_CHECKING: +8 + from . import TYP001 +9 | +10 | +11 | def f(): -------------------------------------------------------------------------------- -17 21 | -18 22 | -19 23 | def f(): -20 |- from . import TYP001 -21 24 | -22 25 | x: TYP001 -23 26 | +21 | +22 | +23 | def f(): + - from . import TYP001 +24 | +25 | x: TYP001 +26 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap index 90bd90e695..c2f1077e90 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_TC003.py.snap @@ -11,19 +11,18 @@ TC003 [*] Move standard library import `os` into a type-checking block 10 | x: os | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | For typing-only import detection tests, see `TC002.py`. -4 4 | """ - 5 |+from typing import TYPE_CHECKING - 6 |+ - 7 |+if TYPE_CHECKING: - 8 |+ import os -5 9 | -6 10 | -7 11 | def f(): -8 |- import os -9 12 | -10 13 | x: os -11 14 | +2 | +3 | For typing-only import detection tests, see `TC002.py`. +4 | """ +5 + from typing import TYPE_CHECKING +6 + +7 + if TYPE_CHECKING: +8 + import os +9 | +10 | +11 | def f(): + - import os +12 | +13 | x: os +14 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap index 9d978decd1..cee4aeb09d 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_1.py.snap @@ -12,15 +12,14 @@ TC003 [*] Move standard library import `typing.Final` into a type-checking block 7 | Const: Final[dict] = {} | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | from __future__ import annotations -4 4 | -5 |-from typing import Final - 5 |+from typing import TYPE_CHECKING - 6 |+ - 7 |+if TYPE_CHECKING: - 8 |+ from typing import Final -6 9 | -7 10 | Const: Final[dict] = {} +2 | +3 | from __future__ import annotations +4 | + - from typing import Final +5 + from typing import TYPE_CHECKING +6 + +7 + if TYPE_CHECKING: +8 + from typing import Final +9 | +10 | Const: Final[dict] = {} +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap index 1c40a7ad20..de632b8e7e 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_2.py.snap @@ -12,15 +12,14 @@ TC003 [*] Move standard library import `typing.Final` into a type-checking block 7 | Const: Final[dict] = {} | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | from __future__ import annotations -4 4 | -5 |-from typing import Final, TYPE_CHECKING - 5 |+from typing import TYPE_CHECKING - 6 |+ - 7 |+if TYPE_CHECKING: - 8 |+ from typing import Final -6 9 | -7 10 | Const: Final[dict] = {} +2 | +3 | from __future__ import annotations +4 | + - from typing import Final, TYPE_CHECKING +5 + from typing import TYPE_CHECKING +6 + +7 + if TYPE_CHECKING: +8 + from typing import Final +9 | +10 | Const: Final[dict] = {} +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap index 1e257387db..56506e24f4 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_exempt_type_checking_3.py.snap @@ -12,16 +12,15 @@ TC003 [*] Move standard library import `typing.Final` into a type-checking block 7 | Const: Final[dict] = {} | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | from __future__ import annotations -4 4 | -5 |-from typing import Final, Mapping - 5 |+from typing import Mapping - 6 |+from typing import TYPE_CHECKING - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ from typing import Final -6 10 | -7 11 | Const: Final[dict] = {} +2 | +3 | from __future__ import annotations +4 | + - from typing import Final, Mapping +5 + from typing import Mapping +6 + from typing import TYPE_CHECKING +7 + +8 + if TYPE_CHECKING: +9 + from typing import Final +10 | +11 | Const: Final[dict] = {} +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap index c7ca4bfe79..9d826051d9 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_init_var.py.snap @@ -9,16 +9,15 @@ TC003 [*] Move standard library import `pathlib.Path` into a type-checking block | ^^^^ | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | from __future__ import annotations -4 4 | -5 5 | from dataclasses import FrozenInstanceError, InitVar, dataclass -6 |-from pathlib import Path - 6 |+from typing import TYPE_CHECKING - 7 |+ - 8 |+if TYPE_CHECKING: - 9 |+ from pathlib import Path -7 10 | -8 11 | -9 12 | @dataclass +3 | from __future__ import annotations +4 | +5 | from dataclasses import FrozenInstanceError, InitVar, dataclass + - from pathlib import Path +6 + from typing import TYPE_CHECKING +7 + +8 + if TYPE_CHECKING: +9 + from pathlib import Path +10 | +11 | +12 | @dataclass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap index 49c2af1dca..6db7c62e9d 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_module__undefined.py.snap @@ -10,15 +10,14 @@ TC003 [*] Move standard library import `collections.abc.Sequence` into a type-ch | ^^^^^^^^ | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-from collections.abc import Sequence - 3 |+from typing import TYPE_CHECKING - 4 |+ - 5 |+if TYPE_CHECKING: - 6 |+ from collections.abc import Sequence -4 7 | -5 8 | -6 9 | class Foo(MyBaseClass): +1 | from __future__ import annotations +2 | + - from collections.abc import Sequence +3 + from typing import TYPE_CHECKING +4 + +5 + if TYPE_CHECKING: +6 + from collections.abc import Sequence +7 | +8 | +9 | class Foo(MyBaseClass): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap index afc6053cd8..6b9323ac78 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_base_classes_3.py.snap @@ -12,19 +12,18 @@ TC003 [*] Move standard library import `uuid.UUID` into a type-checking block 7 | import pydantic | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | import datetime -4 4 | import pathlib -5 |-from uuid import UUID # TC003 -6 5 | -7 6 | import pydantic -8 7 | from pydantic import BaseModel - 8 |+from typing import TYPE_CHECKING - 9 |+ - 10 |+if TYPE_CHECKING: - 11 |+ from uuid import UUID -9 12 | -10 13 | -11 14 | class A(pydantic.BaseModel): +2 | +3 | import datetime +4 | import pathlib + - from uuid import UUID # TC003 +5 | +6 | import pydantic +7 | from pydantic import BaseModel +8 + from typing import TYPE_CHECKING +9 + +10 + if TYPE_CHECKING: +11 + from uuid import UUID +12 | +13 | +14 | class A(pydantic.BaseModel): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap index 35712dc794..7b7d2036c7 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_runtime_evaluated_decorators_3.py.snap @@ -12,21 +12,20 @@ TC003 [*] Move standard library import `uuid.UUID` into a type-checking block 8 | from pydantic import validate_call | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | import datetime -4 4 | from array import array -5 5 | from dataclasses import dataclass -6 |-from uuid import UUID # TC003 -7 6 | from collections.abc import Sequence -8 7 | from pydantic import validate_call -9 8 | -10 9 | import attrs -11 10 | from attrs import frozen - 11 |+from typing import TYPE_CHECKING - 12 |+ - 13 |+if TYPE_CHECKING: - 14 |+ from uuid import UUID -12 15 | -13 16 | -14 17 | @attrs.define(auto_attribs=True) +3 | import datetime +4 | from array import array +5 | from dataclasses import dataclass + - from uuid import UUID # TC003 +6 | from collections.abc import Sequence +7 | from pydantic import validate_call +8 | +9 | import attrs +10 | from attrs import frozen +11 + from typing import TYPE_CHECKING +12 + +13 + if TYPE_CHECKING: +14 + from uuid import UUID +15 | +16 | +17 | @attrs.define(auto_attribs=True) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap index 919be0bfcc..9a6552ac53 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-standard-library-import_singledispatchmethod.py.snap @@ -11,18 +11,17 @@ TC003 [*] Move standard library import `pathlib.Path` into a type-checking block 6 | from typing import Union | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from collections.abc import MutableMapping, Mapping -4 |-from pathlib import Path -5 4 | from functools import singledispatchmethod -6 |-from typing import Union - 5 |+from typing import Union, TYPE_CHECKING - 6 |+ - 7 |+if TYPE_CHECKING: - 8 |+ from pathlib import Path -7 9 | -8 10 | -9 11 | class Foo: +1 | from __future__ import annotations +2 | +3 | from collections.abc import MutableMapping, Mapping + - from pathlib import Path +4 | from functools import singledispatchmethod + - from typing import Union +5 + from typing import Union, TYPE_CHECKING +6 + +7 + if TYPE_CHECKING: +8 + from pathlib import Path +9 | +10 | +11 | class Foo: +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap index f060bd6715..2d3f306807 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_TC002.py.snap @@ -11,20 +11,19 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 7 | x: pd.DataFrame | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): -5 |- import pandas as pd # TC002 -6 9 | -7 10 | x: pd.DataFrame -8 11 | +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): + - import pandas as pd # TC002 +9 | +10 | x: pd.DataFrame +11 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:11:24 @@ -36,24 +35,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 13 | x: DataFrame | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -8 12 | -9 13 | -10 14 | def f(): -11 |- from pandas import DataFrame # TC002 -12 15 | -13 16 | x: DataFrame -14 17 | +12 | +13 | +14 | def f(): + - from pandas import DataFrame # TC002 +15 | +16 | x: DataFrame +17 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:17:37 @@ -65,24 +63,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 19 | x: df | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame as df -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame as df +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -14 18 | -15 19 | -16 20 | def f(): -17 |- from pandas import DataFrame as df # TC002 -18 21 | -19 22 | x: df -20 23 | +18 | +19 | +20 | def f(): + - from pandas import DataFrame as df # TC002 +21 | +22 | x: df +23 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> TC002.py:23:22 @@ -94,24 +91,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 25 | x: pd.DataFrame = 1 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -20 24 | -21 25 | -22 26 | def f(): -23 |- import pandas as pd # TC002 -24 27 | -25 28 | x: pd.DataFrame = 1 -26 29 | +24 | +25 | +26 | def f(): + - import pandas as pd # TC002 +27 | +28 | x: pd.DataFrame = 1 +29 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:29:24 @@ -123,24 +119,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 31 | x: DataFrame = 2 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -26 30 | -27 31 | -28 32 | def f(): -29 |- from pandas import DataFrame # TC002 -30 33 | -31 34 | x: DataFrame = 2 -32 35 | +30 | +31 | +32 | def f(): + - from pandas import DataFrame # TC002 +33 | +34 | x: DataFrame = 2 +35 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block --> TC002.py:35:37 @@ -152,24 +147,23 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 37 | x: df = 3 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pandas import DataFrame as df -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pandas import DataFrame as df +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -32 36 | -33 37 | -34 38 | def f(): -35 |- from pandas import DataFrame as df # TC002 -36 39 | -37 40 | x: df = 3 -38 41 | +36 | +37 | +38 | def f(): + - from pandas import DataFrame as df # TC002 +39 | +40 | x: df = 3 +41 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> TC002.py:41:22 @@ -181,24 +175,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 43 | x: "pd.DataFrame" = 1 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -38 42 | -39 43 | -40 44 | def f(): -41 |- import pandas as pd # TC002 -42 45 | -43 46 | x: "pd.DataFrame" = 1 -44 47 | +42 | +43 | +44 | def f(): + - import pandas as pd # TC002 +45 | +46 | x: "pd.DataFrame" = 1 +47 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pandas` into a type-checking block --> TC002.py:47:22 @@ -210,24 +203,23 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 49 | x = dict["pd.DataFrame", "pd.DataFrame"] | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pandas as pd -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pandas as pd +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -44 48 | -45 49 | -46 50 | def f(): -47 |- import pandas as pd # TC002 -48 51 | -49 52 | x = dict["pd.DataFrame", "pd.DataFrame"] -50 53 | +48 | +49 | +50 | def f(): + - import pandas as pd # TC002 +51 | +52 | x = dict["pd.DataFrame", "pd.DataFrame"] +53 | +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `module.Member` into a type-checking block --> TC002.py:172:24 @@ -240,21 +232,20 @@ TC002 [*] Move third-party import `module.Member` into a type-checking block 174 | x: Member = 1 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | """Tests to determine accurate detection of typing-only imports.""" - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from module import Member -2 6 | -3 7 | -4 8 | def f(): +1 | """Tests to determine accurate detection of typing-only imports.""" +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from module import Member +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -169 173 | def f(): -170 174 | global Member -171 175 | -172 |- from module import Member -173 176 | -174 177 | x: Member = 1 -175 178 | +173 | def f(): +174 | global Member +175 | + - from module import Member +176 | +177 | x: Member = 1 +178 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap index 77938f9a02..886a190214 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_base_classes_2.py.snap @@ -12,23 +12,22 @@ TC002 [*] Move third-party import `geopandas` into a type-checking block 5 | import pyproj # TC002 | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 |-import geopandas as gpd # TC002 -4 3 | import pydantic -5 4 | import pyproj # TC002 -6 5 | from pydantic import BaseModel -7 6 | -8 7 | import numpy - 8 |+from typing import TYPE_CHECKING - 9 |+ - 10 |+if TYPE_CHECKING: - 11 |+ import geopandas as gpd -9 12 | -10 13 | -11 14 | class A(BaseModel): +1 | from __future__ import annotations +2 | + - import geopandas as gpd # TC002 +3 | import pydantic +4 | import pyproj # TC002 +5 | from pydantic import BaseModel +6 | +7 | import numpy +8 + from typing import TYPE_CHECKING +9 + +10 + if TYPE_CHECKING: +11 + import geopandas as gpd +12 | +13 | +14 | class A(BaseModel): +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pyproj` into a type-checking block --> runtime_evaluated_base_classes_2.py:5:8 @@ -40,19 +39,18 @@ TC002 [*] Move third-party import `pyproj` into a type-checking block 6 | from pydantic import BaseModel | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | import geopandas as gpd # TC002 -4 4 | import pydantic -5 |-import pyproj # TC002 -6 5 | from pydantic import BaseModel -7 6 | -8 7 | import numpy - 8 |+from typing import TYPE_CHECKING - 9 |+ - 10 |+if TYPE_CHECKING: - 11 |+ import pyproj -9 12 | -10 13 | -11 14 | class A(BaseModel): +2 | +3 | import geopandas as gpd # TC002 +4 | import pydantic + - import pyproj # TC002 +5 | from pydantic import BaseModel +6 | +7 | import numpy +8 + from typing import TYPE_CHECKING +9 + +10 + if TYPE_CHECKING: +11 + import pyproj +12 | +13 | +14 | class A(BaseModel): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap index e4245adea6..f8024fa370 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_runtime_evaluated_decorators_2.py.snap @@ -10,16 +10,15 @@ TC002 [*] Move third-party import `numpy` into a type-checking block | ^^^^^ | help: Move into type-checking block - -ℹ Unsafe fix -7 7 | import pyproj -8 8 | from attrs import frozen -9 9 | -10 |-import numpy # TC002 - 10 |+from typing import TYPE_CHECKING - 11 |+ - 12 |+if TYPE_CHECKING: - 13 |+ import numpy -11 14 | -12 15 | -13 16 | @attrs.define(auto_attribs=True) +7 | import pyproj +8 | from attrs import frozen +9 | + - import numpy # TC002 +10 + from typing import TYPE_CHECKING +11 + +12 + if TYPE_CHECKING: +13 + import numpy +14 | +15 | +16 | @attrs.define(auto_attribs=True) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap index f6d4f2f11c..0609e15da2 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_singledispatch.py.snap @@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 14 | if TYPE_CHECKING: | help: Move into type-checking block - -ℹ Unsafe fix -9 9 | from numpy import asarray -10 10 | from numpy.typing import ArrayLike -11 11 | from scipy.sparse import spmatrix -12 |-from pandas import DataFrame -13 12 | -14 13 | if TYPE_CHECKING: - 14 |+ from pandas import DataFrame -15 15 | from numpy import ndarray -16 16 | -17 17 | +9 | from numpy import asarray +10 | from numpy.typing import ArrayLike +11 | from scipy.sparse import spmatrix + - from pandas import DataFrame +12 | +13 | if TYPE_CHECKING: +14 + from pandas import DataFrame +15 | from numpy import ndarray +16 | +17 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap index fef1a107a0..1dae69a4a2 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_strict.py.snap @@ -12,24 +12,23 @@ TC002 [*] Move third-party import `pkg.bar.A` into a type-checking block 56 | def test(value: A): | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ from pkg.bar import A -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + from pkg.bar import A +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -51 55 | def f(): -52 56 | # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime -53 57 | import pkg -54 |- from pkg.bar import A -55 58 | -56 59 | def test(value: A): -57 60 | return pkg.B() +55 | def f(): +56 | # In un-strict mode, this _should_ raise an error, since `pkg.bar` isn't used at runtime +57 | import pkg + - from pkg.bar import A +58 | +59 | def test(value: A): +60 | return pkg.B() +note: This is an unsafe fix and may change runtime behavior TC002 [*] Move third-party import `pkg` into a type-checking block --> strict.py:91:12 @@ -41,21 +40,20 @@ TC002 [*] Move third-party import `pkg` into a type-checking block 92 | import pkgfoo.bar as B | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations - 2 |+from typing import TYPE_CHECKING - 3 |+ - 4 |+if TYPE_CHECKING: - 5 |+ import pkg -2 6 | -3 7 | -4 8 | def f(): +1 | from __future__ import annotations +2 + from typing import TYPE_CHECKING +3 + +4 + if TYPE_CHECKING: +5 + import pkg +6 | +7 | +8 | def f(): -------------------------------------------------------------------------------- -88 92 | # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime. -89 93 | # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is -90 94 | # testing the implementation. -91 |- import pkg -92 95 | import pkgfoo.bar as B -93 96 | -94 97 | def test(value: pkg.A): +92 | # In un-strict mode, this _should_ raise an error, since `pkg` isn't used at runtime. +93 | # Note that `pkg` is a prefix of `pkgfoo` which are both different modules. This is +94 | # testing the implementation. + - import pkg +95 | import pkgfoo.bar as B +96 | +97 | def test(value: pkg.A): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap index 3e38e94b6d..5dca1ca18c 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_1.py.snap @@ -11,18 +11,17 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 9 | df: DataFrame | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | from __future__ import annotations -2 2 | -3 3 | from typing_extensions import Self - 4 |+from typing import TYPE_CHECKING - 5 |+ - 6 |+if TYPE_CHECKING: - 7 |+ from pandas import DataFrame -4 8 | -5 9 | -6 10 | def func(): -7 |- from pandas import DataFrame -8 11 | -9 12 | df: DataFrame +1 | from __future__ import annotations +2 | +3 | from typing_extensions import Self +4 + from typing import TYPE_CHECKING +5 + +6 + if TYPE_CHECKING: +7 + from pandas import DataFrame +8 | +9 | +10 | def func(): + - from pandas import DataFrame +11 | +12 | df: DataFrame +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap index d0f633a1f0..d58a404b0d 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing-only-third-party-import_typing_modules_2.py.snap @@ -11,16 +11,15 @@ TC002 [*] Move third-party import `pandas.DataFrame` into a type-checking block 9 | df: DataFrame | help: Move into type-checking block - -ℹ Unsafe fix -2 2 | -3 3 | import typing_extensions -4 4 | - 5 |+if typing_extensions.TYPE_CHECKING: - 6 |+ from pandas import DataFrame - 7 |+ -5 8 | -6 9 | def func(): -7 |- from pandas import DataFrame -8 10 | -9 11 | df: DataFrame +2 | +3 | import typing_extensions +4 | +5 + if typing_extensions.TYPE_CHECKING: +6 + from pandas import DataFrame +7 + +8 | +9 | def func(): + - from pandas import DataFrame +10 | +11 | df: DataFrame +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap index 36ac27e90e..5d66325269 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_after_package_import.snap @@ -12,17 +12,16 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 6 | from typing import TYPE_CHECKING | help: Move into type-checking block - -ℹ Unsafe fix -1 1 | -2 2 | from __future__ import annotations -3 3 | -4 |-import pandas as pd -5 4 | -6 5 | from typing import TYPE_CHECKING -7 6 | - 7 |+if TYPE_CHECKING: - 8 |+ import pandas as pd - 9 |+ -8 10 | def f(x: pd.DataFrame): -9 11 | pass +1 | +2 | from __future__ import annotations +3 | + - import pandas as pd +4 | +5 | from typing import TYPE_CHECKING +6 | +7 + if TYPE_CHECKING: +8 + import pandas as pd +9 + +10 | def f(x: pd.DataFrame): +11 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap index b06fe0450d..0c3209ab43 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__typing_import_before_package_import.snap @@ -12,15 +12,14 @@ TC002 [*] Move third-party import `pandas` into a type-checking block 8 | def f(x: pd.DataFrame): | help: Move into type-checking block - -ℹ Unsafe fix -3 3 | -4 4 | from typing import TYPE_CHECKING -5 5 | -6 |-import pandas as pd -7 6 | - 7 |+if TYPE_CHECKING: - 8 |+ import pandas as pd - 9 |+ -8 10 | def f(x: pd.DataFrame): -9 11 | pass +3 | +4 | from typing import TYPE_CHECKING +5 | + - import pandas as pd +6 | +7 + if TYPE_CHECKING: +8 + import pandas as pd +9 + +10 | def f(x: pd.DataFrame): +11 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap index b06e7c139c..549f8826a7 100644 --- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap +++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linter__rules__flake8_type_checking__tests__unquoted-type-alias_TC007.py.snap @@ -12,16 +12,15 @@ TC007 [*] Add quotes to type alias 17 | e: TypeAlias = OptStr # TC007 | help: Add quotes - -ℹ Unsafe fix -12 12 | -13 13 | a: TypeAlias = int # OK -14 14 | b: TypeAlias = Dict # OK -15 |-c: TypeAlias = Foo # TC007 - 15 |+c: TypeAlias = "Foo" # TC007 -16 16 | d: TypeAlias = Foo | None # TC007 -17 17 | e: TypeAlias = OptStr # TC007 -18 18 | f: TypeAlias = Bar # TC007 +12 | +13 | a: TypeAlias = int # OK +14 | b: TypeAlias = Dict # OK + - c: TypeAlias = Foo # TC007 +15 + c: TypeAlias = "Foo" # TC007 +16 | d: TypeAlias = Foo | None # TC007 +17 | e: TypeAlias = OptStr # TC007 +18 | f: TypeAlias = Bar # TC007 +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:16:16 @@ -34,16 +33,15 @@ TC007 [*] Add quotes to type alias 18 | f: TypeAlias = Bar # TC007 | help: Add quotes - -ℹ Unsafe fix -13 13 | a: TypeAlias = int # OK -14 14 | b: TypeAlias = Dict # OK -15 15 | c: TypeAlias = Foo # TC007 -16 |-d: TypeAlias = Foo | None # TC007 - 16 |+d: TypeAlias = "Foo | None" # TC007 -17 17 | e: TypeAlias = OptStr # TC007 -18 18 | f: TypeAlias = Bar # TC007 -19 19 | g: TypeAlias = Foo | Bar # TC007 x2 +13 | a: TypeAlias = int # OK +14 | b: TypeAlias = Dict # OK +15 | c: TypeAlias = Foo # TC007 + - d: TypeAlias = Foo | None # TC007 +16 + d: TypeAlias = "Foo | None" # TC007 +17 | e: TypeAlias = OptStr # TC007 +18 | f: TypeAlias = Bar # TC007 +19 | g: TypeAlias = Foo | Bar # TC007 x2 +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:17:16 @@ -56,16 +54,15 @@ TC007 [*] Add quotes to type alias 19 | g: TypeAlias = Foo | Bar # TC007 x2 | help: Add quotes - -ℹ Unsafe fix -14 14 | b: TypeAlias = Dict # OK -15 15 | c: TypeAlias = Foo # TC007 -16 16 | d: TypeAlias = Foo | None # TC007 -17 |-e: TypeAlias = OptStr # TC007 - 17 |+e: TypeAlias = "OptStr" # TC007 -18 18 | f: TypeAlias = Bar # TC007 -19 19 | g: TypeAlias = Foo | Bar # TC007 x2 -20 20 | h: TypeAlias = Foo[str] # TC007 +14 | b: TypeAlias = Dict # OK +15 | c: TypeAlias = Foo # TC007 +16 | d: TypeAlias = Foo | None # TC007 + - e: TypeAlias = OptStr # TC007 +17 + e: TypeAlias = "OptStr" # TC007 +18 | f: TypeAlias = Bar # TC007 +19 | g: TypeAlias = Foo | Bar # TC007 x2 +20 | h: TypeAlias = Foo[str] # TC007 +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:18:16 @@ -78,16 +75,15 @@ TC007 [*] Add quotes to type alias 20 | h: TypeAlias = Foo[str] # TC007 | help: Add quotes - -ℹ Unsafe fix -15 15 | c: TypeAlias = Foo # TC007 -16 16 | d: TypeAlias = Foo | None # TC007 -17 17 | e: TypeAlias = OptStr # TC007 -18 |-f: TypeAlias = Bar # TC007 - 18 |+f: TypeAlias = "Bar" # TC007 -19 19 | g: TypeAlias = Foo | Bar # TC007 x2 -20 20 | h: TypeAlias = Foo[str] # TC007 -21 21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) +15 | c: TypeAlias = Foo # TC007 +16 | d: TypeAlias = Foo | None # TC007 +17 | e: TypeAlias = OptStr # TC007 + - f: TypeAlias = Bar # TC007 +18 + f: TypeAlias = "Bar" # TC007 +19 | g: TypeAlias = Foo | Bar # TC007 x2 +20 | h: TypeAlias = Foo[str] # TC007 +21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:19:16 @@ -100,16 +96,15 @@ TC007 [*] Add quotes to type alias 21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) | help: Add quotes - -ℹ Unsafe fix -16 16 | d: TypeAlias = Foo | None # TC007 -17 17 | e: TypeAlias = OptStr # TC007 -18 18 | f: TypeAlias = Bar # TC007 -19 |-g: TypeAlias = Foo | Bar # TC007 x2 - 19 |+g: TypeAlias = "Foo | Bar" # TC007 x2 -20 20 | h: TypeAlias = Foo[str] # TC007 -21 21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) -22 22 | Bar) +16 | d: TypeAlias = Foo | None # TC007 +17 | e: TypeAlias = OptStr # TC007 +18 | f: TypeAlias = Bar # TC007 + - g: TypeAlias = Foo | Bar # TC007 x2 +19 + g: TypeAlias = "Foo | Bar" # TC007 x2 +20 | h: TypeAlias = Foo[str] # TC007 +21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) +22 | Bar) +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:19:22 @@ -122,16 +117,15 @@ TC007 [*] Add quotes to type alias 21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) | help: Add quotes - -ℹ Unsafe fix -16 16 | d: TypeAlias = Foo | None # TC007 -17 17 | e: TypeAlias = OptStr # TC007 -18 18 | f: TypeAlias = Bar # TC007 -19 |-g: TypeAlias = Foo | Bar # TC007 x2 - 19 |+g: TypeAlias = "Foo | Bar" # TC007 x2 -20 20 | h: TypeAlias = Foo[str] # TC007 -21 21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) -22 22 | Bar) +16 | d: TypeAlias = Foo | None # TC007 +17 | e: TypeAlias = OptStr # TC007 +18 | f: TypeAlias = Bar # TC007 + - g: TypeAlias = Foo | Bar # TC007 x2 +19 + g: TypeAlias = "Foo | Bar" # TC007 x2 +20 | h: TypeAlias = Foo[str] # TC007 +21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) +22 | Bar) +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:20:16 @@ -144,16 +138,15 @@ TC007 [*] Add quotes to type alias 22 | Bar) | help: Add quotes - -ℹ Unsafe fix -17 17 | e: TypeAlias = OptStr # TC007 -18 18 | f: TypeAlias = Bar # TC007 -19 19 | g: TypeAlias = Foo | Bar # TC007 x2 -20 |-h: TypeAlias = Foo[str] # TC007 - 20 |+h: TypeAlias = "Foo[str]" # TC007 -21 21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) -22 22 | Bar) -23 23 | +17 | e: TypeAlias = OptStr # TC007 +18 | f: TypeAlias = Bar # TC007 +19 | g: TypeAlias = Foo | Bar # TC007 x2 + - h: TypeAlias = Foo[str] # TC007 +20 + h: TypeAlias = "Foo[str]" # TC007 +21 | i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) +22 | Bar) +23 | +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:21:17 @@ -165,17 +158,16 @@ TC007 [*] Add quotes to type alias 22 | Bar) | help: Add quotes - -ℹ Unsafe fix -18 18 | f: TypeAlias = Bar # TC007 -19 19 | g: TypeAlias = Foo | Bar # TC007 x2 -20 20 | h: TypeAlias = Foo[str] # TC007 -21 |-i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) -22 |- Bar) - 21 |+i: TypeAlias = ("Foo | Bar") -23 22 | -24 23 | type C = Foo # OK -25 24 | type D = Foo | None # OK +18 | f: TypeAlias = Bar # TC007 +19 | g: TypeAlias = Foo | Bar # TC007 x2 +20 | h: TypeAlias = Foo[str] # TC007 + - i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) + - Bar) +21 + i: TypeAlias = ("Foo | Bar") +22 | +23 | type C = Foo # OK +24 | type D = Foo | None # OK +note: This is an unsafe fix and may change runtime behavior TC007 [*] Add quotes to type alias --> TC007.py:22:5 @@ -188,14 +180,13 @@ TC007 [*] Add quotes to type alias 24 | type C = Foo # OK | help: Add quotes - -ℹ Unsafe fix -18 18 | f: TypeAlias = Bar # TC007 -19 19 | g: TypeAlias = Foo | Bar # TC007 x2 -20 20 | h: TypeAlias = Foo[str] # TC007 -21 |-i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) -22 |- Bar) - 21 |+i: TypeAlias = ("Foo | Bar") -23 22 | -24 23 | type C = Foo # OK -25 24 | type D = Foo | None # OK +18 | f: TypeAlias = Bar # TC007 +19 | g: TypeAlias = Foo | Bar # TC007 x2 +20 | h: TypeAlias = Foo[str] # TC007 + - i: TypeAlias = (Foo | # TC007 x2 (fix removes comment currently) + - Bar) +21 + i: TypeAlias = ("Foo | Bar") +22 | +23 | type C = Foo # OK +24 | type D = Foo | None # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap index 8e5ee8eb59..976595eb45 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH201_PTH201.py.snap @@ -11,16 +11,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 8 | _ = PurePath(".") | help: Remove the current directory argument - -ℹ Safe fix -3 3 | -4 4 | -5 5 | # match -6 |-_ = Path(".") - 6 |+_ = Path() -7 7 | _ = pth(".") -8 8 | _ = PurePath(".") -9 9 | _ = Path("") +3 | +4 | +5 | # match + - _ = Path(".") +6 + _ = Path() +7 | _ = pth(".") +8 | _ = PurePath(".") +9 | _ = Path("") PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:7:9 @@ -33,16 +31,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 9 | _ = Path("") | help: Remove the current directory argument - -ℹ Safe fix -4 4 | -5 5 | # match -6 6 | _ = Path(".") -7 |-_ = pth(".") - 7 |+_ = pth() -8 8 | _ = PurePath(".") -9 9 | _ = Path("") -10 10 | +4 | +5 | # match +6 | _ = Path(".") + - _ = pth(".") +7 + _ = pth() +8 | _ = PurePath(".") +9 | _ = Path("") +10 | PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:8:14 @@ -54,16 +50,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 9 | _ = Path("") | help: Remove the current directory argument - -ℹ Safe fix -5 5 | # match -6 6 | _ = Path(".") -7 7 | _ = pth(".") -8 |-_ = PurePath(".") - 8 |+_ = PurePath() -9 9 | _ = Path("") -10 10 | -11 11 | Path('', ) +5 | # match +6 | _ = Path(".") +7 | _ = pth(".") + - _ = PurePath(".") +8 + _ = PurePath() +9 | _ = Path("") +10 | +11 | Path('', ) PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:9:10 @@ -76,16 +70,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 11 | Path('', ) | help: Remove the current directory argument - -ℹ Safe fix -6 6 | _ = Path(".") -7 7 | _ = pth(".") -8 8 | _ = PurePath(".") -9 |-_ = Path("") - 9 |+_ = Path() -10 10 | -11 11 | Path('', ) -12 12 | +6 | _ = Path(".") +7 | _ = pth(".") +8 | _ = PurePath(".") + - _ = Path("") +9 + _ = Path() +10 | +11 | Path('', ) +12 | PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:11:6 @@ -98,16 +90,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 13 | Path( | help: Remove the current directory argument - -ℹ Safe fix -8 8 | _ = PurePath(".") -9 9 | _ = Path("") -10 10 | -11 |-Path('', ) - 11 |+Path() -12 12 | -13 13 | Path( -14 14 | '', +8 | _ = PurePath(".") +9 | _ = Path("") +10 | + - Path('', ) +11 + Path() +12 | +13 | Path( +14 | '', PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:14:5 @@ -118,18 +108,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 15 | ) | help: Remove the current directory argument - -ℹ Safe fix -10 10 | -11 11 | Path('', ) -12 12 | -13 |-Path( -14 |- '', -15 |-) - 13 |+Path() -16 14 | -17 15 | Path( # Comment before argument -18 16 | '', +10 | +11 | Path('', ) +12 | + - Path( + - '', + - ) +13 + Path() +14 | +15 | Path( # Comment before argument +16 | '', PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:18:5 @@ -140,18 +128,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 19 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -14 14 | '', -15 15 | ) -16 16 | -17 |-Path( # Comment before argument -18 |- '', -19 |-) - 17 |+Path() -20 18 | -21 19 | Path( -22 20 | '', # EOL comment +14 | '', +15 | ) +16 | + - Path( # Comment before argument + - '', + - ) +17 + Path() +18 | +19 | Path( +20 | '', # EOL comment +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:22:5 @@ -162,18 +149,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 23 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -18 18 | '', -19 19 | ) -20 20 | -21 |-Path( -22 |- '', # EOL comment -23 |-) - 21 |+Path() -24 22 | -25 23 | Path( -26 24 | '' # Comment in the middle of implicitly concatenated string +18 | '', +19 | ) +20 | + - Path( + - '', # EOL comment + - ) +21 + Path() +22 | +23 | Path( +24 | '' # Comment in the middle of implicitly concatenated string +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:26:5 @@ -185,19 +171,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 28 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -22 22 | '', # EOL comment -23 23 | ) -24 24 | -25 |-Path( -26 |- '' # Comment in the middle of implicitly concatenated string -27 |- ".", -28 |-) - 25 |+Path() -29 26 | -30 27 | Path( -31 28 | '' # Comment before comma +22 | '', # EOL comment +23 | ) +24 | + - Path( + - '' # Comment in the middle of implicitly concatenated string + - ".", + - ) +25 + Path() +26 | +27 | Path( +28 | '' # Comment before comma +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:31:5 @@ -209,19 +194,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 33 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -27 27 | ".", -28 28 | ) -29 29 | -30 |-Path( -31 |- '' # Comment before comma -32 |- , -33 |-) - 30 |+Path() -34 31 | -35 32 | Path( -36 33 | '', +27 | ".", +28 | ) +29 | + - Path( + - '' # Comment before comma + - , + - ) +30 + Path() +31 | +32 | Path( +33 | '', +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:36:5 @@ -232,18 +216,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 37 | ) / "bare" | help: Remove the current directory argument - -ℹ Safe fix -33 33 | ) -34 34 | -35 35 | Path( -36 |- '', -37 |-) / "bare" - 36 |+ "bare", - 37 |+) -38 38 | -39 39 | Path( # Comment before argument -40 40 | '', +33 | ) +34 | +35 | Path( + - '', + - ) / "bare" +36 + "bare", +37 + ) +38 | +39 | Path( # Comment before argument +40 | '', PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:40:5 @@ -254,18 +236,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 41 | ) / ("parenthesized") | help: Remove the current directory argument - -ℹ Unsafe fix -37 37 | ) / "bare" -38 38 | -39 39 | Path( # Comment before argument -40 |- '', -41 |-) / ("parenthesized") - 40 |+ ("parenthesized"), - 41 |+) -42 42 | -43 43 | Path( -44 44 | '', # EOL comment +37 | ) / "bare" +38 | +39 | Path( # Comment before argument + - '', + - ) / ("parenthesized") +40 + ("parenthesized"), +41 + ) +42 | +43 | Path( +44 | '', # EOL comment +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:44:5 @@ -276,18 +257,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 45 | ) / ( ("double parenthesized" ) ) | help: Remove the current directory argument - -ℹ Unsafe fix -41 41 | ) / ("parenthesized") -42 42 | -43 43 | Path( -44 |- '', # EOL comment -45 |-) / ( ("double parenthesized" ) ) - 44 |+ ( ("double parenthesized" ) ), # EOL comment - 45 |+) -46 46 | -47 47 | ( Path( -48 48 | '' # Comment in the middle of implicitly concatenated string +41 | ) / ("parenthesized") +42 | +43 | Path( + - '', # EOL comment + - ) / ( ("double parenthesized" ) ) +44 + ( ("double parenthesized" ) ), # EOL comment +45 + ) +46 | +47 | ( Path( +48 | '' # Comment in the middle of implicitly concatenated string +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:48:5 @@ -300,22 +280,21 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 51 | # Comment between closing parentheses | help: Remove the current directory argument - -ℹ Unsafe fix -44 44 | '', # EOL comment -45 45 | ) / ( ("double parenthesized" ) ) -46 46 | -47 |-( Path( -48 |- '' # Comment in the middle of implicitly concatenated string -49 |- ".", -50 |-) )/ (("parenthesized path call") - 47 |+Path( - 48 |+ (("parenthesized path call") -51 49 | # Comment between closing parentheses - 50 |+), -52 51 | ) -53 52 | -54 53 | Path( +44 | '', # EOL comment +45 | ) / ( ("double parenthesized" ) ) +46 | + - ( Path( + - '' # Comment in the middle of implicitly concatenated string + - ".", + - ) )/ (("parenthesized path call") +47 + Path( +48 + (("parenthesized path call") +49 | # Comment between closing parentheses +50 + ), +51 | ) +52 | +53 | Path( +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:55:5 @@ -327,16 +306,15 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 57 | ) / "multiple" / ( | help: Remove the current directory argument - -ℹ Unsafe fix -52 52 | ) -53 53 | -54 54 | Path( -55 |- '' # Comment before comma - 55 |+ "multiple" # Comment before comma -56 56 | , -57 |-) / "multiple" / ( - 57 |+) / ( -58 58 | "frag" # Comment -59 59 | 'ment' -60 60 | ) +52 | ) +53 | +54 | Path( + - '' # Comment before comma +55 + "multiple" # Comment before comma +56 | , + - ) / "multiple" / ( +57 + ) / ( +58 | "frag" # Comment +59 | 'ment' +60 | ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap index 512cbe18b3..d2a76a210e 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210.py.snap @@ -23,16 +23,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 24 | path.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -19 19 | -20 20 | ### Errors -21 21 | path.with_suffix(".") -22 |-path.with_suffix("py") - 22 |+path.with_suffix(".py") -23 23 | path.with_suffix(r"s") -24 24 | path.with_suffix(u'' "json") -25 25 | path.with_suffix(suffix="js") +19 | +20 | ### Errors +21 | path.with_suffix(".") + - path.with_suffix("py") +22 + path.with_suffix(".py") +23 | path.with_suffix(r"s") +24 | path.with_suffix(u'' "json") +25 | path.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:23:1 @@ -45,16 +44,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 25 | path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -20 20 | ### Errors -21 21 | path.with_suffix(".") -22 22 | path.with_suffix("py") -23 |-path.with_suffix(r"s") - 23 |+path.with_suffix(r".s") -24 24 | path.with_suffix(u'' "json") -25 25 | path.with_suffix(suffix="js") -26 26 | +20 | ### Errors +21 | path.with_suffix(".") +22 | path.with_suffix("py") + - path.with_suffix(r"s") +23 + path.with_suffix(r".s") +24 | path.with_suffix(u'' "json") +25 | path.with_suffix(suffix="js") +26 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:24:1 @@ -66,16 +64,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 25 | path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -21 21 | path.with_suffix(".") -22 22 | path.with_suffix("py") -23 23 | path.with_suffix(r"s") -24 |-path.with_suffix(u'' "json") - 24 |+path.with_suffix(u'.' "json") -25 25 | path.with_suffix(suffix="js") -26 26 | -27 27 | posix_path.with_suffix(".") +21 | path.with_suffix(".") +22 | path.with_suffix("py") +23 | path.with_suffix(r"s") + - path.with_suffix(u'' "json") +24 + path.with_suffix(u'.' "json") +25 | path.with_suffix(suffix="js") +26 | +27 | posix_path.with_suffix(".") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:25:1 @@ -88,16 +85,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 27 | posix_path.with_suffix(".") | help: Add a leading dot - -ℹ Unsafe fix -22 22 | path.with_suffix("py") -23 23 | path.with_suffix(r"s") -24 24 | path.with_suffix(u'' "json") -25 |-path.with_suffix(suffix="js") - 25 |+path.with_suffix(suffix=".js") -26 26 | -27 27 | posix_path.with_suffix(".") -28 28 | posix_path.with_suffix("py") +22 | path.with_suffix("py") +23 | path.with_suffix(r"s") +24 | path.with_suffix(u'' "json") + - path.with_suffix(suffix="js") +25 + path.with_suffix(suffix=".js") +26 | +27 | posix_path.with_suffix(".") +28 | posix_path.with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210.py:27:1 @@ -121,16 +117,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 30 | posix_path.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -25 25 | path.with_suffix(suffix="js") -26 26 | -27 27 | posix_path.with_suffix(".") -28 |-posix_path.with_suffix("py") - 28 |+posix_path.with_suffix(".py") -29 29 | posix_path.with_suffix(r"s") -30 30 | posix_path.with_suffix(u'' "json") -31 31 | posix_path.with_suffix(suffix="js") +25 | path.with_suffix(suffix="js") +26 | +27 | posix_path.with_suffix(".") + - posix_path.with_suffix("py") +28 + posix_path.with_suffix(".py") +29 | posix_path.with_suffix(r"s") +30 | posix_path.with_suffix(u'' "json") +31 | posix_path.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:29:1 @@ -143,16 +138,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 31 | posix_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -26 26 | -27 27 | posix_path.with_suffix(".") -28 28 | posix_path.with_suffix("py") -29 |-posix_path.with_suffix(r"s") - 29 |+posix_path.with_suffix(r".s") -30 30 | posix_path.with_suffix(u'' "json") -31 31 | posix_path.with_suffix(suffix="js") -32 32 | +26 | +27 | posix_path.with_suffix(".") +28 | posix_path.with_suffix("py") + - posix_path.with_suffix(r"s") +29 + posix_path.with_suffix(r".s") +30 | posix_path.with_suffix(u'' "json") +31 | posix_path.with_suffix(suffix="js") +32 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:30:1 @@ -164,16 +158,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 31 | posix_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -27 27 | posix_path.with_suffix(".") -28 28 | posix_path.with_suffix("py") -29 29 | posix_path.with_suffix(r"s") -30 |-posix_path.with_suffix(u'' "json") - 30 |+posix_path.with_suffix(u'.' "json") -31 31 | posix_path.with_suffix(suffix="js") -32 32 | -33 33 | pure_path.with_suffix(".") +27 | posix_path.with_suffix(".") +28 | posix_path.with_suffix("py") +29 | posix_path.with_suffix(r"s") + - posix_path.with_suffix(u'' "json") +30 + posix_path.with_suffix(u'.' "json") +31 | posix_path.with_suffix(suffix="js") +32 | +33 | pure_path.with_suffix(".") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:31:1 @@ -186,16 +179,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 33 | pure_path.with_suffix(".") | help: Add a leading dot - -ℹ Unsafe fix -28 28 | posix_path.with_suffix("py") -29 29 | posix_path.with_suffix(r"s") -30 30 | posix_path.with_suffix(u'' "json") -31 |-posix_path.with_suffix(suffix="js") - 31 |+posix_path.with_suffix(suffix=".js") -32 32 | -33 33 | pure_path.with_suffix(".") -34 34 | pure_path.with_suffix("py") +28 | posix_path.with_suffix("py") +29 | posix_path.with_suffix(r"s") +30 | posix_path.with_suffix(u'' "json") + - posix_path.with_suffix(suffix="js") +31 + posix_path.with_suffix(suffix=".js") +32 | +33 | pure_path.with_suffix(".") +34 | pure_path.with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210.py:33:1 @@ -219,16 +211,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 36 | pure_path.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -31 31 | posix_path.with_suffix(suffix="js") -32 32 | -33 33 | pure_path.with_suffix(".") -34 |-pure_path.with_suffix("py") - 34 |+pure_path.with_suffix(".py") -35 35 | pure_path.with_suffix(r"s") -36 36 | pure_path.with_suffix(u'' "json") -37 37 | pure_path.with_suffix(suffix="js") +31 | posix_path.with_suffix(suffix="js") +32 | +33 | pure_path.with_suffix(".") + - pure_path.with_suffix("py") +34 + pure_path.with_suffix(".py") +35 | pure_path.with_suffix(r"s") +36 | pure_path.with_suffix(u'' "json") +37 | pure_path.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:35:1 @@ -241,16 +232,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 37 | pure_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -32 32 | -33 33 | pure_path.with_suffix(".") -34 34 | pure_path.with_suffix("py") -35 |-pure_path.with_suffix(r"s") - 35 |+pure_path.with_suffix(r".s") -36 36 | pure_path.with_suffix(u'' "json") -37 37 | pure_path.with_suffix(suffix="js") -38 38 | +32 | +33 | pure_path.with_suffix(".") +34 | pure_path.with_suffix("py") + - pure_path.with_suffix(r"s") +35 + pure_path.with_suffix(r".s") +36 | pure_path.with_suffix(u'' "json") +37 | pure_path.with_suffix(suffix="js") +38 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:36:1 @@ -262,16 +252,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 37 | pure_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -33 33 | pure_path.with_suffix(".") -34 34 | pure_path.with_suffix("py") -35 35 | pure_path.with_suffix(r"s") -36 |-pure_path.with_suffix(u'' "json") - 36 |+pure_path.with_suffix(u'.' "json") -37 37 | pure_path.with_suffix(suffix="js") -38 38 | -39 39 | pure_posix_path.with_suffix(".") +33 | pure_path.with_suffix(".") +34 | pure_path.with_suffix("py") +35 | pure_path.with_suffix(r"s") + - pure_path.with_suffix(u'' "json") +36 + pure_path.with_suffix(u'.' "json") +37 | pure_path.with_suffix(suffix="js") +38 | +39 | pure_posix_path.with_suffix(".") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:37:1 @@ -284,16 +273,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 39 | pure_posix_path.with_suffix(".") | help: Add a leading dot - -ℹ Unsafe fix -34 34 | pure_path.with_suffix("py") -35 35 | pure_path.with_suffix(r"s") -36 36 | pure_path.with_suffix(u'' "json") -37 |-pure_path.with_suffix(suffix="js") - 37 |+pure_path.with_suffix(suffix=".js") -38 38 | -39 39 | pure_posix_path.with_suffix(".") -40 40 | pure_posix_path.with_suffix("py") +34 | pure_path.with_suffix("py") +35 | pure_path.with_suffix(r"s") +36 | pure_path.with_suffix(u'' "json") + - pure_path.with_suffix(suffix="js") +37 + pure_path.with_suffix(suffix=".js") +38 | +39 | pure_posix_path.with_suffix(".") +40 | pure_posix_path.with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210.py:39:1 @@ -317,16 +305,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 42 | pure_posix_path.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -37 37 | pure_path.with_suffix(suffix="js") -38 38 | -39 39 | pure_posix_path.with_suffix(".") -40 |-pure_posix_path.with_suffix("py") - 40 |+pure_posix_path.with_suffix(".py") -41 41 | pure_posix_path.with_suffix(r"s") -42 42 | pure_posix_path.with_suffix(u'' "json") -43 43 | pure_posix_path.with_suffix(suffix="js") +37 | pure_path.with_suffix(suffix="js") +38 | +39 | pure_posix_path.with_suffix(".") + - pure_posix_path.with_suffix("py") +40 + pure_posix_path.with_suffix(".py") +41 | pure_posix_path.with_suffix(r"s") +42 | pure_posix_path.with_suffix(u'' "json") +43 | pure_posix_path.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:41:1 @@ -339,16 +326,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 43 | pure_posix_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -38 38 | -39 39 | pure_posix_path.with_suffix(".") -40 40 | pure_posix_path.with_suffix("py") -41 |-pure_posix_path.with_suffix(r"s") - 41 |+pure_posix_path.with_suffix(r".s") -42 42 | pure_posix_path.with_suffix(u'' "json") -43 43 | pure_posix_path.with_suffix(suffix="js") -44 44 | +38 | +39 | pure_posix_path.with_suffix(".") +40 | pure_posix_path.with_suffix("py") + - pure_posix_path.with_suffix(r"s") +41 + pure_posix_path.with_suffix(r".s") +42 | pure_posix_path.with_suffix(u'' "json") +43 | pure_posix_path.with_suffix(suffix="js") +44 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:42:1 @@ -360,16 +346,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 43 | pure_posix_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -39 39 | pure_posix_path.with_suffix(".") -40 40 | pure_posix_path.with_suffix("py") -41 41 | pure_posix_path.with_suffix(r"s") -42 |-pure_posix_path.with_suffix(u'' "json") - 42 |+pure_posix_path.with_suffix(u'.' "json") -43 43 | pure_posix_path.with_suffix(suffix="js") -44 44 | -45 45 | pure_windows_path.with_suffix(".") +39 | pure_posix_path.with_suffix(".") +40 | pure_posix_path.with_suffix("py") +41 | pure_posix_path.with_suffix(r"s") + - pure_posix_path.with_suffix(u'' "json") +42 + pure_posix_path.with_suffix(u'.' "json") +43 | pure_posix_path.with_suffix(suffix="js") +44 | +45 | pure_windows_path.with_suffix(".") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:43:1 @@ -382,16 +367,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 45 | pure_windows_path.with_suffix(".") | help: Add a leading dot - -ℹ Unsafe fix -40 40 | pure_posix_path.with_suffix("py") -41 41 | pure_posix_path.with_suffix(r"s") -42 42 | pure_posix_path.with_suffix(u'' "json") -43 |-pure_posix_path.with_suffix(suffix="js") - 43 |+pure_posix_path.with_suffix(suffix=".js") -44 44 | -45 45 | pure_windows_path.with_suffix(".") -46 46 | pure_windows_path.with_suffix("py") +40 | pure_posix_path.with_suffix("py") +41 | pure_posix_path.with_suffix(r"s") +42 | pure_posix_path.with_suffix(u'' "json") + - pure_posix_path.with_suffix(suffix="js") +43 + pure_posix_path.with_suffix(suffix=".js") +44 | +45 | pure_windows_path.with_suffix(".") +46 | pure_windows_path.with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210.py:45:1 @@ -415,16 +399,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 48 | pure_windows_path.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -43 43 | pure_posix_path.with_suffix(suffix="js") -44 44 | -45 45 | pure_windows_path.with_suffix(".") -46 |-pure_windows_path.with_suffix("py") - 46 |+pure_windows_path.with_suffix(".py") -47 47 | pure_windows_path.with_suffix(r"s") -48 48 | pure_windows_path.with_suffix(u'' "json") -49 49 | pure_windows_path.with_suffix(suffix="js") +43 | pure_posix_path.with_suffix(suffix="js") +44 | +45 | pure_windows_path.with_suffix(".") + - pure_windows_path.with_suffix("py") +46 + pure_windows_path.with_suffix(".py") +47 | pure_windows_path.with_suffix(r"s") +48 | pure_windows_path.with_suffix(u'' "json") +49 | pure_windows_path.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:47:1 @@ -437,16 +420,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 49 | pure_windows_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -44 44 | -45 45 | pure_windows_path.with_suffix(".") -46 46 | pure_windows_path.with_suffix("py") -47 |-pure_windows_path.with_suffix(r"s") - 47 |+pure_windows_path.with_suffix(r".s") -48 48 | pure_windows_path.with_suffix(u'' "json") -49 49 | pure_windows_path.with_suffix(suffix="js") -50 50 | +44 | +45 | pure_windows_path.with_suffix(".") +46 | pure_windows_path.with_suffix("py") + - pure_windows_path.with_suffix(r"s") +47 + pure_windows_path.with_suffix(r".s") +48 | pure_windows_path.with_suffix(u'' "json") +49 | pure_windows_path.with_suffix(suffix="js") +50 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:48:1 @@ -458,16 +440,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 49 | pure_windows_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -45 45 | pure_windows_path.with_suffix(".") -46 46 | pure_windows_path.with_suffix("py") -47 47 | pure_windows_path.with_suffix(r"s") -48 |-pure_windows_path.with_suffix(u'' "json") - 48 |+pure_windows_path.with_suffix(u'.' "json") -49 49 | pure_windows_path.with_suffix(suffix="js") -50 50 | -51 51 | windows_path.with_suffix(".") +45 | pure_windows_path.with_suffix(".") +46 | pure_windows_path.with_suffix("py") +47 | pure_windows_path.with_suffix(r"s") + - pure_windows_path.with_suffix(u'' "json") +48 + pure_windows_path.with_suffix(u'.' "json") +49 | pure_windows_path.with_suffix(suffix="js") +50 | +51 | windows_path.with_suffix(".") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:49:1 @@ -480,16 +461,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 51 | windows_path.with_suffix(".") | help: Add a leading dot - -ℹ Unsafe fix -46 46 | pure_windows_path.with_suffix("py") -47 47 | pure_windows_path.with_suffix(r"s") -48 48 | pure_windows_path.with_suffix(u'' "json") -49 |-pure_windows_path.with_suffix(suffix="js") - 49 |+pure_windows_path.with_suffix(suffix=".js") -50 50 | -51 51 | windows_path.with_suffix(".") -52 52 | windows_path.with_suffix("py") +46 | pure_windows_path.with_suffix("py") +47 | pure_windows_path.with_suffix(r"s") +48 | pure_windows_path.with_suffix(u'' "json") + - pure_windows_path.with_suffix(suffix="js") +49 + pure_windows_path.with_suffix(suffix=".js") +50 | +51 | windows_path.with_suffix(".") +52 | windows_path.with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210.py:51:1 @@ -513,16 +493,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 54 | windows_path.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -49 49 | pure_windows_path.with_suffix(suffix="js") -50 50 | -51 51 | windows_path.with_suffix(".") -52 |-windows_path.with_suffix("py") - 52 |+windows_path.with_suffix(".py") -53 53 | windows_path.with_suffix(r"s") -54 54 | windows_path.with_suffix(u'' "json") -55 55 | windows_path.with_suffix(suffix="js") +49 | pure_windows_path.with_suffix(suffix="js") +50 | +51 | windows_path.with_suffix(".") + - windows_path.with_suffix("py") +52 + windows_path.with_suffix(".py") +53 | windows_path.with_suffix(r"s") +54 | windows_path.with_suffix(u'' "json") +55 | windows_path.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:53:1 @@ -535,16 +514,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 55 | windows_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -50 50 | -51 51 | windows_path.with_suffix(".") -52 52 | windows_path.with_suffix("py") -53 |-windows_path.with_suffix(r"s") - 53 |+windows_path.with_suffix(r".s") -54 54 | windows_path.with_suffix(u'' "json") -55 55 | windows_path.with_suffix(suffix="js") -56 56 | +50 | +51 | windows_path.with_suffix(".") +52 | windows_path.with_suffix("py") + - windows_path.with_suffix(r"s") +53 + windows_path.with_suffix(r".s") +54 | windows_path.with_suffix(u'' "json") +55 | windows_path.with_suffix(suffix="js") +56 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:54:1 @@ -556,16 +534,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 55 | windows_path.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -51 51 | windows_path.with_suffix(".") -52 52 | windows_path.with_suffix("py") -53 53 | windows_path.with_suffix(r"s") -54 |-windows_path.with_suffix(u'' "json") - 54 |+windows_path.with_suffix(u'.' "json") -55 55 | windows_path.with_suffix(suffix="js") -56 56 | -57 57 | Path().with_suffix(".") +51 | windows_path.with_suffix(".") +52 | windows_path.with_suffix("py") +53 | windows_path.with_suffix(r"s") + - windows_path.with_suffix(u'' "json") +54 + windows_path.with_suffix(u'.' "json") +55 | windows_path.with_suffix(suffix="js") +56 | +57 | Path().with_suffix(".") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:55:1 @@ -578,16 +555,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 57 | Path().with_suffix(".") | help: Add a leading dot - -ℹ Unsafe fix -52 52 | windows_path.with_suffix("py") -53 53 | windows_path.with_suffix(r"s") -54 54 | windows_path.with_suffix(u'' "json") -55 |-windows_path.with_suffix(suffix="js") - 55 |+windows_path.with_suffix(suffix=".js") -56 56 | -57 57 | Path().with_suffix(".") -58 58 | Path().with_suffix("py") +52 | windows_path.with_suffix("py") +53 | windows_path.with_suffix(r"s") +54 | windows_path.with_suffix(u'' "json") + - windows_path.with_suffix(suffix="js") +55 + windows_path.with_suffix(suffix=".js") +56 | +57 | Path().with_suffix(".") +58 | Path().with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210.py:57:1 @@ -611,16 +587,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 60 | PurePath().with_suffix("py") | help: Add a leading dot - -ℹ Unsafe fix -55 55 | windows_path.with_suffix(suffix="js") -56 56 | -57 57 | Path().with_suffix(".") -58 |-Path().with_suffix("py") - 58 |+Path().with_suffix(".py") -59 59 | PosixPath().with_suffix("py") -60 60 | PurePath().with_suffix("py") -61 61 | PurePosixPath().with_suffix("py") +55 | windows_path.with_suffix(suffix="js") +56 | +57 | Path().with_suffix(".") + - Path().with_suffix("py") +58 + Path().with_suffix(".py") +59 | PosixPath().with_suffix("py") +60 | PurePath().with_suffix("py") +61 | PurePosixPath().with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:59:1 @@ -633,16 +608,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 61 | PurePosixPath().with_suffix("py") | help: Add a leading dot - -ℹ Unsafe fix -56 56 | -57 57 | Path().with_suffix(".") -58 58 | Path().with_suffix("py") -59 |-PosixPath().with_suffix("py") - 59 |+PosixPath().with_suffix(".py") -60 60 | PurePath().with_suffix("py") -61 61 | PurePosixPath().with_suffix("py") -62 62 | PureWindowsPath().with_suffix("py") +56 | +57 | Path().with_suffix(".") +58 | Path().with_suffix("py") + - PosixPath().with_suffix("py") +59 + PosixPath().with_suffix(".py") +60 | PurePath().with_suffix("py") +61 | PurePosixPath().with_suffix("py") +62 | PureWindowsPath().with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:60:1 @@ -655,16 +629,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 62 | PureWindowsPath().with_suffix("py") | help: Add a leading dot - -ℹ Unsafe fix -57 57 | Path().with_suffix(".") -58 58 | Path().with_suffix("py") -59 59 | PosixPath().with_suffix("py") -60 |-PurePath().with_suffix("py") - 60 |+PurePath().with_suffix(".py") -61 61 | PurePosixPath().with_suffix("py") -62 62 | PureWindowsPath().with_suffix("py") -63 63 | WindowsPath().with_suffix("py") +57 | Path().with_suffix(".") +58 | Path().with_suffix("py") +59 | PosixPath().with_suffix("py") + - PurePath().with_suffix("py") +60 + PurePath().with_suffix(".py") +61 | PurePosixPath().with_suffix("py") +62 | PureWindowsPath().with_suffix("py") +63 | WindowsPath().with_suffix("py") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:61:1 @@ -677,16 +650,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 63 | WindowsPath().with_suffix("py") | help: Add a leading dot - -ℹ Unsafe fix -58 58 | Path().with_suffix("py") -59 59 | PosixPath().with_suffix("py") -60 60 | PurePath().with_suffix("py") -61 |-PurePosixPath().with_suffix("py") - 61 |+PurePosixPath().with_suffix(".py") -62 62 | PureWindowsPath().with_suffix("py") -63 63 | WindowsPath().with_suffix("py") -64 64 | +58 | Path().with_suffix("py") +59 | PosixPath().with_suffix("py") +60 | PurePath().with_suffix("py") + - PurePosixPath().with_suffix("py") +61 + PurePosixPath().with_suffix(".py") +62 | PureWindowsPath().with_suffix("py") +63 | WindowsPath().with_suffix("py") +64 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:62:1 @@ -698,16 +670,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 63 | WindowsPath().with_suffix("py") | help: Add a leading dot - -ℹ Unsafe fix -59 59 | PosixPath().with_suffix("py") -60 60 | PurePath().with_suffix("py") -61 61 | PurePosixPath().with_suffix("py") -62 |-PureWindowsPath().with_suffix("py") - 62 |+PureWindowsPath().with_suffix(".py") -63 63 | WindowsPath().with_suffix("py") -64 64 | -65 65 | ### No errors +59 | PosixPath().with_suffix("py") +60 | PurePath().with_suffix("py") +61 | PurePosixPath().with_suffix("py") + - PureWindowsPath().with_suffix("py") +62 + PureWindowsPath().with_suffix(".py") +63 | WindowsPath().with_suffix("py") +64 | +65 | ### No errors +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210.py:63:1 @@ -720,13 +691,12 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 65 | ### No errors | help: Add a leading dot - -ℹ Unsafe fix -60 60 | PurePath().with_suffix("py") -61 61 | PurePosixPath().with_suffix("py") -62 62 | PureWindowsPath().with_suffix("py") -63 |-WindowsPath().with_suffix("py") - 63 |+WindowsPath().with_suffix(".py") -64 64 | -65 65 | ### No errors -66 66 | path.with_suffix() +60 | PurePath().with_suffix("py") +61 | PurePosixPath().with_suffix("py") +62 | PureWindowsPath().with_suffix("py") + - WindowsPath().with_suffix("py") +63 + WindowsPath().with_suffix(".py") +64 | +65 | ### No errors +66 | path.with_suffix() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap index 04a5e8e740..adb00cbf99 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__PTH210_PTH210_1.py.snap @@ -24,16 +24,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 16 | p.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -11 11 | def test_path(p: Path) -> None: -12 12 | ## Errors -13 13 | p.with_suffix(".") -14 |- p.with_suffix("py") - 14 |+ p.with_suffix(".py") -15 15 | p.with_suffix(r"s") -16 16 | p.with_suffix(u'' "json") -17 17 | p.with_suffix(suffix="js") +11 | def test_path(p: Path) -> None: +12 | ## Errors +13 | p.with_suffix(".") + - p.with_suffix("py") +14 + p.with_suffix(".py") +15 | p.with_suffix(r"s") +16 | p.with_suffix(u'' "json") +17 | p.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:15:5 @@ -46,16 +45,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 17 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -12 12 | ## Errors -13 13 | p.with_suffix(".") -14 14 | p.with_suffix("py") -15 |- p.with_suffix(r"s") - 15 |+ p.with_suffix(r".s") -16 16 | p.with_suffix(u'' "json") -17 17 | p.with_suffix(suffix="js") -18 18 | +12 | ## Errors +13 | p.with_suffix(".") +14 | p.with_suffix("py") + - p.with_suffix(r"s") +15 + p.with_suffix(r".s") +16 | p.with_suffix(u'' "json") +17 | p.with_suffix(suffix="js") +18 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:16:5 @@ -67,16 +65,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 17 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -13 13 | p.with_suffix(".") -14 14 | p.with_suffix("py") -15 15 | p.with_suffix(r"s") -16 |- p.with_suffix(u'' "json") - 16 |+ p.with_suffix(u'.' "json") -17 17 | p.with_suffix(suffix="js") -18 18 | -19 19 | ## No errors +13 | p.with_suffix(".") +14 | p.with_suffix("py") +15 | p.with_suffix(r"s") + - p.with_suffix(u'' "json") +16 + p.with_suffix(u'.' "json") +17 | p.with_suffix(suffix="js") +18 | +19 | ## No errors +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:17:5 @@ -89,16 +86,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 19 | ## No errors | help: Add a leading dot - -ℹ Unsafe fix -14 14 | p.with_suffix("py") -15 15 | p.with_suffix(r"s") -16 16 | p.with_suffix(u'' "json") -17 |- p.with_suffix(suffix="js") - 17 |+ p.with_suffix(suffix=".js") -18 18 | -19 19 | ## No errors -20 20 | p.with_suffix() +14 | p.with_suffix("py") +15 | p.with_suffix(r"s") +16 | p.with_suffix(u'' "json") + - p.with_suffix(suffix="js") +17 + p.with_suffix(suffix=".js") +18 | +19 | ## No errors +20 | p.with_suffix() +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210_1.py:31:5 @@ -123,16 +119,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 34 | p.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -29 29 | def test_posix_path(p: PosixPath) -> None: -30 30 | ## Errors -31 31 | p.with_suffix(".") -32 |- p.with_suffix("py") - 32 |+ p.with_suffix(".py") -33 33 | p.with_suffix(r"s") -34 34 | p.with_suffix(u'' "json") -35 35 | p.with_suffix(suffix="js") +29 | def test_posix_path(p: PosixPath) -> None: +30 | ## Errors +31 | p.with_suffix(".") + - p.with_suffix("py") +32 + p.with_suffix(".py") +33 | p.with_suffix(r"s") +34 | p.with_suffix(u'' "json") +35 | p.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:33:5 @@ -145,16 +140,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 35 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -30 30 | ## Errors -31 31 | p.with_suffix(".") -32 32 | p.with_suffix("py") -33 |- p.with_suffix(r"s") - 33 |+ p.with_suffix(r".s") -34 34 | p.with_suffix(u'' "json") -35 35 | p.with_suffix(suffix="js") -36 36 | +30 | ## Errors +31 | p.with_suffix(".") +32 | p.with_suffix("py") + - p.with_suffix(r"s") +33 + p.with_suffix(r".s") +34 | p.with_suffix(u'' "json") +35 | p.with_suffix(suffix="js") +36 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:34:5 @@ -166,16 +160,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 35 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -31 31 | p.with_suffix(".") -32 32 | p.with_suffix("py") -33 33 | p.with_suffix(r"s") -34 |- p.with_suffix(u'' "json") - 34 |+ p.with_suffix(u'.' "json") -35 35 | p.with_suffix(suffix="js") -36 36 | -37 37 | ## No errors +31 | p.with_suffix(".") +32 | p.with_suffix("py") +33 | p.with_suffix(r"s") + - p.with_suffix(u'' "json") +34 + p.with_suffix(u'.' "json") +35 | p.with_suffix(suffix="js") +36 | +37 | ## No errors +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:35:5 @@ -188,16 +181,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 37 | ## No errors | help: Add a leading dot - -ℹ Unsafe fix -32 32 | p.with_suffix("py") -33 33 | p.with_suffix(r"s") -34 34 | p.with_suffix(u'' "json") -35 |- p.with_suffix(suffix="js") - 35 |+ p.with_suffix(suffix=".js") -36 36 | -37 37 | ## No errors -38 38 | p.with_suffix() +32 | p.with_suffix("py") +33 | p.with_suffix(r"s") +34 | p.with_suffix(u'' "json") + - p.with_suffix(suffix="js") +35 + p.with_suffix(suffix=".js") +36 | +37 | ## No errors +38 | p.with_suffix() +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210_1.py:49:5 @@ -222,16 +214,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 52 | p.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -47 47 | def test_pure_path(p: PurePath) -> None: -48 48 | ## Errors -49 49 | p.with_suffix(".") -50 |- p.with_suffix("py") - 50 |+ p.with_suffix(".py") -51 51 | p.with_suffix(r"s") -52 52 | p.with_suffix(u'' "json") -53 53 | p.with_suffix(suffix="js") +47 | def test_pure_path(p: PurePath) -> None: +48 | ## Errors +49 | p.with_suffix(".") + - p.with_suffix("py") +50 + p.with_suffix(".py") +51 | p.with_suffix(r"s") +52 | p.with_suffix(u'' "json") +53 | p.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:51:5 @@ -244,16 +235,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 53 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -48 48 | ## Errors -49 49 | p.with_suffix(".") -50 50 | p.with_suffix("py") -51 |- p.with_suffix(r"s") - 51 |+ p.with_suffix(r".s") -52 52 | p.with_suffix(u'' "json") -53 53 | p.with_suffix(suffix="js") -54 54 | +48 | ## Errors +49 | p.with_suffix(".") +50 | p.with_suffix("py") + - p.with_suffix(r"s") +51 + p.with_suffix(r".s") +52 | p.with_suffix(u'' "json") +53 | p.with_suffix(suffix="js") +54 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:52:5 @@ -265,16 +255,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 53 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -49 49 | p.with_suffix(".") -50 50 | p.with_suffix("py") -51 51 | p.with_suffix(r"s") -52 |- p.with_suffix(u'' "json") - 52 |+ p.with_suffix(u'.' "json") -53 53 | p.with_suffix(suffix="js") -54 54 | -55 55 | ## No errors +49 | p.with_suffix(".") +50 | p.with_suffix("py") +51 | p.with_suffix(r"s") + - p.with_suffix(u'' "json") +52 + p.with_suffix(u'.' "json") +53 | p.with_suffix(suffix="js") +54 | +55 | ## No errors +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:53:5 @@ -287,16 +276,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 55 | ## No errors | help: Add a leading dot - -ℹ Unsafe fix -50 50 | p.with_suffix("py") -51 51 | p.with_suffix(r"s") -52 52 | p.with_suffix(u'' "json") -53 |- p.with_suffix(suffix="js") - 53 |+ p.with_suffix(suffix=".js") -54 54 | -55 55 | ## No errors -56 56 | p.with_suffix() +50 | p.with_suffix("py") +51 | p.with_suffix(r"s") +52 | p.with_suffix(u'' "json") + - p.with_suffix(suffix="js") +53 + p.with_suffix(suffix=".js") +54 | +55 | ## No errors +56 | p.with_suffix() +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210_1.py:67:5 @@ -321,16 +309,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 70 | p.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -65 65 | def test_pure_posix_path(p: PurePosixPath) -> None: -66 66 | ## Errors -67 67 | p.with_suffix(".") -68 |- p.with_suffix("py") - 68 |+ p.with_suffix(".py") -69 69 | p.with_suffix(r"s") -70 70 | p.with_suffix(u'' "json") -71 71 | p.with_suffix(suffix="js") +65 | def test_pure_posix_path(p: PurePosixPath) -> None: +66 | ## Errors +67 | p.with_suffix(".") + - p.with_suffix("py") +68 + p.with_suffix(".py") +69 | p.with_suffix(r"s") +70 | p.with_suffix(u'' "json") +71 | p.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:69:5 @@ -343,16 +330,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 71 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -66 66 | ## Errors -67 67 | p.with_suffix(".") -68 68 | p.with_suffix("py") -69 |- p.with_suffix(r"s") - 69 |+ p.with_suffix(r".s") -70 70 | p.with_suffix(u'' "json") -71 71 | p.with_suffix(suffix="js") -72 72 | +66 | ## Errors +67 | p.with_suffix(".") +68 | p.with_suffix("py") + - p.with_suffix(r"s") +69 + p.with_suffix(r".s") +70 | p.with_suffix(u'' "json") +71 | p.with_suffix(suffix="js") +72 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:70:5 @@ -364,16 +350,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 71 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -67 67 | p.with_suffix(".") -68 68 | p.with_suffix("py") -69 69 | p.with_suffix(r"s") -70 |- p.with_suffix(u'' "json") - 70 |+ p.with_suffix(u'.' "json") -71 71 | p.with_suffix(suffix="js") -72 72 | -73 73 | ## No errors +67 | p.with_suffix(".") +68 | p.with_suffix("py") +69 | p.with_suffix(r"s") + - p.with_suffix(u'' "json") +70 + p.with_suffix(u'.' "json") +71 | p.with_suffix(suffix="js") +72 | +73 | ## No errors +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:71:5 @@ -386,16 +371,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 73 | ## No errors | help: Add a leading dot - -ℹ Unsafe fix -68 68 | p.with_suffix("py") -69 69 | p.with_suffix(r"s") -70 70 | p.with_suffix(u'' "json") -71 |- p.with_suffix(suffix="js") - 71 |+ p.with_suffix(suffix=".js") -72 72 | -73 73 | ## No errors -74 74 | p.with_suffix() +68 | p.with_suffix("py") +69 | p.with_suffix(r"s") +70 | p.with_suffix(u'' "json") + - p.with_suffix(suffix="js") +71 + p.with_suffix(suffix=".js") +72 | +73 | ## No errors +74 | p.with_suffix() +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210_1.py:85:5 @@ -420,16 +404,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 88 | p.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -83 83 | def test_pure_windows_path(p: PureWindowsPath) -> None: -84 84 | ## Errors -85 85 | p.with_suffix(".") -86 |- p.with_suffix("py") - 86 |+ p.with_suffix(".py") -87 87 | p.with_suffix(r"s") -88 88 | p.with_suffix(u'' "json") -89 89 | p.with_suffix(suffix="js") +83 | def test_pure_windows_path(p: PureWindowsPath) -> None: +84 | ## Errors +85 | p.with_suffix(".") + - p.with_suffix("py") +86 + p.with_suffix(".py") +87 | p.with_suffix(r"s") +88 | p.with_suffix(u'' "json") +89 | p.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:87:5 @@ -442,16 +425,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 89 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -84 84 | ## Errors -85 85 | p.with_suffix(".") -86 86 | p.with_suffix("py") -87 |- p.with_suffix(r"s") - 87 |+ p.with_suffix(r".s") -88 88 | p.with_suffix(u'' "json") -89 89 | p.with_suffix(suffix="js") -90 90 | +84 | ## Errors +85 | p.with_suffix(".") +86 | p.with_suffix("py") + - p.with_suffix(r"s") +87 + p.with_suffix(r".s") +88 | p.with_suffix(u'' "json") +89 | p.with_suffix(suffix="js") +90 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:88:5 @@ -463,16 +445,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 89 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -85 85 | p.with_suffix(".") -86 86 | p.with_suffix("py") -87 87 | p.with_suffix(r"s") -88 |- p.with_suffix(u'' "json") - 88 |+ p.with_suffix(u'.' "json") -89 89 | p.with_suffix(suffix="js") -90 90 | -91 91 | ## No errors +85 | p.with_suffix(".") +86 | p.with_suffix("py") +87 | p.with_suffix(r"s") + - p.with_suffix(u'' "json") +88 + p.with_suffix(u'.' "json") +89 | p.with_suffix(suffix="js") +90 | +91 | ## No errors +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:89:5 @@ -485,16 +466,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 91 | ## No errors | help: Add a leading dot - -ℹ Unsafe fix -86 86 | p.with_suffix("py") -87 87 | p.with_suffix(r"s") -88 88 | p.with_suffix(u'' "json") -89 |- p.with_suffix(suffix="js") - 89 |+ p.with_suffix(suffix=".js") -90 90 | -91 91 | ## No errors -92 92 | p.with_suffix() +86 | p.with_suffix("py") +87 | p.with_suffix(r"s") +88 | p.with_suffix(u'' "json") + - p.with_suffix(suffix="js") +89 + p.with_suffix(suffix=".js") +90 | +91 | ## No errors +92 | p.with_suffix() +note: This is an unsafe fix and may change runtime behavior PTH210 Invalid suffix passed to `.with_suffix()` --> PTH210_1.py:103:5 @@ -519,16 +499,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 106 | p.with_suffix(u'' "json") | help: Add a leading dot - -ℹ Unsafe fix -101 101 | def test_windows_path(p: WindowsPath) -> None: -102 102 | ## Errors -103 103 | p.with_suffix(".") -104 |- p.with_suffix("py") - 104 |+ p.with_suffix(".py") -105 105 | p.with_suffix(r"s") -106 106 | p.with_suffix(u'' "json") -107 107 | p.with_suffix(suffix="js") +101 | def test_windows_path(p: WindowsPath) -> None: +102 | ## Errors +103 | p.with_suffix(".") + - p.with_suffix("py") +104 + p.with_suffix(".py") +105 | p.with_suffix(r"s") +106 | p.with_suffix(u'' "json") +107 | p.with_suffix(suffix="js") +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:105:5 @@ -541,16 +520,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 107 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -102 102 | ## Errors -103 103 | p.with_suffix(".") -104 104 | p.with_suffix("py") -105 |- p.with_suffix(r"s") - 105 |+ p.with_suffix(r".s") -106 106 | p.with_suffix(u'' "json") -107 107 | p.with_suffix(suffix="js") -108 108 | +102 | ## Errors +103 | p.with_suffix(".") +104 | p.with_suffix("py") + - p.with_suffix(r"s") +105 + p.with_suffix(r".s") +106 | p.with_suffix(u'' "json") +107 | p.with_suffix(suffix="js") +108 | +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:106:5 @@ -562,16 +540,15 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 107 | p.with_suffix(suffix="js") | help: Add a leading dot - -ℹ Unsafe fix -103 103 | p.with_suffix(".") -104 104 | p.with_suffix("py") -105 105 | p.with_suffix(r"s") -106 |- p.with_suffix(u'' "json") - 106 |+ p.with_suffix(u'.' "json") -107 107 | p.with_suffix(suffix="js") -108 108 | -109 109 | ## No errors +103 | p.with_suffix(".") +104 | p.with_suffix("py") +105 | p.with_suffix(r"s") + - p.with_suffix(u'' "json") +106 + p.with_suffix(u'.' "json") +107 | p.with_suffix(suffix="js") +108 | +109 | ## No errors +note: This is an unsafe fix and may change runtime behavior PTH210 [*] Dotless suffix passed to `.with_suffix()` --> PTH210_1.py:107:5 @@ -584,13 +561,12 @@ PTH210 [*] Dotless suffix passed to `.with_suffix()` 109 | ## No errors | help: Add a leading dot - -ℹ Unsafe fix -104 104 | p.with_suffix("py") -105 105 | p.with_suffix(r"s") -106 106 | p.with_suffix(u'' "json") -107 |- p.with_suffix(suffix="js") - 107 |+ p.with_suffix(suffix=".js") -108 108 | -109 109 | ## No errors -110 110 | p.with_suffix() +104 | p.with_suffix("py") +105 | p.with_suffix(r"s") +106 | p.with_suffix(u'' "json") + - p.with_suffix(suffix="js") +107 + p.with_suffix(suffix=".js") +108 | +109 | ## No errors +110 | p.with_suffix() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap index 7819dbb198..02d0039102 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH201_PTH201.py.snap @@ -11,16 +11,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 8 | _ = PurePath(".") | help: Remove the current directory argument - -ℹ Safe fix -3 3 | -4 4 | -5 5 | # match -6 |-_ = Path(".") - 6 |+_ = Path() -7 7 | _ = pth(".") -8 8 | _ = PurePath(".") -9 9 | _ = Path("") +3 | +4 | +5 | # match + - _ = Path(".") +6 + _ = Path() +7 | _ = pth(".") +8 | _ = PurePath(".") +9 | _ = Path("") PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:7:9 @@ -33,16 +31,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 9 | _ = Path("") | help: Remove the current directory argument - -ℹ Safe fix -4 4 | -5 5 | # match -6 6 | _ = Path(".") -7 |-_ = pth(".") - 7 |+_ = pth() -8 8 | _ = PurePath(".") -9 9 | _ = Path("") -10 10 | +4 | +5 | # match +6 | _ = Path(".") + - _ = pth(".") +7 + _ = pth() +8 | _ = PurePath(".") +9 | _ = Path("") +10 | PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:8:14 @@ -54,16 +50,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 9 | _ = Path("") | help: Remove the current directory argument - -ℹ Safe fix -5 5 | # match -6 6 | _ = Path(".") -7 7 | _ = pth(".") -8 |-_ = PurePath(".") - 8 |+_ = PurePath() -9 9 | _ = Path("") -10 10 | -11 11 | Path('', ) +5 | # match +6 | _ = Path(".") +7 | _ = pth(".") + - _ = PurePath(".") +8 + _ = PurePath() +9 | _ = Path("") +10 | +11 | Path('', ) PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:9:10 @@ -76,16 +70,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 11 | Path('', ) | help: Remove the current directory argument - -ℹ Safe fix -6 6 | _ = Path(".") -7 7 | _ = pth(".") -8 8 | _ = PurePath(".") -9 |-_ = Path("") - 9 |+_ = Path() -10 10 | -11 11 | Path('', ) -12 12 | +6 | _ = Path(".") +7 | _ = pth(".") +8 | _ = PurePath(".") + - _ = Path("") +9 + _ = Path() +10 | +11 | Path('', ) +12 | PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:11:6 @@ -98,16 +90,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 13 | Path( | help: Remove the current directory argument - -ℹ Safe fix -8 8 | _ = PurePath(".") -9 9 | _ = Path("") -10 10 | -11 |-Path('', ) - 11 |+Path() -12 12 | -13 13 | Path( -14 14 | '', +8 | _ = PurePath(".") +9 | _ = Path("") +10 | + - Path('', ) +11 + Path() +12 | +13 | Path( +14 | '', PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:14:5 @@ -118,18 +108,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 15 | ) | help: Remove the current directory argument - -ℹ Safe fix -10 10 | -11 11 | Path('', ) -12 12 | -13 |-Path( -14 |- '', -15 |-) - 13 |+Path() -16 14 | -17 15 | Path( # Comment before argument -18 16 | '', +10 | +11 | Path('', ) +12 | + - Path( + - '', + - ) +13 + Path() +14 | +15 | Path( # Comment before argument +16 | '', PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:18:5 @@ -140,18 +128,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 19 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -14 14 | '', -15 15 | ) -16 16 | -17 |-Path( # Comment before argument -18 |- '', -19 |-) - 17 |+Path() -20 18 | -21 19 | Path( -22 20 | '', # EOL comment +14 | '', +15 | ) +16 | + - Path( # Comment before argument + - '', + - ) +17 + Path() +18 | +19 | Path( +20 | '', # EOL comment +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:22:5 @@ -162,18 +149,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 23 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -18 18 | '', -19 19 | ) -20 20 | -21 |-Path( -22 |- '', # EOL comment -23 |-) - 21 |+Path() -24 22 | -25 23 | Path( -26 24 | '' # Comment in the middle of implicitly concatenated string +18 | '', +19 | ) +20 | + - Path( + - '', # EOL comment + - ) +21 + Path() +22 | +23 | Path( +24 | '' # Comment in the middle of implicitly concatenated string +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:26:5 @@ -185,19 +171,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 28 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -22 22 | '', # EOL comment -23 23 | ) -24 24 | -25 |-Path( -26 |- '' # Comment in the middle of implicitly concatenated string -27 |- ".", -28 |-) - 25 |+Path() -29 26 | -30 27 | Path( -31 28 | '' # Comment before comma +22 | '', # EOL comment +23 | ) +24 | + - Path( + - '' # Comment in the middle of implicitly concatenated string + - ".", + - ) +25 + Path() +26 | +27 | Path( +28 | '' # Comment before comma +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:31:5 @@ -209,19 +194,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 33 | ) | help: Remove the current directory argument - -ℹ Unsafe fix -27 27 | ".", -28 28 | ) -29 29 | -30 |-Path( -31 |- '' # Comment before comma -32 |- , -33 |-) - 30 |+Path() -34 31 | -35 32 | Path( -36 33 | '', +27 | ".", +28 | ) +29 | + - Path( + - '' # Comment before comma + - , + - ) +30 + Path() +31 | +32 | Path( +33 | '', +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:36:5 @@ -232,18 +216,16 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 37 | ) / "bare" | help: Remove the current directory argument - -ℹ Safe fix -33 33 | ) -34 34 | -35 35 | Path( -36 |- '', -37 |-) / "bare" - 36 |+ "bare", - 37 |+) -38 38 | -39 39 | Path( # Comment before argument -40 40 | '', +33 | ) +34 | +35 | Path( + - '', + - ) / "bare" +36 + "bare", +37 + ) +38 | +39 | Path( # Comment before argument +40 | '', PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:40:5 @@ -254,18 +236,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 41 | ) / ("parenthesized") | help: Remove the current directory argument - -ℹ Unsafe fix -37 37 | ) / "bare" -38 38 | -39 39 | Path( # Comment before argument -40 |- '', -41 |-) / ("parenthesized") - 40 |+ ("parenthesized"), - 41 |+) -42 42 | -43 43 | Path( -44 44 | '', # EOL comment +37 | ) / "bare" +38 | +39 | Path( # Comment before argument + - '', + - ) / ("parenthesized") +40 + ("parenthesized"), +41 + ) +42 | +43 | Path( +44 | '', # EOL comment +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:44:5 @@ -276,18 +257,17 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 45 | ) / ( ("double parenthesized" ) ) | help: Remove the current directory argument - -ℹ Unsafe fix -41 41 | ) / ("parenthesized") -42 42 | -43 43 | Path( -44 |- '', # EOL comment -45 |-) / ( ("double parenthesized" ) ) - 44 |+ ( ("double parenthesized" ) ), # EOL comment - 45 |+) -46 46 | -47 47 | ( Path( -48 48 | '' # Comment in the middle of implicitly concatenated string +41 | ) / ("parenthesized") +42 | +43 | Path( + - '', # EOL comment + - ) / ( ("double parenthesized" ) ) +44 + ( ("double parenthesized" ) ), # EOL comment +45 + ) +46 | +47 | ( Path( +48 | '' # Comment in the middle of implicitly concatenated string +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:48:5 @@ -300,22 +280,21 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 51 | # Comment between closing parentheses | help: Remove the current directory argument - -ℹ Unsafe fix -44 44 | '', # EOL comment -45 45 | ) / ( ("double parenthesized" ) ) -46 46 | -47 |-( Path( -48 |- '' # Comment in the middle of implicitly concatenated string -49 |- ".", -50 |-) )/ (("parenthesized path call") - 47 |+Path( - 48 |+ (("parenthesized path call") -51 49 | # Comment between closing parentheses - 50 |+), -52 51 | ) -53 52 | -54 53 | Path( +44 | '', # EOL comment +45 | ) / ( ("double parenthesized" ) ) +46 | + - ( Path( + - '' # Comment in the middle of implicitly concatenated string + - ".", + - ) )/ (("parenthesized path call") +47 + Path( +48 + (("parenthesized path call") +49 | # Comment between closing parentheses +50 + ), +51 | ) +52 | +53 | Path( +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:55:5 @@ -327,19 +306,18 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 57 | ) / "multiple" / ( | help: Remove the current directory argument - -ℹ Unsafe fix -52 52 | ) -53 53 | -54 54 | Path( -55 |- '' # Comment before comma - 55 |+ "multiple" # Comment before comma -56 56 | , -57 |-) / "multiple" / ( - 57 |+) / ( -58 58 | "frag" # Comment -59 59 | 'ment' -60 60 | ) +52 | ) +53 | +54 | Path( + - '' # Comment before comma +55 + "multiple" # Comment before comma +56 | , + - ) / "multiple" / ( +57 + ) / ( +58 | "frag" # Comment +59 | 'ment' +60 | ) +note: This is an unsafe fix and may change runtime behavior PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:74:15 @@ -352,16 +330,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 76 | _ = WindowsPath(".") | help: Remove the current directory argument - -ℹ Safe fix -71 71 | -72 72 | from importlib.metadata import PackagePath -73 73 | -74 |-_ = PosixPath(".") - 74 |+_ = PosixPath() -75 75 | _ = PurePosixPath(".") -76 76 | _ = WindowsPath(".") -77 77 | _ = PureWindowsPath(".") +71 | +72 | from importlib.metadata import PackagePath +73 | + - _ = PosixPath(".") +74 + _ = PosixPath() +75 | _ = PurePosixPath(".") +76 | _ = WindowsPath(".") +77 | _ = PureWindowsPath(".") PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:75:19 @@ -373,16 +349,14 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 77 | _ = PureWindowsPath(".") | help: Remove the current directory argument - -ℹ Safe fix -72 72 | from importlib.metadata import PackagePath -73 73 | -74 74 | _ = PosixPath(".") -75 |-_ = PurePosixPath(".") - 75 |+_ = PurePosixPath() -76 76 | _ = WindowsPath(".") -77 77 | _ = PureWindowsPath(".") -78 78 | _ = PackagePath(".") +72 | from importlib.metadata import PackagePath +73 | +74 | _ = PosixPath(".") + - _ = PurePosixPath(".") +75 + _ = PurePosixPath() +76 | _ = WindowsPath(".") +77 | _ = PureWindowsPath(".") +78 | _ = PackagePath(".") PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:76:17 @@ -395,15 +369,13 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 78 | _ = PackagePath(".") | help: Remove the current directory argument - -ℹ Safe fix -73 73 | -74 74 | _ = PosixPath(".") -75 75 | _ = PurePosixPath(".") -76 |-_ = WindowsPath(".") - 76 |+_ = WindowsPath() -77 77 | _ = PureWindowsPath(".") -78 78 | _ = PackagePath(".") +73 | +74 | _ = PosixPath(".") +75 | _ = PurePosixPath(".") + - _ = WindowsPath(".") +76 + _ = WindowsPath() +77 | _ = PureWindowsPath(".") +78 | _ = PackagePath(".") PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:77:21 @@ -415,14 +387,12 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` 78 | _ = PackagePath(".") | help: Remove the current directory argument - -ℹ Safe fix -74 74 | _ = PosixPath(".") -75 75 | _ = PurePosixPath(".") -76 76 | _ = WindowsPath(".") -77 |-_ = PureWindowsPath(".") - 77 |+_ = PureWindowsPath() -78 78 | _ = PackagePath(".") +74 | _ = PosixPath(".") +75 | _ = PurePosixPath(".") +76 | _ = WindowsPath(".") + - _ = PureWindowsPath(".") +77 + _ = PureWindowsPath() +78 | _ = PackagePath(".") PTH201 [*] Do not pass the current directory explicitly to `Path` --> PTH201.py:78:17 @@ -433,10 +403,8 @@ PTH201 [*] Do not pass the current directory explicitly to `Path` | ^^^ | help: Remove the current directory argument - -ℹ Safe fix -75 75 | _ = PurePosixPath(".") -76 76 | _ = WindowsPath(".") -77 77 | _ = PureWindowsPath(".") -78 |-_ = PackagePath(".") - 78 |+_ = PackagePath() +75 | _ = PurePosixPath(".") +76 | _ = WindowsPath(".") +77 | _ = PureWindowsPath(".") + - _ = PackagePath(".") +78 + _ = PackagePath() diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap index 107a4da2c0..3ba53629ec 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202.py.snap @@ -10,16 +10,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 12 | os.path.getsize(Path("filename")) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -7 7 | filename2 = Path("filename") -8 8 | -9 9 | -10 |-os.path.getsize("filename") - 10 |+Path("filename").stat().st_size -11 11 | os.path.getsize(b"filename") -12 12 | os.path.getsize(Path("filename")) -13 13 | os.path.getsize(__file__) +7 | filename2 = Path("filename") +8 | +9 | + - os.path.getsize("filename") +10 + Path("filename").stat().st_size +11 | os.path.getsize(b"filename") +12 | os.path.getsize(Path("filename")) +13 | os.path.getsize(__file__) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:11:1 @@ -31,16 +29,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 13 | os.path.getsize(__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -8 8 | -9 9 | -10 10 | os.path.getsize("filename") -11 |-os.path.getsize(b"filename") - 11 |+Path(b"filename").stat().st_size -12 12 | os.path.getsize(Path("filename")) -13 13 | os.path.getsize(__file__) -14 14 | +8 | +9 | +10 | os.path.getsize("filename") + - os.path.getsize(b"filename") +11 + Path(b"filename").stat().st_size +12 | os.path.getsize(Path("filename")) +13 | os.path.getsize(__file__) +14 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:12:1 @@ -52,16 +48,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 13 | os.path.getsize(__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -9 9 | -10 10 | os.path.getsize("filename") -11 11 | os.path.getsize(b"filename") -12 |-os.path.getsize(Path("filename")) - 12 |+Path("filename").stat().st_size -13 13 | os.path.getsize(__file__) -14 14 | -15 15 | os.path.getsize(filename) +9 | +10 | os.path.getsize("filename") +11 | os.path.getsize(b"filename") + - os.path.getsize(Path("filename")) +12 + Path("filename").stat().st_size +13 | os.path.getsize(__file__) +14 | +15 | os.path.getsize(filename) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:13:1 @@ -74,16 +68,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 15 | os.path.getsize(filename) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -10 10 | os.path.getsize("filename") -11 11 | os.path.getsize(b"filename") -12 12 | os.path.getsize(Path("filename")) -13 |-os.path.getsize(__file__) - 13 |+Path(__file__).stat().st_size -14 14 | -15 15 | os.path.getsize(filename) -16 16 | os.path.getsize(filename1) +10 | os.path.getsize("filename") +11 | os.path.getsize(b"filename") +12 | os.path.getsize(Path("filename")) + - os.path.getsize(__file__) +13 + Path(__file__).stat().st_size +14 | +15 | os.path.getsize(filename) +16 | os.path.getsize(filename1) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:15:1 @@ -96,16 +88,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 17 | os.path.getsize(filename2) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -12 12 | os.path.getsize(Path("filename")) -13 13 | os.path.getsize(__file__) -14 14 | -15 |-os.path.getsize(filename) - 15 |+Path(filename).stat().st_size -16 16 | os.path.getsize(filename1) -17 17 | os.path.getsize(filename2) -18 18 | +12 | os.path.getsize(Path("filename")) +13 | os.path.getsize(__file__) +14 | + - os.path.getsize(filename) +15 + Path(filename).stat().st_size +16 | os.path.getsize(filename1) +17 | os.path.getsize(filename2) +18 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:16:1 @@ -116,16 +106,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 17 | os.path.getsize(filename2) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -13 13 | os.path.getsize(__file__) -14 14 | -15 15 | os.path.getsize(filename) -16 |-os.path.getsize(filename1) - 16 |+Path(filename1).stat().st_size -17 17 | os.path.getsize(filename2) -18 18 | -19 19 | os.path.getsize(filename="filename") +13 | os.path.getsize(__file__) +14 | +15 | os.path.getsize(filename) + - os.path.getsize(filename1) +16 + Path(filename1).stat().st_size +17 | os.path.getsize(filename2) +18 | +19 | os.path.getsize(filename="filename") PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:17:1 @@ -138,16 +126,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 19 | os.path.getsize(filename="filename") | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -14 14 | -15 15 | os.path.getsize(filename) -16 16 | os.path.getsize(filename1) -17 |-os.path.getsize(filename2) - 17 |+Path(filename2).stat().st_size -18 18 | -19 19 | os.path.getsize(filename="filename") -20 20 | os.path.getsize(filename=b"filename") +14 | +15 | os.path.getsize(filename) +16 | os.path.getsize(filename1) + - os.path.getsize(filename2) +17 + Path(filename2).stat().st_size +18 | +19 | os.path.getsize(filename="filename") +20 | os.path.getsize(filename=b"filename") PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:19:1 @@ -160,16 +146,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 21 | os.path.getsize(filename=Path("filename")) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -16 16 | os.path.getsize(filename1) -17 17 | os.path.getsize(filename2) -18 18 | -19 |-os.path.getsize(filename="filename") - 19 |+Path("filename").stat().st_size -20 20 | os.path.getsize(filename=b"filename") -21 21 | os.path.getsize(filename=Path("filename")) -22 22 | os.path.getsize(filename=__file__) +16 | os.path.getsize(filename1) +17 | os.path.getsize(filename2) +18 | + - os.path.getsize(filename="filename") +19 + Path("filename").stat().st_size +20 | os.path.getsize(filename=b"filename") +21 | os.path.getsize(filename=Path("filename")) +22 | os.path.getsize(filename=__file__) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:20:1 @@ -181,16 +165,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 22 | os.path.getsize(filename=__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -17 17 | os.path.getsize(filename2) -18 18 | -19 19 | os.path.getsize(filename="filename") -20 |-os.path.getsize(filename=b"filename") - 20 |+Path(b"filename").stat().st_size -21 21 | os.path.getsize(filename=Path("filename")) -22 22 | os.path.getsize(filename=__file__) -23 23 | +17 | os.path.getsize(filename2) +18 | +19 | os.path.getsize(filename="filename") + - os.path.getsize(filename=b"filename") +20 + Path(b"filename").stat().st_size +21 | os.path.getsize(filename=Path("filename")) +22 | os.path.getsize(filename=__file__) +23 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:21:1 @@ -202,16 +184,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 22 | os.path.getsize(filename=__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -18 18 | -19 19 | os.path.getsize(filename="filename") -20 20 | os.path.getsize(filename=b"filename") -21 |-os.path.getsize(filename=Path("filename")) - 21 |+Path("filename").stat().st_size -22 22 | os.path.getsize(filename=__file__) -23 23 | -24 24 | getsize("filename") +18 | +19 | os.path.getsize(filename="filename") +20 | os.path.getsize(filename=b"filename") + - os.path.getsize(filename=Path("filename")) +21 + Path("filename").stat().st_size +22 | os.path.getsize(filename=__file__) +23 | +24 | getsize("filename") PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:22:1 @@ -224,16 +204,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 24 | getsize("filename") | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -19 19 | os.path.getsize(filename="filename") -20 20 | os.path.getsize(filename=b"filename") -21 21 | os.path.getsize(filename=Path("filename")) -22 |-os.path.getsize(filename=__file__) - 22 |+Path(__file__).stat().st_size -23 23 | -24 24 | getsize("filename") -25 25 | getsize(b"filename") +19 | os.path.getsize(filename="filename") +20 | os.path.getsize(filename=b"filename") +21 | os.path.getsize(filename=Path("filename")) + - os.path.getsize(filename=__file__) +22 + Path(__file__).stat().st_size +23 | +24 | getsize("filename") +25 | getsize(b"filename") PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:24:1 @@ -246,16 +224,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 26 | getsize(Path("filename")) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -21 21 | os.path.getsize(filename=Path("filename")) -22 22 | os.path.getsize(filename=__file__) -23 23 | -24 |-getsize("filename") - 24 |+Path("filename").stat().st_size -25 25 | getsize(b"filename") -26 26 | getsize(Path("filename")) -27 27 | getsize(__file__) +21 | os.path.getsize(filename=Path("filename")) +22 | os.path.getsize(filename=__file__) +23 | + - getsize("filename") +24 + Path("filename").stat().st_size +25 | getsize(b"filename") +26 | getsize(Path("filename")) +27 | getsize(__file__) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:25:1 @@ -267,16 +243,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 27 | getsize(__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -22 22 | os.path.getsize(filename=__file__) -23 23 | -24 24 | getsize("filename") -25 |-getsize(b"filename") - 25 |+Path(b"filename").stat().st_size -26 26 | getsize(Path("filename")) -27 27 | getsize(__file__) -28 28 | +22 | os.path.getsize(filename=__file__) +23 | +24 | getsize("filename") + - getsize(b"filename") +25 + Path(b"filename").stat().st_size +26 | getsize(Path("filename")) +27 | getsize(__file__) +28 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:26:1 @@ -288,16 +262,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 27 | getsize(__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -23 23 | -24 24 | getsize("filename") -25 25 | getsize(b"filename") -26 |-getsize(Path("filename")) - 26 |+Path("filename").stat().st_size -27 27 | getsize(__file__) -28 28 | -29 29 | getsize(filename="filename") +23 | +24 | getsize("filename") +25 | getsize(b"filename") + - getsize(Path("filename")) +26 + Path("filename").stat().st_size +27 | getsize(__file__) +28 | +29 | getsize(filename="filename") PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:27:1 @@ -310,16 +282,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 29 | getsize(filename="filename") | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -24 24 | getsize("filename") -25 25 | getsize(b"filename") -26 26 | getsize(Path("filename")) -27 |-getsize(__file__) - 27 |+Path(__file__).stat().st_size -28 28 | -29 29 | getsize(filename="filename") -30 30 | getsize(filename=b"filename") +24 | getsize("filename") +25 | getsize(b"filename") +26 | getsize(Path("filename")) + - getsize(__file__) +27 + Path(__file__).stat().st_size +28 | +29 | getsize(filename="filename") +30 | getsize(filename=b"filename") PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:29:1 @@ -332,16 +302,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 31 | getsize(filename=Path("filename")) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -26 26 | getsize(Path("filename")) -27 27 | getsize(__file__) -28 28 | -29 |-getsize(filename="filename") - 29 |+Path("filename").stat().st_size -30 30 | getsize(filename=b"filename") -31 31 | getsize(filename=Path("filename")) -32 32 | getsize(filename=__file__) +26 | getsize(Path("filename")) +27 | getsize(__file__) +28 | + - getsize(filename="filename") +29 + Path("filename").stat().st_size +30 | getsize(filename=b"filename") +31 | getsize(filename=Path("filename")) +32 | getsize(filename=__file__) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:30:1 @@ -353,16 +321,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 32 | getsize(filename=__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -27 27 | getsize(__file__) -28 28 | -29 29 | getsize(filename="filename") -30 |-getsize(filename=b"filename") - 30 |+Path(b"filename").stat().st_size -31 31 | getsize(filename=Path("filename")) -32 32 | getsize(filename=__file__) -33 33 | +27 | getsize(__file__) +28 | +29 | getsize(filename="filename") + - getsize(filename=b"filename") +30 + Path(b"filename").stat().st_size +31 | getsize(filename=Path("filename")) +32 | getsize(filename=__file__) +33 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:31:1 @@ -374,16 +340,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 32 | getsize(filename=__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -28 28 | -29 29 | getsize(filename="filename") -30 30 | getsize(filename=b"filename") -31 |-getsize(filename=Path("filename")) - 31 |+Path("filename").stat().st_size -32 32 | getsize(filename=__file__) -33 33 | -34 34 | getsize(filename) +28 | +29 | getsize(filename="filename") +30 | getsize(filename=b"filename") + - getsize(filename=Path("filename")) +31 + Path("filename").stat().st_size +32 | getsize(filename=__file__) +33 | +34 | getsize(filename) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:32:1 @@ -396,16 +360,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 34 | getsize(filename) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -29 29 | getsize(filename="filename") -30 30 | getsize(filename=b"filename") -31 31 | getsize(filename=Path("filename")) -32 |-getsize(filename=__file__) - 32 |+Path(__file__).stat().st_size -33 33 | -34 34 | getsize(filename) -35 35 | getsize(filename1) +29 | getsize(filename="filename") +30 | getsize(filename=b"filename") +31 | getsize(filename=Path("filename")) + - getsize(filename=__file__) +32 + Path(__file__).stat().st_size +33 | +34 | getsize(filename) +35 | getsize(filename1) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:34:1 @@ -418,16 +380,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 36 | getsize(filename2) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -31 31 | getsize(filename=Path("filename")) -32 32 | getsize(filename=__file__) -33 33 | -34 |-getsize(filename) - 34 |+Path(filename).stat().st_size -35 35 | getsize(filename1) -36 36 | getsize(filename2) -37 37 | +31 | getsize(filename=Path("filename")) +32 | getsize(filename=__file__) +33 | + - getsize(filename) +34 + Path(filename).stat().st_size +35 | getsize(filename1) +36 | getsize(filename2) +37 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:35:1 @@ -438,16 +398,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 36 | getsize(filename2) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -32 32 | getsize(filename=__file__) -33 33 | -34 34 | getsize(filename) -35 |-getsize(filename1) - 35 |+Path(filename1).stat().st_size -36 36 | getsize(filename2) -37 37 | -38 38 | +32 | getsize(filename=__file__) +33 | +34 | getsize(filename) + - getsize(filename1) +35 + Path(filename1).stat().st_size +36 | getsize(filename2) +37 | +38 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:36:1 @@ -458,16 +416,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` | ^^^^^^^ | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -33 33 | -34 34 | getsize(filename) -35 35 | getsize(filename1) -36 |-getsize(filename2) - 36 |+Path(filename2).stat().st_size -37 37 | -38 38 | -39 39 | os.path.getsize( +33 | +34 | getsize(filename) +35 | getsize(filename1) + - getsize(filename2) +36 + Path(filename2).stat().st_size +37 | +38 | +39 | os.path.getsize( PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:39:1 @@ -478,18 +434,17 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 41 | ) | help: Replace with `Path(...).stat().st_size` - -ℹ Unsafe fix -36 36 | getsize(filename2) -37 37 | -38 38 | -39 |-os.path.getsize( -40 |- "filename", # comment -41 |-) - 39 |+Path("filename").stat().st_size -42 40 | -43 41 | os.path.getsize( -44 42 | # comment +36 | getsize(filename2) +37 | +38 | + - os.path.getsize( + - "filename", # comment + - ) +39 + Path("filename").stat().st_size +40 | +41 | os.path.getsize( +42 | # comment +note: This is an unsafe fix and may change runtime behavior PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:43:1 @@ -502,21 +457,20 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 45 | "filename" | help: Replace with `Path(...).stat().st_size` - -ℹ Unsafe fix -40 40 | "filename", # comment -41 41 | ) -42 42 | -43 |-os.path.getsize( -44 |- # comment -45 |- "filename" -46 |- , -47 |- # comment -48 |-) - 43 |+Path("filename").stat().st_size -49 44 | -50 45 | os.path.getsize( -51 46 | # comment +40 | "filename", # comment +41 | ) +42 | + - os.path.getsize( + - # comment + - "filename" + - , + - # comment + - ) +43 + Path("filename").stat().st_size +44 | +45 | os.path.getsize( +46 | # comment +note: This is an unsafe fix and may change runtime behavior PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:50:1 @@ -529,20 +483,19 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 52 | b"filename" | help: Replace with `Path(...).stat().st_size` - -ℹ Unsafe fix -47 47 | # comment -48 48 | ) -49 49 | -50 |-os.path.getsize( -51 |- # comment -52 |- b"filename" -53 |- # comment -54 |-) - 50 |+Path(b"filename").stat().st_size -55 51 | -56 52 | os.path.getsize( # comment -57 53 | Path(__file__) +47 | # comment +48 | ) +49 | + - os.path.getsize( + - # comment + - b"filename" + - # comment + - ) +50 + Path(b"filename").stat().st_size +51 | +52 | os.path.getsize( # comment +53 | Path(__file__) +note: This is an unsafe fix and may change runtime behavior PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:56:1 @@ -555,19 +508,18 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 58 | # comment | help: Replace with `Path(...).stat().st_size` - -ℹ Unsafe fix -53 53 | # comment -54 54 | ) -55 55 | -56 |-os.path.getsize( # comment -57 |- Path(__file__) -58 |- # comment -59 |-) # comment - 56 |+Path(__file__).stat().st_size # comment -60 57 | -61 58 | getsize( # comment -62 59 | "filename") +53 | # comment +54 | ) +55 | + - os.path.getsize( # comment + - Path(__file__) + - # comment + - ) # comment +56 + Path(__file__).stat().st_size # comment +57 | +58 | getsize( # comment +59 | "filename") +note: This is an unsafe fix and may change runtime behavior PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:61:1 @@ -579,17 +531,16 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 62 | "filename") | help: Replace with `Path(...).stat().st_size` - -ℹ Unsafe fix -58 58 | # comment -59 59 | ) # comment -60 60 | -61 |-getsize( # comment -62 |- "filename") - 61 |+Path("filename").stat().st_size -63 62 | -64 63 | getsize( # comment -65 64 | b"filename", +58 | # comment +59 | ) # comment +60 | + - getsize( # comment + - "filename") +61 + Path("filename").stat().st_size +62 | +63 | getsize( # comment +64 | b"filename", +note: This is an unsafe fix and may change runtime behavior PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:64:1 @@ -602,19 +553,18 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 66 | #comment | help: Replace with `Path(...).stat().st_size` - -ℹ Unsafe fix -61 61 | getsize( # comment -62 62 | "filename") -63 63 | -64 |-getsize( # comment -65 |- b"filename", -66 |- #comment -67 |-) - 64 |+Path(b"filename").stat().st_size -68 65 | -69 66 | os.path.getsize("file" + "name") -70 67 | +61 | getsize( # comment +62 | "filename") +63 | + - getsize( # comment + - b"filename", + - #comment + - ) +64 + Path(b"filename").stat().st_size +65 | +66 | os.path.getsize("file" + "name") +67 | +note: This is an unsafe fix and may change runtime behavior PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:69:1 @@ -627,16 +577,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 71 | getsize \ | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -66 66 | #comment -67 67 | ) -68 68 | -69 |-os.path.getsize("file" + "name") - 69 |+Path("file" + "name").stat().st_size -70 70 | -71 71 | getsize \ -72 72 | \ +66 | #comment +67 | ) +68 | + - os.path.getsize("file" + "name") +69 + Path("file" + "name").stat().st_size +70 | +71 | getsize \ +72 | \ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:71:1 @@ -649,21 +597,20 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 73 | \ | help: Replace with `Path(...).stat().st_size` - -ℹ Unsafe fix -68 68 | -69 69 | os.path.getsize("file" + "name") -70 70 | -71 |-getsize \ -72 |-\ -73 |-\ -74 |- ( # comment -75 |- "filename", -76 |- ) - 71 |+Path("filename").stat().st_size -77 72 | -78 73 | getsize(Path("filename").resolve()) -79 74 | +68 | +69 | os.path.getsize("file" + "name") +70 | + - getsize \ + - \ + - \ + - ( # comment + - "filename", + - ) +71 + Path("filename").stat().st_size +72 | +73 | getsize(Path("filename").resolve()) +74 | +note: This is an unsafe fix and may change runtime behavior PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:78:1 @@ -676,16 +623,14 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 80 | import pathlib | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -75 75 | "filename", -76 76 | ) -77 77 | -78 |-getsize(Path("filename").resolve()) - 78 |+Path(Path("filename").resolve()).stat().st_size -79 79 | -80 80 | import pathlib -81 81 | +75 | "filename", +76 | ) +77 | + - getsize(Path("filename").resolve()) +78 + Path(Path("filename").resolve()).stat().st_size +79 | +80 | import pathlib +81 | PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202.py:82:1 @@ -696,10 +641,8 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` | ^^^^^^^^^^^^^^^ | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -79 79 | -80 80 | import pathlib -81 81 | -82 |-os.path.getsize(pathlib.Path("filename")) - 82 |+pathlib.Path("filename").stat().st_size +79 | +80 | import pathlib +81 | + - os.path.getsize(pathlib.Path("filename")) +82 + pathlib.Path("filename").stat().st_size diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap index 95dc695ee6..fbeba4eace 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH202_PTH202_2.py.snap @@ -12,15 +12,13 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 5 | os.path.getsize(filename=__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -1 1 | import os - 2 |+import pathlib -2 3 | -3 |-os.path.getsize(filename="filename") - 4 |+pathlib.Path("filename").stat().st_size -4 5 | os.path.getsize(filename=b"filename") -5 6 | os.path.getsize(filename=__file__) +1 | import os +2 + import pathlib +3 | + - os.path.getsize(filename="filename") +4 + pathlib.Path("filename").stat().st_size +5 | os.path.getsize(filename=b"filename") +6 | os.path.getsize(filename=__file__) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202_2.py:4:1 @@ -31,15 +29,13 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` 5 | os.path.getsize(filename=__file__) | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -1 1 | import os - 2 |+import pathlib -2 3 | -3 4 | os.path.getsize(filename="filename") -4 |-os.path.getsize(filename=b"filename") - 5 |+pathlib.Path(b"filename").stat().st_size -5 6 | os.path.getsize(filename=__file__) +1 | import os +2 + import pathlib +3 | +4 | os.path.getsize(filename="filename") + - os.path.getsize(filename=b"filename") +5 + pathlib.Path(b"filename").stat().st_size +6 | os.path.getsize(filename=__file__) PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` --> PTH202_2.py:5:1 @@ -50,12 +46,10 @@ PTH202 [*] `os.path.getsize` should be replaced by `Path.stat().st_size` | ^^^^^^^^^^^^^^^ | help: Replace with `Path(...).stat().st_size` - -ℹ Safe fix -1 1 | import os - 2 |+import pathlib -2 3 | -3 4 | os.path.getsize(filename="filename") -4 5 | os.path.getsize(filename=b"filename") -5 |-os.path.getsize(filename=__file__) - 6 |+pathlib.Path(__file__).stat().st_size +1 | import os +2 + import pathlib +3 | +4 | os.path.getsize(filename="filename") +5 | os.path.getsize(filename=b"filename") + - os.path.getsize(filename=__file__) +6 + pathlib.Path(__file__).stat().st_size diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap index 81109e01bd..374d0094c6 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH203_PTH203.py.snap @@ -12,16 +12,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 7 | os.path.getatime(Path("filename")) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -2 2 | from pathlib import Path -3 3 | from os.path import getatime -4 4 | -5 |-os.path.getatime("filename") - 5 |+Path("filename").stat().st_atime -6 6 | os.path.getatime(b"filename") -7 7 | os.path.getatime(Path("filename")) -8 8 | +2 | from pathlib import Path +3 | from os.path import getatime +4 | + - os.path.getatime("filename") +5 + Path("filename").stat().st_atime +6 | os.path.getatime(b"filename") +7 | os.path.getatime(Path("filename")) +8 | PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:6:1 @@ -32,16 +30,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 7 | os.path.getatime(Path("filename")) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -3 3 | from os.path import getatime -4 4 | -5 5 | os.path.getatime("filename") -6 |-os.path.getatime(b"filename") - 6 |+Path(b"filename").stat().st_atime -7 7 | os.path.getatime(Path("filename")) -8 8 | -9 9 | +3 | from os.path import getatime +4 | +5 | os.path.getatime("filename") + - os.path.getatime(b"filename") +6 + Path(b"filename").stat().st_atime +7 | os.path.getatime(Path("filename")) +8 | +9 | PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:7:1 @@ -52,16 +48,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` | ^^^^^^^^^^^^^^^^ | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -4 4 | -5 5 | os.path.getatime("filename") -6 6 | os.path.getatime(b"filename") -7 |-os.path.getatime(Path("filename")) - 7 |+Path("filename").stat().st_atime -8 8 | -9 9 | -10 10 | getatime("filename") +4 | +5 | os.path.getatime("filename") +6 | os.path.getatime(b"filename") + - os.path.getatime(Path("filename")) +7 + Path("filename").stat().st_atime +8 | +9 | +10 | getatime("filename") PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:10:1 @@ -72,16 +66,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 12 | getatime(Path("filename")) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -7 7 | os.path.getatime(Path("filename")) -8 8 | -9 9 | -10 |-getatime("filename") - 10 |+Path("filename").stat().st_atime -11 11 | getatime(b"filename") -12 12 | getatime(Path("filename")) -13 13 | +7 | os.path.getatime(Path("filename")) +8 | +9 | + - getatime("filename") +10 + Path("filename").stat().st_atime +11 | getatime(b"filename") +12 | getatime(Path("filename")) +13 | PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:11:1 @@ -92,16 +84,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 12 | getatime(Path("filename")) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -8 8 | -9 9 | -10 10 | getatime("filename") -11 |-getatime(b"filename") - 11 |+Path(b"filename").stat().st_atime -12 12 | getatime(Path("filename")) -13 13 | -14 14 | +8 | +9 | +10 | getatime("filename") + - getatime(b"filename") +11 + Path(b"filename").stat().st_atime +12 | getatime(Path("filename")) +13 | +14 | PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:12:1 @@ -112,16 +102,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` | ^^^^^^^^ | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -9 9 | -10 10 | getatime("filename") -11 11 | getatime(b"filename") -12 |-getatime(Path("filename")) - 12 |+Path("filename").stat().st_atime -13 13 | -14 14 | -15 15 | file = __file__ +9 | +10 | getatime("filename") +11 | getatime(b"filename") + - getatime(Path("filename")) +12 + Path("filename").stat().st_atime +13 | +14 | +15 | file = __file__ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:17:1 @@ -134,16 +122,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 19 | os.path.getatime(filename=Path("filename")) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -14 14 | -15 15 | file = __file__ -16 16 | -17 |-os.path.getatime(file) - 17 |+Path(file).stat().st_atime -18 18 | os.path.getatime(filename="filename") -19 19 | os.path.getatime(filename=Path("filename")) -20 20 | +14 | +15 | file = __file__ +16 | + - os.path.getatime(file) +17 + Path(file).stat().st_atime +18 | os.path.getatime(filename="filename") +19 | os.path.getatime(filename=Path("filename")) +20 | PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:18:1 @@ -154,16 +140,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 19 | os.path.getatime(filename=Path("filename")) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -15 15 | file = __file__ -16 16 | -17 17 | os.path.getatime(file) -18 |-os.path.getatime(filename="filename") - 18 |+Path("filename").stat().st_atime -19 19 | os.path.getatime(filename=Path("filename")) -20 20 | -21 21 | os.path.getatime( # comment 1 +15 | file = __file__ +16 | +17 | os.path.getatime(file) + - os.path.getatime(filename="filename") +18 + Path("filename").stat().st_atime +19 | os.path.getatime(filename=Path("filename")) +20 | +21 | os.path.getatime( # comment 1 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:19:1 @@ -176,16 +160,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 21 | os.path.getatime( # comment 1 | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -16 16 | -17 17 | os.path.getatime(file) -18 18 | os.path.getatime(filename="filename") -19 |-os.path.getatime(filename=Path("filename")) - 19 |+Path("filename").stat().st_atime -20 20 | -21 21 | os.path.getatime( # comment 1 -22 22 | # comment 2 +16 | +17 | os.path.getatime(file) +18 | os.path.getatime(filename="filename") + - os.path.getatime(filename=Path("filename")) +19 + Path("filename").stat().st_atime +20 | +21 | os.path.getatime( # comment 1 +22 | # comment 2 PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:21:1 @@ -198,22 +180,21 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 23 | "filename" # comment 3 | help: Replace with `Path.stat(...).st_atime` - -ℹ Unsafe fix -18 18 | os.path.getatime(filename="filename") -19 19 | os.path.getatime(filename=Path("filename")) -20 20 | -21 |-os.path.getatime( # comment 1 -22 |- # comment 2 -23 |- "filename" # comment 3 -24 |- # comment 4 -25 |- , # comment 5 -26 |- # comment 6 -27 |-) # comment 7 - 21 |+Path("filename").stat().st_atime # comment 7 -28 22 | -29 23 | os.path.getatime("file" + "name") -30 24 | +18 | os.path.getatime(filename="filename") +19 | os.path.getatime(filename=Path("filename")) +20 | + - os.path.getatime( # comment 1 + - # comment 2 + - "filename" # comment 3 + - # comment 4 + - , # comment 5 + - # comment 6 + - ) # comment 7 +21 + Path("filename").stat().st_atime # comment 7 +22 | +23 | os.path.getatime("file" + "name") +24 | +note: This is an unsafe fix and may change runtime behavior PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:29:1 @@ -226,16 +207,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 31 | getatime(Path("filename").resolve()) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -26 26 | # comment 6 -27 27 | ) # comment 7 -28 28 | -29 |-os.path.getatime("file" + "name") - 29 |+Path("file" + "name").stat().st_atime -30 30 | -31 31 | getatime(Path("filename").resolve()) -32 32 | +26 | # comment 6 +27 | ) # comment 7 +28 | + - os.path.getatime("file" + "name") +29 + Path("file" + "name").stat().st_atime +30 | +31 | getatime(Path("filename").resolve()) +32 | PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:31:1 @@ -248,16 +227,14 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 33 | os.path.getatime(pathlib.Path("filename")) | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -28 28 | -29 29 | os.path.getatime("file" + "name") -30 30 | -31 |-getatime(Path("filename").resolve()) - 31 |+Path(Path("filename").resolve()).stat().st_atime -32 32 | -33 33 | os.path.getatime(pathlib.Path("filename")) -34 34 | +28 | +29 | os.path.getatime("file" + "name") +30 | + - getatime(Path("filename").resolve()) +31 + Path(Path("filename").resolve()).stat().st_atime +32 | +33 | os.path.getatime(pathlib.Path("filename")) +34 | PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:33:1 @@ -270,15 +247,13 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` 35 | getatime(Path("dir") / "file.txt") | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -30 30 | -31 31 | getatime(Path("filename").resolve()) -32 32 | -33 |-os.path.getatime(pathlib.Path("filename")) - 33 |+pathlib.Path("filename").stat().st_atime -34 34 | -35 35 | getatime(Path("dir") / "file.txt") +30 | +31 | getatime(Path("filename").resolve()) +32 | + - os.path.getatime(pathlib.Path("filename")) +33 + pathlib.Path("filename").stat().st_atime +34 | +35 | getatime(Path("dir") / "file.txt") PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` --> PTH203.py:35:1 @@ -289,10 +264,8 @@ PTH203 [*] `os.path.getatime` should be replaced by `Path.stat().st_atime` | ^^^^^^^^ | help: Replace with `Path.stat(...).st_atime` - -ℹ Safe fix -32 32 | -33 33 | os.path.getatime(pathlib.Path("filename")) -34 34 | -35 |-getatime(Path("dir") / "file.txt") - 35 |+Path(Path("dir") / "file.txt").stat().st_atime +32 | +33 | os.path.getatime(pathlib.Path("filename")) +34 | + - getatime(Path("dir") / "file.txt") +35 + Path(Path("dir") / "file.txt").stat().st_atime diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap index 023f059ab3..cb48936311 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH204_PTH204.py.snap @@ -10,16 +10,14 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` 8 | os.path.getmtime(Path("filename")) | help: Replace with `Path.stat(...).st_mtime` - -ℹ Safe fix -3 3 | from os.path import getmtime -4 4 | -5 5 | -6 |-os.path.getmtime("filename") - 6 |+Path("filename").stat().st_mtime -7 7 | os.path.getmtime(b"filename") -8 8 | os.path.getmtime(Path("filename")) -9 9 | +3 | from os.path import getmtime +4 | +5 | + - os.path.getmtime("filename") +6 + Path("filename").stat().st_mtime +7 | os.path.getmtime(b"filename") +8 | os.path.getmtime(Path("filename")) +9 | PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` --> PTH204.py:7:1 @@ -30,16 +28,14 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` 8 | os.path.getmtime(Path("filename")) | help: Replace with `Path.stat(...).st_mtime` - -ℹ Safe fix -4 4 | -5 5 | -6 6 | os.path.getmtime("filename") -7 |-os.path.getmtime(b"filename") - 7 |+Path(b"filename").stat().st_mtime -8 8 | os.path.getmtime(Path("filename")) -9 9 | -10 10 | +4 | +5 | +6 | os.path.getmtime("filename") + - os.path.getmtime(b"filename") +7 + Path(b"filename").stat().st_mtime +8 | os.path.getmtime(Path("filename")) +9 | +10 | PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` --> PTH204.py:8:1 @@ -50,16 +46,14 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` | ^^^^^^^^^^^^^^^^ | help: Replace with `Path.stat(...).st_mtime` - -ℹ Safe fix -5 5 | -6 6 | os.path.getmtime("filename") -7 7 | os.path.getmtime(b"filename") -8 |-os.path.getmtime(Path("filename")) - 8 |+Path("filename").stat().st_mtime -9 9 | -10 10 | -11 11 | getmtime("filename") +5 | +6 | os.path.getmtime("filename") +7 | os.path.getmtime(b"filename") + - os.path.getmtime(Path("filename")) +8 + Path("filename").stat().st_mtime +9 | +10 | +11 | getmtime("filename") PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` --> PTH204.py:11:1 @@ -70,15 +64,13 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` 13 | getmtime(Path("filename")) | help: Replace with `Path.stat(...).st_mtime` - -ℹ Safe fix -8 8 | os.path.getmtime(Path("filename")) -9 9 | -10 10 | -11 |-getmtime("filename") - 11 |+Path("filename").stat().st_mtime -12 12 | getmtime(b"filename") -13 13 | getmtime(Path("filename")) +8 | os.path.getmtime(Path("filename")) +9 | +10 | + - getmtime("filename") +11 + Path("filename").stat().st_mtime +12 | getmtime(b"filename") +13 | getmtime(Path("filename")) PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` --> PTH204.py:12:1 @@ -89,14 +81,12 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` 13 | getmtime(Path("filename")) | help: Replace with `Path.stat(...).st_mtime` - -ℹ Safe fix -9 9 | -10 10 | -11 11 | getmtime("filename") -12 |-getmtime(b"filename") - 12 |+Path(b"filename").stat().st_mtime -13 13 | getmtime(Path("filename")) +9 | +10 | +11 | getmtime("filename") + - getmtime(b"filename") +12 + Path(b"filename").stat().st_mtime +13 | getmtime(Path("filename")) PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` --> PTH204.py:13:1 @@ -107,10 +97,8 @@ PTH204 [*] `os.path.getmtime` should be replaced by `Path.stat().st_mtime` | ^^^^^^^^ | help: Replace with `Path.stat(...).st_mtime` - -ℹ Safe fix -10 10 | -11 11 | getmtime("filename") -12 12 | getmtime(b"filename") -13 |-getmtime(Path("filename")) - 13 |+Path("filename").stat().st_mtime +10 | +11 | getmtime("filename") +12 | getmtime(b"filename") + - getmtime(Path("filename")) +13 + Path("filename").stat().st_mtime diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap index 858f75f1ed..c15f941c5e 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH205_PTH205.py.snap @@ -10,16 +10,14 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` 8 | os.path.getctime(Path("filename")) | help: Replace with `Path.stat(...).st_ctime` - -ℹ Safe fix -3 3 | from os.path import getctime -4 4 | -5 5 | -6 |-os.path.getctime("filename") - 6 |+Path("filename").stat().st_ctime -7 7 | os.path.getctime(b"filename") -8 8 | os.path.getctime(Path("filename")) -9 9 | +3 | from os.path import getctime +4 | +5 | + - os.path.getctime("filename") +6 + Path("filename").stat().st_ctime +7 | os.path.getctime(b"filename") +8 | os.path.getctime(Path("filename")) +9 | PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` --> PTH205.py:7:1 @@ -30,16 +28,14 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` 8 | os.path.getctime(Path("filename")) | help: Replace with `Path.stat(...).st_ctime` - -ℹ Safe fix -4 4 | -5 5 | -6 6 | os.path.getctime("filename") -7 |-os.path.getctime(b"filename") - 7 |+Path(b"filename").stat().st_ctime -8 8 | os.path.getctime(Path("filename")) -9 9 | -10 10 | getctime("filename") +4 | +5 | +6 | os.path.getctime("filename") + - os.path.getctime(b"filename") +7 + Path(b"filename").stat().st_ctime +8 | os.path.getctime(Path("filename")) +9 | +10 | getctime("filename") PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` --> PTH205.py:8:1 @@ -52,16 +48,14 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` 10 | getctime("filename") | help: Replace with `Path.stat(...).st_ctime` - -ℹ Safe fix -5 5 | -6 6 | os.path.getctime("filename") -7 7 | os.path.getctime(b"filename") -8 |-os.path.getctime(Path("filename")) - 8 |+Path("filename").stat().st_ctime -9 9 | -10 10 | getctime("filename") -11 11 | getctime(b"filename") +5 | +6 | os.path.getctime("filename") +7 | os.path.getctime(b"filename") + - os.path.getctime(Path("filename")) +8 + Path("filename").stat().st_ctime +9 | +10 | getctime("filename") +11 | getctime(b"filename") PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` --> PTH205.py:10:1 @@ -74,15 +68,13 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` 12 | getctime(Path("filename")) | help: Replace with `Path.stat(...).st_ctime` - -ℹ Safe fix -7 7 | os.path.getctime(b"filename") -8 8 | os.path.getctime(Path("filename")) -9 9 | -10 |-getctime("filename") - 10 |+Path("filename").stat().st_ctime -11 11 | getctime(b"filename") -12 12 | getctime(Path("filename")) +7 | os.path.getctime(b"filename") +8 | os.path.getctime(Path("filename")) +9 | + - getctime("filename") +10 + Path("filename").stat().st_ctime +11 | getctime(b"filename") +12 | getctime(Path("filename")) PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` --> PTH205.py:11:1 @@ -93,14 +85,12 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` 12 | getctime(Path("filename")) | help: Replace with `Path.stat(...).st_ctime` - -ℹ Safe fix -8 8 | os.path.getctime(Path("filename")) -9 9 | -10 10 | getctime("filename") -11 |-getctime(b"filename") - 11 |+Path(b"filename").stat().st_ctime -12 12 | getctime(Path("filename")) +8 | os.path.getctime(Path("filename")) +9 | +10 | getctime("filename") + - getctime(b"filename") +11 + Path(b"filename").stat().st_ctime +12 | getctime(Path("filename")) PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` --> PTH205.py:12:1 @@ -111,10 +101,8 @@ PTH205 [*] `os.path.getctime` should be replaced by `Path.stat().st_ctime` | ^^^^^^^^ | help: Replace with `Path.stat(...).st_ctime` - -ℹ Safe fix -9 9 | -10 10 | getctime("filename") -11 11 | getctime(b"filename") -12 |-getctime(Path("filename")) - 12 |+Path("filename").stat().st_ctime +9 | +10 | getctime("filename") +11 | getctime(b"filename") + - getctime(Path("filename")) +12 + Path("filename").stat().st_ctime diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH211_PTH211.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH211_PTH211.py.snap index d6f0db9f8a..02ca128887 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH211_PTH211.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview__PTH211_PTH211.py.snap @@ -10,16 +10,14 @@ PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` 7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok | help: Replace with `Path(...).symlink_to(...)` - -ℹ Safe fix -2 2 | from pathlib import Path -3 3 | -4 4 | -5 |-os.symlink("usr/bin/python", "tmp/python") - 5 |+Path("tmp/python").symlink_to("usr/bin/python") -6 6 | os.symlink(b"usr/bin/python", b"tmp/python") -7 7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok -8 8 | +2 | from pathlib import Path +3 | +4 | + - os.symlink("usr/bin/python", "tmp/python") +5 + Path("tmp/python").symlink_to("usr/bin/python") +6 | os.symlink(b"usr/bin/python", b"tmp/python") +7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok +8 | PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` --> PTH211.py:6:1 @@ -30,16 +28,14 @@ PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` 7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok | help: Replace with `Path(...).symlink_to(...)` - -ℹ Safe fix -3 3 | -4 4 | -5 5 | os.symlink("usr/bin/python", "tmp/python") -6 |-os.symlink(b"usr/bin/python", b"tmp/python") - 6 |+Path(b"tmp/python").symlink_to(b"usr/bin/python") -7 7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok -8 8 | -9 9 | os.symlink("usr/bin/python", "tmp/python", target_is_directory=True) +3 | +4 | +5 | os.symlink("usr/bin/python", "tmp/python") + - os.symlink(b"usr/bin/python", b"tmp/python") +6 + Path(b"tmp/python").symlink_to(b"usr/bin/python") +7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok +8 | +9 | os.symlink("usr/bin/python", "tmp/python", target_is_directory=True) PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` --> PTH211.py:9:1 @@ -52,16 +48,14 @@ PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` 11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) # Ok | help: Replace with `Path(...).symlink_to(...)` - -ℹ Safe fix -6 6 | os.symlink(b"usr/bin/python", b"tmp/python") -7 7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok -8 8 | -9 |-os.symlink("usr/bin/python", "tmp/python", target_is_directory=True) - 9 |+Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) -10 10 | os.symlink(b"usr/bin/python", b"tmp/python", target_is_directory=True) -11 11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) # Ok -12 12 | +6 | os.symlink(b"usr/bin/python", b"tmp/python") +7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok +8 | + - os.symlink("usr/bin/python", "tmp/python", target_is_directory=True) +9 + Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) +10 | os.symlink(b"usr/bin/python", b"tmp/python", target_is_directory=True) +11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) # Ok +12 | PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` --> PTH211.py:10:1 @@ -72,16 +66,14 @@ PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` 11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) # Ok | help: Replace with `Path(...).symlink_to(...)` - -ℹ Safe fix -7 7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok -8 8 | -9 9 | os.symlink("usr/bin/python", "tmp/python", target_is_directory=True) -10 |-os.symlink(b"usr/bin/python", b"tmp/python", target_is_directory=True) - 10 |+Path(b"tmp/python").symlink_to(b"usr/bin/python", target_is_directory=True) -11 11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) # Ok -12 12 | -13 13 | fd = os.open(".", os.O_RDONLY) +7 | Path("tmp/python").symlink_to("usr/bin/python") # Ok +8 | +9 | os.symlink("usr/bin/python", "tmp/python", target_is_directory=True) + - os.symlink(b"usr/bin/python", b"tmp/python", target_is_directory=True) +10 + Path(b"tmp/python").symlink_to(b"usr/bin/python", target_is_directory=True) +11 | Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) # Ok +12 | +13 | fd = os.open(".", os.O_RDONLY) PTH211 `os.symlink` should be replaced by `Path.symlink_to` --> PTH211.py:17:1 @@ -104,16 +96,14 @@ PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` 20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None) | help: Replace with `Path(...).symlink_to(...)` - -ℹ Safe fix -15 15 | os.close(fd) -16 16 | -17 17 | os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True) -18 |-os.symlink("usr/bin/python", dst="tmp/python", target_is_directory=False) - 18 |+Path("tmp/python").symlink_to("usr/bin/python") -19 19 | -20 20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None) -21 21 | +15 | os.close(fd) +16 | +17 | os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True) + - os.symlink("usr/bin/python", dst="tmp/python", target_is_directory=False) +18 + Path("tmp/python").symlink_to("usr/bin/python") +19 | +20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None) +21 | PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` --> PTH211.py:20:1 @@ -126,16 +116,14 @@ PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` 22 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory= True ) | help: Replace with `Path(...).symlink_to(...)` - -ℹ Safe fix -17 17 | os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True) -18 18 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory=False) -19 19 | -20 |-os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None) - 20 |+Path("tmp/python").symlink_to("usr/bin/python") -21 21 | -22 22 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory= True ) -23 23 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory="nonboolean") +17 | os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True) +18 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory=False) +19 | + - os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None) +20 + Path("tmp/python").symlink_to("usr/bin/python") +21 | +22 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory= True ) +23 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory="nonboolean") PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` --> PTH211.py:22:1 @@ -147,14 +135,12 @@ PTH211 [*] `os.symlink` should be replaced by `Path.symlink_to` 23 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory="nonboolean") | help: Replace with `Path(...).symlink_to(...)` - -ℹ Safe fix -19 19 | -20 20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None) -21 21 | -22 |-os.symlink("usr/bin/python", dst="tmp/python", target_is_directory= True ) - 22 |+Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) -23 23 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory="nonboolean") +19 | +20 | os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None) +21 | + - os.symlink("usr/bin/python", dst="tmp/python", target_is_directory= True ) +22 + Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True) +23 | os.symlink("usr/bin/python", dst="tmp/python", target_is_directory="nonboolean") PTH211 `os.symlink` should be replaced by `Path.symlink_to` --> PTH211.py:23:1 diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap index 6fcb218516..3761d0eded 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_full_name.py.snap @@ -12,20 +12,19 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()` 9 | aaa = os.mkdir(p) | help: Replace with `Path(...).resolve()` - -ℹ Unsafe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" -6 7 | -7 |-a = os.path.abspath(p) - 8 |+a = pathlib.Path(p).resolve() -8 9 | aa = os.chmod(p) -9 10 | aaa = os.mkdir(p) -10 11 | os.makedirs(p) +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" +7 | + - a = os.path.abspath(p) +8 + a = pathlib.Path(p).resolve() +9 | aa = os.chmod(p) +10 | aaa = os.mkdir(p) +11 | os.makedirs(p) +note: This is an unsafe fix and may change runtime behavior PTH101 `os.chmod()` should be replaced by `Path.chmod()` --> full_name.py:8:6 @@ -49,22 +48,20 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` 11 | os.rename(p) | help: Replace with `Path(...).mkdir()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" -6 7 | -7 8 | a = os.path.abspath(p) -8 9 | aa = os.chmod(p) -9 |-aaa = os.mkdir(p) - 10 |+aaa = pathlib.Path(p).mkdir() -10 11 | os.makedirs(p) -11 12 | os.rename(p) -12 13 | os.replace(p) +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" +7 | +8 | a = os.path.abspath(p) +9 | aa = os.chmod(p) + - aaa = os.mkdir(p) +10 + aaa = pathlib.Path(p).mkdir() +11 | os.makedirs(p) +12 | os.rename(p) +13 | os.replace(p) PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> full_name.py:10:1 @@ -77,23 +74,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` 12 | os.replace(p) | help: Replace with `Path(...).mkdir(parents=True)` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -7 8 | a = os.path.abspath(p) -8 9 | aa = os.chmod(p) -9 10 | aaa = os.mkdir(p) -10 |-os.makedirs(p) - 11 |+pathlib.Path(p).mkdir(parents=True) -11 12 | os.rename(p) -12 13 | os.replace(p) -13 14 | os.rmdir(p) +8 | a = os.path.abspath(p) +9 | aa = os.chmod(p) +10 | aaa = os.mkdir(p) + - os.makedirs(p) +11 + pathlib.Path(p).mkdir(parents=True) +12 | os.rename(p) +13 | os.replace(p) +14 | os.rmdir(p) PTH104 `os.rename()` should be replaced by `Path.rename()` --> full_name.py:11:1 @@ -130,23 +125,21 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()` 15 | os.unlink(p) | help: Replace with `Path(...).rmdir()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -10 11 | os.makedirs(p) -11 12 | os.rename(p) -12 13 | os.replace(p) -13 |-os.rmdir(p) - 14 |+pathlib.Path(p).rmdir() -14 15 | os.remove(p) -15 16 | os.unlink(p) -16 17 | os.getcwd(p) +11 | os.makedirs(p) +12 | os.rename(p) +13 | os.replace(p) + - os.rmdir(p) +14 + pathlib.Path(p).rmdir() +15 | os.remove(p) +16 | os.unlink(p) +17 | os.getcwd(p) PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` --> full_name.py:14:1 @@ -159,23 +152,21 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` 16 | os.getcwd(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -11 12 | os.rename(p) -12 13 | os.replace(p) -13 14 | os.rmdir(p) -14 |-os.remove(p) - 15 |+pathlib.Path(p).unlink() -15 16 | os.unlink(p) -16 17 | os.getcwd(p) -17 18 | b = os.path.exists(p) +12 | os.rename(p) +13 | os.replace(p) +14 | os.rmdir(p) + - os.remove(p) +15 + pathlib.Path(p).unlink() +16 | os.unlink(p) +17 | os.getcwd(p) +18 | b = os.path.exists(p) PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` --> full_name.py:15:1 @@ -188,23 +179,21 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` 17 | b = os.path.exists(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -12 13 | os.replace(p) -13 14 | os.rmdir(p) -14 15 | os.remove(p) -15 |-os.unlink(p) - 16 |+pathlib.Path(p).unlink() -16 17 | os.getcwd(p) -17 18 | b = os.path.exists(p) -18 19 | bb = os.path.expanduser(p) +13 | os.replace(p) +14 | os.rmdir(p) +15 | os.remove(p) + - os.unlink(p) +16 + pathlib.Path(p).unlink() +17 | os.getcwd(p) +18 | b = os.path.exists(p) +19 | bb = os.path.expanduser(p) PTH109 `os.getcwd()` should be replaced by `Path.cwd()` --> full_name.py:16:1 @@ -229,23 +218,21 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()` 19 | bbb = os.path.isdir(p) | help: Replace with `Path(...).exists()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -14 15 | os.remove(p) -15 16 | os.unlink(p) -16 17 | os.getcwd(p) -17 |-b = os.path.exists(p) - 18 |+b = pathlib.Path(p).exists() -18 19 | bb = os.path.expanduser(p) -19 20 | bbb = os.path.isdir(p) -20 21 | bbbb = os.path.isfile(p) +15 | os.remove(p) +16 | os.unlink(p) +17 | os.getcwd(p) + - b = os.path.exists(p) +18 + b = pathlib.Path(p).exists() +19 | bb = os.path.expanduser(p) +20 | bbb = os.path.isdir(p) +21 | bbbb = os.path.isfile(p) PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` --> full_name.py:18:6 @@ -258,23 +245,21 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` 20 | bbbb = os.path.isfile(p) | help: Replace with `Path(...).expanduser()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -15 16 | os.unlink(p) -16 17 | os.getcwd(p) -17 18 | b = os.path.exists(p) -18 |-bb = os.path.expanduser(p) - 19 |+bb = pathlib.Path(p).expanduser() -19 20 | bbb = os.path.isdir(p) -20 21 | bbbb = os.path.isfile(p) -21 22 | bbbbb = os.path.islink(p) +16 | os.unlink(p) +17 | os.getcwd(p) +18 | b = os.path.exists(p) + - bb = os.path.expanduser(p) +19 + bb = pathlib.Path(p).expanduser() +20 | bbb = os.path.isdir(p) +21 | bbbb = os.path.isfile(p) +22 | bbbbb = os.path.islink(p) PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` --> full_name.py:19:7 @@ -287,23 +272,21 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` 21 | bbbbb = os.path.islink(p) | help: Replace with `Path(...).is_dir()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -16 17 | os.getcwd(p) -17 18 | b = os.path.exists(p) -18 19 | bb = os.path.expanduser(p) -19 |-bbb = os.path.isdir(p) - 20 |+bbb = pathlib.Path(p).is_dir() -20 21 | bbbb = os.path.isfile(p) -21 22 | bbbbb = os.path.islink(p) -22 23 | os.readlink(p) +17 | os.getcwd(p) +18 | b = os.path.exists(p) +19 | bb = os.path.expanduser(p) + - bbb = os.path.isdir(p) +20 + bbb = pathlib.Path(p).is_dir() +21 | bbbb = os.path.isfile(p) +22 | bbbbb = os.path.islink(p) +23 | os.readlink(p) PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` --> full_name.py:20:8 @@ -316,23 +299,21 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` 22 | os.readlink(p) | help: Replace with `Path(...).is_file()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -17 18 | b = os.path.exists(p) -18 19 | bb = os.path.expanduser(p) -19 20 | bbb = os.path.isdir(p) -20 |-bbbb = os.path.isfile(p) - 21 |+bbbb = pathlib.Path(p).is_file() -21 22 | bbbbb = os.path.islink(p) -22 23 | os.readlink(p) -23 24 | os.stat(p) +18 | b = os.path.exists(p) +19 | bb = os.path.expanduser(p) +20 | bbb = os.path.isdir(p) + - bbbb = os.path.isfile(p) +21 + bbbb = pathlib.Path(p).is_file() +22 | bbbbb = os.path.islink(p) +23 | os.readlink(p) +24 | os.stat(p) PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` --> full_name.py:21:9 @@ -345,23 +326,21 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` 23 | os.stat(p) | help: Replace with `Path(...).is_symlink()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -18 19 | bb = os.path.expanduser(p) -19 20 | bbb = os.path.isdir(p) -20 21 | bbbb = os.path.isfile(p) -21 |-bbbbb = os.path.islink(p) - 22 |+bbbbb = pathlib.Path(p).is_symlink() -22 23 | os.readlink(p) -23 24 | os.stat(p) -24 25 | os.path.isabs(p) +19 | bb = os.path.expanduser(p) +20 | bbb = os.path.isdir(p) +21 | bbbb = os.path.isfile(p) + - bbbbb = os.path.islink(p) +22 + bbbbb = pathlib.Path(p).is_symlink() +23 | os.readlink(p) +24 | os.stat(p) +25 | os.path.isabs(p) PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` --> full_name.py:22:1 @@ -374,23 +353,21 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` 24 | os.path.isabs(p) | help: Replace with `Path(...).readlink()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -19 20 | bbb = os.path.isdir(p) -20 21 | bbbb = os.path.isfile(p) -21 22 | bbbbb = os.path.islink(p) -22 |-os.readlink(p) - 23 |+pathlib.Path(p).readlink() -23 24 | os.stat(p) -24 25 | os.path.isabs(p) -25 26 | os.path.join(p, q) +20 | bbb = os.path.isdir(p) +21 | bbbb = os.path.isfile(p) +22 | bbbbb = os.path.islink(p) + - os.readlink(p) +23 + pathlib.Path(p).readlink() +24 | os.stat(p) +25 | os.path.isabs(p) +26 | os.path.join(p, q) PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()` --> full_name.py:23:1 @@ -414,23 +391,21 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()` 26 | os.sep.join([p, q]) | help: Replace with `Path(...).is_absolute()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -21 22 | bbbbb = os.path.islink(p) -22 23 | os.readlink(p) -23 24 | os.stat(p) -24 |-os.path.isabs(p) - 25 |+pathlib.Path(p).is_absolute() -25 26 | os.path.join(p, q) -26 27 | os.sep.join([p, q]) -27 28 | os.sep.join((p, q)) +22 | bbbbb = os.path.islink(p) +23 | os.readlink(p) +24 | os.stat(p) + - os.path.isabs(p) +25 + pathlib.Path(p).is_absolute() +26 | os.path.join(p, q) +27 | os.sep.join([p, q]) +28 | os.sep.join((p, q)) PTH118 `os.path.join()` should be replaced by `Path` with `/` operator --> full_name.py:25:1 @@ -476,23 +451,21 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name` 30 | os.path.samefile(p) | help: Replace with `Path(...).name` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -25 26 | os.path.join(p, q) -26 27 | os.sep.join([p, q]) -27 28 | os.sep.join((p, q)) -28 |-os.path.basename(p) - 29 |+pathlib.Path(p).name -29 30 | os.path.dirname(p) -30 31 | os.path.samefile(p) -31 32 | os.path.splitext(p) +26 | os.path.join(p, q) +27 | os.sep.join([p, q]) +28 | os.sep.join((p, q)) + - os.path.basename(p) +29 + pathlib.Path(p).name +30 | os.path.dirname(p) +31 | os.path.samefile(p) +32 | os.path.splitext(p) PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` --> full_name.py:29:1 @@ -505,23 +478,21 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` 31 | os.path.splitext(p) | help: Replace with `Path(...).parent` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -26 27 | os.sep.join([p, q]) -27 28 | os.sep.join((p, q)) -28 29 | os.path.basename(p) -29 |-os.path.dirname(p) - 30 |+pathlib.Path(p).parent -30 31 | os.path.samefile(p) -31 32 | os.path.splitext(p) -32 33 | with open(p) as fp: +27 | os.sep.join([p, q]) +28 | os.sep.join((p, q)) +29 | os.path.basename(p) + - os.path.dirname(p) +30 + pathlib.Path(p).parent +31 | os.path.samefile(p) +32 | os.path.splitext(p) +33 | with open(p) as fp: PTH121 `os.path.samefile()` should be replaced by `Path.samefile()` --> full_name.py:30:1 @@ -665,23 +636,21 @@ PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()` 109 | os.getcwdb() | help: Replace with `Path.cwd()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -105 106 | os.replace("src", "dst", src_dir_fd=1) -106 107 | os.replace("src", "dst", dst_dir_fd=2) -107 108 | -108 |-os.getcwd() - 109 |+pathlib.Path.cwd() -109 110 | os.getcwdb() -110 111 | -111 112 | os.mkdir(path="directory") +106 | os.replace("src", "dst", src_dir_fd=1) +107 | os.replace("src", "dst", dst_dir_fd=2) +108 | + - os.getcwd() +109 + pathlib.Path.cwd() +110 | os.getcwdb() +111 | +112 | os.mkdir(path="directory") PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()` --> full_name.py:109:1 @@ -693,23 +662,21 @@ PTH109 [*] `os.getcwd()` should be replaced by `Path.cwd()` 111 | os.mkdir(path="directory") | help: Replace with `Path.cwd()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -106 107 | os.replace("src", "dst", dst_dir_fd=2) -107 108 | -108 109 | os.getcwd() -109 |-os.getcwdb() - 110 |+pathlib.Path.cwd() -110 111 | -111 112 | os.mkdir(path="directory") -112 113 | +107 | os.replace("src", "dst", dst_dir_fd=2) +108 | +109 | os.getcwd() + - os.getcwdb() +110 + pathlib.Path.cwd() +111 | +112 | os.mkdir(path="directory") +113 | PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` --> full_name.py:111:1 @@ -722,23 +689,21 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` 113 | os.mkdir( | help: Replace with `Path(...).mkdir()` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -108 109 | os.getcwd() -109 110 | os.getcwdb() -110 111 | -111 |-os.mkdir(path="directory") - 112 |+pathlib.Path("directory").mkdir() -112 113 | -113 114 | os.mkdir( -114 115 | # comment 1 +109 | os.getcwd() +110 | os.getcwdb() +111 | + - os.mkdir(path="directory") +112 + pathlib.Path("directory").mkdir() +113 | +114 | os.mkdir( +115 | # comment 1 PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` --> full_name.py:113:1 @@ -751,27 +716,26 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` 115 | "directory", | help: Replace with `Path(...).mkdir()` - -ℹ Unsafe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -110 111 | -111 112 | os.mkdir(path="directory") -112 113 | -113 |-os.mkdir( -114 |- # comment 1 -115 |- "directory", -116 |- mode=0o777 -117 |-) - 114 |+pathlib.Path("directory").mkdir(mode=0o777) -118 115 | -119 116 | os.mkdir("directory", mode=0o777, dir_fd=1) -120 117 | +111 | +112 | os.mkdir(path="directory") +113 | + - os.mkdir( + - # comment 1 + - "directory", + - mode=0o777 + - ) +114 + pathlib.Path("directory").mkdir(mode=0o777) +115 | +116 | os.mkdir("directory", mode=0o777, dir_fd=1) +117 | +note: This is an unsafe fix and may change runtime behavior PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> full_name.py:121:1 @@ -784,23 +748,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` 123 | os.makedirs("name", 0o777, False) | help: Replace with `Path(...).mkdir(parents=True)` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -118 119 | -119 120 | os.mkdir("directory", mode=0o777, dir_fd=1) -120 121 | -121 |-os.makedirs("name", 0o777, exist_ok=False) - 122 |+pathlib.Path("name").mkdir(0o777, exist_ok=False, parents=True) -122 123 | -123 124 | os.makedirs("name", 0o777, False) -124 125 | +119 | +120 | os.mkdir("directory", mode=0o777, dir_fd=1) +121 | + - os.makedirs("name", 0o777, exist_ok=False) +122 + pathlib.Path("name").mkdir(0o777, exist_ok=False, parents=True) +123 | +124 | os.makedirs("name", 0o777, False) +125 | PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> full_name.py:123:1 @@ -813,23 +775,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` 125 | os.makedirs(name="name", mode=0o777, exist_ok=False) | help: Replace with `Path(...).mkdir(parents=True)` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -120 121 | -121 122 | os.makedirs("name", 0o777, exist_ok=False) -122 123 | -123 |-os.makedirs("name", 0o777, False) - 124 |+pathlib.Path("name").mkdir(0o777, True, False) -124 125 | -125 126 | os.makedirs(name="name", mode=0o777, exist_ok=False) -126 127 | +121 | +122 | os.makedirs("name", 0o777, exist_ok=False) +123 | + - os.makedirs("name", 0o777, False) +124 + pathlib.Path("name").mkdir(0o777, True, False) +125 | +126 | os.makedirs(name="name", mode=0o777, exist_ok=False) +127 | PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> full_name.py:125:1 @@ -842,22 +802,20 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` 127 | os.makedirs("name", unknown_kwarg=True) | help: Replace with `Path(...).mkdir(parents=True)` - -ℹ Safe fix -1 1 | import os -2 2 | import os.path - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os +2 | import os.path +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -122 123 | -123 124 | os.makedirs("name", 0o777, False) -124 125 | -125 |-os.makedirs(name="name", mode=0o777, exist_ok=False) - 126 |+pathlib.Path("name").mkdir(mode=0o777, exist_ok=False, parents=True) -126 127 | -127 128 | os.makedirs("name", unknown_kwarg=True) +123 | +124 | os.makedirs("name", 0o777, False) +125 | + - os.makedirs(name="name", mode=0o777, exist_ok=False) +126 + pathlib.Path("name").mkdir(mode=0o777, exist_ok=False, parents=True) +127 | +128 | os.makedirs("name", unknown_kwarg=True) PTH103 `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> full_name.py:127:1 diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap index 4bb8b54649..8f240afbab 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_as.py.snap @@ -12,20 +12,19 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()` 9 | aaa = foo.mkdir(p) | help: Replace with `Path(...).resolve()` - -ℹ Unsafe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" -6 7 | -7 |-a = foo_p.abspath(p) - 8 |+a = pathlib.Path(p).resolve() -8 9 | aa = foo.chmod(p) -9 10 | aaa = foo.mkdir(p) -10 11 | foo.makedirs(p) +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" +7 | + - a = foo_p.abspath(p) +8 + a = pathlib.Path(p).resolve() +9 | aa = foo.chmod(p) +10 | aaa = foo.mkdir(p) +11 | foo.makedirs(p) +note: This is an unsafe fix and may change runtime behavior PTH101 `os.chmod()` should be replaced by `Path.chmod()` --> import_as.py:8:6 @@ -49,22 +48,20 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` 11 | foo.rename(p) | help: Replace with `Path(...).mkdir()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" -6 7 | -7 8 | a = foo_p.abspath(p) -8 9 | aa = foo.chmod(p) -9 |-aaa = foo.mkdir(p) - 10 |+aaa = pathlib.Path(p).mkdir() -10 11 | foo.makedirs(p) -11 12 | foo.rename(p) -12 13 | foo.replace(p) +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" +7 | +8 | a = foo_p.abspath(p) +9 | aa = foo.chmod(p) + - aaa = foo.mkdir(p) +10 + aaa = pathlib.Path(p).mkdir() +11 | foo.makedirs(p) +12 | foo.rename(p) +13 | foo.replace(p) PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> import_as.py:10:1 @@ -77,23 +74,21 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` 12 | foo.replace(p) | help: Replace with `Path(...).mkdir(parents=True)` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -7 8 | a = foo_p.abspath(p) -8 9 | aa = foo.chmod(p) -9 10 | aaa = foo.mkdir(p) -10 |-foo.makedirs(p) - 11 |+pathlib.Path(p).mkdir(parents=True) -11 12 | foo.rename(p) -12 13 | foo.replace(p) -13 14 | foo.rmdir(p) +8 | a = foo_p.abspath(p) +9 | aa = foo.chmod(p) +10 | aaa = foo.mkdir(p) + - foo.makedirs(p) +11 + pathlib.Path(p).mkdir(parents=True) +12 | foo.rename(p) +13 | foo.replace(p) +14 | foo.rmdir(p) PTH104 `os.rename()` should be replaced by `Path.rename()` --> import_as.py:11:1 @@ -130,23 +125,21 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()` 15 | foo.unlink(p) | help: Replace with `Path(...).rmdir()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -10 11 | foo.makedirs(p) -11 12 | foo.rename(p) -12 13 | foo.replace(p) -13 |-foo.rmdir(p) - 14 |+pathlib.Path(p).rmdir() -14 15 | foo.remove(p) -15 16 | foo.unlink(p) -16 17 | foo.getcwd(p) +11 | foo.makedirs(p) +12 | foo.rename(p) +13 | foo.replace(p) + - foo.rmdir(p) +14 + pathlib.Path(p).rmdir() +15 | foo.remove(p) +16 | foo.unlink(p) +17 | foo.getcwd(p) PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` --> import_as.py:14:1 @@ -159,23 +152,21 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` 16 | foo.getcwd(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -11 12 | foo.rename(p) -12 13 | foo.replace(p) -13 14 | foo.rmdir(p) -14 |-foo.remove(p) - 15 |+pathlib.Path(p).unlink() -15 16 | foo.unlink(p) -16 17 | foo.getcwd(p) -17 18 | b = foo_p.exists(p) +12 | foo.rename(p) +13 | foo.replace(p) +14 | foo.rmdir(p) + - foo.remove(p) +15 + pathlib.Path(p).unlink() +16 | foo.unlink(p) +17 | foo.getcwd(p) +18 | b = foo_p.exists(p) PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` --> import_as.py:15:1 @@ -188,23 +179,21 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` 17 | b = foo_p.exists(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -12 13 | foo.replace(p) -13 14 | foo.rmdir(p) -14 15 | foo.remove(p) -15 |-foo.unlink(p) - 16 |+pathlib.Path(p).unlink() -16 17 | foo.getcwd(p) -17 18 | b = foo_p.exists(p) -18 19 | bb = foo_p.expanduser(p) +13 | foo.replace(p) +14 | foo.rmdir(p) +15 | foo.remove(p) + - foo.unlink(p) +16 + pathlib.Path(p).unlink() +17 | foo.getcwd(p) +18 | b = foo_p.exists(p) +19 | bb = foo_p.expanduser(p) PTH109 `os.getcwd()` should be replaced by `Path.cwd()` --> import_as.py:16:1 @@ -229,23 +218,21 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()` 19 | bbb = foo_p.isdir(p) | help: Replace with `Path(...).exists()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -14 15 | foo.remove(p) -15 16 | foo.unlink(p) -16 17 | foo.getcwd(p) -17 |-b = foo_p.exists(p) - 18 |+b = pathlib.Path(p).exists() -18 19 | bb = foo_p.expanduser(p) -19 20 | bbb = foo_p.isdir(p) -20 21 | bbbb = foo_p.isfile(p) +15 | foo.remove(p) +16 | foo.unlink(p) +17 | foo.getcwd(p) + - b = foo_p.exists(p) +18 + b = pathlib.Path(p).exists() +19 | bb = foo_p.expanduser(p) +20 | bbb = foo_p.isdir(p) +21 | bbbb = foo_p.isfile(p) PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` --> import_as.py:18:6 @@ -258,23 +245,21 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` 20 | bbbb = foo_p.isfile(p) | help: Replace with `Path(...).expanduser()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -15 16 | foo.unlink(p) -16 17 | foo.getcwd(p) -17 18 | b = foo_p.exists(p) -18 |-bb = foo_p.expanduser(p) - 19 |+bb = pathlib.Path(p).expanduser() -19 20 | bbb = foo_p.isdir(p) -20 21 | bbbb = foo_p.isfile(p) -21 22 | bbbbb = foo_p.islink(p) +16 | foo.unlink(p) +17 | foo.getcwd(p) +18 | b = foo_p.exists(p) + - bb = foo_p.expanduser(p) +19 + bb = pathlib.Path(p).expanduser() +20 | bbb = foo_p.isdir(p) +21 | bbbb = foo_p.isfile(p) +22 | bbbbb = foo_p.islink(p) PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` --> import_as.py:19:7 @@ -287,23 +272,21 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` 21 | bbbbb = foo_p.islink(p) | help: Replace with `Path(...).is_dir()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -16 17 | foo.getcwd(p) -17 18 | b = foo_p.exists(p) -18 19 | bb = foo_p.expanduser(p) -19 |-bbb = foo_p.isdir(p) - 20 |+bbb = pathlib.Path(p).is_dir() -20 21 | bbbb = foo_p.isfile(p) -21 22 | bbbbb = foo_p.islink(p) -22 23 | foo.readlink(p) +17 | foo.getcwd(p) +18 | b = foo_p.exists(p) +19 | bb = foo_p.expanduser(p) + - bbb = foo_p.isdir(p) +20 + bbb = pathlib.Path(p).is_dir() +21 | bbbb = foo_p.isfile(p) +22 | bbbbb = foo_p.islink(p) +23 | foo.readlink(p) PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` --> import_as.py:20:8 @@ -316,23 +299,21 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` 22 | foo.readlink(p) | help: Replace with `Path(...).is_file()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -17 18 | b = foo_p.exists(p) -18 19 | bb = foo_p.expanduser(p) -19 20 | bbb = foo_p.isdir(p) -20 |-bbbb = foo_p.isfile(p) - 21 |+bbbb = pathlib.Path(p).is_file() -21 22 | bbbbb = foo_p.islink(p) -22 23 | foo.readlink(p) -23 24 | foo.stat(p) +18 | b = foo_p.exists(p) +19 | bb = foo_p.expanduser(p) +20 | bbb = foo_p.isdir(p) + - bbbb = foo_p.isfile(p) +21 + bbbb = pathlib.Path(p).is_file() +22 | bbbbb = foo_p.islink(p) +23 | foo.readlink(p) +24 | foo.stat(p) PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` --> import_as.py:21:9 @@ -345,23 +326,21 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` 23 | foo.stat(p) | help: Replace with `Path(...).is_symlink()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -18 19 | bb = foo_p.expanduser(p) -19 20 | bbb = foo_p.isdir(p) -20 21 | bbbb = foo_p.isfile(p) -21 |-bbbbb = foo_p.islink(p) - 22 |+bbbbb = pathlib.Path(p).is_symlink() -22 23 | foo.readlink(p) -23 24 | foo.stat(p) -24 25 | foo_p.isabs(p) +19 | bb = foo_p.expanduser(p) +20 | bbb = foo_p.isdir(p) +21 | bbbb = foo_p.isfile(p) + - bbbbb = foo_p.islink(p) +22 + bbbbb = pathlib.Path(p).is_symlink() +23 | foo.readlink(p) +24 | foo.stat(p) +25 | foo_p.isabs(p) PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` --> import_as.py:22:1 @@ -374,23 +353,21 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` 24 | foo_p.isabs(p) | help: Replace with `Path(...).readlink()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -19 20 | bbb = foo_p.isdir(p) -20 21 | bbbb = foo_p.isfile(p) -21 22 | bbbbb = foo_p.islink(p) -22 |-foo.readlink(p) - 23 |+pathlib.Path(p).readlink() -23 24 | foo.stat(p) -24 25 | foo_p.isabs(p) -25 26 | foo_p.join(p, q) +20 | bbb = foo_p.isdir(p) +21 | bbbb = foo_p.isfile(p) +22 | bbbbb = foo_p.islink(p) + - foo.readlink(p) +23 + pathlib.Path(p).readlink() +24 | foo.stat(p) +25 | foo_p.isabs(p) +26 | foo_p.join(p, q) PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()` --> import_as.py:23:1 @@ -414,23 +391,21 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()` 26 | foo.sep.join([p, q]) | help: Replace with `Path(...).is_absolute()` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -21 22 | bbbbb = foo_p.islink(p) -22 23 | foo.readlink(p) -23 24 | foo.stat(p) -24 |-foo_p.isabs(p) - 25 |+pathlib.Path(p).is_absolute() -25 26 | foo_p.join(p, q) -26 27 | foo.sep.join([p, q]) -27 28 | foo.sep.join((p, q)) +22 | bbbbb = foo_p.islink(p) +23 | foo.readlink(p) +24 | foo.stat(p) + - foo_p.isabs(p) +25 + pathlib.Path(p).is_absolute() +26 | foo_p.join(p, q) +27 | foo.sep.join([p, q]) +28 | foo.sep.join((p, q)) PTH118 `os.path.join()` should be replaced by `Path` with `/` operator --> import_as.py:25:1 @@ -476,23 +451,21 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name` 30 | foo_p.samefile(p) | help: Replace with `Path(...).name` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -25 26 | foo_p.join(p, q) -26 27 | foo.sep.join([p, q]) -27 28 | foo.sep.join((p, q)) -28 |-foo_p.basename(p) - 29 |+pathlib.Path(p).name -29 30 | foo_p.dirname(p) -30 31 | foo_p.samefile(p) -31 32 | foo_p.splitext(p) +26 | foo_p.join(p, q) +27 | foo.sep.join([p, q]) +28 | foo.sep.join((p, q)) + - foo_p.basename(p) +29 + pathlib.Path(p).name +30 | foo_p.dirname(p) +31 | foo_p.samefile(p) +32 | foo_p.splitext(p) PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` --> import_as.py:29:1 @@ -505,22 +478,20 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` 31 | foo_p.splitext(p) | help: Replace with `Path(...).parent` - -ℹ Safe fix -1 1 | import os as foo -2 2 | import os.path as foo_p - 3 |+import pathlib -3 4 | -4 5 | p = "/foo" -5 6 | q = "bar" +1 | import os as foo +2 | import os.path as foo_p +3 + import pathlib +4 | +5 | p = "/foo" +6 | q = "bar" -------------------------------------------------------------------------------- -26 27 | foo.sep.join([p, q]) -27 28 | foo.sep.join((p, q)) -28 29 | foo_p.basename(p) -29 |-foo_p.dirname(p) - 30 |+pathlib.Path(p).parent -30 31 | foo_p.samefile(p) -31 32 | foo_p.splitext(p) +27 | foo.sep.join([p, q]) +28 | foo.sep.join((p, q)) +29 | foo_p.basename(p) + - foo_p.dirname(p) +30 + pathlib.Path(p).parent +31 | foo_p.samefile(p) +32 | foo_p.splitext(p) PTH121 `os.path.samefile()` should be replaced by `Path.samefile()` --> import_as.py:30:1 diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap index b98ec10098..bacf13158a 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from.py.snap @@ -12,21 +12,20 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()` 11 | aaa = mkdir(p) | help: Replace with `Path(...).resolve()` - -ℹ Unsafe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" -8 9 | -9 |-a = abspath(p) - 10 |+a = pathlib.Path(p).resolve() -10 11 | aa = chmod(p) -11 12 | aaa = mkdir(p) -12 13 | makedirs(p) +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" +9 | + - a = abspath(p) +10 + a = pathlib.Path(p).resolve() +11 | aa = chmod(p) +12 | aaa = mkdir(p) +13 | makedirs(p) +note: This is an unsafe fix and may change runtime behavior PTH101 `os.chmod()` should be replaced by `Path.chmod()` --> import_from.py:10:6 @@ -50,23 +49,21 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` 13 | rename(p) | help: Replace with `Path(...).mkdir()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" -8 9 | -9 10 | a = abspath(p) -10 11 | aa = chmod(p) -11 |-aaa = mkdir(p) - 12 |+aaa = pathlib.Path(p).mkdir() -12 13 | makedirs(p) -13 14 | rename(p) -14 15 | replace(p) +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" +9 | +10 | a = abspath(p) +11 | aa = chmod(p) + - aaa = mkdir(p) +12 + aaa = pathlib.Path(p).mkdir() +13 | makedirs(p) +14 | rename(p) +15 | replace(p) PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> import_from.py:12:1 @@ -79,24 +76,22 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` 14 | replace(p) | help: Replace with `Path(...).mkdir(parents=True)` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -9 10 | a = abspath(p) -10 11 | aa = chmod(p) -11 12 | aaa = mkdir(p) -12 |-makedirs(p) - 13 |+pathlib.Path(p).mkdir(parents=True) -13 14 | rename(p) -14 15 | replace(p) -15 16 | rmdir(p) +10 | a = abspath(p) +11 | aa = chmod(p) +12 | aaa = mkdir(p) + - makedirs(p) +13 + pathlib.Path(p).mkdir(parents=True) +14 | rename(p) +15 | replace(p) +16 | rmdir(p) PTH104 `os.rename()` should be replaced by `Path.rename()` --> import_from.py:13:1 @@ -133,24 +128,22 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()` 17 | unlink(p) | help: Replace with `Path(...).rmdir()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -12 13 | makedirs(p) -13 14 | rename(p) -14 15 | replace(p) -15 |-rmdir(p) - 16 |+pathlib.Path(p).rmdir() -16 17 | remove(p) -17 18 | unlink(p) -18 19 | getcwd(p) +13 | makedirs(p) +14 | rename(p) +15 | replace(p) + - rmdir(p) +16 + pathlib.Path(p).rmdir() +17 | remove(p) +18 | unlink(p) +19 | getcwd(p) PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` --> import_from.py:16:1 @@ -163,24 +156,22 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` 18 | getcwd(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -13 14 | rename(p) -14 15 | replace(p) -15 16 | rmdir(p) -16 |-remove(p) - 17 |+pathlib.Path(p).unlink() -17 18 | unlink(p) -18 19 | getcwd(p) -19 20 | b = exists(p) +14 | rename(p) +15 | replace(p) +16 | rmdir(p) + - remove(p) +17 + pathlib.Path(p).unlink() +18 | unlink(p) +19 | getcwd(p) +20 | b = exists(p) PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` --> import_from.py:17:1 @@ -193,24 +184,22 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` 19 | b = exists(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -14 15 | replace(p) -15 16 | rmdir(p) -16 17 | remove(p) -17 |-unlink(p) - 18 |+pathlib.Path(p).unlink() -18 19 | getcwd(p) -19 20 | b = exists(p) -20 21 | bb = expanduser(p) +15 | replace(p) +16 | rmdir(p) +17 | remove(p) + - unlink(p) +18 + pathlib.Path(p).unlink() +19 | getcwd(p) +20 | b = exists(p) +21 | bb = expanduser(p) PTH109 `os.getcwd()` should be replaced by `Path.cwd()` --> import_from.py:18:1 @@ -235,24 +224,22 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()` 21 | bbb = isdir(p) | help: Replace with `Path(...).exists()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -16 17 | remove(p) -17 18 | unlink(p) -18 19 | getcwd(p) -19 |-b = exists(p) - 20 |+b = pathlib.Path(p).exists() -20 21 | bb = expanduser(p) -21 22 | bbb = isdir(p) -22 23 | bbbb = isfile(p) +17 | remove(p) +18 | unlink(p) +19 | getcwd(p) + - b = exists(p) +20 + b = pathlib.Path(p).exists() +21 | bb = expanduser(p) +22 | bbb = isdir(p) +23 | bbbb = isfile(p) PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` --> import_from.py:20:6 @@ -265,24 +252,22 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` 22 | bbbb = isfile(p) | help: Replace with `Path(...).expanduser()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -17 18 | unlink(p) -18 19 | getcwd(p) -19 20 | b = exists(p) -20 |-bb = expanduser(p) - 21 |+bb = pathlib.Path(p).expanduser() -21 22 | bbb = isdir(p) -22 23 | bbbb = isfile(p) -23 24 | bbbbb = islink(p) +18 | unlink(p) +19 | getcwd(p) +20 | b = exists(p) + - bb = expanduser(p) +21 + bb = pathlib.Path(p).expanduser() +22 | bbb = isdir(p) +23 | bbbb = isfile(p) +24 | bbbbb = islink(p) PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` --> import_from.py:21:7 @@ -295,24 +280,22 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` 23 | bbbbb = islink(p) | help: Replace with `Path(...).is_dir()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -18 19 | getcwd(p) -19 20 | b = exists(p) -20 21 | bb = expanduser(p) -21 |-bbb = isdir(p) - 22 |+bbb = pathlib.Path(p).is_dir() -22 23 | bbbb = isfile(p) -23 24 | bbbbb = islink(p) -24 25 | readlink(p) +19 | getcwd(p) +20 | b = exists(p) +21 | bb = expanduser(p) + - bbb = isdir(p) +22 + bbb = pathlib.Path(p).is_dir() +23 | bbbb = isfile(p) +24 | bbbbb = islink(p) +25 | readlink(p) PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` --> import_from.py:22:8 @@ -325,24 +308,22 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` 24 | readlink(p) | help: Replace with `Path(...).is_file()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -19 20 | b = exists(p) -20 21 | bb = expanduser(p) -21 22 | bbb = isdir(p) -22 |-bbbb = isfile(p) - 23 |+bbbb = pathlib.Path(p).is_file() -23 24 | bbbbb = islink(p) -24 25 | readlink(p) -25 26 | stat(p) +20 | b = exists(p) +21 | bb = expanduser(p) +22 | bbb = isdir(p) + - bbbb = isfile(p) +23 + bbbb = pathlib.Path(p).is_file() +24 | bbbbb = islink(p) +25 | readlink(p) +26 | stat(p) PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` --> import_from.py:23:9 @@ -355,24 +336,22 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` 25 | stat(p) | help: Replace with `Path(...).is_symlink()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -20 21 | bb = expanduser(p) -21 22 | bbb = isdir(p) -22 23 | bbbb = isfile(p) -23 |-bbbbb = islink(p) - 24 |+bbbbb = pathlib.Path(p).is_symlink() -24 25 | readlink(p) -25 26 | stat(p) -26 27 | isabs(p) +21 | bb = expanduser(p) +22 | bbb = isdir(p) +23 | bbbb = isfile(p) + - bbbbb = islink(p) +24 + bbbbb = pathlib.Path(p).is_symlink() +25 | readlink(p) +26 | stat(p) +27 | isabs(p) PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` --> import_from.py:24:1 @@ -385,24 +364,22 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` 26 | isabs(p) | help: Replace with `Path(...).readlink()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -21 22 | bbb = isdir(p) -22 23 | bbbb = isfile(p) -23 24 | bbbbb = islink(p) -24 |-readlink(p) - 25 |+pathlib.Path(p).readlink() -25 26 | stat(p) -26 27 | isabs(p) -27 28 | join(p, q) +22 | bbb = isdir(p) +23 | bbbb = isfile(p) +24 | bbbbb = islink(p) + - readlink(p) +25 + pathlib.Path(p).readlink() +26 | stat(p) +27 | isabs(p) +28 | join(p, q) PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()` --> import_from.py:25:1 @@ -426,24 +403,22 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()` 28 | sep.join((p, q)) | help: Replace with `Path(...).is_absolute()` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -23 24 | bbbbb = islink(p) -24 25 | readlink(p) -25 26 | stat(p) -26 |-isabs(p) - 27 |+pathlib.Path(p).is_absolute() -27 28 | join(p, q) -28 29 | sep.join((p, q)) -29 30 | sep.join([p, q]) +24 | bbbbb = islink(p) +25 | readlink(p) +26 | stat(p) + - isabs(p) +27 + pathlib.Path(p).is_absolute() +28 | join(p, q) +29 | sep.join((p, q)) +30 | sep.join([p, q]) PTH118 `os.path.join()` should be replaced by `Path` with `/` operator --> import_from.py:27:1 @@ -489,24 +464,22 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name` 32 | samefile(p) | help: Replace with `Path(...).name` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -27 28 | join(p, q) -28 29 | sep.join((p, q)) -29 30 | sep.join([p, q]) -30 |-basename(p) - 31 |+pathlib.Path(p).name -31 32 | dirname(p) -32 33 | samefile(p) -33 34 | splitext(p) +28 | join(p, q) +29 | sep.join((p, q)) +30 | sep.join([p, q]) + - basename(p) +31 + pathlib.Path(p).name +32 | dirname(p) +33 | samefile(p) +34 | splitext(p) PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` --> import_from.py:31:1 @@ -519,24 +492,22 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` 33 | splitext(p) | help: Replace with `Path(...).parent` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -28 29 | sep.join((p, q)) -29 30 | sep.join([p, q]) -30 31 | basename(p) -31 |-dirname(p) - 32 |+pathlib.Path(p).parent -32 33 | samefile(p) -33 34 | splitext(p) -34 35 | with open(p) as fp: +29 | sep.join((p, q)) +30 | sep.join([p, q]) +31 | basename(p) + - dirname(p) +32 + pathlib.Path(p).parent +33 | samefile(p) +34 | splitext(p) +35 | with open(p) as fp: PTH121 `os.path.samefile()` should be replaced by `Path.samefile()` --> import_from.py:32:1 @@ -601,24 +572,22 @@ PTH104 [*] `os.rename()` should be replaced by `Path.rename()` 55 | rename( | help: Replace with `Path(...).rename(...)` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -50 51 | -51 52 | file = "file_1.py" -52 53 | -53 |-rename(file, "file_2.py") - 54 |+pathlib.Path(file).rename("file_2.py") -54 55 | -55 56 | rename( -56 57 | # commment 1 +51 | +52 | file = "file_1.py" +53 | + - rename(file, "file_2.py") +54 + pathlib.Path(file).rename("file_2.py") +55 | +56 | rename( +57 | # commment 1 PTH104 [*] `os.rename()` should be replaced by `Path.rename()` --> import_from.py:55:1 @@ -631,30 +600,29 @@ PTH104 [*] `os.rename()` should be replaced by `Path.rename()` 57 | file, # comment 2 | help: Replace with `Path(...).rename(...)` - -ℹ Unsafe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -52 53 | -53 54 | rename(file, "file_2.py") -54 55 | -55 |-rename( -56 |- # commment 1 -57 |- file, # comment 2 -58 |- "file_2.py" -59 |- , -60 |- # comment 3 -61 |-) - 56 |+pathlib.Path(file).rename("file_2.py") -62 57 | -63 58 | rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None) -64 59 | +53 | +54 | rename(file, "file_2.py") +55 | + - rename( + - # commment 1 + - file, # comment 2 + - "file_2.py" + - , + - # comment 3 + - ) +56 + pathlib.Path(file).rename("file_2.py") +57 | +58 | rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None) +59 | +note: This is an unsafe fix and may change runtime behavior PTH104 [*] `os.rename()` should be replaced by `Path.rename()` --> import_from.py:63:1 @@ -667,20 +635,18 @@ PTH104 [*] `os.rename()` should be replaced by `Path.rename()` 65 | rename(file, "file_2.py", src_dir_fd=1) | help: Replace with `Path(...).rename(...)` - -ℹ Safe fix -2 2 | from os import remove, unlink, getcwd, readlink, stat -3 3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink -4 4 | from os.path import isabs, join, basename, dirname, samefile, splitext - 5 |+import pathlib -5 6 | -6 7 | p = "/foo" -7 8 | q = "bar" +2 | from os import remove, unlink, getcwd, readlink, stat +3 | from os.path import abspath, exists, expanduser, isdir, isfile, islink +4 | from os.path import isabs, join, basename, dirname, samefile, splitext +5 + import pathlib +6 | +7 | p = "/foo" +8 | q = "bar" -------------------------------------------------------------------------------- -60 61 | # comment 3 -61 62 | ) -62 63 | -63 |-rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None) - 64 |+pathlib.Path(file).rename("file_2.py") -64 65 | -65 66 | rename(file, "file_2.py", src_dir_fd=1) +61 | # comment 3 +62 | ) +63 | + - rename(file, "file_2.py", src_dir_fd=None, dst_dir_fd=None) +64 + pathlib.Path(file).rename("file_2.py") +65 | +66 | rename(file, "file_2.py", src_dir_fd=1) diff --git a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap index 9ca00b20b2..0722ac76b1 100644 --- a/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap +++ b/crates/ruff_linter/src/rules/flake8_use_pathlib/snapshots/ruff_linter__rules__flake8_use_pathlib__tests__preview_import_from_as.py.snap @@ -12,21 +12,20 @@ PTH100 [*] `os.path.abspath()` should be replaced by `Path.resolve()` 16 | aaa = xmkdir(p) | help: Replace with `Path(...).resolve()` - -ℹ Unsafe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" -13 14 | -14 |-a = xabspath(p) - 15 |+a = pathlib.Path(p).resolve() -15 16 | aa = xchmod(p) -16 17 | aaa = xmkdir(p) -17 18 | xmakedirs(p) +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" +14 | + - a = xabspath(p) +15 + a = pathlib.Path(p).resolve() +16 | aa = xchmod(p) +17 | aaa = xmkdir(p) +18 | xmakedirs(p) +note: This is an unsafe fix and may change runtime behavior PTH101 `os.chmod()` should be replaced by `Path.chmod()` --> import_from_as.py:15:6 @@ -50,23 +49,21 @@ PTH102 [*] `os.mkdir()` should be replaced by `Path.mkdir()` 18 | xrename(p) | help: Replace with `Path(...).mkdir()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" -13 14 | -14 15 | a = xabspath(p) -15 16 | aa = xchmod(p) -16 |-aaa = xmkdir(p) - 17 |+aaa = pathlib.Path(p).mkdir() -17 18 | xmakedirs(p) -18 19 | xrename(p) -19 20 | xreplace(p) +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" +14 | +15 | a = xabspath(p) +16 | aa = xchmod(p) + - aaa = xmkdir(p) +17 + aaa = pathlib.Path(p).mkdir() +18 | xmakedirs(p) +19 | xrename(p) +20 | xreplace(p) PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` --> import_from_as.py:17:1 @@ -79,24 +76,22 @@ PTH103 [*] `os.makedirs()` should be replaced by `Path.mkdir(parents=True)` 19 | xreplace(p) | help: Replace with `Path(...).mkdir(parents=True)` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -14 15 | a = xabspath(p) -15 16 | aa = xchmod(p) -16 17 | aaa = xmkdir(p) -17 |-xmakedirs(p) - 18 |+pathlib.Path(p).mkdir(parents=True) -18 19 | xrename(p) -19 20 | xreplace(p) -20 21 | xrmdir(p) +15 | a = xabspath(p) +16 | aa = xchmod(p) +17 | aaa = xmkdir(p) + - xmakedirs(p) +18 + pathlib.Path(p).mkdir(parents=True) +19 | xrename(p) +20 | xreplace(p) +21 | xrmdir(p) PTH104 `os.rename()` should be replaced by `Path.rename()` --> import_from_as.py:18:1 @@ -133,24 +128,22 @@ PTH106 [*] `os.rmdir()` should be replaced by `Path.rmdir()` 22 | xunlink(p) | help: Replace with `Path(...).rmdir()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -17 18 | xmakedirs(p) -18 19 | xrename(p) -19 20 | xreplace(p) -20 |-xrmdir(p) - 21 |+pathlib.Path(p).rmdir() -21 22 | xremove(p) -22 23 | xunlink(p) -23 24 | xgetcwd(p) +18 | xmakedirs(p) +19 | xrename(p) +20 | xreplace(p) + - xrmdir(p) +21 + pathlib.Path(p).rmdir() +22 | xremove(p) +23 | xunlink(p) +24 | xgetcwd(p) PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` --> import_from_as.py:21:1 @@ -163,24 +156,22 @@ PTH107 [*] `os.remove()` should be replaced by `Path.unlink()` 23 | xgetcwd(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -18 19 | xrename(p) -19 20 | xreplace(p) -20 21 | xrmdir(p) -21 |-xremove(p) - 22 |+pathlib.Path(p).unlink() -22 23 | xunlink(p) -23 24 | xgetcwd(p) -24 25 | b = xexists(p) +19 | xrename(p) +20 | xreplace(p) +21 | xrmdir(p) + - xremove(p) +22 + pathlib.Path(p).unlink() +23 | xunlink(p) +24 | xgetcwd(p) +25 | b = xexists(p) PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` --> import_from_as.py:22:1 @@ -193,24 +184,22 @@ PTH108 [*] `os.unlink()` should be replaced by `Path.unlink()` 24 | b = xexists(p) | help: Replace with `Path(...).unlink()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -19 20 | xreplace(p) -20 21 | xrmdir(p) -21 22 | xremove(p) -22 |-xunlink(p) - 23 |+pathlib.Path(p).unlink() -23 24 | xgetcwd(p) -24 25 | b = xexists(p) -25 26 | bb = xexpanduser(p) +20 | xreplace(p) +21 | xrmdir(p) +22 | xremove(p) + - xunlink(p) +23 + pathlib.Path(p).unlink() +24 | xgetcwd(p) +25 | b = xexists(p) +26 | bb = xexpanduser(p) PTH109 `os.getcwd()` should be replaced by `Path.cwd()` --> import_from_as.py:23:1 @@ -235,24 +224,22 @@ PTH110 [*] `os.path.exists()` should be replaced by `Path.exists()` 26 | bbb = xisdir(p) | help: Replace with `Path(...).exists()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -21 22 | xremove(p) -22 23 | xunlink(p) -23 24 | xgetcwd(p) -24 |-b = xexists(p) - 25 |+b = pathlib.Path(p).exists() -25 26 | bb = xexpanduser(p) -26 27 | bbb = xisdir(p) -27 28 | bbbb = xisfile(p) +22 | xremove(p) +23 | xunlink(p) +24 | xgetcwd(p) + - b = xexists(p) +25 + b = pathlib.Path(p).exists() +26 | bb = xexpanduser(p) +27 | bbb = xisdir(p) +28 | bbbb = xisfile(p) PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` --> import_from_as.py:25:6 @@ -265,24 +252,22 @@ PTH111 [*] `os.path.expanduser()` should be replaced by `Path.expanduser()` 27 | bbbb = xisfile(p) | help: Replace with `Path(...).expanduser()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -22 23 | xunlink(p) -23 24 | xgetcwd(p) -24 25 | b = xexists(p) -25 |-bb = xexpanduser(p) - 26 |+bb = pathlib.Path(p).expanduser() -26 27 | bbb = xisdir(p) -27 28 | bbbb = xisfile(p) -28 29 | bbbbb = xislink(p) +23 | xunlink(p) +24 | xgetcwd(p) +25 | b = xexists(p) + - bb = xexpanduser(p) +26 + bb = pathlib.Path(p).expanduser() +27 | bbb = xisdir(p) +28 | bbbb = xisfile(p) +29 | bbbbb = xislink(p) PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` --> import_from_as.py:26:7 @@ -295,24 +280,22 @@ PTH112 [*] `os.path.isdir()` should be replaced by `Path.is_dir()` 28 | bbbbb = xislink(p) | help: Replace with `Path(...).is_dir()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -23 24 | xgetcwd(p) -24 25 | b = xexists(p) -25 26 | bb = xexpanduser(p) -26 |-bbb = xisdir(p) - 27 |+bbb = pathlib.Path(p).is_dir() -27 28 | bbbb = xisfile(p) -28 29 | bbbbb = xislink(p) -29 30 | xreadlink(p) +24 | xgetcwd(p) +25 | b = xexists(p) +26 | bb = xexpanduser(p) + - bbb = xisdir(p) +27 + bbb = pathlib.Path(p).is_dir() +28 | bbbb = xisfile(p) +29 | bbbbb = xislink(p) +30 | xreadlink(p) PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` --> import_from_as.py:27:8 @@ -325,24 +308,22 @@ PTH113 [*] `os.path.isfile()` should be replaced by `Path.is_file()` 29 | xreadlink(p) | help: Replace with `Path(...).is_file()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -24 25 | b = xexists(p) -25 26 | bb = xexpanduser(p) -26 27 | bbb = xisdir(p) -27 |-bbbb = xisfile(p) - 28 |+bbbb = pathlib.Path(p).is_file() -28 29 | bbbbb = xislink(p) -29 30 | xreadlink(p) -30 31 | xstat(p) +25 | b = xexists(p) +26 | bb = xexpanduser(p) +27 | bbb = xisdir(p) + - bbbb = xisfile(p) +28 + bbbb = pathlib.Path(p).is_file() +29 | bbbbb = xislink(p) +30 | xreadlink(p) +31 | xstat(p) PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` --> import_from_as.py:28:9 @@ -355,24 +336,22 @@ PTH114 [*] `os.path.islink()` should be replaced by `Path.is_symlink()` 30 | xstat(p) | help: Replace with `Path(...).is_symlink()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -25 26 | bb = xexpanduser(p) -26 27 | bbb = xisdir(p) -27 28 | bbbb = xisfile(p) -28 |-bbbbb = xislink(p) - 29 |+bbbbb = pathlib.Path(p).is_symlink() -29 30 | xreadlink(p) -30 31 | xstat(p) -31 32 | xisabs(p) +26 | bb = xexpanduser(p) +27 | bbb = xisdir(p) +28 | bbbb = xisfile(p) + - bbbbb = xislink(p) +29 + bbbbb = pathlib.Path(p).is_symlink() +30 | xreadlink(p) +31 | xstat(p) +32 | xisabs(p) PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` --> import_from_as.py:29:1 @@ -385,24 +364,22 @@ PTH115 [*] `os.readlink()` should be replaced by `Path.readlink()` 31 | xisabs(p) | help: Replace with `Path(...).readlink()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -26 27 | bbb = xisdir(p) -27 28 | bbbb = xisfile(p) -28 29 | bbbbb = xislink(p) -29 |-xreadlink(p) - 30 |+pathlib.Path(p).readlink() -30 31 | xstat(p) -31 32 | xisabs(p) -32 33 | xjoin(p, q) +27 | bbb = xisdir(p) +28 | bbbb = xisfile(p) +29 | bbbbb = xislink(p) + - xreadlink(p) +30 + pathlib.Path(p).readlink() +31 | xstat(p) +32 | xisabs(p) +33 | xjoin(p, q) PTH116 `os.stat()` should be replaced by `Path.stat()`, `Path.owner()`, or `Path.group()` --> import_from_as.py:30:1 @@ -426,24 +403,22 @@ PTH117 [*] `os.path.isabs()` should be replaced by `Path.is_absolute()` 33 | s.join((p, q)) | help: Replace with `Path(...).is_absolute()` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -28 29 | bbbbb = xislink(p) -29 30 | xreadlink(p) -30 31 | xstat(p) -31 |-xisabs(p) - 32 |+pathlib.Path(p).is_absolute() -32 33 | xjoin(p, q) -33 34 | s.join((p, q)) -34 35 | s.join([p, q]) +29 | bbbbb = xislink(p) +30 | xreadlink(p) +31 | xstat(p) + - xisabs(p) +32 + pathlib.Path(p).is_absolute() +33 | xjoin(p, q) +34 | s.join((p, q)) +35 | s.join([p, q]) PTH118 `os.path.join()` should be replaced by `Path` with `/` operator --> import_from_as.py:32:1 @@ -489,24 +464,22 @@ PTH119 [*] `os.path.basename()` should be replaced by `Path.name` 37 | xsamefile(p) | help: Replace with `Path(...).name` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -32 33 | xjoin(p, q) -33 34 | s.join((p, q)) -34 35 | s.join([p, q]) -35 |-xbasename(p) - 36 |+pathlib.Path(p).name -36 37 | xdirname(p) -37 38 | xsamefile(p) -38 39 | xsplitext(p) +33 | xjoin(p, q) +34 | s.join((p, q)) +35 | s.join([p, q]) + - xbasename(p) +36 + pathlib.Path(p).name +37 | xdirname(p) +38 | xsamefile(p) +39 | xsplitext(p) PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` --> import_from_as.py:36:1 @@ -519,23 +492,21 @@ PTH120 [*] `os.path.dirname()` should be replaced by `Path.parent` 38 | xsplitext(p) | help: Replace with `Path(...).parent` - -ℹ Safe fix -7 7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs -8 8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname -9 9 | from os.path import samefile as xsamefile, splitext as xsplitext - 10 |+import pathlib -10 11 | -11 12 | p = "/foo" -12 13 | q = "bar" +7 | from os.path import isfile as xisfile, islink as xislink, isabs as xisabs +8 | from os.path import join as xjoin, basename as xbasename, dirname as xdirname +9 | from os.path import samefile as xsamefile, splitext as xsplitext +10 + import pathlib +11 | +12 | p = "/foo" +13 | q = "bar" -------------------------------------------------------------------------------- -33 34 | s.join((p, q)) -34 35 | s.join([p, q]) -35 36 | xbasename(p) -36 |-xdirname(p) - 37 |+pathlib.Path(p).parent -37 38 | xsamefile(p) -38 39 | xsplitext(p) +34 | s.join((p, q)) +35 | s.join([p, q]) +36 | xbasename(p) + - xdirname(p) +37 + pathlib.Path(p).parent +38 | xsamefile(p) +39 | xsplitext(p) PTH121 `os.path.samefile()` should be replaced by `Path.samefile()` --> import_from_as.py:37:1 diff --git a/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap b/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap index a05344de64..e951d9e721 100644 --- a/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap +++ b/crates/ruff_linter/src/rules/flynt/snapshots/ruff_linter__rules__flynt__tests__FLY002_FLY002.py.snap @@ -11,16 +11,15 @@ FLY002 [*] Consider `f"{a} World"` instead of string join 7 | ok3 = "x".join(("1", "2", "3")) # OK | help: Replace with `f"{a} World"` - -ℹ Unsafe fix -2 2 | from random import random, choice -3 3 | -4 4 | a = "Hello" -5 |-ok1 = " ".join([a, " World"]) # OK - 5 |+ok1 = f"{a} World" # OK -6 6 | ok2 = "".join(["Finally, ", a, " World"]) # OK -7 7 | ok3 = "x".join(("1", "2", "3")) # OK -8 8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally +2 | from random import random, choice +3 | +4 | a = "Hello" + - ok1 = " ".join([a, " World"]) # OK +5 + ok1 = f"{a} World" # OK +6 | ok2 = "".join(["Finally, ", a, " World"]) # OK +7 | ok3 = "x".join(("1", "2", "3")) # OK +8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally +note: This is an unsafe fix and may change runtime behavior FLY002 [*] Consider `f"Finally, {a} World"` instead of string join --> FLY002.py:6:7 @@ -33,16 +32,15 @@ FLY002 [*] Consider `f"Finally, {a} World"` instead of string join 8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally | help: Replace with `f"Finally, {a} World"` - -ℹ Unsafe fix -3 3 | -4 4 | a = "Hello" -5 5 | ok1 = " ".join([a, " World"]) # OK -6 |-ok2 = "".join(["Finally, ", a, " World"]) # OK - 6 |+ok2 = f"Finally, {a} World" # OK -7 7 | ok3 = "x".join(("1", "2", "3")) # OK -8 8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally -9 9 | ok5 = "a".join([random(), random()]) # OK (simple calls) +3 | +4 | a = "Hello" +5 | ok1 = " ".join([a, " World"]) # OK + - ok2 = "".join(["Finally, ", a, " World"]) # OK +6 + ok2 = f"Finally, {a} World" # OK +7 | ok3 = "x".join(("1", "2", "3")) # OK +8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally +9 | ok5 = "a".join([random(), random()]) # OK (simple calls) +note: This is an unsafe fix and may change runtime behavior FLY002 [*] Consider `"1x2x3"` instead of string join --> FLY002.py:7:7 @@ -55,16 +53,15 @@ FLY002 [*] Consider `"1x2x3"` instead of string join 9 | ok5 = "a".join([random(), random()]) # OK (simple calls) | help: Replace with `"1x2x3"` - -ℹ Unsafe fix -4 4 | a = "Hello" -5 5 | ok1 = " ".join([a, " World"]) # OK -6 6 | ok2 = "".join(["Finally, ", a, " World"]) # OK -7 |-ok3 = "x".join(("1", "2", "3")) # OK - 7 |+ok3 = "1x2x3" # OK -8 8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally -9 9 | ok5 = "a".join([random(), random()]) # OK (simple calls) -10 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) +4 | a = "Hello" +5 | ok1 = " ".join([a, " World"]) # OK +6 | ok2 = "".join(["Finally, ", a, " World"]) # OK + - ok3 = "x".join(("1", "2", "3")) # OK +7 + ok3 = "1x2x3" # OK +8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally +9 | ok5 = "a".join([random(), random()]) # OK (simple calls) +10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) +note: This is an unsafe fix and may change runtime behavior FLY002 [*] Consider `f"{1}y{2}y{3}"` instead of string join --> FLY002.py:8:7 @@ -77,16 +74,15 @@ FLY002 [*] Consider `f"{1}y{2}y{3}"` instead of string join 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) | help: Replace with `f"{1}y{2}y{3}"` - -ℹ Unsafe fix -5 5 | ok1 = " ".join([a, " World"]) # OK -6 6 | ok2 = "".join(["Finally, ", a, " World"]) # OK -7 7 | ok3 = "x".join(("1", "2", "3")) # OK -8 |-ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally - 8 |+ok4 = f"{1}y{2}y{3}" # Technically OK, though would've been an error originally -9 9 | ok5 = "a".join([random(), random()]) # OK (simple calls) -10 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) -11 11 | +5 | ok1 = " ".join([a, " World"]) # OK +6 | ok2 = "".join(["Finally, ", a, " World"]) # OK +7 | ok3 = "x".join(("1", "2", "3")) # OK + - ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally +8 + ok4 = f"{1}y{2}y{3}" # Technically OK, though would've been an error originally +9 | ok5 = "a".join([random(), random()]) # OK (simple calls) +10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) +11 | +note: This is an unsafe fix and may change runtime behavior FLY002 [*] Consider `f"{random()}a{random()}"` instead of string join --> FLY002.py:9:7 @@ -98,16 +94,15 @@ FLY002 [*] Consider `f"{random()}a{random()}"` instead of string join 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) | help: Replace with `f"{random()}a{random()}"` - -ℹ Unsafe fix -6 6 | ok2 = "".join(["Finally, ", a, " World"]) # OK -7 7 | ok3 = "x".join(("1", "2", "3")) # OK -8 8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally -9 |-ok5 = "a".join([random(), random()]) # OK (simple calls) - 9 |+ok5 = f"{random()}a{random()}" # OK (simple calls) -10 10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) -11 11 | -12 12 | nok1 = "x".join({"4", "5", "yee"}) # Not OK (set) +6 | ok2 = "".join(["Finally, ", a, " World"]) # OK +7 | ok3 = "x".join(("1", "2", "3")) # OK +8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally + - ok5 = "a".join([random(), random()]) # OK (simple calls) +9 + ok5 = f"{random()}a{random()}" # OK (simple calls) +10 | ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) +11 | +12 | nok1 = "x".join({"4", "5", "yee"}) # Not OK (set) +note: This is an unsafe fix and may change runtime behavior FLY002 [*] Consider `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"` instead of string join --> FLY002.py:10:7 @@ -120,16 +115,15 @@ FLY002 [*] Consider `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"` instead 12 | nok1 = "x".join({"4", "5", "yee"}) # Not OK (set) | help: Replace with `f"{secrets.token_urlsafe()}a{secrets.token_hex()}"` - -ℹ Unsafe fix -7 7 | ok3 = "x".join(("1", "2", "3")) # OK -8 8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally -9 9 | ok5 = "a".join([random(), random()]) # OK (simple calls) -10 |-ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) - 10 |+ok6 = f"{secrets.token_urlsafe()}a{secrets.token_hex()}" # OK (attr calls) -11 11 | -12 12 | nok1 = "x".join({"4", "5", "yee"}) # Not OK (set) -13 13 | nok2 = a.join(["1", "2", "3"]) # Not OK (not a static joiner) +7 | ok3 = "x".join(("1", "2", "3")) # OK +8 | ok4 = "y".join([1, 2, 3]) # Technically OK, though would've been an error originally +9 | ok5 = "a".join([random(), random()]) # OK (simple calls) + - ok6 = "a".join([secrets.token_urlsafe(), secrets.token_hex()]) # OK (attr calls) +10 + ok6 = f"{secrets.token_urlsafe()}a{secrets.token_hex()}" # OK (attr calls) +11 | +12 | nok1 = "x".join({"4", "5", "yee"}) # Not OK (set) +13 | nok2 = a.join(["1", "2", "3"]) # Not OK (not a static joiner) +note: This is an unsafe fix and may change runtime behavior FLY002 [*] Consider `f"{url}{filename}"` instead of string join --> FLY002.py:23:11 @@ -140,10 +134,9 @@ FLY002 [*] Consider `f"{url}{filename}"` instead of string join | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `f"{url}{filename}"` - -ℹ Unsafe fix -20 20 | -21 21 | # Regression test for: https://github.com/astral-sh/ruff/issues/7197 -22 22 | def create_file_public_url(url, filename): -23 |- return''.join([url, filename]) - 23 |+ return f"{url}{filename}" +20 | +21 | # Regression test for: https://github.com/astral-sh/ruff/issues/7197 +22 | def create_file_public_url(url, filename): + - return''.join([url, filename]) +23 + return f"{url}{filename}" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap index 640f8ef45f..f5b9d42767 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__1_separate_subpackage_first_and_third_party_imports.py.snap @@ -15,19 +15,17 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import sys - 2 |+ - 3 |+import foo - 4 |+from foo import bar, baz - 5 |+ -2 6 | import baz -3 |-from foo import bar, baz - 7 |+import foo.bar - 8 |+import foo.bar.baz -4 9 | from foo.bar import blah, blub -5 10 | from foo.bar.baz import something -6 |-import foo -7 |-import foo.bar -8 |-import foo.bar.baz +1 | import sys +2 + +3 + import foo +4 + from foo import bar, baz +5 + +6 | import baz + - from foo import bar, baz +7 + import foo.bar +8 + import foo.bar.baz +9 | from foo.bar import blah, blub +10 | from foo.bar.baz import something + - import foo + - import foo.bar + - import foo.bar.baz diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap index a112861682..917e7c390f 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__2_separate_subpackage_first_and_third_party_imports.py.snap @@ -15,18 +15,16 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import sys - 2 |+ -2 3 | import baz -3 |-from foo import bar, baz - 4 |+import foo.bar - 5 |+import foo.bar.baz -4 6 | from foo.bar import blah, blub -5 7 | from foo.bar.baz import something - 8 |+ -6 9 | import foo -7 |-import foo.bar -8 |-import foo.bar.baz - 10 |+from foo import bar, baz +1 | import sys +2 + +3 | import baz + - from foo import bar, baz +4 + import foo.bar +5 + import foo.bar.baz +6 | from foo.bar import blah, blub +7 | from foo.bar.baz import something +8 + +9 | import foo + - import foo.bar + - import foo.bar.baz +10 + from foo import bar, baz diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap index 7764f55c0c..19a1d5264c 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__add_newline_before_comments.py.snap @@ -14,15 +14,13 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import os - 2 |+ -2 3 | # This is a comment in the same section, so we need to add one newline. -3 4 | import sys - 5 |+ -4 6 | import numpy as np - 7 |+ -5 8 | # This is a comment, but it starts a new section, so we don't need to add a newline -6 9 | # before it. -7 10 | import leading_prefix +1 | import os +2 + +3 | # This is a comment in the same section, so we need to add one newline. +4 | import sys +5 + +6 | import numpy as np +7 + +8 | # This is a comment, but it starts a new section, so we don't need to add a newline +9 | # before it. +10 | import leading_prefix diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap index f99d6dc880..897fef0831 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__as_imports_comments.py.snap @@ -22,24 +22,22 @@ I001 [*] Import block is un-sorted or un-formatted | |_^ | help: Organize imports - -ℹ Safe fix -1 |-from foo import ( # Comment on `foo` -2 |- Member as Alias, # Comment on `Alias` -3 |-) -4 |- -5 1 | from bar import ( # Comment on `bar` -6 2 | Member, # Comment on `Member` -7 |-) -8 |- -9 |-from baz import ( # Comment on `baz` -10 |- Member as Alias # Comment on `Alias` -11 3 | ) -12 |- -13 |-from bop import ( # Comment on `bop` -14 |- Member # Comment on `Member` - 4 |+from baz import Member as Alias # Comment on `baz` # Comment on `Alias` - 5 |+from bop import Member # Comment on `bop` # Comment on `Member` - 6 |+from foo import ( # Comment on `foo` - 7 |+ Member as Alias, # Comment on `Alias` -15 8 | ) + - from foo import ( # Comment on `foo` + - Member as Alias, # Comment on `Alias` + - ) + - +1 | from bar import ( # Comment on `bar` +2 | Member, # Comment on `Member` + - ) + - + - from baz import ( # Comment on `baz` + - Member as Alias # Comment on `Alias` +3 | ) + - + - from bop import ( # Comment on `bop` + - Member # Comment on `Member` +4 + from baz import Member as Alias # Comment on `baz` # Comment on `Alias` +5 + from bop import Member # Comment on `bop` # Comment on `Member` +6 + from foo import ( # Comment on `foo` +7 + Member as Alias, # Comment on `Alias` +8 | ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap index 94f4c90cd0..bf99dd51dc 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__bom_unsorted.py.snap @@ -9,9 +9,7 @@ I001 [*] Import block is un-sorted or un-formatted | |__________^ | help: Organize imports - -ℹ Safe fix -1 |-import foo -2 |-import bar - 1 |+import bar - 2 |+import foo + - import foo + - import bar +1 + import bar +2 + import foo diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap index dbdb4cef00..5d92111627 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__case_sensitive_case_sensitive.py.snap @@ -16,18 +16,16 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import A -2 2 | import B - 3 |+import C - 4 |+import E -3 5 | import b -4 |-import C -5 6 | import d -6 |-import E -7 7 | import f -8 |-from g import a, B, c -9 |-from h import A, b, C - 8 |+from g import B, a, c - 9 |+from h import A, C, b +1 | import A +2 | import B +3 + import C +4 + import E +5 | import b + - import C +6 | import d + - import E +7 | import f + - from g import a, B, c + - from h import A, b, C +8 + from g import B, a, c +9 + from h import A, C, b diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap index 282f28db82..86e459fb79 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__closest_to_furthest_relative_imports_order.py.snap @@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________^ | help: Organize imports - -ℹ Safe fix - 1 |+from . import c - 2 |+from .. import b -1 3 | from ... import a -2 |-from .. import b -3 |-from . import c +1 + from . import c +2 + from .. import b +3 | from ... import a + - from .. import b + - from . import c diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap index c9a668a8cf..a02afabc6e 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports.py.snap @@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix - 1 |+from module import CONSTANT, function -1 2 | from module import Class as C -2 |-from module import CONSTANT -3 |-from module import function -4 3 | from module import function as f +1 + from module import CONSTANT, function +2 | from module import Class as C + - from module import CONSTANT + - from module import function +3 | from module import function as f diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap index 1bfabef370..af1b0e074c 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_as_imports_combine_as_imports.py.snap @@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from module import Class as C -2 |-from module import CONSTANT -3 |-from module import function -4 |-from module import function as f - 1 |+from module import CONSTANT, Class as C, function, function as f + - from module import Class as C + - from module import CONSTANT + - from module import function + - from module import function as f +1 + from module import CONSTANT, Class as C, function, function as f diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap index 3277e96b8b..e718f48194 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__combine_import_from.py.snap @@ -12,18 +12,16 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________________________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from collections import Awaitable -2 |-from collections import AsyncIterable -3 |-from collections import Collection -4 |-from collections import ChainMap -5 |-from collections import MutableSequence, MutableMapping - 1 |+from collections import ( - 2 |+ AsyncIterable, - 3 |+ Awaitable, - 4 |+ ChainMap, - 5 |+ Collection, - 6 |+ MutableMapping, - 7 |+ MutableSequence, - 8 |+) + - from collections import Awaitable + - from collections import AsyncIterable + - from collections import Collection + - from collections import ChainMap + - from collections import MutableSequence, MutableMapping +1 + from collections import ( +2 + AsyncIterable, +3 + Awaitable, +4 + ChainMap, +5 + Collection, +6 + MutableMapping, +7 + MutableSequence, +8 + ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap index a05d2accfa..9bc54c7de5 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__comments.py.snap @@ -40,50 +40,48 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________^ | help: Organize imports - -ℹ Safe fix -1 1 | # Comment 1 -2 2 | # Comment 2 -3 |-import D - 3 |+import B # Comment 4 -4 4 | -5 5 | # Comment 3a -6 |-import C -7 |- -8 6 | # Comment 3b -9 7 | import C -10 |- -11 |-import B # Comment 4 - 8 |+import D -12 9 | -13 10 | # Comment 5 -14 |- -15 11 | # Comment 6 -16 12 | from A import ( -17 |- a, # Comment 7 -18 |- b, -19 |- c, # Comment 8 - 13 |+ a, # Comment 7 # Comment 9 - 14 |+ b, # Comment 10 - 15 |+ c, # Comment 8 # Comment 11 -20 16 | ) -21 |-from A import ( -22 |- a, # Comment 9 -23 |- b, # Comment 10 -24 |- c, # Comment 11 - 17 |+from D import ( - 18 |+ a_long_name_to_force_multiple_lines, # Comment 12 - 19 |+ another_long_name_to_force_multiple_lines, # Comment 13 -25 20 | ) -26 |- -27 |-from D import a_long_name_to_force_multiple_lines # Comment 12 -28 |-from D import another_long_name_to_force_multiple_lines # Comment 13 -29 |- -30 21 | from E import a # Comment 1 -31 |- -32 |-from F import a # Comment 1 -33 |-from F import b - 22 |+from F import ( - 23 |+ a, # Comment 1 - 24 |+ b, - 25 |+) +1 | # Comment 1 +2 | # Comment 2 + - import D +3 + import B # Comment 4 +4 | +5 | # Comment 3a + - import C + - +6 | # Comment 3b +7 | import C + - + - import B # Comment 4 +8 + import D +9 | +10 | # Comment 5 + - +11 | # Comment 6 +12 | from A import ( + - a, # Comment 7 + - b, + - c, # Comment 8 +13 + a, # Comment 7 # Comment 9 +14 + b, # Comment 10 +15 + c, # Comment 8 # Comment 11 +16 | ) + - from A import ( + - a, # Comment 9 + - b, # Comment 10 + - c, # Comment 11 +17 + from D import ( +18 + a_long_name_to_force_multiple_lines, # Comment 12 +19 + another_long_name_to_force_multiple_lines, # Comment 13 +20 | ) + - + - from D import a_long_name_to_force_multiple_lines # Comment 12 + - from D import another_long_name_to_force_multiple_lines # Comment 13 + - +21 | from E import a # Comment 1 + - + - from F import a # Comment 1 + - from F import b +22 + from F import ( +23 + a, # Comment 1 +24 + b, +25 + ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap index 802f717317..8bd0e08fec 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__deduplicate_imports.py.snap @@ -11,9 +11,7 @@ I001 [*] Import block is un-sorted or un-formatted | |________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import os -2 |-import os -3 2 | import os as os1 -4 3 | import os as os2 +1 | import os + - import os +2 | import os as os1 +3 | import os as os2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap index ea45f03a17..df981a6f5e 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__detect_same_package.snap @@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted | |______________^ | help: Organize imports - -ℹ Safe fix -1 1 | import os - 2 |+ -2 3 | import pandas - 4 |+ -3 5 | import foo.baz +1 | import os +2 + +3 | import pandas +4 + +5 | import foo.baz diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap index 71e291594f..574d30e45a 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length.py.snap @@ -16,27 +16,25 @@ I001 [*] Import block is un-sorted or un-formatted | |_____^ | help: Organize imports - -ℹ Safe fix -5 5 | -6 6 | if indented: -7 7 | from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -8 |- from line_with_89 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -9 |- from line_with_90 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -10 |- from line_with_91 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -11 |- from line_with_92 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - 8 |+ from line_with_89 import ( - 9 |+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, - 10 |+ ) - 11 |+ from line_with_90 import ( - 12 |+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, - 13 |+ ) - 14 |+ from line_with_91 import ( - 15 |+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, - 16 |+ ) - 17 |+ from line_with_92 import ( - 18 |+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, - 19 |+ ) -12 20 | from line_with_93 import ( -13 21 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, -14 22 | ) +5 | +6 | if indented: +7 | from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + - from line_with_89 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + - from line_with_90 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + - from line_with_91 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + - from line_with_92 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +8 + from line_with_89 import ( +9 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, +10 + ) +11 + from line_with_90 import ( +12 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, +13 + ) +14 + from line_with_91 import ( +15 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, +16 + ) +17 + from line_with_92 import ( +18 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, +19 + ) +20 | from line_with_93 import ( +21 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, +22 | ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap index 1e9aa5cab2..8ae9842a78 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__fit_line_length_comment.py.snap @@ -15,22 +15,20 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________^ | help: Organize imports - -ℹ Safe fix -1 1 | import a - 2 |+ -2 3 | # Don't take this comment into account when determining whether the next import can fit on one line. -3 4 | from b import c -4 |-from d import e # Do take this comment into account when determining whether the next import can fit on one line. - 5 |+from d import ( - 6 |+ e, # Do take this comment into account when determining whether the next import can fit on one line. - 7 |+) - 8 |+ -5 9 | # The next import fits on one line. -6 10 | from f import g # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ - 11 |+ -7 12 | # The next import doesn't fit on one line. -8 |-from h import i # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9 - 13 |+from h import ( - 14 |+ i, # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9 - 15 |+) +1 | import a +2 + +3 | # Don't take this comment into account when determining whether the next import can fit on one line. +4 | from b import c + - from d import e # Do take this comment into account when determining whether the next import can fit on one line. +5 + from d import ( +6 + e, # Do take this comment into account when determining whether the next import can fit on one line. +7 + ) +8 + +9 | # The next import fits on one line. +10 | from f import g # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ +11 + +12 | # The next import doesn't fit on one line. + - from h import i # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9 +13 + from h import ( +14 + i, # 012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9012ß9💣2ℝ9 +15 + ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap index 0e39739f5d..99e9f896a4 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_single_line_force_single_line.py.snap @@ -34,52 +34,50 @@ I001 [*] Import block is un-sorted or un-formatted | |_________________^ | help: Organize imports - -ℹ Safe fix -1 |-import sys, math -2 |-from os import path, uname - 1 |+import math - 2 |+import sys -3 3 | from json import detect_encoding -4 4 | from json import dump -5 5 | from json import dumps as json_dumps -6 6 | from json import load -7 7 | from json import loads as json_loads -8 |-from logging.handlers import StreamHandler, FileHandler - 8 |+from logging.handlers import FileHandler, StreamHandler - 9 |+from os import path, uname -9 10 | -10 |-# comment 1 -11 |-from third_party import lib1, lib2, \ -12 |- lib3, lib7, lib5, lib6 -13 |-# comment 2 -14 |-from third_party import lib4 - 11 |+# comment 6 - 12 |+from bar import a # comment 7 - 13 |+from bar import b # comment 8 -15 14 | - 15 |+# comment 9 - 16 |+from baz import * # comment 10 -16 17 | from foo import bar # comment 3 -17 18 | from foo2 import bar2 # comment 4 -18 |-from foo3 import bar3, baz3 # comment 5 - 19 |+from foo3 import bar3 # comment 5 - 20 |+from foo3 import baz3 # comment 5 -19 21 | -20 |-# comment 6 -21 |-from bar import ( -22 |- a, # comment 7 -23 |- b, # comment 8 -24 |-) - 22 |+# comment 1 - 23 |+from third_party import lib1 - 24 |+from third_party import lib2 - 25 |+from third_party import lib3 -25 26 | -26 |-# comment 9 -27 |-from baz import * # comment 10 - 27 |+# comment 2 - 28 |+from third_party import lib4 - 29 |+from third_party import lib5 - 30 |+from third_party import lib6 - 31 |+from third_party import lib7 + - import sys, math + - from os import path, uname +1 + import math +2 + import sys +3 | from json import detect_encoding +4 | from json import dump +5 | from json import dumps as json_dumps +6 | from json import load +7 | from json import loads as json_loads + - from logging.handlers import StreamHandler, FileHandler +8 + from logging.handlers import FileHandler, StreamHandler +9 + from os import path, uname +10 | + - # comment 1 + - from third_party import lib1, lib2, \ + - lib3, lib7, lib5, lib6 + - # comment 2 + - from third_party import lib4 +11 + # comment 6 +12 + from bar import a # comment 7 +13 + from bar import b # comment 8 +14 | +15 + # comment 9 +16 + from baz import * # comment 10 +17 | from foo import bar # comment 3 +18 | from foo2 import bar2 # comment 4 + - from foo3 import bar3, baz3 # comment 5 +19 + from foo3 import bar3 # comment 5 +20 + from foo3 import baz3 # comment 5 +21 | + - # comment 6 + - from bar import ( + - a, # comment 7 + - b, # comment 8 + - ) +22 + # comment 1 +23 + from third_party import lib1 +24 + from third_party import lib2 +25 + from third_party import lib3 +26 | + - # comment 9 + - from baz import * # comment 10 +27 + # comment 2 +28 + from third_party import lib4 +29 + from third_party import lib5 +30 + from third_party import lib6 +31 + from third_party import lib7 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap index c691b2aefe..439b590204 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections.py.snap @@ -20,24 +20,22 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from a import a1 # import_from -2 |-from c import * # import_from_star -3 1 | import a # import - 2 |+import b as b1 # import_as -4 3 | import c.d - 4 |+import z - 5 |+from a import a1 # import_from - 6 |+from c import * # import_from_star -5 7 | from z import z1 -6 |-import b as b1 # import_as -7 |-import z -8 8 | - 9 |+from ...grandparent import fn3 -9 10 | from ..parent import * - 11 |+from . import my -10 12 | from .my import fn -11 |-from . import my -12 13 | from .my.nested import fn2 -13 |-from ...grandparent import fn3 + - from a import a1 # import_from + - from c import * # import_from_star +1 | import a # import +2 + import b as b1 # import_as +3 | import c.d +4 + import z +5 + from a import a1 # import_from +6 + from c import * # import_from_star +7 | from z import z1 + - import b as b1 # import_as + - import z +8 | +9 + from ...grandparent import fn3 +10 | from ..parent import * +11 + from . import my +12 | from .my import fn + - from . import my +13 | from .my.nested import fn2 + - from ...grandparent import fn3 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap index 62d7a8d8ef..117531db2d 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections.py.snap @@ -20,25 +20,23 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from a import a1 # import_from -2 |-from c import * # import_from_star - 1 |+import z - 2 |+from z import z1 -3 3 | import a # import - 4 |+from a import a1 # import_from - 5 |+import b as b1 # import_as - 6 |+from c import * # import_from_star -4 7 | import c.d -5 |-from z import z1 -6 |-import b as b1 # import_as -7 |-import z -8 8 | - 9 |+from ...grandparent import fn3 -9 10 | from ..parent import * - 11 |+from . import my -10 12 | from .my import fn -11 |-from . import my -12 13 | from .my.nested import fn2 -13 |-from ...grandparent import fn3 + - from a import a1 # import_from + - from c import * # import_from_star +1 + import z +2 + from z import z1 +3 | import a # import +4 + from a import a1 # import_from +5 + import b as b1 # import_as +6 + from c import * # import_from_star +7 | import c.d + - from z import z1 + - import b as b1 # import_as + - import z +8 | +9 + from ...grandparent import fn3 +10 | from ..parent import * +11 + from . import my +12 | from .my import fn + - from . import my +13 | from .my.nested import fn2 + - from ...grandparent import fn3 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap index 94212f25e5..632a0c606a 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_future.py.snap @@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________________________^ | help: Organize imports - -ℹ Safe fix - 1 |+from __future__ import annotations -1 2 | import __future__ -2 |-from __future__ import annotations +1 + from __future__ import annotations +2 | import __future__ + - from __future__ import annotations diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap index 86c1f33ecd..b7be5859b6 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_sort_within_sections_force_sort_within_sections_with_as_names.py.snap @@ -12,14 +12,12 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________^ | help: Organize imports - -ℹ Safe fix - 1 |+import datetime - 2 |+import datetime as dt - 3 |+from datetime import timedelta - 4 |+from datetime import timezone as tz -1 5 | import encodings -2 |-from datetime import timezone as tz -3 |-from datetime import timedelta -4 |-import datetime as dt -5 |-import datetime +1 + import datetime +2 + import datetime as dt +3 + from datetime import timedelta +4 + from datetime import timezone as tz +5 | import encodings + - from datetime import timezone as tz + - from datetime import timedelta + - import datetime as dt + - import datetime diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap index d13a77760b..98e508937e 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top.py.snap @@ -30,38 +30,36 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________________^ | help: Organize imports - -ℹ Safe fix -1 |-import lib6 - 1 |+import foo - 2 |+import lib1 -2 3 | import lib2 -3 |-import lib5 -4 |-import lib1 -5 4 | import lib3 - 5 |+import lib3.lib4 - 6 |+import lib3.lib4.lib5 -6 7 | import lib4 -7 |- -8 |-import foo - 8 |+import lib5 - 9 |+import lib6 -9 10 | import z -10 11 | from foo import bar - 12 |+from foo.lib1.bar import baz -11 13 | from lib1 import foo -12 |-from lib2 import foo -13 14 | from lib1.lib2 import foo -14 |-from foo.lib1.bar import baz -15 |-from lib4 import lib1 -16 |-from lib5 import lib2 -17 |-from lib4 import lib2 -18 |-from lib5 import lib1 -19 |- -20 |-import lib3.lib4 -21 |-import lib3.lib4.lib5 - 15 |+from lib2 import foo -22 16 | from lib3.lib4 import foo -23 17 | from lib3.lib4.lib5 import foo - 18 |+from lib4 import lib1, lib2 - 19 |+from lib5 import lib1, lib2 + - import lib6 +1 + import foo +2 + import lib1 +3 | import lib2 + - import lib5 + - import lib1 +4 | import lib3 +5 + import lib3.lib4 +6 + import lib3.lib4.lib5 +7 | import lib4 + - + - import foo +8 + import lib5 +9 + import lib6 +10 | import z +11 | from foo import bar +12 + from foo.lib1.bar import baz +13 | from lib1 import foo + - from lib2 import foo +14 | from lib1.lib2 import foo + - from foo.lib1.bar import baz + - from lib4 import lib1 + - from lib5 import lib2 + - from lib4 import lib2 + - from lib5 import lib1 + - + - import lib3.lib4 + - import lib3.lib4.lib5 +15 + from lib2 import foo +16 | from lib3.lib4 import foo +17 | from lib3.lib4.lib5 import foo +18 + from lib4 import lib1, lib2 +19 + from lib5 import lib1, lib2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap index e3b5a2578a..2f36ba2660 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_to_top_force_to_top.py.snap @@ -30,41 +30,39 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________________^ | help: Organize imports - -ℹ Safe fix -1 |-import lib6 -2 |-import lib2 -3 |-import lib5 -4 1 | import lib1 -5 2 | import lib3 -6 |-import lib4 -7 |- - 3 |+import lib3.lib4 - 4 |+import lib5 - 5 |+import z -8 6 | import foo -9 |-import z - 7 |+import lib2 - 8 |+import lib3.lib4.lib5 - 9 |+import lib4 - 10 |+import lib6 - 11 |+from lib1 import foo - 12 |+from lib3.lib4 import foo - 13 |+from lib5 import lib1, lib2 -10 14 | from foo import bar -11 |-from lib1 import foo -12 |-from lib2 import foo -13 |-from lib1.lib2 import foo -14 15 | from foo.lib1.bar import baz -15 |-from lib4 import lib1 -16 |-from lib5 import lib2 -17 |-from lib4 import lib2 -18 |-from lib5 import lib1 -19 |- -20 |-import lib3.lib4 -21 |-import lib3.lib4.lib5 -22 |-from lib3.lib4 import foo - 16 |+from lib1.lib2 import foo - 17 |+from lib2 import foo -23 18 | from lib3.lib4.lib5 import foo - 19 |+from lib4 import lib1, lib2 + - import lib6 + - import lib2 + - import lib5 +1 | import lib1 +2 | import lib3 + - import lib4 + - +3 + import lib3.lib4 +4 + import lib5 +5 + import z +6 | import foo + - import z +7 + import lib2 +8 + import lib3.lib4.lib5 +9 + import lib4 +10 + import lib6 +11 + from lib1 import foo +12 + from lib3.lib4 import foo +13 + from lib5 import lib1, lib2 +14 | from foo import bar + - from lib1 import foo + - from lib2 import foo + - from lib1.lib2 import foo +15 | from foo.lib1.bar import baz + - from lib4 import lib1 + - from lib5 import lib2 + - from lib4 import lib2 + - from lib5 import lib1 + - + - import lib3.lib4 + - import lib3.lib4.lib5 + - from lib3.lib4 import foo +16 + from lib1.lib2 import foo +17 + from lib2 import foo +18 | from lib3.lib4.lib5 import foo +19 + from lib4 import lib1, lib2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap index e53adb4091..e42a678791 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases.py.snap @@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted | |_________________^ | help: Organize imports - -ℹ Safe fix -1 |-from .a import a1 as a1, a2 as a2 - 1 |+from .a import a1 as a1 - 2 |+from .a import a2 as a2 -2 3 | from .b import b1 as b1 -3 4 | from .c import c1 + - from .a import a1 as a1, a2 as a2 +1 + from .a import a1 as a1 +2 + from .a import a2 as a2 +3 | from .b import b1 as b1 +4 | from .c import c1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap index 25a4bc4b1c..206ea89c8b 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__force_wrap_aliases_force_wrap_aliases.py.snap @@ -10,12 +10,10 @@ I001 [*] Import block is un-sorted or un-formatted | |_________________^ | help: Organize imports - -ℹ Safe fix -1 |-from .a import a1 as a1, a2 as a2 - 1 |+from .a import ( - 2 |+ a1 as a1, - 3 |+ a2 as a2, - 4 |+) -2 5 | from .b import b1 as b1 -3 6 | from .c import c1 + - from .a import a1 as a1, a2 as a2 +1 + from .a import ( +2 + a1 as a1, +3 + a2 as a2, +4 + ) +5 | from .b import b1 as b1 +6 | from .c import c1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap index b1c25d4506..09821ee3a1 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__forced_separate.py.snap @@ -15,16 +15,14 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________________________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | # office_helper and tests are both first-party, -2 2 | # but we want tests and experiments to be separated, in that order - 3 |+from office_helper.assistants import entity_registry as er -3 4 | from office_helper.core import CoreState - 5 |+ -4 6 | import tests.common.foo as tcf -5 7 | from tests.common import async_mock_service - 8 |+ -6 9 | from experiments.starry import * -7 10 | from experiments.weird import varieties -8 |-from office_helper.assistants import entity_registry as er +1 | # office_helper and tests are both first-party, +2 | # but we want tests and experiments to be separated, in that order +3 + from office_helper.assistants import entity_registry as er +4 | from office_helper.core import CoreState +5 + +6 | import tests.common.foo as tcf +7 | from tests.common import async_mock_service +8 + +9 | from experiments.starry import * +10 | from experiments.weird import varieties + - from office_helper.assistants import entity_registry as er diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap index 136faa2daf..718a705e2a 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__future_from.py.snap @@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________________________^ | help: Organize imports - -ℹ Safe fix - 1 |+from __future__ import annotations -1 2 | import __future__ -2 |-from __future__ import annotations +1 + from __future__ import annotations +2 | import __future__ + - from __future__ import annotations diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap index 640f8ef45f..f5b9d42767 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__glob_1_separate_subpackage_first_and_third_party_imports.py.snap @@ -15,19 +15,17 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import sys - 2 |+ - 3 |+import foo - 4 |+from foo import bar, baz - 5 |+ -2 6 | import baz -3 |-from foo import bar, baz - 7 |+import foo.bar - 8 |+import foo.bar.baz -4 9 | from foo.bar import blah, blub -5 10 | from foo.bar.baz import something -6 |-import foo -7 |-import foo.bar -8 |-import foo.bar.baz +1 | import sys +2 + +3 + import foo +4 + from foo import bar, baz +5 + +6 | import baz + - from foo import bar, baz +7 + import foo.bar +8 + import foo.bar.baz +9 | from foo.bar import blah, blub +10 | from foo.bar.baz import something + - import foo + - import foo.bar + - import foo.bar.baz diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap index a68ca1b639..fc12431cad 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__if_elif_else.py.snap @@ -11,11 +11,9 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________________________________________________^ | help: Organize imports - -ℹ Safe fix -3 3 | elif "setuptools" in sys.modules: -4 4 | from setuptools.command.sdist import sdist as _sdist -5 5 | else: - 6 |+ from distutils.command.sdist import sdist as _sdist -6 7 | from setuptools.command.sdist import sdist as _sdist -7 |- from distutils.command.sdist import sdist as _sdist +3 | elif "setuptools" in sys.modules: +4 | from setuptools.command.sdist import sdist as _sdist +5 | else: +6 + from distutils.command.sdist import sdist as _sdist +7 | from setuptools.command.sdist import sdist as _sdist + - from distutils.command.sdist import sdist as _sdist diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap index 549e10842a..aa37e927ca 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__import_from_after_import.py.snap @@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted | |_________^ | help: Organize imports - -ℹ Safe fix - 1 |+import os -1 2 | from collections import Collection -2 |-import os +1 + import os +2 | from collections import Collection + - import os diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap index 86ef5295bd..302280ade9 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__inline_comments.py.snap @@ -18,23 +18,21 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________________________________________________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | from a.prometheus.metrics import ( # type:ignore[attr-defined] -2 2 | TERMINAL_CURRENTLY_RUNNING_TOTAL, -3 3 | ) -4 |- -5 4 | from b.prometheus.metrics import ( -6 5 | TERMINAL_CURRENTLY_RUNNING_TOTAL, # type:ignore[attr-defined] -7 6 | ) -8 |- -9 |-from c.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL # type:ignore[attr-defined] -10 |- -11 |-from d.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL, OTHER_RUNNING_TOTAL # type:ignore[attr-defined] - 7 |+from c.prometheus.metrics import ( - 8 |+ TERMINAL_CURRENTLY_RUNNING_TOTAL, # type:ignore[attr-defined] - 9 |+) - 10 |+from d.prometheus.metrics import ( # type:ignore[attr-defined] - 11 |+ OTHER_RUNNING_TOTAL, - 12 |+ TERMINAL_CURRENTLY_RUNNING_TOTAL, - 13 |+) +1 | from a.prometheus.metrics import ( # type:ignore[attr-defined] +2 | TERMINAL_CURRENTLY_RUNNING_TOTAL, +3 | ) + - +4 | from b.prometheus.metrics import ( +5 | TERMINAL_CURRENTLY_RUNNING_TOTAL, # type:ignore[attr-defined] +6 | ) + - + - from c.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL # type:ignore[attr-defined] + - + - from d.prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL, OTHER_RUNNING_TOTAL # type:ignore[attr-defined] +7 + from c.prometheus.metrics import ( +8 + TERMINAL_CURRENTLY_RUNNING_TOTAL, # type:ignore[attr-defined] +9 + ) +10 + from d.prometheus.metrics import ( # type:ignore[attr-defined] +11 + OTHER_RUNNING_TOTAL, +12 + TERMINAL_CURRENTLY_RUNNING_TOTAL, +13 + ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap index 76f24a7a8b..df1b21ec93 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.py.snap @@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted 4 | import os | help: Organize imports - -ℹ Safe fix -1 1 | import a -2 2 | import b - 3 |+ -3 4 | x = 1 -4 5 | import os -5 6 | import sys +1 | import a +2 | import b +3 + +4 | x = 1 +5 | import os +6 | import sys I001 [*] Import block is un-sorted or un-formatted --> insert_empty_lines.py:4:1 @@ -32,16 +30,14 @@ I001 [*] Import block is un-sorted or un-formatted 7 | pass | help: Organize imports - -ℹ Safe fix -3 3 | x = 1 -4 4 | import os -5 5 | import sys - 6 |+ - 7 |+ -6 8 | def f(): -7 9 | pass -8 10 | if True: +3 | x = 1 +4 | import os +5 | import sys +6 + +7 + +8 | def f(): +9 | pass +10 | if True: I001 [*] Import block is un-sorted or un-formatted --> insert_empty_lines.py:14:1 @@ -54,15 +50,13 @@ I001 [*] Import block is un-sorted or un-formatted 16 | """Docstring""" | help: Organize imports - -ℹ Safe fix -13 13 | y = 1 -14 14 | import os -15 15 | import sys - 16 |+ -16 17 | """Docstring""" -17 18 | -18 19 | if True: +13 | y = 1 +14 | import os +15 | import sys +16 + +17 | """Docstring""" +18 | +19 | if True: I001 [*] Import block is un-sorted or un-formatted --> insert_empty_lines.py:52:1 @@ -73,12 +67,10 @@ I001 [*] Import block is un-sorted or un-formatted 54 | # Comment goes here. | help: Organize imports - -ℹ Safe fix -51 51 | -52 52 | import os -53 53 | - 54 |+ -54 55 | # Comment goes here. -55 56 | def f(): -56 57 | pass +51 | +52 | import os +53 | +54 + +55 | # Comment goes here. +56 | def f(): +57 | pass diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap index edb2bd3578..c16c7d3602 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__insert_empty_lines.pyi.snap @@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted 4 | import os | help: Organize imports - -ℹ Safe fix -1 1 | import a -2 2 | import b - 3 |+ -3 4 | x = 1 -4 5 | import os -5 6 | import sys +1 | import a +2 | import b +3 + +4 | x = 1 +5 | import os +6 | import sys I001 [*] Import block is un-sorted or un-formatted --> insert_empty_lines.pyi:4:1 @@ -32,15 +30,13 @@ I001 [*] Import block is un-sorted or un-formatted 7 | pass | help: Organize imports - -ℹ Safe fix -3 3 | x = 1 -4 4 | import os -5 5 | import sys - 6 |+ -6 7 | def f(): -7 8 | pass -8 9 | if True: +3 | x = 1 +4 | import os +5 | import sys +6 + +7 | def f(): +8 | pass +9 | if True: I001 [*] Import block is un-sorted or un-formatted --> insert_empty_lines.pyi:14:1 @@ -53,12 +49,10 @@ I001 [*] Import block is un-sorted or un-formatted 16 | """Docstring""" | help: Organize imports - -ℹ Safe fix -13 13 | y = 1 -14 14 | import os -15 15 | import sys - 16 |+ -16 17 | """Docstring""" -17 18 | -18 19 | if True: +13 | y = 1 +14 | import os +15 | import sys +16 + +17 | """Docstring""" +18 | +19 | if True: diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap index a0303f1be5..0dc3139078 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_closest_separate_local_folder_imports.py.snap @@ -14,16 +14,14 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import os -1 2 | import sys - 3 |+ - 4 |+import leading_prefix - 5 |+ -2 6 | import ruff -3 |-import leading_prefix -4 |-import os -5 7 | from . import leading_prefix -6 8 | from .. import trailing_prefix -7 9 | from ruff import check +1 + import os +2 | import sys +3 + +4 + import leading_prefix +5 + +6 | import ruff + - import leading_prefix + - import os +7 | from . import leading_prefix +8 | from .. import trailing_prefix +9 | from ruff import check diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap index 4ca17dda52..6a9d9ab9e3 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__known_local_folder_separate_local_folder_imports.py.snap @@ -14,17 +14,15 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import os -1 2 | import sys - 3 |+ - 4 |+import leading_prefix - 5 |+ -2 6 | import ruff -3 |-import leading_prefix -4 |-import os - 7 |+from .. import trailing_prefix -5 8 | from . import leading_prefix -6 |-from .. import trailing_prefix -7 9 | from ruff import check +1 + import os +2 | import sys +3 + +4 + import leading_prefix +5 + +6 | import ruff + - import leading_prefix + - import os +7 + from .. import trailing_prefix +8 | from . import leading_prefix + - from .. import trailing_prefix +9 | from ruff import check diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap index 0b48d95f99..cb9163b858 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_from_imports.py.snap @@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________________________^ | help: Organize imports - -ℹ Safe fix - 1 |+from short import b -1 2 | from mediuuuuuuuuuuum import a -2 |-from short import b -3 3 | from loooooooooooooooooooooog import c +1 + from short import b +2 | from mediuuuuuuuuuuum import a + - from short import b +3 | from loooooooooooooooooooooog import c diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap index 94f47e0f40..e3b19c01a4 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_members.py.snap @@ -18,20 +18,18 @@ I001 [*] Import block is un-sorted or un-formatted | |_^ | help: Organize imports - -ℹ Safe fix -1 1 | from module1 import ( -2 |- loooooooooooooong, - 2 |+ short, -3 3 | σηορτ, - 4 |+ shoort, -4 5 | mediuuuuum, -5 |- shoort, -6 |- looooooooooooooong, -7 6 | μεδιυυυυυμ, -8 |- short, -9 7 | mediuuuuuum, - 8 |+ loooooooooooooong, -10 9 | λοοοοοοοοοοοοοονγ, - 10 |+ looooooooooooooong, -11 11 | ) +1 | from module1 import ( + - loooooooooooooong, +2 + short, +3 | σηορτ, +4 + shoort, +5 | mediuuuuum, + - shoort, + - looooooooooooooong, +6 | μεδιυυυυυμ, + - short, +7 | mediuuuuuum, +8 + loooooooooooooong, +9 | λοοοοοοοοοοοοοονγ, +10 + looooooooooooooong, +11 | ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap index 2ec6069c64..7c70f9719c 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_non_ascii_modules.py.snap @@ -16,17 +16,15 @@ I001 [*] Import block is un-sorted or un-formatted | |_________________________^ | help: Organize imports - -ℹ Safe fix -1 |-import loooooooooooooong -2 |-import mediuuuuuum -3 1 | import short -4 2 | import σηορτ -5 3 | import shoort -6 4 | import mediuuuuum - 5 |+import μεδιυυυυυμ - 6 |+import mediuuuuuum - 7 |+import loooooooooooooong -7 8 | import λοοοοοοοοοοοοοονγ -8 |-import μεδιυυυυυμ -9 9 | import looooooooooooooong + - import loooooooooooooong + - import mediuuuuuum +1 | import short +2 | import σηορτ +3 | import shoort +4 | import mediuuuuum +5 + import μεδιυυυυυμ +6 + import mediuuuuuum +7 + import loooooooooooooong +8 | import λοοοοοοοοοοοοοονγ + - import μεδιυυυυυμ +9 | import looooooooooooooong diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap index f6bd011af9..d096cf65a0 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_and_from_imports.py.snap @@ -13,14 +13,12 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import short -1 2 | import mediuuuuuum -2 |-import short -3 3 | import looooooooooooooooong -4 |-from looooooooooooooong import a - 4 |+from short import b -5 5 | from mediuuuum import c -6 |-from short import b - 6 |+from looooooooooooooong import a +1 + import short +2 | import mediuuuuuum + - import short +3 | import looooooooooooooooong + - from looooooooooooooong import a +4 + from short import b +5 | from mediuuuum import c + - from short import b +6 + from looooooooooooooong import a diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap index a17b260c40..34291d8f81 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_straight_imports.py.snap @@ -11,11 +11,9 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import short - 2 |+import mediuuuuuuma -1 3 | import mediuuuuuumb -2 |-import short -3 4 | import looooooooooooooooong -4 |-import mediuuuuuuma +1 + import short +2 + import mediuuuuuuma +3 | import mediuuuuuumb + - import short +4 | import looooooooooooooooong + - import mediuuuuuuma diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap index 10f86beef6..25679e4a7e 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort__length_sort_with_relative_imports.py.snap @@ -14,15 +14,13 @@ I001 [*] Import block is un-sorted or un-formatted | |_________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from ..looooooooooooooong import a -2 |-from ...mediuuuum import b - 1 |+from . import d -3 2 | from .short import c -4 3 | from ....short import c -5 |-from . import d -6 4 | from .mediuuuum import a -7 5 | from ......short import b - 6 |+from ...mediuuuum import b - 7 |+from ..looooooooooooooong import a + - from ..looooooooooooooong import a + - from ...mediuuuum import b +1 + from . import d +2 | from .short import c +3 | from ....short import c + - from . import d +4 | from .mediuuuum import a +5 | from ......short import b +6 + from ...mediuuuum import b +7 + from ..looooooooooooooong import a diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap index 96a389074a..ed428cbcea 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_from_imports.py.snap @@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________________________^ | help: Organize imports - -ℹ Safe fix - 1 |+from loooooooooooooooooooooog import c -1 2 | from mediuuuuuuuuuuum import a -2 3 | from short import b -3 |-from loooooooooooooooooooooog import c +1 + from loooooooooooooooooooooog import c +2 | from mediuuuuuuuuuuum import a +3 | from short import b + - from loooooooooooooooooooooog import c diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap index eede9709bd..9ba474fbc2 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_and_from_imports.py.snap @@ -13,11 +13,9 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import short -1 2 | import mediuuuuuum -2 |-import short -3 3 | import looooooooooooooooong -4 4 | from looooooooooooooong import a -5 5 | from mediuuuum import c +1 + import short +2 | import mediuuuuuum + - import short +3 | import looooooooooooooooong +4 | from looooooooooooooong import a +5 | from mediuuuum import c diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap index a17b260c40..34291d8f81 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__length_sort_straight__length_sort_straight_imports.py.snap @@ -11,11 +11,9 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import short - 2 |+import mediuuuuuuma -1 3 | import mediuuuuuumb -2 |-import short -3 4 | import looooooooooooooooong -4 |-import mediuuuuuuma +1 + import short +2 + import mediuuuuuuma +3 | import mediuuuuuumb + - import short +4 | import looooooooooooooooong + - import mediuuuuuuma diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap index 9822ae9a5a..1e3f63bcfc 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_crlf.py.snap @@ -8,14 +8,12 @@ I001 [*] Import block is un-sorted or un-formatted | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Organize imports - -ℹ Safe fix -1 |-from long_module_name import member_one, member_two, member_three, member_four, member_five - 1 |+from long_module_name import ( - 2 |+ member_five, - 3 |+ member_four, - 4 |+ member_one, - 5 |+ member_three, - 6 |+ member_two, - 7 |+) -2 8 | + - from long_module_name import member_one, member_two, member_three, member_four, member_five +1 + from long_module_name import ( +2 + member_five, +3 + member_four, +4 + member_one, +5 + member_three, +6 + member_two, +7 + ) +8 | diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap index ff6cdea1d7..023304caef 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__line_ending_lf.py.snap @@ -8,14 +8,12 @@ I001 [*] Import block is un-sorted or un-formatted | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Organize imports - -ℹ Safe fix -1 |-from long_module_name import member_one, member_two, member_three, member_four, member_five - 1 |+from long_module_name import ( - 2 |+ member_five, - 3 |+ member_four, - 4 |+ member_one, - 5 |+ member_three, - 6 |+ member_two, - 7 |+) -2 8 | + - from long_module_name import member_one, member_two, member_three, member_four, member_five +1 + from long_module_name import ( +2 + member_five, +3 + member_four, +4 + member_one, +5 + member_three, +6 + member_two, +7 + ) +8 | diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap index a4c209169f..1c228b764f 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports.pyi.snap @@ -16,19 +16,17 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | -5 |-from requests import Session -6 |- -7 5 | from my_first_party import my_first_party_object - 6 |+from requests import Session -8 7 | -9 8 | from . import my_local_folder_object -10 |- -11 |- -12 9 | -13 10 | class Thing(object): -14 11 | name: str +2 | +3 | from typing import Any +4 | + - from requests import Session + - +5 | from my_first_party import my_first_party_object +6 + from requests import Session +7 | +8 | from . import my_local_folder_object + - + - +9 | +10 | class Thing(object): +11 | name: str diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap index c270af683c..cca116a4f7 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_class_after.py.snap @@ -18,19 +18,17 @@ I001 [*] Import block is un-sorted or un-formatted 11 | name: str | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | -5 |-from requests import Session -6 |- -7 5 | from my_first_party import my_first_party_object - 6 |+from requests import Session -8 7 | -9 8 | from . import my_local_folder_object - 9 |+ - 10 |+ -10 11 | class Thing(object): -11 12 | name: str -12 13 | def __init__(self, name: str): +2 | +3 | from typing import Any +4 | + - from requests import Session + - +5 | from my_first_party import my_first_party_object +6 + from requests import Session +7 | +8 | from . import my_local_folder_object +9 + +10 + +11 | class Thing(object): +12 | name: str +13 | def __init__(self, name: str): diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap index e35b6f26bb..58e7705715 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_func_after.py.snap @@ -16,26 +16,24 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | -5 |-from requests import Session -6 |- -7 5 | from my_first_party import my_first_party_object - 6 |+from requests import Session -8 7 | -9 8 | from . import my_local_folder_object -10 |- -11 |- -12 |- -13 |- -14 |- -15 |- -16 |- -17 |- -18 |- -19 9 | -20 10 | -21 11 | def main(): +2 | +3 | from typing import Any +4 | + - from requests import Session + - +5 | from my_first_party import my_first_party_object +6 + from requests import Session +7 | +8 | from . import my_local_folder_object + - + - + - + - + - + - + - + - + - +9 | +10 | +11 | def main(): diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap index a4c209169f..1c228b764f 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports.pyi.snap @@ -16,19 +16,17 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | -5 |-from requests import Session -6 |- -7 5 | from my_first_party import my_first_party_object - 6 |+from requests import Session -8 7 | -9 8 | from . import my_local_folder_object -10 |- -11 |- -12 9 | -13 10 | class Thing(object): -14 11 | name: str +2 | +3 | from typing import Any +4 | + - from requests import Session + - +5 | from my_first_party import my_first_party_object +6 + from requests import Session +7 | +8 | from . import my_local_folder_object + - + - +9 | +10 | class Thing(object): +11 | name: str diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap index e6081ac492..1c21d083b5 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_class_after.py.snap @@ -18,20 +18,18 @@ I001 [*] Import block is un-sorted or un-formatted 11 | name: str | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | - 5 |+from my_first_party import my_first_party_object -5 6 | from requests import Session -6 7 | -7 |-from my_first_party import my_first_party_object - 8 |+from . import my_local_folder_object - 9 |+ - 10 |+ -8 11 | -9 |-from . import my_local_folder_object -10 12 | class Thing(object): -11 13 | name: str -12 14 | def __init__(self, name: str): +2 | +3 | from typing import Any +4 | +5 + from my_first_party import my_first_party_object +6 | from requests import Session +7 | + - from my_first_party import my_first_party_object +8 + from . import my_local_folder_object +9 + +10 + +11 | + - from . import my_local_folder_object +12 | class Thing(object): +13 | name: str +14 | def __init__(self, name: str): diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap index 448c2eb7ee..c9b2306130 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_func_after.py.snap @@ -16,25 +16,23 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | -5 |-from requests import Session -6 |- -7 5 | from my_first_party import my_first_party_object - 6 |+from requests import Session -8 7 | -9 8 | from . import my_local_folder_object -10 |- -11 |- -12 |- -13 |- -14 |- -15 |- -16 |- -17 |- -18 9 | -19 10 | -20 11 | +2 | +3 | from typing import Any +4 | + - from requests import Session + - +5 | from my_first_party import my_first_party_object +6 + from requests import Session +7 | +8 | from . import my_local_folder_object + - + - + - + - + - + - + - + - +9 | +10 | +11 | diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap index ff9a5bfc0a..e0cc211bc4 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_after_imports_lines_after_imports_nothing_after.py.snap @@ -16,14 +16,12 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | -5 |-from requests import Session -6 |- -7 5 | from my_first_party import my_first_party_object - 6 |+from requests import Session -8 7 | -9 8 | from . import my_local_folder_object +2 | +3 | from typing import Any +4 | + - from requests import Session + - +5 | from my_first_party import my_first_party_object +6 + from requests import Session +7 | +8 | from . import my_local_folder_object diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap index 0cdda30e86..7c7836dd37 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__lines_between_typeslines_between_types.py.snap @@ -23,14 +23,12 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________^ | help: Organize imports - -ℹ Safe fix -9 9 | import requests -10 10 | -11 11 | - 12 |+from loguru import Logger -12 13 | from sanic import Sanic -13 |-from loguru import Logger -14 14 | -15 15 | from . import config -16 16 | from .data import Data +9 | import requests +10 | +11 | +12 + from loguru import Logger +13 | from sanic import Sanic + - from loguru import Logger +14 | +15 | from . import config +16 | from .data import Data diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap index 1351db55e3..dea383689c 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__magic_trailing_comma.py.snap @@ -45,57 +45,55 @@ I001 [*] Import block is un-sorted or un-formatted | |_^ | help: Organize imports - -ℹ Safe fix -1 1 | # This has a magic trailing comma, will be sorted, but not rolled into one line -2 |-from sys import ( -3 |- stderr, -4 |- argv, -5 |- stdout, -6 |- exit, - 2 |+from glob import ( - 3 |+ escape, # Ends with a comment, should still treat as magic trailing comma. - 4 |+ glob, - 5 |+ iglob, -7 6 | ) -8 7 | -9 8 | # No magic comma, this will be rolled into one line. -10 |-from os import ( -11 |- path, -12 |- environ, -13 |- execl, -14 |- execv -15 |-) -16 |- -17 |-from glob import ( -18 |- glob, -19 |- iglob, -20 |- escape, # Ends with a comment, should still treat as magic trailing comma. - 9 |+from os import environ, execl, execv, path - 10 |+from sys import ( - 11 |+ argv, - 12 |+ exit, - 13 |+ stderr, - 14 |+ stdout, -21 15 | ) -22 16 | -23 17 | # These will be combined, but without a trailing comma. -24 |-from foo import bar -25 |-from foo import baz - 18 |+from foo import bar, baz -26 19 | -27 20 | # These will be combined, _with_ a trailing comma. -28 |-from module1 import member1 -29 21 | from module1 import ( - 22 |+ member1, -30 23 | member2, -31 24 | member3, -32 25 | ) -33 26 | -34 27 | # These will be combined, _with_ a trailing comma. -35 |-from module2 import member1, member2 -36 28 | from module2 import ( - 29 |+ member1, - 30 |+ member2, -37 31 | member3, -38 32 | ) +1 | # This has a magic trailing comma, will be sorted, but not rolled into one line + - from sys import ( + - stderr, + - argv, + - stdout, + - exit, +2 + from glob import ( +3 + escape, # Ends with a comment, should still treat as magic trailing comma. +4 + glob, +5 + iglob, +6 | ) +7 | +8 | # No magic comma, this will be rolled into one line. + - from os import ( + - path, + - environ, + - execl, + - execv + - ) + - + - from glob import ( + - glob, + - iglob, + - escape, # Ends with a comment, should still treat as magic trailing comma. +9 + from os import environ, execl, execv, path +10 + from sys import ( +11 + argv, +12 + exit, +13 + stderr, +14 + stdout, +15 | ) +16 | +17 | # These will be combined, but without a trailing comma. + - from foo import bar + - from foo import baz +18 + from foo import bar, baz +19 | +20 | # These will be combined, _with_ a trailing comma. + - from module1 import member1 +21 | from module1 import ( +22 + member1, +23 | member2, +24 | member3, +25 | ) +26 | +27 | # These will be combined, _with_ a trailing comma. + - from module2 import member1, member2 +28 | from module2 import ( +29 + member1, +30 + member2, +31 | member3, +32 | ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap index f8c50324e8..a3bf6f296b 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__match_case.py.snap @@ -13,16 +13,14 @@ I001 [*] Import block is un-sorted or un-formatted 6 | import collections | help: Organize imports - -ℹ Safe fix -1 1 | match 1: -2 2 | case 1: - 3 |+ import os -3 4 | import sys -4 |- import os -5 5 | case 2: -6 6 | import collections -7 7 | import abc +1 | match 1: +2 | case 1: +3 + import os +4 | import sys + - import os +5 | case 2: +6 | import collections +7 | import abc I001 [*] Import block is un-sorted or un-formatted --> match_case.py:6:9 @@ -34,11 +32,9 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________^ | help: Organize imports - -ℹ Safe fix -3 3 | import sys -4 4 | import os -5 5 | case 2: - 6 |+ import abc -6 7 | import collections -7 |- import abc +3 | import sys +4 | import os +5 | case 2: +6 + import abc +7 | import collections + - import abc diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap index 3179e36560..f9934c7442 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__natural_order.py.snap @@ -23,24 +23,22 @@ I001 [*] Import block is un-sorted or un-formatted | |_^ | help: Organize imports - -ℹ Safe fix -1 1 | import numpy1 - 2 |+import numpy2 -2 3 | import numpy10 -3 |-import numpy2 -4 4 | from numpy import ( -5 5 | cos, -6 6 | int8, -7 |- sin, - 7 |+ int16, -8 8 | int32, -9 9 | int64, - 10 |+ sin, -10 11 | tan, -11 12 | uint8, -12 13 | uint16, -13 |- int16, -14 14 | uint32, -15 15 | uint64, -16 16 | ) +1 | import numpy1 +2 + import numpy2 +3 | import numpy10 + - import numpy2 +4 | from numpy import ( +5 | cos, +6 | int8, + - sin, +7 + int16, +8 | int32, +9 | int64, +10 + sin, +11 | tan, +12 | uint8, +13 | uint16, + - int16, +14 | uint32, +15 | uint64, +16 | ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap index d23761ecb0..28955f76f3 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_detect_same_package.snap @@ -10,10 +10,8 @@ I001 [*] Import block is un-sorted or un-formatted | |______________^ | help: Organize imports - -ℹ Safe fix -1 1 | import os -2 |-import pandas - 2 |+ -3 3 | import foo.baz - 4 |+import pandas +1 | import os + - import pandas +2 + +3 | import foo.baz +4 + import pandas diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap index 49a20edc69..b19933fbe4 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py.snap @@ -16,14 +16,12 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | from typing import Any -4 4 | -5 |-from requests import Session -6 |- -7 5 | from my_first_party import my_first_party_object - 6 |+from requests import Session -8 7 | -9 8 | from . import my_local_folder_object +2 | +3 | from typing import Any +4 | + - from requests import Session + - +5 | from my_first_party import my_first_party_object +6 + from requests import Session +7 | +8 | from . import my_local_folder_object diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap index 6edb96de08..aa2e6aa9a5 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before.py_no_lines_before.py.snap @@ -16,15 +16,13 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | from __future__ import annotations -2 |- -3 2 | from typing import Any -4 |- - 3 |+from my_first_party import my_first_party_object -5 4 | from requests import Session -6 |- -7 |-from my_first_party import my_first_party_object -8 |- -9 5 | from . import my_local_folder_object +1 | from __future__ import annotations + - +2 | from typing import Any + - +3 + from my_first_party import my_first_party_object +4 | from requests import Session + - + - from my_first_party import my_first_party_object + - +5 | from . import my_local_folder_object diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap index ccd137ad41..03c88d8522 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_lines_before_with_empty_sections.py_no_lines_before_with_empty_sections.py.snap @@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted | |____________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | from __future__ import annotations -2 2 | from typing import Any - 3 |+ -3 4 | from . import my_local_folder_object +1 | from __future__ import annotations +2 | from typing import Any +3 + +4 | from . import my_local_folder_object diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap index 2a6ae0bc0e..9cf50cb706 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_standard_library_no_standard_library.py.snap @@ -16,16 +16,14 @@ I001 [*] Import block is un-sorted or un-formatted | |__________^ | help: Organize imports - -ℹ Safe fix -1 1 | from __future__ import annotations -2 2 | -3 |-import os -4 3 | import django.settings -5 4 | from library import foo - 5 |+import os -6 6 | import pytz - 7 |+import sys -7 8 | -8 9 | from . import local -9 |-import sys +1 | from __future__ import annotations +2 | + - import os +3 | import django.settings +4 | from library import foo +5 + import os +6 | import pytz +7 + import sys +8 | +9 | from . import local + - import sys diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap index 2a77df40fd..10553e7371 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__no_wrap_star.py.snap @@ -8,7 +8,5 @@ I001 [*] Import block is un-sorted or un-formatted | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Organize imports - -ℹ Safe fix -1 |-from .subscription import * # type: ignore # some very long comment explaining why this needs a type ignore - 1 |+from .subscription import * # type: ignore # some very long comment explaining why this needs a type ignore + - from .subscription import * # type: ignore # some very long comment explaining why this needs a type ignore +1 + from .subscription import * # type: ignore # some very long comment explaining why this needs a type ignore diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap index 5d90b0269b..689773fc03 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type.py.snap @@ -19,23 +19,21 @@ I001 [*] Import block is un-sorted or un-formatted | |__________^ | help: Organize imports - -ℹ Safe fix -1 |-import StringIO -2 1 | import glob -3 2 | import os -4 3 | import shutil -5 4 | import tempfile -6 5 | import time -7 |-from subprocess import PIPE, Popen, STDOUT -8 |-from module import Class, CONSTANT, function, BASIC, Apple -9 |-import foo -10 |-import FOO - 6 |+from subprocess import PIPE, STDOUT, Popen - 7 |+ -11 8 | import BAR -12 9 | import bar - 10 |+import FOO - 11 |+import foo - 12 |+import StringIO - 13 |+from module import BASIC, CONSTANT, Apple, Class, function + - import StringIO +1 | import glob +2 | import os +3 | import shutil +4 | import tempfile +5 | import time + - from subprocess import PIPE, Popen, STDOUT + - from module import Class, CONSTANT, function, BASIC, Apple + - import foo + - import FOO +6 + from subprocess import PIPE, STDOUT, Popen +7 + +8 | import BAR +9 | import bar +10 + import FOO +11 + import foo +12 + import StringIO +13 + from module import BASIC, CONSTANT, Apple, Class, function diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap index c31710b90d..4277709111 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_false_order_by_type.py.snap @@ -19,22 +19,20 @@ I001 [*] Import block is un-sorted or un-formatted | |__________^ | help: Organize imports - -ℹ Safe fix -1 |-import StringIO -2 1 | import glob -3 2 | import os -4 3 | import shutil -5 4 | import tempfile -6 5 | import time -7 6 | from subprocess import PIPE, Popen, STDOUT -8 |-from module import Class, CONSTANT, function, BASIC, Apple -9 |-import foo -10 |-import FOO - 7 |+ -11 8 | import BAR -12 9 | import bar - 10 |+import FOO - 11 |+import foo - 12 |+import StringIO - 13 |+from module import Apple, BASIC, Class, CONSTANT, function + - import StringIO +1 | import glob +2 | import os +3 | import shutil +4 | import tempfile +5 | import time +6 | from subprocess import PIPE, Popen, STDOUT + - from module import Class, CONSTANT, function, BASIC, Apple + - import foo + - import FOO +7 + +8 | import BAR +9 | import bar +10 + import FOO +11 + import foo +12 + import StringIO +13 + from module import Apple, BASIC, Class, CONSTANT, function diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap index 829c83cdd5..b4cc49d62d 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes.py.snap @@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from sklearn.svm import func, SVC, CONST, Klass -2 |-from subprocess import N_CLASS, PIPE, Popen, STDOUT -3 |-from module import CLASS, Class, CONSTANT, function, BASIC, Apple -4 |-from torch.nn import SELU, AClass, A_CONSTANT - 1 |+from subprocess import N_CLASS, PIPE, STDOUT, Popen - 2 |+ - 3 |+from module import BASIC, CLASS, CONSTANT, Apple, Class, function - 4 |+from sklearn.svm import CONST, SVC, Klass, func - 5 |+from torch.nn import A_CONSTANT, SELU, AClass + - from sklearn.svm import func, SVC, CONST, Klass + - from subprocess import N_CLASS, PIPE, Popen, STDOUT + - from module import CLASS, Class, CONSTANT, function, BASIC, Apple + - from torch.nn import SELU, AClass, A_CONSTANT +1 + from subprocess import N_CLASS, PIPE, STDOUT, Popen +2 + +3 + from module import BASIC, CLASS, CONSTANT, Apple, Class, function +4 + from sklearn.svm import CONST, SVC, Klass, func +5 + from torch.nn import A_CONSTANT, SELU, AClass diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap index 9c80994321..0aad0400d5 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_classes_order_by_type_with_custom_classes.py.snap @@ -11,14 +11,12 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from sklearn.svm import func, SVC, CONST, Klass -2 |-from subprocess import N_CLASS, PIPE, Popen, STDOUT -3 |-from module import CLASS, Class, CONSTANT, function, BASIC, Apple -4 |-from torch.nn import SELU, AClass, A_CONSTANT - 1 |+from subprocess import PIPE, STDOUT, N_CLASS, Popen - 2 |+ - 3 |+from module import BASIC, CONSTANT, Apple, CLASS, Class, function - 4 |+from sklearn.svm import CONST, Klass, SVC, func - 5 |+from torch.nn import A_CONSTANT, AClass, SELU + - from sklearn.svm import func, SVC, CONST, Klass + - from subprocess import N_CLASS, PIPE, Popen, STDOUT + - from module import CLASS, Class, CONSTANT, function, BASIC, Apple + - from torch.nn import SELU, AClass, A_CONSTANT +1 + from subprocess import PIPE, STDOUT, N_CLASS, Popen +2 + +3 + from module import BASIC, CONSTANT, Apple, CLASS, Class, function +4 + from sklearn.svm import CONST, Klass, SVC, func +5 + from torch.nn import A_CONSTANT, AClass, SELU diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap index 4af13473df..12070dd546 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants.py.snap @@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________________________________________________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from sklearn.svm import XYZ, func, variable, Const, Klass, constant -2 |-from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT - 1 |+from subprocess import STDOUT, A_constant, Class, First, Last, func, konst, var - 2 |+ - 3 |+from sklearn.svm import XYZ, Const, Klass, constant, func, variable + - from sklearn.svm import XYZ, func, variable, Const, Klass, constant + - from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT +1 + from subprocess import STDOUT, A_constant, Class, First, Last, func, konst, var +2 + +3 + from sklearn.svm import XYZ, Const, Klass, constant, func, variable diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap index 12652cfccf..8a4faaa00f 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_constants_order_by_type_with_custom_constants.py.snap @@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________________________________________________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from sklearn.svm import XYZ, func, variable, Const, Klass, constant -2 |-from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT - 1 |+from subprocess import A_constant, First, konst, Last, STDOUT, Class, func, var - 2 |+ - 3 |+from sklearn.svm import Const, constant, XYZ, Klass, func, variable + - from sklearn.svm import XYZ, func, variable, Const, Klass, constant + - from subprocess import First, var, func, Class, konst, A_constant, Last, STDOUT +1 + from subprocess import A_constant, First, konst, Last, STDOUT, Class, func, var +2 + +3 + from sklearn.svm import Const, constant, XYZ, Klass, func, variable diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap index 9c479a19f4..97f2340ad4 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables.py.snap @@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________________________________________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from sklearn.svm import VAR, Class, MyVar, CONST, abc -2 |-from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe - 1 |+from subprocess import CONSTANT, Klass, Variable, exe, utils, var_ABC - 2 |+ - 3 |+from sklearn.svm import CONST, VAR, Class, MyVar, abc + - from sklearn.svm import VAR, Class, MyVar, CONST, abc + - from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe +1 + from subprocess import CONSTANT, Klass, Variable, exe, utils, var_ABC +2 + +3 + from sklearn.svm import CONST, VAR, Class, MyVar, abc diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap index 5ba8a2a85d..9bed5e346a 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_by_type_with_custom_variables_order_by_type_with_custom_variables.py.snap @@ -9,10 +9,8 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________________________________________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from sklearn.svm import VAR, Class, MyVar, CONST, abc -2 |-from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe - 1 |+from subprocess import CONSTANT, Klass, exe, utils, var_ABC, Variable - 2 |+ - 3 |+from sklearn.svm import CONST, Class, abc, MyVar, VAR + - from sklearn.svm import VAR, Class, MyVar, CONST, abc + - from subprocess import utils, var_ABC, Variable, Klass, CONSTANT, exe +1 + from subprocess import CONSTANT, Klass, exe, utils, var_ABC, Variable +2 + +3 + from sklearn.svm import CONST, Class, abc, MyVar, VAR diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap index 81306b136c..a7721979d3 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__order_relative_imports_by_level.py.snap @@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted | |________________^ | help: Organize imports - -ℹ Safe fix -1 |-from .a import a -2 1 | from ..a import a -3 2 | from ..b import a - 3 |+from .a import a -4 4 | from .b import a + - from .a import a +1 | from ..a import a +2 | from ..b import a +3 + from .a import a +4 | from .b import a diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap index 0e7e1444ff..947ae20af8 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_comment_order.py.snap @@ -18,16 +18,14 @@ I001 [*] Import block is un-sorted or un-formatted | |__________^ | help: Organize imports - -ℹ Safe fix - 1 |+import abc -1 2 | import io - 3 |+ -2 4 | # Old MacDonald had a farm, -3 5 | # EIEIO -4 6 | # And on his farm he had a cow, +1 + import abc +2 | import io +3 + +4 | # Old MacDonald had a farm, +5 | # EIEIO +6 | # And on his farm he had a cow, -------------------------------------------------------------------------------- -8 10 | # Old MacDonald had a farm, -9 11 | # EIEIO -10 12 | from errno import EIO -11 |-import abc +10 | # Old MacDonald had a farm, +11 | # EIEIO +12 | from errno import EIO + - import abc diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap index bed68a5be3..81bfbf8ac2 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_import_star.py.snap @@ -13,16 +13,14 @@ I001 [*] Import block is un-sorted or un-formatted | |_________________________^ | help: Organize imports - -ℹ Safe fix -1 |-from some_other_module import some_class -2 |-from some_other_module import * -3 1 | # Above -4 |-from some_module import some_class # Aside -5 |-# Above -6 2 | from some_module import * # Aside - 3 |+ - 4 |+# Above - 5 |+from some_module import some_class # Aside - 6 |+from some_other_module import * - 7 |+from some_other_module import some_class + - from some_other_module import some_class + - from some_other_module import * +1 | # Above + - from some_module import some_class # Aside + - # Above +2 | from some_module import * # Aside +3 + +4 + # Above +5 + from some_module import some_class # Aside +6 + from some_other_module import * +7 + from some_other_module import some_class diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap index cf9fa130e1..6c0579a1be 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__preserve_indentation.py.snap @@ -12,15 +12,13 @@ I001 [*] Import block is un-sorted or un-formatted 5 | import sys | help: Organize imports - -ℹ Safe fix -1 1 | if True: - 2 |+ import os -2 3 | import sys -3 |- import os -4 4 | else: -5 5 | import sys -6 6 | import os +1 | if True: +2 + import os +3 | import sys + - import os +4 | else: +5 | import sys +6 | import os I001 [*] Import block is un-sorted or un-formatted --> preserve_indentation.py:5:5 @@ -32,11 +30,9 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________^ | help: Organize imports - -ℹ Safe fix -2 2 | import sys -3 3 | import os -4 4 | else: - 5 |+ import os -5 6 | import sys -6 |- import os +2 | import sys +3 | import os +4 | else: +5 + import os +6 | import sys + - import os diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap index 66ad3162d5..b1874b9482 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__propagate_inline_comments_propagate_inline_comments.py.snap @@ -11,10 +11,8 @@ I001 [*] Import block is un-sorted or un-formatted | |_^ | help: Organize imports - -ℹ Safe fix -1 1 | from mypackage.subpackage import ( # long comment that seems to be a problem -2 2 | a_long_variable_name_that_causes_problems, -3 |- items, -4 3 | ) - 4 |+from mypackage.subpackage import items # long comment that seems to be a problem +1 | from mypackage.subpackage import ( # long comment that seems to be a problem +2 | a_long_variable_name_that_causes_problems, + - items, +3 | ) +4 + from mypackage.subpackage import items # long comment that seems to be a problem diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap index a9b7d1db9d..a95f61cadb 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__reorder_within_section.py.snap @@ -9,8 +9,6 @@ I001 [*] Import block is un-sorted or un-formatted | |_________^ | help: Organize imports - -ℹ Safe fix - 1 |+import os -1 2 | import sys -2 |-import os +1 + import os +2 | import sys + - import os diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap index dd3573040b..9a2d25a230 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comment.py.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> comment.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | #!/usr/bin/env python3 - 2 |+from __future__ import annotations -2 3 | -3 4 | x = 1 +1 | #!/usr/bin/env python3 +2 + from __future__ import annotations +3 | +4 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap index b458a05db3..d1911923c2 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_comments_and_newlines.py.snap @@ -4,11 +4,9 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> comments_and_newlines.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -2 2 | # A copyright notice could go here -3 3 | -4 4 | # A linter directive could go here - 5 |+from __future__ import annotations -5 6 | -6 7 | x = 1 +2 | # A copyright notice could go here +3 | +4 | # A linter directive could go here +5 + from __future__ import annotations +6 | +7 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap index 5f66b71778..1b3b41d7ee 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring.py.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> docstring.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | """Hello, world!""" - 2 |+from __future__ import annotations -2 3 | -3 4 | x = 1 +1 | """Hello, world!""" +2 + from __future__ import annotations +3 | +4 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap index 69109cf945..129377aa61 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_followed_by_continuation.py.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> docstring_followed_by_continuation.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | """Hello, world!"""\ -2 2 | - 3 |+from __future__ import annotations -3 4 | x = 1; y = 2 +1 | """Hello, world!"""\ +2 | +3 + from __future__ import annotations +4 | x = 1; y = 2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap index 52a950f66e..e64702b5c3 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_continuation.py.snap @@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> docstring_with_continuation.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 |-"""Hello, world!"""; x = \ - 1 |+"""Hello, world!"""; from __future__ import annotations; x = \ -2 2 | 1; y = 2 + - """Hello, world!"""; x = \ +1 + """Hello, world!"""; from __future__ import annotations; x = \ +2 | 1; y = 2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap index 3c438a2ed8..7607b810c4 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_multiple_continuations.py.snap @@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> docstring_with_multiple_continuations.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | """Hello, world!"""\ -2 2 | \ -3 3 | - 4 |+from __future__ import annotations -4 5 | x = 1; y = 2 +1 | """Hello, world!"""\ +2 | \ +3 | +4 + from __future__ import annotations +5 | x = 1; y = 2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap index d9c7308b79..b4953166a9 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_docstring_with_semicolon.py.snap @@ -4,7 +4,5 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> docstring_with_semicolon.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 |-"""Hello, world!"""; x = 1 - 1 |+"""Hello, world!"""; from __future__ import annotations; x = 1 + - """Hello, world!"""; x = 1 +1 + """Hello, world!"""; from __future__ import annotations; x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap index 1a5c82902f..98a6e1ecbd 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_existing_import.py.snap @@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> existing_import.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix - 1 |+from __future__ import annotations -1 2 | from __future__ import generator_stop -2 3 | import os +1 + from __future__ import annotations +2 | from __future__ import generator_stop +3 | import os diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap index 49f487f419..27528e2e3e 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_multiline_docstring.py.snap @@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> multiline_docstring.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | """a -2 2 | b""" -3 3 | # b - 4 |+from __future__ import annotations -4 5 | import os +1 | """a +2 | b""" +3 | # b +4 + from __future__ import annotations +5 | import os diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap index ca65feda4d..ea3ab8c897 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_off.py.snap @@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> off.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | # isort: off - 2 |+from __future__ import annotations -2 3 | -3 4 | x = 1 -4 5 | # isort: on +1 | # isort: off +2 + from __future__ import annotations +3 | +4 | x = 1 +5 | # isort: on diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap index e99460f814..4296853943 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_unused.py.snap @@ -11,15 +11,13 @@ F401 [*] `sys` imported but unused 7 | # Unused, _not_ marked as required (due to the alias). | help: Remove unused import: `sys` - -ℹ Safe fix -2 2 | import os -3 3 | -4 4 | # Unused, _not_ marked as required. -5 |-import sys -6 5 | -7 6 | # Unused, _not_ marked as required (due to the alias). -8 7 | import pathlib as non_alias +2 | import os +3 | +4 | # Unused, _not_ marked as required. + - import sys +5 | +6 | # Unused, _not_ marked as required (due to the alias). +7 | import pathlib as non_alias F401 [*] `pathlib` imported but unused --> unused.py:8:19 @@ -31,12 +29,10 @@ F401 [*] `pathlib` imported but unused 10 | # Unused, marked as required. | help: Remove unused import: `pathlib` - -ℹ Safe fix -5 5 | import sys -6 6 | -7 7 | # Unused, _not_ marked as required (due to the alias). -8 |-import pathlib as non_alias -9 8 | -10 9 | # Unused, marked as required. -11 10 | import shelve as alias +5 | import sys +6 | +7 | # Unused, _not_ marked as required (due to the alias). + - import pathlib as non_alias +8 | +9 | # Unused, marked as required. +10 | import shelve as alias diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap index 08b3cfc7ba..087919fdc8 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_whitespace.py.snap @@ -4,11 +4,9 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> whitespace.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | # This is a regression test for https://github.com/astral-sh/ruff/issues/19310 -2 2 | # there is a (potentially invisible) unicode formfeed character (000C) between "docstring" and the semicolon -3 |-"docstring" ; print( - 3 |+"docstring" ; from __future__ import annotations; print( -4 4 | f"{__doc__=}", -5 5 | ) +1 | # This is a regression test for https://github.com/astral-sh/ruff/issues/19310 +2 | # there is a (potentially invisible) unicode formfeed character (000C) between "docstring" and the semicolon + - "docstring" ; print( +3 + "docstring" ; from __future__ import annotations; print( +4 | f"{__doc__=}", +5 | ) diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap index ae06367b92..dcfb94ea27 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comment.py.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> comment.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 1 | #!/usr/bin/env python3 - 2 |+from __future__ import annotations as _annotations -2 3 | -3 4 | x = 1 +1 | #!/usr/bin/env python3 +2 + from __future__ import annotations as _annotations +3 | +4 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap index c85b5c507c..0253eee38e 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_comments_and_newlines.py.snap @@ -4,11 +4,9 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> comments_and_newlines.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -2 2 | # A copyright notice could go here -3 3 | -4 4 | # A linter directive could go here - 5 |+from __future__ import annotations as _annotations -5 6 | -6 7 | x = 1 +2 | # A copyright notice could go here +3 | +4 | # A linter directive could go here +5 + from __future__ import annotations as _annotations +6 | +7 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap index e91df9de92..5fa25396c3 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring.py.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> docstring.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 1 | """Hello, world!""" - 2 |+from __future__ import annotations as _annotations -2 3 | -3 4 | x = 1 +1 | """Hello, world!""" +2 + from __future__ import annotations as _annotations +3 | +4 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap index 711989cbfe..3041bb362f 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_followed_by_continuation.py.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> docstring_followed_by_continuation.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 1 | """Hello, world!"""\ -2 2 | - 3 |+from __future__ import annotations as _annotations -3 4 | x = 1; y = 2 +1 | """Hello, world!"""\ +2 | +3 + from __future__ import annotations as _annotations +4 | x = 1; y = 2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap index b8a3e7f2cb..d32da5dfb5 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_continuation.py.snap @@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> docstring_with_continuation.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 |-"""Hello, world!"""; x = \ - 1 |+"""Hello, world!"""; from __future__ import annotations as _annotations; x = \ -2 2 | 1; y = 2 + - """Hello, world!"""; x = \ +1 + """Hello, world!"""; from __future__ import annotations as _annotations; x = \ +2 | 1; y = 2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap index ce1f0d64ba..3e017dc1ad 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_multiple_continuations.py.snap @@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> docstring_with_multiple_continuations.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 1 | """Hello, world!"""\ -2 2 | \ -3 3 | - 4 |+from __future__ import annotations as _annotations -4 5 | x = 1; y = 2 +1 | """Hello, world!"""\ +2 | \ +3 | +4 + from __future__ import annotations as _annotations +5 | x = 1; y = 2 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap index d1cc50e2a8..12058500f5 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_docstring_with_semicolon.py.snap @@ -4,7 +4,5 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> docstring_with_semicolon.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 |-"""Hello, world!"""; x = 1 - 1 |+"""Hello, world!"""; from __future__ import annotations as _annotations; x = 1 + - """Hello, world!"""; x = 1 +1 + """Hello, world!"""; from __future__ import annotations as _annotations; x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap index 95493b80a2..1ff81a3762 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_existing_import.py.snap @@ -4,8 +4,6 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> existing_import.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix - 1 |+from __future__ import annotations as _annotations -1 2 | from __future__ import generator_stop -2 3 | import os +1 + from __future__ import annotations as _annotations +2 | from __future__ import generator_stop +3 | import os diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap index fca4d8f8eb..4a5260cca7 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_multiline_docstring.py.snap @@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> multiline_docstring.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 1 | """a -2 2 | b""" -3 3 | # b - 4 |+from __future__ import annotations as _annotations -4 5 | import os +1 | """a +2 | b""" +3 | # b +4 + from __future__ import annotations as _annotations +5 | import os diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap index 60be80529b..886d740520 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_import_with_alias_off.py.snap @@ -4,10 +4,8 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations as _annotations` --> off.py:1:1 help: Insert required import: `from __future__ import annotations as _annotations` - -ℹ Safe fix -1 1 | # isort: off - 2 |+from __future__ import annotations as _annotations -2 3 | -3 4 | x = 1 -4 5 | # isort: on +1 | # isort: off +2 + from __future__ import annotations as _annotations +3 | +4 | x = 1 +5 | # isort: on diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap index 8bf448df89..dc042745fa 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_docstring.py.snap @@ -4,19 +4,15 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> docstring.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | """Hello, world!""" - 2 |+from __future__ import annotations -2 3 | -3 4 | x = 1 +1 | """Hello, world!""" +2 + from __future__ import annotations +3 | +4 | x = 1 I002 [*] Missing required import: `from __future__ import generator_stop` --> docstring.py:1:1 help: Insert required import: `from __future__ import generator_stop` - -ℹ Safe fix -1 1 | """Hello, world!""" - 2 |+from __future__ import generator_stop -2 3 | -3 4 | x = 1 +1 | """Hello, world!""" +2 + from __future__ import generator_stop +3 | +4 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap index 4300626f5d..f3bad09c67 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__required_imports_multiple_strings.py.snap @@ -4,21 +4,17 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `from __future__ import annotations` --> multiple_strings.py:1:1 help: Insert required import: `from __future__ import annotations` - -ℹ Safe fix -1 1 | """This is a docstring.""" - 2 |+from __future__ import annotations -2 3 | "This is not a docstring." -3 4 | "This is also not a docstring." -4 5 | +1 | """This is a docstring.""" +2 + from __future__ import annotations +3 | "This is not a docstring." +4 | "This is also not a docstring." +5 | I002 [*] Missing required import: `from __future__ import generator_stop` --> multiple_strings.py:1:1 help: Insert required import: `from __future__ import generator_stop` - -ℹ Safe fix -1 1 | """This is a docstring.""" - 2 |+from __future__ import generator_stop -2 3 | "This is not a docstring." -3 4 | "This is also not a docstring." -4 5 | +1 | """This is a docstring.""" +2 + from __future__ import generator_stop +3 | "This is not a docstring." +4 | "This is also not a docstring." +5 | diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap index 5066d975ed..522dbc5a73 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__section_order_sections.py.snap @@ -14,17 +14,15 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________^ | help: Organize imports - -ℹ Safe fix -1 1 | from __future__ import annotations - 2 |+ -2 3 | import os -3 4 | import sys - 5 |+ -4 6 | import pytz - 7 |+ -5 8 | import django.settings - 9 |+ -6 10 | from library import foo - 11 |+ -7 12 | from . import local +1 | from __future__ import annotations +2 + +3 | import os +4 | import sys +5 + +6 | import pytz +7 + +8 | import django.settings +9 + +10 | from library import foo +11 + +12 | from . import local diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap index 608a27d50f..5189470128 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_main_first_party.py.snap @@ -15,14 +15,12 @@ I001 [*] Import block is un-sorted or un-formatted 8 | os.a | help: Organize imports - -ℹ Safe fix -1 1 | import os -2 2 | -3 |-import __main__ -4 3 | import third_party -5 4 | - 5 |+import __main__ -6 6 | import first_party -7 7 | -8 8 | os.a +1 | import os +2 | + - import __main__ +3 | import third_party +4 | +5 + import __main__ +6 | import first_party +7 | +8 | os.a diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap index 09893b2c97..a80b9a5426 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sections_sections.py.snap @@ -14,17 +14,15 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________^ | help: Organize imports - -ℹ Safe fix -1 1 | from __future__ import annotations - 2 |+ -2 3 | import os -3 4 | import sys - 5 |+ -4 6 | import pytz -5 |-import django.settings -6 7 | from library import foo - 8 |+ -7 9 | from . import local - 10 |+ - 11 |+import django.settings +1 | from __future__ import annotations +2 + +3 | import os +4 | import sys +5 + +6 | import pytz + - import django.settings +7 | from library import foo +8 + +9 | from . import local +10 + +11 + import django.settings diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap index 66636e6f78..774d16ac36 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_first_party_imports.py.snap @@ -12,14 +12,12 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import os -1 2 | import sys - 3 |+ - 4 |+import numpy as np - 5 |+ -2 6 | import leading_prefix -3 |-import numpy as np -4 |-import os -5 7 | from leading_prefix import Class +1 + import os +2 | import sys +3 + +4 + import numpy as np +5 + +6 | import leading_prefix + - import numpy as np + - import os +7 | from leading_prefix import Class diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap index 3d3dc12260..230f91e4b6 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_future_imports.py.snap @@ -10,11 +10,9 @@ I001 [*] Import block is un-sorted or un-formatted | |__________________________________^ | help: Organize imports - -ℹ Safe fix -1 |-import sys -2 |-import os -3 1 | from __future__ import annotations - 2 |+ - 3 |+import os - 4 |+import sys + - import sys + - import os +1 | from __future__ import annotations +2 + +3 + import os +4 + import sys diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap index 553ad555bb..f419664b61 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_local_folder_imports.py.snap @@ -14,18 +14,16 @@ I001 [*] Import block is un-sorted or un-formatted | |______________________^ | help: Organize imports - -ℹ Safe fix - 1 |+import os -1 2 | import sys - 3 |+ -2 4 | import ruff - 5 |+from ruff import check - 6 |+ -3 7 | import leading_prefix -4 |-import os - 8 |+ - 9 |+from .. import trailing_prefix -5 10 | from . import leading_prefix -6 |-from .. import trailing_prefix -7 |-from ruff import check +1 + import os +2 | import sys +3 + +4 | import ruff +5 + from ruff import check +6 + +7 | import leading_prefix + - import os +8 + +9 + from .. import trailing_prefix +10 | from . import leading_prefix + - from .. import trailing_prefix + - from ruff import check diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap index 16428a3868..000ee1c61b 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__separate_third_party_imports.py.snap @@ -11,12 +11,10 @@ I001 [*] Import block is un-sorted or un-formatted | |_________^ | help: Organize imports - -ℹ Safe fix -1 |-import pandas as pd - 1 |+import os -2 2 | import sys - 3 |+ -3 4 | import numpy as np -4 |-import os - 5 |+import pandas as pd + - import pandas as pd +1 + import os +2 | import sys +3 + +4 | import numpy as np + - import os +5 + import pandas as pd diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap index 6bf22e519b..64993cd84f 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__skip.py.snap @@ -11,17 +11,15 @@ I001 [*] Import block is un-sorted or un-formatted | |______________^ | help: Organize imports - -ℹ Safe fix -17 17 | def f(): -18 18 | import sys -19 19 | import os # isort: skip - 20 |+ import abc -20 21 | import collections -21 |- import abc -22 22 | -23 23 | -24 24 | def f(): +17 | def f(): +18 | import sys +19 | import os # isort: skip +20 + import abc +21 | import collections + - import abc +22 | +23 | +24 | def f(): I001 [*] Import block is un-sorted or un-formatted --> skip.py:27:5 @@ -33,17 +31,15 @@ I001 [*] Import block is un-sorted or un-formatted | |______________^ | help: Organize imports - -ℹ Safe fix -24 24 | def f(): -25 25 | import sys -26 26 | import os # isort:skip - 27 |+ import abc -27 28 | import collections -28 |- import abc -29 29 | -30 30 | -31 31 | def f(): +24 | def f(): +25 | import sys +26 | import os # isort:skip +27 + import abc +28 | import collections + - import abc +29 | +30 | +31 | def f(): I001 [*] Import block is un-sorted or un-formatted --> skip.py:34:5 @@ -54,11 +50,9 @@ I001 [*] Import block is un-sorted or un-formatted | ^^^^^^^^^^^^^^^^^^^^^ | help: Organize imports - -ℹ Safe fix -31 31 | def f(): -32 32 | import sys; import os # isort:skip -33 33 | import sys; import os # isort:skip # isort:skip -34 |- import sys; import os - 34 |+ import os - 35 |+ import sys +31 | def f(): +32 | import sys; import os # isort:skip +33 | import sys; import os # isort:skip # isort:skip + - import sys; import os +34 + import os +35 + import sys diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap index 28ac2cbf46..b6c8b985aa 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__sort_similar_imports.py.snap @@ -33,45 +33,43 @@ I001 [*] Import block is un-sorted or un-formatted | |_____________^ | help: Organize imports - -ℹ Safe fix -1 |-from a import b - 1 |+import A - 2 |+import a - 3 |+import B - 4 |+import b - 5 |+import x - 6 |+import x as A - 7 |+import x as Y - 8 |+import x as a - 9 |+import x as y -2 10 | from a import BAD as DEF -3 |-from a import B -4 |-from a import Boo as DEF - 11 |+from a import B, b - 12 |+from a import B as A -5 13 | from a import B as Abc -6 |-from a import B as A -7 14 | from a import B as DEF - 15 |+from a import Boo as DEF -8 16 | from a import b as a -9 |-from a import b as x -10 17 | from a import b as c -11 |-from b import c -12 18 | from a import b as d - 19 |+from a import b as x -13 20 | from a import b as y -14 |-from b import C - 21 |+from b import C, c -15 22 | from b import c as d -16 |- -17 |-import A -18 |-import a -19 |-import b -20 |-import B -21 |- -22 |-import x as y -23 |-import x as A -24 |-import x as Y -25 |-import x -26 |-import x as a + - from a import b +1 + import A +2 + import a +3 + import B +4 + import b +5 + import x +6 + import x as A +7 + import x as Y +8 + import x as a +9 + import x as y +10 | from a import BAD as DEF + - from a import B + - from a import Boo as DEF +11 + from a import B, b +12 + from a import B as A +13 | from a import B as Abc + - from a import B as A +14 | from a import B as DEF +15 + from a import Boo as DEF +16 | from a import b as a + - from a import b as x +17 | from a import b as c + - from b import c +18 | from a import b as d +19 + from a import b as x +20 | from a import b as y + - from b import C +21 + from b import C, c +22 | from b import c as d + - + - import A + - import a + - import b + - import B + - + - import x as y + - import x as A + - import x as Y + - import x + - import x as a diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap index ba458c1fea..1296aaaf93 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split.py.snap @@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted 18 | # isort: split | help: Organize imports - -ℹ Safe fix -12 12 | import b -13 13 | -14 14 | if True: - 15 |+ import A -15 16 | import C -16 |- import A -17 17 | -18 18 | # isort: split -19 19 | +12 | import b +13 | +14 | if True: +15 + import A +16 | import C + - import A +17 | +18 | # isort: split +19 | I001 [*] Import block is un-sorted or un-formatted --> split.py:20:5 @@ -34,17 +32,15 @@ I001 [*] Import block is un-sorted or un-formatted | |____________^ | help: Organize imports - -ℹ Safe fix -17 17 | -18 18 | # isort: split -19 19 | - 20 |+ import B -20 21 | import D -21 |- import B -22 22 | -23 23 | -24 24 | import e +17 | +18 | # isort: split +19 | +20 + import B +21 | import D + - import B +22 | +23 | +24 | import e I001 [*] Import block is un-sorted or un-formatted --> split.py:30:1 @@ -56,11 +52,9 @@ I001 [*] Import block is un-sorted or un-formatted | |________^ | help: Organize imports - -ℹ Safe fix -27 27 | # isort: split -28 28 | # isort: split -29 29 | - 30 |+import c -30 31 | import d -31 |-import c +27 | # isort: split +28 | # isort: split +29 | +30 + import c +31 | import d + - import c diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap index e8504643c3..14574d6605 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__split_on_trailing_comma_magic_trailing_comma.py.snap @@ -45,51 +45,49 @@ I001 [*] Import block is un-sorted or un-formatted | |_^ | help: Organize imports - -ℹ Safe fix -1 1 | # This has a magic trailing comma, will be sorted, but not rolled into one line -2 |-from sys import ( -3 |- stderr, -4 |- argv, -5 |- stdout, -6 |- exit, -7 |-) -8 |- -9 |-# No magic comma, this will be rolled into one line. -10 |-from os import ( -11 |- path, -12 |- environ, -13 |- execl, -14 |- execv -15 |-) -16 |- -17 2 | from glob import ( - 3 |+ escape, # Ends with a comment, should still treat as magic trailing comma. -18 4 | glob, -19 5 | iglob, -20 |- escape, # Ends with a comment, should still treat as magic trailing comma. -21 6 | ) -22 7 | - 8 |+# No magic comma, this will be rolled into one line. - 9 |+from os import environ, execl, execv, path - 10 |+from sys import argv, exit, stderr, stdout - 11 |+ -23 12 | # These will be combined, but without a trailing comma. -24 |-from foo import bar -25 |-from foo import baz - 13 |+from foo import bar, baz -26 14 | -27 15 | # These will be combined, _with_ a trailing comma. -28 |-from module1 import member1 -29 |-from module1 import ( -30 |- member2, -31 |- member3, -32 |-) - 16 |+from module1 import member1, member2, member3 -33 17 | -34 18 | # These will be combined, _with_ a trailing comma. -35 |-from module2 import member1, member2 -36 |-from module2 import ( -37 |- member3, -38 |-) - 19 |+from module2 import member1, member2, member3 +1 | # This has a magic trailing comma, will be sorted, but not rolled into one line + - from sys import ( + - stderr, + - argv, + - stdout, + - exit, + - ) + - + - # No magic comma, this will be rolled into one line. + - from os import ( + - path, + - environ, + - execl, + - execv + - ) + - +2 | from glob import ( +3 + escape, # Ends with a comment, should still treat as magic trailing comma. +4 | glob, +5 | iglob, + - escape, # Ends with a comment, should still treat as magic trailing comma. +6 | ) +7 | +8 + # No magic comma, this will be rolled into one line. +9 + from os import environ, execl, execv, path +10 + from sys import argv, exit, stderr, stdout +11 + +12 | # These will be combined, but without a trailing comma. + - from foo import bar + - from foo import baz +13 + from foo import bar, baz +14 | +15 | # These will be combined, _with_ a trailing comma. + - from module1 import member1 + - from module1 import ( + - member2, + - member3, + - ) +16 + from module1 import member1, member2, member3 +17 | +18 | # These will be combined, _with_ a trailing comma. + - from module2 import member1, member2 + - from module2 import ( + - member3, + - ) +19 + from module2 import member1, member2, member3 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap index 0b3da48c00..a19c0e909a 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__star_before_others.py.snap @@ -10,9 +10,7 @@ I001 [*] Import block is un-sorted or un-formatted | |_______________________^ | help: Organize imports - -ℹ Safe fix -1 1 | from .logging import config_logging - 2 |+from .settings import * -2 3 | from .settings import ENV -3 |-from .settings import * +1 | from .logging import config_logging +2 + from .settings import * +3 | from .settings import ENV + - from .settings import * diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap index 3aa72a1317..9195b747fa 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.py.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `import os` --> docstring.py:1:1 help: Insert required import: `import os` - -ℹ Safe fix -1 1 | """Hello, world!""" - 2 |+import os -2 3 | -3 4 | x = 1 +1 | """Hello, world!""" +2 + import os +3 | +4 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap index 90186c1c46..03fe838a2a 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__straight_required_import_docstring.pyi.snap @@ -4,9 +4,7 @@ source: crates/ruff_linter/src/rules/isort/mod.rs I002 [*] Missing required import: `import os` --> docstring.pyi:1:1 help: Insert required import: `import os` - -ℹ Safe fix -1 1 | """Hello, world!""" - 2 |+import os -2 3 | -3 4 | x = 1 +1 | """Hello, world!""" +2 + import os +3 | +4 | x = 1 diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap index 95ca30c37b..2038d98586 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__trailing_comment.py.snap @@ -17,22 +17,20 @@ I001 [*] Import block is un-sorted or un-formatted 15 | pass | help: Organize imports - -ℹ Safe fix -5 5 | -6 6 | pass -7 7 | - 8 |+from foo import bar # some comment -8 9 | from mylib import ( -9 10 | MyClient, -10 11 | MyMgmtClient, -11 |-); from foo import ( -12 |- bar -13 |-)# some comment - 12 |+) -14 13 | -15 14 | pass -16 15 | +5 | +6 | pass +7 | +8 + from foo import bar # some comment +9 | from mylib import ( +10 | MyClient, +11 | MyMgmtClient, + - ); from foo import ( + - bar + - )# some comment +12 + ) +13 | +14 | pass +15 | I001 [*] Import block is un-sorted or un-formatted --> trailing_comment.py:17:1 @@ -52,18 +50,16 @@ I001 [*] Import block is un-sorted or un-formatted 26 | pass | help: Organize imports - -ℹ Safe fix -14 14 | -15 15 | pass -16 16 | -17 |-from foo import ( -18 |- bar -19 |-) - 17 |+from foo import bar -20 18 | from mylib import ( -21 19 | MyClient, -22 20 | MyMgmtClient, +14 | +15 | pass +16 | + - from foo import ( + - bar + - ) +17 + from foo import bar +18 | from mylib import ( +19 | MyClient, +20 | MyMgmtClient, I001 [*] Import block is un-sorted or un-formatted --> trailing_comment.py:35:1 @@ -79,19 +75,17 @@ I001 [*] Import block is un-sorted or un-formatted 40 | pass | help: Organize imports - -ℹ Safe fix -32 32 | -33 33 | pass -34 34 | -35 |-from mylib import ( -36 |- MyClient -37 |- # some comment -38 |-) - 35 |+from mylib import MyClient # some comment -39 36 | -40 37 | pass -41 38 | +32 | +33 | pass +34 | + - from mylib import ( + - MyClient + - # some comment + - ) +35 + from mylib import MyClient # some comment +36 | +37 | pass +38 | I001 [*] Import block is un-sorted or un-formatted --> trailing_comment.py:42:1 @@ -107,19 +101,17 @@ I001 [*] Import block is un-sorted or un-formatted 47 | pass | help: Organize imports - -ℹ Safe fix -39 39 | -40 40 | pass -41 41 | -42 |-from mylib import ( -43 |- # some comment -44 |- MyClient -45 |-) - 42 |+from mylib import MyClient # some comment -46 43 | -47 44 | pass -48 45 | +39 | +40 | pass +41 | + - from mylib import ( + - # some comment + - MyClient + - ) +42 + from mylib import MyClient # some comment +43 | +44 | pass +45 | I001 [*] Import block is un-sorted or un-formatted --> trailing_comment.py:50:1 @@ -133,14 +125,12 @@ I001 [*] Import block is un-sorted or un-formatted | |_^ | help: Organize imports - -ℹ Safe fix -47 47 | pass -48 48 | -49 49 | # a -50 |-from mylib import ( # b -51 |- # c -52 |- MyClient # d -53 |- # e -54 |-) # f - 50 |+from mylib import MyClient # b # c # d # e # f +47 | pass +48 | +49 | # a + - from mylib import ( # b + - # c + - MyClient # d + - # e + - ) # f +50 + from mylib import MyClient # b # c # d # e # f diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap index 65d75ac606..48aeeee11e 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__two_space.py.snap @@ -17,17 +17,15 @@ I001 [*] Import block is un-sorted or un-formatted 10 | del sin, cos, tan, pi, nan | help: Organize imports - -ℹ Safe fix -1 1 | # If the file doesn't contain a logical indent token, we should still detect two-space indentation on imports. -2 2 | from math import ( -3 |- sin, -4 |- tan, -5 3 | cos, -6 4 | nan, -7 5 | pi, - 6 |+ sin, - 7 |+ tan, -8 8 | ) -9 9 | -10 10 | del sin, cos, tan, pi, nan +1 | # If the file doesn't contain a logical indent token, we should still detect two-space indentation on imports. +2 | from math import ( + - sin, + - tan, +3 | cos, +4 | nan, +5 | pi, +6 + sin, +7 + tan, +8 | ) +9 | +10 | del sin, cos, tan, pi, nan diff --git a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap index 1b90e6af08..7dae7e26dc 100644 --- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap +++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linter__rules__isort__tests__unicode.py.snap @@ -13,13 +13,11 @@ I001 [*] Import block is un-sorted or un-formatted 6 | h = 2 * π * ℏ | help: Organize imports - -ℹ Safe fix - 1 |+import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio - 2 |+import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ -1 3 | from astropy.constants import hbar as ℏ -2 4 | from numpy import pi as π -3 |-import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ -4 |-import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio -5 5 | -6 6 | h = 2 * π * ℏ +1 + import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio +2 + import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ +3 | from astropy.constants import hbar as ℏ +4 | from numpy import pi as π + - import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ + - import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio +5 | +6 | h = 2 * π * ℏ diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap index 63f0ce2588..331cee389d 100644 --- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap +++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-function_NPY003.py.snap @@ -12,16 +12,14 @@ NPY003 [*] `np.round_` is deprecated; use `np.round` instead 6 | np.cumproduct(np.random.rand(5, 5)) | help: Replace with `np.round` - -ℹ Safe fix -1 1 | def func(): -2 2 | import numpy as np -3 3 | -4 |- np.round_(np.random.rand(5, 5), 2) - 4 |+ np.round(np.random.rand(5, 5), 2) -5 5 | np.product(np.random.rand(5, 5)) -6 6 | np.cumproduct(np.random.rand(5, 5)) -7 7 | np.sometrue(np.random.rand(5, 5)) +1 | def func(): +2 | import numpy as np +3 | + - np.round_(np.random.rand(5, 5), 2) +4 + np.round(np.random.rand(5, 5), 2) +5 | np.product(np.random.rand(5, 5)) +6 | np.cumproduct(np.random.rand(5, 5)) +7 | np.sometrue(np.random.rand(5, 5)) NPY003 [*] `np.product` is deprecated; use `np.prod` instead --> NPY003.py:5:5 @@ -33,16 +31,14 @@ NPY003 [*] `np.product` is deprecated; use `np.prod` instead 7 | np.sometrue(np.random.rand(5, 5)) | help: Replace with `np.prod` - -ℹ Safe fix -2 2 | import numpy as np -3 3 | -4 4 | np.round_(np.random.rand(5, 5), 2) -5 |- np.product(np.random.rand(5, 5)) - 5 |+ np.prod(np.random.rand(5, 5)) -6 6 | np.cumproduct(np.random.rand(5, 5)) -7 7 | np.sometrue(np.random.rand(5, 5)) -8 8 | np.alltrue(np.random.rand(5, 5)) +2 | import numpy as np +3 | +4 | np.round_(np.random.rand(5, 5), 2) + - np.product(np.random.rand(5, 5)) +5 + np.prod(np.random.rand(5, 5)) +6 | np.cumproduct(np.random.rand(5, 5)) +7 | np.sometrue(np.random.rand(5, 5)) +8 | np.alltrue(np.random.rand(5, 5)) NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead --> NPY003.py:6:5 @@ -55,16 +51,14 @@ NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead 8 | np.alltrue(np.random.rand(5, 5)) | help: Replace with `np.cumprod` - -ℹ Safe fix -3 3 | -4 4 | np.round_(np.random.rand(5, 5), 2) -5 5 | np.product(np.random.rand(5, 5)) -6 |- np.cumproduct(np.random.rand(5, 5)) - 6 |+ np.cumprod(np.random.rand(5, 5)) -7 7 | np.sometrue(np.random.rand(5, 5)) -8 8 | np.alltrue(np.random.rand(5, 5)) -9 9 | +3 | +4 | np.round_(np.random.rand(5, 5), 2) +5 | np.product(np.random.rand(5, 5)) + - np.cumproduct(np.random.rand(5, 5)) +6 + np.cumprod(np.random.rand(5, 5)) +7 | np.sometrue(np.random.rand(5, 5)) +8 | np.alltrue(np.random.rand(5, 5)) +9 | NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead --> NPY003.py:7:5 @@ -76,16 +70,14 @@ NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead 8 | np.alltrue(np.random.rand(5, 5)) | help: Replace with `np.any` - -ℹ Safe fix -4 4 | np.round_(np.random.rand(5, 5), 2) -5 5 | np.product(np.random.rand(5, 5)) -6 6 | np.cumproduct(np.random.rand(5, 5)) -7 |- np.sometrue(np.random.rand(5, 5)) - 7 |+ np.any(np.random.rand(5, 5)) -8 8 | np.alltrue(np.random.rand(5, 5)) -9 9 | -10 10 | +4 | np.round_(np.random.rand(5, 5), 2) +5 | np.product(np.random.rand(5, 5)) +6 | np.cumproduct(np.random.rand(5, 5)) + - np.sometrue(np.random.rand(5, 5)) +7 + np.any(np.random.rand(5, 5)) +8 | np.alltrue(np.random.rand(5, 5)) +9 | +10 | NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead --> NPY003.py:8:5 @@ -96,16 +88,14 @@ NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead | ^^^^^^^^^^ | help: Replace with `np.all` - -ℹ Safe fix -5 5 | np.product(np.random.rand(5, 5)) -6 6 | np.cumproduct(np.random.rand(5, 5)) -7 7 | np.sometrue(np.random.rand(5, 5)) -8 |- np.alltrue(np.random.rand(5, 5)) - 8 |+ np.all(np.random.rand(5, 5)) -9 9 | -10 10 | -11 11 | def func(): +5 | np.product(np.random.rand(5, 5)) +6 | np.cumproduct(np.random.rand(5, 5)) +7 | np.sometrue(np.random.rand(5, 5)) + - np.alltrue(np.random.rand(5, 5)) +8 + np.all(np.random.rand(5, 5)) +9 | +10 | +11 | def func(): NPY003 [*] `np.round_` is deprecated; use `np.round` instead --> NPY003.py:14:5 @@ -118,21 +108,19 @@ NPY003 [*] `np.round_` is deprecated; use `np.round` instead 16 | cumproduct(np.random.rand(5, 5)) | help: Replace with `np.round` - -ℹ Safe fix - 1 |+from numpy import round -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy import round +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -11 12 | def func(): -12 13 | from numpy import round_, product, cumproduct, sometrue, alltrue -13 14 | -14 |- round_(np.random.rand(5, 5), 2) - 15 |+ round(np.random.rand(5, 5), 2) -15 16 | product(np.random.rand(5, 5)) -16 17 | cumproduct(np.random.rand(5, 5)) -17 18 | sometrue(np.random.rand(5, 5)) +12 | def func(): +13 | from numpy import round_, product, cumproduct, sometrue, alltrue +14 | + - round_(np.random.rand(5, 5), 2) +15 + round(np.random.rand(5, 5), 2) +16 | product(np.random.rand(5, 5)) +17 | cumproduct(np.random.rand(5, 5)) +18 | sometrue(np.random.rand(5, 5)) NPY003 [*] `np.product` is deprecated; use `np.prod` instead --> NPY003.py:15:5 @@ -144,21 +132,19 @@ NPY003 [*] `np.product` is deprecated; use `np.prod` instead 17 | sometrue(np.random.rand(5, 5)) | help: Replace with `np.prod` - -ℹ Safe fix - 1 |+from numpy import prod -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy import prod +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -12 13 | from numpy import round_, product, cumproduct, sometrue, alltrue -13 14 | -14 15 | round_(np.random.rand(5, 5), 2) -15 |- product(np.random.rand(5, 5)) - 16 |+ prod(np.random.rand(5, 5)) -16 17 | cumproduct(np.random.rand(5, 5)) -17 18 | sometrue(np.random.rand(5, 5)) -18 19 | alltrue(np.random.rand(5, 5)) +13 | from numpy import round_, product, cumproduct, sometrue, alltrue +14 | +15 | round_(np.random.rand(5, 5), 2) + - product(np.random.rand(5, 5)) +16 + prod(np.random.rand(5, 5)) +17 | cumproduct(np.random.rand(5, 5)) +18 | sometrue(np.random.rand(5, 5)) +19 | alltrue(np.random.rand(5, 5)) NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead --> NPY003.py:16:5 @@ -171,20 +157,18 @@ NPY003 [*] `np.cumproduct` is deprecated; use `np.cumprod` instead 18 | alltrue(np.random.rand(5, 5)) | help: Replace with `np.cumprod` - -ℹ Safe fix - 1 |+from numpy import cumprod -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy import cumprod +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -13 14 | -14 15 | round_(np.random.rand(5, 5), 2) -15 16 | product(np.random.rand(5, 5)) -16 |- cumproduct(np.random.rand(5, 5)) - 17 |+ cumprod(np.random.rand(5, 5)) -17 18 | sometrue(np.random.rand(5, 5)) -18 19 | alltrue(np.random.rand(5, 5)) +14 | +15 | round_(np.random.rand(5, 5), 2) +16 | product(np.random.rand(5, 5)) + - cumproduct(np.random.rand(5, 5)) +17 + cumprod(np.random.rand(5, 5)) +18 | sometrue(np.random.rand(5, 5)) +19 | alltrue(np.random.rand(5, 5)) NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead --> NPY003.py:17:5 @@ -196,19 +180,17 @@ NPY003 [*] `np.sometrue` is deprecated; use `np.any` instead 18 | alltrue(np.random.rand(5, 5)) | help: Replace with `np.any` - -ℹ Safe fix - 1 |+from numpy import any -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy import any +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -14 15 | round_(np.random.rand(5, 5), 2) -15 16 | product(np.random.rand(5, 5)) -16 17 | cumproduct(np.random.rand(5, 5)) -17 |- sometrue(np.random.rand(5, 5)) - 18 |+ any(np.random.rand(5, 5)) -18 19 | alltrue(np.random.rand(5, 5)) +15 | round_(np.random.rand(5, 5), 2) +16 | product(np.random.rand(5, 5)) +17 | cumproduct(np.random.rand(5, 5)) + - sometrue(np.random.rand(5, 5)) +18 + any(np.random.rand(5, 5)) +19 | alltrue(np.random.rand(5, 5)) NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead --> NPY003.py:18:5 @@ -219,15 +201,13 @@ NPY003 [*] `np.alltrue` is deprecated; use `np.all` instead | ^^^^^^^ | help: Replace with `np.all` - -ℹ Safe fix - 1 |+from numpy import all -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy import all +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -15 16 | product(np.random.rand(5, 5)) -16 17 | cumproduct(np.random.rand(5, 5)) -17 18 | sometrue(np.random.rand(5, 5)) -18 |- alltrue(np.random.rand(5, 5)) - 19 |+ all(np.random.rand(5, 5)) +16 | product(np.random.rand(5, 5)) +17 | cumproduct(np.random.rand(5, 5)) +18 | sometrue(np.random.rand(5, 5)) + - alltrue(np.random.rand(5, 5)) +19 + all(np.random.rand(5, 5)) diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap index 55f95252ae..26aaed26cb 100644 --- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap +++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy-deprecated-type-alias_NPY001.py.snap @@ -10,16 +10,14 @@ NPY001 [*] Type alias `np.float` is deprecated, replace with builtin type 7 | npy.int | help: Replace `np.float` with builtin type - -ℹ Safe fix -3 3 | import numpy -4 4 | -5 5 | # Error -6 |-npy.float - 6 |+float -7 7 | npy.int -8 8 | -9 9 | if dtype == np.object: +3 | import numpy +4 | +5 | # Error + - npy.float +6 + float +7 | npy.int +8 | +9 | if dtype == np.object: NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type --> NPY001.py:7:1 @@ -32,16 +30,14 @@ NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type 9 | if dtype == np.object: | help: Replace `np.int` with builtin type - -ℹ Safe fix -4 4 | -5 5 | # Error -6 6 | npy.float -7 |-npy.int - 7 |+int -8 8 | -9 9 | if dtype == np.object: -10 10 | ... +4 | +5 | # Error +6 | npy.float + - npy.int +7 + int +8 | +9 | if dtype == np.object: +10 | ... NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type --> NPY001.py:9:13 @@ -53,16 +49,14 @@ NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type 10 | ... | help: Replace `np.object` with builtin type - -ℹ Safe fix -6 6 | npy.float -7 7 | npy.int -8 8 | -9 |-if dtype == np.object: - 9 |+if dtype == object: -10 10 | ... -11 11 | -12 12 | result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex]) +6 | npy.float +7 | npy.int +8 | + - if dtype == np.object: +9 + if dtype == object: +10 | ... +11 | +12 | result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex]) NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type --> NPY001.py:12:72 @@ -75,16 +69,14 @@ NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type 14 | pdf = pd.DataFrame( | help: Replace `np.int` with builtin type - -ℹ Safe fix -9 9 | if dtype == np.object: -10 10 | ... -11 11 | -12 |-result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex]) - 12 |+result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, int, np.complex]) -13 13 | -14 14 | pdf = pd.DataFrame( -15 15 | data=[[1, 2, 3]], +9 | if dtype == np.object: +10 | ... +11 | + - result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex]) +12 + result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, int, np.complex]) +13 | +14 | pdf = pd.DataFrame( +15 | data=[[1, 2, 3]], NPY001 [*] Type alias `np.complex` is deprecated, replace with builtin type --> NPY001.py:12:80 @@ -97,16 +89,14 @@ NPY001 [*] Type alias `np.complex` is deprecated, replace with builtin type 14 | pdf = pd.DataFrame( | help: Replace `np.complex` with builtin type - -ℹ Safe fix -9 9 | if dtype == np.object: -10 10 | ... -11 11 | -12 |-result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex]) - 12 |+result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, complex]) -13 13 | -14 14 | pdf = pd.DataFrame( -15 15 | data=[[1, 2, 3]], +9 | if dtype == np.object: +10 | ... +11 | + - result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.complex]) +12 + result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, complex]) +13 | +14 | pdf = pd.DataFrame( +15 | data=[[1, 2, 3]], NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type --> NPY001.py:17:11 @@ -118,16 +108,14 @@ NPY001 [*] Type alias `np.object` is deprecated, replace with builtin type 18 | ) | help: Replace `np.object` with builtin type - -ℹ Safe fix -14 14 | pdf = pd.DataFrame( -15 15 | data=[[1, 2, 3]], -16 16 | columns=["a", "b", "c"], -17 |- dtype=numpy.object, - 17 |+ dtype=object, -18 18 | ) -19 19 | -20 20 | _ = arr.astype(np.int) +14 | pdf = pd.DataFrame( +15 | data=[[1, 2, 3]], +16 | columns=["a", "b", "c"], + - dtype=numpy.object, +17 + dtype=object, +18 | ) +19 | +20 | _ = arr.astype(np.int) NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type --> NPY001.py:20:16 @@ -140,16 +128,14 @@ NPY001 [*] Type alias `np.int` is deprecated, replace with builtin type 22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952 | help: Replace `np.int` with builtin type - -ℹ Safe fix -17 17 | dtype=numpy.object, -18 18 | ) -19 19 | -20 |-_ = arr.astype(np.int) - 20 |+_ = arr.astype(int) -21 21 | -22 22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952 -23 23 | from numpy import float +17 | dtype=numpy.object, +18 | ) +19 | + - _ = arr.astype(np.int) +20 + _ = arr.astype(int) +21 | +22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952 +23 | from numpy import float NPY001 [*] Type alias `np.float` is deprecated, replace with builtin type --> NPY001.py:25:1 @@ -160,12 +146,10 @@ NPY001 [*] Type alias `np.float` is deprecated, replace with builtin type | ^^^^^ | help: Replace `np.float` with builtin type - -ℹ Safe fix -21 21 | -22 22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952 -23 23 | from numpy import float - 24 |+import builtins -24 25 | -25 |-float(1) - 26 |+builtins.float(1) +21 | +22 | # Regression test for: https://github.com/astral-sh/ruff/issues/6952 +23 | from numpy import float +24 + import builtins +25 | + - float(1) +26 + builtins.float(1) diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap index 966168f605..a63fd3be90 100644 --- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap +++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201.py.snap @@ -12,17 +12,15 @@ NPY201 [*] `np.add_docstring` will be removed in NumPy 2.0. Use `numpy.lib.add_d 6 | np.add_newdoc | help: Replace with `numpy.lib.add_docstring` - -ℹ Safe fix - 1 |+from numpy.lib import add_docstring -1 2 | def func(): -2 3 | import numpy as np -3 4 | -4 |- np.add_docstring - 5 |+ add_docstring -5 6 | -6 7 | np.add_newdoc -7 8 | +1 + from numpy.lib import add_docstring +2 | def func(): +3 | import numpy as np +4 | + - np.add_docstring +5 + add_docstring +6 | +7 | np.add_newdoc +8 | NPY201 [*] `np.add_newdoc` will be removed in NumPy 2.0. Use `numpy.lib.add_newdoc` instead. --> NPY201.py:6:5 @@ -35,19 +33,17 @@ NPY201 [*] `np.add_newdoc` will be removed in NumPy 2.0. Use `numpy.lib.add_newd 8 | np.add_newdoc_ufunc | help: Replace with `numpy.lib.add_newdoc` - -ℹ Safe fix - 1 |+from numpy.lib import add_newdoc -1 2 | def func(): -2 3 | import numpy as np -3 4 | -4 5 | np.add_docstring -5 6 | -6 |- np.add_newdoc - 7 |+ add_newdoc -7 8 | -8 9 | np.add_newdoc_ufunc -9 10 | +1 + from numpy.lib import add_newdoc +2 | def func(): +3 | import numpy as np +4 | +5 | np.add_docstring +6 | + - np.add_newdoc +7 + add_newdoc +8 | +9 | np.add_newdoc_ufunc +10 | NPY201 `np.add_newdoc_ufunc` will be removed in NumPy 2.0. `add_newdoc_ufunc` is an internal function. --> NPY201.py:8:5 @@ -82,21 +78,20 @@ NPY201 [*] `np.byte_bounds` will be removed in NumPy 2.0. Use `numpy.lib.array_u 14 | np.cast | help: Replace with `numpy.lib.array_utils.byte_bounds` (requires NumPy 2.0 or greater) - -ℹ Unsafe fix - 1 |+from numpy.lib.array_utils import byte_bounds -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.lib.array_utils import byte_bounds +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -9 10 | -10 11 | np.asfarray([1,2,3]) -11 12 | -12 |- np.byte_bounds(np.array([1,2,3])) - 13 |+ byte_bounds(np.array([1,2,3])) -13 14 | -14 15 | np.cast -15 16 | +10 | +11 | np.asfarray([1,2,3]) +12 | + - np.byte_bounds(np.array([1,2,3])) +13 + byte_bounds(np.array([1,2,3])) +14 | +15 | np.cast +16 | +note: This is an unsafe fix and may change runtime behavior NPY201 `np.cast` will be removed in NumPy 2.0. Use `np.asarray(arr, dtype=dtype)` instead. --> NPY201.py:14:5 @@ -120,16 +115,14 @@ NPY201 [*] `np.cfloat` will be removed in NumPy 2.0. Use `numpy.complex128` inst 18 | np.clongfloat(12+34j) | help: Replace with `numpy.complex128` - -ℹ Safe fix -13 13 | -14 14 | np.cast -15 15 | -16 |- np.cfloat(12+34j) - 16 |+ np.complex128(12+34j) -17 17 | -18 18 | np.clongfloat(12+34j) -19 19 | +13 | +14 | np.cast +15 | + - np.cfloat(12+34j) +16 + np.complex128(12+34j) +17 | +18 | np.clongfloat(12+34j) +19 | NPY201 [*] `np.clongfloat` will be removed in NumPy 2.0. Use `numpy.clongdouble` instead. --> NPY201.py:18:5 @@ -142,16 +135,14 @@ NPY201 [*] `np.clongfloat` will be removed in NumPy 2.0. Use `numpy.clongdouble` 20 | np.compat | help: Replace with `numpy.clongdouble` - -ℹ Safe fix -15 15 | -16 16 | np.cfloat(12+34j) -17 17 | -18 |- np.clongfloat(12+34j) - 18 |+ np.clongdouble(12+34j) -19 19 | -20 20 | np.compat -21 21 | +15 | +16 | np.cfloat(12+34j) +17 | + - np.clongfloat(12+34j) +18 + np.clongdouble(12+34j) +19 | +20 | np.compat +21 | NPY201 `np.compat` will be removed in NumPy 2.0. Python 2 is no longer supported. --> NPY201.py:20:5 @@ -175,16 +166,14 @@ NPY201 [*] `np.complex_` will be removed in NumPy 2.0. Use `numpy.complex128` in 24 | np.DataSource | help: Replace with `numpy.complex128` - -ℹ Safe fix -19 19 | -20 20 | np.compat -21 21 | -22 |- np.complex_(12+34j) - 22 |+ np.complex128(12+34j) -23 23 | -24 24 | np.DataSource -25 25 | +19 | +20 | np.compat +21 | + - np.complex_(12+34j) +22 + np.complex128(12+34j) +23 | +24 | np.DataSource +25 | NPY201 [*] `np.DataSource` will be removed in NumPy 2.0. Use `numpy.lib.npyio.DataSource` instead. --> NPY201.py:24:5 @@ -197,21 +186,19 @@ NPY201 [*] `np.DataSource` will be removed in NumPy 2.0. Use `numpy.lib.npyio.Da 26 | np.deprecate | help: Replace with `numpy.lib.npyio.DataSource` - -ℹ Safe fix - 1 |+from numpy.lib.npyio import DataSource -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.lib.npyio import DataSource +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -21 22 | -22 23 | np.complex_(12+34j) -23 24 | -24 |- np.DataSource - 25 |+ DataSource -25 26 | -26 27 | np.deprecate -27 28 | +22 | +23 | np.complex_(12+34j) +24 | + - np.DataSource +25 + DataSource +26 | +27 | np.deprecate +28 | NPY201 `np.deprecate` will be removed in NumPy 2.0. Emit `DeprecationWarning` with `warnings.warn` directly, or use `typing.deprecated`. --> NPY201.py:26:5 @@ -290,16 +277,14 @@ NPY201 [*] `np.float_` will be removed in NumPy 2.0. Use `numpy.float64` instead 40 | np.geterrobj | help: Replace with `numpy.float64` - -ℹ Safe fix -35 35 | -36 36 | np.get_array_wrap -37 37 | -38 |- np.float_ - 38 |+ np.float64 -39 39 | -40 40 | np.geterrobj -41 41 | +35 | +36 | np.get_array_wrap +37 | + - np.float_ +38 + np.float64 +39 | +40 | np.geterrobj +41 | NPY201 `np.geterrobj` will be removed in NumPy 2.0. Use the `np.errstate` context manager instead. --> NPY201.py:40:5 @@ -323,16 +308,14 @@ NPY201 [*] `np.Inf` will be removed in NumPy 2.0. Use `numpy.inf` instead. 44 | np.Infinity | help: Replace with `numpy.inf` - -ℹ Safe fix -39 39 | -40 40 | np.geterrobj -41 41 | -42 |- np.Inf - 42 |+ np.inf -43 43 | -44 44 | np.Infinity -45 45 | +39 | +40 | np.geterrobj +41 | + - np.Inf +42 + np.inf +43 | +44 | np.Infinity +45 | NPY201 [*] `np.Infinity` will be removed in NumPy 2.0. Use `numpy.inf` instead. --> NPY201.py:44:5 @@ -345,16 +328,14 @@ NPY201 [*] `np.Infinity` will be removed in NumPy 2.0. Use `numpy.inf` instead. 46 | np.infty | help: Replace with `numpy.inf` - -ℹ Safe fix -41 41 | -42 42 | np.Inf -43 43 | -44 |- np.Infinity - 44 |+ np.inf -45 45 | -46 46 | np.infty -47 47 | +41 | +42 | np.Inf +43 | + - np.Infinity +44 + np.inf +45 | +46 | np.infty +47 | NPY201 [*] `np.infty` will be removed in NumPy 2.0. Use `numpy.inf` instead. --> NPY201.py:46:5 @@ -367,16 +348,14 @@ NPY201 [*] `np.infty` will be removed in NumPy 2.0. Use `numpy.inf` instead. 48 | np.issctype | help: Replace with `numpy.inf` - -ℹ Safe fix -43 43 | -44 44 | np.Infinity -45 45 | -46 |- np.infty - 46 |+ np.inf -47 47 | -48 48 | np.issctype -49 49 | +43 | +44 | np.Infinity +45 | + - np.infty +46 + np.inf +47 | +48 | np.issctype +49 | NPY201 `np.issctype` will be removed without replacement in NumPy 2.0 --> NPY201.py:48:5 @@ -400,16 +379,14 @@ NPY201 [*] `np.issubclass_` will be removed in NumPy 2.0. Use `issubclass` inste 52 | np.issubsctype | help: Replace with `issubclass` - -ℹ Safe fix -47 47 | -48 48 | np.issctype -49 49 | -50 |- np.issubclass_(np.int32, np.integer) - 50 |+ issubclass(np.int32, np.integer) -51 51 | -52 52 | np.issubsctype -53 53 | +47 | +48 | np.issctype +49 | + - np.issubclass_(np.int32, np.integer) +50 + issubclass(np.int32, np.integer) +51 | +52 | np.issubsctype +53 | NPY201 [*] `np.issubsctype` will be removed in NumPy 2.0. Use `numpy.issubdtype` instead. --> NPY201.py:52:5 @@ -422,16 +399,14 @@ NPY201 [*] `np.issubsctype` will be removed in NumPy 2.0. Use `numpy.issubdtype` 54 | np.mat | help: Replace with `numpy.issubdtype` - -ℹ Safe fix -49 49 | -50 50 | np.issubclass_(np.int32, np.integer) -51 51 | -52 |- np.issubsctype - 52 |+ np.issubdtype -53 53 | -54 54 | np.mat -55 55 | +49 | +50 | np.issubclass_(np.int32, np.integer) +51 | + - np.issubsctype +52 + np.issubdtype +53 | +54 | np.mat +55 | NPY201 [*] `np.mat` will be removed in NumPy 2.0. Use `numpy.asmatrix` instead. --> NPY201.py:54:5 @@ -444,16 +419,14 @@ NPY201 [*] `np.mat` will be removed in NumPy 2.0. Use `numpy.asmatrix` instead. 56 | np.maximum_sctype | help: Replace with `numpy.asmatrix` - -ℹ Safe fix -51 51 | -52 52 | np.issubsctype -53 53 | -54 |- np.mat - 54 |+ np.asmatrix -55 55 | -56 56 | np.maximum_sctype -57 57 | +51 | +52 | np.issubsctype +53 | + - np.mat +54 + np.asmatrix +55 | +56 | np.maximum_sctype +57 | NPY201 `np.maximum_sctype` will be removed without replacement in NumPy 2.0 --> NPY201.py:56:5 @@ -477,16 +450,14 @@ NPY201 [*] `np.NaN` will be removed in NumPy 2.0. Use `numpy.nan` instead. 60 | np.nbytes[np.int64] | help: Replace with `numpy.nan` - -ℹ Safe fix -55 55 | -56 56 | np.maximum_sctype -57 57 | -58 |- np.NaN - 58 |+ np.nan -59 59 | -60 60 | np.nbytes[np.int64] -61 61 | +55 | +56 | np.maximum_sctype +57 | + - np.NaN +58 + np.nan +59 | +60 | np.nbytes[np.int64] +61 | NPY201 `np.nbytes` will be removed in NumPy 2.0. Use `np.dtype().itemsize` instead. --> NPY201.py:60:5 @@ -510,16 +481,14 @@ NPY201 [*] `np.NINF` will be removed in NumPy 2.0. Use `-np.inf` instead. 64 | np.NZERO | help: Replace with `-np.inf` - -ℹ Safe fix -59 59 | -60 60 | np.nbytes[np.int64] -61 61 | -62 |- np.NINF - 62 |+ -np.inf -63 63 | -64 64 | np.NZERO -65 65 | +59 | +60 | np.nbytes[np.int64] +61 | + - np.NINF +62 + -np.inf +63 | +64 | np.NZERO +65 | NPY201 [*] `np.NZERO` will be removed in NumPy 2.0. Use `-0.0` instead. --> NPY201.py:64:5 @@ -532,16 +501,14 @@ NPY201 [*] `np.NZERO` will be removed in NumPy 2.0. Use `-0.0` instead. 66 | np.longcomplex(12+34j) | help: Replace with `-0.0` - -ℹ Safe fix -61 61 | -62 62 | np.NINF -63 63 | -64 |- np.NZERO - 64 |+ -0.0 -65 65 | -66 66 | np.longcomplex(12+34j) -67 67 | +61 | +62 | np.NINF +63 | + - np.NZERO +64 + -0.0 +65 | +66 | np.longcomplex(12+34j) +67 | NPY201 [*] `np.longcomplex` will be removed in NumPy 2.0. Use `numpy.clongdouble` instead. --> NPY201.py:66:5 @@ -554,16 +521,14 @@ NPY201 [*] `np.longcomplex` will be removed in NumPy 2.0. Use `numpy.clongdouble 68 | np.longfloat(12+34j) | help: Replace with `numpy.clongdouble` - -ℹ Safe fix -63 63 | -64 64 | np.NZERO -65 65 | -66 |- np.longcomplex(12+34j) - 66 |+ np.clongdouble(12+34j) -67 67 | -68 68 | np.longfloat(12+34j) -69 69 | +63 | +64 | np.NZERO +65 | + - np.longcomplex(12+34j) +66 + np.clongdouble(12+34j) +67 | +68 | np.longfloat(12+34j) +69 | NPY201 [*] `np.longfloat` will be removed in NumPy 2.0. Use `numpy.longdouble` instead. --> NPY201.py:68:5 @@ -576,16 +541,14 @@ NPY201 [*] `np.longfloat` will be removed in NumPy 2.0. Use `numpy.longdouble` i 70 | np.lookfor | help: Replace with `numpy.longdouble` - -ℹ Safe fix -65 65 | -66 66 | np.longcomplex(12+34j) -67 67 | -68 |- np.longfloat(12+34j) - 68 |+ np.longdouble(12+34j) -69 69 | -70 70 | np.lookfor -71 71 | +65 | +66 | np.longcomplex(12+34j) +67 | + - np.longfloat(12+34j) +68 + np.longdouble(12+34j) +69 | +70 | np.lookfor +71 | NPY201 `np.lookfor` will be removed in NumPy 2.0. Search NumPy’s documentation directly. --> NPY201.py:70:5 @@ -609,13 +572,11 @@ NPY201 [*] `np.NAN` will be removed in NumPy 2.0. Use `numpy.nan` instead. 74 | try: | help: Replace with `numpy.nan` - -ℹ Safe fix -69 69 | -70 70 | np.lookfor -71 71 | -72 |- np.NAN - 72 |+ np.nan -73 73 | -74 74 | try: -75 75 | from numpy.lib.npyio import DataSource +69 | +70 | np.lookfor +71 | + - np.NAN +72 + np.nan +73 | +74 | try: +75 | from numpy.lib.npyio import DataSource diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap index cc084a2158..0fc00891d2 100644 --- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap +++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_2.py.snap @@ -23,16 +23,14 @@ NPY201 [*] `np.PINF` will be removed in NumPy 2.0. Use `numpy.inf` instead. 8 | np.PZERO | help: Replace with `numpy.inf` - -ℹ Safe fix -3 3 | -4 4 | np.obj2sctype(int) -5 5 | -6 |- np.PINF - 6 |+ np.inf -7 7 | -8 8 | np.PZERO -9 9 | +3 | +4 | np.obj2sctype(int) +5 | + - np.PINF +6 + np.inf +7 | +8 | np.PZERO +9 | NPY201 [*] `np.PZERO` will be removed in NumPy 2.0. Use `0.0` instead. --> NPY201_2.py:8:5 @@ -45,16 +43,14 @@ NPY201 [*] `np.PZERO` will be removed in NumPy 2.0. Use `0.0` instead. 10 | np.recfromcsv | help: Replace with `0.0` - -ℹ Safe fix -5 5 | -6 6 | np.PINF -7 7 | -8 |- np.PZERO - 8 |+ 0.0 -9 9 | -10 10 | np.recfromcsv -11 11 | +5 | +6 | np.PINF +7 | + - np.PZERO +8 + 0.0 +9 | +10 | np.recfromcsv +11 | NPY201 `np.recfromcsv` will be removed in NumPy 2.0. Use `np.genfromtxt` with comma delimiter instead. --> NPY201_2.py:10:5 @@ -89,16 +85,14 @@ NPY201 [*] `np.round_` will be removed in NumPy 2.0. Use `numpy.round` instead. 16 | np.safe_eval | help: Replace with `numpy.round` - -ℹ Safe fix -11 11 | -12 12 | np.recfromtxt -13 13 | -14 |- np.round_(12.34) - 14 |+ np.round(12.34) -15 15 | -16 16 | np.safe_eval -17 17 | +11 | +12 | np.recfromtxt +13 | + - np.round_(12.34) +14 + np.round(12.34) +15 | +16 | np.safe_eval +17 | NPY201 [*] `np.safe_eval` will be removed in NumPy 2.0. Use `ast.literal_eval` instead. --> NPY201_2.py:16:5 @@ -111,21 +105,19 @@ NPY201 [*] `np.safe_eval` will be removed in NumPy 2.0. Use `ast.literal_eval` i 18 | np.sctype2char | help: Replace with `ast.literal_eval` - -ℹ Safe fix - 1 |+from ast import literal_eval -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from ast import literal_eval +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -13 14 | -14 15 | np.round_(12.34) -15 16 | -16 |- np.safe_eval - 17 |+ literal_eval -17 18 | -18 19 | np.sctype2char -19 20 | +14 | +15 | np.round_(12.34) +16 | + - np.safe_eval +17 + literal_eval +18 | +19 | np.sctype2char +20 | NPY201 `np.sctype2char` will be removed without replacement in NumPy 2.0 --> NPY201_2.py:18:5 @@ -182,16 +174,14 @@ NPY201 [*] `np.singlecomplex` will be removed in NumPy 2.0. Use `numpy.complex64 30 | np.string_("asdf") | help: Replace with `numpy.complex64` - -ℹ Safe fix -25 25 | -26 26 | np.set_string_function -27 27 | -28 |- np.singlecomplex(12+1j) - 28 |+ np.complex64(12+1j) -29 29 | -30 30 | np.string_("asdf") -31 31 | +25 | +26 | np.set_string_function +27 | + - np.singlecomplex(12+1j) +28 + np.complex64(12+1j) +29 | +30 | np.string_("asdf") +31 | NPY201 [*] `np.string_` will be removed in NumPy 2.0. Use `numpy.bytes_` instead. --> NPY201_2.py:30:5 @@ -204,16 +194,14 @@ NPY201 [*] `np.string_` will be removed in NumPy 2.0. Use `numpy.bytes_` instead 32 | np.source | help: Replace with `numpy.bytes_` - -ℹ Safe fix -27 27 | -28 28 | np.singlecomplex(12+1j) -29 29 | -30 |- np.string_("asdf") - 30 |+ np.bytes_("asdf") -31 31 | -32 32 | np.source -33 33 | +27 | +28 | np.singlecomplex(12+1j) +29 | + - np.string_("asdf") +30 + np.bytes_("asdf") +31 | +32 | np.source +33 | NPY201 [*] `np.source` will be removed in NumPy 2.0. Use `inspect.getsource` instead. --> NPY201_2.py:32:5 @@ -226,21 +214,19 @@ NPY201 [*] `np.source` will be removed in NumPy 2.0. Use `inspect.getsource` ins 34 | np.tracemalloc_domain | help: Replace with `inspect.getsource` - -ℹ Safe fix - 1 |+from inspect import getsource -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from inspect import getsource +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -29 30 | -30 31 | np.string_("asdf") -31 32 | -32 |- np.source - 33 |+ getsource -33 34 | -34 35 | np.tracemalloc_domain -35 36 | +30 | +31 | np.string_("asdf") +32 | + - np.source +33 + getsource +34 | +35 | np.tracemalloc_domain +36 | NPY201 [*] `np.tracemalloc_domain` will be removed in NumPy 2.0. Use `numpy.lib.tracemalloc_domain` instead. --> NPY201_2.py:34:5 @@ -253,21 +239,19 @@ NPY201 [*] `np.tracemalloc_domain` will be removed in NumPy 2.0. Use `numpy.lib. 36 | np.unicode_("asf") | help: Replace with `numpy.lib.tracemalloc_domain` - -ℹ Safe fix - 1 |+from numpy.lib import tracemalloc_domain -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.lib import tracemalloc_domain +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -31 32 | -32 33 | np.source -33 34 | -34 |- np.tracemalloc_domain - 35 |+ tracemalloc_domain -35 36 | -36 37 | np.unicode_("asf") -37 38 | +32 | +33 | np.source +34 | + - np.tracemalloc_domain +35 + tracemalloc_domain +36 | +37 | np.unicode_("asf") +38 | NPY201 [*] `np.unicode_` will be removed in NumPy 2.0. Use `numpy.str_` instead. --> NPY201_2.py:36:5 @@ -280,16 +264,14 @@ NPY201 [*] `np.unicode_` will be removed in NumPy 2.0. Use `numpy.str_` instead. 38 | np.who() | help: Replace with `numpy.str_` - -ℹ Safe fix -33 33 | -34 34 | np.tracemalloc_domain -35 35 | -36 |- np.unicode_("asf") - 36 |+ np.str_("asf") -37 37 | -38 38 | np.who() -39 39 | +33 | +34 | np.tracemalloc_domain +35 | + - np.unicode_("asf") +36 + np.str_("asf") +37 | +38 | np.who() +39 | NPY201 `np.who` will be removed in NumPy 2.0. Use an IDE variable explorer or `locals()` instead. --> NPY201_2.py:38:5 @@ -313,16 +295,14 @@ NPY201 [*] `np.row_stack` will be removed in NumPy 2.0. Use `numpy.vstack` inste 42 | np.alltrue([True, True]) | help: Replace with `numpy.vstack` - -ℹ Safe fix -37 37 | -38 38 | np.who() -39 39 | -40 |- np.row_stack(([1,2], [3,4])) - 40 |+ np.vstack(([1,2], [3,4])) -41 41 | -42 42 | np.alltrue([True, True]) -43 43 | +37 | +38 | np.who() +39 | + - np.row_stack(([1,2], [3,4])) +40 + np.vstack(([1,2], [3,4])) +41 | +42 | np.alltrue([True, True]) +43 | NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead. --> NPY201_2.py:42:5 @@ -335,16 +315,14 @@ NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead. 44 | np.sometrue([True, False]) | help: Replace with `numpy.all` - -ℹ Safe fix -39 39 | -40 40 | np.row_stack(([1,2], [3,4])) -41 41 | -42 |- np.alltrue([True, True]) - 42 |+ np.all([True, True]) -43 43 | -44 44 | np.sometrue([True, False]) -45 45 | +39 | +40 | np.row_stack(([1,2], [3,4])) +41 | + - np.alltrue([True, True]) +42 + np.all([True, True]) +43 | +44 | np.sometrue([True, False]) +45 | NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead. --> NPY201_2.py:44:5 @@ -357,16 +335,14 @@ NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead. 46 | np.cumproduct([1, 2, 3]) | help: Replace with `numpy.any` - -ℹ Safe fix -41 41 | -42 42 | np.alltrue([True, True]) -43 43 | -44 |- np.sometrue([True, False]) - 44 |+ np.any([True, False]) -45 45 | -46 46 | np.cumproduct([1, 2, 3]) -47 47 | +41 | +42 | np.alltrue([True, True]) +43 | + - np.sometrue([True, False]) +44 + np.any([True, False]) +45 | +46 | np.cumproduct([1, 2, 3]) +47 | NPY201 [*] `np.cumproduct` will be removed in NumPy 2.0. Use `numpy.cumprod` instead. --> NPY201_2.py:46:5 @@ -379,16 +355,14 @@ NPY201 [*] `np.cumproduct` will be removed in NumPy 2.0. Use `numpy.cumprod` ins 48 | np.product([1, 2, 3]) | help: Replace with `numpy.cumprod` - -ℹ Safe fix -43 43 | -44 44 | np.sometrue([True, False]) -45 45 | -46 |- np.cumproduct([1, 2, 3]) - 46 |+ np.cumprod([1, 2, 3]) -47 47 | -48 48 | np.product([1, 2, 3]) -49 49 | +43 | +44 | np.sometrue([True, False]) +45 | + - np.cumproduct([1, 2, 3]) +46 + np.cumprod([1, 2, 3]) +47 | +48 | np.product([1, 2, 3]) +49 | NPY201 [*] `np.product` will be removed in NumPy 2.0. Use `numpy.prod` instead. --> NPY201_2.py:48:5 @@ -401,16 +375,14 @@ NPY201 [*] `np.product` will be removed in NumPy 2.0. Use `numpy.prod` instead. 50 | np.trapz([1, 2, 3]) | help: Replace with `numpy.prod` - -ℹ Safe fix -45 45 | -46 46 | np.cumproduct([1, 2, 3]) -47 47 | -48 |- np.product([1, 2, 3]) - 48 |+ np.prod([1, 2, 3]) -49 49 | -50 50 | np.trapz([1, 2, 3]) -51 51 | +45 | +46 | np.cumproduct([1, 2, 3]) +47 | + - np.product([1, 2, 3]) +48 + np.prod([1, 2, 3]) +49 | +50 | np.trapz([1, 2, 3]) +51 | NPY201 [*] `np.trapz` will be removed in NumPy 2.0. Use `numpy.trapezoid` on NumPy 2.0, or ignore this warning on earlier versions. --> NPY201_2.py:50:5 @@ -423,16 +395,15 @@ NPY201 [*] `np.trapz` will be removed in NumPy 2.0. Use `numpy.trapezoid` on Num 52 | np.in1d([1, 2], [1, 3, 5]) | help: Replace with `numpy.trapezoid` (requires NumPy 2.0 or greater) - -ℹ Unsafe fix -47 47 | -48 48 | np.product([1, 2, 3]) -49 49 | -50 |- np.trapz([1, 2, 3]) - 50 |+ np.trapezoid([1, 2, 3]) -51 51 | -52 52 | np.in1d([1, 2], [1, 3, 5]) -53 53 | +47 | +48 | np.product([1, 2, 3]) +49 | + - np.trapz([1, 2, 3]) +50 + np.trapezoid([1, 2, 3]) +51 | +52 | np.in1d([1, 2], [1, 3, 5]) +53 | +note: This is an unsafe fix and may change runtime behavior NPY201 [*] `np.in1d` will be removed in NumPy 2.0. Use `numpy.isin` instead. --> NPY201_2.py:52:5 @@ -445,16 +416,14 @@ NPY201 [*] `np.in1d` will be removed in NumPy 2.0. Use `numpy.isin` instead. 54 | np.AxisError | help: Replace with `numpy.isin` - -ℹ Safe fix -49 49 | -50 50 | np.trapz([1, 2, 3]) -51 51 | -52 |- np.in1d([1, 2], [1, 3, 5]) - 52 |+ np.isin([1, 2], [1, 3, 5]) -53 53 | -54 54 | np.AxisError -55 55 | +49 | +50 | np.trapz([1, 2, 3]) +51 | + - np.in1d([1, 2], [1, 3, 5]) +52 + np.isin([1, 2], [1, 3, 5]) +53 | +54 | np.AxisError +55 | NPY201 [*] `np.AxisError` will be removed in NumPy 2.0. Use `numpy.exceptions.AxisError` instead. --> NPY201_2.py:54:5 @@ -467,21 +436,19 @@ NPY201 [*] `np.AxisError` will be removed in NumPy 2.0. Use `numpy.exceptions.Ax 56 | np.ComplexWarning | help: Replace with `numpy.exceptions.AxisError` - -ℹ Safe fix - 1 |+from numpy.exceptions import AxisError -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.exceptions import AxisError +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -51 52 | -52 53 | np.in1d([1, 2], [1, 3, 5]) -53 54 | -54 |- np.AxisError - 55 |+ AxisError -55 56 | -56 57 | np.ComplexWarning -57 58 | +52 | +53 | np.in1d([1, 2], [1, 3, 5]) +54 | + - np.AxisError +55 + AxisError +56 | +57 | np.ComplexWarning +58 | NPY201 [*] `np.ComplexWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.ComplexWarning` instead. --> NPY201_2.py:56:5 @@ -494,21 +461,19 @@ NPY201 [*] `np.ComplexWarning` will be removed in NumPy 2.0. Use `numpy.exceptio 58 | np.compare_chararrays | help: Replace with `numpy.exceptions.ComplexWarning` - -ℹ Safe fix - 1 |+from numpy.exceptions import ComplexWarning -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.exceptions import ComplexWarning +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -53 54 | -54 55 | np.AxisError -55 56 | -56 |- np.ComplexWarning - 57 |+ ComplexWarning -57 58 | -58 59 | np.compare_chararrays -59 60 | +54 | +55 | np.AxisError +56 | + - np.ComplexWarning +57 + ComplexWarning +58 | +59 | np.compare_chararrays +60 | NPY201 [*] `np.compare_chararrays` will be removed in NumPy 2.0. Use `numpy.char.compare_chararrays` instead. --> NPY201_2.py:58:5 @@ -521,21 +486,19 @@ NPY201 [*] `np.compare_chararrays` will be removed in NumPy 2.0. Use `numpy.char 60 | try: | help: Replace with `numpy.char.compare_chararrays` - -ℹ Safe fix - 1 |+from numpy.char import compare_chararrays -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.char import compare_chararrays +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -55 56 | -56 57 | np.ComplexWarning -57 58 | -58 |- np.compare_chararrays - 59 |+ compare_chararrays -59 60 | -60 61 | try: -61 62 | np.all([True, True]) +56 | +57 | np.ComplexWarning +58 | + - np.compare_chararrays +59 + compare_chararrays +60 | +61 | try: +62 | np.all([True, True]) NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead. --> NPY201_2.py:63:9 @@ -548,16 +511,14 @@ NPY201 [*] `np.alltrue` will be removed in NumPy 2.0. Use `numpy.all` instead. 65 | try: | help: Replace with `numpy.all` - -ℹ Safe fix -60 60 | try: -61 61 | np.all([True, True]) -62 62 | except TypeError: -63 |- np.alltrue([True, True]) # Should emit a warning here (`except TypeError`, not `except AttributeError`) - 63 |+ np.all([True, True]) # Should emit a warning here (`except TypeError`, not `except AttributeError`) -64 64 | -65 65 | try: -66 66 | np.anyyyy([True, True]) +60 | try: +61 | np.all([True, True]) +62 | except TypeError: + - np.alltrue([True, True]) # Should emit a warning here (`except TypeError`, not `except AttributeError`) +63 + np.all([True, True]) # Should emit a warning here (`except TypeError`, not `except AttributeError`) +64 | +65 | try: +66 | np.anyyyy([True, True]) NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead. --> NPY201_2.py:68:9 @@ -569,13 +530,11 @@ NPY201 [*] `np.sometrue` will be removed in NumPy 2.0. Use `numpy.any` instead. 69 | # (must have an attribute access of the undeprecated name in the `try` body for it to be ignored) | help: Replace with `numpy.any` - -ℹ Safe fix -65 65 | try: -66 66 | np.anyyyy([True, True]) -67 67 | except AttributeError: -68 |- np.sometrue([True, True]) # Should emit a warning here - 68 |+ np.any([True, True]) # Should emit a warning here -69 69 | # (must have an attribute access of the undeprecated name in the `try` body for it to be ignored) -70 70 | -71 71 | try: +65 | try: +66 | np.anyyyy([True, True]) +67 | except AttributeError: + - np.sometrue([True, True]) # Should emit a warning here +68 + np.any([True, True]) # Should emit a warning here +69 | # (must have an attribute access of the undeprecated name in the `try` body for it to be ignored) +70 | +71 | try: diff --git a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap index 8b9bb6bee7..873f15d871 100644 --- a/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap +++ b/crates/ruff_linter/src/rules/numpy/snapshots/ruff_linter__rules__numpy__tests__numpy2-deprecation_NPY201_3.py.snap @@ -12,17 +12,15 @@ NPY201 [*] `np.DTypePromotionError` will be removed in NumPy 2.0. Use `numpy.exc 6 | np.ModuleDeprecationWarning | help: Replace with `numpy.exceptions.DTypePromotionError` - -ℹ Safe fix - 1 |+from numpy.exceptions import DTypePromotionError -1 2 | def func(): -2 3 | import numpy as np -3 4 | -4 |- np.DTypePromotionError - 5 |+ DTypePromotionError -5 6 | -6 7 | np.ModuleDeprecationWarning -7 8 | +1 + from numpy.exceptions import DTypePromotionError +2 | def func(): +3 | import numpy as np +4 | + - np.DTypePromotionError +5 + DTypePromotionError +6 | +7 | np.ModuleDeprecationWarning +8 | NPY201 [*] `np.ModuleDeprecationWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.ModuleDeprecationWarning` instead. --> NPY201_3.py:6:5 @@ -35,19 +33,17 @@ NPY201 [*] `np.ModuleDeprecationWarning` will be removed in NumPy 2.0. Use `nump 8 | np.RankWarning | help: Replace with `numpy.exceptions.ModuleDeprecationWarning` - -ℹ Safe fix - 1 |+from numpy.exceptions import ModuleDeprecationWarning -1 2 | def func(): -2 3 | import numpy as np -3 4 | -4 5 | np.DTypePromotionError -5 6 | -6 |- np.ModuleDeprecationWarning - 7 |+ ModuleDeprecationWarning -7 8 | -8 9 | np.RankWarning -9 10 | +1 + from numpy.exceptions import ModuleDeprecationWarning +2 | def func(): +3 | import numpy as np +4 | +5 | np.DTypePromotionError +6 | + - np.ModuleDeprecationWarning +7 + ModuleDeprecationWarning +8 | +9 | np.RankWarning +10 | NPY201 [*] `np.RankWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.RankWarning` on NumPy 2.0, or ignore this warning on earlier versions. --> NPY201_3.py:8:5 @@ -60,21 +56,20 @@ NPY201 [*] `np.RankWarning` will be removed in NumPy 2.0. Use `numpy.exceptions. 10 | np.TooHardError | help: Replace with `numpy.exceptions.RankWarning` (requires NumPy 2.0 or greater) - -ℹ Unsafe fix - 1 |+from numpy.exceptions import RankWarning -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.exceptions import RankWarning +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -5 6 | -6 7 | np.ModuleDeprecationWarning -7 8 | -8 |- np.RankWarning - 9 |+ RankWarning -9 10 | -10 11 | np.TooHardError -11 12 | +6 | +7 | np.ModuleDeprecationWarning +8 | + - np.RankWarning +9 + RankWarning +10 | +11 | np.TooHardError +12 | +note: This is an unsafe fix and may change runtime behavior NPY201 [*] `np.TooHardError` will be removed in NumPy 2.0. Use `numpy.exceptions.TooHardError` instead. --> NPY201_3.py:10:5 @@ -87,21 +82,19 @@ NPY201 [*] `np.TooHardError` will be removed in NumPy 2.0. Use `numpy.exceptions 12 | np.VisibleDeprecationWarning | help: Replace with `numpy.exceptions.TooHardError` - -ℹ Safe fix - 1 |+from numpy.exceptions import TooHardError -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.exceptions import TooHardError +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -7 8 | -8 9 | np.RankWarning -9 10 | -10 |- np.TooHardError - 11 |+ TooHardError -11 12 | -12 13 | np.VisibleDeprecationWarning -13 14 | +8 | +9 | np.RankWarning +10 | + - np.TooHardError +11 + TooHardError +12 | +13 | np.VisibleDeprecationWarning +14 | NPY201 [*] `np.VisibleDeprecationWarning` will be removed in NumPy 2.0. Use `numpy.exceptions.VisibleDeprecationWarning` instead. --> NPY201_3.py:12:5 @@ -114,21 +107,19 @@ NPY201 [*] `np.VisibleDeprecationWarning` will be removed in NumPy 2.0. Use `num 14 | np.chararray | help: Replace with `numpy.exceptions.VisibleDeprecationWarning` - -ℹ Safe fix - 1 |+from numpy.exceptions import VisibleDeprecationWarning -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.exceptions import VisibleDeprecationWarning +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -9 10 | -10 11 | np.TooHardError -11 12 | -12 |- np.VisibleDeprecationWarning - 13 |+ VisibleDeprecationWarning -13 14 | -14 15 | np.chararray -15 16 | +10 | +11 | np.TooHardError +12 | + - np.VisibleDeprecationWarning +13 + VisibleDeprecationWarning +14 | +15 | np.chararray +16 | NPY201 [*] `np.chararray` will be removed in NumPy 2.0. Use `numpy.char.chararray` instead. --> NPY201_3.py:14:5 @@ -141,20 +132,18 @@ NPY201 [*] `np.chararray` will be removed in NumPy 2.0. Use `numpy.char.chararra 16 | np.format_parser | help: Replace with `numpy.char.chararray` - -ℹ Safe fix - 1 |+from numpy.char import chararray -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.char import chararray +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -11 12 | -12 13 | np.VisibleDeprecationWarning -13 14 | -14 |- np.chararray - 15 |+ chararray -15 16 | -16 17 | np.format_parser +12 | +13 | np.VisibleDeprecationWarning +14 | + - np.chararray +15 + chararray +16 | +17 | np.format_parser NPY201 [*] `np.format_parser` will be removed in NumPy 2.0. Use `numpy.rec.format_parser` instead. --> NPY201_3.py:16:5 @@ -165,15 +154,13 @@ NPY201 [*] `np.format_parser` will be removed in NumPy 2.0. Use `numpy.rec.forma | ^^^^^^^^^^^^^^^^ | help: Replace with `numpy.rec.format_parser` - -ℹ Safe fix - 1 |+from numpy.rec import format_parser -1 2 | def func(): -2 3 | import numpy as np -3 4 | +1 + from numpy.rec import format_parser +2 | def func(): +3 | import numpy as np +4 | -------------------------------------------------------------------------------- -13 14 | -14 15 | np.chararray -15 16 | -16 |- np.format_parser - 17 |+ format_parser +14 | +15 | np.chararray +16 | + - np.format_parser +17 + format_parser diff --git a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap index 6fd2c7666c..206dd11ff3 100644 --- a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap +++ b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_PD002.py.snap @@ -12,16 +12,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior 7 | x.y.drop(["a"], axis=1, inplace=True) | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -2 2 | -3 3 | x = pd.DataFrame() -4 4 | -5 |-x.drop(["a"], axis=1, inplace=True) - 5 |+x = x.drop(["a"], axis=1) -6 6 | -7 7 | x.y.drop(["a"], axis=1, inplace=True) -8 8 | +2 | +3 | x = pd.DataFrame() +4 | + - x.drop(["a"], axis=1, inplace=True) +5 + x = x.drop(["a"], axis=1) +6 | +7 | x.y.drop(["a"], axis=1, inplace=True) +8 | +note: This is an unsafe fix and may change runtime behavior PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior --> PD002.py:7:25 @@ -34,16 +33,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior 9 | x["y"].drop(["a"], axis=1, inplace=True) | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -4 4 | -5 5 | x.drop(["a"], axis=1, inplace=True) -6 6 | -7 |-x.y.drop(["a"], axis=1, inplace=True) - 7 |+x.y = x.y.drop(["a"], axis=1) -8 8 | -9 9 | x["y"].drop(["a"], axis=1, inplace=True) -10 10 | +4 | +5 | x.drop(["a"], axis=1, inplace=True) +6 | + - x.y.drop(["a"], axis=1, inplace=True) +7 + x.y = x.y.drop(["a"], axis=1) +8 | +9 | x["y"].drop(["a"], axis=1, inplace=True) +10 | +note: This is an unsafe fix and may change runtime behavior PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior --> PD002.py:9:28 @@ -56,16 +54,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior 11 | x.drop( | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -6 6 | -7 7 | x.y.drop(["a"], axis=1, inplace=True) -8 8 | -9 |-x["y"].drop(["a"], axis=1, inplace=True) - 9 |+x["y"] = x["y"].drop(["a"], axis=1) -10 10 | -11 11 | x.drop( -12 12 | inplace=True, +6 | +7 | x.y.drop(["a"], axis=1, inplace=True) +8 | + - x["y"].drop(["a"], axis=1, inplace=True) +9 + x["y"] = x["y"].drop(["a"], axis=1) +10 | +11 | x.drop( +12 | inplace=True, +note: This is an unsafe fix and may change runtime behavior PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior --> PD002.py:12:5 @@ -77,17 +74,16 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior 14 | axis=1, | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -8 8 | -9 9 | x["y"].drop(["a"], axis=1, inplace=True) -10 10 | -11 |-x.drop( -12 |- inplace=True, - 11 |+x = x.drop( -13 12 | columns=["a"], -14 13 | axis=1, -15 14 | ) +8 | +9 | x["y"].drop(["a"], axis=1, inplace=True) +10 | + - x.drop( + - inplace=True, +11 + x = x.drop( +12 | columns=["a"], +13 | axis=1, +14 | ) +note: This is an unsafe fix and may change runtime behavior PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior --> PD002.py:19:9 @@ -100,17 +96,16 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior 21 | axis=1, | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -15 15 | ) -16 16 | -17 17 | if True: -18 |- x.drop( -19 |- inplace=True, - 18 |+ x = x.drop( -20 19 | columns=["a"], -21 20 | axis=1, -22 21 | ) +15 | ) +16 | +17 | if True: + - x.drop( + - inplace=True, +18 + x = x.drop( +19 | columns=["a"], +20 | axis=1, +21 | ) +note: This is an unsafe fix and may change runtime behavior PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior --> PD002.py:24:33 @@ -123,16 +118,15 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior 26 | f(x.drop(["a"], axis=1, inplace=True)) | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -21 21 | axis=1, -22 22 | ) -23 23 | -24 |-x.drop(["a"], axis=1, **kwargs, inplace=True) - 24 |+x = x.drop(["a"], axis=1, **kwargs) -25 25 | x.drop(["a"], axis=1, inplace=True, **kwargs) -26 26 | f(x.drop(["a"], axis=1, inplace=True)) -27 27 | +21 | axis=1, +22 | ) +23 | + - x.drop(["a"], axis=1, **kwargs, inplace=True) +24 + x = x.drop(["a"], axis=1, **kwargs) +25 | x.drop(["a"], axis=1, inplace=True, **kwargs) +26 | f(x.drop(["a"], axis=1, inplace=True)) +27 | +note: This is an unsafe fix and may change runtime behavior PD002 `inplace=True` should be avoided; it has inconsistent behavior --> PD002.py:25:23 @@ -178,13 +172,12 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior 35 | # This method doesn't take exist in Pandas, so ignore it. | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -30 30 | -31 31 | torch.m.ReLU(inplace=True) # safe because this isn't a pandas call -32 32 | -33 |-(x.drop(["a"], axis=1, inplace=True)) - 33 |+x = (x.drop(["a"], axis=1)) -34 34 | -35 35 | # This method doesn't take exist in Pandas, so ignore it. -36 36 | x.rotate_z(45, inplace=True) +30 | +31 | torch.m.ReLU(inplace=True) # safe because this isn't a pandas call +32 | + - (x.drop(["a"], axis=1, inplace=True)) +33 + x = (x.drop(["a"], axis=1)) +34 | +35 | # This method doesn't take exist in Pandas, so ignore it. +36 | x.rotate_z(45, inplace=True) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap index 38ae790070..5816d50691 100644 --- a/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap +++ b/crates/ruff_linter/src/rules/pandas_vet/snapshots/ruff_linter__rules__pandas_vet__tests__PD002_fail.snap @@ -10,10 +10,9 @@ PD002 [*] `inplace=True` should be avoided; it has inconsistent behavior | ^^^^^^^^^^^^ | help: Assign to variable; remove `inplace` arg - -ℹ Unsafe fix -1 1 | -2 2 | import pandas as pd -3 3 | x = pd.DataFrame() -4 |-x.drop(["a"], axis=1, inplace=True) - 4 |+x = x.drop(["a"], axis=1) +1 | +2 | import pandas as pd +3 | x = pd.DataFrame() + - x.drop(["a"], axis=1, inplace=True) +4 + x = x.drop(["a"], axis=1) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap index 2e7927936b..baf13d4f03 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap +++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N804_N804.py.snap @@ -11,16 +11,15 @@ N804 [*] First argument of a class method should be named `cls` 31 | ... | help: Rename `self` to `cls` - -ℹ Unsafe fix -27 27 | def __new__(cls, *args, **kwargs): -28 28 | ... -29 29 | -30 |- def __init_subclass__(self, default_name, **kwargs): - 30 |+ def __init_subclass__(cls, default_name, **kwargs): -31 31 | ... -32 32 | -33 33 | @classmethod +27 | def __new__(cls, *args, **kwargs): +28 | ... +29 | + - def __init_subclass__(self, default_name, **kwargs): +30 + def __init_subclass__(cls, default_name, **kwargs): +31 | ... +32 | +33 | @classmethod +note: This is an unsafe fix and may change runtime behavior N804 [*] First argument of a class method should be named `cls` --> N804.py:38:56 @@ -31,16 +30,15 @@ N804 [*] First argument of a class method should be named `cls` 39 | ... | help: Rename `self` to `cls` - -ℹ Unsafe fix -35 35 | ... -36 36 | -37 37 | @classmethod -38 |- def bad_class_method_with_positional_only_argument(self, x, /, other): - 38 |+ def bad_class_method_with_positional_only_argument(cls, x, /, other): -39 39 | ... -40 40 | -41 41 | +35 | ... +36 | +37 | @classmethod + - def bad_class_method_with_positional_only_argument(self, x, /, other): +38 + def bad_class_method_with_positional_only_argument(cls, x, /, other): +39 | ... +40 | +41 | +note: This is an unsafe fix and may change runtime behavior N804 [*] First argument of a class method should be named `cls` --> N804.py:43:20 @@ -51,16 +49,15 @@ N804 [*] First argument of a class method should be named `cls` 44 | pass | help: Rename `self` to `cls` - -ℹ Unsafe fix -40 40 | -41 41 | -42 42 | class MetaClass(ABCMeta): -43 |- def bad_method(self): - 43 |+ def bad_method(cls): -44 44 | pass -45 45 | -46 46 | def good_method(cls): +40 | +41 | +42 | class MetaClass(ABCMeta): + - def bad_method(self): +43 + def bad_method(cls): +44 | pass +45 | +46 | def good_method(cls): +note: This is an unsafe fix and may change runtime behavior N804 First argument of a class method should be named `cls` --> N804.py:54:25 @@ -126,20 +123,19 @@ N804 [*] First argument of a class method should be named `cls` 72 | this | help: Rename `this` to `cls` - -ℹ Unsafe fix -67 67 | pass -68 68 | -69 69 | class RenamingInMethodBodyClass(ABCMeta): -70 |- def bad_method(this): -71 |- this = this -72 |- this - 70 |+ def bad_method(cls): - 71 |+ cls = cls - 72 |+ cls -73 73 | -74 74 | def bad_method(this): -75 75 | self = this +67 | pass +68 | +69 | class RenamingInMethodBodyClass(ABCMeta): + - def bad_method(this): + - this = this + - this +70 + def bad_method(cls): +71 + cls = cls +72 + cls +73 | +74 | def bad_method(this): +75 | self = this +note: This is an unsafe fix and may change runtime behavior N804 [*] First argument of a class method should be named `cls` --> N804.py:74:20 @@ -151,18 +147,17 @@ N804 [*] First argument of a class method should be named `cls` 75 | self = this | help: Rename `this` to `cls` - -ℹ Unsafe fix -71 71 | this = this -72 72 | this -73 73 | -74 |- def bad_method(this): -75 |- self = this - 74 |+ def bad_method(cls): - 75 |+ self = cls -76 76 | -77 77 | def func(x): -78 78 | return x +71 | this = this +72 | this +73 | + - def bad_method(this): + - self = this +74 + def bad_method(cls): +75 + self = cls +76 | +77 | def func(x): +78 | return x +note: This is an unsafe fix and may change runtime behavior N804 First argument of a class method should be named `cls` --> N804.py:88:18 diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap index 67d2b6cb40..3c48758e14 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap +++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__N805_N805.py.snap @@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self` 8 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | class Class: -7 |- def bad_method(this): - 7 |+ def bad_method(self): -8 8 | pass -9 9 | -10 10 | if False: +4 | +5 | +6 | class Class: + - def bad_method(this): +7 + def bad_method(self): +8 | pass +9 | +10 | if False: +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:11:30 @@ -30,16 +29,15 @@ N805 [*] First argument of a method should be named `self` 12 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -8 8 | pass -9 9 | -10 10 | if False: -11 |- def extra_bad_method(this): - 11 |+ def extra_bad_method(self): -12 12 | pass -13 13 | -14 14 | def good_method(self): +8 | pass +9 | +10 | if False: + - def extra_bad_method(this): +11 + def extra_bad_method(self): +12 | pass +13 | +14 | def good_method(self): +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:30:15 @@ -50,16 +48,15 @@ N805 [*] First argument of a method should be named `self` 31 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -27 27 | return x -28 28 | -29 29 | @pydantic.validator -30 |- def lower(cls, my_field: str) -> str: - 30 |+ def lower(self, my_field: str) -> str: -31 31 | pass -32 32 | -33 33 | @pydantic.validator("my_field") +27 | return x +28 | +29 | @pydantic.validator + - def lower(cls, my_field: str) -> str: +30 + def lower(self, my_field: str) -> str: +31 | pass +32 | +33 | @pydantic.validator("my_field") +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:34:15 @@ -70,16 +67,15 @@ N805 [*] First argument of a method should be named `self` 35 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -31 31 | pass -32 32 | -33 33 | @pydantic.validator("my_field") -34 |- def lower(cls, my_field: str) -> str: - 34 |+ def lower(self, my_field: str) -> str: -35 35 | pass -36 36 | -37 37 | def __init__(self): +31 | pass +32 | +33 | @pydantic.validator("my_field") + - def lower(cls, my_field: str) -> str: +34 + def lower(self, my_field: str) -> str: +35 | pass +36 | +37 | def __init__(self): +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:63:29 @@ -91,16 +87,15 @@ N805 [*] First argument of a method should be named `self` 64 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -60 60 | def good_method_pos_only(self, blah, /, something: str): -61 61 | pass -62 62 | -63 |- def bad_method_pos_only(this, blah, /, something: str): - 63 |+ def bad_method_pos_only(self, blah, /, something: str): -64 64 | pass -65 65 | -66 66 | +60 | def good_method_pos_only(self, blah, /, something: str): +61 | pass +62 | + - def bad_method_pos_only(this, blah, /, something: str): +63 + def bad_method_pos_only(self, blah, /, something: str): +64 | pass +65 | +66 | +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:69:13 @@ -112,16 +107,15 @@ N805 [*] First argument of a method should be named `self` 70 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -66 66 | -67 67 | class ModelClass: -68 68 | @hybrid_property -69 |- def bad(cls): - 69 |+ def bad(self): -70 70 | pass -71 71 | -72 72 | @bad.expression +66 | +67 | class ModelClass: +68 | @hybrid_property + - def bad(cls): +69 + def bad(self): +70 | pass +71 | +72 | @bad.expression +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:77:13 @@ -132,16 +126,15 @@ N805 [*] First argument of a method should be named `self` 78 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -74 74 | pass -75 75 | -76 76 | @bad.wtf -77 |- def bad(cls): - 77 |+ def bad(self): -78 78 | pass -79 79 | -80 80 | @hybrid_property +74 | pass +75 | +76 | @bad.wtf + - def bad(cls): +77 + def bad(self): +78 | pass +79 | +80 | @hybrid_property +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:85:14 @@ -152,16 +145,15 @@ N805 [*] First argument of a method should be named `self` 86 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -82 82 | pass -83 83 | -84 84 | @good.expression -85 |- def good(cls): - 85 |+ def good(self): -86 86 | pass -87 87 | -88 88 | @good.wtf +82 | pass +83 | +84 | @good.expression + - def good(cls): +85 + def good(self): +86 | pass +87 | +88 | @good.wtf +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:93:19 @@ -172,16 +164,15 @@ N805 [*] First argument of a method should be named `self` 94 | pass | help: Rename `foo` to `self` - -ℹ Unsafe fix -90 90 | pass -91 91 | -92 92 | @foobar.thisisstatic -93 |- def badstatic(foo): - 93 |+ def badstatic(self): -94 94 | pass -95 95 | -96 96 | +90 | pass +91 | +92 | @foobar.thisisstatic + - def badstatic(foo): +93 + def badstatic(self): +94 | pass +95 | +96 | +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:98:26 @@ -247,20 +238,19 @@ N805 [*] First argument of a method should be named `self` 117 | this | help: Rename `this` to `self` - -ℹ Unsafe fix -112 112 | -113 113 | -114 114 | class RenamingInMethodBodyClass: -115 |- def bad_method(this): -116 |- this = this -117 |- this - 115 |+ def bad_method(self): - 116 |+ self = self - 117 |+ self -118 118 | -119 119 | def bad_method(this): -120 120 | self = this +112 | +113 | +114 | class RenamingInMethodBodyClass: + - def bad_method(this): + - this = this + - this +115 + def bad_method(self): +116 + self = self +117 + self +118 | +119 | def bad_method(this): +120 | self = this +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:119:20 @@ -282,18 +272,17 @@ N805 [*] First argument of a method should be named `self` 125 | hºusehold(1) | help: Rename `household` to `self` - -ℹ Unsafe fix -121 121 | -122 122 | -123 123 | class RenamingWithNFKC: -124 |- def formula(household): -125 |- hºusehold(1) - 124 |+ def formula(self): - 125 |+ self(1) -126 126 | -127 127 | -128 128 | from typing import Protocol +121 | +122 | +123 | class RenamingWithNFKC: + - def formula(household): + - hºusehold(1) +124 + def formula(self): +125 + self(1) +126 | +127 | +128 | from typing import Protocol +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:141:11 diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap index ade14cb4e6..9b1800ce93 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap +++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__classmethod_decorators.snap @@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self` 8 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | class Class: -7 |- def bad_method(this): - 7 |+ def bad_method(self): -8 8 | pass -9 9 | -10 10 | if False: +4 | +5 | +6 | class Class: + - def bad_method(this): +7 + def bad_method(self): +8 | pass +9 | +10 | if False: +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:11:30 @@ -30,16 +29,15 @@ N805 [*] First argument of a method should be named `self` 12 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -8 8 | pass -9 9 | -10 10 | if False: -11 |- def extra_bad_method(this): - 11 |+ def extra_bad_method(self): -12 12 | pass -13 13 | -14 14 | def good_method(self): +8 | pass +9 | +10 | if False: + - def extra_bad_method(this): +11 + def extra_bad_method(self): +12 | pass +13 | +14 | def good_method(self): +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:63:29 @@ -51,16 +49,15 @@ N805 [*] First argument of a method should be named `self` 64 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -60 60 | def good_method_pos_only(self, blah, /, something: str): -61 61 | pass -62 62 | -63 |- def bad_method_pos_only(this, blah, /, something: str): - 63 |+ def bad_method_pos_only(self, blah, /, something: str): -64 64 | pass -65 65 | -66 66 | +60 | def good_method_pos_only(self, blah, /, something: str): +61 | pass +62 | + - def bad_method_pos_only(this, blah, /, something: str): +63 + def bad_method_pos_only(self, blah, /, something: str): +64 | pass +65 | +66 | +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:69:13 @@ -72,16 +69,15 @@ N805 [*] First argument of a method should be named `self` 70 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -66 66 | -67 67 | class ModelClass: -68 68 | @hybrid_property -69 |- def bad(cls): - 69 |+ def bad(self): -70 70 | pass -71 71 | -72 72 | @bad.expression +66 | +67 | class ModelClass: +68 | @hybrid_property + - def bad(cls): +69 + def bad(self): +70 | pass +71 | +72 | @bad.expression +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:77:13 @@ -92,16 +88,15 @@ N805 [*] First argument of a method should be named `self` 78 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -74 74 | pass -75 75 | -76 76 | @bad.wtf -77 |- def bad(cls): - 77 |+ def bad(self): -78 78 | pass -79 79 | -80 80 | @hybrid_property +74 | pass +75 | +76 | @bad.wtf + - def bad(cls): +77 + def bad(self): +78 | pass +79 | +80 | @hybrid_property +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:93:19 @@ -112,16 +107,15 @@ N805 [*] First argument of a method should be named `self` 94 | pass | help: Rename `foo` to `self` - -ℹ Unsafe fix -90 90 | pass -91 91 | -92 92 | @foobar.thisisstatic -93 |- def badstatic(foo): - 93 |+ def badstatic(self): -94 94 | pass -95 95 | -96 96 | +90 | pass +91 | +92 | @foobar.thisisstatic + - def badstatic(foo): +93 + def badstatic(self): +94 | pass +95 | +96 | +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:98:26 @@ -187,20 +181,19 @@ N805 [*] First argument of a method should be named `self` 117 | this | help: Rename `this` to `self` - -ℹ Unsafe fix -112 112 | -113 113 | -114 114 | class RenamingInMethodBodyClass: -115 |- def bad_method(this): -116 |- this = this -117 |- this - 115 |+ def bad_method(self): - 116 |+ self = self - 117 |+ self -118 118 | -119 119 | def bad_method(this): -120 120 | self = this +112 | +113 | +114 | class RenamingInMethodBodyClass: + - def bad_method(this): + - this = this + - this +115 + def bad_method(self): +116 + self = self +117 + self +118 | +119 | def bad_method(this): +120 | self = this +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:119:20 @@ -222,18 +215,17 @@ N805 [*] First argument of a method should be named `self` 125 | hºusehold(1) | help: Rename `household` to `self` - -ℹ Unsafe fix -121 121 | -122 122 | -123 123 | class RenamingWithNFKC: -124 |- def formula(household): -125 |- hºusehold(1) - 124 |+ def formula(self): - 125 |+ self(1) -126 126 | -127 127 | -128 128 | from typing import Protocol +121 | +122 | +123 | class RenamingWithNFKC: + - def formula(household): + - hºusehold(1) +124 + def formula(self): +125 + self(1) +126 | +127 | +128 | from typing import Protocol +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:141:11 diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap index 4f123be2e7..0039192b4b 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap +++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N804_N804.py.snap @@ -10,16 +10,15 @@ N804 [*] First argument of a class method should be named `cls` 6 | ... | help: Rename `self` to `cls` - -ℹ Unsafe fix -2 2 | -3 3 | -4 4 | class Class: -5 |- def __init_subclass__(self, default_name, **kwargs): - 5 |+ def __init_subclass__(cls, default_name, **kwargs): -6 6 | ... -7 7 | -8 8 | @classmethod +2 | +3 | +4 | class Class: + - def __init_subclass__(self, default_name, **kwargs): +5 + def __init_subclass__(cls, default_name, **kwargs): +6 | ... +7 | +8 | @classmethod +note: This is an unsafe fix and may change runtime behavior N804 [*] First argument of a class method should be named `cls` --> N804.py:9:20 @@ -30,16 +29,15 @@ N804 [*] First argument of a class method should be named `cls` 10 | ... | help: Rename `self` to `cls` - -ℹ Unsafe fix -6 6 | ... -7 7 | -8 8 | @classmethod -9 |- def badAllowed(self, x, /, other): - 9 |+ def badAllowed(cls, x, /, other): -10 10 | ... -11 11 | -12 12 | @classmethod +6 | ... +7 | +8 | @classmethod + - def badAllowed(self, x, /, other): +9 + def badAllowed(cls, x, /, other): +10 | ... +11 | +12 | @classmethod +note: This is an unsafe fix and may change runtime behavior N804 [*] First argument of a class method should be named `cls` --> N804.py:13:18 @@ -50,16 +48,15 @@ N804 [*] First argument of a class method should be named `cls` 14 | ... | help: Rename `self` to `cls` - -ℹ Unsafe fix -10 10 | ... -11 11 | -12 12 | @classmethod -13 |- def stillBad(self, x, /, other): - 13 |+ def stillBad(cls, x, /, other): -14 14 | ... -15 15 | -16 16 | +10 | ... +11 | +12 | @classmethod + - def stillBad(self, x, /, other): +13 + def stillBad(cls, x, /, other): +14 | ... +15 | +16 | +note: This is an unsafe fix and may change runtime behavior N804 [*] First argument of a class method should be named `cls` --> N804.py:18:20 @@ -70,16 +67,15 @@ N804 [*] First argument of a class method should be named `cls` 19 | pass | help: Rename `self` to `cls` - -ℹ Unsafe fix -15 15 | -16 16 | -17 17 | class MetaClass(ABCMeta): -18 |- def badAllowed(self): - 18 |+ def badAllowed(cls): -19 19 | pass -20 20 | -21 21 | def stillBad(self): +15 | +16 | +17 | class MetaClass(ABCMeta): + - def badAllowed(self): +18 + def badAllowed(cls): +19 | pass +20 | +21 | def stillBad(self): +note: This is an unsafe fix and may change runtime behavior N804 [*] First argument of a class method should be named `cls` --> N804.py:21:18 @@ -91,11 +87,10 @@ N804 [*] First argument of a class method should be named `cls` 22 | pass | help: Rename `self` to `cls` - -ℹ Unsafe fix -18 18 | def badAllowed(self): -19 19 | pass -20 20 | -21 |- def stillBad(self): - 21 |+ def stillBad(cls): -22 22 | pass +18 | def badAllowed(self): +19 | pass +20 | + - def stillBad(self): +21 + def stillBad(cls): +22 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap index 94c5871ea8..f4f8f4e261 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap +++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__ignore_names_N805_N805.py.snap @@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self` 8 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | class Class: -7 |- def badAllowed(this): - 7 |+ def badAllowed(self): -8 8 | pass -9 9 | -10 10 | def stillBad(this): +4 | +5 | +6 | class Class: + - def badAllowed(this): +7 + def badAllowed(self): +8 | pass +9 | +10 | def stillBad(this): +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:10:18 @@ -31,16 +30,15 @@ N805 [*] First argument of a method should be named `self` 11 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -7 7 | def badAllowed(this): -8 8 | pass -9 9 | -10 |- def stillBad(this): - 10 |+ def stillBad(self): -11 11 | pass -12 12 | -13 13 | if False: +7 | def badAllowed(this): +8 | pass +9 | + - def stillBad(this): +10 + def stillBad(self): +11 | pass +12 | +13 | if False: +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:15:24 @@ -52,16 +50,15 @@ N805 [*] First argument of a method should be named `self` 16 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -12 12 | -13 13 | if False: -14 14 | -15 |- def badAllowed(this): - 15 |+ def badAllowed(self): -16 16 | pass -17 17 | -18 18 | def stillBad(this): +12 | +13 | if False: +14 | + - def badAllowed(this): +15 + def badAllowed(self): +16 | pass +17 | +18 | def stillBad(this): +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:18:22 @@ -73,16 +70,15 @@ N805 [*] First argument of a method should be named `self` 19 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -15 15 | def badAllowed(this): -16 16 | pass -17 17 | -18 |- def stillBad(this): - 18 |+ def stillBad(self): -19 19 | pass -20 20 | -21 21 | @pydantic.validator +15 | def badAllowed(this): +16 | pass +17 | + - def stillBad(this): +18 + def stillBad(self): +19 | pass +20 | +21 | @pydantic.validator +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:22:20 @@ -93,16 +89,15 @@ N805 [*] First argument of a method should be named `self` 23 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -19 19 | pass -20 20 | -21 21 | @pydantic.validator -22 |- def badAllowed(cls, my_field: str) -> str: - 22 |+ def badAllowed(self, my_field: str) -> str: -23 23 | pass -24 24 | -25 25 | @pydantic.validator +19 | pass +20 | +21 | @pydantic.validator + - def badAllowed(cls, my_field: str) -> str: +22 + def badAllowed(self, my_field: str) -> str: +23 | pass +24 | +25 | @pydantic.validator +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:26:18 @@ -113,16 +108,15 @@ N805 [*] First argument of a method should be named `self` 27 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -23 23 | pass -24 24 | -25 25 | @pydantic.validator -26 |- def stillBad(cls, my_field: str) -> str: - 26 |+ def stillBad(self, my_field: str) -> str: -27 27 | pass -28 28 | -29 29 | @pydantic.validator("my_field") +23 | pass +24 | +25 | @pydantic.validator + - def stillBad(cls, my_field: str) -> str: +26 + def stillBad(self, my_field: str) -> str: +27 | pass +28 | +29 | @pydantic.validator("my_field") +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:30:20 @@ -133,16 +127,15 @@ N805 [*] First argument of a method should be named `self` 31 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -27 27 | pass -28 28 | -29 29 | @pydantic.validator("my_field") -30 |- def badAllowed(cls, my_field: str) -> str: - 30 |+ def badAllowed(self, my_field: str) -> str: -31 31 | pass -32 32 | -33 33 | @pydantic.validator("my_field") +27 | pass +28 | +29 | @pydantic.validator("my_field") + - def badAllowed(cls, my_field: str) -> str: +30 + def badAllowed(self, my_field: str) -> str: +31 | pass +32 | +33 | @pydantic.validator("my_field") +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:34:18 @@ -153,16 +146,15 @@ N805 [*] First argument of a method should be named `self` 35 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -31 31 | pass -32 32 | -33 33 | @pydantic.validator("my_field") -34 |- def stillBad(cls, my_field: str) -> str: - 34 |+ def stillBad(self, my_field: str) -> str: -35 35 | pass -36 36 | -37 37 | @classmethod +31 | pass +32 | +33 | @pydantic.validator("my_field") + - def stillBad(cls, my_field: str) -> str: +34 + def stillBad(self, my_field: str) -> str: +35 | pass +36 | +37 | @classmethod +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:55:20 diff --git a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap index d7d332471d..b1ff6bb824 100644 --- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap +++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linter__rules__pep8_naming__tests__staticmethod_decorators.snap @@ -10,16 +10,15 @@ N805 [*] First argument of a method should be named `self` 8 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | class Class: -7 |- def bad_method(this): - 7 |+ def bad_method(self): -8 8 | pass -9 9 | -10 10 | if False: +4 | +5 | +6 | class Class: + - def bad_method(this): +7 + def bad_method(self): +8 | pass +9 | +10 | if False: +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:11:30 @@ -30,16 +29,15 @@ N805 [*] First argument of a method should be named `self` 12 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -8 8 | pass -9 9 | -10 10 | if False: -11 |- def extra_bad_method(this): - 11 |+ def extra_bad_method(self): -12 12 | pass -13 13 | -14 14 | def good_method(self): +8 | pass +9 | +10 | if False: + - def extra_bad_method(this): +11 + def extra_bad_method(self): +12 | pass +13 | +14 | def good_method(self): +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:30:15 @@ -50,16 +48,15 @@ N805 [*] First argument of a method should be named `self` 31 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -27 27 | return x -28 28 | -29 29 | @pydantic.validator -30 |- def lower(cls, my_field: str) -> str: - 30 |+ def lower(self, my_field: str) -> str: -31 31 | pass -32 32 | -33 33 | @pydantic.validator("my_field") +27 | return x +28 | +29 | @pydantic.validator + - def lower(cls, my_field: str) -> str: +30 + def lower(self, my_field: str) -> str: +31 | pass +32 | +33 | @pydantic.validator("my_field") +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:34:15 @@ -70,16 +67,15 @@ N805 [*] First argument of a method should be named `self` 35 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -31 31 | pass -32 32 | -33 33 | @pydantic.validator("my_field") -34 |- def lower(cls, my_field: str) -> str: - 34 |+ def lower(self, my_field: str) -> str: -35 35 | pass -36 36 | -37 37 | def __init__(self): +31 | pass +32 | +33 | @pydantic.validator("my_field") + - def lower(cls, my_field: str) -> str: +34 + def lower(self, my_field: str) -> str: +35 | pass +36 | +37 | def __init__(self): +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:63:29 @@ -91,16 +87,15 @@ N805 [*] First argument of a method should be named `self` 64 | pass | help: Rename `this` to `self` - -ℹ Unsafe fix -60 60 | def good_method_pos_only(self, blah, /, something: str): -61 61 | pass -62 62 | -63 |- def bad_method_pos_only(this, blah, /, something: str): - 63 |+ def bad_method_pos_only(self, blah, /, something: str): -64 64 | pass -65 65 | -66 66 | +60 | def good_method_pos_only(self, blah, /, something: str): +61 | pass +62 | + - def bad_method_pos_only(this, blah, /, something: str): +63 + def bad_method_pos_only(self, blah, /, something: str): +64 | pass +65 | +66 | +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:69:13 @@ -112,16 +107,15 @@ N805 [*] First argument of a method should be named `self` 70 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -66 66 | -67 67 | class ModelClass: -68 68 | @hybrid_property -69 |- def bad(cls): - 69 |+ def bad(self): -70 70 | pass -71 71 | -72 72 | @bad.expression +66 | +67 | class ModelClass: +68 | @hybrid_property + - def bad(cls): +69 + def bad(self): +70 | pass +71 | +72 | @bad.expression +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:77:13 @@ -132,16 +126,15 @@ N805 [*] First argument of a method should be named `self` 78 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -74 74 | pass -75 75 | -76 76 | @bad.wtf -77 |- def bad(cls): - 77 |+ def bad(self): -78 78 | pass -79 79 | -80 80 | @hybrid_property +74 | pass +75 | +76 | @bad.wtf + - def bad(cls): +77 + def bad(self): +78 | pass +79 | +80 | @hybrid_property +note: This is an unsafe fix and may change runtime behavior N805 [*] First argument of a method should be named `self` --> N805.py:85:14 @@ -152,16 +145,15 @@ N805 [*] First argument of a method should be named `self` 86 | pass | help: Rename `cls` to `self` - -ℹ Unsafe fix -82 82 | pass -83 83 | -84 84 | @good.expression -85 |- def good(cls): - 85 |+ def good(self): -86 86 | pass -87 87 | -88 88 | @good.wtf +82 | pass +83 | +84 | @good.expression + - def good(cls): +85 + def good(self): +86 | pass +87 | +88 | @good.wtf +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:98:26 @@ -227,20 +219,19 @@ N805 [*] First argument of a method should be named `self` 117 | this | help: Rename `this` to `self` - -ℹ Unsafe fix -112 112 | -113 113 | -114 114 | class RenamingInMethodBodyClass: -115 |- def bad_method(this): -116 |- this = this -117 |- this - 115 |+ def bad_method(self): - 116 |+ self = self - 117 |+ self -118 118 | -119 119 | def bad_method(this): -120 120 | self = this +112 | +113 | +114 | class RenamingInMethodBodyClass: + - def bad_method(this): + - this = this + - this +115 + def bad_method(self): +116 + self = self +117 + self +118 | +119 | def bad_method(this): +120 | self = this +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:119:20 @@ -262,18 +253,17 @@ N805 [*] First argument of a method should be named `self` 125 | hºusehold(1) | help: Rename `household` to `self` - -ℹ Unsafe fix -121 121 | -122 122 | -123 123 | class RenamingWithNFKC: -124 |- def formula(household): -125 |- hºusehold(1) - 124 |+ def formula(self): - 125 |+ self(1) -126 126 | -127 127 | -128 128 | from typing import Protocol +121 | +122 | +123 | class RenamingWithNFKC: + - def formula(household): + - hºusehold(1) +124 + def formula(self): +125 + self(1) +126 | +127 | +128 | from typing import Protocol +note: This is an unsafe fix and may change runtime behavior N805 First argument of a method should be named `self` --> N805.py:141:11 diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap index 60a71ae175..d37d637bbc 100644 --- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap +++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF101_PERF101.py.snap @@ -11,16 +11,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 8 | pass | help: Remove `list()` cast - -ℹ Safe fix -4 4 | foo_dict = {1: 2, 3: 4} -5 5 | foo_int = 123 -6 6 | -7 |-for i in list(foo_tuple): # PERF101 - 7 |+for i in foo_tuple: # PERF101 -8 8 | pass -9 9 | -10 10 | for i in list(foo_list): # PERF101 +4 | foo_dict = {1: 2, 3: 4} +5 | foo_int = 123 +6 | + - for i in list(foo_tuple): # PERF101 +7 + for i in foo_tuple: # PERF101 +8 | pass +9 | +10 | for i in list(foo_list): # PERF101 PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:10:10 @@ -32,16 +30,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 11 | pass | help: Remove `list()` cast - -ℹ Safe fix -7 7 | for i in list(foo_tuple): # PERF101 -8 8 | pass -9 9 | -10 |-for i in list(foo_list): # PERF101 - 10 |+for i in foo_list: # PERF101 -11 11 | pass -12 12 | -13 13 | for i in list(foo_set): # PERF101 +7 | for i in list(foo_tuple): # PERF101 +8 | pass +9 | + - for i in list(foo_list): # PERF101 +10 + for i in foo_list: # PERF101 +11 | pass +12 | +13 | for i in list(foo_set): # PERF101 PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:13:10 @@ -53,16 +49,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 14 | pass | help: Remove `list()` cast - -ℹ Safe fix -10 10 | for i in list(foo_list): # PERF101 -11 11 | pass -12 12 | -13 |-for i in list(foo_set): # PERF101 - 13 |+for i in foo_set: # PERF101 -14 14 | pass -15 15 | -16 16 | for i in list((1, 2, 3)): # PERF101 +10 | for i in list(foo_list): # PERF101 +11 | pass +12 | + - for i in list(foo_set): # PERF101 +13 + for i in foo_set: # PERF101 +14 | pass +15 | +16 | for i in list((1, 2, 3)): # PERF101 PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:16:10 @@ -74,16 +68,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 17 | pass | help: Remove `list()` cast - -ℹ Safe fix -13 13 | for i in list(foo_set): # PERF101 -14 14 | pass -15 15 | -16 |-for i in list((1, 2, 3)): # PERF101 - 16 |+for i in (1, 2, 3): # PERF101 -17 17 | pass -18 18 | -19 19 | for i in list([1, 2, 3]): # PERF101 +13 | for i in list(foo_set): # PERF101 +14 | pass +15 | + - for i in list((1, 2, 3)): # PERF101 +16 + for i in (1, 2, 3): # PERF101 +17 | pass +18 | +19 | for i in list([1, 2, 3]): # PERF101 PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:19:10 @@ -95,16 +87,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 20 | pass | help: Remove `list()` cast - -ℹ Safe fix -16 16 | for i in list((1, 2, 3)): # PERF101 -17 17 | pass -18 18 | -19 |-for i in list([1, 2, 3]): # PERF101 - 19 |+for i in [1, 2, 3]: # PERF101 -20 20 | pass -21 21 | -22 22 | for i in list({1, 2, 3}): # PERF101 +16 | for i in list((1, 2, 3)): # PERF101 +17 | pass +18 | + - for i in list([1, 2, 3]): # PERF101 +19 + for i in [1, 2, 3]: # PERF101 +20 | pass +21 | +22 | for i in list({1, 2, 3}): # PERF101 PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:22:10 @@ -116,16 +106,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 23 | pass | help: Remove `list()` cast - -ℹ Safe fix -19 19 | for i in list([1, 2, 3]): # PERF101 -20 20 | pass -21 21 | -22 |-for i in list({1, 2, 3}): # PERF101 - 22 |+for i in {1, 2, 3}: # PERF101 -23 23 | pass -24 24 | -25 25 | for i in list( +19 | for i in list([1, 2, 3]): # PERF101 +20 | pass +21 | + - for i in list({1, 2, 3}): # PERF101 +22 + for i in {1, 2, 3}: # PERF101 +23 | pass +24 | +25 | for i in list( PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:25:10 @@ -144,23 +132,21 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 32 | pass | help: Remove `list()` cast - -ℹ Safe fix -22 22 | for i in list({1, 2, 3}): # PERF101 -23 23 | pass -24 24 | -25 |-for i in list( -26 |- { - 25 |+for i in { -27 26 | 1, -28 27 | 2, -29 28 | 3, -30 |- } -31 |-): - 29 |+ }: -32 30 | pass -33 31 | -34 32 | for i in list( # Comment +22 | for i in list({1, 2, 3}): # PERF101 +23 | pass +24 | + - for i in list( + - { +25 + for i in { +26 | 1, +27 | 2, +28 | 3, + - } + - ): +29 + }: +30 | pass +31 | +32 | for i in list( # Comment PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:34:10 @@ -175,18 +161,17 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 37 | pass | help: Remove `list()` cast - -ℹ Unsafe fix -31 31 | ): -32 32 | pass -33 33 | -34 |-for i in list( # Comment -35 |- {1, 2, 3} -36 |-): # PERF101 - 34 |+for i in {1, 2, 3}: # PERF101 -37 35 | pass -38 36 | -39 37 | for i in list(foo_dict): # OK +31 | ): +32 | pass +33 | + - for i in list( # Comment + - {1, 2, 3} + - ): # PERF101 +34 + for i in {1, 2, 3}: # PERF101 +35 | pass +36 | +37 | for i in list(foo_dict): # OK +note: This is an unsafe fix and may change runtime behavior PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:57:10 @@ -199,16 +184,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 59 | other_list.append(i + 1) | help: Remove `list()` cast - -ℹ Safe fix -54 54 | for i in list(foo_list): # OK -55 55 | foo_list.append(i + 1) -56 56 | -57 |-for i in list(foo_list): # PERF101 - 57 |+for i in foo_list: # PERF101 -58 58 | # Make sure we match the correct list -59 59 | other_list.append(i + 1) -60 60 | +54 | for i in list(foo_list): # OK +55 | foo_list.append(i + 1) +56 | + - for i in list(foo_list): # PERF101 +57 + for i in foo_list: # PERF101 +58 | # Make sure we match the correct list +59 | other_list.append(i + 1) +60 | PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:69:10 @@ -220,16 +203,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 70 | pass | help: Remove `list()` cast - -ℹ Safe fix -66 66 | -67 67 | x, y, nested_tuple = (1, 2, (3, 4, 5)) -68 68 | -69 |-for i in list(nested_tuple): # PERF101 - 69 |+for i in nested_tuple: # PERF101 -70 70 | pass -71 71 | -72 72 | for i in list(foo_list): # OK +66 | +67 | x, y, nested_tuple = (1, 2, (3, 4, 5)) +68 | + - for i in list(nested_tuple): # PERF101 +69 + for i in nested_tuple: # PERF101 +70 | pass +71 | +72 | for i in list(foo_list): # OK PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:86:10 @@ -241,16 +222,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 87 | pass | help: Remove `list()` cast - -ℹ Safe fix -83 83 | -84 84 | import builtins -85 85 | -86 |-for i in builtins.list(nested_tuple): # PERF101 - 86 |+for i in nested_tuple: # PERF101 -87 87 | pass -88 88 | -89 89 | # https://github.com/astral-sh/ruff/issues/18783 +83 | +84 | import builtins +85 | + - for i in builtins.list(nested_tuple): # PERF101 +86 + for i in nested_tuple: # PERF101 +87 | pass +88 | +89 | # https://github.com/astral-sh/ruff/issues/18783 PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:91:9 @@ -262,16 +241,14 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 92 | print(i) | help: Remove `list()` cast - -ℹ Safe fix -88 88 | -89 89 | # https://github.com/astral-sh/ruff/issues/18783 -90 90 | items = (1, 2, 3) -91 |-for i in(list)(items): - 91 |+for i in items: -92 92 | print(i) -93 93 | -94 94 | # https://github.com/astral-sh/ruff/issues/18784 +88 | +89 | # https://github.com/astral-sh/ruff/issues/18783 +90 | items = (1, 2, 3) + - for i in(list)(items): +91 + for i in items: +92 | print(i) +93 | +94 | # https://github.com/astral-sh/ruff/issues/18784 PERF101 [*] Do not cast an iterable to `list` before iterating over it --> PERF101.py:96:10 @@ -290,17 +267,16 @@ PERF101 [*] Do not cast an iterable to `list` before iterating over it 103 | print(i) | help: Remove `list()` cast - -ℹ Unsafe fix -93 93 | -94 94 | # https://github.com/astral-sh/ruff/issues/18784 -95 95 | items = (1, 2, 3) -96 |-for i in ( # 1 -97 |- list # 2 -98 |- # 3 -99 |-)( # 4 -100 |- items # 5 -101 |- # 6 -102 |-): - 96 |+for i in items: -103 97 | print(i) +93 | +94 | # https://github.com/astral-sh/ruff/issues/18784 +95 | items = (1, 2, 3) + - for i in ( # 1 + - list # 2 + - # 3 + - )( # 4 + - items # 5 + - # 6 + - ): +96 + for i in items: +97 | print(i) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap index e7b8eb93f3..587b67ccd0 100644 --- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap +++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__PERF102_PERF102.py.snap @@ -10,16 +10,15 @@ PERF102 [*] When using only the values of a dict use the `values()` method 6 | print(value) | help: Replace `.items()` with `.values()` - -ℹ Unsafe fix -2 2 | -3 3 | -4 4 | def f(): -5 |- for _, value in some_dict.items(): # PERF102 - 5 |+ for value in some_dict.values(): # PERF102 -6 6 | print(value) -7 7 | -8 8 | +2 | +3 | +4 | def f(): + - for _, value in some_dict.items(): # PERF102 +5 + for value in some_dict.values(): # PERF102 +6 | print(value) +7 | +8 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:10:19 @@ -30,16 +29,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 11 | print(key) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -7 7 | -8 8 | -9 9 | def f(): -10 |- for key, _ in some_dict.items(): # PERF102 - 10 |+ for key in some_dict.keys(): # PERF102 -11 11 | print(key) -12 12 | -13 13 | +7 | +8 | +9 | def f(): + - for key, _ in some_dict.items(): # PERF102 +10 + for key in some_dict.keys(): # PERF102 +11 | print(key) +12 | +13 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:15:30 @@ -50,16 +48,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 16 | print(weird_arg_name) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -12 12 | -13 13 | -14 14 | def f(): -15 |- for weird_arg_name, _ in some_dict.items(): # PERF102 - 15 |+ for weird_arg_name in some_dict.keys(): # PERF102 -16 16 | print(weird_arg_name) -17 17 | -18 18 | +12 | +13 | +14 | def f(): + - for weird_arg_name, _ in some_dict.items(): # PERF102 +15 + for weird_arg_name in some_dict.keys(): # PERF102 +16 | print(weird_arg_name) +17 | +18 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:20:25 @@ -70,16 +67,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 21 | print(name) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def f(): -20 |- for name, (_, _) in some_dict.items(): # PERF102 - 20 |+ for name in some_dict.keys(): # PERF102 -21 21 | print(name) -22 22 | -23 23 | +17 | +18 | +19 | def f(): + - for name, (_, _) in some_dict.items(): # PERF102 +20 + for name in some_dict.keys(): # PERF102 +21 | print(name) +22 | +23 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:30:30 @@ -90,16 +86,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 31 | print(key1) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -27 27 | -28 28 | -29 29 | def f(): -30 |- for (key1, _), (_, _) in some_dict.items(): # PERF102 - 30 |+ for (key1, _) in some_dict.keys(): # PERF102 -31 31 | print(key1) -32 32 | -33 33 | +27 | +28 | +29 | def f(): + - for (key1, _), (_, _) in some_dict.items(): # PERF102 +30 + for (key1, _) in some_dict.keys(): # PERF102 +31 | print(key1) +32 | +33 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the values of a dict use the `values()` method --> PERF102.py:35:36 @@ -110,16 +105,15 @@ PERF102 [*] When using only the values of a dict use the `values()` method 36 | print(value) | help: Replace `.items()` with `.values()` - -ℹ Unsafe fix -32 32 | -33 33 | -34 34 | def f(): -35 |- for (_, (_, _)), (value, _) in some_dict.items(): # PERF102 - 35 |+ for (value, _) in some_dict.values(): # PERF102 -36 36 | print(value) -37 37 | -38 38 | +32 | +33 | +34 | def f(): + - for (_, (_, _)), (value, _) in some_dict.items(): # PERF102 +35 + for (value, _) in some_dict.values(): # PERF102 +36 | print(value) +37 | +38 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:50:32 @@ -130,16 +124,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 51 | print(key2) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -47 47 | -48 48 | -49 49 | def f(): -50 |- for ((_, key2), (_, _)) in some_dict.items(): # PERF102 - 50 |+ for (_, key2) in some_dict.keys(): # PERF102 -51 51 | print(key2) -52 52 | -53 53 | +47 | +48 | +49 | def f(): + - for ((_, key2), (_, _)) in some_dict.items(): # PERF102 +50 + for (_, key2) in some_dict.keys(): # PERF102 +51 | print(key2) +52 | +53 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:85:25 @@ -150,16 +143,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 86 | print(name) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -82 82 | -83 83 | -84 84 | def f(): -85 |- for name, (_, _) in (some_function()).items(): # PERF102 - 85 |+ for name in (some_function()).keys(): # PERF102 -86 86 | print(name) -87 87 | -88 88 | +82 | +83 | +84 | def f(): + - for name, (_, _) in (some_function()).items(): # PERF102 +85 + for name in (some_function()).keys(): # PERF102 +86 | print(name) +87 | +88 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:90:25 @@ -170,16 +162,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 91 | print(name) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -87 87 | -88 88 | -89 89 | def f(): -90 |- for name, (_, _) in (some_function().some_attribute).items(): # PERF102 - 90 |+ for name in (some_function().some_attribute).keys(): # PERF102 -91 91 | print(name) -92 92 | -93 93 | +87 | +88 | +89 | def f(): + - for name, (_, _) in (some_function().some_attribute).items(): # PERF102 +90 + for name in (some_function().some_attribute).keys(): # PERF102 +91 | print(name) +92 | +93 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:95:31 @@ -190,16 +181,15 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 96 | print(name) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -92 92 | -93 93 | -94 94 | def f(): -95 |- for name, unused_value in some_dict.items(): # PERF102 - 95 |+ for name in some_dict.keys(): # PERF102 -96 96 | print(name) -97 97 | -98 98 | +92 | +93 | +94 | def f(): + - for name, unused_value in some_dict.items(): # PERF102 +95 + for name in some_dict.keys(): # PERF102 +96 | print(name) +97 | +98 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the values of a dict use the `values()` method --> PERF102.py:100:31 @@ -210,16 +200,15 @@ PERF102 [*] When using only the values of a dict use the `values()` method 101 | print(value) | help: Replace `.items()` with `.values()` - -ℹ Unsafe fix -97 97 | -98 98 | -99 99 | def f(): -100 |- for unused_name, value in some_dict.items(): # PERF102 - 100 |+ for value in some_dict.values(): # PERF102 -101 101 | print(value) -102 102 | -103 103 | +97 | +98 | +99 | def f(): + - for unused_name, value in some_dict.items(): # PERF102 +100 + for value in some_dict.values(): # PERF102 +101 | print(value) +102 | +103 | +note: This is an unsafe fix and may change runtime behavior PERF102 [*] When using only the keys of a dict use the `keys()` method --> PERF102.py:106:16 @@ -231,11 +220,10 @@ PERF102 [*] When using only the keys of a dict use the `keys()` method 107 | if(C:=name_to_value.get(B.name)):A.run(B.set,C) | help: Replace `.items()` with `.keys()` - -ℹ Unsafe fix -103 103 | -104 104 | # Regression test for: https://github.com/astral-sh/ruff/issues/7097 -105 105 | def _create_context(name_to_value): -106 |- for(B,D)in A.items(): - 106 |+ for B in A.keys(): -107 107 | if(C:=name_to_value.get(B.name)):A.run(B.set,C) +103 | +104 | # Regression test for: https://github.com/astral-sh/ruff/issues/7097 +105 | def _create_context(name_to_value): + - for(B,D)in A.items(): +106 + for B in A.keys(): +107 | if(C:=name_to_value.get(B.name)):A.run(B.set,C) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap index c625975738..3d114bcd3a 100644 --- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap +++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF401_PERF401.py.snap @@ -10,18 +10,17 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -1 1 | def f(): -2 2 | items = [1, 2, 3, 4] -3 |- result = [] -4 |- for i in items: -5 |- if i % 2: -6 |- result.append(i) # PERF401 - 3 |+ result = [i for i in items if i % 2] # PERF401 -7 4 | -8 5 | -9 6 | def f(): +1 | def f(): +2 | items = [1, 2, 3, 4] + - result = [] + - for i in items: + - if i % 2: + - result.append(i) # PERF401 +3 + result = [i for i in items if i % 2] # PERF401 +4 | +5 | +6 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:13:9 @@ -32,18 +31,17 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -8 8 | -9 9 | def f(): -10 10 | items = [1, 2, 3, 4] -11 |- result = [] -12 |- for i in items: -13 |- result.append(i * i) # PERF401 - 11 |+ result = [i * i for i in items] # PERF401 -14 12 | -15 13 | -16 14 | def f(): +8 | +9 | def f(): +10 | items = [1, 2, 3, 4] + - result = [] + - for i in items: + - result.append(i * i) # PERF401 +11 + result = [i * i for i in items] # PERF401 +12 | +13 | +14 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use an async list comprehension to create a transformed list --> PERF401.py:82:13 @@ -54,19 +52,18 @@ PERF401 [*] Use an async list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -76 76 | -77 77 | async def f(): -78 78 | items = [1, 2, 3, 4] -79 |- result = [] -80 |- async for i in items: -81 |- if i % 2: -82 |- result.append(i) # PERF401 - 79 |+ result = [i async for i in items if i % 2] # PERF401 -83 80 | -84 81 | -85 82 | async def f(): +76 | +77 | async def f(): +78 | items = [1, 2, 3, 4] + - result = [] + - async for i in items: + - if i % 2: + - result.append(i) # PERF401 +79 + result = [i async for i in items if i % 2] # PERF401 +80 | +81 | +82 | async def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use an async list comprehension to create a transformed list --> PERF401.py:89:9 @@ -77,18 +74,17 @@ PERF401 [*] Use an async list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -84 84 | -85 85 | async def f(): -86 86 | items = [1, 2, 3, 4] -87 |- result = [] -88 |- async for i in items: -89 |- result.append(i) # PERF401 - 87 |+ result = [i async for i in items] # PERF401 -90 88 | -91 89 | -92 90 | async def f(): +84 | +85 | async def f(): +86 | items = [1, 2, 3, 4] + - result = [] + - async for i in items: + - result.append(i) # PERF401 +87 + result = [i async for i in items] # PERF401 +88 | +89 | +90 | async def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use `list.extend` with an async comprehension to create a transformed list --> PERF401.py:96:9 @@ -99,17 +95,16 @@ PERF401 [*] Use `list.extend` with an async comprehension to create a transforme | ^^^^^^^^^^^^^^^^ | help: Replace for loop with list.extend - -ℹ Unsafe fix -92 92 | async def f(): -93 93 | items = [1, 2, 3, 4] -94 94 | result = [1, 2] -95 |- async for i in items: -96 |- result.append(i) # PERF401 - 95 |+ result.extend([i async for i in items]) # PERF401 -97 96 | -98 97 | -99 98 | def f(): +92 | async def f(): +93 | items = [1, 2, 3, 4] +94 | result = [1, 2] + - async for i in items: + - result.append(i) # PERF401 +95 + result.extend([i async for i in items]) # PERF401 +96 | +97 | +98 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use `list.extend` to create a transformed list --> PERF401.py:102:9 @@ -120,17 +115,16 @@ PERF401 [*] Use `list.extend` to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list.extend - -ℹ Unsafe fix -98 98 | -99 99 | def f(): -100 100 | result, _ = [1, 2, 3, 4], ... -101 |- for i in range(10): -102 |- result.append(i * 2) # PERF401 - 101 |+ result.extend(i * 2 for i in range(10)) # PERF401 -103 102 | -104 103 | -105 104 | def f(): +98 | +99 | def f(): +100 | result, _ = [1, 2, 3, 4], ... + - for i in range(10): + - result.append(i * 2) # PERF401 +101 + result.extend(i * 2 for i in range(10)) # PERF401 +102 | +103 | +104 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use `list.extend` to create a transformed list --> PERF401.py:111:17 @@ -141,22 +135,21 @@ PERF401 [*] Use `list.extend` to create a transformed list | ^^^^^^^^^^^^^^^^ | help: Replace for loop with list.extend - -ℹ Unsafe fix -105 105 | def f(): -106 106 | result = [] -107 107 | if True: -108 |- for i in range(10): # single-line comment 1 should be protected -109 |- # single-line comment 2 should be protected -110 |- if i % 2: # single-line comment 3 should be protected -111 |- result.append(i) # PERF401 - 108 |+ # single-line comment 1 should be protected - 109 |+ # single-line comment 2 should be protected - 110 |+ # single-line comment 3 should be protected - 111 |+ result.extend(i for i in range(10) if i % 2) # PERF401 -112 112 | -113 113 | -114 114 | def f(): +105 | def f(): +106 | result = [] +107 | if True: + - for i in range(10): # single-line comment 1 should be protected + - # single-line comment 2 should be protected + - if i % 2: # single-line comment 3 should be protected + - result.append(i) # PERF401 +108 + # single-line comment 1 should be protected +109 + # single-line comment 2 should be protected +110 + # single-line comment 3 should be protected +111 + result.extend(i for i in range(10) if i % 2) # PERF401 +112 | +113 | +114 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:119:13 @@ -167,24 +160,23 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -112 112 | -113 113 | -114 114 | def f(): -115 |- result = [] # comment after assignment should be protected -116 |- for i in range(10): # single-line comment 1 should be protected -117 |- # single-line comment 2 should be protected -118 |- if i % 2: # single-line comment 3 should be protected -119 |- result.append(i) # PERF401 - 115 |+ # comment after assignment should be protected - 116 |+ # single-line comment 1 should be protected - 117 |+ # single-line comment 2 should be protected - 118 |+ # single-line comment 3 should be protected - 119 |+ result = [i for i in range(10) if i % 2] # PERF401 -120 120 | -121 121 | -122 122 | def f(): +112 | +113 | +114 | def f(): + - result = [] # comment after assignment should be protected + - for i in range(10): # single-line comment 1 should be protected + - # single-line comment 2 should be protected + - if i % 2: # single-line comment 3 should be protected + - result.append(i) # PERF401 +115 + # comment after assignment should be protected +116 + # single-line comment 1 should be protected +117 + # single-line comment 2 should be protected +118 + # single-line comment 3 should be protected +119 + result = [i for i in range(10) if i % 2] # PERF401 +120 | +121 | +122 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:135:13 @@ -195,18 +187,17 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -130 130 | # PERF401 -131 131 | # make sure the fix does not panic if there is no comments -132 132 | if param: -133 |- new_layers = [] -134 |- for value in param: -135 |- new_layers.append(value * 3) - 133 |+ new_layers = [value * 3 for value in param] -136 134 | -137 135 | -138 136 | def f(): +130 | # PERF401 +131 | # make sure the fix does not panic if there is no comments +132 | if param: + - new_layers = [] + - for value in param: + - new_layers.append(value * 3) +133 + new_layers = [value * 3 for value in param] +134 | +135 | +136 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:142:9 @@ -217,19 +208,18 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -136 136 | -137 137 | -138 138 | def f(): -139 |- result = [] -140 139 | var = 1 -141 |- for _ in range(10): -142 |- result.append(var + 1) # PERF401 - 140 |+ result = [var + 1 for _ in range(10)] # PERF401 -143 141 | -144 142 | -145 143 | def f(): +136 | +137 | +138 | def f(): + - result = [] +139 | var = 1 + - for _ in range(10): + - result.append(var + 1) # PERF401 +140 + result = [var + 1 for _ in range(10)] # PERF401 +141 | +142 | +143 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:149:9 @@ -240,19 +230,18 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -144 144 | -145 145 | def f(): -146 146 | # make sure that `tmp` is not deleted -147 |- tmp = 1; result = [] # comment should be protected -148 |- for i in range(10): -149 |- result.append(i + 1) # PERF401 - 147 |+ tmp = 1 # comment should be protected - 148 |+ result = [i + 1 for i in range(10)] # PERF401 -150 149 | -151 150 | -152 151 | def f(): +144 | +145 | def f(): +146 | # make sure that `tmp` is not deleted + - tmp = 1; result = [] # comment should be protected + - for i in range(10): + - result.append(i + 1) # PERF401 +147 + tmp = 1 # comment should be protected +148 + result = [i + 1 for i in range(10)] # PERF401 +149 | +150 | +151 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:156:9 @@ -263,19 +252,18 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -151 151 | -152 152 | def f(): -153 153 | # make sure that `tmp` is not deleted -154 |- result = []; tmp = 1 # comment should be protected -155 |- for i in range(10): -156 |- result.append(i + 1) # PERF401 - 154 |+ tmp = 1 # comment should be protected - 155 |+ result = [i + 1 for i in range(10)] # PERF401 -157 156 | -158 157 | -159 158 | def f(): +151 | +152 | def f(): +153 | # make sure that `tmp` is not deleted + - result = []; tmp = 1 # comment should be protected + - for i in range(10): + - result.append(i + 1) # PERF401 +154 + tmp = 1 # comment should be protected +155 + result = [i + 1 for i in range(10)] # PERF401 +156 | +157 | +158 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:162:9 @@ -286,19 +274,18 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -157 157 | -158 158 | -159 159 | def f(): -160 |- result = [] # comment should be protected -161 |- for i in range(10): -162 |- result.append(i * 2) # PERF401 - 160 |+ # comment should be protected - 161 |+ result = [i * 2 for i in range(10)] # PERF401 -163 162 | -164 163 | -165 164 | def f(): +157 | +158 | +159 | def f(): + - result = [] # comment should be protected + - for i in range(10): + - result.append(i * 2) # PERF401 +160 + # comment should be protected +161 + result = [i * 2 for i in range(10)] # PERF401 +162 | +163 | +164 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use `list.extend` to create a transformed list --> PERF401.py:169:9 @@ -309,17 +296,16 @@ PERF401 [*] Use `list.extend` to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list.extend - -ℹ Unsafe fix -165 165 | def f(): -166 166 | result = [] -167 167 | result.append(1) -168 |- for i in range(10): -169 |- result.append(i * 2) # PERF401 - 168 |+ result.extend(i * 2 for i in range(10)) # PERF401 -170 169 | -171 170 | -172 171 | def f(): +165 | def f(): +166 | result = [] +167 | result.append(1) + - for i in range(10): + - result.append(i * 2) # PERF401 +168 + result.extend(i * 2 for i in range(10)) # PERF401 +169 | +170 | +171 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:189:9 @@ -332,18 +318,17 @@ PERF401 [*] Use a list comprehension to create a transformed list 191 | print(val) | help: Replace for loop with list comprehension - -ℹ Unsafe fix -184 184 | -185 185 | -186 186 | def f(): -187 |- result = [] -188 |- for val in range(5): -189 |- result.append(val * 2) # PERF401 - 187 |+ result = [val * 2 for val in range(5)] # PERF401 -190 188 | val = 1 -191 189 | print(val) -192 190 | +184 | +185 | +186 | def f(): + - result = [] + - for val in range(5): + - result.append(val * 2) # PERF401 +187 + result = [val * 2 for val in range(5)] # PERF401 +188 | val = 1 +189 | print(val) +190 | +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:198:9 @@ -354,18 +339,17 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -193 193 | -194 194 | def f(): -195 195 | i = [1, 2, 3] -196 |- result = [] -197 |- for i in i: -198 |- result.append(i + 1) # PERF401 - 196 |+ result = [i + 1 for i in i] # PERF401 -199 197 | -200 198 | -201 199 | def f(): +193 | +194 | def f(): +195 | i = [1, 2, 3] + - result = [] + - for i in i: + - result.append(i + 1) # PERF401 +196 + result = [i + 1 for i in i] # PERF401 +197 | +198 | +199 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:210:13 @@ -382,37 +366,36 @@ PERF401 [*] Use a list comprehension to create a transformed list | |_____________^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -199 199 | -200 200 | -201 201 | def f(): -202 |- result = [] -203 |- for i in range( # Comment 1 should not be duplicated - 202 |+ # Comment 3 - 203 |+ # Comment 4 - 204 |+ result = [( - 205 |+ i + 1, - 206 |+ # Comment 5 - 207 |+ 2, - 208 |+ ) for i in range( # Comment 1 should not be duplicated -204 209 | ( -205 210 | 2 # Comment 2 -206 211 | + 1 -207 212 | ) -208 |- ): # Comment 3 -209 |- if i % 2: # Comment 4 -210 |- result.append( -211 |- ( -212 |- i + 1, -213 |- # Comment 5 -214 |- 2, -215 |- ) -216 |- ) # PERF401 - 213 |+ ) if i % 2] # PERF401 -217 214 | -218 215 | -219 216 | def f(): +199 | +200 | +201 | def f(): + - result = [] + - for i in range( # Comment 1 should not be duplicated +202 + # Comment 3 +203 + # Comment 4 +204 + result = [( +205 + i + 1, +206 + # Comment 5 +207 + 2, +208 + ) for i in range( # Comment 1 should not be duplicated +209 | ( +210 | 2 # Comment 2 +211 | + 1 +212 | ) + - ): # Comment 3 + - if i % 2: # Comment 4 + - result.append( + - ( + - i + 1, + - # Comment 5 + - 2, + - ) + - ) # PERF401 +213 + ) if i % 2] # PERF401 +214 | +215 | +216 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:222:9 @@ -423,18 +406,17 @@ PERF401 [*] Use a list comprehension to create a transformed list | ^^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with list comprehension - -ℹ Unsafe fix -217 217 | -218 218 | -219 219 | def f(): -220 |- result: list[int] = [] -221 |- for i in range(10): -222 |- result.append(i * 2) # PERF401 - 220 |+ result: list[int] = [i * 2 for i in range(10)] # PERF401 -223 221 | -224 222 | -225 223 | def f(): +217 | +218 | +219 | def f(): + - result: list[int] = [] + - for i in range(10): + - result.append(i * 2) # PERF401 +220 + result: list[int] = [i * 2 for i in range(10)] # PERF401 +221 | +222 | +223 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:229:9 @@ -446,18 +428,17 @@ PERF401 [*] Use a list comprehension to create a transformed list 230 | return result | help: Replace for loop with list comprehension - -ℹ Unsafe fix -224 224 | -225 225 | def f(): -226 226 | a, b = [1, 2, 3], [4, 5, 6] -227 |- result = [] -228 |- for i in a, b: -229 |- result.append(i[0] + i[1]) # PERF401 - 227 |+ result = [i[0] + i[1] for i in (a, b)] # PERF401 -230 228 | return result -231 229 | -232 230 | +224 | +225 | def f(): +226 | a, b = [1, 2, 3], [4, 5, 6] + - result = [] + - for i in a, b: + - result.append(i[0] + i[1]) # PERF401 +227 + result = [i[0] + i[1] for i in (a, b)] # PERF401 +228 | return result +229 | +230 | +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:239:9 @@ -470,20 +451,19 @@ PERF401 [*] Use a list comprehension to create a transformed list 241 | def f(): | help: Replace for loop with list comprehension - -ℹ Unsafe fix -232 232 | -233 233 | def f(): -234 234 | values = [1, 2, 3] -235 |- result = [] -236 235 | for a in values: -237 236 | print(a) -238 |- for a in values: -239 |- result.append(a + 1) # PERF401 - 237 |+ result = [a + 1 for a in values] # PERF401 -240 238 | -241 239 | def f(): -242 240 | values = [1, 2, 3] +232 | +233 | def f(): +234 | values = [1, 2, 3] + - result = [] +235 | for a in values: +236 | print(a) + - for a in values: + - result.append(a + 1) # PERF401 +237 + result = [a + 1 for a in values] # PERF401 +238 | +239 | def f(): +240 | values = [1, 2, 3] +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use `list.extend` to create a transformed list --> PERF401.py:245:13 @@ -495,17 +475,16 @@ PERF401 [*] Use `list.extend` to create a transformed list 246 | result = [] | help: Replace for loop with list.extend - -ℹ Unsafe fix -241 241 | def f(): -242 242 | values = [1, 2, 3] -243 243 | def g(): -244 |- for a in values: -245 |- result.append(a + 1) # PERF401 - 244 |+ result.extend(a + 1 for a in values) # PERF401 -246 245 | result = [] -247 246 | -248 247 | def f(): +241 | def f(): +242 | values = [1, 2, 3] +243 | def g(): + - for a in values: + - result.append(a + 1) # PERF401 +244 + result.extend(a + 1 for a in values) # PERF401 +245 | result = [] +246 | +247 | def f(): +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:262:13 @@ -518,20 +497,19 @@ PERF401 [*] Use a list comprehension to create a transformed list 264 | def f(): | help: Replace for loop with list comprehension - -ℹ Unsafe fix -255 255 | # The fix here must parenthesize the walrus operator -256 256 | # https://github.com/astral-sh/ruff/issues/15047 -257 257 | def f(): -258 |- items = [] -259 258 | -260 |- for i in range(5): -261 |- if j := i: -262 |- items.append(j) - 259 |+ items = [j for i in range(5) if (j := i)] -263 260 | -264 261 | def f(): -265 262 | values = [1, 2, 3] +255 | # The fix here must parenthesize the walrus operator +256 | # https://github.com/astral-sh/ruff/issues/15047 +257 | def f(): + - items = [] +258 | + - for i in range(5): + - if j := i: + - items.append(j) +259 + items = [j for i in range(5) if (j := i)] +260 | +261 | def f(): +262 | values = [1, 2, 3] +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:268:9 @@ -544,19 +522,18 @@ PERF401 [*] Use a list comprehension to create a transformed list 270 | def f(): | help: Replace for loop with list comprehension - -ℹ Unsafe fix -263 263 | -264 264 | def f(): -265 265 | values = [1, 2, 3] -266 |- result = list() # this should be replaced with a comprehension -267 |- for i in values: -268 |- result.append(i + 1) # PERF401 - 266 |+ # this should be replaced with a comprehension - 267 |+ result = [i + 1 for i in values] # PERF401 -269 268 | -270 269 | def f(): -271 270 | src = [1] +263 | +264 | def f(): +265 | values = [1, 2, 3] + - result = list() # this should be replaced with a comprehension + - for i in values: + - result.append(i + 1) # PERF401 +266 + # this should be replaced with a comprehension +267 + result = [i + 1 for i in values] # PERF401 +268 | +269 | def f(): +270 | src = [1] +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:276:13 @@ -569,20 +546,19 @@ PERF401 [*] Use a list comprehension to create a transformed list 278 | for i in src: | help: Replace for loop with list comprehension - -ℹ Unsafe fix -269 269 | -270 270 | def f(): -271 271 | src = [1] -272 |- dst = [] -273 272 | -274 |- for i in src: -275 |- if True if True else False: -276 |- dst.append(i) - 273 |+ dst = [i for i in src if (True if True else False)] -277 274 | -278 275 | for i in src: -279 276 | if lambda: 0: +269 | +270 | def f(): +271 | src = [1] + - dst = [] +272 | + - for i in src: + - if True if True else False: + - dst.append(i) +273 + dst = [i for i in src if (True if True else False)] +274 | +275 | for i in src: +276 | if lambda: 0: +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use `list.extend` to create a transformed list --> PERF401.py:280:13 @@ -595,18 +571,17 @@ PERF401 [*] Use `list.extend` to create a transformed list 282 | def f(): | help: Replace for loop with list.extend - -ℹ Unsafe fix -275 275 | if True if True else False: -276 276 | dst.append(i) -277 277 | -278 |- for i in src: -279 |- if lambda: 0: -280 |- dst.append(i) - 278 |+ dst.extend(i for i in src if (lambda: 0)) -281 279 | -282 280 | def f(): -283 281 | i = "xyz" +275 | if True if True else False: +276 | dst.append(i) +277 | + - for i in src: + - if lambda: 0: + - dst.append(i) +278 + dst.extend(i for i in src if (lambda: 0)) +279 | +280 | def f(): +281 | i = "xyz" +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:286:9 @@ -619,18 +594,17 @@ PERF401 [*] Use a list comprehension to create a transformed list 288 | def f(): | help: Replace for loop with list comprehension - -ℹ Unsafe fix -281 281 | -282 282 | def f(): -283 283 | i = "xyz" -284 |- result = [] -285 |- for i in range(3): -286 |- result.append(x for x in [i]) - 284 |+ result = [(x for x in [i]) for i in range(3)] -287 285 | -288 286 | def f(): -289 287 | i = "xyz" +281 | +282 | def f(): +283 | i = "xyz" + - result = [] + - for i in range(3): + - result.append(x for x in [i]) +284 + result = [(x for x in [i]) for i in range(3)] +285 | +286 | def f(): +287 | i = "xyz" +note: This is an unsafe fix and may change runtime behavior PERF401 [*] Use a list comprehension to create a transformed list --> PERF401.py:292:9 @@ -643,15 +617,14 @@ PERF401 [*] Use a list comprehension to create a transformed list 294 | G_INDEX = None | help: Replace for loop with list comprehension - -ℹ Unsafe fix -287 287 | -288 288 | def f(): -289 289 | i = "xyz" -290 |- result = [] -291 |- for i in range(3): -292 |- result.append((x for x in [i])) - 290 |+ result = [(x for x in [i]) for i in range(3)] -293 291 | -294 292 | G_INDEX = None -295 293 | def f(): +287 | +288 | def f(): +289 | i = "xyz" + - result = [] + - for i in range(3): + - result.append((x for x in [i])) +290 + result = [(x for x in [i]) for i in range(3)] +291 | +292 | G_INDEX = None +293 | def f(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap index c4e3cf3033..dbd210aae3 100644 --- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap +++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linter__rules__perflint__tests__preview__PERF403_PERF403.py.snap @@ -10,17 +10,16 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -1 1 | def foo(): -2 2 | fruit = ["apple", "pear", "orange"] -3 |- result = {} -4 |- for idx, name in enumerate(fruit): -5 |- result[idx] = name # PERF403 - 3 |+ result = {idx: name for idx, name in enumerate(fruit)} # PERF403 -6 4 | -7 5 | -8 6 | def foo(): +1 | def foo(): +2 | fruit = ["apple", "pear", "orange"] + - result = {} + - for idx, name in enumerate(fruit): + - result[idx] = name # PERF403 +3 + result = {idx: name for idx, name in enumerate(fruit)} # PERF403 +4 | +5 | +6 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:13:13 @@ -31,19 +30,18 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -7 7 | -8 8 | def foo(): -9 9 | fruit = ["apple", "pear", "orange"] -10 |- result = {} -11 |- for idx, name in enumerate(fruit): -12 |- if idx % 2: -13 |- result[idx] = name # PERF403 - 10 |+ result = {idx: name for idx, name in enumerate(fruit) if idx % 2} # PERF403 -14 11 | -15 12 | -16 13 | def foo(): +7 | +8 | def foo(): +9 | fruit = ["apple", "pear", "orange"] + - result = {} + - for idx, name in enumerate(fruit): + - if idx % 2: + - result[idx] = name # PERF403 +10 + result = {idx: name for idx, name in enumerate(fruit) if idx % 2} # PERF403 +11 | +12 | +13 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:33:13 @@ -54,20 +52,19 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -26 26 | -27 27 | -28 28 | def foo(): -29 |- result = {} -30 29 | fruit = ["apple", "pear", "orange"] -31 |- for idx, name in enumerate(fruit): -32 |- if idx % 2: -33 |- result[idx] = name # PERF403 - 30 |+ result = {idx: name for idx, name in enumerate(fruit) if idx % 2} # PERF403 -34 31 | -35 32 | -36 33 | def foo(): +26 | +27 | +28 | def foo(): + - result = {} +29 | fruit = ["apple", "pear", "orange"] + - for idx, name in enumerate(fruit): + - if idx % 2: + - result[idx] = name # PERF403 +30 + result = {idx: name for idx, name in enumerate(fruit) if idx % 2} # PERF403 +31 | +32 | +33 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use `dict.update` instead of a for-loop --> PERF403.py:63:13 @@ -78,18 +75,17 @@ PERF403 [*] Use `dict.update` instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with `dict.update` - -ℹ Unsafe fix -58 58 | def foo(): -59 59 | result = {1: "banana"} -60 60 | fruit = ["apple", "pear", "orange"] -61 |- for idx, name in enumerate(fruit): -62 |- if idx % 2: -63 |- result[idx] = name # PERF403 - 61 |+ result.update({idx: name for idx, name in enumerate(fruit) if idx % 2}) # PERF403 -64 62 | -65 63 | -66 64 | def foo(): +58 | def foo(): +59 | result = {1: "banana"} +60 | fruit = ["apple", "pear", "orange"] + - for idx, name in enumerate(fruit): + - if idx % 2: + - result[idx] = name # PERF403 +61 + result.update({idx: name for idx, name in enumerate(fruit) if idx % 2}) # PERF403 +62 | +63 | +64 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:78:9 @@ -100,18 +96,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -73 73 | -74 74 | def foo(): -75 75 | fruit = ["apple", "pear", "orange"] -76 |- result = {} -77 |- for name in fruit: -78 |- result[name] = name # PERF403 - 76 |+ result = {name: name for name in fruit} # PERF403 -79 77 | -80 78 | -81 79 | def foo(): +73 | +74 | def foo(): +75 | fruit = ["apple", "pear", "orange"] + - result = {} + - for name in fruit: + - result[name] = name # PERF403 +76 + result = {name: name for name in fruit} # PERF403 +77 | +78 | +79 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:85:9 @@ -122,18 +117,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -80 80 | -81 81 | def foo(): -82 82 | fruit = ["apple", "pear", "orange"] -83 |- result = {} -84 |- for idx, name in enumerate(fruit): -85 |- result[name] = idx # PERF403 - 83 |+ result = {name: idx for idx, name in enumerate(fruit)} # PERF403 -86 84 | -87 85 | -88 86 | def foo(): +80 | +81 | def foo(): +82 | fruit = ["apple", "pear", "orange"] + - result = {} + - for idx, name in enumerate(fruit): + - result[name] = idx # PERF403 +83 + result = {name: idx for idx, name in enumerate(fruit)} # PERF403 +84 | +85 | +86 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:94:9 @@ -144,18 +138,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -89 89 | from builtins import dict as SneakyDict -90 90 | -91 91 | fruit = ["apple", "pear", "orange"] -92 |- result = SneakyDict() -93 |- for idx, name in enumerate(fruit): -94 |- result[name] = idx # PERF403 - 92 |+ result = {name: idx for idx, name in enumerate(fruit)} # PERF403 -95 93 | -96 94 | -97 95 | def foo(): +89 | from builtins import dict as SneakyDict +90 | +91 | fruit = ["apple", "pear", "orange"] + - result = SneakyDict() + - for idx, name in enumerate(fruit): + - result[name] = idx # PERF403 +92 + result = {name: idx for idx, name in enumerate(fruit)} # PERF403 +93 | +94 | +95 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:106:9 @@ -168,29 +161,28 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | |_______________^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -96 96 | -97 97 | def foo(): -98 98 | fruit = ["apple", "pear", "orange"] -99 |- result: dict[str, int] = { -100 |- # comment 1 -101 |- } -102 |- for idx, name in enumerate( - 99 |+ # comment 1 - 100 |+ # comment 3 - 101 |+ # comment 4 - 102 |+ result: dict[str, int] = {name: idx for idx, name in enumerate( -103 103 | fruit # comment 2 -104 |- ): -105 |- # comment 3 -106 |- result[ -107 |- name # comment 4 -108 |- ] = idx # PERF403 - 104 |+ )} # PERF403 -109 105 | -110 106 | -111 107 | def foo(): +96 | +97 | def foo(): +98 | fruit = ["apple", "pear", "orange"] + - result: dict[str, int] = { + - # comment 1 + - } + - for idx, name in enumerate( +99 + # comment 1 +100 + # comment 3 +101 + # comment 4 +102 + result: dict[str, int] = {name: idx for idx, name in enumerate( +103 | fruit # comment 2 + - ): + - # comment 3 + - result[ + - name # comment 4 + - ] = idx # PERF403 +104 + )} # PERF403 +105 | +106 | +107 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:115:9 @@ -201,19 +193,18 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -110 110 | -111 111 | def foo(): -112 112 | fruit = ["apple", "pear", "orange"] -113 |- a = 1; result = {}; b = 2 -114 |- for idx, name in enumerate(fruit): -115 |- result[name] = idx # PERF403 - 113 |+ a = 1; b = 2 - 114 |+ result = {name: idx for idx, name in enumerate(fruit)} # PERF403 -116 115 | -117 116 | -118 117 | def foo(): +110 | +111 | def foo(): +112 | fruit = ["apple", "pear", "orange"] + - a = 1; result = {}; b = 2 + - for idx, name in enumerate(fruit): + - result[name] = idx # PERF403 +113 + a = 1; b = 2 +114 + result = {name: idx for idx, name in enumerate(fruit)} # PERF403 +115 | +116 | +117 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use `dict.update` instead of a for-loop --> PERF403.py:122:9 @@ -224,17 +215,16 @@ PERF403 [*] Use `dict.update` instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with `dict.update` - -ℹ Unsafe fix -118 118 | def foo(): -119 119 | fruit = ["apple", "pear", "orange"] -120 120 | result = {"kiwi": 3} -121 |- for idx, name in enumerate(fruit): -122 |- result[name] = idx # PERF403 - 121 |+ result.update({name: idx for idx, name in enumerate(fruit)}) # PERF403 -123 122 | -124 123 | -125 124 | def foo(): +118 | def foo(): +119 | fruit = ["apple", "pear", "orange"] +120 | result = {"kiwi": 3} + - for idx, name in enumerate(fruit): + - result[name] = idx # PERF403 +121 + result.update({name: idx for idx, name in enumerate(fruit)}) # PERF403 +122 | +123 | +124 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use `dict.update` instead of a for-loop --> PERF403.py:129:9 @@ -245,17 +235,16 @@ PERF403 [*] Use `dict.update` instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with `dict.update` - -ℹ Unsafe fix -125 125 | def foo(): -126 126 | fruit = ["apple", "pear", "orange"] -127 127 | (_, result) = (None, {"kiwi": 3}) -128 |- for idx, name in enumerate(fruit): -129 |- result[name] = idx # PERF403 - 128 |+ result.update({name: idx for idx, name in enumerate(fruit)}) # PERF403 -130 129 | -131 130 | -132 131 | def foo(): +125 | def foo(): +126 | fruit = ["apple", "pear", "orange"] +127 | (_, result) = (None, {"kiwi": 3}) + - for idx, name in enumerate(fruit): + - result[name] = idx # PERF403 +128 + result.update({name: idx for idx, name in enumerate(fruit)}) # PERF403 +129 | +130 | +131 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use `dict.update` instead of a for-loop --> PERF403.py:137:9 @@ -266,17 +255,16 @@ PERF403 [*] Use `dict.update` instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with `dict.update` - -ℹ Unsafe fix -133 133 | fruit = ["apple", "pear", "orange"] -134 134 | result = {} -135 135 | print(len(result)) -136 |- for idx, name in enumerate(fruit): -137 |- result[name] = idx # PERF403 - 136 |+ result.update({name: idx for idx, name in enumerate(fruit)}) # PERF403 -138 137 | -139 138 | -140 139 | def foo(): +133 | fruit = ["apple", "pear", "orange"] +134 | result = {} +135 | print(len(result)) + - for idx, name in enumerate(fruit): + - result[name] = idx # PERF403 +136 + result.update({name: idx for idx, name in enumerate(fruit)}) # PERF403 +137 | +138 | +139 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:145:13 @@ -287,19 +275,18 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -139 139 | -140 140 | def foo(): -141 141 | fruit = ["apple", "pear", "orange"] -142 |- result = {} -143 |- for idx, name in enumerate(fruit): -144 |- if last_idx := idx % 3: -145 |- result[name] = idx # PERF403 - 142 |+ result = {name: idx for idx, name in enumerate(fruit) if (last_idx := idx % 3)} # PERF403 -146 143 | -147 144 | -148 145 | def foo(): +139 | +140 | def foo(): +141 | fruit = ["apple", "pear", "orange"] + - result = {} + - for idx, name in enumerate(fruit): + - if last_idx := idx % 3: + - result[name] = idx # PERF403 +142 + result = {name: idx for idx, name in enumerate(fruit) if (last_idx := idx % 3)} # PERF403 +143 | +144 | +145 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:153:9 @@ -310,18 +297,17 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^^^^^^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -148 148 | def foo(): -149 149 | fruit = ["apple", "pear", "orange"] -150 150 | indices = [0, 1, 2] -151 |- result = {} -152 |- for idx, name in indices, fruit: -153 |- result[name] = idx # PERF403 - 151 |+ result = {name: idx for idx, name in (indices, fruit)} # PERF403 -154 152 | -155 153 | -156 154 | def foo(): +148 | def foo(): +149 | fruit = ["apple", "pear", "orange"] +150 | indices = [0, 1, 2] + - result = {} + - for idx, name in indices, fruit: + - result[name] = idx # PERF403 +151 + result = {name: idx for idx, name in (indices, fruit)} # PERF403 +152 | +153 | +154 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:162:13 @@ -334,20 +320,19 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop 164 | for k, v in src: | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -155 155 | -156 156 | def foo(): -157 157 | src = (("x", 1),) -158 |- dst = {} -159 158 | -160 |- for k, v in src: -161 |- if True if True else False: -162 |- dst[k] = v - 159 |+ dst = {k: v for k, v in src if (True if True else False)} -163 160 | -164 161 | for k, v in src: -165 162 | if lambda: 0: +155 | +156 | def foo(): +157 | src = (("x", 1),) + - dst = {} +158 | + - for k, v in src: + - if True if True else False: + - dst[k] = v +159 + dst = {k: v for k, v in src if (True if True else False)} +160 | +161 | for k, v in src: +162 | if lambda: 0: +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use `dict.update` instead of a for-loop --> PERF403.py:166:13 @@ -360,18 +345,17 @@ PERF403 [*] Use `dict.update` instead of a for-loop 168 | # https://github.com/astral-sh/ruff/issues/18859 | help: Replace for loop with `dict.update` - -ℹ Unsafe fix -161 161 | if True if True else False: -162 162 | dst[k] = v -163 163 | -164 |- for k, v in src: -165 |- if lambda: 0: -166 |- dst[k] = v - 164 |+ dst.update({k: v for k, v in src if (lambda: 0)}) -167 165 | -168 166 | # https://github.com/astral-sh/ruff/issues/18859 -169 167 | def foo(): +161 | if True if True else False: +162 | dst[k] = v +163 | + - for k, v in src: + - if lambda: 0: + - dst[k] = v +164 + dst.update({k: v for k, v in src if (lambda: 0)}) +165 | +166 | # https://github.com/astral-sh/ruff/issues/18859 +167 | def foo(): +note: This is an unsafe fix and may change runtime behavior PERF403 [*] Use a dictionary comprehension instead of a for-loop --> PERF403.py:172:9 @@ -382,15 +366,14 @@ PERF403 [*] Use a dictionary comprehension instead of a for-loop | ^^^^^^^ | help: Replace for loop with dict comprehension - -ℹ Unsafe fix -167 167 | -168 168 | # https://github.com/astral-sh/ruff/issues/18859 -169 169 | def foo(): -170 |- v = {} -171 |- for o,(x,)in(): -172 |- v[x,]=o - 170 |+ v = {x: o for o,(x,) in ()} -173 171 | -174 172 | -175 173 | # https://github.com/astral-sh/ruff/issues/19005 +167 | +168 | # https://github.com/astral-sh/ruff/issues/18859 +169 | def foo(): + - v = {} + - for o,(x,)in(): + - v[x,]=o +170 + v = {x: o for o,(x,) in ()} +171 | +172 | +173 | # https://github.com/astral-sh/ruff/issues/19005 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap index c85c3b4a81..7f3b7fa1c9 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E201_E20.py.snap @@ -11,14 +11,12 @@ E201 [*] Whitespace after '(' 4 | spam(ham[ 1], {eggs: 2}) | help: Remove whitespace before '(' - -ℹ Safe fix -1 1 | #: E201:1:6 -2 |-spam( ham[1], {eggs: 2}) - 2 |+spam(ham[1], {eggs: 2}) -3 3 | #: E201:1:10 -4 4 | spam(ham[ 1], {eggs: 2}) -5 5 | #: E201:1:15 +1 | #: E201:1:6 + - spam( ham[1], {eggs: 2}) +2 + spam(ham[1], {eggs: 2}) +3 | #: E201:1:10 +4 | spam(ham[ 1], {eggs: 2}) +5 | #: E201:1:15 E201 [*] Whitespace after '[' --> E20.py:4:10 @@ -31,16 +29,14 @@ E201 [*] Whitespace after '[' 6 | spam(ham[1], { eggs: 2}) | help: Remove whitespace before '[' - -ℹ Safe fix -1 1 | #: E201:1:6 -2 2 | spam( ham[1], {eggs: 2}) -3 3 | #: E201:1:10 -4 |-spam(ham[ 1], {eggs: 2}) - 4 |+spam(ham[1], {eggs: 2}) -5 5 | #: E201:1:15 -6 6 | spam(ham[1], { eggs: 2}) -7 7 | #: E201:1:6 +1 | #: E201:1:6 +2 | spam( ham[1], {eggs: 2}) +3 | #: E201:1:10 + - spam(ham[ 1], {eggs: 2}) +4 + spam(ham[1], {eggs: 2}) +5 | #: E201:1:15 +6 | spam(ham[1], { eggs: 2}) +7 | #: E201:1:6 E201 [*] Whitespace after '{' --> E20.py:6:15 @@ -53,16 +49,14 @@ E201 [*] Whitespace after '{' 8 | spam( ham[1], {eggs: 2}) | help: Remove whitespace before '{' - -ℹ Safe fix -3 3 | #: E201:1:10 -4 4 | spam(ham[ 1], {eggs: 2}) -5 5 | #: E201:1:15 -6 |-spam(ham[1], { eggs: 2}) - 6 |+spam(ham[1], {eggs: 2}) -7 7 | #: E201:1:6 -8 8 | spam( ham[1], {eggs: 2}) -9 9 | #: E201:1:10 +3 | #: E201:1:10 +4 | spam(ham[ 1], {eggs: 2}) +5 | #: E201:1:15 + - spam(ham[1], { eggs: 2}) +6 + spam(ham[1], {eggs: 2}) +7 | #: E201:1:6 +8 | spam( ham[1], {eggs: 2}) +9 | #: E201:1:10 E201 [*] Whitespace after '(' --> E20.py:8:6 @@ -75,16 +69,14 @@ E201 [*] Whitespace after '(' 10 | spam(ham[ 1], {eggs: 2}) | help: Remove whitespace before '(' - -ℹ Safe fix -5 5 | #: E201:1:15 -6 6 | spam(ham[1], { eggs: 2}) -7 7 | #: E201:1:6 -8 |-spam( ham[1], {eggs: 2}) - 8 |+spam(ham[1], {eggs: 2}) -9 9 | #: E201:1:10 -10 10 | spam(ham[ 1], {eggs: 2}) -11 11 | #: E201:1:15 +5 | #: E201:1:15 +6 | spam(ham[1], { eggs: 2}) +7 | #: E201:1:6 + - spam( ham[1], {eggs: 2}) +8 + spam(ham[1], {eggs: 2}) +9 | #: E201:1:10 +10 | spam(ham[ 1], {eggs: 2}) +11 | #: E201:1:15 E201 [*] Whitespace after '[' --> E20.py:10:10 @@ -97,16 +89,14 @@ E201 [*] Whitespace after '[' 12 | spam(ham[1], { eggs: 2}) | help: Remove whitespace before '[' - -ℹ Safe fix -7 7 | #: E201:1:6 -8 8 | spam( ham[1], {eggs: 2}) -9 9 | #: E201:1:10 -10 |-spam(ham[ 1], {eggs: 2}) - 10 |+spam(ham[1], {eggs: 2}) -11 11 | #: E201:1:15 -12 12 | spam(ham[1], { eggs: 2}) -13 13 | #: Okay +7 | #: E201:1:6 +8 | spam( ham[1], {eggs: 2}) +9 | #: E201:1:10 + - spam(ham[ 1], {eggs: 2}) +10 + spam(ham[1], {eggs: 2}) +11 | #: E201:1:15 +12 | spam(ham[1], { eggs: 2}) +13 | #: Okay E201 [*] Whitespace after '{' --> E20.py:12:15 @@ -119,16 +109,14 @@ E201 [*] Whitespace after '{' 14 | spam(ham[1], {eggs: 2}) | help: Remove whitespace before '{' - -ℹ Safe fix -9 9 | #: E201:1:10 -10 10 | spam(ham[ 1], {eggs: 2}) -11 11 | #: E201:1:15 -12 |-spam(ham[1], { eggs: 2}) - 12 |+spam(ham[1], {eggs: 2}) -13 13 | #: Okay -14 14 | spam(ham[1], {eggs: 2}) -15 15 | #: +9 | #: E201:1:10 +10 | spam(ham[ 1], {eggs: 2}) +11 | #: E201:1:15 + - spam(ham[1], { eggs: 2}) +12 + spam(ham[1], {eggs: 2}) +13 | #: Okay +14 | spam(ham[1], {eggs: 2}) +15 | #: E201 [*] Whitespace after '[' --> E20.py:107:6 @@ -140,16 +128,14 @@ E201 [*] Whitespace after '[' 109 | #: Okay | help: Remove whitespace before '[' - -ℹ Safe fix -104 104 | #: -105 105 | -106 106 | #: E201:1:6 -107 |-spam[ ~ham] - 107 |+spam[~ham] -108 108 | -109 109 | #: Okay -110 110 | x = [ # +104 | #: +105 | +106 | #: E201:1:6 + - spam[ ~ham] +107 + spam[~ham] +108 | +109 | #: Okay +110 | x = [ # E201 [*] Whitespace after '[' --> E20.py:116:5 @@ -161,16 +147,14 @@ E201 [*] Whitespace after '[' 117 | f"normal { {f"{ { [1, 2] } }" } } normal" | help: Remove whitespace before '[' - -ℹ Safe fix -113 113 | -114 114 | # F-strings -115 115 | f"{ {'a': 1} }" -116 |-f"{[ { {'a': 1} } ]}" - 116 |+f"{[{ {'a': 1} } ]}" -117 117 | f"normal { {f"{ { [1, 2] } }" } } normal" -118 118 | -119 119 | #: Okay +113 | +114 | # F-strings +115 | f"{ {'a': 1} }" + - f"{[ { {'a': 1} } ]}" +116 + f"{[{ {'a': 1} } ]}" +117 | f"normal { {f"{ { [1, 2] } }" } } normal" +118 | +119 | #: Okay E201 [*] Whitespace after '[' --> E20.py:145:5 @@ -182,16 +166,14 @@ E201 [*] Whitespace after '[' 147 | #: Okay | help: Remove whitespace before '[' - -ℹ Safe fix -142 142 | ham[lower + offset : upper + offset] -143 143 | -144 144 | #: E201:1:5 -145 |-ham[ : upper] - 145 |+ham[: upper] -146 146 | -147 147 | #: Okay -148 148 | ham[lower + offset :: upper + offset] +142 | ham[lower + offset : upper + offset] +143 | +144 | #: E201:1:5 + - ham[ : upper] +145 + ham[: upper] +146 | +147 | #: Okay +148 | ham[lower + offset :: upper + offset] E201 [*] Whitespace after '[' --> E20.py:195:5 @@ -203,13 +185,11 @@ E201 [*] Whitespace after '[' 196 | t"normal { {t"{ { [1, 2] } }" } } normal" | help: Remove whitespace before '[' - -ℹ Safe fix -192 192 | -193 193 | # t-strings -194 194 | t"{ {'a': 1} }" -195 |-t"{[ { {'a': 1} } ]}" - 195 |+t"{[{ {'a': 1} } ]}" -196 196 | t"normal { {t"{ { [1, 2] } }" } } normal" -197 197 | -198 198 | t"{x = :.2f}" +192 | +193 | # t-strings +194 | t"{ {'a': 1} }" + - t"{[ { {'a': 1} } ]}" +195 + t"{[{ {'a': 1} } ]}" +196 | t"normal { {t"{ { [1, 2] } }" } } normal" +197 | +198 | t"{x = :.2f}" diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap index 839db34d56..66d9bede1f 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E202_E20.py.snap @@ -11,16 +11,14 @@ E202 [*] Whitespace before ')' 21 | spam(ham[1], {eggs: 2 }) | help: Remove whitespace before ')' - -ℹ Safe fix -16 16 | -17 17 | -18 18 | #: E202:1:23 -19 |-spam(ham[1], {eggs: 2} ) - 19 |+spam(ham[1], {eggs: 2}) -20 20 | #: E202:1:22 -21 21 | spam(ham[1], {eggs: 2 }) -22 22 | #: E202:1:11 +16 | +17 | +18 | #: E202:1:23 + - spam(ham[1], {eggs: 2} ) +19 + spam(ham[1], {eggs: 2}) +20 | #: E202:1:22 +21 | spam(ham[1], {eggs: 2 }) +22 | #: E202:1:11 E202 [*] Whitespace before '}' --> E20.py:21:22 @@ -33,16 +31,14 @@ E202 [*] Whitespace before '}' 23 | spam(ham[1 ], {eggs: 2}) | help: Remove whitespace before '}' - -ℹ Safe fix -18 18 | #: E202:1:23 -19 19 | spam(ham[1], {eggs: 2} ) -20 20 | #: E202:1:22 -21 |-spam(ham[1], {eggs: 2 }) - 21 |+spam(ham[1], {eggs: 2}) -22 22 | #: E202:1:11 -23 23 | spam(ham[1 ], {eggs: 2}) -24 24 | #: E202:1:23 +18 | #: E202:1:23 +19 | spam(ham[1], {eggs: 2} ) +20 | #: E202:1:22 + - spam(ham[1], {eggs: 2 }) +21 + spam(ham[1], {eggs: 2}) +22 | #: E202:1:11 +23 | spam(ham[1 ], {eggs: 2}) +24 | #: E202:1:23 E202 [*] Whitespace before ']' --> E20.py:23:11 @@ -55,16 +51,14 @@ E202 [*] Whitespace before ']' 25 | spam(ham[1], {eggs: 2} ) | help: Remove whitespace before ']' - -ℹ Safe fix -20 20 | #: E202:1:22 -21 21 | spam(ham[1], {eggs: 2 }) -22 22 | #: E202:1:11 -23 |-spam(ham[1 ], {eggs: 2}) - 23 |+spam(ham[1], {eggs: 2}) -24 24 | #: E202:1:23 -25 25 | spam(ham[1], {eggs: 2} ) -26 26 | #: E202:1:22 +20 | #: E202:1:22 +21 | spam(ham[1], {eggs: 2 }) +22 | #: E202:1:11 + - spam(ham[1 ], {eggs: 2}) +23 + spam(ham[1], {eggs: 2}) +24 | #: E202:1:23 +25 | spam(ham[1], {eggs: 2} ) +26 | #: E202:1:22 E202 [*] Whitespace before ')' --> E20.py:25:23 @@ -77,16 +71,14 @@ E202 [*] Whitespace before ')' 27 | spam(ham[1], {eggs: 2 }) | help: Remove whitespace before ')' - -ℹ Safe fix -22 22 | #: E202:1:11 -23 23 | spam(ham[1 ], {eggs: 2}) -24 24 | #: E202:1:23 -25 |-spam(ham[1], {eggs: 2} ) - 25 |+spam(ham[1], {eggs: 2}) -26 26 | #: E202:1:22 -27 27 | spam(ham[1], {eggs: 2 }) -28 28 | #: E202:1:11 +22 | #: E202:1:11 +23 | spam(ham[1 ], {eggs: 2}) +24 | #: E202:1:23 + - spam(ham[1], {eggs: 2} ) +25 + spam(ham[1], {eggs: 2}) +26 | #: E202:1:22 +27 | spam(ham[1], {eggs: 2 }) +28 | #: E202:1:11 E202 [*] Whitespace before '}' --> E20.py:27:22 @@ -99,16 +91,14 @@ E202 [*] Whitespace before '}' 29 | spam(ham[1 ], {eggs: 2}) | help: Remove whitespace before '}' - -ℹ Safe fix -24 24 | #: E202:1:23 -25 25 | spam(ham[1], {eggs: 2} ) -26 26 | #: E202:1:22 -27 |-spam(ham[1], {eggs: 2 }) - 27 |+spam(ham[1], {eggs: 2}) -28 28 | #: E202:1:11 -29 29 | spam(ham[1 ], {eggs: 2}) -30 30 | #: Okay +24 | #: E202:1:23 +25 | spam(ham[1], {eggs: 2} ) +26 | #: E202:1:22 + - spam(ham[1], {eggs: 2 }) +27 + spam(ham[1], {eggs: 2}) +28 | #: E202:1:11 +29 | spam(ham[1 ], {eggs: 2}) +30 | #: Okay E202 [*] Whitespace before ']' --> E20.py:29:11 @@ -121,16 +111,14 @@ E202 [*] Whitespace before ']' 31 | spam(ham[1], {eggs: 2}) | help: Remove whitespace before ']' - -ℹ Safe fix -26 26 | #: E202:1:22 -27 27 | spam(ham[1], {eggs: 2 }) -28 28 | #: E202:1:11 -29 |-spam(ham[1 ], {eggs: 2}) - 29 |+spam(ham[1], {eggs: 2}) -30 30 | #: Okay -31 31 | spam(ham[1], {eggs: 2}) -32 32 | +26 | #: E202:1:22 +27 | spam(ham[1], {eggs: 2 }) +28 | #: E202:1:11 + - spam(ham[1 ], {eggs: 2}) +29 + spam(ham[1], {eggs: 2}) +30 | #: Okay +31 | spam(ham[1], {eggs: 2}) +32 | E202 [*] Whitespace before ']' --> E20.py:116:18 @@ -142,16 +130,14 @@ E202 [*] Whitespace before ']' 117 | f"normal { {f"{ { [1, 2] } }" } } normal" | help: Remove whitespace before ']' - -ℹ Safe fix -113 113 | -114 114 | # F-strings -115 115 | f"{ {'a': 1} }" -116 |-f"{[ { {'a': 1} } ]}" - 116 |+f"{[ { {'a': 1} }]}" -117 117 | f"normal { {f"{ { [1, 2] } }" } } normal" -118 118 | -119 119 | #: Okay +113 | +114 | # F-strings +115 | f"{ {'a': 1} }" + - f"{[ { {'a': 1} } ]}" +116 + f"{[ { {'a': 1} }]}" +117 | f"normal { {f"{ { [1, 2] } }" } } normal" +118 | +119 | #: Okay E202 [*] Whitespace before ']' --> E20.py:172:12 @@ -163,16 +149,14 @@ E202 [*] Whitespace before ']' 174 | #: E203:1:10 | help: Remove whitespace before ']' - -ℹ Safe fix -169 169 | ham[upper :] -170 170 | -171 171 | #: E202:1:12 -172 |-ham[upper : ] - 172 |+ham[upper :] -173 173 | -174 174 | #: E203:1:10 -175 175 | ham[upper :] +169 | ham[upper :] +170 | +171 | #: E202:1:12 + - ham[upper : ] +172 + ham[upper :] +173 | +174 | #: E203:1:10 +175 | ham[upper :] E202 [*] Whitespace before ']' --> E20.py:195:18 @@ -184,13 +168,11 @@ E202 [*] Whitespace before ']' 196 | t"normal { {t"{ { [1, 2] } }" } } normal" | help: Remove whitespace before ']' - -ℹ Safe fix -192 192 | -193 193 | # t-strings -194 194 | t"{ {'a': 1} }" -195 |-t"{[ { {'a': 1} } ]}" - 195 |+t"{[ { {'a': 1} }]}" -196 196 | t"normal { {t"{ { [1, 2] } }" } } normal" -197 197 | -198 198 | t"{x = :.2f}" +192 | +193 | # t-strings +194 | t"{ {'a': 1} }" + - t"{[ { {'a': 1} } ]}" +195 + t"{[ { {'a': 1} }]}" +196 | t"normal { {t"{ { [1, 2] } }" } } normal" +197 | +198 | t"{x = :.2f}" diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap index f8cd84d5de..48b597a3e2 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E203_E20.py.snap @@ -11,16 +11,14 @@ E203 [*] Whitespace before ':' 53 | x, y = y, x | help: Remove whitespace before ':' - -ℹ Safe fix -48 48 | -49 49 | -50 50 | #: E203:1:10 -51 |-if x == 4 : - 51 |+if x == 4: -52 52 | print(x, y) -53 53 | x, y = y, x -54 54 | #: E203:1:10 +48 | +49 | +50 | #: E203:1:10 + - if x == 4 : +51 + if x == 4: +52 | print(x, y) +53 | x, y = y, x +54 | #: E203:1:10 E203 [*] Whitespace before ':' --> E20.py:55:10 @@ -33,16 +31,14 @@ E203 [*] Whitespace before ':' 57 | x, y = y, x | help: Remove whitespace before ':' - -ℹ Safe fix -52 52 | print(x, y) -53 53 | x, y = y, x -54 54 | #: E203:1:10 -55 |-if x == 4 : - 55 |+if x == 4: -56 56 | print(x, y) -57 57 | x, y = y, x -58 58 | #: E203:2:15 E702:2:16 +52 | print(x, y) +53 | x, y = y, x +54 | #: E203:1:10 + - if x == 4 : +55 + if x == 4: +56 | print(x, y) +57 | x, y = y, x +58 | #: E203:2:15 E702:2:16 E203 [*] Whitespace before ';' --> E20.py:60:16 @@ -55,16 +51,14 @@ E203 [*] Whitespace before ';' 62 | if x == 4: | help: Remove whitespace before ';' - -ℹ Safe fix -57 57 | x, y = y, x -58 58 | #: E203:2:15 E702:2:16 -59 59 | if x == 4: -60 |- print(x, y) ; x, y = y, x - 60 |+ print(x, y); x, y = y, x -61 61 | #: E203:2:15 E702:2:16 -62 62 | if x == 4: -63 63 | print(x, y) ; x, y = y, x +57 | x, y = y, x +58 | #: E203:2:15 E702:2:16 +59 | if x == 4: + - print(x, y) ; x, y = y, x +60 + print(x, y); x, y = y, x +61 | #: E203:2:15 E702:2:16 +62 | if x == 4: +63 | print(x, y) ; x, y = y, x E203 [*] Whitespace before ';' --> E20.py:63:16 @@ -77,16 +71,14 @@ E203 [*] Whitespace before ';' 65 | if x == 4: | help: Remove whitespace before ';' - -ℹ Safe fix -60 60 | print(x, y) ; x, y = y, x -61 61 | #: E203:2:15 E702:2:16 -62 62 | if x == 4: -63 |- print(x, y) ; x, y = y, x - 63 |+ print(x, y); x, y = y, x -64 64 | #: E203:3:13 -65 65 | if x == 4: -66 66 | print(x, y) +60 | print(x, y) ; x, y = y, x +61 | #: E203:2:15 E702:2:16 +62 | if x == 4: + - print(x, y) ; x, y = y, x +63 + print(x, y); x, y = y, x +64 | #: E203:3:13 +65 | if x == 4: +66 | print(x, y) E203 [*] Whitespace before ',' --> E20.py:67:13 @@ -99,16 +91,14 @@ E203 [*] Whitespace before ',' 69 | if x == 4: | help: Remove whitespace before ',' - -ℹ Safe fix -64 64 | #: E203:3:13 -65 65 | if x == 4: -66 66 | print(x, y) -67 |- x, y = y , x - 67 |+ x, y = y, x -68 68 | #: E203:3:13 -69 69 | if x == 4: -70 70 | print(x, y) +64 | #: E203:3:13 +65 | if x == 4: +66 | print(x, y) + - x, y = y , x +67 + x, y = y, x +68 | #: E203:3:13 +69 | if x == 4: +70 | print(x, y) E203 [*] Whitespace before ',' --> E20.py:71:13 @@ -121,16 +111,14 @@ E203 [*] Whitespace before ',' 73 | if x == 4: | help: Remove whitespace before ',' - -ℹ Safe fix -68 68 | #: E203:3:13 -69 69 | if x == 4: -70 70 | print(x, y) -71 |- x, y = y , x - 71 |+ x, y = y, x -72 72 | #: Okay -73 73 | if x == 4: -74 74 | print(x, y) +68 | #: E203:3:13 +69 | if x == 4: +70 | print(x, y) + - x, y = y , x +71 + x, y = y, x +72 | #: Okay +73 | if x == 4: +74 | print(x, y) E203 [*] Whitespace before ':' --> E20.py:86:61 @@ -142,16 +130,14 @@ E203 [*] Whitespace before ':' 87 | ] | help: Remove whitespace before ':' - -ℹ Safe fix -83 83 | -84 84 | #: E203 multi whitespace before : -85 85 | predictions = predictions[ -86 |- len(past_covariates) // datamodule.hparams["downsample"] : - 86 |+ len(past_covariates) // datamodule.hparams["downsample"] : -87 87 | ] -88 88 | -89 89 | #: E203 tab before : +83 | +84 | #: E203 multi whitespace before : +85 | predictions = predictions[ + - len(past_covariates) // datamodule.hparams["downsample"] : +86 + len(past_covariates) // datamodule.hparams["downsample"] : +87 | ] +88 | +89 | #: E203 tab before : E203 [*] Whitespace before ':' --> E20.py:91:61 @@ -163,16 +149,14 @@ E203 [*] Whitespace before ':' 92 | ] | help: Remove whitespace before ':' - -ℹ Safe fix -88 88 | -89 89 | #: E203 tab before : -90 90 | predictions = predictions[ -91 |- len(past_covariates) // datamodule.hparams["downsample"] : - 91 |+ len(past_covariates) // datamodule.hparams["downsample"] : -92 92 | ] -93 93 | -94 94 | #: E203 single whitespace before : with line a comment +88 | +89 | #: E203 tab before : +90 | predictions = predictions[ + - len(past_covariates) // datamodule.hparams["downsample"] : +91 + len(past_covariates) // datamodule.hparams["downsample"] : +92 | ] +93 | +94 | #: E203 single whitespace before : with line a comment E203 [*] Whitespace before ':' --> E20.py:101:61 @@ -184,16 +168,14 @@ E203 [*] Whitespace before ':' 102 | ] | help: Remove whitespace before ':' - -ℹ Safe fix -98 98 | -99 99 | #: E203 multi whitespace before : with line a comment -100 100 | predictions = predictions[ -101 |- len(past_covariates) // datamodule.hparams["downsample"] : # Just some comment - 101 |+ len(past_covariates) // datamodule.hparams["downsample"] : # Just some comment -102 102 | ] -103 103 | -104 104 | #: +98 | +99 | #: E203 multi whitespace before : with line a comment +100 | predictions = predictions[ + - len(past_covariates) // datamodule.hparams["downsample"] : # Just some comment +101 + len(past_covariates) // datamodule.hparams["downsample"] : # Just some comment +102 | ] +103 | +104 | #: E203 [*] Whitespace before ':' --> E20.py:126:16 @@ -205,16 +187,14 @@ E203 [*] Whitespace before ':' 128 | #: E203:1:19 | help: Remove whitespace before ':' - -ℹ Safe fix -123 123 | ham[(lower + offset) : upper + offset] -124 124 | -125 125 | #: E203:1:19 -126 |-{lower + offset : upper + offset} - 126 |+{lower + offset: upper + offset} -127 127 | -128 128 | #: E203:1:19 -129 129 | ham[lower + offset : upper + offset] +123 | ham[(lower + offset) : upper + offset] +124 | +125 | #: E203:1:19 + - {lower + offset : upper + offset} +126 + {lower + offset: upper + offset} +127 | +128 | #: E203:1:19 +129 | ham[lower + offset : upper + offset] E203 [*] Whitespace before ':' --> E20.py:129:19 @@ -226,16 +206,14 @@ E203 [*] Whitespace before ':' 131 | #: Okay | help: Remove whitespace before ':' - -ℹ Safe fix -126 126 | {lower + offset : upper + offset} -127 127 | -128 128 | #: E203:1:19 -129 |-ham[lower + offset : upper + offset] - 129 |+ham[lower + offset: upper + offset] -130 130 | -131 131 | #: Okay -132 132 | release_lines = history_file_lines[history_file_lines.index('## Unreleased') + 1: -1] +126 | {lower + offset : upper + offset} +127 | +128 | #: E203:1:19 + - ham[lower + offset : upper + offset] +129 + ham[lower + offset: upper + offset] +130 | +131 | #: Okay +132 | release_lines = history_file_lines[history_file_lines.index('## Unreleased') + 1: -1] E203 [*] Whitespace before ':' --> E20.py:157:21 @@ -247,16 +225,14 @@ E203 [*] Whitespace before ':' 159 | #: E203:1:20 | help: Remove whitespace before ':' - -ℹ Safe fix -154 154 | ham[lower + offset::upper + offset] -155 155 | -156 156 | #: E203:1:21 -157 |-ham[lower + offset : : upper + offset] - 157 |+ham[lower + offset :: upper + offset] -158 158 | -159 159 | #: E203:1:20 -160 160 | ham[lower + offset: :upper + offset] +154 | ham[lower + offset::upper + offset] +155 | +156 | #: E203:1:21 + - ham[lower + offset : : upper + offset] +157 + ham[lower + offset :: upper + offset] +158 | +159 | #: E203:1:20 +160 | ham[lower + offset: :upper + offset] E203 [*] Whitespace before ':' --> E20.py:160:20 @@ -268,16 +244,14 @@ E203 [*] Whitespace before ':' 162 | #: E203:1:20 | help: Remove whitespace before ':' - -ℹ Safe fix -157 157 | ham[lower + offset : : upper + offset] -158 158 | -159 159 | #: E203:1:20 -160 |-ham[lower + offset: :upper + offset] - 160 |+ham[lower + offset::upper + offset] -161 161 | -162 162 | #: E203:1:20 -163 163 | ham[{lower + offset : upper + offset} : upper + offset] +157 | ham[lower + offset : : upper + offset] +158 | +159 | #: E203:1:20 + - ham[lower + offset: :upper + offset] +160 + ham[lower + offset::upper + offset] +161 | +162 | #: E203:1:20 +163 | ham[{lower + offset : upper + offset} : upper + offset] E203 [*] Whitespace before ':' --> E20.py:163:20 @@ -289,16 +263,14 @@ E203 [*] Whitespace before ':' 165 | #: Okay | help: Remove whitespace before ':' - -ℹ Safe fix -160 160 | ham[lower + offset: :upper + offset] -161 161 | -162 162 | #: E203:1:20 -163 |-ham[{lower + offset : upper + offset} : upper + offset] - 163 |+ham[{lower + offset: upper + offset} : upper + offset] -164 164 | -165 165 | #: Okay -166 166 | ham[upper:] +160 | ham[lower + offset: :upper + offset] +161 | +162 | #: E203:1:20 + - ham[{lower + offset : upper + offset} : upper + offset] +163 + ham[{lower + offset: upper + offset} : upper + offset] +164 | +165 | #: Okay +166 | ham[upper:] E203 [*] Whitespace before ':' --> E20.py:175:10 @@ -310,16 +282,14 @@ E203 [*] Whitespace before ':' 177 | #: Okay | help: Remove whitespace before ':' - -ℹ Safe fix -172 172 | ham[upper : ] -173 173 | -174 174 | #: E203:1:10 -175 |-ham[upper :] - 175 |+ham[upper:] -176 176 | -177 177 | #: Okay -178 178 | ham[lower +1 :, "columnname"] +172 | ham[upper : ] +173 | +174 | #: E203:1:10 + - ham[upper :] +175 + ham[upper:] +176 | +177 | #: Okay +178 | ham[lower +1 :, "columnname"] E203 [*] Whitespace before ':' --> E20.py:181:14 @@ -331,16 +301,14 @@ E203 [*] Whitespace before ':' 183 | #: Okay | help: Remove whitespace before ':' - -ℹ Safe fix -178 178 | ham[lower +1 :, "columnname"] -179 179 | -180 180 | #: E203:1:13 -181 |-ham[lower + 1 :, "columnname"] - 181 |+ham[lower + 1:, "columnname"] -182 182 | -183 183 | #: Okay -184 184 | f"{ham[lower +1 :, "columnname"]}" +178 | ham[lower +1 :, "columnname"] +179 | +180 | #: E203:1:13 + - ham[lower + 1 :, "columnname"] +181 + ham[lower + 1:, "columnname"] +182 | +183 | #: Okay +184 | f"{ham[lower +1 :, "columnname"]}" E203 [*] Whitespace before ':' --> E20.py:187:17 @@ -352,16 +320,14 @@ E203 [*] Whitespace before ':' 189 | #: Okay: https://github.com/astral-sh/ruff/issues/12023 | help: Remove whitespace before ':' - -ℹ Safe fix -184 184 | f"{ham[lower +1 :, "columnname"]}" -185 185 | -186 186 | #: E203:1:13 -187 |-f"{ham[lower + 1 :, "columnname"]}" - 187 |+f"{ham[lower + 1:, "columnname"]}" -188 188 | -189 189 | #: Okay: https://github.com/astral-sh/ruff/issues/12023 -190 190 | f"{x = :.2f}" +184 | f"{ham[lower +1 :, "columnname"]}" +185 | +186 | #: E203:1:13 + - f"{ham[lower + 1 :, "columnname"]}" +187 + f"{ham[lower + 1:, "columnname"]}" +188 | +189 | #: Okay: https://github.com/astral-sh/ruff/issues/12023 +190 | f"{x = :.2f}" E203 [*] Whitespace before ':' --> E20.py:205:17 @@ -371,11 +337,9 @@ E203 [*] Whitespace before ':' | ^^ | help: Remove whitespace before ':' - -ℹ Safe fix -202 202 | t"{ham[lower +1 :, "columnname"]}" -203 203 | -204 204 | #: E203:1:13 -205 |-t"{ham[lower + 1 :, "columnname"]}" - 205 |+t"{ham[lower + 1:, "columnname"]}" -206 206 | +202 | t"{ham[lower +1 :, "columnname"]}" +203 | +204 | #: E203:1:13 + - t"{ham[lower + 1 :, "columnname"]}" +205 + t"{ham[lower + 1:, "columnname"]}" +206 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap index 47b03f8b73..244df047fa 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E204_E204.py.snap @@ -11,16 +11,14 @@ E204 [*] Whitespace after decorator 16 | print('baz') | help: Remove whitespace - -ℹ Safe fix -11 11 | print('bar') -12 12 | -13 13 | # E204 -14 |-@ foo - 14 |+@foo -15 15 | def baz(): -16 16 | print('baz') -17 17 | +11 | print('bar') +12 | +13 | # E204 + - @ foo +14 + @foo +15 | def baz(): +16 | print('baz') +17 | E204 [*] Whitespace after decorator --> E204.py:25:6 @@ -32,16 +30,14 @@ E204 [*] Whitespace after decorator 27 | print('baz') | help: Remove whitespace - -ℹ Safe fix -22 22 | print('bar') -23 23 | -24 24 | # E204 -25 |- @ foo - 25 |+ @foo -26 26 | def baz(self): -27 27 | print('baz') -28 28 | +22 | print('bar') +23 | +24 | # E204 + - @ foo +25 + @foo +26 | def baz(self): +27 | print('baz') +28 | E204 [*] Whitespace after decorator --> E204.py:31:2 @@ -53,13 +49,11 @@ E204 [*] Whitespace after decorator 33 | def baz(): | help: Remove whitespace - -ℹ Safe fix -28 28 | -29 29 | -30 30 | # E204 -31 |-@ \ -32 |-foo - 31 |+@foo -33 32 | def baz(): -34 33 | print('baz') +28 | +29 | +30 | # E204 + - @ \ + - foo +31 + @foo +32 | def baz(): +33 | print('baz') diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap index c9307277cb..ca3b6c94c2 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E211_E21.py.snap @@ -11,14 +11,12 @@ E211 [*] Whitespace before '(' 4 | dict ['key'] = list [index] | help: Removed whitespace before '(' - -ℹ Safe fix -1 1 | #: E211 -2 |-spam (1) - 2 |+spam(1) -3 3 | #: E211 E211 -4 4 | dict ['key'] = list [index] -5 5 | #: E211 +1 | #: E211 + - spam (1) +2 + spam(1) +3 | #: E211 E211 +4 | dict ['key'] = list [index] +5 | #: E211 E211 [*] Whitespace before '[' --> E21.py:4:5 @@ -31,16 +29,14 @@ E211 [*] Whitespace before '[' 6 | dict['key'] ['subkey'] = list[index] | help: Removed whitespace before '[' - -ℹ Safe fix -1 1 | #: E211 -2 2 | spam (1) -3 3 | #: E211 E211 -4 |-dict ['key'] = list [index] - 4 |+dict['key'] = list [index] -5 5 | #: E211 -6 6 | dict['key'] ['subkey'] = list[index] -7 7 | #: Okay +1 | #: E211 +2 | spam (1) +3 | #: E211 E211 + - dict ['key'] = list [index] +4 + dict['key'] = list [index] +5 | #: E211 +6 | dict['key'] ['subkey'] = list[index] +7 | #: Okay E211 [*] Whitespace before '[' --> E21.py:4:20 @@ -53,16 +49,14 @@ E211 [*] Whitespace before '[' 6 | dict['key'] ['subkey'] = list[index] | help: Removed whitespace before '[' - -ℹ Safe fix -1 1 | #: E211 -2 2 | spam (1) -3 3 | #: E211 E211 -4 |-dict ['key'] = list [index] - 4 |+dict ['key'] = list[index] -5 5 | #: E211 -6 6 | dict['key'] ['subkey'] = list[index] -7 7 | #: Okay +1 | #: E211 +2 | spam (1) +3 | #: E211 E211 + - dict ['key'] = list [index] +4 + dict ['key'] = list[index] +5 | #: E211 +6 | dict['key'] ['subkey'] = list[index] +7 | #: Okay E211 [*] Whitespace before '[' --> E21.py:6:12 @@ -75,16 +69,14 @@ E211 [*] Whitespace before '[' 8 | spam(1) | help: Removed whitespace before '[' - -ℹ Safe fix -3 3 | #: E211 E211 -4 4 | dict ['key'] = list [index] -5 5 | #: E211 -6 |-dict['key'] ['subkey'] = list[index] - 6 |+dict['key']['subkey'] = list[index] -7 7 | #: Okay -8 8 | spam(1) -9 9 | dict['key'] = list[index] +3 | #: E211 E211 +4 | dict ['key'] = list [index] +5 | #: E211 + - dict['key'] ['subkey'] = list[index] +6 + dict['key']['subkey'] = list[index] +7 | #: Okay +8 | spam(1) +9 | dict['key'] = list[index] E211 [*] Whitespace before '(' --> E21.py:17:15 @@ -94,16 +86,14 @@ E211 [*] Whitespace before '(' 18 | """Fetch name from --person-name in sys.argv. | help: Removed whitespace before '(' - -ℹ Safe fix -14 14 | pass -15 15 | -16 16 | -17 |-def fetch_name () -> Union[str, None]: - 17 |+def fetch_name() -> Union[str, None]: -18 18 | """Fetch name from --person-name in sys.argv. -19 19 | -20 20 | Returns: +14 | pass +15 | +16 | + - def fetch_name () -> Union[str, None]: +17 + def fetch_name() -> Union[str, None]: +18 | """Fetch name from --person-name in sys.argv. +19 | +20 | Returns: E211 [*] Whitespace before '(' --> E21.py:27:19 @@ -116,16 +106,14 @@ E211 [*] Whitespace before '(' 29 | return sys.argv[i + 1] | help: Removed whitespace before '(' - -ℹ Safe fix -24 24 | Logger.info(test) -25 25 | # test commented code -26 26 | # Logger.info("test code") -27 |- for i in range (0, len (sys.argv)) : - 27 |+ for i in range(0, len (sys.argv)) : -28 28 | if sys.argv[i] == "--name" : -29 29 | return sys.argv[i + 1] -30 30 | return None +24 | Logger.info(test) +25 | # test commented code +26 | # Logger.info("test code") + - for i in range (0, len (sys.argv)) : +27 + for i in range(0, len (sys.argv)) : +28 | if sys.argv[i] == "--name" : +29 | return sys.argv[i + 1] +30 | return None E211 [*] Whitespace before '(' --> E21.py:27:27 @@ -138,13 +126,11 @@ E211 [*] Whitespace before '(' 29 | return sys.argv[i + 1] | help: Removed whitespace before '(' - -ℹ Safe fix -24 24 | Logger.info(test) -25 25 | # test commented code -26 26 | # Logger.info("test code") -27 |- for i in range (0, len (sys.argv)) : - 27 |+ for i in range (0, len(sys.argv)) : -28 28 | if sys.argv[i] == "--name" : -29 29 | return sys.argv[i + 1] -30 30 | return None +24 | Logger.info(test) +25 | # test commented code +26 | # Logger.info("test code") + - for i in range (0, len (sys.argv)) : +27 + for i in range (0, len(sys.argv)) : +28 | if sys.argv[i] == "--name" : +29 | return sys.argv[i + 1] +30 | return None diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap index b8afef65c3..8dbc7c2b9a 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E221_E22.py.snap @@ -12,15 +12,13 @@ E221 [*] Multiple spaces before operator 5 | x = 1 | help: Replace with single space - -ℹ Safe fix -1 1 | #: E221 -2 2 | a = 12 + 3 -3 |-b = 4 + 5 - 3 |+b = 4 + 5 -4 4 | #: E221 E221 -5 5 | x = 1 -6 6 | y = 2 +1 | #: E221 +2 | a = 12 + 3 + - b = 4 + 5 +3 + b = 4 + 5 +4 | #: E221 E221 +5 | x = 1 +6 | y = 2 E221 [*] Multiple spaces before operator --> E22.py:5:2 @@ -33,16 +31,14 @@ E221 [*] Multiple spaces before operator 7 | long_variable = 3 | help: Replace with single space - -ℹ Safe fix -2 2 | a = 12 + 3 -3 3 | b = 4 + 5 -4 4 | #: E221 E221 -5 |-x = 1 - 5 |+x = 1 -6 6 | y = 2 -7 7 | long_variable = 3 -8 8 | #: E221 E221 +2 | a = 12 + 3 +3 | b = 4 + 5 +4 | #: E221 E221 + - x = 1 +5 + x = 1 +6 | y = 2 +7 | long_variable = 3 +8 | #: E221 E221 E221 [*] Multiple spaces before operator --> E22.py:6:2 @@ -55,16 +51,14 @@ E221 [*] Multiple spaces before operator 8 | #: E221 E221 | help: Replace with single space - -ℹ Safe fix -3 3 | b = 4 + 5 -4 4 | #: E221 E221 -5 5 | x = 1 -6 |-y = 2 - 6 |+y = 2 -7 7 | long_variable = 3 -8 8 | #: E221 E221 -9 9 | x[0] = 1 +3 | b = 4 + 5 +4 | #: E221 E221 +5 | x = 1 + - y = 2 +6 + y = 2 +7 | long_variable = 3 +8 | #: E221 E221 +9 | x[0] = 1 E221 [*] Multiple spaces before operator --> E22.py:9:5 @@ -77,16 +71,14 @@ E221 [*] Multiple spaces before operator 11 | long_variable = 3 | help: Replace with single space - -ℹ Safe fix -6 6 | y = 2 -7 7 | long_variable = 3 -8 8 | #: E221 E221 -9 |-x[0] = 1 - 9 |+x[0] = 1 -10 10 | x[1] = 2 -11 11 | long_variable = 3 -12 12 | #: E221 E221 +6 | y = 2 +7 | long_variable = 3 +8 | #: E221 E221 + - x[0] = 1 +9 + x[0] = 1 +10 | x[1] = 2 +11 | long_variable = 3 +12 | #: E221 E221 E221 [*] Multiple spaces before operator --> E22.py:10:5 @@ -99,16 +91,14 @@ E221 [*] Multiple spaces before operator 12 | #: E221 E221 | help: Replace with single space - -ℹ Safe fix -7 7 | long_variable = 3 -8 8 | #: E221 E221 -9 9 | x[0] = 1 -10 |-x[1] = 2 - 10 |+x[1] = 2 -11 11 | long_variable = 3 -12 12 | #: E221 E221 -13 13 | x = f(x) + 1 +7 | long_variable = 3 +8 | #: E221 E221 +9 | x[0] = 1 + - x[1] = 2 +10 + x[1] = 2 +11 | long_variable = 3 +12 | #: E221 E221 +13 | x = f(x) + 1 E221 [*] Multiple spaces before operator --> E22.py:13:9 @@ -121,16 +111,14 @@ E221 [*] Multiple spaces before operator 15 | z = x[0] + 3 | help: Replace with single space - -ℹ Safe fix -10 10 | x[1] = 2 -11 11 | long_variable = 3 -12 12 | #: E221 E221 -13 |-x = f(x) + 1 - 13 |+x = f(x) + 1 -14 14 | y = long_variable + 2 -15 15 | z = x[0] + 3 -16 16 | #: E221:3:14 +10 | x[1] = 2 +11 | long_variable = 3 +12 | #: E221 E221 + - x = f(x) + 1 +13 + x = f(x) + 1 +14 | y = long_variable + 2 +15 | z = x[0] + 3 +16 | #: E221:3:14 E221 [*] Multiple spaces before operator --> E22.py:15:9 @@ -143,16 +131,14 @@ E221 [*] Multiple spaces before operator 17 | text = """ | help: Replace with single space - -ℹ Safe fix -12 12 | #: E221 E221 -13 13 | x = f(x) + 1 -14 14 | y = long_variable + 2 -15 |-z = x[0] + 3 - 15 |+z = x[0] + 3 -16 16 | #: E221:3:14 -17 17 | text = """ -18 18 | bar +12 | #: E221 E221 +13 | x = f(x) + 1 +14 | y = long_variable + 2 + - z = x[0] + 3 +15 + z = x[0] + 3 +16 | #: E221:3:14 +17 | text = """ +18 | bar E221 [*] Multiple spaces before operator --> E22.py:19:14 @@ -165,16 +151,14 @@ E221 [*] Multiple spaces before operator 21 | x = 1 | help: Replace with single space - -ℹ Safe fix -16 16 | #: E221:3:14 -17 17 | text = """ -18 18 | bar -19 |- foo %s""" % rofl - 19 |+ foo %s""" % rofl -20 20 | #: Okay -21 21 | x = 1 -22 22 | y = 2 +16 | #: E221:3:14 +17 | text = """ +18 | bar + - foo %s""" % rofl +19 + foo %s""" % rofl +20 | #: Okay +21 | x = 1 +22 | y = 2 E221 [*] Multiple spaces before operator --> E22.py:184:5 @@ -186,13 +170,11 @@ E221 [*] Multiple spaces before operator 185 | print(a) | help: Replace with single space - -ℹ Safe fix -181 181 | pass -182 182 | #: -183 183 | -184 |-if a == 1: - 184 |+if a == 1: -185 185 | print(a) -186 186 | -187 187 | +181 | pass +182 | #: +183 | + - if a == 1: +184 + if a == 1: +185 | print(a) +186 | +187 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap index c3fa3fd64c..199fa5eb51 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E222_E22.py.snap @@ -11,16 +11,14 @@ E222 [*] Multiple spaces after operator 30 | #: E222 E222 | help: Replace with single space - -ℹ Safe fix -25 25 | -26 26 | -27 27 | #: E222 -28 |-a = a + 1 - 28 |+a = a + 1 -29 29 | b = b + 10 -30 30 | #: E222 E222 -31 31 | x = -1 +25 | +26 | +27 | #: E222 + - a = a + 1 +28 + a = a + 1 +29 | b = b + 10 +30 | #: E222 E222 +31 | x = -1 E222 [*] Multiple spaces after operator --> E22.py:31:4 @@ -33,16 +31,14 @@ E222 [*] Multiple spaces after operator 33 | long_variable = 3 | help: Replace with single space - -ℹ Safe fix -28 28 | a = a + 1 -29 29 | b = b + 10 -30 30 | #: E222 E222 -31 |-x = -1 - 31 |+x = -1 -32 32 | y = -2 -33 33 | long_variable = 3 -34 34 | #: E222 E222 +28 | a = a + 1 +29 | b = b + 10 +30 | #: E222 E222 + - x = -1 +31 + x = -1 +32 | y = -2 +33 | long_variable = 3 +34 | #: E222 E222 E222 [*] Multiple spaces after operator --> E22.py:32:4 @@ -55,16 +51,14 @@ E222 [*] Multiple spaces after operator 34 | #: E222 E222 | help: Replace with single space - -ℹ Safe fix -29 29 | b = b + 10 -30 30 | #: E222 E222 -31 31 | x = -1 -32 |-y = -2 - 32 |+y = -2 -33 33 | long_variable = 3 -34 34 | #: E222 E222 -35 35 | x[0] = 1 +29 | b = b + 10 +30 | #: E222 E222 +31 | x = -1 + - y = -2 +32 + y = -2 +33 | long_variable = 3 +34 | #: E222 E222 +35 | x[0] = 1 E222 [*] Multiple spaces after operator --> E22.py:35:7 @@ -77,16 +71,14 @@ E222 [*] Multiple spaces after operator 37 | long_variable = 3 | help: Replace with single space - -ℹ Safe fix -32 32 | y = -2 -33 33 | long_variable = 3 -34 34 | #: E222 E222 -35 |-x[0] = 1 - 35 |+x[0] = 1 -36 36 | x[1] = 2 -37 37 | long_variable = 3 -38 38 | #: +32 | y = -2 +33 | long_variable = 3 +34 | #: E222 E222 + - x[0] = 1 +35 + x[0] = 1 +36 | x[1] = 2 +37 | long_variable = 3 +38 | #: E222 [*] Multiple spaces after operator --> E22.py:36:7 @@ -99,16 +91,14 @@ E222 [*] Multiple spaces after operator 38 | #: | help: Replace with single space - -ℹ Safe fix -33 33 | long_variable = 3 -34 34 | #: E222 E222 -35 35 | x[0] = 1 -36 |-x[1] = 2 - 36 |+x[1] = 2 -37 37 | long_variable = 3 -38 38 | #: -39 39 | +33 | long_variable = 3 +34 | #: E222 E222 +35 | x[0] = 1 + - x[1] = 2 +36 + x[1] = 2 +37 | long_variable = 3 +38 | #: +39 | E222 [*] Multiple spaces after operator --> E22.py:184:9 @@ -120,13 +110,11 @@ E222 [*] Multiple spaces after operator 185 | print(a) | help: Replace with single space - -ℹ Safe fix -181 181 | pass -182 182 | #: -183 183 | -184 |-if a == 1: - 184 |+if a == 1: -185 185 | print(a) -186 186 | -187 187 | +181 | pass +182 | #: +183 | + - if a == 1: +184 + if a == 1: +185 | print(a) +186 | +187 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap index b8b17d0a49..7fc6679f49 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E223_E22.py.snap @@ -11,13 +11,11 @@ E223 [*] Tab before operator 44 | #: | help: Replace with single space - -ℹ Safe fix -40 40 | -41 41 | #: E223 -42 42 | foobart = 4 -43 |-a = 3 # aligned with tab - 43 |+a = 3 # aligned with tab -44 44 | #: -45 45 | -46 46 | +40 | +41 | #: E223 +42 | foobart = 4 + - a = 3 # aligned with tab +43 + a = 3 # aligned with tab +44 | #: +45 | +46 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap index d5af8158a4..73cadde88f 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E224_E22.py.snap @@ -11,13 +11,11 @@ E224 [*] Tab after operator 50 | #: | help: Replace with single space - -ℹ Safe fix -45 45 | -46 46 | -47 47 | #: E224 -48 |-a += 1 - 48 |+a += 1 -49 49 | b += 1000 -50 50 | #: -51 51 | +45 | +46 | +47 | #: E224 + - a += 1 +48 + a += 1 +49 | b += 1000 +50 | #: +51 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap index 5c9f55037a..990faba8fc 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E225_E22.py.snap @@ -11,16 +11,14 @@ E225 [*] Missing whitespace around operator 56 | submitted+= 1 | help: Add missing whitespace - -ℹ Safe fix -51 51 | -52 52 | -53 53 | #: E225 -54 |-submitted +=1 - 54 |+submitted += 1 -55 55 | #: E225 -56 56 | submitted+= 1 -57 57 | #: E225 +51 | +52 | +53 | #: E225 + - submitted +=1 +54 + submitted += 1 +55 | #: E225 +56 | submitted+= 1 +57 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:56:10 @@ -33,16 +31,14 @@ E225 [*] Missing whitespace around operator 58 | c =-1 | help: Add missing whitespace - -ℹ Safe fix -53 53 | #: E225 -54 54 | submitted +=1 -55 55 | #: E225 -56 |-submitted+= 1 - 56 |+submitted += 1 -57 57 | #: E225 -58 58 | c =-1 -59 59 | #: E225 +53 | #: E225 +54 | submitted +=1 +55 | #: E225 + - submitted+= 1 +56 + submitted += 1 +57 | #: E225 +58 | c =-1 +59 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:58:3 @@ -55,16 +51,14 @@ E225 [*] Missing whitespace around operator 60 | x = x /2 - 1 | help: Add missing whitespace - -ℹ Safe fix -55 55 | #: E225 -56 56 | submitted+= 1 -57 57 | #: E225 -58 |-c =-1 - 58 |+c = -1 -59 59 | #: E225 -60 60 | x = x /2 - 1 -61 61 | #: E225 +55 | #: E225 +56 | submitted+= 1 +57 | #: E225 + - c =-1 +58 + c = -1 +59 | #: E225 +60 | x = x /2 - 1 +61 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:76:2 @@ -77,16 +71,14 @@ E225 [*] Missing whitespace around operator 78 | i=i +1 | help: Add missing whitespace - -ℹ Safe fix -73 73 | #: E225 -74 74 | _1kB = _1MB>> 10 -75 75 | #: E225 E225 -76 |-i=i+ 1 - 76 |+i = i+ 1 -77 77 | #: E225 E225 -78 78 | i=i +1 -79 79 | #: E225 +73 | #: E225 +74 | _1kB = _1MB>> 10 +75 | #: E225 E225 + - i=i+ 1 +76 + i = i+ 1 +77 | #: E225 E225 +78 | i=i +1 +79 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:78:2 @@ -99,16 +91,14 @@ E225 [*] Missing whitespace around operator 80 | i = 1and 1 | help: Add missing whitespace - -ℹ Safe fix -75 75 | #: E225 E225 -76 76 | i=i+ 1 -77 77 | #: E225 E225 -78 |-i=i +1 - 78 |+i = i +1 -79 79 | #: E225 -80 80 | i = 1and 1 -81 81 | #: E225 +75 | #: E225 E225 +76 | i=i+ 1 +77 | #: E225 E225 + - i=i +1 +78 + i = i +1 +79 | #: E225 +80 | i = 1and 1 +81 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:80:6 @@ -121,16 +111,14 @@ E225 [*] Missing whitespace around operator 82 | i = 1or 0 | help: Add missing whitespace - -ℹ Safe fix -77 77 | #: E225 E225 -78 78 | i=i +1 -79 79 | #: E225 -80 |-i = 1and 1 - 80 |+i = 1 and 1 -81 81 | #: E225 -82 82 | i = 1or 0 -83 83 | #: E225 +77 | #: E225 E225 +78 | i=i +1 +79 | #: E225 + - i = 1and 1 +80 + i = 1 and 1 +81 | #: E225 +82 | i = 1or 0 +83 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:82:6 @@ -143,16 +131,14 @@ E225 [*] Missing whitespace around operator 84 | 1is 1 | help: Add missing whitespace - -ℹ Safe fix -79 79 | #: E225 -80 80 | i = 1and 1 -81 81 | #: E225 -82 |-i = 1or 0 - 82 |+i = 1 or 0 -83 83 | #: E225 -84 84 | 1is 1 -85 85 | #: E225 +79 | #: E225 +80 | i = 1and 1 +81 | #: E225 + - i = 1or 0 +82 + i = 1 or 0 +83 | #: E225 +84 | 1is 1 +85 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:84:2 @@ -165,16 +151,14 @@ E225 [*] Missing whitespace around operator 86 | 1in [] | help: Add missing whitespace - -ℹ Safe fix -81 81 | #: E225 -82 82 | i = 1or 0 -83 83 | #: E225 -84 |-1is 1 - 84 |+1 is 1 -85 85 | #: E225 -86 86 | 1in [] -87 87 | #: E225 +81 | #: E225 +82 | i = 1or 0 +83 | #: E225 + - 1is 1 +84 + 1 is 1 +85 | #: E225 +86 | 1in [] +87 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:86:2 @@ -187,16 +171,14 @@ E225 [*] Missing whitespace around operator 88 | i = 1 @2 | help: Add missing whitespace - -ℹ Safe fix -83 83 | #: E225 -84 84 | 1is 1 -85 85 | #: E225 -86 |-1in [] - 86 |+1 in [] -87 87 | #: E225 -88 88 | i = 1 @2 -89 89 | #: E225 +83 | #: E225 +84 | 1is 1 +85 | #: E225 + - 1in [] +86 + 1 in [] +87 | #: E225 +88 | i = 1 @2 +89 | #: E225 E225 [*] Missing whitespace around operator --> E22.py:92:2 @@ -209,16 +191,14 @@ E225 [*] Missing whitespace around operator 94 | i =i+1 | help: Add missing whitespace - -ℹ Safe fix -89 89 | #: E225 -90 90 | i = 1@ 2 -91 91 | #: E225 E226 -92 |-i=i+1 - 92 |+i = i+1 -93 93 | #: E225 E226 -94 94 | i =i+1 -95 95 | #: E225 E226 +89 | #: E225 +90 | i = 1@ 2 +91 | #: E225 E226 + - i=i+1 +92 + i = i+1 +93 | #: E225 E226 +94 | i =i+1 +95 | #: E225 E226 E225 [*] Missing whitespace around operator --> E22.py:94:3 @@ -231,16 +211,14 @@ E225 [*] Missing whitespace around operator 96 | i= i+1 | help: Add missing whitespace - -ℹ Safe fix -91 91 | #: E225 E226 -92 92 | i=i+1 -93 93 | #: E225 E226 -94 |-i =i+1 - 94 |+i = i+1 -95 95 | #: E225 E226 -96 96 | i= i+1 -97 97 | #: E225 E226 +91 | #: E225 E226 +92 | i=i+1 +93 | #: E225 E226 + - i =i+1 +94 + i = i+1 +95 | #: E225 E226 +96 | i= i+1 +97 | #: E225 E226 E225 [*] Missing whitespace around operator --> E22.py:96:2 @@ -253,13 +231,11 @@ E225 [*] Missing whitespace around operator 98 | c = (a +b)*(a - b) | help: Add missing whitespace - -ℹ Safe fix -93 93 | #: E225 E226 -94 94 | i =i+1 -95 95 | #: E225 E226 -96 |-i= i+1 - 96 |+i = i+1 -97 97 | #: E225 E226 -98 98 | c = (a +b)*(a - b) -99 99 | #: E225 E226 +93 | #: E225 E226 +94 | i =i+1 +95 | #: E225 E226 + - i= i+1 +96 + i = i+1 +97 | #: E225 E226 +98 | c = (a +b)*(a - b) +99 | #: E225 E226 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap index 3545f910f4..40f64a0f0c 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E226_E22.py.snap @@ -12,16 +12,14 @@ E226 [*] Missing whitespace around arithmetic operator 62 | c = alpha -4 | help: Add missing whitespace - -ℹ Safe fix -57 57 | #: E225 -58 58 | c =-1 -59 59 | #: E225 -60 |-x = x /2 - 1 - 60 |+x = x / 2 - 1 -61 61 | #: E225 -62 62 | c = alpha -4 -63 63 | #: E225 +57 | #: E225 +58 | c =-1 +59 | #: E225 + - x = x /2 - 1 +60 + x = x / 2 - 1 +61 | #: E225 +62 | c = alpha -4 +63 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:62:11 @@ -34,16 +32,14 @@ E226 [*] Missing whitespace around arithmetic operator 64 | c = alpha- 4 | help: Add missing whitespace - -ℹ Safe fix -59 59 | #: E225 -60 60 | x = x /2 - 1 -61 61 | #: E225 -62 |-c = alpha -4 - 62 |+c = alpha - 4 -63 63 | #: E225 -64 64 | c = alpha- 4 -65 65 | #: E225 +59 | #: E225 +60 | x = x /2 - 1 +61 | #: E225 + - c = alpha -4 +62 + c = alpha - 4 +63 | #: E225 +64 | c = alpha- 4 +65 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:64:10 @@ -56,16 +52,14 @@ E226 [*] Missing whitespace around arithmetic operator 66 | z = x **y | help: Add missing whitespace - -ℹ Safe fix -61 61 | #: E225 -62 62 | c = alpha -4 -63 63 | #: E225 -64 |-c = alpha- 4 - 64 |+c = alpha - 4 -65 65 | #: E225 -66 66 | z = x **y -67 67 | #: E225 +61 | #: E225 +62 | c = alpha -4 +63 | #: E225 + - c = alpha- 4 +64 + c = alpha - 4 +65 | #: E225 +66 | z = x **y +67 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:66:7 @@ -78,16 +72,14 @@ E226 [*] Missing whitespace around arithmetic operator 68 | z = (x + 1) **y | help: Add missing whitespace - -ℹ Safe fix -63 63 | #: E225 -64 64 | c = alpha- 4 -65 65 | #: E225 -66 |-z = x **y - 66 |+z = x ** y -67 67 | #: E225 -68 68 | z = (x + 1) **y -69 69 | #: E225 +63 | #: E225 +64 | c = alpha- 4 +65 | #: E225 + - z = x **y +66 + z = x ** y +67 | #: E225 +68 | z = (x + 1) **y +69 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:68:13 @@ -100,16 +92,14 @@ E226 [*] Missing whitespace around arithmetic operator 70 | z = (x + 1)** y | help: Add missing whitespace - -ℹ Safe fix -65 65 | #: E225 -66 66 | z = x **y -67 67 | #: E225 -68 |-z = (x + 1) **y - 68 |+z = (x + 1) ** y -69 69 | #: E225 -70 70 | z = (x + 1)** y -71 71 | #: E225 +65 | #: E225 +66 | z = x **y +67 | #: E225 + - z = (x + 1) **y +68 + z = (x + 1) ** y +69 | #: E225 +70 | z = (x + 1)** y +71 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:70:12 @@ -122,16 +112,14 @@ E226 [*] Missing whitespace around arithmetic operator 72 | _1kB = _1MB >>10 | help: Add missing whitespace - -ℹ Safe fix -67 67 | #: E225 -68 68 | z = (x + 1) **y -69 69 | #: E225 -70 |-z = (x + 1)** y - 70 |+z = (x + 1) ** y -71 71 | #: E225 -72 72 | _1kB = _1MB >>10 -73 73 | #: E225 +67 | #: E225 +68 | z = (x + 1) **y +69 | #: E225 + - z = (x + 1)** y +70 + z = (x + 1) ** y +71 | #: E225 +72 | _1kB = _1MB >>10 +73 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:76:4 @@ -144,16 +132,14 @@ E226 [*] Missing whitespace around arithmetic operator 78 | i=i +1 | help: Add missing whitespace - -ℹ Safe fix -73 73 | #: E225 -74 74 | _1kB = _1MB>> 10 -75 75 | #: E225 E225 -76 |-i=i+ 1 - 76 |+i=i + 1 -77 77 | #: E225 E225 -78 78 | i=i +1 -79 79 | #: E225 +73 | #: E225 +74 | _1kB = _1MB>> 10 +75 | #: E225 E225 + - i=i+ 1 +76 + i=i + 1 +77 | #: E225 E225 +78 | i=i +1 +79 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:78:5 @@ -166,16 +152,14 @@ E226 [*] Missing whitespace around arithmetic operator 80 | i = 1and 1 | help: Add missing whitespace - -ℹ Safe fix -75 75 | #: E225 E225 -76 76 | i=i+ 1 -77 77 | #: E225 E225 -78 |-i=i +1 - 78 |+i=i + 1 -79 79 | #: E225 -80 80 | i = 1and 1 -81 81 | #: E225 +75 | #: E225 E225 +76 | i=i+ 1 +77 | #: E225 E225 + - i=i +1 +78 + i=i + 1 +79 | #: E225 +80 | i = 1and 1 +81 | #: E225 E226 [*] Missing whitespace around arithmetic operator --> E22.py:88:7 @@ -188,16 +172,14 @@ E226 [*] Missing whitespace around arithmetic operator 90 | i = 1@ 2 | help: Add missing whitespace - -ℹ Safe fix -85 85 | #: E225 -86 86 | 1in [] -87 87 | #: E225 -88 |-i = 1 @2 - 88 |+i = 1 @ 2 -89 89 | #: E225 -90 90 | i = 1@ 2 -91 91 | #: E225 E226 +85 | #: E225 +86 | 1in [] +87 | #: E225 + - i = 1 @2 +88 + i = 1 @ 2 +89 | #: E225 +90 | i = 1@ 2 +91 | #: E225 E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:90:6 @@ -210,16 +192,14 @@ E226 [*] Missing whitespace around arithmetic operator 92 | i=i+1 | help: Add missing whitespace - -ℹ Safe fix -87 87 | #: E225 -88 88 | i = 1 @2 -89 89 | #: E225 -90 |-i = 1@ 2 - 90 |+i = 1 @ 2 -91 91 | #: E225 E226 -92 92 | i=i+1 -93 93 | #: E225 E226 +87 | #: E225 +88 | i = 1 @2 +89 | #: E225 + - i = 1@ 2 +90 + i = 1 @ 2 +91 | #: E225 E226 +92 | i=i+1 +93 | #: E225 E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:92:4 @@ -232,16 +212,14 @@ E226 [*] Missing whitespace around arithmetic operator 94 | i =i+1 | help: Add missing whitespace - -ℹ Safe fix -89 89 | #: E225 -90 90 | i = 1@ 2 -91 91 | #: E225 E226 -92 |-i=i+1 - 92 |+i=i + 1 -93 93 | #: E225 E226 -94 94 | i =i+1 -95 95 | #: E225 E226 +89 | #: E225 +90 | i = 1@ 2 +91 | #: E225 E226 + - i=i+1 +92 + i=i + 1 +93 | #: E225 E226 +94 | i =i+1 +95 | #: E225 E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:94:5 @@ -254,16 +232,14 @@ E226 [*] Missing whitespace around arithmetic operator 96 | i= i+1 | help: Add missing whitespace - -ℹ Safe fix -91 91 | #: E225 E226 -92 92 | i=i+1 -93 93 | #: E225 E226 -94 |-i =i+1 - 94 |+i =i + 1 -95 95 | #: E225 E226 -96 96 | i= i+1 -97 97 | #: E225 E226 +91 | #: E225 E226 +92 | i=i+1 +93 | #: E225 E226 + - i =i+1 +94 + i =i + 1 +95 | #: E225 E226 +96 | i= i+1 +97 | #: E225 E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:96:5 @@ -276,16 +252,14 @@ E226 [*] Missing whitespace around arithmetic operator 98 | c = (a +b)*(a - b) | help: Add missing whitespace - -ℹ Safe fix -93 93 | #: E225 E226 -94 94 | i =i+1 -95 95 | #: E225 E226 -96 |-i= i+1 - 96 |+i= i + 1 -97 97 | #: E225 E226 -98 98 | c = (a +b)*(a - b) -99 99 | #: E225 E226 +93 | #: E225 E226 +94 | i =i+1 +95 | #: E225 E226 + - i= i+1 +96 + i= i + 1 +97 | #: E225 E226 +98 | c = (a +b)*(a - b) +99 | #: E225 E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:98:8 @@ -298,16 +272,14 @@ E226 [*] Missing whitespace around arithmetic operator 100 | c = (a+ b)*(a - b) | help: Add missing whitespace - -ℹ Safe fix -95 95 | #: E225 E226 -96 96 | i= i+1 -97 97 | #: E225 E226 -98 |-c = (a +b)*(a - b) - 98 |+c = (a + b)*(a - b) -99 99 | #: E225 E226 -100 100 | c = (a+ b)*(a - b) -101 101 | #: +95 | #: E225 E226 +96 | i= i+1 +97 | #: E225 E226 + - c = (a +b)*(a - b) +98 + c = (a + b)*(a - b) +99 | #: E225 E226 +100 | c = (a+ b)*(a - b) +101 | #: E226 [*] Missing whitespace around arithmetic operator --> E22.py:98:11 @@ -320,16 +292,14 @@ E226 [*] Missing whitespace around arithmetic operator 100 | c = (a+ b)*(a - b) | help: Add missing whitespace - -ℹ Safe fix -95 95 | #: E225 E226 -96 96 | i= i+1 -97 97 | #: E225 E226 -98 |-c = (a +b)*(a - b) - 98 |+c = (a +b) * (a - b) -99 99 | #: E225 E226 -100 100 | c = (a+ b)*(a - b) -101 101 | #: +95 | #: E225 E226 +96 | i= i+1 +97 | #: E225 E226 + - c = (a +b)*(a - b) +98 + c = (a +b) * (a - b) +99 | #: E225 E226 +100 | c = (a+ b)*(a - b) +101 | #: E226 [*] Missing whitespace around arithmetic operator --> E22.py:100:7 @@ -341,16 +311,14 @@ E226 [*] Missing whitespace around arithmetic operator 101 | #: | help: Add missing whitespace - -ℹ Safe fix -97 97 | #: E225 E226 -98 98 | c = (a +b)*(a - b) -99 99 | #: E225 E226 -100 |-c = (a+ b)*(a - b) - 100 |+c = (a + b)*(a - b) -101 101 | #: -102 102 | -103 103 | #: E226 +97 | #: E225 E226 +98 | c = (a +b)*(a - b) +99 | #: E225 E226 + - c = (a+ b)*(a - b) +100 + c = (a + b)*(a - b) +101 | #: +102 | +103 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:100:11 @@ -362,16 +330,14 @@ E226 [*] Missing whitespace around arithmetic operator 101 | #: | help: Add missing whitespace - -ℹ Safe fix -97 97 | #: E225 E226 -98 98 | c = (a +b)*(a - b) -99 99 | #: E225 E226 -100 |-c = (a+ b)*(a - b) - 100 |+c = (a+ b) * (a - b) -101 101 | #: -102 102 | -103 103 | #: E226 +97 | #: E225 E226 +98 | c = (a +b)*(a - b) +99 | #: E225 E226 + - c = (a+ b)*(a - b) +100 + c = (a+ b) * (a - b) +101 | #: +102 | +103 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:104:6 @@ -383,16 +349,14 @@ E226 [*] Missing whitespace around arithmetic operator 106 | c = (a+b) * (a-b) | help: Add missing whitespace - -ℹ Safe fix -101 101 | #: -102 102 | -103 103 | #: E226 -104 |-z = 2//30 - 104 |+z = 2 // 30 -105 105 | #: E226 E226 -106 106 | c = (a+b) * (a-b) -107 107 | #: E226 +101 | #: +102 | +103 | #: E226 + - z = 2//30 +104 + z = 2 // 30 +105 | #: E226 E226 +106 | c = (a+b) * (a-b) +107 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:106:7 @@ -405,16 +369,14 @@ E226 [*] Missing whitespace around arithmetic operator 108 | norman = True+False | help: Add missing whitespace - -ℹ Safe fix -103 103 | #: E226 -104 104 | z = 2//30 -105 105 | #: E226 E226 -106 |-c = (a+b) * (a-b) - 106 |+c = (a + b) * (a-b) -107 107 | #: E226 -108 108 | norman = True+False -109 109 | #: E226 +103 | #: E226 +104 | z = 2//30 +105 | #: E226 E226 + - c = (a+b) * (a-b) +106 + c = (a + b) * (a-b) +107 | #: E226 +108 | norman = True+False +109 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:106:15 @@ -427,16 +389,14 @@ E226 [*] Missing whitespace around arithmetic operator 108 | norman = True+False | help: Add missing whitespace - -ℹ Safe fix -103 103 | #: E226 -104 104 | z = 2//30 -105 105 | #: E226 E226 -106 |-c = (a+b) * (a-b) - 106 |+c = (a+b) * (a - b) -107 107 | #: E226 -108 108 | norman = True+False -109 109 | #: E226 +103 | #: E226 +104 | z = 2//30 +105 | #: E226 E226 + - c = (a+b) * (a-b) +106 + c = (a+b) * (a - b) +107 | #: E226 +108 | norman = True+False +109 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:110:6 @@ -449,16 +409,14 @@ E226 [*] Missing whitespace around arithmetic operator 112 | x = x/2 - 1 | help: Add missing whitespace - -ℹ Safe fix -107 107 | #: E226 -108 108 | norman = True+False -109 109 | #: E226 -110 |-x = x*2 - 1 - 110 |+x = x * 2 - 1 -111 111 | #: E226 -112 112 | x = x/2 - 1 -113 113 | #: E226 E226 +107 | #: E226 +108 | norman = True+False +109 | #: E226 + - x = x*2 - 1 +110 + x = x * 2 - 1 +111 | #: E226 +112 | x = x/2 - 1 +113 | #: E226 E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:112:6 @@ -471,16 +429,14 @@ E226 [*] Missing whitespace around arithmetic operator 114 | hypot2 = x*x + y*y | help: Add missing whitespace - -ℹ Safe fix -109 109 | #: E226 -110 110 | x = x*2 - 1 -111 111 | #: E226 -112 |-x = x/2 - 1 - 112 |+x = x / 2 - 1 -113 113 | #: E226 E226 -114 114 | hypot2 = x*x + y*y -115 115 | #: E226 +109 | #: E226 +110 | x = x*2 - 1 +111 | #: E226 + - x = x/2 - 1 +112 + x = x / 2 - 1 +113 | #: E226 E226 +114 | hypot2 = x*x + y*y +115 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:114:11 @@ -493,16 +449,14 @@ E226 [*] Missing whitespace around arithmetic operator 116 | c = (a + b)*(a - b) | help: Add missing whitespace - -ℹ Safe fix -111 111 | #: E226 -112 112 | x = x/2 - 1 -113 113 | #: E226 E226 -114 |-hypot2 = x*x + y*y - 114 |+hypot2 = x * x + y*y -115 115 | #: E226 -116 116 | c = (a + b)*(a - b) -117 117 | #: E226 +111 | #: E226 +112 | x = x/2 - 1 +113 | #: E226 E226 + - hypot2 = x*x + y*y +114 + hypot2 = x * x + y*y +115 | #: E226 +116 | c = (a + b)*(a - b) +117 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:114:17 @@ -515,16 +469,14 @@ E226 [*] Missing whitespace around arithmetic operator 116 | c = (a + b)*(a - b) | help: Add missing whitespace - -ℹ Safe fix -111 111 | #: E226 -112 112 | x = x/2 - 1 -113 113 | #: E226 E226 -114 |-hypot2 = x*x + y*y - 114 |+hypot2 = x*x + y * y -115 115 | #: E226 -116 116 | c = (a + b)*(a - b) -117 117 | #: E226 +111 | #: E226 +112 | x = x/2 - 1 +113 | #: E226 E226 + - hypot2 = x*x + y*y +114 + hypot2 = x*x + y * y +115 | #: E226 +116 | c = (a + b)*(a - b) +117 | #: E226 E226 [*] Missing whitespace around arithmetic operator --> E22.py:116:12 @@ -537,16 +489,14 @@ E226 [*] Missing whitespace around arithmetic operator 118 | def halves(n): | help: Add missing whitespace - -ℹ Safe fix -113 113 | #: E226 E226 -114 114 | hypot2 = x*x + y*y -115 115 | #: E226 -116 |-c = (a + b)*(a - b) - 116 |+c = (a + b) * (a - b) -117 117 | #: E226 -118 118 | def halves(n): -119 119 | return (i//2 for i in range(n)) +113 | #: E226 E226 +114 | hypot2 = x*x + y*y +115 | #: E226 + - c = (a + b)*(a - b) +116 + c = (a + b) * (a - b) +117 | #: E226 +118 | def halves(n): +119 | return (i//2 for i in range(n)) E226 [*] Missing whitespace around arithmetic operator --> E22.py:119:14 @@ -559,13 +509,11 @@ E226 [*] Missing whitespace around arithmetic operator 121 | _1kB = _1MB>>10 | help: Add missing whitespace - -ℹ Safe fix -116 116 | c = (a + b)*(a - b) -117 117 | #: E226 -118 118 | def halves(n): -119 |- return (i//2 for i in range(n)) - 119 |+ return (i // 2 for i in range(n)) -120 120 | #: E227 -121 121 | _1kB = _1MB>>10 -122 122 | #: E227 +116 | c = (a + b)*(a - b) +117 | #: E226 +118 | def halves(n): + - return (i//2 for i in range(n)) +119 + return (i // 2 for i in range(n)) +120 | #: E227 +121 | _1kB = _1MB>>10 +122 | #: E227 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap index da81b27486..46be0b7b6f 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E227_E22.py.snap @@ -12,16 +12,14 @@ E227 [*] Missing whitespace around bitwise or shift operator 74 | _1kB = _1MB>> 10 | help: Add missing whitespace - -ℹ Safe fix -69 69 | #: E225 -70 70 | z = (x + 1)** y -71 71 | #: E225 -72 |-_1kB = _1MB >>10 - 72 |+_1kB = _1MB >> 10 -73 73 | #: E225 -74 74 | _1kB = _1MB>> 10 -75 75 | #: E225 E225 +69 | #: E225 +70 | z = (x + 1)** y +71 | #: E225 + - _1kB = _1MB >>10 +72 + _1kB = _1MB >> 10 +73 | #: E225 +74 | _1kB = _1MB>> 10 +75 | #: E225 E225 E227 [*] Missing whitespace around bitwise or shift operator --> E22.py:74:12 @@ -34,16 +32,14 @@ E227 [*] Missing whitespace around bitwise or shift operator 76 | i=i+ 1 | help: Add missing whitespace - -ℹ Safe fix -71 71 | #: E225 -72 72 | _1kB = _1MB >>10 -73 73 | #: E225 -74 |-_1kB = _1MB>> 10 - 74 |+_1kB = _1MB >> 10 -75 75 | #: E225 E225 -76 76 | i=i+ 1 -77 77 | #: E225 E225 +71 | #: E225 +72 | _1kB = _1MB >>10 +73 | #: E225 + - _1kB = _1MB>> 10 +74 + _1kB = _1MB >> 10 +75 | #: E225 E225 +76 | i=i+ 1 +77 | #: E225 E225 E227 [*] Missing whitespace around bitwise or shift operator --> E22.py:121:12 @@ -56,16 +52,14 @@ E227 [*] Missing whitespace around bitwise or shift operator 123 | _1MB = _1kB<<10 | help: Add missing whitespace - -ℹ Safe fix -118 118 | def halves(n): -119 119 | return (i//2 for i in range(n)) -120 120 | #: E227 -121 |-_1kB = _1MB>>10 - 121 |+_1kB = _1MB >> 10 -122 122 | #: E227 -123 123 | _1MB = _1kB<<10 -124 124 | #: E227 +118 | def halves(n): +119 | return (i//2 for i in range(n)) +120 | #: E227 + - _1kB = _1MB>>10 +121 + _1kB = _1MB >> 10 +122 | #: E227 +123 | _1MB = _1kB<<10 +124 | #: E227 E227 [*] Missing whitespace around bitwise or shift operator --> E22.py:123:12 @@ -78,16 +72,14 @@ E227 [*] Missing whitespace around bitwise or shift operator 125 | a = b|c | help: Add missing whitespace - -ℹ Safe fix -120 120 | #: E227 -121 121 | _1kB = _1MB>>10 -122 122 | #: E227 -123 |-_1MB = _1kB<<10 - 123 |+_1MB = _1kB << 10 -124 124 | #: E227 -125 125 | a = b|c -126 126 | #: E227 +120 | #: E227 +121 | _1kB = _1MB>>10 +122 | #: E227 + - _1MB = _1kB<<10 +123 + _1MB = _1kB << 10 +124 | #: E227 +125 | a = b|c +126 | #: E227 E227 [*] Missing whitespace around bitwise or shift operator --> E22.py:125:6 @@ -100,16 +92,14 @@ E227 [*] Missing whitespace around bitwise or shift operator 127 | b = c&a | help: Add missing whitespace - -ℹ Safe fix -122 122 | #: E227 -123 123 | _1MB = _1kB<<10 -124 124 | #: E227 -125 |-a = b|c - 125 |+a = b | c -126 126 | #: E227 -127 127 | b = c&a -128 128 | #: E227 +122 | #: E227 +123 | _1MB = _1kB<<10 +124 | #: E227 + - a = b|c +125 + a = b | c +126 | #: E227 +127 | b = c&a +128 | #: E227 E227 [*] Missing whitespace around bitwise or shift operator --> E22.py:127:6 @@ -122,16 +112,14 @@ E227 [*] Missing whitespace around bitwise or shift operator 129 | c = b^a | help: Add missing whitespace - -ℹ Safe fix -124 124 | #: E227 -125 125 | a = b|c -126 126 | #: E227 -127 |-b = c&a - 127 |+b = c & a -128 128 | #: E227 -129 129 | c = b^a -130 130 | #: E228 +124 | #: E227 +125 | a = b|c +126 | #: E227 + - b = c&a +127 + b = c & a +128 | #: E227 +129 | c = b^a +130 | #: E228 E227 [*] Missing whitespace around bitwise or shift operator --> E22.py:129:6 @@ -144,16 +132,14 @@ E227 [*] Missing whitespace around bitwise or shift operator 131 | a = b%c | help: Add missing whitespace - -ℹ Safe fix -126 126 | #: E227 -127 127 | b = c&a -128 128 | #: E227 -129 |-c = b^a - 129 |+c = b ^ a -130 130 | #: E228 -131 131 | a = b%c -132 132 | #: E228 +126 | #: E227 +127 | b = c&a +128 | #: E227 + - c = b^a +129 + c = b ^ a +130 | #: E228 +131 | a = b%c +132 | #: E228 E227 [*] Missing whitespace around bitwise or shift operator --> E22.py:154:11 @@ -166,13 +152,11 @@ E227 [*] Missing whitespace around bitwise or shift operator 156 | x = x / 2 - 1 | help: Add missing whitespace - -ℹ Safe fix -151 151 | func1(lambda *args, **kw: (args, kw)) -152 152 | func2(lambda a, b=h[:], c=0: (a, b, c)) -153 153 | if not -5 < x < +5: -154 |- print >>sys.stderr, "x is out of range." - 154 |+ print >> sys.stderr, "x is out of range." -155 155 | print >> sys.stdout, "x is an integer." -156 156 | x = x / 2 - 1 -157 157 | x = 1 @ 2 +151 | func1(lambda *args, **kw: (args, kw)) +152 | func2(lambda a, b=h[:], c=0: (a, b, c)) +153 | if not -5 < x < +5: + - print >>sys.stderr, "x is out of range." +154 + print >> sys.stderr, "x is out of range." +155 | print >> sys.stdout, "x is an integer." +156 | x = x / 2 - 1 +157 | x = 1 @ 2 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap index c6ee2bea2c..7361b9d036 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E228_E22.py.snap @@ -12,16 +12,14 @@ E228 [*] Missing whitespace around modulo operator 133 | msg = fmt%(errno, errmsg) | help: Add missing whitespace - -ℹ Safe fix -128 128 | #: E227 -129 129 | c = b^a -130 130 | #: E228 -131 |-a = b%c - 131 |+a = b % c -132 132 | #: E228 -133 133 | msg = fmt%(errno, errmsg) -134 134 | #: E228 +128 | #: E227 +129 | c = b^a +130 | #: E228 + - a = b%c +131 + a = b % c +132 | #: E228 +133 | msg = fmt%(errno, errmsg) +134 | #: E228 E228 [*] Missing whitespace around modulo operator --> E22.py:133:10 @@ -34,16 +32,14 @@ E228 [*] Missing whitespace around modulo operator 135 | msg = "Error %d occurred"%errno | help: Add missing whitespace - -ℹ Safe fix -130 130 | #: E228 -131 131 | a = b%c -132 132 | #: E228 -133 |-msg = fmt%(errno, errmsg) - 133 |+msg = fmt % (errno, errmsg) -134 134 | #: E228 -135 135 | msg = "Error %d occurred"%errno -136 136 | #: +130 | #: E228 +131 | a = b%c +132 | #: E228 + - msg = fmt%(errno, errmsg) +133 + msg = fmt % (errno, errmsg) +134 | #: E228 +135 | msg = "Error %d occurred"%errno +136 | #: E228 [*] Missing whitespace around modulo operator --> E22.py:135:26 @@ -55,13 +51,11 @@ E228 [*] Missing whitespace around modulo operator 136 | #: | help: Add missing whitespace - -ℹ Safe fix -132 132 | #: E228 -133 133 | msg = fmt%(errno, errmsg) -134 134 | #: E228 -135 |-msg = "Error %d occurred"%errno - 135 |+msg = "Error %d occurred" % errno -136 136 | #: -137 137 | -138 138 | #: Okay +132 | #: E228 +133 | msg = fmt%(errno, errmsg) +134 | #: E228 + - msg = "Error %d occurred"%errno +135 + msg = "Error %d occurred" % errno +136 | #: +137 | +138 | #: Okay diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap index df5b5a5502..c210a6768b 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E231_E23.py.snap @@ -11,14 +11,12 @@ E231 [*] Missing whitespace after ',' 4 | a[b1,:] | help: Add missing whitespace - -ℹ Safe fix -1 1 | #: E231 -2 |-a = (1,2) - 2 |+a = (1, 2) -3 3 | #: E231 -4 4 | a[b1,:] -5 5 | #: E231 +1 | #: E231 + - a = (1,2) +2 + a = (1, 2) +3 | #: E231 +4 | a[b1,:] +5 | #: E231 E231 [*] Missing whitespace after ',' --> E23.py:4:5 @@ -31,16 +29,14 @@ E231 [*] Missing whitespace after ',' 6 | a = [{'a':''}] | help: Add missing whitespace - -ℹ Safe fix -1 1 | #: E231 -2 2 | a = (1,2) -3 3 | #: E231 -4 |-a[b1,:] - 4 |+a[b1, :] -5 5 | #: E231 -6 6 | a = [{'a':''}] -7 7 | #: Okay +1 | #: E231 +2 | a = (1,2) +3 | #: E231 + - a[b1,:] +4 + a[b1, :] +5 | #: E231 +6 | a = [{'a':''}] +7 | #: Okay E231 [*] Missing whitespace after ':' --> E23.py:6:10 @@ -53,16 +49,14 @@ E231 [*] Missing whitespace after ':' 8 | a = (4,) | help: Add missing whitespace - -ℹ Safe fix -3 3 | #: E231 -4 4 | a[b1,:] -5 5 | #: E231 -6 |-a = [{'a':''}] - 6 |+a = [{'a': ''}] -7 7 | #: Okay -8 8 | a = (4,) -9 9 | b = (5, ) +3 | #: E231 +4 | a[b1,:] +5 | #: E231 + - a = [{'a':''}] +6 + a = [{'a': ''}] +7 | #: Okay +8 | a = (4,) +9 | b = (5, ) E231 [*] Missing whitespace after ',' --> E23.py:19:10 @@ -74,16 +68,14 @@ E231 [*] Missing whitespace after ',' 20 | pass | help: Add missing whitespace - -ℹ Safe fix -16 16 | -17 17 | def foo() -> None: -18 18 | #: E231 -19 |- if (1,2): - 19 |+ if (1, 2): -20 20 | pass -21 21 | -22 22 | #: Okay +16 | +17 | def foo() -> None: +18 | #: E231 + - if (1,2): +19 + if (1, 2): +20 | pass +21 | +22 | #: Okay E231 [*] Missing whitespace after ':' --> E23.py:29:20 @@ -95,16 +87,14 @@ E231 [*] Missing whitespace after ':' 30 | } | help: Add missing whitespace - -ℹ Safe fix -26 26 | #: E231:2:20 -27 27 | mdtypes_template = { -28 28 | 'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')], -29 |- 'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')], - 29 |+ 'tag_smalldata': [('byte_count_mdtype', 'u4'), ('data', 'S4')], -30 30 | } -31 31 | -32 32 | # E231 +26 | #: E231:2:20 +27 | mdtypes_template = { +28 | 'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')], + - 'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')], +29 + 'tag_smalldata': [('byte_count_mdtype', 'u4'), ('data', 'S4')], +30 | } +31 | +32 | # E231 E231 [*] Missing whitespace after ',' --> E23.py:33:6 @@ -116,16 +106,14 @@ E231 [*] Missing whitespace after ',' 35 | # Okay because it's hard to differentiate between the usages of a colon in a f-string | help: Add missing whitespace - -ℹ Safe fix -30 30 | } -31 31 | -32 32 | # E231 -33 |-f"{(a,b)}" - 33 |+f"{(a, b)}" -34 34 | -35 35 | # Okay because it's hard to differentiate between the usages of a colon in a f-string -36 36 | f"{a:=1}" +30 | } +31 | +32 | # E231 + - f"{(a,b)}" +33 + f"{(a, b)}" +34 | +35 | # Okay because it's hard to differentiate between the usages of a colon in a f-string +36 | f"{a:=1}" E231 [*] Missing whitespace after ':' --> E23.py:47:37 @@ -137,16 +125,14 @@ E231 [*] Missing whitespace after ':' 49 | #: Okay | help: Add missing whitespace - -ℹ Safe fix -44 44 | snapshot.file_uri[len(f's3://{self.s3_bucket_name}/'):] -45 45 | -46 46 | #: E231 -47 |-{len(f's3://{self.s3_bucket_name}/'):1} - 47 |+{len(f's3://{self.s3_bucket_name}/'): 1} -48 48 | -49 49 | #: Okay -50 50 | a = (1,) +44 | snapshot.file_uri[len(f's3://{self.s3_bucket_name}/'):] +45 | +46 | #: E231 + - {len(f's3://{self.s3_bucket_name}/'):1} +47 + {len(f's3://{self.s3_bucket_name}/'): 1} +48 | +49 | #: Okay +50 | a = (1,) E231 [*] Missing whitespace after ':' --> E23.py:60:13 @@ -159,16 +145,14 @@ E231 [*] Missing whitespace after ':' 62 | results_in_tuple = ( | help: Add missing whitespace - -ℹ Safe fix -57 57 | """Primary function.""" -58 58 | results = { -59 59 | "k1": [1], -60 |- "k2":[2], - 60 |+ "k2": [2], -61 61 | } -62 62 | results_in_tuple = ( -63 63 | { +57 | """Primary function.""" +58 | results = { +59 | "k1": [1], + - "k2":[2], +60 + "k2": [2], +61 | } +62 | results_in_tuple = ( +63 | { E231 [*] Missing whitespace after ':' --> E23.py:65:17 @@ -181,16 +165,14 @@ E231 [*] Missing whitespace after ':' 67 | ) | help: Add missing whitespace - -ℹ Safe fix -62 62 | results_in_tuple = ( -63 63 | { -64 64 | "k1": [1], -65 |- "k2":[2], - 65 |+ "k2": [2], -66 66 | }, -67 67 | ) -68 68 | results_in_list = [ +62 | results_in_tuple = ( +63 | { +64 | "k1": [1], + - "k2":[2], +65 + "k2": [2], +66 | }, +67 | ) +68 | results_in_list = [ E231 [*] Missing whitespace after ':' --> E23.py:71:17 @@ -203,16 +185,14 @@ E231 [*] Missing whitespace after ':' 73 | ] | help: Add missing whitespace - -ℹ Safe fix -68 68 | results_in_list = [ -69 69 | { -70 70 | "k1": [1], -71 |- "k2":[2], - 71 |+ "k2": [2], -72 72 | } -73 73 | ] -74 74 | results_in_list_first = [ +68 | results_in_list = [ +69 | { +70 | "k1": [1], + - "k2":[2], +71 + "k2": [2], +72 | } +73 | ] +74 | results_in_list_first = [ E231 [*] Missing whitespace after ':' --> E23.py:76:17 @@ -225,16 +205,14 @@ E231 [*] Missing whitespace after ':' 78 | ] | help: Add missing whitespace - -ℹ Safe fix -73 73 | ] -74 74 | results_in_list_first = [ -75 75 | { -76 |- "k2":[2], - 76 |+ "k2": [2], -77 77 | } -78 78 | ] -79 79 | +73 | ] +74 | results_in_list_first = [ +75 | { + - "k2":[2], +76 + "k2": [2], +77 | } +78 | ] +79 | E231 [*] Missing whitespace after ':' --> E23.py:82:13 @@ -247,16 +225,14 @@ E231 [*] Missing whitespace after ':' 84 | "k3":[2], # E231 | help: Add missing whitespace - -ℹ Safe fix -79 79 | -80 80 | x = [ -81 81 | { -82 |- "k1":[2], # E231 - 82 |+ "k1": [2], # E231 -83 83 | "k2": x[2:4], -84 84 | "k3":[2], # E231 -85 85 | "k4": [2], +79 | +80 | x = [ +81 | { + - "k1":[2], # E231 +82 + "k1": [2], # E231 +83 | "k2": x[2:4], +84 | "k3":[2], # E231 +85 | "k4": [2], E231 [*] Missing whitespace after ':' --> E23.py:84:13 @@ -269,16 +245,14 @@ E231 [*] Missing whitespace after ':' 86 | "k5": [2], | help: Add missing whitespace - -ℹ Safe fix -81 81 | { -82 82 | "k1":[2], # E231 -83 83 | "k2": x[2:4], -84 |- "k3":[2], # E231 - 84 |+ "k3": [2], # E231 -85 85 | "k4": [2], -86 86 | "k5": [2], -87 87 | "k6": [1, 2, 3, 4,5,6,7] # E231 +81 | { +82 | "k1":[2], # E231 +83 | "k2": x[2:4], + - "k3":[2], # E231 +84 + "k3": [2], # E231 +85 | "k4": [2], +86 | "k5": [2], +87 | "k6": [1, 2, 3, 4,5,6,7] # E231 E231 [*] Missing whitespace after ',' --> E23.py:87:26 @@ -291,16 +265,14 @@ E231 [*] Missing whitespace after ',' 89 | { | help: Add missing whitespace - -ℹ Safe fix -84 84 | "k3":[2], # E231 -85 85 | "k4": [2], -86 86 | "k5": [2], -87 |- "k6": [1, 2, 3, 4,5,6,7] # E231 - 87 |+ "k6": [1, 2, 3, 4, 5,6,7] # E231 -88 88 | }, -89 89 | { -90 90 | "k1": [ +84 | "k3":[2], # E231 +85 | "k4": [2], +86 | "k5": [2], + - "k6": [1, 2, 3, 4,5,6,7] # E231 +87 + "k6": [1, 2, 3, 4, 5,6,7] # E231 +88 | }, +89 | { +90 | "k1": [ E231 [*] Missing whitespace after ',' --> E23.py:87:28 @@ -313,16 +285,14 @@ E231 [*] Missing whitespace after ',' 89 | { | help: Add missing whitespace - -ℹ Safe fix -84 84 | "k3":[2], # E231 -85 85 | "k4": [2], -86 86 | "k5": [2], -87 |- "k6": [1, 2, 3, 4,5,6,7] # E231 - 87 |+ "k6": [1, 2, 3, 4,5, 6,7] # E231 -88 88 | }, -89 89 | { -90 90 | "k1": [ +84 | "k3":[2], # E231 +85 | "k4": [2], +86 | "k5": [2], + - "k6": [1, 2, 3, 4,5,6,7] # E231 +87 + "k6": [1, 2, 3, 4,5, 6,7] # E231 +88 | }, +89 | { +90 | "k1": [ E231 [*] Missing whitespace after ',' --> E23.py:87:30 @@ -335,16 +305,14 @@ E231 [*] Missing whitespace after ',' 89 | { | help: Add missing whitespace - -ℹ Safe fix -84 84 | "k3":[2], # E231 -85 85 | "k4": [2], -86 86 | "k5": [2], -87 |- "k6": [1, 2, 3, 4,5,6,7] # E231 - 87 |+ "k6": [1, 2, 3, 4,5,6, 7] # E231 -88 88 | }, -89 89 | { -90 90 | "k1": [ +84 | "k3":[2], # E231 +85 | "k4": [2], +86 | "k5": [2], + - "k6": [1, 2, 3, 4,5,6,7] # E231 +87 + "k6": [1, 2, 3, 4,5,6, 7] # E231 +88 | }, +89 | { +90 | "k1": [ E231 [*] Missing whitespace after ':' --> E23.py:92:21 @@ -357,16 +325,14 @@ E231 [*] Missing whitespace after ':' 94 | { | help: Add missing whitespace - -ℹ Safe fix -89 89 | { -90 90 | "k1": [ -91 91 | { -92 |- "ka":[2,3], # E231 - 92 |+ "ka": [2,3], # E231 -93 93 | }, -94 94 | { -95 95 | "kb": [2,3], # E231 +89 | { +90 | "k1": [ +91 | { + - "ka":[2,3], # E231 +92 + "ka": [2,3], # E231 +93 | }, +94 | { +95 | "kb": [2,3], # E231 E231 [*] Missing whitespace after ',' --> E23.py:92:24 @@ -379,16 +345,14 @@ E231 [*] Missing whitespace after ',' 94 | { | help: Add missing whitespace - -ℹ Safe fix -89 89 | { -90 90 | "k1": [ -91 91 | { -92 |- "ka":[2,3], # E231 - 92 |+ "ka":[2, 3], # E231 -93 93 | }, -94 94 | { -95 95 | "kb": [2,3], # E231 +89 | { +90 | "k1": [ +91 | { + - "ka":[2,3], # E231 +92 + "ka":[2, 3], # E231 +93 | }, +94 | { +95 | "kb": [2,3], # E231 E231 [*] Missing whitespace after ',' --> E23.py:95:25 @@ -401,16 +365,14 @@ E231 [*] Missing whitespace after ',' 97 | { | help: Add missing whitespace - -ℹ Safe fix -92 92 | "ka":[2,3], # E231 -93 93 | }, -94 94 | { -95 |- "kb": [2,3], # E231 - 95 |+ "kb": [2, 3], # E231 -96 96 | }, -97 97 | { -98 98 | "ka":[2, 3], # E231 +92 | "ka":[2,3], # E231 +93 | }, +94 | { + - "kb": [2,3], # E231 +95 + "kb": [2, 3], # E231 +96 | }, +97 | { +98 | "ka":[2, 3], # E231 E231 [*] Missing whitespace after ':' --> E23.py:98:21 @@ -423,16 +385,14 @@ E231 [*] Missing whitespace after ':' 100 | "kc": [2, 3], # Ok | help: Add missing whitespace - -ℹ Safe fix -95 95 | "kb": [2,3], # E231 -96 96 | }, -97 97 | { -98 |- "ka":[2, 3], # E231 - 98 |+ "ka": [2, 3], # E231 -99 99 | "kb": [2, 3], # Ok -100 100 | "kc": [2, 3], # Ok -101 101 | "kd": [2,3], # E231 +95 | "kb": [2,3], # E231 +96 | }, +97 | { + - "ka":[2, 3], # E231 +98 + "ka": [2, 3], # E231 +99 | "kb": [2, 3], # Ok +100 | "kc": [2, 3], # Ok +101 | "kd": [2,3], # E231 E231 [*] Missing whitespace after ',' --> E23.py:101:25 @@ -445,16 +405,14 @@ E231 [*] Missing whitespace after ',' 103 | }, | help: Add missing whitespace - -ℹ Safe fix -98 98 | "ka":[2, 3], # E231 -99 99 | "kb": [2, 3], # Ok -100 100 | "kc": [2, 3], # Ok -101 |- "kd": [2,3], # E231 - 101 |+ "kd": [2, 3], # E231 -102 102 | "ke":[2,3], # E231 -103 103 | }, -104 104 | ] +98 | "ka":[2, 3], # E231 +99 | "kb": [2, 3], # Ok +100 | "kc": [2, 3], # Ok + - "kd": [2,3], # E231 +101 + "kd": [2, 3], # E231 +102 | "ke":[2,3], # E231 +103 | }, +104 | ] E231 [*] Missing whitespace after ':' --> E23.py:102:21 @@ -467,16 +425,14 @@ E231 [*] Missing whitespace after ':' 104 | ] | help: Add missing whitespace - -ℹ Safe fix -99 99 | "kb": [2, 3], # Ok -100 100 | "kc": [2, 3], # Ok -101 101 | "kd": [2,3], # E231 -102 |- "ke":[2,3], # E231 - 102 |+ "ke": [2,3], # E231 -103 103 | }, -104 104 | ] -105 105 | } +99 | "kb": [2, 3], # Ok +100 | "kc": [2, 3], # Ok +101 | "kd": [2,3], # E231 + - "ke":[2,3], # E231 +102 + "ke": [2,3], # E231 +103 | }, +104 | ] +105 | } E231 [*] Missing whitespace after ',' --> E23.py:102:24 @@ -489,16 +445,14 @@ E231 [*] Missing whitespace after ',' 104 | ] | help: Add missing whitespace - -ℹ Safe fix -99 99 | "kb": [2, 3], # Ok -100 100 | "kc": [2, 3], # Ok -101 101 | "kd": [2,3], # E231 -102 |- "ke":[2,3], # E231 - 102 |+ "ke":[2, 3], # E231 -103 103 | }, -104 104 | ] -105 105 | } +99 | "kb": [2, 3], # Ok +100 | "kc": [2, 3], # Ok +101 | "kd": [2,3], # E231 + - "ke":[2,3], # E231 +102 + "ke":[2, 3], # E231 +103 | }, +104 | ] +105 | } E231 [*] Missing whitespace after ':' --> E23.py:109:18 @@ -510,16 +464,14 @@ E231 [*] Missing whitespace after ':' 111 | y:B = [[["foo", "bar"]]], | help: Add missing whitespace - -ℹ Safe fix -106 106 | ] -107 107 | -108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults -109 |-def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( - 109 |+def pep_696_bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -110 110 | x:A = "foo"[::-1], -111 111 | y:B = [[["foo", "bar"]]], -112 112 | z:object = "fooo", +106 | ] +107 | +108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults + - def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +109 + def pep_696_bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +110 | x:A = "foo"[::-1], +111 | y:B = [[["foo", "bar"]]], +112 | z:object = "fooo", E231 [*] Missing whitespace after ':' --> E23.py:109:40 @@ -531,16 +483,14 @@ E231 [*] Missing whitespace after ':' 111 | y:B = [[["foo", "bar"]]], | help: Add missing whitespace - -ℹ Safe fix -106 106 | ] -107 107 | -108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults -109 |-def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( - 109 |+def pep_696_bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]( -110 110 | x:A = "foo"[::-1], -111 111 | y:B = [[["foo", "bar"]]], -112 112 | z:object = "fooo", +106 | ] +107 | +108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults + - def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +109 + def pep_696_bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]( +110 | x:A = "foo"[::-1], +111 | y:B = [[["foo", "bar"]]], +112 | z:object = "fooo", E231 [*] Missing whitespace after ':' --> E23.py:109:70 @@ -552,16 +502,14 @@ E231 [*] Missing whitespace after ':' 111 | y:B = [[["foo", "bar"]]], | help: Add missing whitespace - -ℹ Safe fix -106 106 | ] -107 107 | -108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults -109 |-def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( - 109 |+def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]( -110 110 | x:A = "foo"[::-1], -111 111 | y:B = [[["foo", "bar"]]], -112 112 | z:object = "fooo", +106 | ] +107 | +108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults + - def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +109 + def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]( +110 | x:A = "foo"[::-1], +111 | y:B = [[["foo", "bar"]]], +112 | z:object = "fooo", E231 [*] Missing whitespace after ':' --> E23.py:110:6 @@ -574,16 +522,14 @@ E231 [*] Missing whitespace after ':' 112 | z:object = "fooo", | help: Add missing whitespace - -ℹ Safe fix -107 107 | -108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults -109 109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -110 |- x:A = "foo"[::-1], - 110 |+ x: A = "foo"[::-1], -111 111 | y:B = [[["foo", "bar"]]], -112 112 | z:object = "fooo", -113 113 | ): +107 | +108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults +109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( + - x:A = "foo"[::-1], +110 + x: A = "foo"[::-1], +111 | y:B = [[["foo", "bar"]]], +112 | z:object = "fooo", +113 | ): E231 [*] Missing whitespace after ':' --> E23.py:111:6 @@ -596,16 +542,14 @@ E231 [*] Missing whitespace after ':' 113 | ): | help: Add missing whitespace - -ℹ Safe fix -108 108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults -109 109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -110 110 | x:A = "foo"[::-1], -111 |- y:B = [[["foo", "bar"]]], - 111 |+ y: B = [[["foo", "bar"]]], -112 112 | z:object = "fooo", -113 113 | ): -114 114 | pass +108 | # Should be E231 errors on all of these type parameters and function parameters, but not on their (strange) defaults +109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +110 | x:A = "foo"[::-1], + - y:B = [[["foo", "bar"]]], +111 + y: B = [[["foo", "bar"]]], +112 | z:object = "fooo", +113 | ): +114 | pass E231 [*] Missing whitespace after ':' --> E23.py:112:6 @@ -618,16 +562,14 @@ E231 [*] Missing whitespace after ':' 114 | pass | help: Add missing whitespace - -ℹ Safe fix -109 109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -110 110 | x:A = "foo"[::-1], -111 111 | y:B = [[["foo", "bar"]]], -112 |- z:object = "fooo", - 112 |+ z: object = "fooo", -113 113 | ): -114 114 | pass -115 115 | +109 | def pep_696_bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +110 | x:A = "foo"[::-1], +111 | y:B = [[["foo", "bar"]]], + - z:object = "fooo", +112 + z: object = "fooo", +113 | ): +114 | pass +115 | E231 [*] Missing whitespace after ':' --> E23.py:116:18 @@ -640,16 +582,14 @@ E231 [*] Missing whitespace after ':' 118 | self, | help: Add missing whitespace - -ℹ Safe fix -113 113 | ): -114 114 | pass -115 115 | -116 |-class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: - 116 |+class PEP696Bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: -117 117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -118 118 | self, -119 119 | x:A = "foo"[::-1], +113 | ): +114 | pass +115 | + - class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: +116 + class PEP696Bad[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: +117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +118 | self, +119 | x:A = "foo"[::-1], E231 [*] Missing whitespace after ':' --> E23.py:116:40 @@ -662,16 +602,14 @@ E231 [*] Missing whitespace after ':' 118 | self, | help: Add missing whitespace - -ℹ Safe fix -113 113 | ): -114 114 | pass -115 115 | -116 |-class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: - 116 |+class PEP696Bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]: -117 117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -118 118 | self, -119 119 | x:A = "foo"[::-1], +113 | ): +114 | pass +115 | + - class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: +116 + class PEP696Bad[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]: +117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +118 | self, +119 | x:A = "foo"[::-1], E231 [*] Missing whitespace after ':' --> E23.py:116:70 @@ -684,16 +622,14 @@ E231 [*] Missing whitespace after ':' 118 | self, | help: Add missing whitespace - -ℹ Safe fix -113 113 | ): -114 114 | pass -115 115 | -116 |-class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: - 116 |+class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]: -117 117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -118 118 | self, -119 119 | x:A = "foo"[::-1], +113 | ): +114 | pass +115 | + - class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: +116 + class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]: +117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +118 | self, +119 | x:A = "foo"[::-1], E231 [*] Missing whitespace after ':' --> E23.py:117:29 @@ -705,16 +641,14 @@ E231 [*] Missing whitespace after ':' 119 | x:A = "foo"[::-1], | help: Add missing whitespace - -ℹ Safe fix -114 114 | pass -115 115 | -116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: -117 |- def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( - 117 |+ def pep_696_bad_method[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -118 118 | self, -119 119 | x:A = "foo"[::-1], -120 120 | y:B = [[["foo", "bar"]]], +114 | pass +115 | +116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: + - def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +117 + def pep_696_bad_method[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +118 | self, +119 | x:A = "foo"[::-1], +120 | y:B = [[["foo", "bar"]]], E231 [*] Missing whitespace after ':' --> E23.py:117:51 @@ -726,16 +660,14 @@ E231 [*] Missing whitespace after ':' 119 | x:A = "foo"[::-1], | help: Add missing whitespace - -ℹ Safe fix -114 114 | pass -115 115 | -116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: -117 |- def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( - 117 |+ def pep_696_bad_method[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]( -118 118 | self, -119 119 | x:A = "foo"[::-1], -120 120 | y:B = [[["foo", "bar"]]], +114 | pass +115 | +116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: + - def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +117 + def pep_696_bad_method[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes]( +118 | self, +119 | x:A = "foo"[::-1], +120 | y:B = [[["foo", "bar"]]], E231 [*] Missing whitespace after ':' --> E23.py:117:81 @@ -747,16 +679,14 @@ E231 [*] Missing whitespace after ':' 119 | x:A = "foo"[::-1], | help: Add missing whitespace - -ℹ Safe fix -114 114 | pass -115 115 | -116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: -117 |- def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( - 117 |+ def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]( -118 118 | self, -119 119 | x:A = "foo"[::-1], -120 120 | y:B = [[["foo", "bar"]]], +114 | pass +115 | +116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: + - def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +117 + def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes]( +118 | self, +119 | x:A = "foo"[::-1], +120 | y:B = [[["foo", "bar"]]], E231 [*] Missing whitespace after ':' --> E23.py:119:10 @@ -769,16 +699,14 @@ E231 [*] Missing whitespace after ':' 121 | z:object = "fooo", | help: Add missing whitespace - -ℹ Safe fix -116 116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: -117 117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -118 118 | self, -119 |- x:A = "foo"[::-1], - 119 |+ x: A = "foo"[::-1], -120 120 | y:B = [[["foo", "bar"]]], -121 121 | z:object = "fooo", -122 122 | ): +116 | class PEP696Bad[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]: +117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +118 | self, + - x:A = "foo"[::-1], +119 + x: A = "foo"[::-1], +120 | y:B = [[["foo", "bar"]]], +121 | z:object = "fooo", +122 | ): E231 [*] Missing whitespace after ':' --> E23.py:120:10 @@ -791,16 +719,14 @@ E231 [*] Missing whitespace after ':' 122 | ): | help: Add missing whitespace - -ℹ Safe fix -117 117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( -118 118 | self, -119 119 | x:A = "foo"[::-1], -120 |- y:B = [[["foo", "bar"]]], - 120 |+ y: B = [[["foo", "bar"]]], -121 121 | z:object = "fooo", -122 122 | ): -123 123 | pass +117 | def pep_696_bad_method[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes]( +118 | self, +119 | x:A = "foo"[::-1], + - y:B = [[["foo", "bar"]]], +120 + y: B = [[["foo", "bar"]]], +121 | z:object = "fooo", +122 | ): +123 | pass E231 [*] Missing whitespace after ':' --> E23.py:121:10 @@ -813,16 +739,14 @@ E231 [*] Missing whitespace after ':' 123 | pass | help: Add missing whitespace - -ℹ Safe fix -118 118 | self, -119 119 | x:A = "foo"[::-1], -120 120 | y:B = [[["foo", "bar"]]], -121 |- z:object = "fooo", - 121 |+ z: object = "fooo", -122 122 | ): -123 123 | pass -124 124 | +118 | self, +119 | x:A = "foo"[::-1], +120 | y:B = [[["foo", "bar"]]], + - z:object = "fooo", +121 + z: object = "fooo", +122 | ): +123 | pass +124 | E231 [*] Missing whitespace after ':' --> E23.py:125:32 @@ -835,16 +759,14 @@ E231 [*] Missing whitespace after ':' 127 | pass | help: Add missing whitespace - -ℹ Safe fix -122 122 | ): -123 123 | pass -124 124 | -125 |-class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): - 125 |+class PEP696BadWithEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): -126 126 | class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): -127 127 | pass -128 128 | +122 | ): +123 | pass +124 | + - class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): +125 + class PEP696BadWithEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): +126 | class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +127 | pass +128 | E231 [*] Missing whitespace after ':' --> E23.py:125:54 @@ -857,16 +779,14 @@ E231 [*] Missing whitespace after ':' 127 | pass | help: Add missing whitespace - -ℹ Safe fix -122 122 | ): -123 123 | pass -124 124 | -125 |-class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): - 125 |+class PEP696BadWithEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](): -126 126 | class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): -127 127 | pass -128 128 | +122 | ): +123 | pass +124 | + - class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): +125 + class PEP696BadWithEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](): +126 | class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +127 | pass +128 | E231 [*] Missing whitespace after ':' --> E23.py:125:84 @@ -879,16 +799,14 @@ E231 [*] Missing whitespace after ':' 127 | pass | help: Add missing whitespace - -ℹ Safe fix -122 122 | ): -123 123 | pass -124 124 | -125 |-class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): - 125 |+class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](): -126 126 | class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): -127 127 | pass -128 128 | +122 | ): +123 | pass +124 | + - class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): +125 + class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](): +126 | class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +127 | pass +128 | E231 [*] Missing whitespace after ':' --> E23.py:126:47 @@ -899,16 +817,14 @@ E231 [*] Missing whitespace after ':' 127 | pass | help: Add missing whitespace - -ℹ Safe fix -123 123 | pass -124 124 | -125 125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): -126 |- class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): - 126 |+ class IndentedPEP696BadWithNonEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): -127 127 | pass -128 128 | -129 129 | # Should be no E231 errors on any of these: +123 | pass +124 | +125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): + - class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +126 + class IndentedPEP696BadWithNonEmptyBases[A: object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +127 | pass +128 | +129 | # Should be no E231 errors on any of these: E231 [*] Missing whitespace after ':' --> E23.py:126:69 @@ -919,16 +835,14 @@ E231 [*] Missing whitespace after ':' 127 | pass | help: Add missing whitespace - -ℹ Safe fix -123 123 | pass -124 124 | -125 125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): -126 |- class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): - 126 |+ class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): -127 127 | pass -128 128 | -129 129 | # Should be no E231 errors on any of these: +123 | pass +124 | +125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): + - class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +126 + class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B: object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +127 | pass +128 | +129 | # Should be no E231 errors on any of these: E231 [*] Missing whitespace after ':' --> E23.py:126:99 @@ -939,16 +853,14 @@ E231 [*] Missing whitespace after ':' 127 | pass | help: Add missing whitespace - -ℹ Safe fix -123 123 | pass -124 124 | -125 125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): -126 |- class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): - 126 |+ class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](object, something_dynamic[x::-1]): -127 127 | pass -128 128 | -129 129 | # Should be no E231 errors on any of these: +123 | pass +124 | +125 | class PEP696BadWithEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](): + - class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C:object= bytes](object, something_dynamic[x::-1]): +126 + class IndentedPEP696BadWithNonEmptyBases[A:object="foo"[::-1], B:object =[[["foo", "bar"]]], C: object= bytes](object, something_dynamic[x::-1]): +127 | pass +128 | +129 | # Should be no E231 errors on any of these: E231 [*] Missing whitespace after ',' --> E23.py:147:6 @@ -960,16 +872,14 @@ E231 [*] Missing whitespace after ',' 149 | # Okay because it's hard to differentiate between the usages of a colon in a t-string | help: Add missing whitespace - -ℹ Safe fix -144 144 | pass -145 145 | -146 146 | # E231 -147 |-t"{(a,b)}" - 147 |+t"{(a, b)}" -148 148 | -149 149 | # Okay because it's hard to differentiate between the usages of a colon in a t-string -150 150 | t"{a:=1}" +144 | pass +145 | +146 | # E231 + - t"{(a,b)}" +147 + t"{(a, b)}" +148 | +149 | # Okay because it's hard to differentiate between the usages of a colon in a t-string +150 | t"{a:=1}" E231 [*] Missing whitespace after ':' --> E23.py:161:37 @@ -979,10 +889,8 @@ E231 [*] Missing whitespace after ':' | ^ | help: Add missing whitespace - -ℹ Safe fix -158 158 | snapshot.file_uri[len(t's3://{self.s3_bucket_name}/'):] -159 159 | -160 160 | #: E231 -161 |-{len(t's3://{self.s3_bucket_name}/'):1} - 161 |+{len(t's3://{self.s3_bucket_name}/'): 1} +158 | snapshot.file_uri[len(t's3://{self.s3_bucket_name}/'):] +159 | +160 | #: E231 + - {len(t's3://{self.s3_bucket_name}/'):1} +161 + {len(t's3://{self.s3_bucket_name}/'): 1} diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap index 15b4ba7da7..a1f5d6a4b0 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E241_E24.py.snap @@ -11,14 +11,12 @@ E241 [*] Multiple spaces after comma 4 | b = (1, 20) | help: Replace with single space - -ℹ Safe fix -1 1 | #: E241 -2 |-a = (1, 2) - 2 |+a = (1, 2) -3 3 | #: Okay -4 4 | b = (1, 20) -5 5 | #: E242 +1 | #: E241 + - a = (1, 2) +2 + a = (1, 2) +3 | #: Okay +4 | b = (1, 20) +5 | #: E242 E241 [*] Multiple spaces after comma --> E24.py:11:18 @@ -31,15 +29,13 @@ E241 [*] Multiple spaces after comma 13 | c, -d] | help: Replace with single space - -ℹ Safe fix -8 8 | b = (1, 20) # space before 20 -9 9 | #: E241 E241 E241 -10 10 | # issue 135 -11 |-more_spaces = [a, b, - 11 |+more_spaces = [a, b, -12 12 | ef, +h, -13 13 | c, -d] +8 | b = (1, 20) # space before 20 +9 | #: E241 E241 E241 +10 | # issue 135 + - more_spaces = [a, b, +11 + more_spaces = [a, b, +12 | ef, +h, +13 | c, -d] E241 [*] Multiple spaces after comma --> E24.py:12:19 @@ -51,14 +47,12 @@ E241 [*] Multiple spaces after comma 13 | c, -d] | help: Replace with single space - -ℹ Safe fix -9 9 | #: E241 E241 E241 -10 10 | # issue 135 -11 11 | more_spaces = [a, b, -12 |- ef, +h, - 12 |+ ef, +h, -13 13 | c, -d] +9 | #: E241 E241 E241 +10 | # issue 135 +11 | more_spaces = [a, b, + - ef, +h, +12 + ef, +h, +13 | c, -d] E241 [*] Multiple spaces after comma --> E24.py:13:18 @@ -69,10 +63,8 @@ E241 [*] Multiple spaces after comma | ^^^ | help: Replace with single space - -ℹ Safe fix -10 10 | # issue 135 -11 11 | more_spaces = [a, b, -12 12 | ef, +h, -13 |- c, -d] - 13 |+ c, -d] +10 | # issue 135 +11 | more_spaces = [a, b, +12 | ef, +h, + - c, -d] +13 + c, -d] diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap index a77f70cb0b..af927a5d3d 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E242_E24.py.snap @@ -12,13 +12,11 @@ E242 [*] Tab after comma 8 | b = (1, 20) # space before 20 | help: Replace with single space - -ℹ Safe fix -3 3 | #: Okay -4 4 | b = (1, 20) -5 5 | #: E242 -6 |-a = (1, 2) # tab before 2 - 6 |+a = (1, 2) # tab before 2 -7 7 | #: Okay -8 8 | b = (1, 20) # space before 20 -9 9 | #: E241 E241 E241 +3 | #: Okay +4 | b = (1, 20) +5 | #: E242 + - a = (1, 2) # tab before 2 +6 + a = (1, 2) # tab before 2 +7 | #: Okay +8 | b = (1, 20) # space before 20 +9 | #: E241 E241 E241 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap index 542413bf0a..ea63ba312b 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E251_E25.py.snap @@ -11,14 +11,12 @@ E251 [*] Unexpected spaces around keyword / parameter equals 4 | pass | help: Remove whitespace - -ℹ Safe fix -1 1 | #: E251 E251 -2 |-def foo(bar = False): - 2 |+def foo(bar= False): -3 3 | '''Test function with an error in declaration''' -4 4 | pass -5 5 | #: E251 +1 | #: E251 E251 + - def foo(bar = False): +2 + def foo(bar= False): +3 | '''Test function with an error in declaration''' +4 | pass +5 | #: E251 E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:2:14 @@ -30,14 +28,12 @@ E251 [*] Unexpected spaces around keyword / parameter equals 4 | pass | help: Remove whitespace - -ℹ Safe fix -1 1 | #: E251 E251 -2 |-def foo(bar = False): - 2 |+def foo(bar =False): -3 3 | '''Test function with an error in declaration''' -4 4 | pass -5 5 | #: E251 +1 | #: E251 E251 + - def foo(bar = False): +2 + def foo(bar =False): +3 | '''Test function with an error in declaration''' +4 | pass +5 | #: E251 E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:6:9 @@ -50,16 +46,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals 8 | foo(bar =True) | help: Remove whitespace - -ℹ Safe fix -3 3 | '''Test function with an error in declaration''' -4 4 | pass -5 5 | #: E251 -6 |-foo(bar= True) - 6 |+foo(bar=True) -7 7 | #: E251 -8 8 | foo(bar =True) -9 9 | #: E251 E251 +3 | '''Test function with an error in declaration''' +4 | pass +5 | #: E251 + - foo(bar= True) +6 + foo(bar=True) +7 | #: E251 +8 | foo(bar =True) +9 | #: E251 E251 E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:8:8 @@ -72,16 +66,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals 10 | foo(bar = True) | help: Remove whitespace - -ℹ Safe fix -5 5 | #: E251 -6 6 | foo(bar= True) -7 7 | #: E251 -8 |-foo(bar =True) - 8 |+foo(bar=True) -9 9 | #: E251 E251 -10 10 | foo(bar = True) -11 11 | #: E251 +5 | #: E251 +6 | foo(bar= True) +7 | #: E251 + - foo(bar =True) +8 + foo(bar=True) +9 | #: E251 E251 +10 | foo(bar = True) +11 | #: E251 E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:10:8 @@ -94,16 +86,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals 12 | y = bar(root= "sdasd") | help: Remove whitespace - -ℹ Safe fix -7 7 | #: E251 -8 8 | foo(bar =True) -9 9 | #: E251 E251 -10 |-foo(bar = True) - 10 |+foo(bar= True) -11 11 | #: E251 -12 12 | y = bar(root= "sdasd") -13 13 | #: E251:2:29 +7 | #: E251 +8 | foo(bar =True) +9 | #: E251 E251 + - foo(bar = True) +10 + foo(bar= True) +11 | #: E251 +12 | y = bar(root= "sdasd") +13 | #: E251:2:29 E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:10:10 @@ -116,16 +106,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals 12 | y = bar(root= "sdasd") | help: Remove whitespace - -ℹ Safe fix -7 7 | #: E251 -8 8 | foo(bar =True) -9 9 | #: E251 E251 -10 |-foo(bar = True) - 10 |+foo(bar =True) -11 11 | #: E251 -12 12 | y = bar(root= "sdasd") -13 13 | #: E251:2:29 +7 | #: E251 +8 | foo(bar =True) +9 | #: E251 E251 + - foo(bar = True) +10 + foo(bar =True) +11 | #: E251 +12 | y = bar(root= "sdasd") +13 | #: E251:2:29 E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:12:14 @@ -138,16 +126,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals 14 | parser.add_argument('--long-option', | help: Remove whitespace - -ℹ Safe fix -9 9 | #: E251 E251 -10 10 | foo(bar = True) -11 11 | #: E251 -12 |-y = bar(root= "sdasd") - 12 |+y = bar(root="sdasd") -13 13 | #: E251:2:29 -14 14 | parser.add_argument('--long-option', -15 15 | default= +9 | #: E251 E251 +10 | foo(bar = True) +11 | #: E251 + - y = bar(root= "sdasd") +12 + y = bar(root="sdasd") +13 | #: E251:2:29 +14 | parser.add_argument('--long-option', +15 | default= E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:15:29 @@ -162,17 +148,15 @@ E251 [*] Unexpected spaces around keyword / parameter equals 18 | parser.add_argument('--long-option', default | help: Remove whitespace - -ℹ Safe fix -12 12 | y = bar(root= "sdasd") -13 13 | #: E251:2:29 -14 14 | parser.add_argument('--long-option', -15 |- default= -16 |- "/rather/long/filesystem/path/here/blah/blah/blah") - 15 |+ default="/rather/long/filesystem/path/here/blah/blah/blah") -17 16 | #: E251:1:45 -18 17 | parser.add_argument('--long-option', default -19 18 | ="/rather/long/filesystem/path/here/blah/blah/blah") +12 | y = bar(root= "sdasd") +13 | #: E251:2:29 +14 | parser.add_argument('--long-option', + - default= + - "/rather/long/filesystem/path/here/blah/blah/blah") +15 + default="/rather/long/filesystem/path/here/blah/blah/blah") +16 | #: E251:1:45 +17 | parser.add_argument('--long-option', default +18 | ="/rather/long/filesystem/path/here/blah/blah/blah") E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:18:45 @@ -187,17 +171,15 @@ E251 [*] Unexpected spaces around keyword / parameter equals 21 | foo(True, | help: Remove whitespace - -ℹ Safe fix -15 15 | default= -16 16 | "/rather/long/filesystem/path/here/blah/blah/blah") -17 17 | #: E251:1:45 -18 |-parser.add_argument('--long-option', default -19 |- ="/rather/long/filesystem/path/here/blah/blah/blah") - 18 |+parser.add_argument('--long-option', default="/rather/long/filesystem/path/here/blah/blah/blah") -20 19 | #: E251:3:8 E251:3:10 -21 20 | foo(True, -22 21 | baz=(1, 2), +15 | default= +16 | "/rather/long/filesystem/path/here/blah/blah/blah") +17 | #: E251:1:45 + - parser.add_argument('--long-option', default + - ="/rather/long/filesystem/path/here/blah/blah/blah") +18 + parser.add_argument('--long-option', default="/rather/long/filesystem/path/here/blah/blah/blah") +19 | #: E251:3:8 E251:3:10 +20 | foo(True, +21 | baz=(1, 2), E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:23:8 @@ -210,16 +192,14 @@ E251 [*] Unexpected spaces around keyword / parameter equals 25 | #: Okay | help: Remove whitespace - -ℹ Safe fix -20 20 | #: E251:3:8 E251:3:10 -21 21 | foo(True, -22 22 | baz=(1, 2), -23 |- biz = 'foo' - 23 |+ biz= 'foo' -24 24 | ) -25 25 | #: Okay -26 26 | foo(bar=(1 == 1)) +20 | #: E251:3:8 E251:3:10 +21 | foo(True, +22 | baz=(1, 2), + - biz = 'foo' +23 + biz= 'foo' +24 | ) +25 | #: Okay +26 | foo(bar=(1 == 1)) E251 [*] Unexpected spaces around keyword / parameter equals --> E25.py:23:10 @@ -232,13 +212,11 @@ E251 [*] Unexpected spaces around keyword / parameter equals 25 | #: Okay | help: Remove whitespace - -ℹ Safe fix -20 20 | #: E251:3:8 E251:3:10 -21 21 | foo(True, -22 22 | baz=(1, 2), -23 |- biz = 'foo' - 23 |+ biz ='foo' -24 24 | ) -25 25 | #: Okay -26 26 | foo(bar=(1 == 1)) +20 | #: E251:3:8 E251:3:10 +21 | foo(True, +22 | baz=(1, 2), + - biz = 'foo' +23 + biz ='foo' +24 | ) +25 | #: Okay +26 | foo(bar=(1 == 1)) diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap index ced0599eb2..ccdff8a151 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E252_E25.py.snap @@ -12,16 +12,14 @@ E252 [*] Missing whitespace around parameter equals 48 | #: Okay | help: Add missing whitespace - -ℹ Safe fix -43 43 | async def add(a: int = 0, b: int = 0) -> int: -44 44 | return a + b -45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 -46 |-def add(a: int=0, b: int =0, c: int= 0) -> int: - 46 |+def add(a: int =0, b: int =0, c: int= 0) -> int: -47 47 | return a + b + c -48 48 | #: Okay -49 49 | def add(a: int = _default(name='f')): +43 | async def add(a: int = 0, b: int = 0) -> int: +44 | return a + b +45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 + - def add(a: int=0, b: int =0, c: int= 0) -> int: +46 + def add(a: int =0, b: int =0, c: int= 0) -> int: +47 | return a + b + c +48 | #: Okay +49 | def add(a: int = _default(name='f')): E252 [*] Missing whitespace around parameter equals --> E25.py:46:15 @@ -34,16 +32,14 @@ E252 [*] Missing whitespace around parameter equals 48 | #: Okay | help: Add missing whitespace - -ℹ Safe fix -43 43 | async def add(a: int = 0, b: int = 0) -> int: -44 44 | return a + b -45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 -46 |-def add(a: int=0, b: int =0, c: int= 0) -> int: - 46 |+def add(a: int= 0, b: int =0, c: int= 0) -> int: -47 47 | return a + b + c -48 48 | #: Okay -49 49 | def add(a: int = _default(name='f')): +43 | async def add(a: int = 0, b: int = 0) -> int: +44 | return a + b +45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 + - def add(a: int=0, b: int =0, c: int= 0) -> int: +46 + def add(a: int= 0, b: int =0, c: int= 0) -> int: +47 | return a + b + c +48 | #: Okay +49 | def add(a: int = _default(name='f')): E252 [*] Missing whitespace around parameter equals --> E25.py:46:26 @@ -56,16 +52,14 @@ E252 [*] Missing whitespace around parameter equals 48 | #: Okay | help: Add missing whitespace - -ℹ Safe fix -43 43 | async def add(a: int = 0, b: int = 0) -> int: -44 44 | return a + b -45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 -46 |-def add(a: int=0, b: int =0, c: int= 0) -> int: - 46 |+def add(a: int=0, b: int = 0, c: int= 0) -> int: -47 47 | return a + b + c -48 48 | #: Okay -49 49 | def add(a: int = _default(name='f')): +43 | async def add(a: int = 0, b: int = 0) -> int: +44 | return a + b +45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 + - def add(a: int=0, b: int =0, c: int= 0) -> int: +46 + def add(a: int=0, b: int = 0, c: int= 0) -> int: +47 | return a + b + c +48 | #: Okay +49 | def add(a: int = _default(name='f')): E252 [*] Missing whitespace around parameter equals --> E25.py:46:36 @@ -78,16 +72,14 @@ E252 [*] Missing whitespace around parameter equals 48 | #: Okay | help: Add missing whitespace - -ℹ Safe fix -43 43 | async def add(a: int = 0, b: int = 0) -> int: -44 44 | return a + b -45 45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 -46 |-def add(a: int=0, b: int =0, c: int= 0) -> int: - 46 |+def add(a: int=0, b: int =0, c: int = 0) -> int: -47 47 | return a + b + c -48 48 | #: Okay -49 49 | def add(a: int = _default(name='f')): +43 | async def add(a: int = 0, b: int = 0) -> int: +44 | return a + b +45 | #: E252:1:15 E252:1:16 E252:1:27 E252:1:36 + - def add(a: int=0, b: int =0, c: int= 0) -> int: +46 + def add(a: int=0, b: int =0, c: int = 0) -> int: +47 | return a + b + c +48 | #: Okay +49 | def add(a: int = _default(name='f')): E252 [*] Missing whitespace around parameter equals --> E25.py:64:18 @@ -98,16 +90,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:18 @@ -118,16 +108,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:26 @@ -138,16 +126,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:33 @@ -158,16 +144,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:49 @@ -178,16 +162,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:49 @@ -198,16 +180,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:64 @@ -218,16 +198,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:64 @@ -238,16 +216,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:80 @@ -258,16 +234,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:64:96 @@ -278,16 +252,14 @@ E252 [*] Missing whitespace around parameter equals 65 | pass | help: Add missing whitespace - -ℹ Safe fix -61 61 | print(f"{foo(a = 1)}") -62 62 | -63 63 | # There should be at least one E251 diagnostic for each type parameter here: -64 |-def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): - 64 |+def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes](): -65 65 | pass -66 66 | -67 67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +61 | print(f"{foo(a = 1)}") +62 | +63 | # There should be at least one E251 diagnostic for each type parameter here: + - def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +64 + def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes](): +65 | pass +66 | +67 | class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: E252 [*] Missing whitespace around parameter equals --> E25.py:67:18 @@ -299,16 +271,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A =int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:18 @@ -320,16 +290,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A= int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:26 @@ -341,16 +309,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B = str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:33 @@ -362,16 +328,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B =str, C = bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:49 @@ -383,16 +347,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B =str, C= bool, D:object =int, E: object=str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:49 @@ -404,16 +366,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B =str, C= bool, D:object= int, E: object=str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:64 @@ -425,16 +385,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object =str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:64 @@ -446,16 +404,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object= str, F: object =bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:80 @@ -467,16 +423,14 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object = bool, G: object= bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, E252 [*] Missing whitespace around parameter equals --> E25.py:67:96 @@ -488,13 +442,11 @@ E252 [*] Missing whitespace around parameter equals 68 | pass | help: Add missing whitespace - -ℹ Safe fix -64 64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): -65 65 | pass -66 66 | -67 |-class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: - 67 |+class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes]: -68 68 | pass -69 69 | -70 70 | # The last of these should cause us to emit E231, +64 | def pep_696_bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes](): +65 | pass +66 | + - class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object= bytes]: +67 + class PEP696Bad[A=int, B =str, C= bool, D:object=int, E: object=str, F: object =bool, G: object = bytes]: +68 | pass +69 | +70 | # The last of these should cause us to emit E231, diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap index 2970034f65..04502d5950 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E261_E26.py.snap @@ -11,11 +11,9 @@ E261 [*] Insert at least two spaces before an inline comment 4 | x = x + 1 #Increment x | help: Insert spaces - -ℹ Safe fix -1 1 | #: E261:1:5 -2 |-pass # an inline comment - 2 |+pass # an inline comment -3 3 | #: E262:1:12 -4 4 | x = x + 1 #Increment x -5 5 | #: E262:1:12 +1 | #: E261:1:5 + - pass # an inline comment +2 + pass # an inline comment +3 | #: E262:1:12 +4 | x = x + 1 #Increment x +5 | #: E262:1:12 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap index b3a33831ca..d570c51213 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E262_E26.py.snap @@ -12,16 +12,14 @@ E262 [*] Inline comment should start with `# ` 6 | x = x + 1 # Increment x | help: Format space - -ℹ Safe fix -1 1 | #: E261:1:5 -2 2 | pass # an inline comment -3 3 | #: E262:1:12 -4 |-x = x + 1 #Increment x - 4 |+x = x + 1 # Increment x -5 5 | #: E262:1:12 -6 6 | x = x + 1 # Increment x -7 7 | #: E262:1:12 +1 | #: E261:1:5 +2 | pass # an inline comment +3 | #: E262:1:12 + - x = x + 1 #Increment x +4 + x = x + 1 # Increment x +5 | #: E262:1:12 +6 | x = x + 1 # Increment x +7 | #: E262:1:12 E262 [*] Inline comment should start with `# ` --> E26.py:6:12 @@ -34,16 +32,14 @@ E262 [*] Inline comment should start with `# ` 8 | x = y + 1 #: Increment x | help: Format space - -ℹ Safe fix -3 3 | #: E262:1:12 -4 4 | x = x + 1 #Increment x -5 5 | #: E262:1:12 -6 |-x = x + 1 # Increment x - 6 |+x = x + 1 # Increment x -7 7 | #: E262:1:12 -8 8 | x = y + 1 #: Increment x -9 9 | #: E265:1:1 +3 | #: E262:1:12 +4 | x = x + 1 #Increment x +5 | #: E262:1:12 + - x = x + 1 # Increment x +6 + x = x + 1 # Increment x +7 | #: E262:1:12 +8 | x = y + 1 #: Increment x +9 | #: E265:1:1 E262 [*] Inline comment should start with `# ` --> E26.py:8:12 @@ -56,16 +52,14 @@ E262 [*] Inline comment should start with `# ` 10 | #Block comment | help: Format space - -ℹ Safe fix -5 5 | #: E262:1:12 -6 6 | x = x + 1 # Increment x -7 7 | #: E262:1:12 -8 |-x = y + 1 #: Increment x - 8 |+x = y + 1 #: Increment x -9 9 | #: E265:1:1 -10 10 | #Block comment -11 11 | a = 1 +5 | #: E262:1:12 +6 | x = x + 1 # Increment x +7 | #: E262:1:12 + - x = y + 1 #: Increment x +8 + x = y + 1 #: Increment x +9 | #: E265:1:1 +10 | #Block comment +11 | a = 1 E262 [*] Inline comment should start with `# ` --> E26.py:63:9 @@ -78,16 +72,14 @@ E262 [*] Inline comment should start with `# ` 65 | # (Two spaces) Ok for block comment | help: Format space - -ℹ Safe fix -60 60 | #: E262:3:9 -61 61 | # -*- coding: utf8 -*- -62 62 | #  (One space one NBSP) Ok for block comment -63 |-a = 42 #  (One space one NBSP) - 63 |+a = 42 # (One space one NBSP) -64 64 | #: E262:2:9 -65 65 | # (Two spaces) Ok for block comment -66 66 | a = 42 # (Two spaces) +60 | #: E262:3:9 +61 | # -*- coding: utf8 -*- +62 | #  (One space one NBSP) Ok for block comment + - a = 42 #  (One space one NBSP) +63 + a = 42 # (One space one NBSP) +64 | #: E262:2:9 +65 | # (Two spaces) Ok for block comment +66 | a = 42 # (Two spaces) E262 [*] Inline comment should start with `# ` --> E26.py:66:9 @@ -100,16 +92,14 @@ E262 [*] Inline comment should start with `# ` 68 | #: E265:5:1 | help: Format space - -ℹ Safe fix -63 63 | a = 42 #  (One space one NBSP) -64 64 | #: E262:2:9 -65 65 | # (Two spaces) Ok for block comment -66 |-a = 42 # (Two spaces) - 66 |+a = 42 # (Two spaces) -67 67 | -68 68 | #: E265:5:1 -69 69 | ### Means test is not done yet +63 | a = 42 #  (One space one NBSP) +64 | #: E262:2:9 +65 | # (Two spaces) Ok for block comment + - a = 42 # (Two spaces) +66 + a = 42 # (Two spaces) +67 | +68 | #: E265:5:1 +69 | ### Means test is not done yet E262 [*] Inline comment should start with `# ` --> E26.py:84:8 @@ -122,15 +112,13 @@ E262 [*] Inline comment should start with `# ` 86 | a = 1 #:Foo | help: Format space - -ℹ Safe fix -81 81 | #: E266:1:3 -82 82 | ## Foo -83 83 | -84 |-a = 1 ## Foo - 84 |+a = 1 # Foo -85 85 | -86 86 | a = 1 #:Foo +81 | #: E266:1:3 +82 | ## Foo +83 | + - a = 1 ## Foo +84 + a = 1 # Foo +85 | +86 | a = 1 #:Foo E262 [*] Inline comment should start with `# ` --> E26.py:86:8 @@ -141,10 +129,8 @@ E262 [*] Inline comment should start with `# ` | ^^^^^ | help: Format space - -ℹ Safe fix -83 83 | -84 84 | a = 1 ## Foo -85 85 | -86 |-a = 1 #:Foo - 86 |+a = 1 #: Foo +83 | +84 | a = 1 ## Foo +85 | + - a = 1 #:Foo +86 + a = 1 #: Foo diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap index f2af89f9d4..5dac94331c 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E265_E26.py.snap @@ -12,16 +12,14 @@ E265 [*] Block comment should start with `# ` 12 | #: E265:2:1 | help: Format space - -ℹ Safe fix -7 7 | #: E262:1:12 -8 8 | x = y + 1 #: Increment x -9 9 | #: E265:1:1 -10 |-#Block comment - 10 |+# Block comment -11 11 | a = 1 -12 12 | #: E265:2:1 -13 13 | m = 42 +7 | #: E262:1:12 +8 | x = y + 1 #: Increment x +9 | #: E265:1:1 + - #Block comment +10 + # Block comment +11 | a = 1 +12 | #: E265:2:1 +13 | m = 42 E265 [*] Block comment should start with `# ` --> E26.py:14:1 @@ -34,16 +32,14 @@ E265 [*] Block comment should start with `# ` 16 | #: E266:3:5 E266:6:5 | help: Format space - -ℹ Safe fix -11 11 | a = 1 -12 12 | #: E265:2:1 -13 13 | m = 42 -14 |-#! This is important - 14 |+# ! This is important -15 15 | mx = 42 - 42 -16 16 | #: E266:3:5 E266:6:5 -17 17 | def how_it_feel(r): +11 | a = 1 +12 | #: E265:2:1 +13 | m = 42 + - #! This is important +14 + # ! This is important +15 | mx = 42 - 42 +16 | #: E266:3:5 E266:6:5 +17 | def how_it_feel(r): E265 [*] Block comment should start with `# ` --> E26.py:25:1 @@ -56,16 +52,14 @@ E265 [*] Block comment should start with `# ` 27 | #: W291:1:42 | help: Format space - -ℹ Safe fix -22 22 | ### Of course it is unused -23 23 | return -24 24 | #: E265:1:1 E266:2:1 -25 |-##if DEBUG: - 25 |+# if DEBUG: -26 26 | ## logging.error() -27 27 | #: W291:1:42 -28 28 | ######################################### +22 | ### Of course it is unused +23 | return +24 | #: E265:1:1 E266:2:1 + - ##if DEBUG: +25 + # if DEBUG: +26 | ## logging.error() +27 | #: W291:1:42 +28 | ######################################### E265 [*] Block comment should start with `# ` --> E26.py:32:1 @@ -77,16 +71,14 @@ E265 [*] Block comment should start with `# ` 34 | pass # an inline comment | help: Format space - -ℹ Safe fix -29 29 | #: -30 30 | -31 31 | #: Okay -32 |-#!/usr/bin/env python - 32 |+# !/usr/bin/env python -33 33 | -34 34 | pass # an inline comment -35 35 | x = x + 1 # Increment x +29 | #: +30 | +31 | #: Okay + - #!/usr/bin/env python +32 + # !/usr/bin/env python +33 | +34 | pass # an inline comment +35 | x = x + 1 # Increment x E265 [*] Block comment should start with `# ` --> E26.py:73:1 @@ -98,16 +90,14 @@ E265 [*] Block comment should start with `# ` 74 | # 8 Means test runs forever | help: Format space - -ℹ Safe fix -70 70 | # E Means test is giving error (E) -71 71 | # F Means test is failing (F) -72 72 | # EF Means test is giving error and Failing -73 |-#! Means test is segfaulting - 73 |+# ! Means test is segfaulting -74 74 | # 8 Means test runs forever -75 75 | -76 76 | #: Colon prefix is okay +70 | # E Means test is giving error (E) +71 | # F Means test is failing (F) +72 | # EF Means test is giving error and Failing + - #! Means test is segfaulting +73 + # ! Means test is segfaulting +74 | # 8 Means test runs forever +75 | +76 | #: Colon prefix is okay E265 [*] Block comment should start with `# ` --> E26.py:78:1 @@ -120,13 +110,11 @@ E265 [*] Block comment should start with `# ` 80 | # We should strip the space, but preserve the hashes. | help: Format space - -ℹ Safe fix -75 75 | -76 76 | #: Colon prefix is okay -77 77 | -78 |-###This is a variable ### - 78 |+# This is a variable ### -79 79 | -80 80 | # We should strip the space, but preserve the hashes. -81 81 | #: E266:1:3 +75 | +76 | #: Colon prefix is okay +77 | + - ###This is a variable ### +78 + # This is a variable ### +79 | +80 | # We should strip the space, but preserve the hashes. +81 | #: E266:1:3 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap index e1d348254b..ec06e548d8 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E266_E26.py.snap @@ -11,16 +11,14 @@ E266 [*] Too many leading `#` before block comment 20 | a = 42 | help: Remove leading `#` - -ℹ Safe fix -16 16 | #: E266:3:5 E266:6:5 -17 17 | def how_it_feel(r): -18 18 | -19 |- ### This is a variable ### - 19 |+ # This is a variable ### -20 20 | a = 42 -21 21 | -22 22 | ### Of course it is unused +16 | #: E266:3:5 E266:6:5 +17 | def how_it_feel(r): +18 | + - ### This is a variable ### +19 + # This is a variable ### +20 | a = 42 +21 | +22 | ### Of course it is unused E266 [*] Too many leading `#` before block comment --> E26.py:22:5 @@ -33,16 +31,14 @@ E266 [*] Too many leading `#` before block comment 24 | #: E265:1:1 E266:2:1 | help: Remove leading `#` - -ℹ Safe fix -19 19 | ### This is a variable ### -20 20 | a = 42 -21 21 | -22 |- ### Of course it is unused - 22 |+ # Of course it is unused -23 23 | return -24 24 | #: E265:1:1 E266:2:1 -25 25 | ##if DEBUG: +19 | ### This is a variable ### +20 | a = 42 +21 | + - ### Of course it is unused +22 + # Of course it is unused +23 | return +24 | #: E265:1:1 E266:2:1 +25 | ##if DEBUG: E266 [*] Too many leading `#` before block comment --> E26.py:26:1 @@ -55,16 +51,14 @@ E266 [*] Too many leading `#` before block comment 28 | ######################################### | help: Remove leading `#` - -ℹ Safe fix -23 23 | return -24 24 | #: E265:1:1 E266:2:1 -25 25 | ##if DEBUG: -26 |-## logging.error() - 26 |+# logging.error() -27 27 | #: W291:1:42 -28 28 | ######################################### -29 29 | #: +23 | return +24 | #: E265:1:1 E266:2:1 +25 | ##if DEBUG: + - ## logging.error() +26 + # logging.error() +27 | #: W291:1:42 +28 | ######################################### +29 | #: E266 [*] Too many leading `#` before block comment --> E26.py:69:1 @@ -76,16 +70,14 @@ E266 [*] Too many leading `#` before block comment 71 | # F Means test is failing (F) | help: Remove leading `#` - -ℹ Safe fix -66 66 | a = 42 # (Two spaces) -67 67 | -68 68 | #: E265:5:1 -69 |-### Means test is not done yet - 69 |+# Means test is not done yet -70 70 | # E Means test is giving error (E) -71 71 | # F Means test is failing (F) -72 72 | # EF Means test is giving error and Failing +66 | a = 42 # (Two spaces) +67 | +68 | #: E265:5:1 + - ### Means test is not done yet +69 + # Means test is not done yet +70 | # E Means test is giving error (E) +71 | # F Means test is failing (F) +72 | # EF Means test is giving error and Failing E266 [*] Too many leading `#` before block comment --> E26.py:82:1 @@ -98,13 +90,11 @@ E266 [*] Too many leading `#` before block comment 84 | a = 1 ## Foo | help: Remove leading `#` - -ℹ Safe fix -79 79 | -80 80 | # We should strip the space, but preserve the hashes. -81 81 | #: E266:1:3 -82 |-## Foo - 82 |+# Foo -83 83 | -84 84 | a = 1 ## Foo -85 85 | +79 | +80 | # We should strip the space, but preserve the hashes. +81 | #: E266:1:3 + - ## Foo +82 + # Foo +83 | +84 | a = 1 ## Foo +85 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap index 55cdd05b70..0c8168f818 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E271_E27.py.snap @@ -12,16 +12,14 @@ E271 [*] Multiple spaces after keyword 6 | True and False | help: Replace with single space - -ℹ Safe fix -1 1 | #: Okay -2 2 | True and False -3 3 | #: E271 -4 |-True and False - 4 |+True and False -5 5 | #: E272 -6 6 | True and False -7 7 | #: E271 +1 | #: Okay +2 | True and False +3 | #: E271 + - True and False +4 + True and False +5 | #: E272 +6 | True and False +7 | #: E271 E271 [*] Multiple spaces after keyword --> E27.py:6:5 @@ -34,16 +32,14 @@ E271 [*] Multiple spaces after keyword 8 | if 1: | help: Replace with single space - -ℹ Safe fix -3 3 | #: E271 -4 4 | True and False -5 5 | #: E272 -6 |-True and False - 6 |+True and False -7 7 | #: E271 -8 8 | if 1: -9 9 | pass +3 | #: E271 +4 | True and False +5 | #: E272 + - True and False +6 + True and False +7 | #: E271 +8 | if 1: +9 | pass E271 [*] Multiple spaces after keyword --> E27.py:8:3 @@ -56,16 +52,14 @@ E271 [*] Multiple spaces after keyword 10 | #: E273 | help: Replace with single space - -ℹ Safe fix -5 5 | #: E272 -6 6 | True and False -7 7 | #: E271 -8 |-if 1: - 8 |+if 1: -9 9 | pass -10 10 | #: E273 -11 11 | True and False +5 | #: E272 +6 | True and False +7 | #: E271 + - if 1: +8 + if 1: +9 | pass +10 | #: E273 +11 | True and False E271 [*] Multiple spaces after keyword --> E27.py:15:6 @@ -78,16 +72,14 @@ E271 [*] Multiple spaces after keyword 17 | 1 and b | help: Replace with single space - -ℹ Safe fix -12 12 | #: E273 E274 -13 13 | True and False -14 14 | #: E271 -15 |-a and b - 15 |+a and b -16 16 | #: E271 -17 17 | 1 and b -18 18 | #: E271 +12 | #: E273 E274 +13 | True and False +14 | #: E271 + - a and b +15 + a and b +16 | #: E271 +17 | 1 and b +18 | #: E271 E271 [*] Multiple spaces after keyword --> E27.py:17:6 @@ -100,16 +92,14 @@ E271 [*] Multiple spaces after keyword 19 | a and 2 | help: Replace with single space - -ℹ Safe fix -14 14 | #: E271 -15 15 | a and b -16 16 | #: E271 -17 |-1 and b - 17 |+1 and b -18 18 | #: E271 -19 19 | a and 2 -20 20 | #: E271 E272 +14 | #: E271 +15 | a and b +16 | #: E271 + - 1 and b +17 + 1 and b +18 | #: E271 +19 | a and 2 +20 | #: E271 E272 E271 [*] Multiple spaces after keyword --> E27.py:19:6 @@ -122,16 +112,14 @@ E271 [*] Multiple spaces after keyword 21 | 1 and b | help: Replace with single space - -ℹ Safe fix -16 16 | #: E271 -17 17 | 1 and b -18 18 | #: E271 -19 |-a and 2 - 19 |+a and 2 -20 20 | #: E271 E272 -21 21 | 1 and b -22 22 | #: E271 E272 +16 | #: E271 +17 | 1 and b +18 | #: E271 + - a and 2 +19 + a and 2 +20 | #: E271 E272 +21 | 1 and b +22 | #: E271 E272 E271 [*] Multiple spaces after keyword --> E27.py:21:7 @@ -144,16 +132,14 @@ E271 [*] Multiple spaces after keyword 23 | a and 2 | help: Replace with single space - -ℹ Safe fix -18 18 | #: E271 -19 19 | a and 2 -20 20 | #: E271 E272 -21 |-1 and b - 21 |+1 and b -22 22 | #: E271 E272 -23 23 | a and 2 -24 24 | #: E272 +18 | #: E271 +19 | a and 2 +20 | #: E271 E272 + - 1 and b +21 + 1 and b +22 | #: E271 E272 +23 | a and 2 +24 | #: E272 E271 [*] Multiple spaces after keyword --> E27.py:23:7 @@ -166,16 +152,14 @@ E271 [*] Multiple spaces after keyword 25 | this and False | help: Replace with single space - -ℹ Safe fix -20 20 | #: E271 E272 -21 21 | 1 and b -22 22 | #: E271 E272 -23 |-a and 2 - 23 |+a and 2 -24 24 | #: E272 -25 25 | this and False -26 26 | #: E273 +20 | #: E271 E272 +21 | 1 and b +22 | #: E271 E272 + - a and 2 +23 + a and 2 +24 | #: E272 +25 | this and False +26 | #: E273 E271 [*] Multiple spaces after keyword --> E27.py:36:14 @@ -188,16 +172,14 @@ E271 [*] Multiple spaces after keyword 38 | from w import(e, f) | help: Replace with single space - -ℹ Safe fix -33 33 | from u import (a, b) -34 34 | from v import c, d -35 35 | #: E271 -36 |-from w import (e, f) - 36 |+from w import (e, f) -37 37 | #: E275 -38 38 | from w import(e, f) -39 39 | #: E275 +33 | from u import (a, b) +34 | from v import c, d +35 | #: E271 + - from w import (e, f) +36 + from w import (e, f) +37 | #: E275 +38 | from w import(e, f) +39 | #: E275 E271 [*] Multiple spaces after keyword --> E27.py:71:5 @@ -209,13 +191,11 @@ E271 [*] Multiple spaces after keyword 73 | #: E273 | help: Replace with single space - -ℹ Safe fix -68 68 | # Soft keywords -69 69 | -70 70 | #: E271 -71 |-type Number = int - 71 |+type Number = int -72 72 | -73 73 | #: E273 -74 74 | type Number = int +68 | # Soft keywords +69 | +70 | #: E271 + - type Number = int +71 + type Number = int +72 | +73 | #: E273 +74 | type Number = int diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap index f01d5aa72f..4b8185fe87 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E272_E27.py.snap @@ -12,16 +12,14 @@ E272 [*] Multiple spaces before keyword 23 | a and 2 | help: Replace with single space - -ℹ Safe fix -18 18 | #: E271 -19 19 | a and 2 -20 20 | #: E271 E272 -21 |-1 and b - 21 |+1 and b -22 22 | #: E271 E272 -23 23 | a and 2 -24 24 | #: E272 +18 | #: E271 +19 | a and 2 +20 | #: E271 E272 + - 1 and b +21 + 1 and b +22 | #: E271 E272 +23 | a and 2 +24 | #: E272 E272 [*] Multiple spaces before keyword --> E27.py:23:2 @@ -34,16 +32,14 @@ E272 [*] Multiple spaces before keyword 25 | this and False | help: Replace with single space - -ℹ Safe fix -20 20 | #: E271 E272 -21 21 | 1 and b -22 22 | #: E271 E272 -23 |-a and 2 - 23 |+a and 2 -24 24 | #: E272 -25 25 | this and False -26 26 | #: E273 +20 | #: E271 E272 +21 | 1 and b +22 | #: E271 E272 + - a and 2 +23 + a and 2 +24 | #: E272 +25 | this and False +26 | #: E273 E272 [*] Multiple spaces before keyword --> E27.py:25:5 @@ -56,13 +52,11 @@ E272 [*] Multiple spaces before keyword 27 | a and b | help: Replace with single space - -ℹ Safe fix -22 22 | #: E271 E272 -23 23 | a and 2 -24 24 | #: E272 -25 |-this and False - 25 |+this and False -26 26 | #: E273 -27 27 | a and b -28 28 | #: E274 +22 | #: E271 E272 +23 | a and 2 +24 | #: E272 + - this and False +25 + this and False +26 | #: E273 +27 | a and b +28 | #: E274 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap index f48e5fa931..90bc4a0143 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E273_E27.py.snap @@ -12,16 +12,14 @@ E273 [*] Tab after keyword 13 | True and False | help: Replace with single space - -ℹ Safe fix -8 8 | if 1: -9 9 | pass -10 10 | #: E273 -11 |-True and False - 11 |+True and False -12 12 | #: E273 E274 -13 13 | True and False -14 14 | #: E271 +8 | if 1: +9 | pass +10 | #: E273 + - True and False +11 + True and False +12 | #: E273 E274 +13 | True and False +14 | #: E271 E273 [*] Tab after keyword --> E27.py:13:5 @@ -34,16 +32,14 @@ E273 [*] Tab after keyword 15 | a and b | help: Replace with single space - -ℹ Safe fix -10 10 | #: E273 -11 11 | True and False -12 12 | #: E273 E274 -13 |-True and False - 13 |+True and False -14 14 | #: E271 -15 15 | a and b -16 16 | #: E271 +10 | #: E273 +11 | True and False +12 | #: E273 E274 + - True and False +13 + True and False +14 | #: E271 +15 | a and b +16 | #: E271 E273 [*] Tab after keyword --> E27.py:13:10 @@ -56,16 +52,14 @@ E273 [*] Tab after keyword 15 | a and b | help: Replace with single space - -ℹ Safe fix -10 10 | #: E273 -11 11 | True and False -12 12 | #: E273 E274 -13 |-True and False - 13 |+True and False -14 14 | #: E271 -15 15 | a and b -16 16 | #: E271 +10 | #: E273 +11 | True and False +12 | #: E273 E274 + - True and False +13 + True and False +14 | #: E271 +15 | a and b +16 | #: E271 E273 [*] Tab after keyword --> E27.py:27:6 @@ -78,16 +72,14 @@ E273 [*] Tab after keyword 29 | a and b | help: Replace with single space - -ℹ Safe fix -24 24 | #: E272 -25 25 | this and False -26 26 | #: E273 -27 |-a and b - 27 |+a and b -28 28 | #: E274 -29 29 | a and b -30 30 | #: E273 E274 +24 | #: E272 +25 | this and False +26 | #: E273 + - a and b +27 + a and b +28 | #: E274 +29 | a and b +30 | #: E273 E274 E273 [*] Tab after keyword --> E27.py:31:10 @@ -100,16 +92,14 @@ E273 [*] Tab after keyword 33 | from u import (a, b) | help: Replace with single space - -ℹ Safe fix -28 28 | #: E274 -29 29 | a and b -30 30 | #: E273 E274 -31 |-this and False - 31 |+this and False -32 32 | #: Okay -33 33 | from u import (a, b) -34 34 | from v import c, d +28 | #: E274 +29 | a and b +30 | #: E273 E274 + - this and False +31 + this and False +32 | #: Okay +33 | from u import (a, b) +34 | from v import c, d E273 [*] Tab after keyword --> E27.py:74:5 @@ -121,13 +111,11 @@ E273 [*] Tab after keyword 76 | #: E275 | help: Replace with single space - -ℹ Safe fix -71 71 | type Number = int -72 72 | -73 73 | #: E273 -74 |-type Number = int - 74 |+type Number = int -75 75 | -76 76 | #: E275 -77 77 | match(foo): +71 | type Number = int +72 | +73 | #: E273 + - type Number = int +74 + type Number = int +75 | +76 | #: E275 +77 | match(foo): diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap index b77370136a..e4540d9f30 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E274_E27.py.snap @@ -12,16 +12,14 @@ E274 [*] Tab before keyword 31 | this and False | help: Replace with single space - -ℹ Safe fix -26 26 | #: E273 -27 27 | a and b -28 28 | #: E274 -29 |-a and b - 29 |+a and b -30 30 | #: E273 E274 -31 31 | this and False -32 32 | #: Okay +26 | #: E273 +27 | a and b +28 | #: E274 + - a and b +29 + a and b +30 | #: E273 E274 +31 | this and False +32 | #: Okay E274 [*] Tab before keyword --> E27.py:31:5 @@ -34,13 +32,11 @@ E274 [*] Tab before keyword 33 | from u import (a, b) | help: Replace with single space - -ℹ Safe fix -28 28 | #: E274 -29 29 | a and b -30 30 | #: E273 E274 -31 |-this and False - 31 |+this and False -32 32 | #: Okay -33 33 | from u import (a, b) -34 34 | from v import c, d +28 | #: E274 +29 | a and b +30 | #: E273 E274 + - this and False +31 + this and False +32 | #: Okay +33 | from u import (a, b) +34 | from v import c, d diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap index ce4802d928..83ce6619a4 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E275_E27.py.snap @@ -12,16 +12,14 @@ E275 [*] Missing whitespace after keyword 40 | from importable.module import(e, f) | help: Added missing whitespace after keyword - -ℹ Safe fix -35 35 | #: E271 -36 36 | from w import (e, f) -37 37 | #: E275 -38 |-from w import(e, f) - 38 |+from w import (e, f) -39 39 | #: E275 -40 40 | from importable.module import(e, f) -41 41 | #: E275 +35 | #: E271 +36 | from w import (e, f) +37 | #: E275 + - from w import(e, f) +38 + from w import (e, f) +39 | #: E275 +40 | from importable.module import(e, f) +41 | #: E275 E275 [*] Missing whitespace after keyword --> E27.py:40:24 @@ -34,16 +32,14 @@ E275 [*] Missing whitespace after keyword 42 | try: | help: Added missing whitespace after keyword - -ℹ Safe fix -37 37 | #: E275 -38 38 | from w import(e, f) -39 39 | #: E275 -40 |-from importable.module import(e, f) - 40 |+from importable.module import (e, f) -41 41 | #: E275 -42 42 | try: -43 43 | from importable.module import(e, f) +37 | #: E275 +38 | from w import(e, f) +39 | #: E275 + - from importable.module import(e, f) +40 + from importable.module import (e, f) +41 | #: E275 +42 | try: +43 | from importable.module import(e, f) E275 [*] Missing whitespace after keyword --> E27.py:43:28 @@ -56,16 +52,14 @@ E275 [*] Missing whitespace after keyword 45 | pass | help: Added missing whitespace after keyword - -ℹ Safe fix -40 40 | from importable.module import(e, f) -41 41 | #: E275 -42 42 | try: -43 |- from importable.module import(e, f) - 43 |+ from importable.module import (e, f) -44 44 | except ImportError: -45 45 | pass -46 46 | #: E275 +40 | from importable.module import(e, f) +41 | #: E275 +42 | try: + - from importable.module import(e, f) +43 + from importable.module import (e, f) +44 | except ImportError: +45 | pass +46 | #: E275 E275 [*] Missing whitespace after keyword --> E27.py:47:1 @@ -78,16 +72,14 @@ E275 [*] Missing whitespace after keyword 49 | else: | help: Added missing whitespace after keyword - -ℹ Safe fix -44 44 | except ImportError: -45 45 | pass -46 46 | #: E275 -47 |-if(foo): - 47 |+if (foo): -48 48 | pass -49 49 | else: -50 50 | pass +44 | except ImportError: +45 | pass +46 | #: E275 + - if(foo): +47 + if (foo): +48 | pass +49 | else: +50 | pass E275 [*] Missing whitespace after keyword --> E27.py:55:5 @@ -100,16 +92,14 @@ E275 [*] Missing whitespace after keyword 57 | def f(): | help: Added missing whitespace after keyword - -ℹ Safe fix -52 52 | matched = {"true": True, "false": False} -53 53 | #: E275:2:11 -54 54 | if True: -55 |- assert(1) - 55 |+ assert (1) -56 56 | #: Okay -57 57 | def f(): -58 58 | print((yield)) +52 | matched = {"true": True, "false": False} +53 | #: E275:2:11 +54 | if True: + - assert(1) +55 + assert (1) +56 | #: Okay +57 | def f(): +58 | print((yield)) E275 [*] Missing whitespace after keyword --> E27.py:77:1 @@ -121,16 +111,14 @@ E275 [*] Missing whitespace after keyword 79 | pass | help: Added missing whitespace after keyword - -ℹ Safe fix -74 74 | type Number = int -75 75 | -76 76 | #: E275 -77 |-match(foo): - 77 |+match (foo): -78 78 | case(1): -79 79 | pass -80 80 | +74 | type Number = int +75 | +76 | #: E275 + - match(foo): +77 + match (foo): +78 | case(1): +79 | pass +80 | E275 [*] Missing whitespace after keyword --> E27.py:78:5 @@ -142,13 +130,11 @@ E275 [*] Missing whitespace after keyword 79 | pass | help: Added missing whitespace after keyword - -ℹ Safe fix -75 75 | -76 76 | #: E275 -77 77 | match(foo): -78 |- case(1): - 78 |+ case (1): -79 79 | pass -80 80 | -81 81 | # https://github.com/astral-sh/ruff/issues/12094 +75 | +76 | #: E275 +77 | match(foo): + - case(1): +78 + case (1): +79 | pass +80 | +81 | # https://github.com/astral-sh/ruff/issues/12094 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap index f72f81c611..e4c13172b2 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E301_E30.py.snap @@ -12,15 +12,13 @@ E301 [*] Expected 1 blank line, found 0 480 | # end | help: Add missing blank line - -ℹ Safe fix -475 475 | -476 476 | def func1(): -477 477 | pass - 478 |+ -478 479 | def func2(): -479 480 | pass -480 481 | # end +475 | +476 | def func1(): +477 | pass +478 + +479 | def func2(): +480 | pass +481 | # end E301 [*] Expected 1 blank line, found 0 --> E30.py:489:5 @@ -33,15 +31,13 @@ E301 [*] Expected 1 blank line, found 0 491 | # end | help: Add missing blank line - -ℹ Safe fix -485 485 | -486 486 | def fn1(): -487 487 | pass - 488 |+ -488 489 | # comment -489 490 | def fn2(): -490 491 | pass +485 | +486 | def fn1(): +487 | pass +488 + +489 | # comment +490 | def fn2(): +491 | pass E301 [*] Expected 1 blank line, found 0 --> E30.py:499:5 @@ -53,15 +49,13 @@ E301 [*] Expected 1 blank line, found 0 501 | pass | help: Add missing blank line - -ℹ Safe fix -496 496 | """Class for minimal repo.""" -497 497 | -498 498 | columns = [] - 499 |+ -499 500 | @classmethod -500 501 | def cls_method(cls) -> None: -501 502 | pass +496 | """Class for minimal repo.""" +497 | +498 | columns = [] +499 + +500 | @classmethod +501 | def cls_method(cls) -> None: +502 | pass E301 [*] Expected 1 blank line, found 0 --> E30.py:511:5 @@ -74,15 +68,13 @@ E301 [*] Expected 1 blank line, found 0 513 | pass | help: Add missing blank line - -ℹ Safe fix -508 508 | -509 509 | def method(cls) -> None: -510 510 | pass - 511 |+ -511 512 | @classmethod -512 513 | def cls_method(cls) -> None: -513 514 | pass +508 | +509 | def method(cls) -> None: +510 | pass +511 + +512 | @classmethod +513 | def cls_method(cls) -> None: +514 | pass E301 [*] Expected 1 blank line, found 0 --> E30.py:526:5 @@ -95,12 +87,10 @@ E301 [*] Expected 1 blank line, found 0 528 | # end | help: Add missing blank line - -ℹ Safe fix -523 523 | @overload -524 524 | def bar(self, x: str) -> str: -525 525 | ... - 526 |+ -526 527 | def bar(self, x: int | str) -> int | str: -527 528 | return x -528 529 | # end +523 | @overload +524 | def bar(self, x: str) -> str: +525 | ... +526 + +527 | def bar(self, x: int | str) -> int | str: +528 | return x +529 | # end diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap index 83da023604..f598258bc3 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E30.py.snap @@ -12,16 +12,14 @@ E302 [*] Expected 2 blank lines, found 0 535 | # end | help: Add missing blank line(s) - -ℹ Safe fix -530 530 | -531 531 | # E302 -532 532 | """Main module.""" - 533 |+ - 534 |+ -533 535 | def fn(): -534 536 | pass -535 537 | # end +530 | +531 | # E302 +532 | """Main module.""" +533 + +534 + +535 | def fn(): +536 | pass +537 | # end E302 [*] Expected 2 blank lines, found 0 --> E30.py:540:1 @@ -34,16 +32,14 @@ E302 [*] Expected 2 blank lines, found 0 542 | # end | help: Add missing blank line(s) - -ℹ Safe fix -537 537 | -538 538 | # E302 -539 539 | import sys - 540 |+ - 541 |+ -540 542 | def get_sys_path(): -541 543 | return sys.path -542 544 | # end +537 | +538 | # E302 +539 | import sys +540 + +541 + +542 | def get_sys_path(): +543 | return sys.path +544 | # end E302 [*] Expected 2 blank lines, found 1 --> E30.py:549:1 @@ -56,15 +52,13 @@ E302 [*] Expected 2 blank lines, found 1 551 | # end | help: Add missing blank line(s) - -ℹ Safe fix -546 546 | def a(): -547 547 | pass -548 548 | - 549 |+ -549 550 | def b(): -550 551 | pass -551 552 | # end +546 | def a(): +547 | pass +548 | +549 + +550 | def b(): +551 | pass +552 | # end E302 [*] Expected 2 blank lines, found 1 --> E30.py:560:1 @@ -77,15 +71,13 @@ E302 [*] Expected 2 blank lines, found 1 562 | # end | help: Add missing blank line(s) - -ℹ Safe fix -557 557 | -558 558 | # comment -559 559 | - 560 |+ -560 561 | def b(): -561 562 | pass -562 563 | # end +557 | +558 | # comment +559 | +560 + +561 | def b(): +562 | pass +563 | # end E302 [*] Expected 2 blank lines, found 1 --> E30.py:569:1 @@ -98,15 +90,13 @@ E302 [*] Expected 2 blank lines, found 1 571 | # end | help: Add missing blank line(s) - -ℹ Safe fix -566 566 | def a(): -567 567 | pass -568 568 | - 569 |+ -569 570 | async def b(): -570 571 | pass -571 572 | # end +566 | def a(): +567 | pass +568 | +569 + +570 | async def b(): +571 | pass +572 | # end E302 [*] Expected 2 blank lines, found 1 --> E30.py:578:1 @@ -119,15 +109,13 @@ E302 [*] Expected 2 blank lines, found 1 580 | # end | help: Add missing blank line(s) - -ℹ Safe fix -575 575 | async def x(): -576 576 | pass -577 577 | - 578 |+ -578 579 | async def x(y: int = 1): -579 580 | pass -580 581 | # end +575 | async def x(): +576 | pass +577 | +578 + +579 | async def x(y: int = 1): +580 | pass +581 | # end E302 [*] Expected 2 blank lines, found 0 --> E30.py:586:1 @@ -139,16 +127,14 @@ E302 [*] Expected 2 blank lines, found 0 587 | # end | help: Add missing blank line(s) - -ℹ Safe fix -583 583 | # E302 -584 584 | def bar(): -585 585 | pass - 586 |+ - 587 |+ -586 588 | def baz(): pass -587 589 | # end -588 590 | +583 | # E302 +584 | def bar(): +585 | pass +586 + +587 + +588 | def baz(): pass +589 | # end +590 | E302 [*] Expected 2 blank lines, found 0 --> E30.py:592:1 @@ -161,16 +147,14 @@ E302 [*] Expected 2 blank lines, found 0 594 | # end | help: Add missing blank line(s) - -ℹ Safe fix -589 589 | -590 590 | # E302 -591 591 | def bar(): pass - 592 |+ - 593 |+ -592 594 | def baz(): -593 595 | pass -594 596 | # end +589 | +590 | # E302 +591 | def bar(): pass +592 + +593 + +594 | def baz(): +595 | pass +596 | # end E302 [*] Expected 2 blank lines, found 1 --> E30.py:602:1 @@ -182,15 +166,13 @@ E302 [*] Expected 2 blank lines, found 1 604 | pass | help: Add missing blank line(s) - -ℹ Safe fix -598 598 | def f(): -599 599 | pass -600 600 | - 601 |+ -601 602 | # comment -602 603 | @decorator -603 604 | def g(): +598 | def f(): +599 | pass +600 | +601 + +602 | # comment +603 | @decorator +604 | def g(): E302 [*] Expected 2 blank lines, found 0 --> E30.py:624:1 @@ -202,16 +184,14 @@ E302 [*] Expected 2 blank lines, found 0 625 | # end | help: Add missing blank line(s) - -ℹ Safe fix -621 621 | -622 622 | # E302 -623 623 | class A:... - 624 |+ - 625 |+ -624 626 | class B: ... -625 627 | # end -626 628 | +621 | +622 | # E302 +623 | class A:... +624 + +625 + +626 | class B: ... +627 | # end +628 | E302 [*] Expected 2 blank lines, found 1 --> E30.py:634:1 @@ -224,15 +204,13 @@ E302 [*] Expected 2 blank lines, found 1 636 | # end | help: Add missing blank line(s) - -ℹ Safe fix -631 631 | @overload -632 632 | def fn(a: str) -> str: ... -633 633 | - 634 |+ -634 635 | def fn(a: int | str) -> int | str: -635 636 | ... -636 637 | # end +631 | @overload +632 | def fn(a: str) -> str: ... +633 | +634 + +635 | def fn(a: int | str) -> int | str: +636 | ... +637 | # end E302 [*] Expected 2 blank lines, found 0 --> E30.py:944:1 @@ -245,16 +223,14 @@ E302 [*] Expected 2 blank lines, found 0 946 | # end | help: Add missing blank line(s) - -ℹ Safe fix -941 941 | def test_update(): -942 942 | pass -943 943 | # comment - 944 |+ - 945 |+ -944 946 | def test_clientmodel(): -945 947 | pass -946 948 | # end +941 | def test_update(): +942 | pass +943 | # comment +944 + +945 + +946 | def test_clientmodel(): +947 | pass +948 | # end E302 [*] Expected 2 blank lines, found 0 --> E30.py:953:1 @@ -267,16 +243,14 @@ E302 [*] Expected 2 blank lines, found 0 955 | # end | help: Add missing blank line(s) - -ℹ Safe fix -950 950 | def test_update(): -951 951 | pass -952 952 | # comment - 953 |+ - 954 |+ -953 955 | def test_clientmodel(): -954 956 | pass -955 957 | # end +950 | def test_update(): +951 | pass +952 | # comment +953 + +954 + +955 | def test_clientmodel(): +956 | pass +957 | # end E302 [*] Expected 2 blank lines, found 0 --> E30.py:962:1 @@ -289,13 +263,11 @@ E302 [*] Expected 2 blank lines, found 0 964 | # end | help: Add missing blank line(s) - -ℹ Safe fix -958 958 | # E302 -959 959 | def test_update(): -960 960 | pass - 961 |+ - 962 |+ -961 963 | # comment -962 964 | def test_clientmodel(): -963 965 | pass +958 | # E302 +959 | def test_update(): +960 | pass +961 + +962 + +963 | # comment +964 | def test_clientmodel(): +965 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap index 236d2a724f..e021a4a224 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_docstring.py.snap @@ -11,10 +11,8 @@ E302 [*] Expected 2 blank lines, found 1 4 | pass | help: Add missing blank line(s) - -ℹ Safe fix -1 1 | """Test where the error is after the module's docstring.""" -2 2 | - 3 |+ -3 4 | def fn(): -4 5 | pass +1 | """Test where the error is after the module's docstring.""" +2 | +3 + +4 | def fn(): +5 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap index 9bce5adbdc..0aa7b284cf 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_expression.py.snap @@ -11,10 +11,8 @@ E302 [*] Expected 2 blank lines, found 1 4 | pass | help: Add missing blank line(s) - -ℹ Safe fix -1 1 | "Test where the first line is a comment, " + "and the rule violation follows it." -2 2 | - 3 |+ -3 4 | def fn(): -4 5 | pass +1 | "Test where the first line is a comment, " + "and the rule violation follows it." +2 | +3 + +4 | def fn(): +5 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap index dae5f7c98a..33d80a82aa 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_function.py.snap @@ -11,11 +11,9 @@ E302 [*] Expected 2 blank lines, found 1 5 | pass | help: Add missing blank line(s) - -ℹ Safe fix -1 1 | def fn1(): -2 2 | pass -3 3 | - 4 |+ -4 5 | def fn2(): -5 6 | pass +1 | def fn1(): +2 | pass +3 | +4 + +5 | def fn2(): +6 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap index 3951c67b86..ffa7bac2f9 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E302_E302_first_line_statement.py.snap @@ -11,10 +11,8 @@ E302 [*] Expected 2 blank lines, found 1 4 | pass | help: Add missing blank line(s) - -ℹ Safe fix -1 1 | print("Test where the first line is a statement, and the rule violation follows it.") -2 2 | - 3 |+ -3 4 | def fn(): -4 5 | pass +1 | print("Test where the first line is a statement, and the rule violation follows it.") +2 | +3 + +4 | def fn(): +5 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap index 1551b0be0d..a793f49d25 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap @@ -10,15 +10,13 @@ E303 [*] Too many blank lines (2) 619 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -613 613 | def method1(): -614 614 | return 1 -615 615 | -616 |- -617 616 | def method2(): -618 617 | return 22 -619 618 | # end +613 | def method1(): +614 | return 1 +615 | + - +616 | def method2(): +617 | return 22 +618 | # end E303 [*] Too many blank lines (2) --> E30.py:644:5 @@ -29,15 +27,13 @@ E303 [*] Too many blank lines (2) 646 | def inner(): # E306 not expected (pycodestyle detects E306) | help: Remove extraneous blank line(s) - -ℹ Safe fix -640 640 | def fn(): -641 641 | _ = None -642 642 | -643 |- -644 643 | # arbitrary comment -645 644 | -646 645 | def inner(): # E306 not expected (pycodestyle detects E306) +640 | def fn(): +641 | _ = None +642 | + - +643 | # arbitrary comment +644 | +645 | def inner(): # E306 not expected (pycodestyle detects E306) E303 [*] Too many blank lines (2) --> E30.py:656:5 @@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2) 658 | pass | help: Remove extraneous blank line(s) - -ℹ Safe fix -652 652 | def fn(): -653 653 | _ = None -654 654 | -655 |- -656 655 | # arbitrary comment -657 656 | def inner(): # E306 not expected (pycodestyle detects E306) -658 657 | pass +652 | def fn(): +653 | _ = None +654 | + - +655 | # arbitrary comment +656 | def inner(): # E306 not expected (pycodestyle detects E306) +657 | pass E303 [*] Too many blank lines (3) --> E30.py:667:1 @@ -66,15 +60,13 @@ E303 [*] Too many blank lines (3) 668 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -663 663 | print() -664 664 | -665 665 | -666 |- -667 666 | print() -668 667 | # end -669 668 | +663 | print() +664 | +665 | + - +666 | print() +667 | # end +668 | E303 [*] Too many blank lines (3) --> E30.py:676:1 @@ -85,15 +77,13 @@ E303 [*] Too many blank lines (3) 678 | print() | help: Remove extraneous blank line(s) - -ℹ Safe fix -672 672 | print() -673 673 | -674 674 | -675 |- -676 675 | # comment -677 676 | -678 677 | print() +672 | print() +673 | +674 | + - +675 | # comment +676 | +677 | print() E303 [*] Too many blank lines (2) --> E30.py:687:5 @@ -102,15 +92,13 @@ E303 [*] Too many blank lines (2) | ^^^^^^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -683 683 | def a(): -684 684 | print() -685 685 | -686 |- -687 686 | # comment -688 687 | -689 688 | +683 | def a(): +684 | print() +685 | + - +686 | # comment +687 | +688 | E303 [*] Too many blank lines (2) --> E30.py:690:5 @@ -121,15 +109,13 @@ E303 [*] Too many blank lines (2) 692 | print() | help: Remove extraneous blank line(s) - -ℹ Safe fix -686 686 | -687 687 | # comment -688 688 | -689 |- -690 689 | # another comment -691 690 | -692 691 | print() +686 | +687 | # comment +688 | + - +689 | # another comment +690 | +691 | print() E303 [*] Too many blank lines (3) --> E30.py:701:1 @@ -141,15 +127,13 @@ E303 [*] Too many blank lines (3) 704 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -697 697 | #!python -698 698 | -699 699 | -700 |- -701 700 | """This class docstring comes on line 5. -702 701 | It gives error E303: too many blank lines (3) -703 702 | """ +697 | #!python +698 | +699 | + - +700 | """This class docstring comes on line 5. +701 | It gives error E303: too many blank lines (3) +702 | """ E303 [*] Too many blank lines (2) --> E30.py:713:5 @@ -160,15 +144,13 @@ E303 [*] Too many blank lines (2) 715 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -709 709 | def a(self): -710 710 | pass -711 711 | -712 |- -713 712 | def b(self): -714 713 | pass -715 714 | # end +709 | def a(self): +710 | pass +711 | + - +712 | def b(self): +713 | pass +714 | # end E303 [*] Too many blank lines (2) --> E30.py:723:5 @@ -178,15 +160,13 @@ E303 [*] Too many blank lines (2) 724 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -719 719 | if True: -720 720 | a = 1 -721 721 | -722 |- -723 722 | a = 2 -724 723 | # end -725 724 | +719 | if True: +720 | a = 1 +721 | + - +722 | a = 2 +723 | # end +724 | E303 [*] Too many blank lines (2) --> E30.py:731:5 @@ -195,15 +175,13 @@ E303 [*] Too many blank lines (2) | ^^^^^^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -727 727 | # E303 -728 728 | class Test: -729 729 | -730 |- -731 730 | # comment -732 731 | -733 732 | +727 | # E303 +728 | class Test: +729 | + - +730 | # comment +731 | +732 | E303 [*] Too many blank lines (2) --> E30.py:734:5 @@ -214,15 +192,13 @@ E303 [*] Too many blank lines (2) 736 | def test(self): pass | help: Remove extraneous blank line(s) - -ℹ Safe fix -730 730 | -731 731 | # comment -732 732 | -733 |- -734 733 | # another comment -735 734 | -736 735 | def test(self): pass +730 | +731 | # comment +732 | + - +733 | # another comment +734 | +735 | def test(self): pass E303 [*] Too many blank lines (2) --> E30.py:748:5 @@ -233,15 +209,13 @@ E303 [*] Too many blank lines (2) 750 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -744 744 | -745 745 | # wrongly indented comment -746 746 | -747 |- -748 747 | def b(self): -749 748 | pass -750 749 | # end +744 | +745 | # wrongly indented comment +746 | + - +747 | def b(self): +748 | pass +749 | # end E303 [*] Too many blank lines (2) --> E30.py:758:5 @@ -251,12 +225,10 @@ E303 [*] Too many blank lines (2) 759 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -754 754 | def fn(): -755 755 | pass -756 756 | -757 |- -758 757 | pass -759 758 | # end -760 759 | +754 | def fn(): +755 | pass +756 | + - +757 | pass +758 | # end +759 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap index 69abdc2255..26a455e445 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_comment.py.snap @@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3) 6 | pass | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | # Test where the first line is a comment, and the rule violation follows it. -2 2 | -3 3 | -4 |- -5 4 | def fn(): -6 5 | pass +1 | # Test where the first line is a comment, and the rule violation follows it. +2 | +3 | + - +4 | def fn(): +5 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap index a17b0e2583..fadad42fa6 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_docstring.py.snap @@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3) 6 | pass | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | """Test where the error is after the module's docstring.""" -2 2 | -3 3 | -4 |- -5 4 | def fn(): -6 5 | pass +1 | """Test where the error is after the module's docstring.""" +2 | +3 | + - +4 | def fn(): +5 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap index 5b5949a0ad..c7b102856d 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_expression.py.snap @@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3) 6 | pass | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | "Test where the first line is a comment, " + "and the rule violation follows it." -2 2 | -3 3 | -4 |- -5 4 | def fn(): -6 5 | pass +1 | "Test where the first line is a comment, " + "and the rule violation follows it." +2 | +3 | + - +4 | def fn(): +5 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap index 76cd66baf6..5cfbafff8a 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E303_first_line_statement.py.snap @@ -9,11 +9,9 @@ E303 [*] Too many blank lines (3) 6 | pass | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | print("Test where the first line is a statement, and the rule violation follows it.") -2 2 | -3 3 | -4 |- -5 4 | def fn(): -6 5 | pass +1 | print("Test where the first line is a statement, and the rule violation follows it.") +2 | +3 | + - +4 | def fn(): +5 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap index 8600852a29..383dee6b36 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E304_E30.py.snap @@ -12,15 +12,13 @@ E304 [*] Blank lines found after function decorator (1) 767 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -761 761 | -762 762 | # E304 -763 763 | @decorator -764 |- -765 764 | def function(): -766 765 | pass -767 766 | # end +761 | +762 | # E304 +763 | @decorator + - +764 | def function(): +765 | pass +766 | # end E304 [*] Blank lines found after function decorator (1) --> E30.py:774:1 @@ -32,15 +30,13 @@ E304 [*] Blank lines found after function decorator (1) 776 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -769 769 | -770 770 | # E304 -771 771 | @decorator -772 |- -773 772 | # comment E304 not expected -774 773 | def function(): -775 774 | pass +769 | +770 | # E304 +771 | @decorator + - +772 | # comment E304 not expected +773 | def function(): +774 | pass E304 [*] Blank lines found after function decorator (2) --> E30.py:786:1 @@ -52,15 +48,13 @@ E304 [*] Blank lines found after function decorator (2) 788 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -778 778 | -779 779 | # E304 -780 780 | @decorator -781 |- -782 781 | # comment E304 not expected -783 |- -784 |- -785 782 | # second comment E304 not expected -786 783 | def function(): -787 784 | pass +778 | +779 | # E304 +780 | @decorator + - +781 | # comment E304 not expected + - + - +782 | # second comment E304 not expected +783 | def function(): +784 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap index 4991548cac..b57173b4a5 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E305_E30.py.snap @@ -10,15 +10,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1) 799 | # end | help: Add missing blank line(s) - -ℹ Safe fix -795 795 | # comment -796 796 | -797 797 | # another comment - 798 |+ -798 799 | fn() -799 800 | # end -800 801 | +795 | # comment +796 | +797 | # another comment +798 + +799 | fn() +800 | # end +801 | E305 [*] Expected 2 blank lines after class or function definition, found (1) --> E30.py:809:1 @@ -29,15 +27,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1) 810 | # end | help: Add missing blank line(s) - -ℹ Safe fix -806 806 | # comment -807 807 | -808 808 | # another comment - 809 |+ -809 810 | a = 1 -810 811 | # end -811 812 | +806 | # comment +807 | +808 | # another comment +809 + +810 | a = 1 +811 | # end +812 | E305 [*] Expected 2 blank lines after class or function definition, found (1) --> E30.py:821:1 @@ -50,15 +46,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1) 823 | except Exception: | help: Add missing blank line(s) - -ℹ Safe fix -818 818 | -819 819 | # another comment -820 820 | - 821 |+ -821 822 | try: -822 823 | fn() -823 824 | except Exception: +818 | +819 | # another comment +820 | +821 + +822 | try: +823 | fn() +824 | except Exception: E305 [*] Expected 2 blank lines after class or function definition, found (1) --> E30.py:833:1 @@ -70,15 +64,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1) 835 | # end | help: Add missing blank line(s) - -ℹ Safe fix -829 829 | def a(): -830 830 | print() -831 831 | - 832 |+ -832 833 | # Two spaces before comments, too. -833 834 | if a(): -834 835 | a() +829 | def a(): +830 | print() +831 | +832 + +833 | # Two spaces before comments, too. +834 | if a(): +835 | a() E305 [*] Expected 2 blank lines after class or function definition, found (1) --> E30.py:846:1 @@ -91,15 +83,13 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1) 848 | # end | help: Add missing blank line(s) - -ℹ Safe fix -843 843 | def main(): -844 844 | blah, blah -845 845 | - 846 |+ -846 847 | if __name__ == '__main__': -847 848 | main() -848 849 | # end +843 | def main(): +844 | blah, blah +845 | +846 + +847 | if __name__ == '__main__': +848 | main() +849 | # end E305 [*] Expected 2 blank lines after class or function definition, found (1) --> E30.py:973:1 @@ -110,12 +100,10 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1) 974 | APPLE = 200 | help: Add missing blank line(s) - -ℹ Safe fix -969 969 | class A: -970 970 | pass -971 971 | - 972 |+ -972 973 | # ====== Cool constants ======== -973 974 | BANANA = 100 -974 975 | APPLE = 200 +969 | class A: +970 | pass +971 | +972 + +973 | # ====== Cool constants ======== +974 | BANANA = 100 +975 | APPLE = 200 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap index b322886e7d..204834fc20 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E306_E30.py.snap @@ -12,15 +12,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 856 | # end | help: Add missing blank line - -ℹ Safe fix -851 851 | # E306:3:5 -852 852 | def a(): -853 853 | x = 1 - 854 |+ -854 855 | def b(): -855 856 | pass -856 857 | # end +851 | # E306:3:5 +852 | def a(): +853 | x = 1 +854 + +855 | def b(): +856 | pass +857 | # end E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:862:5 @@ -33,15 +31,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 864 | # end | help: Add missing blank line - -ℹ Safe fix -859 859 | #: E306:3:5 -860 860 | async def a(): -861 861 | x = 1 - 862 |+ -862 863 | def b(): -863 864 | pass -864 865 | # end +859 | #: E306:3:5 +860 | async def a(): +861 | x = 1 +862 + +863 | def b(): +864 | pass +865 | # end E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:870:5 @@ -54,15 +50,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 872 | def c(): | help: Add missing blank line - -ℹ Safe fix -867 867 | #: E306:3:5 E306:5:9 -868 868 | def a(): -869 869 | x = 2 - 870 |+ -870 871 | def b(): -871 872 | x = 1 -872 873 | def c(): +867 | #: E306:3:5 E306:5:9 +868 | def a(): +869 | x = 2 +870 + +871 | def b(): +872 | x = 1 +873 | def c(): E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:872:9 @@ -75,15 +69,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 874 | # end | help: Add missing blank line - -ℹ Safe fix -869 869 | x = 2 -870 870 | def b(): -871 871 | x = 1 - 872 |+ -872 873 | def c(): -873 874 | pass -874 875 | # end +869 | x = 2 +870 | def b(): +871 | x = 1 +872 + +873 | def c(): +874 | pass +875 | # end E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:880:5 @@ -96,15 +88,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 882 | x = 2 | help: Add missing blank line - -ℹ Safe fix -877 877 | # E306:3:5 E306:6:5 -878 878 | def a(): -879 879 | x = 1 - 880 |+ -880 881 | class C: -881 882 | pass -882 883 | x = 2 +877 | # E306:3:5 E306:6:5 +878 | def a(): +879 | x = 1 +880 + +881 | class C: +882 | pass +883 | x = 2 E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:883:5 @@ -117,15 +107,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 885 | # end | help: Add missing blank line - -ℹ Safe fix -880 880 | class C: -881 881 | pass -882 882 | x = 2 - 883 |+ -883 884 | def b(): -884 885 | pass -885 886 | # end +880 | class C: +881 | pass +882 | x = 2 +883 + +884 | def b(): +885 | pass +886 | # end E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:892:5 @@ -137,15 +125,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 893 | # end | help: Add missing blank line - -ℹ Safe fix -889 889 | def foo(): -890 890 | def bar(): -891 891 | pass - 892 |+ -892 893 | def baz(): pass -893 894 | # end -894 895 | +889 | def foo(): +890 | def bar(): +891 | pass +892 + +893 | def baz(): pass +894 | # end +895 | E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:899:5 @@ -158,15 +144,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 901 | # end | help: Add missing blank line - -ℹ Safe fix -896 896 | # E306:3:5 -897 897 | def foo(): -898 898 | def bar(): pass - 899 |+ -899 900 | def baz(): -900 901 | pass -901 902 | # end +896 | # E306:3:5 +897 | def foo(): +898 | def bar(): pass +899 + +900 | def baz(): +901 | pass +902 | # end E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:907:5 @@ -179,15 +163,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 909 | pass | help: Add missing blank line - -ℹ Safe fix -904 904 | # E306 -905 905 | def a(): -906 906 | x = 2 - 907 |+ -907 908 | @decorator -908 909 | def b(): -909 910 | pass +904 | # E306 +905 | def a(): +906 | x = 2 +907 + +908 | @decorator +909 | def b(): +910 | pass E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:916:5 @@ -200,15 +182,13 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 918 | pass | help: Add missing blank line - -ℹ Safe fix -913 913 | # E306 -914 914 | def a(): -915 915 | x = 2 - 916 |+ -916 917 | @decorator -917 918 | async def b(): -918 919 | pass +913 | # E306 +914 | def a(): +915 | x = 2 +916 + +917 | @decorator +918 | async def b(): +919 | pass E306 [*] Expected 1 blank line before a nested definition, found 0 --> E30.py:925:5 @@ -221,12 +201,10 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 927 | # end | help: Add missing blank line - -ℹ Safe fix -922 922 | # E306 -923 923 | def a(): -924 924 | x = 2 - 925 |+ -925 926 | async def b(): -926 927 | pass -927 928 | # end +922 | # E306 +923 | def a(): +924 | x = 2 +925 + +926 | async def b(): +927 | pass +928 | # end diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap index d9b8910ed4..c5c2ac2f41 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E401_E40.py.snap @@ -11,15 +11,13 @@ E401 [*] Multiple imports on one line 4 | #: Okay | help: Split imports - -ℹ Safe fix -1 1 | #: E401 -2 |-import os, sys - 2 |+import os - 3 |+import sys -3 4 | -4 5 | #: Okay -5 6 | import os +1 | #: E401 + - import os, sys +2 + import os +3 + import sys +4 | +5 | #: Okay +6 | import os E401 [*] Multiple imports on one line --> E40.py:65:1 @@ -30,17 +28,15 @@ E401 [*] Multiple imports on one line 66 | import re as regex, string; x = 1 | help: Split imports - -ℹ Safe fix -62 62 | import bar -63 63 | -64 64 | #: E401 -65 |-import re as regex, string # also with a comment! - 65 |+import re as regex - 66 |+import string # also with a comment! -66 67 | import re as regex, string; x = 1 -67 68 | -68 69 | x = 1; import re as regex, string +62 | import bar +63 | +64 | #: E401 + - import re as regex, string # also with a comment! +65 + import re as regex +66 + import string # also with a comment! +67 | import re as regex, string; x = 1 +68 | +69 | x = 1; import re as regex, string E401 [*] Multiple imports on one line --> E40.py:66:1 @@ -53,16 +49,14 @@ E401 [*] Multiple imports on one line 68 | x = 1; import re as regex, string | help: Split imports - -ℹ Safe fix -63 63 | -64 64 | #: E401 -65 65 | import re as regex, string # also with a comment! -66 |-import re as regex, string; x = 1 - 66 |+import re as regex; import string; x = 1 -67 67 | -68 68 | x = 1; import re as regex, string -69 69 | +63 | +64 | #: E401 +65 | import re as regex, string # also with a comment! + - import re as regex, string; x = 1 +66 + import re as regex; import string; x = 1 +67 | +68 | x = 1; import re as regex, string +69 | E401 [*] Multiple imports on one line --> E40.py:68:8 @@ -73,16 +67,14 @@ E401 [*] Multiple imports on one line | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Split imports - -ℹ Safe fix -65 65 | import re as regex, string # also with a comment! -66 66 | import re as regex, string; x = 1 -67 67 | -68 |-x = 1; import re as regex, string - 68 |+x = 1; import re as regex; import string -69 69 | -70 70 | -71 71 | def blah(): +65 | import re as regex, string # also with a comment! +66 | import re as regex, string; x = 1 +67 | + - x = 1; import re as regex, string +68 + x = 1; import re as regex; import string +69 | +70 | +71 | def blah(): E401 [*] Multiple imports on one line --> E40.py:72:5 @@ -94,17 +86,15 @@ E401 [*] Multiple imports on one line 74 | def nested_and_tested(): | help: Split imports - -ℹ Safe fix -69 69 | -70 70 | -71 71 | def blah(): -72 |- import datetime as dt, copy - 72 |+ import datetime as dt - 73 |+ import copy -73 74 | -74 75 | def nested_and_tested(): -75 76 | import builtins, textwrap as tw +69 | +70 | +71 | def blah(): + - import datetime as dt, copy +72 + import datetime as dt +73 + import copy +74 | +75 | def nested_and_tested(): +76 | import builtins, textwrap as tw E401 [*] Multiple imports on one line --> E40.py:75:9 @@ -116,17 +106,15 @@ E401 [*] Multiple imports on one line 77 | x = 1; import re as regex, string | help: Split imports - -ℹ Safe fix -72 72 | import datetime as dt, copy -73 73 | -74 74 | def nested_and_tested(): -75 |- import builtins, textwrap as tw - 75 |+ import builtins - 76 |+ import textwrap as tw -76 77 | -77 78 | x = 1; import re as regex, string -78 79 | import re as regex, string; x = 1 +72 | import datetime as dt, copy +73 | +74 | def nested_and_tested(): + - import builtins, textwrap as tw +75 + import builtins +76 + import textwrap as tw +77 | +78 | x = 1; import re as regex, string +79 | import re as regex, string; x = 1 E401 [*] Multiple imports on one line --> E40.py:77:16 @@ -138,16 +126,14 @@ E401 [*] Multiple imports on one line 78 | import re as regex, string; x = 1 | help: Split imports - -ℹ Safe fix -74 74 | def nested_and_tested(): -75 75 | import builtins, textwrap as tw -76 76 | -77 |- x = 1; import re as regex, string - 77 |+ x = 1; import re as regex; import string -78 78 | import re as regex, string; x = 1 -79 79 | -80 80 | if True: import re as regex, string +74 | def nested_and_tested(): +75 | import builtins, textwrap as tw +76 | + - x = 1; import re as regex, string +77 + x = 1; import re as regex; import string +78 | import re as regex, string; x = 1 +79 | +80 | if True: import re as regex, string E401 [*] Multiple imports on one line --> E40.py:78:9 @@ -159,15 +145,13 @@ E401 [*] Multiple imports on one line 80 | if True: import re as regex, string | help: Split imports - -ℹ Safe fix -75 75 | import builtins, textwrap as tw -76 76 | -77 77 | x = 1; import re as regex, string -78 |- import re as regex, string; x = 1 - 78 |+ import re as regex; import string; x = 1 -79 79 | -80 80 | if True: import re as regex, string +75 | import builtins, textwrap as tw +76 | +77 | x = 1; import re as regex, string + - import re as regex, string; x = 1 +78 + import re as regex; import string; x = 1 +79 | +80 | if True: import re as regex, string E401 [*] Multiple imports on one line --> E40.py:80:14 @@ -178,10 +162,8 @@ E401 [*] Multiple imports on one line | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Split imports - -ℹ Safe fix -77 77 | x = 1; import re as regex, string -78 78 | import re as regex, string; x = 1 -79 79 | -80 |- if True: import re as regex, string - 80 |+ if True: import re as regex; import string +77 | x = 1; import re as regex, string +78 | import re as regex, string; x = 1 +79 | + - if True: import re as regex, string +80 + if True: import re as regex; import string diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap index 9b62eb2ee9..a4e605d2cb 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E70.py.snap @@ -12,16 +12,14 @@ E703 [*] Statement ends with an unnecessary semicolon 12 | del a[:]; a.append(42); | help: Remove unnecessary semicolon - -ℹ Safe fix -7 7 | #: E702:1:17 -8 8 | import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe) -9 9 | #: E703:1:13 -10 |-import shlex; - 10 |+import shlex -11 11 | #: E702:1:9 E703:1:23 -12 12 | del a[:]; a.append(42); -13 13 | #: E704:1:1 +7 | #: E702:1:17 +8 | import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe) +9 | #: E703:1:13 + - import shlex; +10 + import shlex +11 | #: E702:1:9 E703:1:23 +12 | del a[:]; a.append(42); +13 | #: E704:1:1 E703 [*] Statement ends with an unnecessary semicolon --> E70.py:12:23 @@ -34,16 +32,14 @@ E703 [*] Statement ends with an unnecessary semicolon 14 | def f(x): return 2 | help: Remove unnecessary semicolon - -ℹ Safe fix -9 9 | #: E703:1:13 -10 10 | import shlex; -11 11 | #: E702:1:9 E703:1:23 -12 |-del a[:]; a.append(42); - 12 |+del a[:]; a.append(42) -13 13 | #: E704:1:1 -14 14 | def f(x): return 2 -15 15 | #: E704:1:1 +9 | #: E703:1:13 +10 | import shlex; +11 | #: E702:1:9 E703:1:23 + - del a[:]; a.append(42); +12 + del a[:]; a.append(42) +13 | #: E704:1:1 +14 | def f(x): return 2 +15 | #: E704:1:1 E703 [*] Statement ends with an unnecessary semicolon --> E70.py:25:14 @@ -56,16 +52,14 @@ E703 [*] Statement ends with an unnecessary semicolon 27 | if True: lambda a: b | help: Remove unnecessary semicolon - -ℹ Safe fix -22 22 | while all is round: -23 23 | def f(x): return 2*x -24 24 | #: E704:1:8 E702:1:11 E703:1:14 -25 |-if True: x; y; - 25 |+if True: x; y -26 26 | #: E701:1:8 -27 27 | if True: lambda a: b -28 28 | #: E701:1:10 +22 | while all is round: +23 | def f(x): return 2*x +24 | #: E704:1:8 E702:1:11 E703:1:14 + - if True: x; y; +25 + if True: x; y +26 | #: E701:1:8 +27 | if True: lambda a: b +28 | #: E701:1:10 E703 [*] Statement ends with an unnecessary semicolon --> E70.py:68:1 @@ -78,17 +72,15 @@ E703 [*] Statement ends with an unnecessary semicolon 70 | a = \ | help: Remove unnecessary semicolon - -ℹ Safe fix -64 64 | while 1: -65 65 | 1;... -66 66 | #: E703:2:1 -67 |-0\ -68 |-; - 67 |+0 -69 68 | #: E701:2:3 -70 69 | a = \ -71 70 | 5; +64 | while 1: +65 | 1;... +66 | #: E703:2:1 + - 0\ + - ; +67 + 0 +68 | #: E701:2:3 +69 | a = \ +70 | 5; E703 [*] Statement ends with an unnecessary semicolon --> E70.py:71:4 @@ -101,12 +93,10 @@ E703 [*] Statement ends with an unnecessary semicolon 73 | with x(y) as z: ... | help: Remove unnecessary semicolon - -ℹ Safe fix -68 68 | ; -69 69 | #: E701:2:3 -70 70 | a = \ -71 |- 5; - 71 |+ 5 -72 72 | #: -73 73 | with x(y) as z: ... +68 | ; +69 | #: E701:2:3 +70 | a = \ + - 5; +71 + 5 +72 | #: +73 | with x(y) as z: ... diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap index 03e8193c87..b0b21c9051 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E703_E703.ipynb.snap @@ -12,16 +12,14 @@ E703 [*] Statement ends with an unnecessary semicolon 7 | # Nested expressions isn't relevant | help: Remove unnecessary semicolon - -ℹ Safe fix -2 2 | # Simple case -3 3 | x; -4 4 | # Only skip the last expression -5 |-x; # E703 - 5 |+x # E703 -6 6 | x; -7 7 | # Nested expressions isn't relevant -8 8 | if True: +2 | # Simple case +3 | x; +4 | # Only skip the last expression + - x; # E703 +5 + x # E703 +6 | x; +7 | # Nested expressions isn't relevant +8 | if True: E703 [*] Statement ends with an unnecessary semicolon --> E703.ipynb:9:6 @@ -34,13 +32,11 @@ E703 [*] Statement ends with an unnecessary semicolon 11 | x; x; | help: Remove unnecessary semicolon - -ℹ Safe fix -6 6 | x; -7 7 | # Nested expressions isn't relevant -8 8 | if True: -9 |- x; - 9 |+ x -10 10 | # Semicolons with multiple expressions -11 11 | x; x; -12 12 | # Comments, newlines and whitespace +6 | x; +7 | # Nested expressions isn't relevant +8 | if True: + - x; +9 + x +10 | # Semicolons with multiple expressions +11 | x; x; +12 | # Comments, newlines and whitespace diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap index ea67cff398..c8614bf34a 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E711_E711.py.snap @@ -11,14 +11,13 @@ E711 [*] Comparison to `None` should be `cond is None` 4 | #: E711 | help: Replace with `cond is None` - -ℹ Unsafe fix -1 1 | #: E711 -2 |-if res == None: - 2 |+if res is None: -3 3 | pass -4 4 | #: E711 -5 5 | if res != None: +1 | #: E711 + - if res == None: +2 + if res is None: +3 | pass +4 | #: E711 +5 | if res != None: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is not None` --> E711.py:5:11 @@ -31,16 +30,15 @@ E711 [*] Comparison to `None` should be `cond is not None` 7 | #: E711 | help: Replace with `cond is not None` - -ℹ Unsafe fix -2 2 | if res == None: -3 3 | pass -4 4 | #: E711 -5 |-if res != None: - 5 |+if res is not None: -6 6 | pass -7 7 | #: E711 -8 8 | if None == res: +2 | if res == None: +3 | pass +4 | #: E711 + - if res != None: +5 + if res is not None: +6 | pass +7 | #: E711 +8 | if None == res: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is None` --> E711.py:8:4 @@ -53,16 +51,15 @@ E711 [*] Comparison to `None` should be `cond is None` 10 | #: E711 | help: Replace with `cond is None` - -ℹ Unsafe fix -5 5 | if res != None: -6 6 | pass -7 7 | #: E711 -8 |-if None == res: - 8 |+if None is res: -9 9 | pass -10 10 | #: E711 -11 11 | if None != res: +5 | if res != None: +6 | pass +7 | #: E711 + - if None == res: +8 + if None is res: +9 | pass +10 | #: E711 +11 | if None != res: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is not None` --> E711.py:11:4 @@ -75,16 +72,15 @@ E711 [*] Comparison to `None` should be `cond is not None` 13 | #: E711 | help: Replace with `cond is not None` - -ℹ Unsafe fix -8 8 | if None == res: -9 9 | pass -10 10 | #: E711 -11 |-if None != res: - 11 |+if None is not res: -12 12 | pass -13 13 | #: E711 -14 14 | if res[1] == None: +8 | if None == res: +9 | pass +10 | #: E711 + - if None != res: +11 + if None is not res: +12 | pass +13 | #: E711 +14 | if res[1] == None: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is None` --> E711.py:14:14 @@ -97,16 +93,15 @@ E711 [*] Comparison to `None` should be `cond is None` 16 | #: E711 | help: Replace with `cond is None` - -ℹ Unsafe fix -11 11 | if None != res: -12 12 | pass -13 13 | #: E711 -14 |-if res[1] == None: - 14 |+if res[1] is None: -15 15 | pass -16 16 | #: E711 -17 17 | if res[1] != None: +11 | if None != res: +12 | pass +13 | #: E711 + - if res[1] == None: +14 + if res[1] is None: +15 | pass +16 | #: E711 +17 | if res[1] != None: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is not None` --> E711.py:17:14 @@ -119,16 +114,15 @@ E711 [*] Comparison to `None` should be `cond is not None` 19 | #: E711 | help: Replace with `cond is not None` - -ℹ Unsafe fix -14 14 | if res[1] == None: -15 15 | pass -16 16 | #: E711 -17 |-if res[1] != None: - 17 |+if res[1] is not None: -18 18 | pass -19 19 | #: E711 -20 20 | if None != res[1]: +14 | if res[1] == None: +15 | pass +16 | #: E711 + - if res[1] != None: +17 + if res[1] is not None: +18 | pass +19 | #: E711 +20 | if None != res[1]: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is not None` --> E711.py:20:4 @@ -141,16 +135,15 @@ E711 [*] Comparison to `None` should be `cond is not None` 22 | #: E711 | help: Replace with `cond is not None` - -ℹ Unsafe fix -17 17 | if res[1] != None: -18 18 | pass -19 19 | #: E711 -20 |-if None != res[1]: - 20 |+if None is not res[1]: -21 21 | pass -22 22 | #: E711 -23 23 | if None == res[1]: +17 | if res[1] != None: +18 | pass +19 | #: E711 + - if None != res[1]: +20 + if None is not res[1]: +21 | pass +22 | #: E711 +23 | if None == res[1]: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is None` --> E711.py:23:4 @@ -162,16 +155,15 @@ E711 [*] Comparison to `None` should be `cond is None` 24 | pass | help: Replace with `cond is None` - -ℹ Unsafe fix -20 20 | if None != res[1]: -21 21 | pass -22 22 | #: E711 -23 |-if None == res[1]: - 23 |+if None is res[1]: -24 24 | pass -25 25 | -26 26 | if x == None != None: +20 | if None != res[1]: +21 | pass +22 | #: E711 + - if None == res[1]: +23 + if None is res[1]: +24 | pass +25 | +26 | if x == None != None: +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is None` --> E711.py:26:9 @@ -183,16 +175,15 @@ E711 [*] Comparison to `None` should be `cond is None` 27 | pass | help: Replace with `cond is None` - -ℹ Unsafe fix -23 23 | if None == res[1]: -24 24 | pass -25 25 | -26 |-if x == None != None: - 26 |+if x is None is not None: -27 27 | pass -28 28 | -29 29 | #: Okay +23 | if None == res[1]: +24 | pass +25 | + - if x == None != None: +26 + if x is None is not None: +27 | pass +28 | +29 | #: Okay +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is not None` --> E711.py:26:17 @@ -204,13 +195,12 @@ E711 [*] Comparison to `None` should be `cond is not None` 27 | pass | help: Replace with `cond is not None` - -ℹ Unsafe fix -23 23 | if None == res[1]: -24 24 | pass -25 25 | -26 |-if x == None != None: - 26 |+if x is None is not None: -27 27 | pass -28 28 | -29 29 | #: Okay +23 | if None == res[1]: +24 | pass +25 | + - if x == None != None: +26 + if x is None is not None: +27 | pass +28 | +29 | #: Okay +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap index 502c3b1e2c..7155cd3ac5 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E712_E712.py.snap @@ -11,14 +11,13 @@ E712 [*] Avoid equality comparisons to `True`; use `res:` for truth checks 4 | #: E712 | help: Replace with `res` - -ℹ Unsafe fix -1 1 | #: E712 -2 |-if res == True: - 2 |+if res: -3 3 | pass -4 4 | #: E712 -5 5 | if res != False: +1 | #: E712 + - if res == True: +2 + if res: +3 | pass +4 | #: E712 +5 | if res != False: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid inequality comparisons to `False`; use `res:` for truth checks --> E712.py:5:4 @@ -31,16 +30,15 @@ E712 [*] Avoid inequality comparisons to `False`; use `res:` for truth checks 7 | #: E712 | help: Replace with `res` - -ℹ Unsafe fix -2 2 | if res == True: -3 3 | pass -4 4 | #: E712 -5 |-if res != False: - 5 |+if res: -6 6 | pass -7 7 | #: E712 -8 8 | if True != res: +2 | if res == True: +3 | pass +4 | #: E712 + - if res != False: +5 + if res: +6 | pass +7 | #: E712 +8 | if True != res: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid inequality comparisons to `True`; use `not res:` for false checks --> E712.py:8:4 @@ -53,16 +51,15 @@ E712 [*] Avoid inequality comparisons to `True`; use `not res:` for false checks 10 | #: E712 | help: Replace with `not res` - -ℹ Unsafe fix -5 5 | if res != False: -6 6 | pass -7 7 | #: E712 -8 |-if True != res: - 8 |+if not res: -9 9 | pass -10 10 | #: E712 -11 11 | if False == res: +5 | if res != False: +6 | pass +7 | #: E712 + - if True != res: +8 + if not res: +9 | pass +10 | #: E712 +11 | if False == res: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `False`; use `not res:` for false checks --> E712.py:11:4 @@ -75,16 +72,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not res:` for false checks 13 | #: E712 | help: Replace with `not res` - -ℹ Unsafe fix -8 8 | if True != res: -9 9 | pass -10 10 | #: E712 -11 |-if False == res: - 11 |+if not res: -12 12 | pass -13 13 | #: E712 -14 14 | if res[1] == True: +8 | if True != res: +9 | pass +10 | #: E712 + - if False == res: +11 + if not res: +12 | pass +13 | #: E712 +14 | if res[1] == True: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True`; use `res[1]:` for truth checks --> E712.py:14:4 @@ -97,16 +93,15 @@ E712 [*] Avoid equality comparisons to `True`; use `res[1]:` for truth checks 16 | #: E712 | help: Replace with `res[1]` - -ℹ Unsafe fix -11 11 | if False == res: -12 12 | pass -13 13 | #: E712 -14 |-if res[1] == True: - 14 |+if res[1]: -15 15 | pass -16 16 | #: E712 -17 17 | if res[1] != False: +11 | if False == res: +12 | pass +13 | #: E712 + - if res[1] == True: +14 + if res[1]: +15 | pass +16 | #: E712 +17 | if res[1] != False: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid inequality comparisons to `False`; use `res[1]:` for truth checks --> E712.py:17:4 @@ -119,16 +114,15 @@ E712 [*] Avoid inequality comparisons to `False`; use `res[1]:` for truth checks 19 | #: E712 | help: Replace with `res[1]` - -ℹ Unsafe fix -14 14 | if res[1] == True: -15 15 | pass -16 16 | #: E712 -17 |-if res[1] != False: - 17 |+if res[1]: -18 18 | pass -19 19 | #: E712 -20 20 | var = 1 if cond == True else -1 if cond == False else cond +14 | if res[1] == True: +15 | pass +16 | #: E712 + - if res[1] != False: +17 + if res[1]: +18 | pass +19 | #: E712 +20 | var = 1 if cond == True else -1 if cond == False else cond +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True`; use `cond:` for truth checks --> E712.py:20:12 @@ -141,16 +135,15 @@ E712 [*] Avoid equality comparisons to `True`; use `cond:` for truth checks 22 | if (True) == TrueElement or x == TrueElement: | help: Replace with `cond` - -ℹ Unsafe fix -17 17 | if res[1] != False: -18 18 | pass -19 19 | #: E712 -20 |-var = 1 if cond == True else -1 if cond == False else cond - 20 |+var = 1 if cond else -1 if cond == False else cond -21 21 | #: E712 -22 22 | if (True) == TrueElement or x == TrueElement: -23 23 | pass +17 | if res[1] != False: +18 | pass +19 | #: E712 + - var = 1 if cond == True else -1 if cond == False else cond +20 + var = 1 if cond else -1 if cond == False else cond +21 | #: E712 +22 | if (True) == TrueElement or x == TrueElement: +23 | pass +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `False`; use `not cond:` for false checks --> E712.py:20:36 @@ -163,16 +156,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not cond:` for false checks 22 | if (True) == TrueElement or x == TrueElement: | help: Replace with `not cond` - -ℹ Unsafe fix -17 17 | if res[1] != False: -18 18 | pass -19 19 | #: E712 -20 |-var = 1 if cond == True else -1 if cond == False else cond - 20 |+var = 1 if cond == True else -1 if not cond else cond -21 21 | #: E712 -22 22 | if (True) == TrueElement or x == TrueElement: -23 23 | pass +17 | if res[1] != False: +18 | pass +19 | #: E712 + - var = 1 if cond == True else -1 if cond == False else cond +20 + var = 1 if cond == True else -1 if not cond else cond +21 | #: E712 +22 | if (True) == TrueElement or x == TrueElement: +23 | pass +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth checks --> E712.py:22:4 @@ -184,16 +176,15 @@ E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth chec 23 | pass | help: Replace with `TrueElement` - -ℹ Unsafe fix -19 19 | #: E712 -20 20 | var = 1 if cond == True else -1 if cond == False else cond -21 21 | #: E712 -22 |-if (True) == TrueElement or x == TrueElement: - 22 |+if (TrueElement) or x == TrueElement: -23 23 | pass -24 24 | -25 25 | if res == True != False: +19 | #: E712 +20 | var = 1 if cond == True else -1 if cond == False else cond +21 | #: E712 + - if (True) == TrueElement or x == TrueElement: +22 + if (TrueElement) or x == TrueElement: +23 | pass +24 | +25 | if res == True != False: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True` or `False` --> E712.py:25:4 @@ -205,16 +196,15 @@ E712 [*] Avoid equality comparisons to `True` or `False` 26 | pass | help: Replace comparison - -ℹ Unsafe fix -22 22 | if (True) == TrueElement or x == TrueElement: -23 23 | pass -24 24 | -25 |-if res == True != False: - 25 |+if res is True is not False: -26 26 | pass -27 27 | -28 28 | if(True) == TrueElement or x == TrueElement: +22 | if (True) == TrueElement or x == TrueElement: +23 | pass +24 | + - if res == True != False: +25 + if res is True is not False: +26 | pass +27 | +28 | if(True) == TrueElement or x == TrueElement: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True` or `False` --> E712.py:25:4 @@ -226,16 +216,15 @@ E712 [*] Avoid equality comparisons to `True` or `False` 26 | pass | help: Replace comparison - -ℹ Unsafe fix -22 22 | if (True) == TrueElement or x == TrueElement: -23 23 | pass -24 24 | -25 |-if res == True != False: - 25 |+if res is True is not False: -26 26 | pass -27 27 | -28 28 | if(True) == TrueElement or x == TrueElement: +22 | if (True) == TrueElement or x == TrueElement: +23 | pass +24 | + - if res == True != False: +25 + if res is True is not False: +26 | pass +27 | +28 | if(True) == TrueElement or x == TrueElement: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth checks --> E712.py:28:3 @@ -247,16 +236,15 @@ E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth chec 29 | pass | help: Replace with `TrueElement` - -ℹ Unsafe fix -25 25 | if res == True != False: -26 26 | pass -27 27 | -28 |-if(True) == TrueElement or x == TrueElement: - 28 |+if(TrueElement) or x == TrueElement: -29 29 | pass -30 30 | -31 31 | if (yield i) == True: +25 | if res == True != False: +26 | pass +27 | + - if(True) == TrueElement or x == TrueElement: +28 + if(TrueElement) or x == TrueElement: +29 | pass +30 | +31 | if (yield i) == True: +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True`; use `yield i:` for truth checks --> E712.py:31:4 @@ -268,16 +256,15 @@ E712 [*] Avoid equality comparisons to `True`; use `yield i:` for truth checks 32 | print("even") | help: Replace with `yield i` - -ℹ Unsafe fix -28 28 | if(True) == TrueElement or x == TrueElement: -29 29 | pass -30 30 | -31 |-if (yield i) == True: - 31 |+if (yield i): -32 32 | print("even") -33 33 | -34 34 | #: Okay +28 | if(True) == TrueElement or x == TrueElement: +29 | pass +30 | + - if (yield i) == True: +31 + if (yield i): +32 | print("even") +33 | +34 | #: Okay +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `True`; use `True:` for truth checks --> E712.py:58:4 @@ -288,11 +275,10 @@ E712 [*] Avoid equality comparisons to `True`; use `True:` for truth checks 59 | pass | help: Replace with `True` - -ℹ Unsafe fix -55 55 | assert [42, not foo] in bar -56 56 | -57 57 | # https://github.com/astral-sh/ruff/issues/17582 -58 |-if True == True: # No duplicated diagnostic - 58 |+if True: # No duplicated diagnostic -59 59 | pass +55 | assert [42, not foo] in bar +56 | +57 | # https://github.com/astral-sh/ruff/issues/17582 + - if True == True: # No duplicated diagnostic +58 + if True: # No duplicated diagnostic +59 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap index a41a7572d6..ad29800e0b 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E713_E713.py.snap @@ -11,14 +11,12 @@ E713 [*] Test for membership should be `not in` 4 | #: E713 | help: Convert to `not in` - -ℹ Safe fix -1 1 | #: E713 -2 |-if not X in Y: - 2 |+if X not in Y: -3 3 | pass -4 4 | #: E713 -5 5 | if not X.B in Y: +1 | #: E713 + - if not X in Y: +2 + if X not in Y: +3 | pass +4 | #: E713 +5 | if not X.B in Y: E713 [*] Test for membership should be `not in` --> E713.py:5:8 @@ -31,16 +29,14 @@ E713 [*] Test for membership should be `not in` 7 | #: E713 | help: Convert to `not in` - -ℹ Safe fix -2 2 | if not X in Y: -3 3 | pass -4 4 | #: E713 -5 |-if not X.B in Y: - 5 |+if X.B not in Y: -6 6 | pass -7 7 | #: E713 -8 8 | if not X in Y and Z == "zero": +2 | if not X in Y: +3 | pass +4 | #: E713 + - if not X.B in Y: +5 + if X.B not in Y: +6 | pass +7 | #: E713 +8 | if not X in Y and Z == "zero": E713 [*] Test for membership should be `not in` --> E713.py:8:8 @@ -53,16 +49,14 @@ E713 [*] Test for membership should be `not in` 10 | #: E713 | help: Convert to `not in` - -ℹ Safe fix -5 5 | if not X.B in Y: -6 6 | pass -7 7 | #: E713 -8 |-if not X in Y and Z == "zero": - 8 |+if X not in Y and Z == "zero": -9 9 | pass -10 10 | #: E713 -11 11 | if X == "zero" or not Y in Z: +5 | if not X.B in Y: +6 | pass +7 | #: E713 + - if not X in Y and Z == "zero": +8 + if X not in Y and Z == "zero": +9 | pass +10 | #: E713 +11 | if X == "zero" or not Y in Z: E713 [*] Test for membership should be `not in` --> E713.py:11:23 @@ -75,16 +69,14 @@ E713 [*] Test for membership should be `not in` 13 | #: E713 | help: Convert to `not in` - -ℹ Safe fix -8 8 | if not X in Y and Z == "zero": -9 9 | pass -10 10 | #: E713 -11 |-if X == "zero" or not Y in Z: - 11 |+if X == "zero" or Y not in Z: -12 12 | pass -13 13 | #: E713 -14 14 | if not (X in Y): +8 | if not X in Y and Z == "zero": +9 | pass +10 | #: E713 + - if X == "zero" or not Y in Z: +11 + if X == "zero" or Y not in Z: +12 | pass +13 | #: E713 +14 | if not (X in Y): E713 [*] Test for membership should be `not in` --> E713.py:14:9 @@ -96,16 +88,14 @@ E713 [*] Test for membership should be `not in` 15 | pass | help: Convert to `not in` - -ℹ Safe fix -11 11 | if X == "zero" or not Y in Z: -12 12 | pass -13 13 | #: E713 -14 |-if not (X in Y): - 14 |+if X not in Y: -15 15 | pass -16 16 | -17 17 | #: Okay +11 | if X == "zero" or not Y in Z: +12 | pass +13 | #: E713 + - if not (X in Y): +14 + if X not in Y: +15 | pass +16 | +17 | #: Okay E713 [*] Test for membership should be `not in` --> E713.py:40:12 @@ -116,10 +106,8 @@ E713 [*] Test for membership should be `not in` | ^^^^^^^^^^^^^^^^^ | help: Convert to `not in` - -ℹ Safe fix -37 37 | assert {"x": not foo} in bar -38 38 | assert [42, not foo] in bar -39 39 | assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None) -40 |-assert not('name' in request)or not request['name'] - 40 |+assert 'name' not in request or not request['name'] +37 | assert {"x": not foo} in bar +38 | assert [42, not foo] in bar +39 | assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None) + - assert not('name' in request)or not request['name'] +40 + assert 'name' not in request or not request['name'] diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap index 3b9bfc27f3..7050ec8911 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E714_E714.py.snap @@ -11,14 +11,12 @@ E714 [*] Test for object identity should be `is not` 4 | #: E714 | help: Convert to `is not` - -ℹ Safe fix -1 1 | #: E714 -2 |-if not X is Y: - 2 |+if X is not Y: -3 3 | pass -4 4 | #: E714 -5 5 | if not X.B is Y: +1 | #: E714 + - if not X is Y: +2 + if X is not Y: +3 | pass +4 | #: E714 +5 | if not X.B is Y: E714 [*] Test for object identity should be `is not` --> E714.py:5:8 @@ -30,16 +28,14 @@ E714 [*] Test for object identity should be `is not` 6 | pass | help: Convert to `is not` - -ℹ Safe fix -2 2 | if not X is Y: -3 3 | pass -4 4 | #: E714 -5 |-if not X.B is Y: - 5 |+if X.B is not Y: -6 6 | pass -7 7 | -8 8 | #: Okay +2 | if not X is Y: +3 | pass +4 | #: E714 + - if not X.B is Y: +5 + if X.B is not Y: +6 | pass +7 | +8 | #: Okay E714 [*] Test for object identity should be `is not` --> E714.py:39:13 @@ -50,10 +46,8 @@ E714 [*] Test for object identity should be `is not` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to `is not` - -ℹ Safe fix -36 36 | assert (not foo) in bar -37 37 | assert {"x": not foo} in bar -38 38 | assert [42, not foo] in bar -39 |-assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None) - 39 |+assert re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is not None +36 | assert (not foo) in bar +37 | assert {"x": not foo} in bar +38 | assert [42, not foo] in bar + - assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None) +39 + assert re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is not None diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap index f3054605a4..e48878846b 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E731_E731.py.snap @@ -10,16 +10,15 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -1 1 | def scope(): -2 2 | # E731 -3 |- f = lambda x: 2 * x - 3 |+ def f(x): - 4 |+ return 2 * x -4 5 | -5 6 | -6 7 | def scope(): +1 | def scope(): +2 | # E731 + - f = lambda x: 2 * x +3 + def f(x): +4 + return 2 * x +5 | +6 | +7 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:8:5 @@ -30,17 +29,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -5 5 | -6 6 | def scope(): -7 7 | # E731 -8 |- f = lambda x: 2 * x - 8 |+ def f(x): - 9 |+ return 2 * x -9 10 | -10 11 | -11 12 | def scope(): +5 | +6 | def scope(): +7 | # E731 + - f = lambda x: 2 * x +8 + def f(x): +9 + return 2 * x +10 | +11 | +12 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:14:9 @@ -51,17 +49,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `this` as a `def` - -ℹ Unsafe fix -11 11 | def scope(): -12 12 | # E731 -13 13 | while False: -14 |- this = lambda y, z: 2 * x - 14 |+ def this(y, z): - 15 |+ return 2 * x -15 16 | -16 17 | -17 18 | def scope(): +11 | def scope(): +12 | # E731 +13 | while False: + - this = lambda y, z: 2 * x +14 + def this(y, z): +15 + return 2 * x +16 | +17 | +18 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:19:5 @@ -72,17 +69,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -16 16 | -17 17 | def scope(): -18 18 | # E731 -19 |- f = lambda: (yield 1) - 19 |+ def f(): - 20 |+ return (yield 1) -20 21 | -21 22 | -22 23 | def scope(): +16 | +17 | def scope(): +18 | # E731 + - f = lambda: (yield 1) +19 + def f(): +20 + return (yield 1) +21 | +22 | +23 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:24:5 @@ -93,17 +89,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -21 21 | -22 22 | def scope(): -23 23 | # E731 -24 |- f = lambda: (yield from g()) - 24 |+ def f(): - 25 |+ return (yield from g()) -25 26 | -26 27 | -27 28 | def scope(): +21 | +22 | def scope(): +23 | # E731 + - f = lambda: (yield from g()) +24 + def f(): +25 + return (yield from g()) +26 | +27 | +28 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:57:5 @@ -114,17 +109,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -54 54 | -55 55 | class Scope: -56 56 | # E731 -57 |- f = lambda x: 2 * x - 57 |+ def f(x): - 58 |+ return 2 * x -58 59 | -59 60 | -60 61 | class Scope: +54 | +55 | class Scope: +56 | # E731 + - f = lambda x: 2 * x +57 + def f(x): +58 + return 2 * x +59 | +60 | +61 | class Scope: +note: This is an unsafe fix and may change runtime behavior E731 Do not assign a `lambda` expression, use a `def` --> E731.py:73:9 @@ -137,17 +131,16 @@ E731 Do not assign a `lambda` expression, use a `def` 75 | x = lambda: 2 | help: Rewrite `x` as a `def` - -ℹ Display-only fix -70 70 | -71 71 | x: Callable[[int], int] -72 72 | if True: -73 |- x = lambda: 1 - 73 |+ def x(): - 74 |+ return 1 -74 75 | else: -75 76 | x = lambda: 2 -76 77 | return x +70 | +71 | x: Callable[[int], int] +72 | if True: + - x = lambda: 1 +73 + def x(): +74 + return 1 +75 | else: +76 | x = lambda: 2 +77 | return x +note: This is a display-only fix and is likely to be incorrect E731 Do not assign a `lambda` expression, use a `def` --> E731.py:75:9 @@ -159,17 +152,16 @@ E731 Do not assign a `lambda` expression, use a `def` 76 | return x | help: Rewrite `x` as a `def` - -ℹ Display-only fix -72 72 | if True: -73 73 | x = lambda: 1 -74 74 | else: -75 |- x = lambda: 2 - 75 |+ def x(): - 76 |+ return 2 -76 77 | return x -77 78 | -78 79 | +72 | if True: +73 | x = lambda: 1 +74 | else: + - x = lambda: 2 +75 + def x(): +76 + return 2 +77 | return x +78 | +79 | +note: This is a display-only fix and is likely to be incorrect E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:86:5 @@ -180,17 +172,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -83 83 | -84 84 | # ParamSpec cannot be used in this context, so do not preserve the annotation. -85 85 | P = ParamSpec("P") -86 |- f: Callable[P, int] = lambda *args: len(args) - 86 |+ def f(*args): - 87 |+ return len(args) -87 88 | -88 89 | -89 90 | def scope(): +83 | +84 | # ParamSpec cannot be used in this context, so do not preserve the annotation. +85 | P = ParamSpec("P") + - f: Callable[P, int] = lambda *args: len(args) +86 + def f(*args): +87 + return len(args) +88 | +89 | +90 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:94:5 @@ -201,17 +192,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -91 91 | -92 92 | from typing import Callable -93 93 | -94 |- f: Callable[[], None] = lambda: None - 94 |+ def f() -> None: - 95 |+ return None -95 96 | -96 97 | -97 98 | def scope(): +91 | +92 | from typing import Callable +93 | + - f: Callable[[], None] = lambda: None +94 + def f() -> None: +95 + return None +96 | +97 | +98 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:102:5 @@ -222,17 +212,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -99 99 | -100 100 | from typing import Callable -101 101 | -102 |- f: Callable[..., None] = lambda a, b: None - 102 |+ def f(a, b) -> None: - 103 |+ return None -103 104 | -104 105 | -105 106 | def scope(): +99 | +100 | from typing import Callable +101 | + - f: Callable[..., None] = lambda a, b: None +102 + def f(a, b) -> None: +103 + return None +104 | +105 | +106 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:110:5 @@ -243,17 +232,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -107 107 | -108 108 | from typing import Callable -109 109 | -110 |- f: Callable[[int], int] = lambda x: 2 * x - 110 |+ def f(x: int) -> int: - 111 |+ return 2 * x -111 112 | -112 113 | -113 114 | # Let's use the `Callable` type from `collections.abc` instead. +107 | +108 | from typing import Callable +109 | + - f: Callable[[int], int] = lambda x: 2 * x +110 + def f(x: int) -> int: +111 + return 2 * x +112 | +113 | +114 | # Let's use the `Callable` type from `collections.abc` instead. +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:119:5 @@ -264,17 +252,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -116 116 | -117 117 | from collections.abc import Callable -118 118 | -119 |- f: Callable[[str, int], str] = lambda a, b: a * b - 119 |+ def f(a: str, b: int) -> str: - 120 |+ return a * b -120 121 | -121 122 | -122 123 | def scope(): +116 | +117 | from collections.abc import Callable +118 | + - f: Callable[[str, int], str] = lambda a, b: a * b +119 + def f(a: str, b: int) -> str: +120 + return a * b +121 | +122 | +123 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:127:5 @@ -285,17 +272,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -124 124 | -125 125 | from collections.abc import Callable -126 126 | -127 |- f: Callable[[str, int], tuple[str, int]] = lambda a, b: (a, b) - 127 |+ def f(a: str, b: int) -> tuple[str, int]: - 128 |+ return (a, b) -128 129 | -129 130 | -130 131 | def scope(): +124 | +125 | from collections.abc import Callable +126 | + - f: Callable[[str, int], tuple[str, int]] = lambda a, b: (a, b) +127 + def f(a: str, b: int) -> tuple[str, int]: +128 + return (a, b) +129 | +130 | +131 | def scope(): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:135:5 @@ -306,17 +292,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -132 132 | -133 133 | from collections.abc import Callable -134 134 | -135 |- f: Callable[[str, int, list[str]], list[str]] = lambda a, b, /, c: [*c, a * b] - 135 |+ def f(a: str, b: int, /, c: list[str]) -> list[str]: - 136 |+ return [*c, a * b] -136 137 | -137 138 | -138 139 | class TemperatureScales(Enum): +132 | +133 | from collections.abc import Callable +134 | + - f: Callable[[str, int, list[str]], list[str]] = lambda a, b, /, c: [*c, a * b] +135 + def f(a: str, b: int, /, c: list[str]) -> list[str]: +136 + return [*c, a * b] +137 | +138 | +139 | class TemperatureScales(Enum): +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:139:5 @@ -327,17 +312,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` 140 | FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32) | help: Rewrite `CELSIUS` as a `def` - -ℹ Unsafe fix -136 136 | -137 137 | -138 138 | class TemperatureScales(Enum): -139 |- CELSIUS = (lambda deg_c: deg_c) - 139 |+ def CELSIUS(deg_c): - 140 |+ return (deg_c) -140 141 | FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32) -141 142 | -142 143 | +136 | +137 | +138 | class TemperatureScales(Enum): + - CELSIUS = (lambda deg_c: deg_c) +139 + def CELSIUS(deg_c): +140 + return (deg_c) +141 | FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32) +142 | +143 | +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:140:5 @@ -348,17 +332,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Rewrite `FAHRENHEIT` as a `def` - -ℹ Unsafe fix -137 137 | -138 138 | class TemperatureScales(Enum): -139 139 | CELSIUS = (lambda deg_c: deg_c) -140 |- FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32) - 140 |+ def FAHRENHEIT(deg_c): - 141 |+ return (deg_c * 9 / 5 + 32) -141 142 | -142 143 | -143 144 | # Regression test for: https://github.com/astral-sh/ruff/issues/7141 +137 | +138 | class TemperatureScales(Enum): +139 | CELSIUS = (lambda deg_c: deg_c) + - FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32) +140 + def FAHRENHEIT(deg_c): +141 + return (deg_c * 9 / 5 + 32) +142 | +143 | +144 | # Regression test for: https://github.com/astral-sh/ruff/issues/7141 +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:147:5 @@ -371,21 +354,20 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | |_____^ | help: Rewrite `f` as a `def` - -ℹ Unsafe fix -144 144 | def scope(): -145 145 | # E731 -146 146 | -147 |- f = lambda: ( -148 |- i := 1, -149 |- ) - 147 |+ def f(): - 148 |+ return ( - 149 |+ i := 1, - 150 |+ ) -150 151 | -151 152 | -152 153 | from dataclasses import dataclass +144 | def scope(): +145 | # E731 +146 | + - f = lambda: ( + - i := 1, + - ) +147 + def f(): +148 + return ( +149 + i := 1, +150 + ) +151 | +152 | +153 | from dataclasses import dataclass +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:163:1 @@ -401,17 +383,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` 168 | # * https://github.com/astral-sh/ruff/issues/10277 | help: Rewrite `x` as a `def` - -ℹ Unsafe fix -160 160 | -161 161 | # Regression tests for: -162 162 | # * https://github.com/astral-sh/ruff/issues/7720 -163 |-x = lambda: """ - 163 |+def x(): - 164 |+ return """ -164 165 | a -165 166 | b -166 167 | """ +160 | +161 | # Regression tests for: +162 | # * https://github.com/astral-sh/ruff/issues/7720 + - x = lambda: """ +163 + def x(): +164 + return """ +165 | a +166 | b +167 | """ +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:169:1 @@ -423,17 +404,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` 171 | x = lambda: ( | help: Rewrite `at_least_one_million` as a `def` - -ℹ Unsafe fix -166 166 | """ -167 167 | -168 168 | # * https://github.com/astral-sh/ruff/issues/10277 -169 |-at_least_one_million = lambda _: _ >= 1_000_000 - 169 |+def at_least_one_million(_): - 170 |+ return _ >= 1_000_000 -170 171 | -171 172 | x = lambda: ( -172 173 | # comment +166 | """ +167 | +168 | # * https://github.com/astral-sh/ruff/issues/10277 + - at_least_one_million = lambda _: _ >= 1_000_000 +169 + def at_least_one_million(_): +170 + return _ >= 1_000_000 +171 | +172 | x = lambda: ( +173 | # comment +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:171:1 @@ -449,17 +429,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` 176 | x = lambda: ( | help: Rewrite `x` as a `def` - -ℹ Unsafe fix -168 168 | # * https://github.com/astral-sh/ruff/issues/10277 -169 169 | at_least_one_million = lambda _: _ >= 1_000_000 -170 170 | -171 |-x = lambda: ( - 171 |+def x(): - 172 |+ return ( -172 173 | # comment -173 174 | 5 + 10 -174 175 | ) +168 | # * https://github.com/astral-sh/ruff/issues/10277 +169 | at_least_one_million = lambda _: _ >= 1_000_000 +170 | + - x = lambda: ( +171 + def x(): +172 + return ( +173 | # comment +174 | 5 + 10 +175 | ) +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:176:1 @@ -475,17 +454,16 @@ E731 [*] Do not assign a `lambda` expression, use a `def` 181 | # https://github.com/astral-sh/ruff/issues/18475 | help: Rewrite `x` as a `def` - -ℹ Unsafe fix -173 173 | 5 + 10 -174 174 | ) -175 175 | -176 |-x = lambda: ( - 176 |+def x(): - 177 |+ return ( -177 178 | # comment -178 179 | y := 10 -179 180 | ) +173 | 5 + 10 +174 | ) +175 | + - x = lambda: ( +176 + def x(): +177 + return ( +178 | # comment +179 | y := 10 +180 | ) +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:182:1 @@ -501,22 +479,21 @@ E731 [*] Do not assign a `lambda` expression, use a `def` 188 | foo_tooltip = ( | help: Rewrite `foo_tooltip` as a `def` - -ℹ Unsafe fix -179 179 | ) -180 180 | -181 181 | # https://github.com/astral-sh/ruff/issues/18475 -182 |-foo_tooltip = ( -183 |- lambda x, data: f"\nfoo: {data['foo'][int(x)]}" - 182 |+def foo_tooltip(x, data): - 183 |+ return (f"\nfoo: {data['foo'][int(x)]}" -184 184 | if data["foo"] is not None -185 |- else "" -186 |-) - 185 |+ else "") -187 186 | -188 187 | foo_tooltip = ( -189 188 | lambda x, data: f"\nfoo: {data['foo'][int(x)]}" + +179 | ) +180 | +181 | # https://github.com/astral-sh/ruff/issues/18475 + - foo_tooltip = ( + - lambda x, data: f"\nfoo: {data['foo'][int(x)]}" +182 + def foo_tooltip(x, data): +183 + return (f"\nfoo: {data['foo'][int(x)]}" +184 | if data["foo"] is not None + - else "" + - ) +185 + else "") +186 | +187 | foo_tooltip = ( +188 | lambda x, data: f"\nfoo: {data['foo'][int(x)]}" + +note: This is an unsafe fix and may change runtime behavior E731 [*] Do not assign a `lambda` expression, use a `def` --> E731.py:188:1 @@ -531,16 +508,15 @@ E731 [*] Do not assign a `lambda` expression, use a `def` | |_^ | help: Rewrite `foo_tooltip` as a `def` - -ℹ Unsafe fix -185 185 | else "" -186 186 | ) -187 187 | -188 |-foo_tooltip = ( -189 |- lambda x, data: f"\nfoo: {data['foo'][int(x)]}" + -190 |- more -191 |- -192 |-) - 188 |+def foo_tooltip(x, data): - 189 |+ return (f"\nfoo: {data['foo'][int(x)]}" + - 190 |+ more) +185 | else "" +186 | ) +187 | + - foo_tooltip = ( + - lambda x, data: f"\nfoo: {data['foo'][int(x)]}" + + - more + - + - ) +188 + def foo_tooltip(x, data): +189 + return (f"\nfoo: {data['foo'][int(x)]}" + +190 + more) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap index 837470c93c..74f2e3b2d3 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W29.py.snap @@ -12,16 +12,14 @@ W291 [*] Trailing whitespace 6 | class Foo(object): | help: Remove trailing whitespace - -ℹ Safe fix -1 1 | #: Okay -2 2 | # 情 -3 3 | #: W291:1:6 -4 |-print - 4 |+print -5 5 | #: W293:2:1 -6 6 | class Foo(object): -7 7 | +1 | #: Okay +2 | # 情 +3 | #: W291:1:6 + - print +4 + print +5 | #: W293:2:1 +6 | class Foo(object): +7 | W291 [*] Trailing whitespace --> W29.py:11:35 @@ -34,16 +32,14 @@ W291 [*] Trailing whitespace 13 | x = 1 | help: Remove trailing whitespace - -ℹ Safe fix -8 8 | bang = 12 -9 9 | #: W291:2:35 -10 10 | '''multiline -11 |-string with trailing whitespace''' - 11 |+string with trailing whitespace''' -12 12 | #: W291 W292 noeol -13 13 | x = 1 -14 14 | #: W191 W292 noeol +8 | bang = 12 +9 | #: W291:2:35 +10 | '''multiline + - string with trailing whitespace''' +11 + string with trailing whitespace''' +12 | #: W291 W292 noeol +13 | x = 1 +14 | #: W191 W292 noeol W291 [*] Trailing whitespace --> W29.py:13:6 @@ -56,13 +52,11 @@ W291 [*] Trailing whitespace 15 | if False: | help: Remove trailing whitespace - -ℹ Safe fix -10 10 | '''multiline -11 11 | string with trailing whitespace''' -12 12 | #: W291 W292 noeol -13 |-x = 1 - 13 |+x = 1 -14 14 | #: W191 W292 noeol -15 15 | if False: -16 16 | pass # indented with tabs +10 | '''multiline +11 | string with trailing whitespace''' +12 | #: W291 W292 noeol + - x = 1 +13 + x = 1 +14 | #: W191 W292 noeol +15 | if False: +16 | pass # indented with tabs diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap index a349223f9c..130cc97f3b 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W291_W291.py.snap @@ -9,13 +9,12 @@ W291 [*] Trailing whitespace 2 | inside a multiline string''' | help: Remove trailing whitespace - -ℹ Unsafe fix -1 |-'''trailing whitespace - 1 |+'''trailing whitespace -2 2 | inside a multiline string''' -3 3 | -4 4 | f'''trailing whitespace + - '''trailing whitespace +1 + '''trailing whitespace +2 | inside a multiline string''' +3 | +4 | f'''trailing whitespace +note: This is an unsafe fix and may change runtime behavior W291 [*] Trailing whitespace --> W291.py:4:24 @@ -27,16 +26,15 @@ W291 [*] Trailing whitespace 5 | inside a multiline f-string''' | help: Remove trailing whitespace - -ℹ Unsafe fix -1 1 | '''trailing whitespace -2 2 | inside a multiline string''' -3 3 | -4 |-f'''trailing whitespace - 4 |+f'''trailing whitespace -5 5 | inside a multiline f-string''' -6 6 | -7 7 | # Trailing whitespace after `{` +1 | '''trailing whitespace +2 | inside a multiline string''' +3 | + - f'''trailing whitespace +4 + f'''trailing whitespace +5 | inside a multiline f-string''' +6 | +7 | # Trailing whitespace after `{` +note: This is an unsafe fix and may change runtime behavior W291 [*] Trailing whitespace --> W291.py:8:8 @@ -48,16 +46,14 @@ W291 [*] Trailing whitespace 10 | }' | help: Remove trailing whitespace - -ℹ Safe fix -5 5 | inside a multiline f-string''' -6 6 | -7 7 | # Trailing whitespace after `{` -8 |-f'abc { - 8 |+f'abc { -9 9 | 1 + 2 -10 10 | }' -11 11 | +5 | inside a multiline f-string''' +6 | +7 | # Trailing whitespace after `{` + - f'abc { +8 + f'abc { +9 | 1 + 2 +10 | }' +11 | W291 [*] Trailing whitespace --> W291.py:14:10 @@ -69,11 +65,9 @@ W291 [*] Trailing whitespace 15 | }' | help: Remove trailing whitespace - -ℹ Safe fix -11 11 | -12 12 | # Trailing whitespace after `2` -13 13 | f'abc { -14 |- 1 + 2 - 14 |+ 1 + 2 -15 15 | }' +11 | +12 | # Trailing whitespace after `2` +13 | f'abc { + - 1 + 2 +14 + 1 + 2 +15 | }' diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap index 404fb9c25e..7863cb988c 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W292_W292_0.py.snap @@ -9,8 +9,6 @@ W292 [*] No newline at end of file | ^ | help: Add trailing newline - -ℹ Safe fix -1 1 | def fn() -> None: -2 |- pass - 2 |+ pass +1 | def fn() -> None: + - pass +2 + pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap index 03b3a090bc..b93378d6b4 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W29.py.snap @@ -12,13 +12,11 @@ W293 [*] Blank line contains whitespace 9 | #: W291:2:35 | help: Remove whitespace from blank line - -ℹ Safe fix -4 4 | print -5 5 | #: W293:2:1 -6 6 | class Foo(object): -7 |- - 7 |+ -8 8 | bang = 12 -9 9 | #: W291:2:35 -10 10 | '''multiline +4 | print +5 | #: W293:2:1 +6 | class Foo(object): + - +7 + +8 | bang = 12 +9 | #: W291:2:35 +10 | '''multiline diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap index 7fc13aa2f1..78db67be97 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W293_W293.py.snap @@ -11,16 +11,15 @@ W293 [*] Blank line contains whitespace 5 | """\ | help: Remove whitespace from blank line - -ℹ Unsafe fix -1 1 | # See: https://github.com/astral-sh/ruff/issues/9323 -2 2 | class Chassis(RobotModuleTemplate): -3 3 | """底盘信息推送控制 -4 |- - 4 |+ -5 5 | """\ -6 6 | -7 7 | +1 | # See: https://github.com/astral-sh/ruff/issues/9323 +2 | class Chassis(RobotModuleTemplate): +3 | """底盘信息推送控制 + - +4 + +5 | """\ +6 | +7 | +note: This is an unsafe fix and may change runtime behavior W293 [*] Blank line contains whitespace --> W293.py:10:1 @@ -31,18 +30,16 @@ W293 [*] Blank line contains whitespace | ^^^^ | help: Remove whitespace from blank line - -ℹ Safe fix -5 5 | """\ -6 6 | -7 7 | -8 |-"""""" \ -9 |- \ -10 |- - 8 |+"""""" -11 9 | -12 10 | -13 11 | "abc\ +5 | """\ +6 | +7 | + - """""" \ + - \ + - +8 + """""" +9 | +10 | +11 | "abc\ W293 [*] Blank line contains whitespace --> W293.py:16:1 @@ -54,18 +51,16 @@ W293 [*] Blank line contains whitespace 17 | '''blank line with whitespace | help: Remove whitespace from blank line - -ℹ Safe fix -11 11 | -12 12 | -13 13 | "abc\ -14 |- " \ -15 |- \ -16 |- - 14 |+ " -17 15 | '''blank line with whitespace -18 16 | -19 17 | inside a multiline string''' +11 | +12 | +13 | "abc\ + - " \ + - \ + - +14 + " +15 | '''blank line with whitespace +16 | +17 | inside a multiline string''' W293 [*] Blank line contains whitespace --> W293.py:18:1 @@ -76,11 +71,10 @@ W293 [*] Blank line contains whitespace 19 | inside a multiline string''' | help: Remove whitespace from blank line - -ℹ Unsafe fix -15 15 | \ -16 16 | -17 17 | '''blank line with whitespace -18 |- - 18 |+ -19 19 | inside a multiline string''' +15 | \ +16 | +17 | '''blank line with whitespace + - +18 + +19 | inside a multiline string''' +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap index 6b64fdb629..107afa57bb 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_0.py.snap @@ -11,14 +11,12 @@ W605 [*] Invalid escape sequence: `\.` 4 | #: W605:2:1 | help: Use a raw string literal - -ℹ Safe fix -1 1 | #: W605:1:10 -2 |-regex = '\.png$' - 2 |+regex = r'\.png$' -3 3 | -4 4 | #: W605:2:1 -5 5 | regex = ''' +1 | #: W605:1:10 + - regex = '\.png$' +2 + regex = r'\.png$' +3 | +4 | #: W605:2:1 +5 | regex = ''' W605 [*] Invalid escape sequence: `\.` --> W605_0.py:6:1 @@ -30,16 +28,14 @@ W605 [*] Invalid escape sequence: `\.` 7 | ''' | help: Use a raw string literal - -ℹ Safe fix -2 2 | regex = '\.png$' -3 3 | -4 4 | #: W605:2:1 -5 |-regex = ''' - 5 |+regex = r''' -6 6 | \.png$ -7 7 | ''' -8 8 | +2 | regex = '\.png$' +3 | +4 | #: W605:2:1 + - regex = ''' +5 + regex = r''' +6 | \.png$ +7 | ''' +8 | W605 [*] Invalid escape sequence: `\_` --> W605_0.py:11:6 @@ -51,16 +47,14 @@ W605 [*] Invalid escape sequence: `\_` 12 | ) | help: Use a raw string literal - -ℹ Safe fix -8 8 | -9 9 | #: W605:2:6 -10 10 | f( -11 |- '\_' - 11 |+ r'\_' -12 12 | ) -13 13 | -14 14 | #: W605:4:6 +8 | +9 | #: W605:2:6 +10 | f( + - '\_' +11 + r'\_' +12 | ) +13 | +14 | #: W605:4:6 W605 [*] Invalid escape sequence: `\_` --> W605_0.py:18:6 @@ -73,16 +67,14 @@ W605 [*] Invalid escape sequence: `\_` 20 | """ | help: Use a raw string literal - -ℹ Safe fix -12 12 | ) -13 13 | -14 14 | #: W605:4:6 -15 |-""" - 15 |+r""" -16 16 | multi-line -17 17 | literal -18 18 | with \_ somewhere +12 | ) +13 | +14 | #: W605:4:6 + - """ +15 + r""" +16 | multi-line +17 | literal +18 | with \_ somewhere W605 [*] Invalid escape sequence: `\_` --> W605_0.py:23:39 @@ -92,16 +84,14 @@ W605 [*] Invalid escape sequence: `\_` | ^^ | help: Add backslash to escape sequence - -ℹ Safe fix -20 20 | """ -21 21 | -22 22 | #: W605:1:38 -23 |-value = 'new line\nand invalid escape \_ here' - 23 |+value = 'new line\nand invalid escape \\_ here' -24 24 | -25 25 | -26 26 | def f(): +20 | """ +21 | +22 | #: W605:1:38 + - value = 'new line\nand invalid escape \_ here' +23 + value = 'new line\nand invalid escape \\_ here' +24 | +25 | +26 | def f(): W605 [*] Invalid escape sequence: `\.` --> W605_0.py:28:12 @@ -114,16 +104,14 @@ W605 [*] Invalid escape sequence: `\.` 30 | #: Okay | help: Use a raw string literal - -ℹ Safe fix -25 25 | -26 26 | def f(): -27 27 | #: W605:1:11 -28 |- return'\.png$' - 28 |+ return r'\.png$' -29 29 | -30 30 | #: Okay -31 31 | regex = r'\.png$' +25 | +26 | def f(): +27 | #: W605:1:11 + - return'\.png$' +28 + return r'\.png$' +29 | +30 | #: Okay +31 | regex = r'\.png$' W605 [*] Invalid escape sequence: `\_` --> W605_0.py:45:12 @@ -136,16 +124,14 @@ W605 [*] Invalid escape sequence: `\_` 47 | #: W605:1:7 | help: Add backslash to escape sequence - -ℹ Safe fix -42 42 | \w -43 43 | ''' # noqa -44 44 | -45 |-regex = '\\\_' - 45 |+regex = '\\\\_' -46 46 | -47 47 | #: W605:1:7 -48 48 | u'foo\ bar' +42 | \w +43 | ''' # noqa +44 | + - regex = '\\\_' +45 + regex = '\\\\_' +46 | +47 | #: W605:1:7 +48 | u'foo\ bar' W605 [*] Invalid escape sequence: `\ ` --> W605_0.py:48:6 @@ -157,16 +143,14 @@ W605 [*] Invalid escape sequence: `\ ` 50 | #: W605:1:13 | help: Use a raw string literal - -ℹ Safe fix -45 45 | regex = '\\\_' -46 46 | -47 47 | #: W605:1:7 -48 |-u'foo\ bar' - 48 |+r'foo\ bar' -49 49 | -50 50 | #: W605:1:13 -51 51 | ( +45 | regex = '\\\_' +46 | +47 | #: W605:1:7 + - u'foo\ bar' +48 + r'foo\ bar' +49 | +50 | #: W605:1:13 +51 | ( W605 [*] Invalid escape sequence: `\.` --> W605_0.py:53:9 @@ -178,16 +162,14 @@ W605 [*] Invalid escape sequence: `\.` 54 | ) | help: Add backslash to escape sequence - -ℹ Safe fix -50 50 | #: W605:1:13 -51 51 | ( -52 52 | "foo \ -53 |- bar \. baz" - 53 |+ bar \\. baz" -54 54 | ) -55 55 | -56 56 | #: W605:1:6 +50 | #: W605:1:13 +51 | ( +52 | "foo \ + - bar \. baz" +53 + bar \\. baz" +54 | ) +55 | +56 | #: W605:1:6 W605 [*] Invalid escape sequence: `\.` --> W605_0.py:57:6 @@ -199,16 +181,14 @@ W605 [*] Invalid escape sequence: `\.` 59 | #: W605:1:13 | help: Add backslash to escape sequence - -ℹ Safe fix -54 54 | ) -55 55 | -56 56 | #: W605:1:6 -57 |-"foo \. bar \t" - 57 |+"foo \\. bar \t" -58 58 | -59 59 | #: W605:1:13 -60 60 | "foo \t bar \." +54 | ) +55 | +56 | #: W605:1:6 + - "foo \. bar \t" +57 + "foo \\. bar \t" +58 | +59 | #: W605:1:13 +60 | "foo \t bar \." W605 [*] Invalid escape sequence: `\.` --> W605_0.py:60:13 @@ -218,10 +198,8 @@ W605 [*] Invalid escape sequence: `\.` | ^^ | help: Add backslash to escape sequence - -ℹ Safe fix -57 57 | "foo \. bar \t" -58 58 | -59 59 | #: W605:1:13 -60 |-"foo \t bar \." - 60 |+"foo \t bar \\." +57 | "foo \. bar \t" +58 | +59 | #: W605:1:13 + - "foo \t bar \." +60 + "foo \t bar \\." diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap index efee7333ef..9a61dced69 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__W605_W605_1.py.snap @@ -11,16 +11,14 @@ W605 [*] Invalid escape sequence: `\.` 6 | #: W605:2:1 | help: Use a raw string literal - -ℹ Safe fix -1 1 | # Same as `W605_0.py` but using f-strings and t-strings instead. -2 2 | -3 3 | #: W605:1:10 -4 |-regex = f'\.png$' - 4 |+regex = rf'\.png$' -5 5 | -6 6 | #: W605:2:1 -7 7 | regex = f''' +1 | # Same as `W605_0.py` but using f-strings and t-strings instead. +2 | +3 | #: W605:1:10 + - regex = f'\.png$' +4 + regex = rf'\.png$' +5 | +6 | #: W605:2:1 +7 | regex = f''' W605 [*] Invalid escape sequence: `\.` --> W605_1.py:8:1 @@ -32,16 +30,14 @@ W605 [*] Invalid escape sequence: `\.` 9 | ''' | help: Use a raw string literal - -ℹ Safe fix -4 4 | regex = f'\.png$' -5 5 | -6 6 | #: W605:2:1 -7 |-regex = f''' - 7 |+regex = rf''' -8 8 | \.png$ -9 9 | ''' -10 10 | +4 | regex = f'\.png$' +5 | +6 | #: W605:2:1 + - regex = f''' +7 + regex = rf''' +8 | \.png$ +9 | ''' +10 | W605 [*] Invalid escape sequence: `\_` --> W605_1.py:13:7 @@ -53,16 +49,14 @@ W605 [*] Invalid escape sequence: `\_` 14 | ) | help: Use a raw string literal - -ℹ Safe fix -10 10 | -11 11 | #: W605:2:6 -12 12 | f( -13 |- f'\_' - 13 |+ rf'\_' -14 14 | ) -15 15 | -16 16 | #: W605:4:6 +10 | +11 | #: W605:2:6 +12 | f( + - f'\_' +13 + rf'\_' +14 | ) +15 | +16 | #: W605:4:6 W605 [*] Invalid escape sequence: `\_` --> W605_1.py:20:6 @@ -75,16 +69,14 @@ W605 [*] Invalid escape sequence: `\_` 22 | """ | help: Use a raw string literal - -ℹ Safe fix -14 14 | ) -15 15 | -16 16 | #: W605:4:6 -17 |-f""" - 17 |+rf""" -18 18 | multi-line -19 19 | literal -20 20 | with \_ somewhere +14 | ) +15 | +16 | #: W605:4:6 + - f""" +17 + rf""" +18 | multi-line +19 | literal +20 | with \_ somewhere W605 [*] Invalid escape sequence: `\_` --> W605_1.py:25:40 @@ -94,16 +86,14 @@ W605 [*] Invalid escape sequence: `\_` | ^^ | help: Add backslash to escape sequence - -ℹ Safe fix -22 22 | """ -23 23 | -24 24 | #: W605:1:38 -25 |-value = f'new line\nand invalid escape \_ here' - 25 |+value = f'new line\nand invalid escape \\_ here' -26 26 | -27 27 | -28 28 | #: Okay +22 | """ +23 | +24 | #: W605:1:38 + - value = f'new line\nand invalid escape \_ here' +25 + value = f'new line\nand invalid escape \\_ here' +26 | +27 | +28 | #: Okay W605 [*] Invalid escape sequence: `\_` --> W605_1.py:43:13 @@ -116,16 +106,14 @@ W605 [*] Invalid escape sequence: `\_` 45 | value = f'\{1}' | help: Add backslash to escape sequence - -ℹ Safe fix -40 40 | \w -41 41 | ''' # noqa -42 42 | -43 |-regex = f'\\\_' - 43 |+regex = f'\\\\_' -44 44 | value = f'\{{1}}' -45 45 | value = f'\{1}' -46 46 | value = f'{1:\}' +40 | \w +41 | ''' # noqa +42 | + - regex = f'\\\_' +43 + regex = f'\\\\_' +44 | value = f'\{{1}}' +45 | value = f'\{1}' +46 | value = f'{1:\}' W605 [*] Invalid escape sequence: `\{` --> W605_1.py:44:11 @@ -137,16 +125,14 @@ W605 [*] Invalid escape sequence: `\{` 46 | value = f'{1:\}' | help: Use a raw string literal - -ℹ Safe fix -41 41 | ''' # noqa -42 42 | -43 43 | regex = f'\\\_' -44 |-value = f'\{{1}}' - 44 |+value = rf'\{{1}}' -45 45 | value = f'\{1}' -46 46 | value = f'{1:\}' -47 47 | value = f"{f"\{1}"}" +41 | ''' # noqa +42 | +43 | regex = f'\\\_' + - value = f'\{{1}}' +44 + value = rf'\{{1}}' +45 | value = f'\{1}' +46 | value = f'{1:\}' +47 | value = f"{f"\{1}"}" W605 [*] Invalid escape sequence: `\{` --> W605_1.py:45:11 @@ -159,16 +145,14 @@ W605 [*] Invalid escape sequence: `\{` 47 | value = f"{f"\{1}"}" | help: Use a raw string literal - -ℹ Safe fix -42 42 | -43 43 | regex = f'\\\_' -44 44 | value = f'\{{1}}' -45 |-value = f'\{1}' - 45 |+value = rf'\{1}' -46 46 | value = f'{1:\}' -47 47 | value = f"{f"\{1}"}" -48 48 | value = rf"{f"\{1}"}" +42 | +43 | regex = f'\\\_' +44 | value = f'\{{1}}' + - value = f'\{1}' +45 + value = rf'\{1}' +46 | value = f'{1:\}' +47 | value = f"{f"\{1}"}" +48 | value = rf"{f"\{1}"}" W605 [*] Invalid escape sequence: `\}` --> W605_1.py:46:14 @@ -181,16 +165,14 @@ W605 [*] Invalid escape sequence: `\}` 48 | value = rf"{f"\{1}"}" | help: Use a raw string literal - -ℹ Safe fix -43 43 | regex = f'\\\_' -44 44 | value = f'\{{1}}' -45 45 | value = f'\{1}' -46 |-value = f'{1:\}' - 46 |+value = rf'{1:\}' -47 47 | value = f"{f"\{1}"}" -48 48 | value = rf"{f"\{1}"}" -49 49 | +43 | regex = f'\\\_' +44 | value = f'\{{1}}' +45 | value = f'\{1}' + - value = f'{1:\}' +46 + value = rf'{1:\}' +47 | value = f"{f"\{1}"}" +48 | value = rf"{f"\{1}"}" +49 | W605 [*] Invalid escape sequence: `\{` --> W605_1.py:47:14 @@ -202,16 +184,14 @@ W605 [*] Invalid escape sequence: `\{` 48 | value = rf"{f"\{1}"}" | help: Use a raw string literal - -ℹ Safe fix -44 44 | value = f'\{{1}}' -45 45 | value = f'\{1}' -46 46 | value = f'{1:\}' -47 |-value = f"{f"\{1}"}" - 47 |+value = f"{rf"\{1}"}" -48 48 | value = rf"{f"\{1}"}" -49 49 | -50 50 | # Okay +44 | value = f'\{{1}}' +45 | value = f'\{1}' +46 | value = f'{1:\}' + - value = f"{f"\{1}"}" +47 + value = f"{rf"\{1}"}" +48 | value = rf"{f"\{1}"}" +49 | +50 | # Okay W605 [*] Invalid escape sequence: `\{` --> W605_1.py:48:15 @@ -224,16 +204,14 @@ W605 [*] Invalid escape sequence: `\{` 50 | # Okay | help: Use a raw string literal - -ℹ Safe fix -45 45 | value = f'\{1}' -46 46 | value = f'{1:\}' -47 47 | value = f"{f"\{1}"}" -48 |-value = rf"{f"\{1}"}" - 48 |+value = rf"{rf"\{1}"}" -49 49 | -50 50 | # Okay -51 51 | value = rf'\{{1}}' +45 | value = f'\{1}' +46 | value = f'{1:\}' +47 | value = f"{f"\{1}"}" + - value = rf"{f"\{1}"}" +48 + value = rf"{rf"\{1}"}" +49 | +50 | # Okay +51 | value = rf'\{{1}}' W605 [*] Invalid escape sequence: `\d` --> W605_1.py:57:9 @@ -245,16 +223,14 @@ W605 [*] Invalid escape sequence: `\d` 59 | f"\n{{}}�+-\d+" | help: Use a raw string literal - -ℹ Safe fix -54 54 | value = f"{rf"\{1}"}" -55 55 | -56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 -57 |-f"{{}}+-\d" - 57 |+rf"{{}}+-\d" -58 58 | f"\n{{}}+-\d+" -59 59 | f"\n{{}}�+-\d+" -60 60 | +54 | value = f"{rf"\{1}"}" +55 | +56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 + - f"{{}}+-\d" +57 + rf"{{}}+-\d" +58 | f"\n{{}}+-\d+" +59 | f"\n{{}}�+-\d+" +60 | W605 [*] Invalid escape sequence: `\d` --> W605_1.py:58:11 @@ -266,16 +242,14 @@ W605 [*] Invalid escape sequence: `\d` 59 | f"\n{{}}�+-\d+" | help: Add backslash to escape sequence - -ℹ Safe fix -55 55 | -56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 -57 57 | f"{{}}+-\d" -58 |-f"\n{{}}+-\d+" - 58 |+f"\n{{}}+-\\d+" -59 59 | f"\n{{}}�+-\d+" -60 60 | -61 61 | # See https://github.com/astral-sh/ruff/issues/11491 +55 | +56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 +57 | f"{{}}+-\d" + - f"\n{{}}+-\d+" +58 + f"\n{{}}+-\\d+" +59 | f"\n{{}}�+-\d+" +60 | +61 | # See https://github.com/astral-sh/ruff/issues/11491 W605 [*] Invalid escape sequence: `\d` --> W605_1.py:59:12 @@ -288,16 +262,14 @@ W605 [*] Invalid escape sequence: `\d` 61 | # See https://github.com/astral-sh/ruff/issues/11491 | help: Add backslash to escape sequence - -ℹ Safe fix -56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 -57 57 | f"{{}}+-\d" -58 58 | f"\n{{}}+-\d+" -59 |-f"\n{{}}�+-\d+" - 59 |+f"\n{{}}�+-\\d+" -60 60 | -61 61 | # See https://github.com/astral-sh/ruff/issues/11491 -62 62 | total = 10 +56 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 +57 | f"{{}}+-\d" +58 | f"\n{{}}+-\d+" + - f"\n{{}}�+-\d+" +59 + f"\n{{}}�+-\\d+" +60 | +61 | # See https://github.com/astral-sh/ruff/issues/11491 +62 | total = 10 W605 [*] Invalid escape sequence: `\I` --> W605_1.py:65:31 @@ -310,16 +282,14 @@ W605 [*] Invalid escape sequence: `\I` 67 | # Debug text (should trigger) | help: Add backslash to escape sequence - -ℹ Safe fix -62 62 | total = 10 -63 63 | ok = 7 -64 64 | incomplete = 3 -65 |-s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" - 65 |+s = f"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n" -66 66 | -67 67 | # Debug text (should trigger) -68 68 | t = f"{'\InHere'=}" +62 | total = 10 +63 | ok = 7 +64 | incomplete = 3 + - s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" +65 + s = f"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n" +66 | +67 | # Debug text (should trigger) +68 | t = f"{'\InHere'=}" W605 [*] Invalid escape sequence: `\I` --> W605_1.py:68:9 @@ -329,16 +299,14 @@ W605 [*] Invalid escape sequence: `\I` | ^^ | help: Use a raw string literal - -ℹ Safe fix -65 65 | s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" -66 66 | -67 67 | # Debug text (should trigger) -68 |-t = f"{'\InHere'=}" - 68 |+t = f"{r'\InHere'=}" -69 69 | -70 70 | -71 71 | +65 | s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" +66 | +67 | # Debug text (should trigger) + - t = f"{'\InHere'=}" +68 + t = f"{r'\InHere'=}" +69 | +70 | +71 | W605 [*] Invalid escape sequence: `\.` --> W605_1.py:73:11 @@ -350,16 +318,14 @@ W605 [*] Invalid escape sequence: `\.` 75 | #: W605:2:1 | help: Use a raw string literal - -ℹ Safe fix -70 70 | -71 71 | -72 72 | #: W605:1:10 -73 |-regex = t'\.png$' - 73 |+regex = rt'\.png$' -74 74 | -75 75 | #: W605:2:1 -76 76 | regex = t''' +70 | +71 | +72 | #: W605:1:10 + - regex = t'\.png$' +73 + regex = rt'\.png$' +74 | +75 | #: W605:2:1 +76 | regex = t''' W605 [*] Invalid escape sequence: `\.` --> W605_1.py:77:1 @@ -371,16 +337,14 @@ W605 [*] Invalid escape sequence: `\.` 78 | ''' | help: Use a raw string literal - -ℹ Safe fix -73 73 | regex = t'\.png$' -74 74 | -75 75 | #: W605:2:1 -76 |-regex = t''' - 76 |+regex = rt''' -77 77 | \.png$ -78 78 | ''' -79 79 | +73 | regex = t'\.png$' +74 | +75 | #: W605:2:1 + - regex = t''' +76 + regex = rt''' +77 | \.png$ +78 | ''' +79 | W605 [*] Invalid escape sequence: `\_` --> W605_1.py:82:7 @@ -392,16 +356,14 @@ W605 [*] Invalid escape sequence: `\_` 83 | ) | help: Use a raw string literal - -ℹ Safe fix -79 79 | -80 80 | #: W605:2:6 -81 81 | f( -82 |- t'\_' - 82 |+ rt'\_' -83 83 | ) -84 84 | -85 85 | #: W605:4:6 +79 | +80 | #: W605:2:6 +81 | f( + - t'\_' +82 + rt'\_' +83 | ) +84 | +85 | #: W605:4:6 W605 [*] Invalid escape sequence: `\_` --> W605_1.py:89:6 @@ -414,16 +376,14 @@ W605 [*] Invalid escape sequence: `\_` 91 | """ | help: Use a raw string literal - -ℹ Safe fix -83 83 | ) -84 84 | -85 85 | #: W605:4:6 -86 |-t""" - 86 |+rt""" -87 87 | multi-line -88 88 | literal -89 89 | with \_ somewhere +83 | ) +84 | +85 | #: W605:4:6 + - t""" +86 + rt""" +87 | multi-line +88 | literal +89 | with \_ somewhere W605 [*] Invalid escape sequence: `\_` --> W605_1.py:94:40 @@ -433,16 +393,14 @@ W605 [*] Invalid escape sequence: `\_` | ^^ | help: Add backslash to escape sequence - -ℹ Safe fix -91 91 | """ -92 92 | -93 93 | #: W605:1:38 -94 |-value = t'new line\nand invalid escape \_ here' - 94 |+value = t'new line\nand invalid escape \\_ here' -95 95 | -96 96 | -97 97 | #: Okay +91 | """ +92 | +93 | #: W605:1:38 + - value = t'new line\nand invalid escape \_ here' +94 + value = t'new line\nand invalid escape \\_ here' +95 | +96 | +97 | #: Okay W605 [*] Invalid escape sequence: `\w` --> W605_1.py:109:1 @@ -454,16 +412,14 @@ W605 [*] Invalid escape sequence: `\w` 110 | ''' # noqa | help: Use a raw string literal - -ℹ Safe fix -105 105 | ''' -106 106 | s = t'\\' -107 107 | regex = t'\w' # noqa -108 |-regex = t''' - 108 |+regex = rt''' -109 109 | \w -110 110 | ''' # noqa -111 111 | +105 | ''' +106 | s = t'\\' +107 | regex = t'\w' # noqa + - regex = t''' +108 + regex = rt''' +109 | \w +110 | ''' # noqa +111 | W605 [*] Invalid escape sequence: `\_` --> W605_1.py:112:13 @@ -476,16 +432,14 @@ W605 [*] Invalid escape sequence: `\_` 114 | value = t'\{1}' | help: Add backslash to escape sequence - -ℹ Safe fix -109 109 | \w -110 110 | ''' # noqa -111 111 | -112 |-regex = t'\\\_' - 112 |+regex = t'\\\\_' -113 113 | value = t'\{{1}}' -114 114 | value = t'\{1}' -115 115 | value = t'{1:\}' +109 | \w +110 | ''' # noqa +111 | + - regex = t'\\\_' +112 + regex = t'\\\\_' +113 | value = t'\{{1}}' +114 | value = t'\{1}' +115 | value = t'{1:\}' W605 [*] Invalid escape sequence: `\{` --> W605_1.py:113:11 @@ -497,16 +451,14 @@ W605 [*] Invalid escape sequence: `\{` 115 | value = t'{1:\}' | help: Use a raw string literal - -ℹ Safe fix -110 110 | ''' # noqa -111 111 | -112 112 | regex = t'\\\_' -113 |-value = t'\{{1}}' - 113 |+value = rt'\{{1}}' -114 114 | value = t'\{1}' -115 115 | value = t'{1:\}' -116 116 | value = t"{t"\{1}"}" +110 | ''' # noqa +111 | +112 | regex = t'\\\_' + - value = t'\{{1}}' +113 + value = rt'\{{1}}' +114 | value = t'\{1}' +115 | value = t'{1:\}' +116 | value = t"{t"\{1}"}" W605 [*] Invalid escape sequence: `\{` --> W605_1.py:114:11 @@ -519,16 +471,14 @@ W605 [*] Invalid escape sequence: `\{` 116 | value = t"{t"\{1}"}" | help: Use a raw string literal - -ℹ Safe fix -111 111 | -112 112 | regex = t'\\\_' -113 113 | value = t'\{{1}}' -114 |-value = t'\{1}' - 114 |+value = rt'\{1}' -115 115 | value = t'{1:\}' -116 116 | value = t"{t"\{1}"}" -117 117 | value = rt"{t"\{1}"}" +111 | +112 | regex = t'\\\_' +113 | value = t'\{{1}}' + - value = t'\{1}' +114 + value = rt'\{1}' +115 | value = t'{1:\}' +116 | value = t"{t"\{1}"}" +117 | value = rt"{t"\{1}"}" W605 [*] Invalid escape sequence: `\}` --> W605_1.py:115:14 @@ -541,16 +491,14 @@ W605 [*] Invalid escape sequence: `\}` 117 | value = rt"{t"\{1}"}" | help: Use a raw string literal - -ℹ Safe fix -112 112 | regex = t'\\\_' -113 113 | value = t'\{{1}}' -114 114 | value = t'\{1}' -115 |-value = t'{1:\}' - 115 |+value = rt'{1:\}' -116 116 | value = t"{t"\{1}"}" -117 117 | value = rt"{t"\{1}"}" -118 118 | +112 | regex = t'\\\_' +113 | value = t'\{{1}}' +114 | value = t'\{1}' + - value = t'{1:\}' +115 + value = rt'{1:\}' +116 | value = t"{t"\{1}"}" +117 | value = rt"{t"\{1}"}" +118 | W605 [*] Invalid escape sequence: `\{` --> W605_1.py:116:14 @@ -562,16 +510,14 @@ W605 [*] Invalid escape sequence: `\{` 117 | value = rt"{t"\{1}"}" | help: Use a raw string literal - -ℹ Safe fix -113 113 | value = t'\{{1}}' -114 114 | value = t'\{1}' -115 115 | value = t'{1:\}' -116 |-value = t"{t"\{1}"}" - 116 |+value = t"{rt"\{1}"}" -117 117 | value = rt"{t"\{1}"}" -118 118 | -119 119 | # Okay +113 | value = t'\{{1}}' +114 | value = t'\{1}' +115 | value = t'{1:\}' + - value = t"{t"\{1}"}" +116 + value = t"{rt"\{1}"}" +117 | value = rt"{t"\{1}"}" +118 | +119 | # Okay W605 [*] Invalid escape sequence: `\{` --> W605_1.py:117:15 @@ -584,16 +530,14 @@ W605 [*] Invalid escape sequence: `\{` 119 | # Okay | help: Use a raw string literal - -ℹ Safe fix -114 114 | value = t'\{1}' -115 115 | value = t'{1:\}' -116 116 | value = t"{t"\{1}"}" -117 |-value = rt"{t"\{1}"}" - 117 |+value = rt"{rt"\{1}"}" -118 118 | -119 119 | # Okay -120 120 | value = rt'\{{1}}' +114 | value = t'\{1}' +115 | value = t'{1:\}' +116 | value = t"{t"\{1}"}" + - value = rt"{t"\{1}"}" +117 + value = rt"{rt"\{1}"}" +118 | +119 | # Okay +120 | value = rt'\{{1}}' W605 [*] Invalid escape sequence: `\d` --> W605_1.py:126:9 @@ -605,16 +549,14 @@ W605 [*] Invalid escape sequence: `\d` 128 | t"\n{{}}�+-\d+" | help: Use a raw string literal - -ℹ Safe fix -123 123 | value = t"{rt"\{1}"}" -124 124 | -125 125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 -126 |-t"{{}}+-\d" - 126 |+rt"{{}}+-\d" -127 127 | t"\n{{}}+-\d+" -128 128 | t"\n{{}}�+-\d+" -129 129 | +123 | value = t"{rt"\{1}"}" +124 | +125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 + - t"{{}}+-\d" +126 + rt"{{}}+-\d" +127 | t"\n{{}}+-\d+" +128 | t"\n{{}}�+-\d+" +129 | W605 [*] Invalid escape sequence: `\d` --> W605_1.py:127:11 @@ -626,16 +568,14 @@ W605 [*] Invalid escape sequence: `\d` 128 | t"\n{{}}�+-\d+" | help: Add backslash to escape sequence - -ℹ Safe fix -124 124 | -125 125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 -126 126 | t"{{}}+-\d" -127 |-t"\n{{}}+-\d+" - 127 |+t"\n{{}}+-\\d+" -128 128 | t"\n{{}}�+-\d+" -129 129 | -130 130 | # See https://github.com/astral-sh/ruff/issues/11491 +124 | +125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 +126 | t"{{}}+-\d" + - t"\n{{}}+-\d+" +127 + t"\n{{}}+-\\d+" +128 | t"\n{{}}�+-\d+" +129 | +130 | # See https://github.com/astral-sh/ruff/issues/11491 W605 [*] Invalid escape sequence: `\d` --> W605_1.py:128:12 @@ -648,16 +588,14 @@ W605 [*] Invalid escape sequence: `\d` 130 | # See https://github.com/astral-sh/ruff/issues/11491 | help: Add backslash to escape sequence - -ℹ Safe fix -125 125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 -126 126 | t"{{}}+-\d" -127 127 | t"\n{{}}+-\d+" -128 |-t"\n{{}}�+-\d+" - 128 |+t"\n{{}}�+-\\d+" -129 129 | -130 130 | # See https://github.com/astral-sh/ruff/issues/11491 -131 131 | total = 10 +125 | # Regression tests for https://github.com/astral-sh/ruff/issues/10434 +126 | t"{{}}+-\d" +127 | t"\n{{}}+-\d+" + - t"\n{{}}�+-\d+" +128 + t"\n{{}}�+-\\d+" +129 | +130 | # See https://github.com/astral-sh/ruff/issues/11491 +131 | total = 10 W605 [*] Invalid escape sequence: `\I` --> W605_1.py:134:31 @@ -670,16 +608,14 @@ W605 [*] Invalid escape sequence: `\I` 136 | # Debug text (should trigger) | help: Add backslash to escape sequence - -ℹ Safe fix -131 131 | total = 10 -132 132 | ok = 7 -133 133 | incomplete = 3 -134 |-s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" - 134 |+s = t"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n" -135 135 | -136 136 | # Debug text (should trigger) -137 137 | t = t"{'\InHere'=}" +131 | total = 10 +132 | ok = 7 +133 | incomplete = 3 + - s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" +134 + s = t"TOTAL: {total}\nOK: {ok}\\INCOMPLETE: {incomplete}\n" +135 | +136 | # Debug text (should trigger) +137 | t = t"{'\InHere'=}" W605 [*] Invalid escape sequence: `\I` --> W605_1.py:137:9 @@ -689,10 +625,8 @@ W605 [*] Invalid escape sequence: `\I` | ^^ | help: Use a raw string literal - -ℹ Safe fix -134 134 | s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" -135 135 | -136 136 | # Debug text (should trigger) -137 |-t = t"{'\InHere'=}" - 137 |+t = t"{r'\InHere'=}" +134 | s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n" +135 | +136 | # Debug text (should trigger) + - t = t"{'\InHere'=}" +137 + t = t"{r'\InHere'=}" diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap index e7db6cbc5d..3bd1c13bce 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E301_notebook.snap @@ -12,12 +12,10 @@ E301 [*] Expected 1 blank line, found 0 15 | pass | help: Add missing blank line - -ℹ Safe fix -10 10 | -11 11 | def method(cls) -> None: -12 12 | pass - 13 |+ -13 14 | @classmethod -14 15 | def cls_method(cls) -> None: -15 16 | pass +10 | +11 | def method(cls) -> None: +12 | pass +13 + +14 | @classmethod +15 | def cls_method(cls) -> None: +16 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap index 8a5cfb44fb..ae745b3cde 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E302_notebook.snap @@ -12,12 +12,10 @@ E302 [*] Expected 2 blank lines, found 1 23 | # end | help: Add missing blank line(s) - -ℹ Safe fix -18 18 | def a(): -19 19 | pass -20 20 | - 21 |+ -21 22 | def b(): -22 23 | pass -23 24 | # end +18 | def a(): +19 | pass +20 | +21 + +22 | def b(): +23 | pass +24 | # end diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap index 977af3e324..f41c631c18 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_notebook.snap @@ -10,15 +10,13 @@ E303 [*] Too many blank lines (2) 31 | def inner(): # E306 not expected (pycodestyle detects E306) | help: Remove extraneous blank line(s) - -ℹ Safe fix -25 25 | def fn(): -26 26 | _ = None -27 27 | -28 |- -29 28 | # arbitrary comment -30 29 | -31 30 | def inner(): # E306 not expected (pycodestyle detects E306) +25 | def fn(): +26 | _ = None +27 | + - +28 | # arbitrary comment +29 | +30 | def inner(): # E306 not expected (pycodestyle detects E306) E303 [*] Too many blank lines (4) --> E30.ipynb:39:1 @@ -29,13 +27,11 @@ E303 [*] Too many blank lines (4) 41 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -34 34 | # E303 -35 35 | -36 36 | -37 |- -38 |- -39 37 | def fn(): -40 38 | pass -41 39 | # end +34 | # E303 +35 | +36 | + - + - +37 | def fn(): +38 | pass +39 | # end diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap index c8f3e76104..1e06e30216 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E303_typing_stub.snap @@ -10,15 +10,13 @@ E303 [*] Too many blank lines (2) 19 | def grouped3( ): ... | help: Remove extraneous blank line(s) - -ℹ Safe fix -13 13 | @overload -14 14 | def a(arg: int, name: str): ... -15 15 | -16 |- -17 16 | def grouped1(): ... -18 17 | def grouped2(): ... -19 18 | def grouped3( ): ... +13 | @overload +14 | def a(arg: int, name: str): ... +15 | + - +16 | def grouped1(): ... +17 | def grouped2(): ... +18 | def grouped3( ): ... E303 [*] Too many blank lines (2) --> E30.pyi:22:1 @@ -29,15 +27,13 @@ E303 [*] Too many blank lines (2) 24 | backend_object: str | None | help: Remove extraneous blank line(s) - -ℹ Safe fix -18 18 | def grouped2(): ... -19 19 | def grouped3( ): ... -20 20 | -21 |- -22 21 | class BackendProxy: -23 22 | backend_module: str -24 23 | backend_object: str | None +18 | def grouped2(): ... +19 | def grouped3( ): ... +20 | + - +21 | class BackendProxy: +22 | backend_module: str +23 | backend_object: str | None E303 [*] Too many blank lines (2) --> E30.pyi:35:5 @@ -47,15 +43,13 @@ E303 [*] Too many blank lines (2) 36 | a = "test" | help: Remove extraneous blank line(s) - -ℹ Safe fix -31 31 | -32 32 | def with_blank_line(): ... -33 33 | -34 |- -35 34 | def ungrouped(): ... -36 35 | a = "test" -37 36 | +31 | +32 | def with_blank_line(): ... +33 | + - +34 | def ungrouped(): ... +35 | a = "test" +36 | E303 [*] Too many blank lines (2) --> E30.pyi:43:1 @@ -66,12 +60,10 @@ E303 [*] Too many blank lines (2) 45 | pass | help: Remove extraneous blank line(s) - -ℹ Safe fix -39 39 | pass -40 40 | b = "test" -41 41 | -42 |- -43 42 | def outer(): -44 43 | def inner(): -45 44 | pass +39 | pass +40 | b = "test" +41 | + - +42 | def outer(): +43 | def inner(): +44 | pass diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap index 3d9f4f8434..a6746e265f 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_notebook.snap @@ -12,12 +12,10 @@ E304 [*] Blank lines found after function decorator (1) 47 | # end | help: Remove extraneous blank line(s) - -ℹ Safe fix -41 41 | # end -42 42 | # E304 -43 43 | @decorator -44 |- -45 44 | def function(): -46 45 | pass -47 46 | # end +41 | # end +42 | # E304 +43 | @decorator + - +44 | def function(): +45 | pass +46 | # end diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap index 5b83ab47b2..d7d2bf4263 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E304_typing_stub.snap @@ -10,12 +10,10 @@ E304 [*] Blank lines found after function decorator (1) | ^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -28 28 | def grouped2(): ... -29 29 | def grouped3( ): ... -30 30 | @decorated -31 |- -32 31 | def with_blank_line(): ... -33 32 | -34 33 | +28 | def grouped2(): ... +29 | def grouped3( ): ... +30 | @decorated + - +31 | def with_blank_line(): ... +32 | +33 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap index 250640539c..68f4da8c09 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E305_notebook.snap @@ -11,12 +11,10 @@ E305 [*] Expected 2 blank lines after class or function definition, found (1) 57 | # E306:3:5 | help: Add missing blank line(s) - -ℹ Safe fix -52 52 | # comment -53 53 | -54 54 | # another comment - 55 |+ -55 56 | fn() -56 57 | # end -57 58 | # E306:3:5 +52 | # comment +53 | +54 | # another comment +55 + +56 | fn() +57 | # end +58 | # E306:3:5 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap index 342b178c56..cc8b45b445 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_E306_notebook.snap @@ -12,12 +12,10 @@ E306 [*] Expected 1 blank line before a nested definition, found 0 62 | # end | help: Add missing blank line - -ℹ Safe fix -57 57 | # E306:3:5 -58 58 | def a(): -59 59 | x = 1 - 60 |+ -60 61 | def b(): -61 62 | pass -62 63 | # end +57 | # E306:3:5 +58 | def a(): +59 | x = 1 +60 + +61 | def b(): +62 | pass +63 | # end diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap index 8a04a07b58..eac3013414 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(-1)-between(0).snap @@ -12,15 +12,13 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import json -2 |- -3 |- -4 |- -5 2 | from typing import Any, Sequence -6 3 | -7 4 | +1 | import json + - + - + - +2 | from typing import Any, Sequence +3 | +4 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:23:1 @@ -33,15 +31,13 @@ E302 [*] Expected 2 blank lines, found 1 25 | if TYPE_CHECKING: | help: Add missing blank line(s) - -ℹ Safe fix -20 20 | -21 21 | abcd.foo() -22 22 | - 23 |+ -23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... -24 25 | -25 26 | if TYPE_CHECKING: +20 | +21 | abcd.foo() +22 | +23 + +24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +25 | +26 | if TYPE_CHECKING: I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -55,16 +51,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:35:1 @@ -76,15 +70,13 @@ E302 [*] Expected 2 blank lines, found 1 36 | ... | help: Add missing blank line(s) - -ℹ Safe fix -32 32 | -33 33 | abcd.foo() -34 34 | - 35 |+ -35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: -36 37 | ... -37 38 | +32 | +33 | abcd.foo() +34 | +35 + +36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +37 | ... +38 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:41:1 @@ -96,15 +88,13 @@ E302 [*] Expected 2 blank lines, found 1 42 | ... | help: Add missing blank line(s) - -ℹ Safe fix -38 38 | if TYPE_CHECKING: -39 39 | from typing_extensions import TypeAlias -40 40 | - 41 |+ -41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: -42 43 | ... -43 44 | +38 | if TYPE_CHECKING: +39 | from typing_extensions import TypeAlias +40 | +41 + +42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: +43 | ... +44 | I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:60:1 @@ -115,13 +105,11 @@ I001 [*] Import block is un-sorted or un-formatted 62 | class MissingCommand(TypeError): ... # noqa: N818 | help: Organize imports - -ℹ Safe fix -59 59 | -60 60 | from typing import Any, Sequence -61 61 | - 62 |+ -62 63 | class MissingCommand(TypeError): ... # noqa: N818 +59 | +60 | from typing import Any, Sequence +61 | +62 + +63 | class MissingCommand(TypeError): ... # noqa: N818 E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:62:1 @@ -132,10 +120,8 @@ E302 [*] Expected 2 blank lines, found 1 | ^^^^^ | help: Add missing blank line(s) - -ℹ Safe fix -59 59 | -60 60 | from typing import Any, Sequence -61 61 | - 62 |+ -62 63 | class MissingCommand(TypeError): ... # noqa: N818 +59 | +60 | from typing import Any, Sequence +61 | +62 + +63 | class MissingCommand(TypeError): ... # noqa: N818 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap index 9c480c19a2..0fc8cc5855 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(0)-between(0).snap @@ -12,18 +12,16 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import json -2 |- -3 |- -4 |- -5 2 | from typing import Any, Sequence -6 |- -7 |- -8 3 | class MissingCommand(TypeError): ... # noqa: N818 -9 4 | -10 5 | +1 | import json + - + - + - +2 | from typing import Any, Sequence + - + - +3 | class MissingCommand(TypeError): ... # noqa: N818 +4 | +5 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:23:1 @@ -36,15 +34,13 @@ E302 [*] Expected 2 blank lines, found 1 25 | if TYPE_CHECKING: | help: Add missing blank line(s) - -ℹ Safe fix -20 20 | -21 21 | abcd.foo() -22 22 | - 23 |+ -23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... -24 25 | -25 26 | if TYPE_CHECKING: +20 | +21 | abcd.foo() +22 | +23 + +24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +25 | +26 | if TYPE_CHECKING: I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -58,16 +54,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:35:1 @@ -79,15 +73,13 @@ E302 [*] Expected 2 blank lines, found 1 36 | ... | help: Add missing blank line(s) - -ℹ Safe fix -32 32 | -33 33 | abcd.foo() -34 34 | - 35 |+ -35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: -36 37 | ... -37 38 | +32 | +33 | abcd.foo() +34 | +35 + +36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +37 | ... +38 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:41:1 @@ -99,15 +91,13 @@ E302 [*] Expected 2 blank lines, found 1 42 | ... | help: Add missing blank line(s) - -ℹ Safe fix -38 38 | if TYPE_CHECKING: -39 39 | from typing_extensions import TypeAlias -40 40 | - 41 |+ -41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: -42 43 | ... -43 44 | +38 | if TYPE_CHECKING: +39 | from typing_extensions import TypeAlias +40 | +41 + +42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: +43 | ... +44 | I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:60:1 @@ -118,10 +108,8 @@ I001 [*] Import block is un-sorted or un-formatted 62 | class MissingCommand(TypeError): ... # noqa: N818 | help: Organize imports - -ℹ Safe fix -58 58 | -59 59 | -60 60 | from typing import Any, Sequence -61 |- -62 61 | class MissingCommand(TypeError): ... # noqa: N818 +58 | +59 | +60 | from typing import Any, Sequence + - +61 | class MissingCommand(TypeError): ... # noqa: N818 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap index 5c84b8e63e..84e7144bae 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(1)-between(1).snap @@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import json -2 2 | -3 |- -4 |- -5 3 | from typing import Any, Sequence -6 |- -7 4 | -8 5 | class MissingCommand(TypeError): ... # noqa: N818 -9 6 | +1 | import json +2 | + - + - +3 | from typing import Any, Sequence + - +4 | +5 | class MissingCommand(TypeError): ... # noqa: N818 +6 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:23:1 @@ -35,15 +33,13 @@ E302 [*] Expected 2 blank lines, found 1 25 | if TYPE_CHECKING: | help: Add missing blank line(s) - -ℹ Safe fix -20 20 | -21 21 | abcd.foo() -22 22 | - 23 |+ -23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... -24 25 | -25 26 | if TYPE_CHECKING: +20 | +21 | abcd.foo() +22 | +23 + +24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +25 | +26 | if TYPE_CHECKING: I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -57,16 +53,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:35:1 @@ -78,15 +72,13 @@ E302 [*] Expected 2 blank lines, found 1 36 | ... | help: Add missing blank line(s) - -ℹ Safe fix -32 32 | -33 33 | abcd.foo() -34 34 | - 35 |+ -35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: -36 37 | ... -37 38 | +32 | +33 | abcd.foo() +34 | +35 + +36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +37 | ... +38 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:41:1 @@ -98,12 +90,10 @@ E302 [*] Expected 2 blank lines, found 1 42 | ... | help: Add missing blank line(s) - -ℹ Safe fix -38 38 | if TYPE_CHECKING: -39 39 | from typing_extensions import TypeAlias -40 40 | - 41 |+ -41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: -42 43 | ... -43 44 | +38 | if TYPE_CHECKING: +39 | from typing_extensions import TypeAlias +40 | +41 + +42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: +43 | ... +44 | diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap index b3900e15ed..ee1ddb0fea 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_top_level_isort_compatibility-lines-after(4)-between(4).snap @@ -12,20 +12,18 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | -4 4 | - 5 |+ -5 6 | from typing import Any, Sequence -6 7 | -7 8 | - 9 |+ - 10 |+ -8 11 | class MissingCommand(TypeError): ... # noqa: N818 -9 12 | -10 13 | +2 | +3 | +4 | +5 + +6 | from typing import Any, Sequence +7 | +8 | +9 + +10 + +11 | class MissingCommand(TypeError): ... # noqa: N818 +12 | +13 | E302 [*] Expected 4 blank lines, found 2 --> E30_isort.py:8:1 @@ -34,16 +32,14 @@ E302 [*] Expected 4 blank lines, found 2 | ^^^^^ | help: Add missing blank line(s) - -ℹ Safe fix -5 5 | from typing import Any, Sequence -6 6 | -7 7 | - 8 |+ - 9 |+ -8 10 | class MissingCommand(TypeError): ... # noqa: N818 -9 11 | -10 12 | +5 | from typing import Any, Sequence +6 | +7 | +8 + +9 + +10 | class MissingCommand(TypeError): ... # noqa: N818 +11 | +12 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:23:1 @@ -56,15 +52,13 @@ E302 [*] Expected 2 blank lines, found 1 25 | if TYPE_CHECKING: | help: Add missing blank line(s) - -ℹ Safe fix -20 20 | -21 21 | abcd.foo() -22 22 | - 23 |+ -23 24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... -24 25 | -25 26 | if TYPE_CHECKING: +20 | +21 | abcd.foo() +22 | +23 + +24 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +25 | +26 | if TYPE_CHECKING: I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -78,16 +72,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:35:1 @@ -99,15 +91,13 @@ E302 [*] Expected 2 blank lines, found 1 36 | ... | help: Add missing blank line(s) - -ℹ Safe fix -32 32 | -33 33 | abcd.foo() -34 34 | - 35 |+ -35 36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: -36 37 | ... -37 38 | +32 | +33 | abcd.foo() +34 | +35 + +36 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +37 | ... +38 | E302 [*] Expected 2 blank lines, found 1 --> E30_isort.py:41:1 @@ -119,15 +109,13 @@ E302 [*] Expected 2 blank lines, found 1 42 | ... | help: Add missing blank line(s) - -ℹ Safe fix -38 38 | if TYPE_CHECKING: -39 39 | from typing_extensions import TypeAlias -40 40 | - 41 |+ -41 42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: -42 43 | ... -43 44 | +38 | if TYPE_CHECKING: +39 | from typing_extensions import TypeAlias +40 | +41 + +42 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: +43 | ... +44 | I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:60:1 @@ -138,15 +126,13 @@ I001 [*] Import block is un-sorted or un-formatted 62 | class MissingCommand(TypeError): ... # noqa: N818 | help: Organize imports - -ℹ Safe fix -59 59 | -60 60 | from typing import Any, Sequence -61 61 | - 62 |+ - 63 |+ - 64 |+ -62 65 | class MissingCommand(TypeError): ... # noqa: N818 +59 | +60 | from typing import Any, Sequence +61 | +62 + +63 + +64 + +65 | class MissingCommand(TypeError): ... # noqa: N818 E302 [*] Expected 4 blank lines, found 1 --> E30_isort.py:62:1 @@ -157,12 +143,10 @@ E302 [*] Expected 4 blank lines, found 1 | ^^^^^ | help: Add missing blank line(s) - -ℹ Safe fix -59 59 | -60 60 | from typing import Any, Sequence -61 61 | - 62 |+ - 63 |+ - 64 |+ -62 65 | class MissingCommand(TypeError): ... # noqa: N818 +59 | +60 | from typing import Any, Sequence +61 | +62 + +63 + +64 + +65 | class MissingCommand(TypeError): ... # noqa: N818 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap index 941e55ca08..1d509703d2 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__blank_lines_typing_stub_isort.snap @@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import json -2 |- -3 |- -4 |- -5 2 | from typing import Any, Sequence -6 |- -7 3 | -8 4 | class MissingCommand(TypeError): ... # noqa: N818 -9 5 | +1 | import json + - + - + - +2 | from typing import Any, Sequence + - +3 | +4 | class MissingCommand(TypeError): ... # noqa: N818 +5 | E303 [*] Too many blank lines (3) --> E30_isort.pyi:5:1 @@ -31,15 +29,13 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | import json -2 2 | -3 |- -4 |- -5 3 | from typing import Any, Sequence -6 4 | -7 5 | +1 | import json +2 | + - + - +3 | from typing import Any, Sequence +4 | +5 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:8:1 @@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2) | ^^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -4 4 | -5 5 | from typing import Any, Sequence -6 6 | -7 |- -8 7 | class MissingCommand(TypeError): ... # noqa: N818 -9 8 | -10 9 | +4 | +5 | from typing import Any, Sequence +6 | + - +7 | class MissingCommand(TypeError): ... # noqa: N818 +8 | +9 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:11:1 @@ -67,15 +61,13 @@ E303 [*] Too many blank lines (2) 13 | backend_object: str | None | help: Remove extraneous blank line(s) - -ℹ Safe fix -7 7 | -8 8 | class MissingCommand(TypeError): ... # noqa: N818 -9 9 | -10 |- -11 10 | class BackendProxy: -12 11 | backend_module: str -13 12 | backend_object: str | None +7 | +8 | class MissingCommand(TypeError): ... # noqa: N818 +9 | + - +10 | class BackendProxy: +11 | backend_module: str +12 | backend_object: str | None E303 [*] Too many blank lines (2) --> E30_isort.pyi:17:1 @@ -85,15 +77,13 @@ E303 [*] Too many blank lines (2) 18 | import abcd | help: Remove extraneous blank line(s) - -ℹ Safe fix -13 13 | backend_object: str | None -14 14 | backend: Any -15 15 | -16 |- -17 16 | if __name__ == "__main__": -18 17 | import abcd -19 18 | +13 | backend_object: str | None +14 | backend: Any +15 | + - +16 | if __name__ == "__main__": +17 | import abcd +18 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:21:5 @@ -104,15 +94,13 @@ E303 [*] Too many blank lines (2) 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... | help: Remove extraneous blank line(s) - -ℹ Safe fix -17 17 | if __name__ == "__main__": -18 18 | import abcd -19 19 | -20 |- -21 20 | abcd.foo() -22 21 | -23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +17 | if __name__ == "__main__": +18 | import abcd +19 | + - +20 | abcd.foo() +21 | +22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... I001 [*] Import block is un-sorted or un-formatted --> E30_isort.pyi:26:5 @@ -126,16 +114,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (3) --> E30_isort.pyi:30:5 @@ -144,16 +130,14 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:33:5 @@ -164,15 +148,13 @@ E303 [*] Too many blank lines (2) 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: | help: Remove extraneous blank line(s) - -ℹ Safe fix -29 29 | -30 30 | from typing_extensions import TypeAlias -31 31 | -32 |- -33 32 | abcd.foo() -34 33 | -35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +29 | +30 | from typing_extensions import TypeAlias +31 | + - +32 | abcd.foo() +33 | +34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: E303 [*] Too many blank lines (2) --> E30_isort.pyi:45:1 @@ -181,15 +163,13 @@ E303 [*] Too many blank lines (2) | ^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -41 41 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: -42 42 | ... -43 43 | -44 |- -45 44 | def _exit(self) -> None: ... -46 45 | -47 46 | +41 | def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any: +42 | ... +43 | + - +44 | def _exit(self) -> None: ... +45 | +46 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:48:1 @@ -198,15 +178,13 @@ E303 [*] Too many blank lines (2) | ^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -44 44 | -45 45 | def _exit(self) -> None: ... -46 46 | -47 |- -48 47 | def _optional_commands(self) -> dict[str, bool]: ... -49 48 | -50 49 | +44 | +45 | def _exit(self) -> None: ... +46 | + - +47 | def _optional_commands(self) -> dict[str, bool]: ... +48 | +49 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:51:1 @@ -215,15 +193,13 @@ E303 [*] Too many blank lines (2) | ^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -47 47 | -48 48 | def _optional_commands(self) -> dict[str, bool]: ... -49 49 | -50 |- -51 50 | def run(argv: Sequence[str]) -> int: ... -52 51 | -53 52 | +47 | +48 | def _optional_commands(self) -> dict[str, bool]: ... +49 | + - +50 | def run(argv: Sequence[str]) -> int: ... +51 | +52 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:54:1 @@ -232,15 +208,13 @@ E303 [*] Too many blank lines (2) | ^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -50 50 | -51 51 | def run(argv: Sequence[str]) -> int: ... -52 52 | -53 |- -54 53 | def read_line(fd: int = 0) -> bytearray: ... -55 54 | -56 55 | +50 | +51 | def run(argv: Sequence[str]) -> int: ... +52 | + - +53 | def read_line(fd: int = 0) -> bytearray: ... +54 | +55 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:57:1 @@ -249,15 +223,13 @@ E303 [*] Too many blank lines (2) | ^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -53 53 | -54 54 | def read_line(fd: int = 0) -> bytearray: ... -55 55 | -56 |- -57 56 | def flush() -> None: ... -58 57 | -59 58 | +53 | +54 | def read_line(fd: int = 0) -> bytearray: ... +55 | + - +56 | def flush() -> None: ... +57 | +58 | E303 [*] Too many blank lines (2) --> E30_isort.pyi:60:1 @@ -268,12 +240,10 @@ E303 [*] Too many blank lines (2) 62 | class MissingCommand(TypeError): ... # noqa: N818 | help: Remove extraneous blank line(s) - -ℹ Safe fix -56 56 | -57 57 | def flush() -> None: ... -58 58 | -59 |- -60 59 | from typing import Any, Sequence -61 60 | -62 61 | class MissingCommand(TypeError): ... # noqa: N818 +56 | +57 | def flush() -> None: ... +58 | + - +59 | from typing import Any, Sequence +60 | +61 | class MissingCommand(TypeError): ... # noqa: N818 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap index cbd129d821..9d883aa7b3 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__constant_literals.snap @@ -12,16 +12,14 @@ F632 [*] Use `==` to compare constant literals 6 | if "abc" is None: # F632 (fix, but leaves behind unfixable E711) | help: Replace `is` with `==` - -ℹ Safe fix -1 1 | ### -2 2 | # Errors -3 3 | ### -4 |-if "abc" is "def": # F632 (fix) - 4 |+if "abc" == "def": # F632 (fix) -5 5 | pass -6 6 | if "abc" is None: # F632 (fix, but leaves behind unfixable E711) -7 7 | pass +1 | ### +2 | # Errors +3 | ### + - if "abc" is "def": # F632 (fix) +4 + if "abc" == "def": # F632 (fix) +5 | pass +6 | if "abc" is None: # F632 (fix, but leaves behind unfixable E711) +7 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:6:4 @@ -34,16 +32,14 @@ F632 [*] Use `==` to compare constant literals 8 | if None is "abc": # F632 (fix, but leaves behind unfixable E711) | help: Replace `is` with `==` - -ℹ Safe fix -3 3 | ### -4 4 | if "abc" is "def": # F632 (fix) -5 5 | pass -6 |-if "abc" is None: # F632 (fix, but leaves behind unfixable E711) - 6 |+if "abc" == None: # F632 (fix, but leaves behind unfixable E711) -7 7 | pass -8 8 | if None is "abc": # F632 (fix, but leaves behind unfixable E711) -9 9 | pass +3 | ### +4 | if "abc" is "def": # F632 (fix) +5 | pass + - if "abc" is None: # F632 (fix, but leaves behind unfixable E711) +6 + if "abc" == None: # F632 (fix, but leaves behind unfixable E711) +7 | pass +8 | if None is "abc": # F632 (fix, but leaves behind unfixable E711) +9 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:8:4 @@ -56,16 +52,14 @@ F632 [*] Use `==` to compare constant literals 10 | if "abc" is False: # F632 (fix, but leaves behind unfixable E712) | help: Replace `is` with `==` - -ℹ Safe fix -5 5 | pass -6 6 | if "abc" is None: # F632 (fix, but leaves behind unfixable E711) -7 7 | pass -8 |-if None is "abc": # F632 (fix, but leaves behind unfixable E711) - 8 |+if None == "abc": # F632 (fix, but leaves behind unfixable E711) -9 9 | pass -10 10 | if "abc" is False: # F632 (fix, but leaves behind unfixable E712) -11 11 | pass +5 | pass +6 | if "abc" is None: # F632 (fix, but leaves behind unfixable E711) +7 | pass + - if None is "abc": # F632 (fix, but leaves behind unfixable E711) +8 + if None == "abc": # F632 (fix, but leaves behind unfixable E711) +9 | pass +10 | if "abc" is False: # F632 (fix, but leaves behind unfixable E712) +11 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:10:4 @@ -78,16 +72,14 @@ F632 [*] Use `==` to compare constant literals 12 | if False is "abc": # F632 (fix, but leaves behind unfixable E712) | help: Replace `is` with `==` - -ℹ Safe fix -7 7 | pass -8 8 | if None is "abc": # F632 (fix, but leaves behind unfixable E711) -9 9 | pass -10 |-if "abc" is False: # F632 (fix, but leaves behind unfixable E712) - 10 |+if "abc" == False: # F632 (fix, but leaves behind unfixable E712) -11 11 | pass -12 12 | if False is "abc": # F632 (fix, but leaves behind unfixable E712) -13 13 | pass +7 | pass +8 | if None is "abc": # F632 (fix, but leaves behind unfixable E711) +9 | pass + - if "abc" is False: # F632 (fix, but leaves behind unfixable E712) +10 + if "abc" == False: # F632 (fix, but leaves behind unfixable E712) +11 | pass +12 | if False is "abc": # F632 (fix, but leaves behind unfixable E712) +13 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:12:4 @@ -100,16 +92,14 @@ F632 [*] Use `==` to compare constant literals 14 | if False == None: # E711, E712 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -9 9 | pass -10 10 | if "abc" is False: # F632 (fix, but leaves behind unfixable E712) -11 11 | pass -12 |-if False is "abc": # F632 (fix, but leaves behind unfixable E712) - 12 |+if False == "abc": # F632 (fix, but leaves behind unfixable E712) -13 13 | pass -14 14 | if False == None: # E711, E712 (fix) -15 15 | pass +9 | pass +10 | if "abc" is False: # F632 (fix, but leaves behind unfixable E712) +11 | pass + - if False is "abc": # F632 (fix, but leaves behind unfixable E712) +12 + if False == "abc": # F632 (fix, but leaves behind unfixable E712) +13 | pass +14 | if False == None: # E711, E712 (fix) +15 | pass E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks --> constant_literals.py:14:4 @@ -122,16 +112,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks 16 | if None == False: # E711, E712 (fix) | help: Replace with `not None` - -ℹ Unsafe fix -11 11 | pass -12 12 | if False is "abc": # F632 (fix, but leaves behind unfixable E712) -13 13 | pass -14 |-if False == None: # E711, E712 (fix) - 14 |+if not None: # E711, E712 (fix) -15 15 | pass -16 16 | if None == False: # E711, E712 (fix) -17 17 | pass +11 | pass +12 | if False is "abc": # F632 (fix, but leaves behind unfixable E712) +13 | pass + - if False == None: # E711, E712 (fix) +14 + if not None: # E711, E712 (fix) +15 | pass +16 | if None == False: # E711, E712 (fix) +17 | pass +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is None` --> constant_literals.py:14:13 @@ -144,16 +133,15 @@ E711 [*] Comparison to `None` should be `cond is None` 16 | if None == False: # E711, E712 (fix) | help: Replace with `cond is None` - -ℹ Unsafe fix -11 11 | pass -12 12 | if False is "abc": # F632 (fix, but leaves behind unfixable E712) -13 13 | pass -14 |-if False == None: # E711, E712 (fix) - 14 |+if not None: # E711, E712 (fix) -15 15 | pass -16 16 | if None == False: # E711, E712 (fix) -17 17 | pass +11 | pass +12 | if False is "abc": # F632 (fix, but leaves behind unfixable E712) +13 | pass + - if False == None: # E711, E712 (fix) +14 + if not None: # E711, E712 (fix) +15 | pass +16 | if None == False: # E711, E712 (fix) +17 | pass +note: This is an unsafe fix and may change runtime behavior E711 [*] Comparison to `None` should be `cond is None` --> constant_literals.py:16:4 @@ -165,16 +153,15 @@ E711 [*] Comparison to `None` should be `cond is None` 17 | pass | help: Replace with `cond is None` - -ℹ Unsafe fix -13 13 | pass -14 14 | if False == None: # E711, E712 (fix) -15 15 | pass -16 |-if None == False: # E711, E712 (fix) - 16 |+if not None: # E711, E712 (fix) -17 17 | pass -18 18 | -19 19 | named_var = [] +13 | pass +14 | if False == None: # E711, E712 (fix) +15 | pass + - if None == False: # E711, E712 (fix) +16 + if not None: # E711, E712 (fix) +17 | pass +18 | +19 | named_var = [] +note: This is an unsafe fix and may change runtime behavior E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks --> constant_literals.py:16:4 @@ -186,16 +173,15 @@ E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks 17 | pass | help: Replace with `not None` - -ℹ Unsafe fix -13 13 | pass -14 14 | if False == None: # E711, E712 (fix) -15 15 | pass -16 |-if None == False: # E711, E712 (fix) - 16 |+if not None: # E711, E712 (fix) -17 17 | pass -18 18 | -19 19 | named_var = [] +13 | pass +14 | if False == None: # E711, E712 (fix) +15 | pass + - if None == False: # E711, E712 (fix) +16 + if not None: # E711, E712 (fix) +17 | pass +18 | +19 | named_var = [] +note: This is an unsafe fix and may change runtime behavior F632 [*] Use `==` to compare constant literals --> constant_literals.py:20:4 @@ -207,16 +193,14 @@ F632 [*] Use `==` to compare constant literals 22 | if named_var is []: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -17 17 | pass -18 18 | -19 19 | named_var = [] -20 |-if [] is []: # F632 (fix) - 20 |+if [] == []: # F632 (fix) -21 21 | pass -22 22 | if named_var is []: # F632 (fix) -23 23 | pass +17 | pass +18 | +19 | named_var = [] + - if [] is []: # F632 (fix) +20 + if [] == []: # F632 (fix) +21 | pass +22 | if named_var is []: # F632 (fix) +23 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:22:4 @@ -229,16 +213,14 @@ F632 [*] Use `==` to compare constant literals 24 | if [] is named_var: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -19 19 | named_var = [] -20 20 | if [] is []: # F632 (fix) -21 21 | pass -22 |-if named_var is []: # F632 (fix) - 22 |+if named_var == []: # F632 (fix) -23 23 | pass -24 24 | if [] is named_var: # F632 (fix) -25 25 | pass +19 | named_var = [] +20 | if [] is []: # F632 (fix) +21 | pass + - if named_var is []: # F632 (fix) +22 + if named_var == []: # F632 (fix) +23 | pass +24 | if [] is named_var: # F632 (fix) +25 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:24:4 @@ -251,16 +233,14 @@ F632 [*] Use `==` to compare constant literals 26 | if named_var is [1]: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -21 21 | pass -22 22 | if named_var is []: # F632 (fix) -23 23 | pass -24 |-if [] is named_var: # F632 (fix) - 24 |+if [] == named_var: # F632 (fix) -25 25 | pass -26 26 | if named_var is [1]: # F632 (fix) -27 27 | pass +21 | pass +22 | if named_var is []: # F632 (fix) +23 | pass + - if [] is named_var: # F632 (fix) +24 + if [] == named_var: # F632 (fix) +25 | pass +26 | if named_var is [1]: # F632 (fix) +27 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:26:4 @@ -273,16 +253,14 @@ F632 [*] Use `==` to compare constant literals 28 | if [1] is named_var: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -23 23 | pass -24 24 | if [] is named_var: # F632 (fix) -25 25 | pass -26 |-if named_var is [1]: # F632 (fix) - 26 |+if named_var == [1]: # F632 (fix) -27 27 | pass -28 28 | if [1] is named_var: # F632 (fix) -29 29 | pass +23 | pass +24 | if [] is named_var: # F632 (fix) +25 | pass + - if named_var is [1]: # F632 (fix) +26 + if named_var == [1]: # F632 (fix) +27 | pass +28 | if [1] is named_var: # F632 (fix) +29 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:28:4 @@ -295,16 +273,14 @@ F632 [*] Use `==` to compare constant literals 30 | if named_var is [i for i in [1]]: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -25 25 | pass -26 26 | if named_var is [1]: # F632 (fix) -27 27 | pass -28 |-if [1] is named_var: # F632 (fix) - 28 |+if [1] == named_var: # F632 (fix) -29 29 | pass -30 30 | if named_var is [i for i in [1]]: # F632 (fix) -31 31 | pass +25 | pass +26 | if named_var is [1]: # F632 (fix) +27 | pass + - if [1] is named_var: # F632 (fix) +28 + if [1] == named_var: # F632 (fix) +29 | pass +30 | if named_var is [i for i in [1]]: # F632 (fix) +31 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:30:4 @@ -316,16 +292,14 @@ F632 [*] Use `==` to compare constant literals 31 | pass | help: Replace `is` with `==` - -ℹ Safe fix -27 27 | pass -28 28 | if [1] is named_var: # F632 (fix) -29 29 | pass -30 |-if named_var is [i for i in [1]]: # F632 (fix) - 30 |+if named_var == [i for i in [1]]: # F632 (fix) -31 31 | pass -32 32 | -33 33 | named_var = {} +27 | pass +28 | if [1] is named_var: # F632 (fix) +29 | pass + - if named_var is [i for i in [1]]: # F632 (fix) +30 + if named_var == [i for i in [1]]: # F632 (fix) +31 | pass +32 | +33 | named_var = {} F632 [*] Use `==` to compare constant literals --> constant_literals.py:34:4 @@ -337,16 +311,14 @@ F632 [*] Use `==` to compare constant literals 36 | if named_var is {}: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -31 31 | pass -32 32 | -33 33 | named_var = {} -34 |-if {} is {}: # F632 (fix) - 34 |+if {} == {}: # F632 (fix) -35 35 | pass -36 36 | if named_var is {}: # F632 (fix) -37 37 | pass +31 | pass +32 | +33 | named_var = {} + - if {} is {}: # F632 (fix) +34 + if {} == {}: # F632 (fix) +35 | pass +36 | if named_var is {}: # F632 (fix) +37 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:36:4 @@ -359,16 +331,14 @@ F632 [*] Use `==` to compare constant literals 38 | if {} is named_var: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -33 33 | named_var = {} -34 34 | if {} is {}: # F632 (fix) -35 35 | pass -36 |-if named_var is {}: # F632 (fix) - 36 |+if named_var == {}: # F632 (fix) -37 37 | pass -38 38 | if {} is named_var: # F632 (fix) -39 39 | pass +33 | named_var = {} +34 | if {} is {}: # F632 (fix) +35 | pass + - if named_var is {}: # F632 (fix) +36 + if named_var == {}: # F632 (fix) +37 | pass +38 | if {} is named_var: # F632 (fix) +39 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:38:4 @@ -381,16 +351,14 @@ F632 [*] Use `==` to compare constant literals 40 | if named_var is {1}: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -35 35 | pass -36 36 | if named_var is {}: # F632 (fix) -37 37 | pass -38 |-if {} is named_var: # F632 (fix) - 38 |+if {} == named_var: # F632 (fix) -39 39 | pass -40 40 | if named_var is {1}: # F632 (fix) -41 41 | pass +35 | pass +36 | if named_var is {}: # F632 (fix) +37 | pass + - if {} is named_var: # F632 (fix) +38 + if {} == named_var: # F632 (fix) +39 | pass +40 | if named_var is {1}: # F632 (fix) +41 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:40:4 @@ -403,16 +371,14 @@ F632 [*] Use `==` to compare constant literals 42 | if {1} is named_var: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -37 37 | pass -38 38 | if {} is named_var: # F632 (fix) -39 39 | pass -40 |-if named_var is {1}: # F632 (fix) - 40 |+if named_var == {1}: # F632 (fix) -41 41 | pass -42 42 | if {1} is named_var: # F632 (fix) -43 43 | pass +37 | pass +38 | if {} is named_var: # F632 (fix) +39 | pass + - if named_var is {1}: # F632 (fix) +40 + if named_var == {1}: # F632 (fix) +41 | pass +42 | if {1} is named_var: # F632 (fix) +43 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:42:4 @@ -425,16 +391,14 @@ F632 [*] Use `==` to compare constant literals 44 | if named_var is {i for i in [1]}: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -39 39 | pass -40 40 | if named_var is {1}: # F632 (fix) -41 41 | pass -42 |-if {1} is named_var: # F632 (fix) - 42 |+if {1} == named_var: # F632 (fix) -43 43 | pass -44 44 | if named_var is {i for i in [1]}: # F632 (fix) -45 45 | pass +39 | pass +40 | if named_var is {1}: # F632 (fix) +41 | pass + - if {1} is named_var: # F632 (fix) +42 + if {1} == named_var: # F632 (fix) +43 | pass +44 | if named_var is {i for i in [1]}: # F632 (fix) +45 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:44:4 @@ -446,16 +410,14 @@ F632 [*] Use `==` to compare constant literals 45 | pass | help: Replace `is` with `==` - -ℹ Safe fix -41 41 | pass -42 42 | if {1} is named_var: # F632 (fix) -43 43 | pass -44 |-if named_var is {i for i in [1]}: # F632 (fix) - 44 |+if named_var == {i for i in [1]}: # F632 (fix) -45 45 | pass -46 46 | -47 47 | named_var = {1: 1} +41 | pass +42 | if {1} is named_var: # F632 (fix) +43 | pass + - if named_var is {i for i in [1]}: # F632 (fix) +44 + if named_var == {i for i in [1]}: # F632 (fix) +45 | pass +46 | +47 | named_var = {1: 1} F632 [*] Use `==` to compare constant literals --> constant_literals.py:48:4 @@ -467,16 +429,14 @@ F632 [*] Use `==` to compare constant literals 50 | if named_var is {1: 1}: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -45 45 | pass -46 46 | -47 47 | named_var = {1: 1} -48 |-if {1: 1} is {1: 1}: # F632 (fix) - 48 |+if {1: 1} == {1: 1}: # F632 (fix) -49 49 | pass -50 50 | if named_var is {1: 1}: # F632 (fix) -51 51 | pass +45 | pass +46 | +47 | named_var = {1: 1} + - if {1: 1} is {1: 1}: # F632 (fix) +48 + if {1: 1} == {1: 1}: # F632 (fix) +49 | pass +50 | if named_var is {1: 1}: # F632 (fix) +51 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:50:4 @@ -489,16 +449,14 @@ F632 [*] Use `==` to compare constant literals 52 | if {1: 1} is named_var: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -47 47 | named_var = {1: 1} -48 48 | if {1: 1} is {1: 1}: # F632 (fix) -49 49 | pass -50 |-if named_var is {1: 1}: # F632 (fix) - 50 |+if named_var == {1: 1}: # F632 (fix) -51 51 | pass -52 52 | if {1: 1} is named_var: # F632 (fix) -53 53 | pass +47 | named_var = {1: 1} +48 | if {1: 1} is {1: 1}: # F632 (fix) +49 | pass + - if named_var is {1: 1}: # F632 (fix) +50 + if named_var == {1: 1}: # F632 (fix) +51 | pass +52 | if {1: 1} is named_var: # F632 (fix) +53 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:52:4 @@ -511,16 +469,14 @@ F632 [*] Use `==` to compare constant literals 54 | if named_var is {1: 1}: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -49 49 | pass -50 50 | if named_var is {1: 1}: # F632 (fix) -51 51 | pass -52 |-if {1: 1} is named_var: # F632 (fix) - 52 |+if {1: 1} == named_var: # F632 (fix) -53 53 | pass -54 54 | if named_var is {1: 1}: # F632 (fix) -55 55 | pass +49 | pass +50 | if named_var is {1: 1}: # F632 (fix) +51 | pass + - if {1: 1} is named_var: # F632 (fix) +52 + if {1: 1} == named_var: # F632 (fix) +53 | pass +54 | if named_var is {1: 1}: # F632 (fix) +55 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:54:4 @@ -533,16 +489,14 @@ F632 [*] Use `==` to compare constant literals 56 | if {1: 1} is named_var: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -51 51 | pass -52 52 | if {1: 1} is named_var: # F632 (fix) -53 53 | pass -54 |-if named_var is {1: 1}: # F632 (fix) - 54 |+if named_var == {1: 1}: # F632 (fix) -55 55 | pass -56 56 | if {1: 1} is named_var: # F632 (fix) -57 57 | pass +51 | pass +52 | if {1: 1} is named_var: # F632 (fix) +53 | pass + - if named_var is {1: 1}: # F632 (fix) +54 + if named_var == {1: 1}: # F632 (fix) +55 | pass +56 | if {1: 1} is named_var: # F632 (fix) +57 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:56:4 @@ -555,16 +509,14 @@ F632 [*] Use `==` to compare constant literals 58 | if named_var is {i: 1 for i in [1]}: # F632 (fix) | help: Replace `is` with `==` - -ℹ Safe fix -53 53 | pass -54 54 | if named_var is {1: 1}: # F632 (fix) -55 55 | pass -56 |-if {1: 1} is named_var: # F632 (fix) - 56 |+if {1: 1} == named_var: # F632 (fix) -57 57 | pass -58 58 | if named_var is {i: 1 for i in [1]}: # F632 (fix) -59 59 | pass +53 | pass +54 | if named_var is {1: 1}: # F632 (fix) +55 | pass + - if {1: 1} is named_var: # F632 (fix) +56 + if {1: 1} == named_var: # F632 (fix) +57 | pass +58 | if named_var is {i: 1 for i in [1]}: # F632 (fix) +59 | pass F632 [*] Use `==` to compare constant literals --> constant_literals.py:58:4 @@ -576,13 +528,11 @@ F632 [*] Use `==` to compare constant literals 59 | pass | help: Replace `is` with `==` - -ℹ Safe fix -55 55 | pass -56 56 | if {1: 1} is named_var: # F632 (fix) -57 57 | pass -58 |-if named_var is {i: 1 for i in [1]}: # F632 (fix) - 58 |+if named_var == {i: 1 for i in [1]}: # F632 (fix) -59 59 | pass -60 60 | -61 61 | ### +55 | pass +56 | if {1: 1} is named_var: # F632 (fix) +57 | pass + - if named_var is {i: 1 for i in [1]}: # F632 (fix) +58 + if named_var == {i: 1 for i in [1]}: # F632 (fix) +59 | pass +60 | +61 | ### diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap index 851d6ec397..f2a87ff747 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__E502_E502.py.snap @@ -12,16 +12,14 @@ E502 [*] Redundant backslash 11 | 7) | help: Remove redundant backslash - -ℹ Safe fix -6 6 | 3 \ -7 7 | + 4 -8 8 | -9 |-a = (3 -\ - 9 |+a = (3 - -10 10 | 2 + \ -11 11 | 7) -12 12 | +6 | 3 \ +7 | + 4 +8 | + - a = (3 -\ +9 + a = (3 - +10 | 2 + \ +11 | 7) +12 | E502 [*] Redundant backslash --> E502.py:10:11 @@ -32,16 +30,14 @@ E502 [*] Redundant backslash 11 | 7) | help: Remove redundant backslash - -ℹ Safe fix -7 7 | + 4 -8 8 | -9 9 | a = (3 -\ -10 |- 2 + \ - 10 |+ 2 + -11 11 | 7) -12 12 | -13 13 | z = 5 + \ +7 | + 4 +8 | +9 | a = (3 -\ + - 2 + \ +10 + 2 + +11 | 7) +12 | +13 | z = 5 + \ E502 [*] Redundant backslash --> E502.py:14:9 @@ -53,16 +49,14 @@ E502 [*] Redundant backslash 16 | 7) + \ | help: Remove redundant backslash - -ℹ Safe fix -11 11 | 7) -12 12 | -13 13 | z = 5 + \ -14 |- (3 -\ - 14 |+ (3 - -15 15 | 2 + \ -16 16 | 7) + \ -17 17 | 4 +11 | 7) +12 | +13 | z = 5 + \ + - (3 -\ +14 + (3 - +15 | 2 + \ +16 | 7) + \ +17 | 4 E502 [*] Redundant backslash --> E502.py:15:11 @@ -75,16 +69,14 @@ E502 [*] Redundant backslash 17 | 4 | help: Remove redundant backslash - -ℹ Safe fix -12 12 | -13 13 | z = 5 + \ -14 14 | (3 -\ -15 |- 2 + \ - 15 |+ 2 + -16 16 | 7) + \ -17 17 | 4 -18 18 | +12 | +13 | z = 5 + \ +14 | (3 -\ + - 2 + \ +15 + 2 + +16 | 7) + \ +17 | 4 +18 | E502 [*] Redundant backslash --> E502.py:23:17 @@ -96,16 +88,14 @@ E502 [*] Redundant backslash 25 | - 5 | help: Remove redundant backslash - -ℹ Safe fix -20 20 | 2] -21 21 | -22 22 | b = [ -23 |- 2 + 4 + 5 + \ - 23 |+ 2 + 4 + 5 + -24 24 | 44 \ -25 25 | - 5 -26 26 | ] +20 | 2] +21 | +22 | b = [ + - 2 + 4 + 5 + \ +23 + 2 + 4 + 5 + +24 | 44 \ +25 | - 5 +26 | ] E502 [*] Redundant backslash --> E502.py:24:8 @@ -118,16 +108,14 @@ E502 [*] Redundant backslash 26 | ] | help: Remove redundant backslash - -ℹ Safe fix -21 21 | -22 22 | b = [ -23 23 | 2 + 4 + 5 + \ -24 |- 44 \ - 24 |+ 44 -25 25 | - 5 -26 26 | ] -27 27 | +21 | +22 | b = [ +23 | 2 + 4 + 5 + \ + - 44 \ +24 + 44 +25 | - 5 +26 | ] +27 | E502 [*] Redundant backslash --> E502.py:29:11 @@ -139,16 +127,14 @@ E502 [*] Redundant backslash 31 | and True \ | help: Remove redundant backslash - -ℹ Safe fix -26 26 | ] -27 27 | -28 28 | c = (True and -29 |- False \ - 29 |+ False -30 30 | or False \ -31 31 | and True \ -32 32 | ) +26 | ] +27 | +28 | c = (True and + - False \ +29 + False +30 | or False \ +31 | and True \ +32 | ) E502 [*] Redundant backslash --> E502.py:30:14 @@ -161,16 +147,14 @@ E502 [*] Redundant backslash 32 | ) | help: Remove redundant backslash - -ℹ Safe fix -27 27 | -28 28 | c = (True and -29 29 | False \ -30 |- or False \ - 30 |+ or False -31 31 | and True \ -32 32 | ) -33 33 | +27 | +28 | c = (True and +29 | False \ + - or False \ +30 + or False +31 | and True \ +32 | ) +33 | E502 [*] Redundant backslash --> E502.py:31:14 @@ -182,16 +166,14 @@ E502 [*] Redundant backslash 32 | ) | help: Remove redundant backslash - -ℹ Safe fix -28 28 | c = (True and -29 29 | False \ -30 30 | or False \ -31 |- and True \ - 31 |+ and True -32 32 | ) -33 33 | -34 34 | c = (True and +28 | c = (True and +29 | False \ +30 | or False \ + - and True \ +31 + and True +32 | ) +33 | +34 | c = (True and E502 [*] Redundant backslash --> E502.py:44:14 @@ -203,16 +185,14 @@ E502 [*] Redundant backslash 46 | } | help: Remove redundant backslash - -ℹ Safe fix -41 41 | -42 42 | -43 43 | s = { -44 |- 'x': 2 + \ - 44 |+ 'x': 2 + -45 45 | 2 -46 46 | } -47 47 | +41 | +42 | +43 | s = { + - 'x': 2 + \ +44 + 'x': 2 + +45 | 2 +46 | } +47 | E502 [*] Redundant backslash --> E502.py:55:12 @@ -222,16 +202,14 @@ E502 [*] Redundant backslash 56 | + 3} | help: Remove redundant backslash - -ℹ Safe fix -52 52 | } -53 53 | -54 54 | -55 |-x = {2 + 4 \ - 55 |+x = {2 + 4 -56 56 | + 3} -57 57 | -58 58 | y = ( +52 | } +53 | +54 | + - x = {2 + 4 \ +55 + x = {2 + 4 +56 | + 3} +57 | +58 | y = ( E502 [*] Redundant backslash --> E502.py:61:9 @@ -244,16 +222,14 @@ E502 [*] Redundant backslash 63 | ) | help: Remove redundant backslash - -ℹ Safe fix -58 58 | y = ( -59 59 | 2 + 2 # \ -60 60 | + 3 # \ -61 |- + 4 \ - 61 |+ + 4 -62 62 | + 3 -63 63 | ) -64 64 | +58 | y = ( +59 | 2 + 2 # \ +60 | + 3 # \ + - + 4 \ +61 + + 4 +62 | + 3 +63 | ) +64 | E502 [*] Redundant backslash --> E502.py:82:12 @@ -265,16 +241,14 @@ E502 [*] Redundant backslash 83 | "xyz") | help: Remove redundant backslash - -ℹ Safe fix -79 79 | x = "abc" \ -80 80 | "xyz" -81 81 | -82 |-x = ("abc" \ - 82 |+x = ("abc" -83 83 | "xyz") -84 84 | -85 85 | +79 | x = "abc" \ +80 | "xyz" +81 | + - x = ("abc" \ +82 + x = ("abc" +83 | "xyz") +84 | +85 | E502 [*] Redundant backslash --> E502.py:87:14 @@ -285,11 +259,9 @@ E502 [*] Redundant backslash 88 | 2) | help: Remove redundant backslash - -ℹ Safe fix -84 84 | -85 85 | -86 86 | def foo(): -87 |- x = (a + \ - 87 |+ x = (a + -88 88 | 2) +84 | +85 | +86 | def foo(): + - x = (a + \ +87 + x = (a + +88 | 2) diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap index 5f15f1f97c..b13fb973a2 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391.ipynb.snap @@ -14,17 +14,15 @@ W391 [*] Too many newlines at end of cell 9 | 1 + 1 | help: Remove trailing newlines - -ℹ Safe fix -3 3 | # just a comment in this cell -4 4 | # a comment and some newlines -5 5 | -6 |- -7 |- -8 |- -9 6 | 1 + 1 -10 7 | # a comment -11 8 | +3 | # just a comment in this cell +4 | # a comment and some newlines +5 | + - + - + - +6 | 1 + 1 +7 | # a comment +8 | W391 [*] Too many newlines at end of cell --> W391.ipynb:11:1 @@ -40,18 +38,16 @@ W391 [*] Too many newlines at end of cell 16 | 1+1 | help: Remove trailing newlines - -ℹ Safe fix -9 9 | 1 + 1 -10 10 | # a comment -11 11 | -12 |- -13 |- -14 |- -15 |- -16 12 | 1+1 -17 13 | -18 14 | +9 | 1 + 1 +10 | # a comment +11 | + - + - + - + - +12 | 1+1 +13 | +14 | W391 [*] Too many newlines at end of cell --> W391.ipynb:17:1 @@ -64,12 +60,10 @@ W391 [*] Too many newlines at end of cell | |__^ | help: Remove trailing newlines - -ℹ Safe fix -15 15 | -16 16 | 1+1 -17 17 | -18 |- -19 |- -20 |- -21 |- +15 | +16 | 1+1 +17 | + - + - + - + - diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap index 770754ec50..4a41503307 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_0.py.snap @@ -10,9 +10,7 @@ W391 [*] Extra newline at end of file | ^ | help: Remove trailing newline - -ℹ Safe fix -11 11 | if __name__ == '__main__': -12 12 | foo() -13 13 | bar() -14 |- +11 | if __name__ == '__main__': +12 | foo() +13 | bar() + - diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap index 4fee49f2de..9ea457b532 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__preview__W391_W391_2.py.snap @@ -13,12 +13,10 @@ W391 [*] Too many newlines at end of file | |__^ | help: Remove trailing newlines - -ℹ Safe fix -11 11 | if __name__ == '__main__': -12 12 | foo() -13 13 | bar() -14 |- -15 |- -16 |- -17 |- +11 | if __name__ == '__main__': +12 | foo() +13 | bar() + - + - + - + - diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap index fd26c27315..e1442beb98 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__shebang.snap @@ -11,10 +11,8 @@ E265 [*] Block comment should start with `# ` 4 | #: | help: Format space - -ℹ Safe fix -1 1 | #!/usr/bin/python -2 2 | # -3 |-#! - 3 |+# ! -4 4 | #: +1 | #!/usr/bin/python +2 | # + - #! +3 + # ! +4 | #: diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap index 1e0642addf..da17003370 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap @@ -12,15 +12,13 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import json -2 |- -3 |- -4 |- -5 2 | from typing import Any, Sequence -6 3 | -7 4 | +1 | import json + - + - + - +2 | from typing import Any, Sequence +3 | +4 | E303 [*] Too many blank lines (3) --> E30_isort.py:5:1 @@ -29,15 +27,13 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | import json -2 2 | -3 3 | -4 |- -5 4 | from typing import Any, Sequence -6 5 | -7 6 | +1 | import json +2 | +3 | + - +4 | from typing import Any, Sequence +5 | +6 | E303 [*] Too many blank lines (2) --> E30_isort.py:21:5 @@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2) 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... | help: Remove extraneous blank line(s) - -ℹ Safe fix -17 17 | if __name__ == "__main__": -18 18 | import abcd -19 19 | -20 |- -21 20 | abcd.foo() -22 21 | -23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +17 | if __name__ == "__main__": +18 | import abcd +19 | + - +20 | abcd.foo() +21 | +22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -70,16 +64,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (3) --> E30_isort.py:30:5 @@ -88,16 +80,14 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (2) --> E30_isort.py:33:5 @@ -108,15 +98,13 @@ E303 [*] Too many blank lines (2) 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: | help: Remove extraneous blank line(s) - -ℹ Safe fix -29 29 | -30 30 | from typing_extensions import TypeAlias -31 31 | -32 |- -33 32 | abcd.foo() -34 33 | -35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +29 | +30 | from typing_extensions import TypeAlias +31 | + - +32 | abcd.foo() +33 | +34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:60:1 @@ -127,10 +115,8 @@ I001 [*] Import block is un-sorted or un-formatted 62 | class MissingCommand(TypeError): ... # noqa: N818 | help: Organize imports - -ℹ Safe fix -59 59 | -60 60 | from typing import Any, Sequence -61 61 | - 62 |+ -62 63 | class MissingCommand(TypeError): ... # noqa: N818 +59 | +60 | from typing import Any, Sequence +61 | +62 + +63 | class MissingCommand(TypeError): ... # noqa: N818 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap index 395cce3697..69b9af9459 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap @@ -12,18 +12,16 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import json -2 |- -3 |- -4 |- -5 2 | from typing import Any, Sequence -6 |- -7 |- -8 3 | class MissingCommand(TypeError): ... # noqa: N818 -9 4 | -10 5 | +1 | import json + - + - + - +2 | from typing import Any, Sequence + - + - +3 | class MissingCommand(TypeError): ... # noqa: N818 +4 | +5 | E303 [*] Too many blank lines (3) --> E30_isort.py:5:1 @@ -32,15 +30,13 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | import json -2 2 | -3 3 | -4 |- -5 4 | from typing import Any, Sequence -6 5 | -7 6 | +1 | import json +2 | +3 | + - +4 | from typing import Any, Sequence +5 | +6 | E303 [*] Too many blank lines (2) --> E30_isort.py:8:1 @@ -49,16 +45,14 @@ E303 [*] Too many blank lines (2) | ^^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -3 3 | -4 4 | -5 5 | from typing import Any, Sequence -6 |- -7 |- -8 6 | class MissingCommand(TypeError): ... # noqa: N818 -9 7 | -10 8 | +3 | +4 | +5 | from typing import Any, Sequence + - + - +6 | class MissingCommand(TypeError): ... # noqa: N818 +7 | +8 | E303 [*] Too many blank lines (2) --> E30_isort.py:21:5 @@ -69,15 +63,13 @@ E303 [*] Too many blank lines (2) 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... | help: Remove extraneous blank line(s) - -ℹ Safe fix -17 17 | if __name__ == "__main__": -18 18 | import abcd -19 19 | -20 |- -21 20 | abcd.foo() -22 21 | -23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +17 | if __name__ == "__main__": +18 | import abcd +19 | + - +20 | abcd.foo() +21 | +22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -91,16 +83,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (3) --> E30_isort.py:30:5 @@ -109,16 +99,14 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (2) --> E30_isort.py:33:5 @@ -129,15 +117,13 @@ E303 [*] Too many blank lines (2) 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: | help: Remove extraneous blank line(s) - -ℹ Safe fix -29 29 | -30 30 | from typing_extensions import TypeAlias -31 31 | -32 |- -33 32 | abcd.foo() -34 33 | -35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +29 | +30 | from typing_extensions import TypeAlias +31 | + - +32 | abcd.foo() +33 | +34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:60:1 @@ -148,13 +134,11 @@ I001 [*] Import block is un-sorted or un-formatted 62 | class MissingCommand(TypeError): ... # noqa: N818 | help: Organize imports - -ℹ Safe fix -58 58 | -59 59 | -60 60 | from typing import Any, Sequence -61 |- -62 61 | class MissingCommand(TypeError): ... # noqa: N818 +58 | +59 | +60 | from typing import Any, Sequence + - +61 | class MissingCommand(TypeError): ... # noqa: N818 E303 [*] Too many blank lines (1) --> E30_isort.py:62:1 @@ -165,10 +149,8 @@ E303 [*] Too many blank lines (1) | ^^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -58 58 | -59 59 | -60 60 | from typing import Any, Sequence -61 |- -62 61 | class MissingCommand(TypeError): ... # noqa: N818 +58 | +59 | +60 | from typing import Any, Sequence + - +61 | class MissingCommand(TypeError): ... # noqa: N818 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap index 7e3f1d9486..53ef02507b 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap @@ -12,17 +12,15 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -1 1 | import json -2 2 | -3 |- -4 |- -5 3 | from typing import Any, Sequence -6 |- -7 4 | -8 5 | class MissingCommand(TypeError): ... # noqa: N818 -9 6 | +1 | import json +2 | + - + - +3 | from typing import Any, Sequence + - +4 | +5 | class MissingCommand(TypeError): ... # noqa: N818 +6 | E303 [*] Too many blank lines (3) --> E30_isort.py:5:1 @@ -31,15 +29,13 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -1 1 | import json -2 2 | -3 3 | -4 |- -5 4 | from typing import Any, Sequence -6 5 | -7 6 | +1 | import json +2 | +3 | + - +4 | from typing import Any, Sequence +5 | +6 | E303 [*] Too many blank lines (2) --> E30_isort.py:8:1 @@ -48,15 +44,13 @@ E303 [*] Too many blank lines (2) | ^^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -4 4 | -5 5 | from typing import Any, Sequence -6 6 | -7 |- -8 7 | class MissingCommand(TypeError): ... # noqa: N818 -9 8 | -10 9 | +4 | +5 | from typing import Any, Sequence +6 | + - +7 | class MissingCommand(TypeError): ... # noqa: N818 +8 | +9 | E303 [*] Too many blank lines (2) --> E30_isort.py:21:5 @@ -67,15 +61,13 @@ E303 [*] Too many blank lines (2) 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... | help: Remove extraneous blank line(s) - -ℹ Safe fix -17 17 | if __name__ == "__main__": -18 18 | import abcd -19 19 | -20 |- -21 20 | abcd.foo() -22 21 | -23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +17 | if __name__ == "__main__": +18 | import abcd +19 | + - +20 | abcd.foo() +21 | +22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -89,16 +81,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (3) --> E30_isort.py:30:5 @@ -107,16 +97,14 @@ E303 [*] Too many blank lines (3) | ^^^^ | help: Remove extraneous blank line(s) - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (2) --> E30_isort.py:33:5 @@ -127,12 +115,10 @@ E303 [*] Too many blank lines (2) 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: | help: Remove extraneous blank line(s) - -ℹ Safe fix -29 29 | -30 30 | from typing_extensions import TypeAlias -31 31 | -32 |- -33 32 | abcd.foo() -34 33 | -35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +29 | +30 | from typing_extensions import TypeAlias +31 | + - +32 | abcd.foo() +33 | +34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap index 78d8e3cc24..a754ff752f 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap @@ -12,20 +12,18 @@ I001 [*] Import block is un-sorted or un-formatted | |________________________________^ | help: Organize imports - -ℹ Safe fix -2 2 | -3 3 | -4 4 | - 5 |+ -5 6 | from typing import Any, Sequence -6 7 | -7 8 | - 9 |+ - 10 |+ -8 11 | class MissingCommand(TypeError): ... # noqa: N818 -9 12 | -10 13 | +2 | +3 | +4 | +5 + +6 | from typing import Any, Sequence +7 | +8 | +9 + +10 + +11 | class MissingCommand(TypeError): ... # noqa: N818 +12 | +13 | E303 [*] Too many blank lines (2) --> E30_isort.py:21:5 @@ -36,15 +34,13 @@ E303 [*] Too many blank lines (2) 23 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... | help: Remove extraneous blank line(s) - -ℹ Safe fix -17 17 | if __name__ == "__main__": -18 18 | import abcd -19 19 | -20 |- -21 20 | abcd.foo() -22 21 | -23 22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... +17 | if __name__ == "__main__": +18 | import abcd +19 | + - +20 | abcd.foo() +21 | +22 | def __init__(self, backend_module: str, backend_obj: str | None) -> None: ... I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:26:5 @@ -58,16 +54,14 @@ I001 [*] Import block is un-sorted or un-formatted | |___________________________________________^ | help: Organize imports - -ℹ Safe fix -25 25 | if TYPE_CHECKING: -26 26 | import os -27 27 | -28 |- -29 |- -30 28 | from typing_extensions import TypeAlias -31 29 | -32 30 | +25 | if TYPE_CHECKING: +26 | import os +27 | + - + - +28 | from typing_extensions import TypeAlias +29 | +30 | E303 [*] Too many blank lines (2) --> E30_isort.py:33:5 @@ -78,15 +72,13 @@ E303 [*] Too many blank lines (2) 35 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: | help: Remove extraneous blank line(s) - -ℹ Safe fix -29 29 | -30 30 | from typing_extensions import TypeAlias -31 31 | -32 |- -33 32 | abcd.foo() -34 33 | -35 34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: +29 | +30 | from typing_extensions import TypeAlias +31 | + - +32 | abcd.foo() +33 | +34 | def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any: I001 [*] Import block is un-sorted or un-formatted --> E30_isort.py:60:1 @@ -97,12 +89,10 @@ I001 [*] Import block is un-sorted or un-formatted 62 | class MissingCommand(TypeError): ... # noqa: N818 | help: Organize imports - -ℹ Safe fix -59 59 | -60 60 | from typing import Any, Sequence -61 61 | - 62 |+ - 63 |+ - 64 |+ -62 65 | class MissingCommand(TypeError): ... # noqa: N818 +59 | +60 | from typing import Any, Sequence +61 | +62 + +63 + +64 + +65 | class MissingCommand(TypeError): ... # noqa: N818 diff --git a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap index 807eabd09c..40ece69f5b 100644 --- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap +++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__w292_4.snap @@ -8,7 +8,5 @@ W292 [*] No newline at end of file | ^ | help: Add trailing newline - -ℹ Safe fix -1 |- - 1 |+ + - +1 + diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap index 89eb2e2bb2..513311b656 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D.py.snap @@ -12,18 +12,17 @@ D200 [*] One-line docstring should fit on one line | |_______^ | help: Reformat to one line - -ℹ Unsafe fix -126 126 | '(found 3)') -127 127 | @expect('D212: Multi-line docstring summary should start at the first line') -128 128 | def asdlkfasd(): -129 |- """ -130 |- Wrong. -131 |- """ - 129 |+ """Wrong.""" -132 130 | -133 131 | -134 132 | @expect('D201: No blank lines allowed before function docstring (found 1)') +126 | '(found 3)') +127 | @expect('D212: Multi-line docstring summary should start at the first line') +128 | def asdlkfasd(): + - """ + - Wrong. + - """ +129 + """Wrong.""" +130 | +131 | +132 | @expect('D201: No blank lines allowed before function docstring (found 1)') +note: This is an unsafe fix and may change runtime behavior D200 [*] One-line docstring should fit on one line --> D.py:597:5 @@ -36,18 +35,17 @@ D200 [*] One-line docstring should fit on one line | |_____________^ | help: Reformat to one line - -ℹ Unsafe fix -594 594 | '(found 3)') -595 595 | @expect('D212: Multi-line docstring summary should start at the first line') -596 596 | def one_liner(): -597 |- """ -598 |- -599 |- Wrong.""" - 597 |+ """Wrong.""" -600 598 | -601 599 | -602 600 | @expect('D200: One-line docstring should fit on one line with quotes ' +594 | '(found 3)') +595 | @expect('D212: Multi-line docstring summary should start at the first line') +596 | def one_liner(): + - """ + - + - Wrong.""" +597 + """Wrong.""" +598 | +599 | +600 | @expect('D200: One-line docstring should fit on one line with quotes ' +note: This is an unsafe fix and may change runtime behavior D200 [*] One-line docstring should fit on one line --> D.py:606:5 @@ -60,18 +58,17 @@ D200 [*] One-line docstring should fit on one line | |_______^ | help: Reformat to one line - -ℹ Unsafe fix -603 603 | '(found 3)') -604 604 | @expect('D212: Multi-line docstring summary should start at the first line') -605 605 | def one_liner(): -606 |- r"""Wrong. -607 |- -608 |- """ - 606 |+ r"""Wrong.""" -609 607 | -610 608 | -611 609 | @expect('D200: One-line docstring should fit on one line with quotes ' +603 | '(found 3)') +604 | @expect('D212: Multi-line docstring summary should start at the first line') +605 | def one_liner(): + - r"""Wrong. + - + - """ +606 + r"""Wrong.""" +607 | +608 | +609 | @expect('D200: One-line docstring should fit on one line with quotes ' +note: This is an unsafe fix and may change runtime behavior D200 One-line docstring should fit on one line --> D.py:615:5 diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap index 0ab129407c..958ce017b1 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D200_D200.py.snap @@ -20,17 +20,16 @@ D200 [*] One-line docstring should fit on one line | |_______^ | help: Reformat to one line - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | def func(): -7 |- """\\ -8 |- """ - 7 |+ """\\""" -9 8 | -10 9 | -11 10 | def func(): +4 | +5 | +6 | def func(): + - """\\ + - """ +7 + """\\""" +8 | +9 | +10 | def func(): +note: This is an unsafe fix and may change runtime behavior D200 One-line docstring should fit on one line --> D200.py:12:5 diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap index 552f29e140..ed526eeae3 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D201_D.py.snap @@ -10,15 +10,13 @@ D201 [*] No blank lines allowed before function docstring (found 1) | ^^^^^^^^^^^^^^^^^^^^ | help: Remove blank line(s) before function docstring - -ℹ Safe fix -133 133 | -134 134 | @expect('D201: No blank lines allowed before function docstring (found 1)') -135 135 | def leading_space(): -136 |- -137 136 | """Leading space.""" -138 137 | -139 138 | +133 | +134 | @expect('D201: No blank lines allowed before function docstring (found 1)') +135 | def leading_space(): + - +136 | """Leading space.""" +137 | +138 | D201 [*] No blank lines allowed before function docstring (found 1) --> D.py:151:5 @@ -31,15 +29,13 @@ D201 [*] No blank lines allowed before function docstring (found 1) 153 | pass | help: Remove blank line(s) before function docstring - -ℹ Safe fix -147 147 | @expect('D201: No blank lines allowed before function docstring (found 1)') -148 148 | @expect('D202: No blank lines allowed after function docstring (found 1)') -149 149 | def trailing_and_leading_space(): -150 |- -151 150 | """Trailing and leading space.""" -152 151 | -153 152 | pass +147 | @expect('D201: No blank lines allowed before function docstring (found 1)') +148 | @expect('D202: No blank lines allowed after function docstring (found 1)') +149 | def trailing_and_leading_space(): + - +150 | """Trailing and leading space.""" +151 | +152 | pass D201 [*] No blank lines allowed before function docstring (found 1) --> D.py:546:5 @@ -53,15 +49,13 @@ D201 [*] No blank lines allowed before function docstring (found 1) | |_______^ | help: Remove blank line(s) before function docstring - -ℹ Safe fix -542 542 | @expect('D201: No blank lines allowed before function docstring (found 1)') -543 543 | @expect('D213: Multi-line docstring summary should start at the second line') -544 544 | def multiline_leading_space(): -545 |- -546 545 | """Leading space. -547 546 | -548 547 | More content. +542 | @expect('D201: No blank lines allowed before function docstring (found 1)') +543 | @expect('D213: Multi-line docstring summary should start at the second line') +544 | def multiline_leading_space(): + - +545 | """Leading space. +546 | +547 | More content. D201 [*] No blank lines allowed before function docstring (found 1) --> D.py:568:5 @@ -77,15 +71,13 @@ D201 [*] No blank lines allowed before function docstring (found 1) 573 | pass | help: Remove blank line(s) before function docstring - -ℹ Safe fix -564 564 | @expect('D202: No blank lines allowed after function docstring (found 1)') -565 565 | @expect('D213: Multi-line docstring summary should start at the second line') -566 566 | def multiline_trailing_and_leading_space(): -567 |- -568 567 | """Trailing and leading space. -569 568 | -570 569 | More content. +564 | @expect('D202: No blank lines allowed after function docstring (found 1)') +565 | @expect('D213: Multi-line docstring summary should start at the second line') +566 | def multiline_trailing_and_leading_space(): + - +567 | """Trailing and leading space. +568 | +569 | More content. D201 No blank lines allowed before function docstring (found 1) --> D.py:729:5 diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap index c41685f416..2618e6444c 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D.py.snap @@ -12,15 +12,13 @@ D202 [*] No blank lines allowed after function docstring (found 1) 144 | pass | help: Remove blank line(s) after function docstring - -ℹ Safe fix -140 140 | @expect('D202: No blank lines allowed after function docstring (found 1)') -141 141 | def trailing_space(): -142 142 | """Leading space.""" -143 |- -144 143 | pass -145 144 | -146 145 | +140 | @expect('D202: No blank lines allowed after function docstring (found 1)') +141 | def trailing_space(): +142 | """Leading space.""" + - +143 | pass +144 | +145 | D202 [*] No blank lines allowed after function docstring (found 1) --> D.py:151:5 @@ -33,15 +31,13 @@ D202 [*] No blank lines allowed after function docstring (found 1) 153 | pass | help: Remove blank line(s) after function docstring - -ℹ Safe fix -149 149 | def trailing_and_leading_space(): -150 150 | -151 151 | """Trailing and leading space.""" -152 |- -153 152 | pass -154 153 | -155 154 | +149 | def trailing_and_leading_space(): +150 | +151 | """Trailing and leading space.""" + - +152 | pass +153 | +154 | D202 [*] No blank lines allowed after function docstring (found 1) --> D.py:555:5 @@ -57,15 +53,13 @@ D202 [*] No blank lines allowed after function docstring (found 1) 560 | pass | help: Remove blank line(s) after function docstring - -ℹ Safe fix -556 556 | -557 557 | More content. -558 558 | """ -559 |- -560 559 | pass -561 560 | -562 561 | +556 | +557 | More content. +558 | """ + - +559 | pass +560 | +561 | D202 [*] No blank lines allowed after function docstring (found 1) --> D.py:568:5 @@ -81,15 +75,13 @@ D202 [*] No blank lines allowed after function docstring (found 1) 573 | pass | help: Remove blank line(s) after function docstring - -ℹ Safe fix -569 569 | -570 570 | More content. -571 571 | """ -572 |- -573 572 | pass -574 573 | -575 574 | +569 | +570 | More content. +571 | """ + - +572 | pass +573 | +574 | D202 No blank lines allowed after function docstring (found 1) --> D.py:729:5 diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap index 2212f54da7..b9c607d3b7 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D202_D202.py.snap @@ -10,16 +10,14 @@ D202 [*] No blank lines allowed after function docstring (found 2) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove blank line(s) after function docstring - -ℹ Safe fix -55 55 | # D202 -56 56 | def outer(): -57 57 | """This is a docstring.""" -58 |- -59 |- -60 58 | def inner(): -61 59 | return -62 60 | +55 | # D202 +56 | def outer(): +57 | """This is a docstring.""" + - + - +58 | def inner(): +59 | return +60 | D202 [*] No blank lines allowed after function docstring (found 2) --> D202.py:68:5 @@ -30,16 +28,14 @@ D202 [*] No blank lines allowed after function docstring (found 2) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove blank line(s) after function docstring - -ℹ Safe fix -66 66 | # D202 -67 67 | def outer(): -68 68 | """This is a docstring.""" -69 |- -70 |- -71 69 | # This is a comment. -72 70 | def inner(): -73 71 | return +66 | # D202 +67 | def outer(): +68 | """This is a docstring.""" + - + - +69 | # This is a comment. +70 | def inner(): +71 | return D202 [*] No blank lines allowed after function docstring (found 1) --> D202.py:80:5 @@ -52,12 +48,10 @@ D202 [*] No blank lines allowed after function docstring (found 1) 82 | # This is a comment. | help: Remove blank line(s) after function docstring - -ℹ Safe fix -78 78 | # D202 -79 79 | def outer(): -80 80 | """This is a docstring.""" -81 |- -82 81 | # This is a comment. -83 82 | -84 83 | def inner(): +78 | # D202 +79 | def outer(): +80 | """This is a docstring.""" + - +81 | # This is a comment. +82 | +83 | def inner(): diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap index d8aaf746a0..44d0eb9886 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D203_D.py.snap @@ -9,15 +9,13 @@ D203 [*] 1 blank line required before class docstring | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Insert 1 blank line before class docstring - -ℹ Safe fix -158 158 | -159 159 | -160 160 | class LeadingSpaceMissing: - 161 |+ -161 162 | """Leading space missing.""" -162 163 | -163 164 | +158 | +159 | +160 | class LeadingSpaceMissing: +161 + +162 | """Leading space missing.""" +163 | +164 | D203 [*] 1 blank line required before class docstring --> D.py:192:5 @@ -28,15 +26,13 @@ D203 [*] 1 blank line required before class docstring 193 | pass | help: Insert 1 blank line before class docstring - -ℹ Safe fix -189 189 | -190 190 | -191 191 | class LeadingAndTrailingSpaceMissing: - 192 |+ -192 193 | """Leading and trailing space missing.""" -193 194 | pass -194 195 | +189 | +190 | +191 | class LeadingAndTrailingSpaceMissing: +192 + +193 | """Leading and trailing space missing.""" +194 | pass +195 | D203 [*] 1 blank line required before class docstring --> D.py:526:5 @@ -55,15 +51,13 @@ D203 [*] 1 blank line required before class docstring 534 | def __init__(self, x): | help: Insert 1 blank line before class docstring - -ℹ Safe fix -523 523 | # This is reproducing a bug where AttributeError is raised when parsing class -524 524 | # parameters as functions for Google / Numpy conventions. -525 525 | class Blah: # noqa: D203,D213 - 526 |+ -526 527 | """A Blah. -527 528 | -528 529 | Parameters +523 | # This is reproducing a bug where AttributeError is raised when parsing class +524 | # parameters as functions for Google / Numpy conventions. +525 | class Blah: # noqa: D203,D213 +526 + +527 | """A Blah. +528 | +529 | Parameters D203 [*] 1 blank line required before class docstring --> D.py:649:5 @@ -75,15 +69,13 @@ D203 [*] 1 blank line required before class docstring 651 | pass | help: Insert 1 blank line before class docstring - -ℹ Safe fix -646 646 | " -647 647 | -648 648 | class StatementOnSameLineAsDocstring: - 649 |+ -649 650 | "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 -650 651 | def sort_services(self): -651 652 | pass +646 | " +647 | +648 | class StatementOnSameLineAsDocstring: +649 + +650 | "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 +651 | def sort_services(self): +652 | pass D203 [*] 1 blank line required before class docstring --> D.py:654:5 @@ -93,15 +85,13 @@ D203 [*] 1 blank line required before class docstring | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Insert 1 blank line before class docstring - -ℹ Safe fix -651 651 | pass -652 652 | -653 653 | class StatementOnSameLineAsDocstring: - 654 |+ -654 655 | "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1 -655 656 | -656 657 | +651 | pass +652 | +653 | class StatementOnSameLineAsDocstring: +654 + +655 | "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1 +656 | +657 | D203 [*] 1 blank line required before class docstring --> D.py:658:5 @@ -113,12 +103,10 @@ D203 [*] 1 blank line required before class docstring 660 | pass | help: Insert 1 blank line before class docstring - -ℹ Safe fix -655 655 | -656 656 | -657 657 | class CommentAfterDocstring: - 658 |+ -658 659 | "After this docstring there's a comment." # priorities=1 -659 660 | def sort_services(self): -660 661 | pass +655 | +656 | +657 | class CommentAfterDocstring: +658 + +659 | "After this docstring there's a comment." # priorities=1 +660 | def sort_services(self): +661 | pass diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap index 5bdd5f22e7..b5e456a022 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D204_D.py.snap @@ -11,15 +11,13 @@ D204 [*] 1 blank line required after class docstring 182 | pass | help: Insert 1 blank line after class docstring - -ℹ Safe fix -179 179 | class TrailingSpace: -180 180 | -181 181 | """TrailingSpace.""" - 182 |+ -182 183 | pass -183 184 | -184 185 | +179 | class TrailingSpace: +180 | +181 | """TrailingSpace.""" +182 + +183 | pass +184 | +185 | D204 [*] 1 blank line required after class docstring --> D.py:192:5 @@ -30,15 +28,13 @@ D204 [*] 1 blank line required after class docstring 193 | pass | help: Insert 1 blank line after class docstring - -ℹ Safe fix -190 190 | -191 191 | class LeadingAndTrailingSpaceMissing: -192 192 | """Leading and trailing space missing.""" - 193 |+ -193 194 | pass -194 195 | -195 196 | +190 | +191 | class LeadingAndTrailingSpaceMissing: +192 | """Leading and trailing space missing.""" +193 + +194 | pass +195 | +196 | D204 [*] 1 blank line required after class docstring --> D.py:649:5 @@ -50,18 +46,16 @@ D204 [*] 1 blank line required after class docstring 651 | pass | help: Insert 1 blank line after class docstring - -ℹ Safe fix -646 646 | " -647 647 | -648 648 | class StatementOnSameLineAsDocstring: -649 |- "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 - 649 |+ "After this docstring there's another statement on the same line separated by a semicolon." - 650 |+ - 651 |+ priorities=1 -650 652 | def sort_services(self): -651 653 | pass -652 654 | +646 | " +647 | +648 | class StatementOnSameLineAsDocstring: + - "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 +649 + "After this docstring there's another statement on the same line separated by a semicolon." +650 + +651 + priorities=1 +652 | def sort_services(self): +653 | pass +654 | D204 [*] 1 blank line required after class docstring --> D.py:654:5 @@ -71,18 +65,16 @@ D204 [*] 1 blank line required after class docstring | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Insert 1 blank line after class docstring - -ℹ Safe fix -651 651 | pass -652 652 | -653 653 | class StatementOnSameLineAsDocstring: -654 |- "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1 - 654 |+ "After this docstring there's another statement on the same line separated by a semicolon." - 655 |+ - 656 |+ priorities=1 -655 657 | -656 658 | -657 659 | class CommentAfterDocstring: +651 | pass +652 | +653 | class StatementOnSameLineAsDocstring: + - "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1 +654 + "After this docstring there's another statement on the same line separated by a semicolon." +655 + +656 + priorities=1 +657 | +658 | +659 | class CommentAfterDocstring: D204 [*] 1 blank line required after class docstring --> D.py:658:5 @@ -94,12 +86,10 @@ D204 [*] 1 blank line required after class docstring 660 | pass | help: Insert 1 blank line after class docstring - -ℹ Safe fix -656 656 | -657 657 | class CommentAfterDocstring: -658 658 | "After this docstring there's a comment." # priorities=1 - 659 |+ -659 660 | def sort_services(self): -660 661 | pass -661 662 | +656 | +657 | class CommentAfterDocstring: +658 | "After this docstring there's a comment." # priorities=1 +659 + +660 | def sort_services(self): +661 | pass +662 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap index 417c81ed81..671f1a821c 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D205_D.py.snap @@ -28,12 +28,10 @@ D205 [*] 1 blank line required between summary line and description (found 2) | |_______^ | help: Insert single blank line - -ℹ Safe fix -209 209 | def multi_line_two_separating_blanks(): -210 210 | """Summary. -211 211 | -212 |- -213 212 | Description. -214 213 | -215 214 | """ +209 | def multi_line_two_separating_blanks(): +210 | """Summary. +211 | + - +212 | Description. +213 | +214 | """ diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap index 0865368e89..9ec1166ab6 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D207_D.py.snap @@ -12,16 +12,14 @@ D207 [*] Docstring is under-indented 234 | """ | help: Increase indentation - -ℹ Safe fix -229 229 | def asdfsdf(): -230 230 | """Summary. -231 231 | -232 |-Description. - 232 |+ Description. -233 233 | -234 234 | """ -235 235 | +229 | def asdfsdf(): +230 | """Summary. +231 | + - Description. +232 + Description. +233 | +234 | """ +235 | D207 [*] Docstring is under-indented --> D.py:244:1 @@ -32,16 +30,14 @@ D207 [*] Docstring is under-indented | ^ | help: Increase indentation - -ℹ Safe fix -241 241 | -242 242 | Description. -243 243 | -244 |-""" - 244 |+ """ -245 245 | -246 246 | -247 247 | @expect('D208: Docstring is over-indented') +241 | +242 | Description. +243 | + - """ +244 + """ +245 | +246 | +247 | @expect('D208: Docstring is over-indented') D207 [*] Docstring is under-indented --> D.py:440:1 @@ -53,16 +49,14 @@ D207 [*] Docstring is under-indented 441 | """ | help: Increase indentation - -ℹ Safe fix -437 437 | @expect('D213: Multi-line docstring summary should start at the second line') -438 438 | def docstring_start_in_same_line(): """First Line. -439 439 | -440 |- Second Line - 440 |+ Second Line -441 441 | """ -442 442 | -443 443 | +437 | @expect('D213: Multi-line docstring summary should start at the second line') +438 | def docstring_start_in_same_line(): """First Line. +439 | + - Second Line +440 + Second Line +441 | """ +442 | +443 | D207 [*] Docstring is under-indented --> D.py:441:1 @@ -72,13 +66,11 @@ D207 [*] Docstring is under-indented | ^ | help: Increase indentation - -ℹ Safe fix -438 438 | def docstring_start_in_same_line(): """First Line. -439 439 | -440 440 | Second Line -441 |- """ - 441 |+ """ -442 442 | -443 443 | -444 444 | def function_with_lambda_arg(x=lambda y: y): +438 | def docstring_start_in_same_line(): """First Line. +439 | +440 | Second Line + - """ +441 + """ +442 | +443 | +444 | def function_with_lambda_arg(x=lambda y: y): diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap index c54989a221..32ec2acd7e 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D.py.snap @@ -12,16 +12,14 @@ D208 [*] Docstring is over-indented 254 | """ | help: Remove over-indentation - -ℹ Safe fix -249 249 | def asdfsdsdf24(): -250 250 | """Summary. -251 251 | -252 |- Description. - 252 |+ Description. -253 253 | -254 254 | """ -255 255 | +249 | def asdfsdsdf24(): +250 | """Summary. +251 | + - Description. +252 + Description. +253 | +254 | """ +255 | D208 [*] Docstring is over-indented --> D.py:264:1 @@ -32,16 +30,14 @@ D208 [*] Docstring is over-indented | ^ | help: Remove over-indentation - -ℹ Safe fix -261 261 | -262 262 | Description. -263 263 | -264 |- """ - 264 |+ """ -265 265 | -266 266 | -267 267 | @expect('D208: Docstring is over-indented') +261 | +262 | Description. +263 | + - """ +264 + """ +265 | +266 | +267 | @expect('D208: Docstring is over-indented') D208 [*] Docstring is over-indented --> D.py:272:1 @@ -54,16 +50,14 @@ D208 [*] Docstring is over-indented 274 | """ | help: Remove over-indentation - -ℹ Safe fix -269 269 | def asdfsdfsdsdsdfsdf24(): -270 270 | """Summary. -271 271 | -272 |- Description. - 272 |+ Description. -273 273 | -274 274 | """ -275 275 | +269 | def asdfsdfsdsdsdfsdf24(): +270 | """Summary. +271 | + - Description. +272 + Description. +273 | +274 | """ +275 | D208 [*] Docstring is over-indented --> D.py:673:1 @@ -76,16 +70,14 @@ D208 [*] Docstring is over-indented 675 | to the one before | help: Remove over-indentation - -ℹ Safe fix -670 670 | def retain_extra_whitespace(): -671 671 | """Summary. -672 672 | -673 |- This is overindented - 673 |+ This is overindented -674 674 | And so is this, but it we should preserve the extra space on this line relative -675 675 | to the one before -676 676 | """ +670 | def retain_extra_whitespace(): +671 | """Summary. +672 | + - This is overindented +673 + This is overindented +674 | And so is this, but it we should preserve the extra space on this line relative +675 | to the one before +676 | """ D208 [*] Docstring is over-indented --> D.py:674:1 @@ -97,16 +89,14 @@ D208 [*] Docstring is over-indented 676 | """ | help: Remove over-indentation - -ℹ Safe fix -671 671 | """Summary. -672 672 | -673 673 | This is overindented -674 |- And so is this, but it we should preserve the extra space on this line relative - 674 |+ And so is this, but it we should preserve the extra space on this line relative -675 675 | to the one before -676 676 | """ -677 677 | +671 | """Summary. +672 | +673 | This is overindented + - And so is this, but it we should preserve the extra space on this line relative +674 + And so is this, but it we should preserve the extra space on this line relative +675 | to the one before +676 | """ +677 | D208 [*] Docstring is over-indented --> D.py:675:1 @@ -118,16 +108,14 @@ D208 [*] Docstring is over-indented 676 | """ | help: Remove over-indentation - -ℹ Safe fix -672 672 | -673 673 | This is overindented -674 674 | And so is this, but it we should preserve the extra space on this line relative -675 |- to the one before - 675 |+ to the one before -676 676 | """ -677 677 | -678 678 | +672 | +673 | This is overindented +674 | And so is this, but it we should preserve the extra space on this line relative + - to the one before +675 + to the one before +676 | """ +677 | +678 | D208 [*] Docstring is over-indented --> D.py:682:1 @@ -140,16 +128,14 @@ D208 [*] Docstring is over-indented 684 | to the one before | help: Remove over-indentation - -ℹ Safe fix -679 679 | def retain_extra_whitespace_multiple(): -680 680 | """Summary. -681 681 | -682 |- This is overindented - 682 |+ This is overindented -683 683 | And so is this, but it we should preserve the extra space on this line relative -684 684 | to the one before -685 685 | This is also overindented +679 | def retain_extra_whitespace_multiple(): +680 | """Summary. +681 | + - This is overindented +682 + This is overindented +683 | And so is this, but it we should preserve the extra space on this line relative +684 | to the one before +685 | This is also overindented D208 [*] Docstring is over-indented --> D.py:683:1 @@ -161,16 +147,14 @@ D208 [*] Docstring is over-indented 685 | This is also overindented | help: Remove over-indentation - -ℹ Safe fix -680 680 | """Summary. -681 681 | -682 682 | This is overindented -683 |- And so is this, but it we should preserve the extra space on this line relative - 683 |+ And so is this, but it we should preserve the extra space on this line relative -684 684 | to the one before -685 685 | This is also overindented -686 686 | And so is this, but it we should preserve the extra space on this line relative +680 | """Summary. +681 | +682 | This is overindented + - And so is this, but it we should preserve the extra space on this line relative +683 + And so is this, but it we should preserve the extra space on this line relative +684 | to the one before +685 | This is also overindented +686 | And so is this, but it we should preserve the extra space on this line relative D208 [*] Docstring is over-indented --> D.py:684:1 @@ -183,16 +167,14 @@ D208 [*] Docstring is over-indented 686 | And so is this, but it we should preserve the extra space on this line relative | help: Remove over-indentation - -ℹ Safe fix -681 681 | -682 682 | This is overindented -683 683 | And so is this, but it we should preserve the extra space on this line relative -684 |- to the one before - 684 |+ to the one before -685 685 | This is also overindented -686 686 | And so is this, but it we should preserve the extra space on this line relative -687 687 | to the one before +681 | +682 | This is overindented +683 | And so is this, but it we should preserve the extra space on this line relative + - to the one before +684 + to the one before +685 | This is also overindented +686 | And so is this, but it we should preserve the extra space on this line relative +687 | to the one before D208 [*] Docstring is over-indented --> D.py:685:1 @@ -205,16 +187,14 @@ D208 [*] Docstring is over-indented 687 | to the one before | help: Remove over-indentation - -ℹ Safe fix -682 682 | This is overindented -683 683 | And so is this, but it we should preserve the extra space on this line relative -684 684 | to the one before -685 |- This is also overindented - 685 |+ This is also overindented -686 686 | And so is this, but it we should preserve the extra space on this line relative -687 687 | to the one before -688 688 | """ +682 | This is overindented +683 | And so is this, but it we should preserve the extra space on this line relative +684 | to the one before + - This is also overindented +685 + This is also overindented +686 | And so is this, but it we should preserve the extra space on this line relative +687 | to the one before +688 | """ D208 [*] Docstring is over-indented --> D.py:686:1 @@ -227,16 +207,14 @@ D208 [*] Docstring is over-indented 688 | """ | help: Remove over-indentation - -ℹ Safe fix -683 683 | And so is this, but it we should preserve the extra space on this line relative -684 684 | to the one before -685 685 | This is also overindented -686 |- And so is this, but it we should preserve the extra space on this line relative - 686 |+ And so is this, but it we should preserve the extra space on this line relative -687 687 | to the one before -688 688 | """ -689 689 | +683 | And so is this, but it we should preserve the extra space on this line relative +684 | to the one before +685 | This is also overindented + - And so is this, but it we should preserve the extra space on this line relative +686 + And so is this, but it we should preserve the extra space on this line relative +687 | to the one before +688 | """ +689 | D208 [*] Docstring is over-indented --> D.py:687:1 @@ -248,16 +226,14 @@ D208 [*] Docstring is over-indented 688 | """ | help: Remove over-indentation - -ℹ Safe fix -684 684 | to the one before -685 685 | This is also overindented -686 686 | And so is this, but it we should preserve the extra space on this line relative -687 |- to the one before - 687 |+ to the one before -688 688 | """ -689 689 | -690 690 | +684 | to the one before +685 | This is also overindented +686 | And so is this, but it we should preserve the extra space on this line relative + - to the one before +687 + to the one before +688 | """ +689 | +690 | D208 [*] Docstring is over-indented --> D.py:695:1 @@ -270,16 +246,14 @@ D208 [*] Docstring is over-indented 697 | to the one before | help: Remove over-indentation - -ℹ Safe fix -692 692 | def retain_extra_whitespace_deeper(): -693 693 | """Summary. -694 694 | -695 |- This is overindented - 695 |+ This is overindented -696 696 | And so is this, but it we should preserve the extra space on this line relative -697 697 | to the one before -698 698 | And the relative indent here should be preserved too +692 | def retain_extra_whitespace_deeper(): +693 | """Summary. +694 | + - This is overindented +695 + This is overindented +696 | And so is this, but it we should preserve the extra space on this line relative +697 | to the one before +698 | And the relative indent here should be preserved too D208 [*] Docstring is over-indented --> D.py:696:1 @@ -291,16 +265,14 @@ D208 [*] Docstring is over-indented 698 | And the relative indent here should be preserved too | help: Remove over-indentation - -ℹ Safe fix -693 693 | """Summary. -694 694 | -695 695 | This is overindented -696 |- And so is this, but it we should preserve the extra space on this line relative - 696 |+ And so is this, but it we should preserve the extra space on this line relative -697 697 | to the one before -698 698 | And the relative indent here should be preserved too -699 699 | """ +693 | """Summary. +694 | +695 | This is overindented + - And so is this, but it we should preserve the extra space on this line relative +696 + And so is this, but it we should preserve the extra space on this line relative +697 | to the one before +698 | And the relative indent here should be preserved too +699 | """ D208 [*] Docstring is over-indented --> D.py:697:1 @@ -313,16 +285,14 @@ D208 [*] Docstring is over-indented 699 | """ | help: Remove over-indentation - -ℹ Safe fix -694 694 | -695 695 | This is overindented -696 696 | And so is this, but it we should preserve the extra space on this line relative -697 |- to the one before - 697 |+ to the one before -698 698 | And the relative indent here should be preserved too -699 699 | """ -700 700 | +694 | +695 | This is overindented +696 | And so is this, but it we should preserve the extra space on this line relative + - to the one before +697 + to the one before +698 | And the relative indent here should be preserved too +699 | """ +700 | D208 [*] Docstring is over-indented --> D.py:698:1 @@ -334,16 +304,14 @@ D208 [*] Docstring is over-indented 699 | """ | help: Remove over-indentation - -ℹ Safe fix -695 695 | This is overindented -696 696 | And so is this, but it we should preserve the extra space on this line relative -697 697 | to the one before -698 |- And the relative indent here should be preserved too - 698 |+ And the relative indent here should be preserved too -699 699 | """ -700 700 | -701 701 | def retain_extra_whitespace_followed_by_same_offset(): +695 | This is overindented +696 | And so is this, but it we should preserve the extra space on this line relative +697 | to the one before + - And the relative indent here should be preserved too +698 + And the relative indent here should be preserved too +699 | """ +700 | +701 | def retain_extra_whitespace_followed_by_same_offset(): D208 [*] Docstring is over-indented --> D.py:704:1 @@ -356,16 +324,14 @@ D208 [*] Docstring is over-indented 706 | This is overindented | help: Remove over-indentation - -ℹ Safe fix -701 701 | def retain_extra_whitespace_followed_by_same_offset(): -702 702 | """Summary. -703 703 | -704 |- This is overindented - 704 |+ This is overindented -705 705 | And so is this, but it we should preserve the extra space on this line relative -706 706 | This is overindented -707 707 | This is overindented +701 | def retain_extra_whitespace_followed_by_same_offset(): +702 | """Summary. +703 | + - This is overindented +704 + This is overindented +705 | And so is this, but it we should preserve the extra space on this line relative +706 | This is overindented +707 | This is overindented D208 [*] Docstring is over-indented --> D.py:705:1 @@ -377,16 +343,14 @@ D208 [*] Docstring is over-indented 707 | This is overindented | help: Remove over-indentation - -ℹ Safe fix -702 702 | """Summary. -703 703 | -704 704 | This is overindented -705 |- And so is this, but it we should preserve the extra space on this line relative - 705 |+ And so is this, but it we should preserve the extra space on this line relative -706 706 | This is overindented -707 707 | This is overindented -708 708 | """ +702 | """Summary. +703 | +704 | This is overindented + - And so is this, but it we should preserve the extra space on this line relative +705 + And so is this, but it we should preserve the extra space on this line relative +706 | This is overindented +707 | This is overindented +708 | """ D208 [*] Docstring is over-indented --> D.py:706:1 @@ -399,16 +363,14 @@ D208 [*] Docstring is over-indented 708 | """ | help: Remove over-indentation - -ℹ Safe fix -703 703 | -704 704 | This is overindented -705 705 | And so is this, but it we should preserve the extra space on this line relative -706 |- This is overindented - 706 |+ This is overindented -707 707 | This is overindented -708 708 | """ -709 709 | +703 | +704 | This is overindented +705 | And so is this, but it we should preserve the extra space on this line relative + - This is overindented +706 + This is overindented +707 | This is overindented +708 | """ +709 | D208 [*] Docstring is over-indented --> D.py:707:1 @@ -420,16 +382,14 @@ D208 [*] Docstring is over-indented 708 | """ | help: Remove over-indentation - -ℹ Safe fix -704 704 | This is overindented -705 705 | And so is this, but it we should preserve the extra space on this line relative -706 706 | This is overindented -707 |- This is overindented - 707 |+ This is overindented -708 708 | """ -709 709 | -710 710 | +704 | This is overindented +705 | And so is this, but it we should preserve the extra space on this line relative +706 | This is overindented + - This is overindented +707 + This is overindented +708 | """ +709 | +710 | D208 [*] Docstring is over-indented --> D.py:723:1 @@ -441,13 +401,11 @@ D208 [*] Docstring is over-indented 724 | """ | help: Remove over-indentation - -ℹ Safe fix -720 720 | def inconsistent_indent_byte_size(): -721 721 | """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080). -722 722 | -723 |-     Returns: - 723 |+ Returns: -724 724 | """ -725 725 | -726 726 | +720 | def inconsistent_indent_byte_size(): +721 | """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080). +722 | + -     Returns: +723 + Returns: +724 | """ +725 | +726 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap index e6a1707a5b..663c3a0b47 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D208_D208.py.snap @@ -10,14 +10,12 @@ D208 [*] Docstring is over-indented 3 | """ | help: Remove over-indentation - -ℹ Safe fix -1 1 | """ -2 |- Author - 2 |+Author -3 3 | """ -4 4 | -5 5 | +1 | """ + - Author +2 + Author +3 | """ +4 | +5 | D208 [*] Docstring is over-indented --> D208.py:8:1 @@ -30,16 +28,14 @@ D208 [*] Docstring is over-indented 10 | """ | help: Remove over-indentation - -ℹ Safe fix -5 5 | -6 6 | class Platform: -7 7 | """ Remove sampler -8 |- Args: - 8 |+ Args: -9 9 |     Returns: -10 10 | """ -11 11 | +5 | +6 | class Platform: +7 | """ Remove sampler + - Args: +8 + Args: +9 |     Returns: +10 | """ +11 | D208 [*] Docstring is over-indented --> D208.py:9:1 @@ -51,16 +47,14 @@ D208 [*] Docstring is over-indented 10 | """ | help: Remove over-indentation - -ℹ Safe fix -6 6 | class Platform: -7 7 | """ Remove sampler -8 8 | Args: -9 |-     Returns: - 9 |+ Returns: -10 10 | """ -11 11 | -12 12 | +6 | class Platform: +7 | """ Remove sampler +8 | Args: + -     Returns: +9 + Returns: +10 | """ +11 | +12 | D208 [*] Docstring is over-indented --> D208.py:10:1 @@ -71,16 +65,14 @@ D208 [*] Docstring is over-indented | ^ | help: Remove over-indentation - -ℹ Safe fix -7 7 | """ Remove sampler -8 8 | Args: -9 9 |     Returns: -10 |- """ - 10 |+ """ -11 11 | -12 12 | -13 13 | def memory_test(): +7 | """ Remove sampler +8 | Args: +9 |     Returns: + - """ +10 + """ +11 | +12 | +13 | def memory_test(): D208 [*] Docstring is over-indented --> D208.py:24:1 @@ -91,16 +83,14 @@ D208 [*] Docstring is over-indented | ^ | help: Remove over-indentation - -ℹ Safe fix -21 21 | """Over indented last line -22 22 | Args: -23 23 | Returns: -24 |- """ - 24 |+ """ -25 25 | -26 26 | -27 27 | class Platform: +21 | """Over indented last line +22 | Args: +23 | Returns: + - """ +24 + """ +25 | +26 | +27 | class Platform: D208 [*] Docstring is over-indented --> D208.py:29:1 @@ -113,16 +103,14 @@ D208 [*] Docstring is over-indented 31 | """ | help: Remove over-indentation - -ℹ Safe fix -26 26 | -27 27 | class Platform: -28 28 | """All lines are over indented including the last containing the closing quotes -29 |- Args: - 29 |+ Args: -30 30 | Returns: -31 31 | """ -32 32 | +26 | +27 | class Platform: +28 | """All lines are over indented including the last containing the closing quotes + - Args: +29 + Args: +30 | Returns: +31 | """ +32 | D208 [*] Docstring is over-indented --> D208.py:30:1 @@ -134,16 +122,14 @@ D208 [*] Docstring is over-indented 31 | """ | help: Remove over-indentation - -ℹ Safe fix -27 27 | class Platform: -28 28 | """All lines are over indented including the last containing the closing quotes -29 29 | Args: -30 |- Returns: - 30 |+ Returns: -31 31 | """ -32 32 | -33 33 | class Platform: +27 | class Platform: +28 | """All lines are over indented including the last containing the closing quotes +29 | Args: + - Returns: +30 + Returns: +31 | """ +32 | +33 | class Platform: D208 [*] Docstring is over-indented --> D208.py:31:1 @@ -156,16 +142,14 @@ D208 [*] Docstring is over-indented 33 | class Platform: | help: Remove over-indentation - -ℹ Safe fix -28 28 | """All lines are over indented including the last containing the closing quotes -29 29 | Args: -30 30 | Returns: -31 |- """ - 31 |+ """ -32 32 | -33 33 | class Platform: -34 34 | """All lines are over indented including the last +28 | """All lines are over indented including the last containing the closing quotes +29 | Args: +30 | Returns: + - """ +31 + """ +32 | +33 | class Platform: +34 | """All lines are over indented including the last D208 [*] Docstring is over-indented --> D208.py:35:1 @@ -177,16 +161,14 @@ D208 [*] Docstring is over-indented 36 | Returns""" | help: Remove over-indentation - -ℹ Safe fix -32 32 | -33 33 | class Platform: -34 34 | """All lines are over indented including the last -35 |- Args: - 35 |+ Args: -36 36 | Returns""" -37 37 | -38 38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line (see next test). Raises D209 +32 | +33 | class Platform: +34 | """All lines are over indented including the last + - Args: +35 + Args: +36 | Returns""" +37 | +38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line (see next test). Raises D209 D208 [*] Docstring is over-indented --> D208.py:36:1 @@ -199,13 +181,11 @@ D208 [*] Docstring is over-indented 38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line (see next test). Raises D209 | help: Remove over-indentation - -ℹ Safe fix -33 33 | class Platform: -34 34 | """All lines are over indented including the last -35 35 | Args: -36 |- Returns""" - 36 |+ Returns""" -37 37 | -38 38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line (see next test). Raises D209 -39 39 | class Platform: +33 | class Platform: +34 | """All lines are over indented including the last +35 | Args: + - Returns""" +36 + Returns""" +37 | +38 | # OK: This doesn't get flagged because it is accepted when the closing quotes are on a separate line (see next test). Raises D209 +39 | class Platform: diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap index fcfd42cb1a..a8616e4c2a 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D209_D.py.snap @@ -12,17 +12,15 @@ D209 [*] Multi-line docstring closing quotes should be on a separate line | |___________________^ | help: Move closing quotes to new line - -ℹ Safe fix -280 280 | def asdfljdf24(): -281 281 | """Summary. -282 282 | -283 |- Description.""" - 283 |+ Description. - 284 |+ """ -284 285 | -285 286 | -286 287 | @expect('D210: No whitespaces allowed surrounding docstring text') +280 | def asdfljdf24(): +281 | """Summary. +282 | + - Description.""" +283 + Description. +284 + """ +285 | +286 | +287 | @expect('D210: No whitespaces allowed surrounding docstring text') D209 [*] Multi-line docstring closing quotes should be on a separate line --> D.py:588:5 @@ -35,14 +33,12 @@ D209 [*] Multi-line docstring closing quotes should be on a separate line | |_____________________^ | help: Move closing quotes to new line - -ℹ Safe fix -587 587 | def asdfljdjgf24(): -588 588 | """Summary. -589 589 | -590 |- Description. """ - 590 |+ Description. - 591 |+ """ -591 592 | -592 593 | -593 594 | @expect('D200: One-line docstring should fit on one line with quotes ' +587 | def asdfljdjgf24(): +588 | """Summary. +589 | + - Description. """ +590 + Description. +591 + """ +592 | +593 | +594 | @expect('D200: One-line docstring should fit on one line with quotes ' diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap index 4a65482cfe..2121af479b 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D210_D.py.snap @@ -10,16 +10,14 @@ D210 [*] No whitespaces allowed surrounding docstring text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Trim surrounding whitespace - -ℹ Safe fix -285 285 | -286 286 | @expect('D210: No whitespaces allowed surrounding docstring text') -287 287 | def endswith(): -288 |- """Whitespace at the end. """ - 288 |+ """Whitespace at the end.""" -289 289 | -290 290 | -291 291 | @expect('D210: No whitespaces allowed surrounding docstring text') +285 | +286 | @expect('D210: No whitespaces allowed surrounding docstring text') +287 | def endswith(): + - """Whitespace at the end. """ +288 + """Whitespace at the end.""" +289 | +290 | +291 | @expect('D210: No whitespaces allowed surrounding docstring text') D210 [*] No whitespaces allowed surrounding docstring text --> D.py:293:5 @@ -30,16 +28,14 @@ D210 [*] No whitespaces allowed surrounding docstring text | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Trim surrounding whitespace - -ℹ Safe fix -290 290 | -291 291 | @expect('D210: No whitespaces allowed surrounding docstring text') -292 292 | def around(): -293 |- """ Whitespace at everywhere. """ - 293 |+ """Whitespace at everywhere.""" -294 294 | -295 295 | -296 296 | @expect('D210: No whitespaces allowed surrounding docstring text') +290 | +291 | @expect('D210: No whitespaces allowed surrounding docstring text') +292 | def around(): + - """ Whitespace at everywhere. """ +293 + """Whitespace at everywhere.""" +294 | +295 | +296 | @expect('D210: No whitespaces allowed surrounding docstring text') D210 [*] No whitespaces allowed surrounding docstring text --> D.py:299:5 @@ -53,16 +49,14 @@ D210 [*] No whitespaces allowed surrounding docstring text | |_______^ | help: Trim surrounding whitespace - -ℹ Safe fix -296 296 | @expect('D210: No whitespaces allowed surrounding docstring text') -297 297 | @expect('D213: Multi-line docstring summary should start at the second line') -298 298 | def multiline(): -299 |- """ Whitespace at the beginning. - 299 |+ """Whitespace at the beginning. -300 300 | -301 301 | This is the end. -302 302 | """ +296 | @expect('D210: No whitespaces allowed surrounding docstring text') +297 | @expect('D213: Multi-line docstring summary should start at the second line') +298 | def multiline(): + - """ Whitespace at the beginning. +299 + """Whitespace at the beginning. +300 | +301 | This is the end. +302 | """ D210 No whitespaces allowed surrounding docstring text --> D.py:581:5 diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap index 7826cc5fb1..627337f71c 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D211_D.py.snap @@ -10,15 +10,13 @@ D211 [*] No blank lines allowed before class docstring | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove blank line(s) before class docstring - -ℹ Safe fix -166 166 | -167 167 | -168 168 | class WithLeadingSpace: -169 |- -170 169 | """With leading space.""" -171 170 | -172 171 | +166 | +167 | +168 | class WithLeadingSpace: + - +169 | """With leading space.""" +170 | +171 | D211 [*] No blank lines allowed before class docstring --> D.py:181:5 @@ -30,12 +28,10 @@ D211 [*] No blank lines allowed before class docstring 182 | pass | help: Remove blank line(s) before class docstring - -ℹ Safe fix -177 177 | -178 178 | -179 179 | class TrailingSpace: -180 |- -181 180 | """TrailingSpace.""" -182 181 | pass -183 182 | +177 | +178 | +179 | class TrailingSpace: + - +180 | """TrailingSpace.""" +181 | pass +182 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap index b934ae897e..2b17765409 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D212_D.py.snap @@ -12,17 +12,15 @@ D212 [*] Multi-line docstring summary should start at the first line | |_______^ | help: Remove whitespace after opening quotes - -ℹ Safe fix -126 126 | '(found 3)') -127 127 | @expect('D212: Multi-line docstring summary should start at the first line') -128 128 | def asdlkfasd(): -129 |- """ -130 |- Wrong. - 129 |+ """Wrong. -131 130 | """ -132 131 | -133 132 | +126 | '(found 3)') +127 | @expect('D212: Multi-line docstring summary should start at the first line') +128 | def asdlkfasd(): + - """ + - Wrong. +129 + """Wrong. +130 | """ +131 | +132 | D212 [*] Multi-line docstring summary should start at the first line --> D.py:597:5 @@ -35,18 +33,16 @@ D212 [*] Multi-line docstring summary should start at the first line | |_____________^ | help: Remove whitespace after opening quotes - -ℹ Safe fix -594 594 | '(found 3)') -595 595 | @expect('D212: Multi-line docstring summary should start at the first line') -596 596 | def one_liner(): -597 |- """ -598 |- -599 |- Wrong.""" - 597 |+ """Wrong.""" -600 598 | -601 599 | -602 600 | @expect('D200: One-line docstring should fit on one line with quotes ' +594 | '(found 3)') +595 | @expect('D212: Multi-line docstring summary should start at the first line') +596 | def one_liner(): + - """ + - + - Wrong.""" +597 + """Wrong.""" +598 | +599 | +600 | @expect('D200: One-line docstring should fit on one line with quotes ' D212 [*] Multi-line docstring summary should start at the first line --> D.py:624:5 @@ -59,15 +55,13 @@ D212 [*] Multi-line docstring summary should start at the first line | |______________^ | help: Remove whitespace after opening quotes - -ℹ Safe fix -621 621 | '(found 3)') -622 622 | @expect('D212: Multi-line docstring summary should start at the first line') -623 623 | def one_liner(): -624 |- """ -625 |- -626 |- "Wrong.""" - 624 |+ """"Wrong.""" -627 625 | -628 626 | -629 627 | @expect('D404: First word of the docstring should not be "This"') +621 | '(found 3)') +622 | @expect('D212: Multi-line docstring summary should start at the first line') +623 | def one_liner(): + - """ + - + - "Wrong.""" +624 + """"Wrong.""" +625 | +626 | +627 | @expect('D404: First word of the docstring should not be "This"') diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap index 7b1de443da..8b3f443400 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D213_D.py.snap @@ -13,17 +13,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -197 197 | '(found 0)') -198 198 | @expect('D213: Multi-line docstring summary should start at the second line') -199 199 | def multi_line_zero_separating_blanks(): -200 |- """Summary. - 200 |+ """ - 201 |+ Summary. -201 202 | Description. -202 203 | -203 204 | """ +197 | '(found 0)') +198 | @expect('D213: Multi-line docstring summary should start at the second line') +199 | def multi_line_zero_separating_blanks(): + - """Summary. +200 + """ +201 + Summary. +202 | Description. +203 | +204 | """ D213 [*] Multi-line docstring summary should start at the second line --> D.py:210:5 @@ -39,17 +37,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -207 207 | '(found 2)') -208 208 | @expect('D213: Multi-line docstring summary should start at the second line') -209 209 | def multi_line_two_separating_blanks(): -210 |- """Summary. - 210 |+ """ - 211 |+ Summary. -211 212 | -212 213 | -213 214 | Description. +207 | '(found 2)') +208 | @expect('D213: Multi-line docstring summary should start at the second line') +209 | def multi_line_two_separating_blanks(): + - """Summary. +210 + """ +211 + Summary. +212 | +213 | +214 | Description. D213 [*] Multi-line docstring summary should start at the second line --> D.py:220:5 @@ -64,17 +60,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -217 217 | -218 218 | @expect('D213: Multi-line docstring summary should start at the second line') -219 219 | def multi_line_one_separating_blanks(): -220 |- """Summary. - 220 |+ """ - 221 |+ Summary. -221 222 | -222 223 | Description. -223 224 | +217 | +218 | @expect('D213: Multi-line docstring summary should start at the second line') +219 | def multi_line_one_separating_blanks(): + - """Summary. +220 + """ +221 + Summary. +222 | +223 | Description. +224 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:230:5 @@ -89,17 +83,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -227 227 | @expect('D207: Docstring is under-indented') -228 228 | @expect('D213: Multi-line docstring summary should start at the second line') -229 229 | def asdfsdf(): -230 |- """Summary. - 230 |+ """ - 231 |+ Summary. -231 232 | -232 233 | Description. -233 234 | +227 | @expect('D207: Docstring is under-indented') +228 | @expect('D213: Multi-line docstring summary should start at the second line') +229 | def asdfsdf(): + - """Summary. +230 + """ +231 + Summary. +232 | +233 | Description. +234 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:240:5 @@ -114,17 +106,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |___^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -237 237 | @expect('D207: Docstring is under-indented') -238 238 | @expect('D213: Multi-line docstring summary should start at the second line') -239 239 | def asdsdfsdffsdf(): -240 |- """Summary. - 240 |+ """ - 241 |+ Summary. -241 242 | -242 243 | Description. -243 244 | +237 | @expect('D207: Docstring is under-indented') +238 | @expect('D213: Multi-line docstring summary should start at the second line') +239 | def asdsdfsdffsdf(): + - """Summary. +240 + """ +241 + Summary. +242 | +243 | Description. +244 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:250:5 @@ -139,17 +129,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -247 247 | @expect('D208: Docstring is over-indented') -248 248 | @expect('D213: Multi-line docstring summary should start at the second line') -249 249 | def asdfsdsdf24(): -250 |- """Summary. - 250 |+ """ - 251 |+ Summary. -251 252 | -252 253 | Description. -253 254 | +247 | @expect('D208: Docstring is over-indented') +248 | @expect('D213: Multi-line docstring summary should start at the second line') +249 | def asdfsdsdf24(): + - """Summary. +250 + """ +251 + Summary. +252 | +253 | Description. +254 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:260:5 @@ -164,17 +152,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |___________^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -257 257 | @expect('D208: Docstring is over-indented') -258 258 | @expect('D213: Multi-line docstring summary should start at the second line') -259 259 | def asdfsdsdfsdf24(): -260 |- """Summary. - 260 |+ """ - 261 |+ Summary. -261 262 | -262 263 | Description. -263 264 | +257 | @expect('D208: Docstring is over-indented') +258 | @expect('D213: Multi-line docstring summary should start at the second line') +259 | def asdfsdsdfsdf24(): + - """Summary. +260 + """ +261 + Summary. +262 | +263 | Description. +264 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:270:5 @@ -189,17 +175,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -267 267 | @expect('D208: Docstring is over-indented') -268 268 | @expect('D213: Multi-line docstring summary should start at the second line') -269 269 | def asdfsdfsdsdsdfsdf24(): -270 |- """Summary. - 270 |+ """ - 271 |+ Summary. -271 272 | -272 273 | Description. -273 274 | +267 | @expect('D208: Docstring is over-indented') +268 | @expect('D213: Multi-line docstring summary should start at the second line') +269 | def asdfsdfsdsdsdfsdf24(): + - """Summary. +270 + """ +271 + Summary. +272 | +273 | Description. +274 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:281:5 @@ -212,17 +196,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |___________________^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -278 278 | 'line') -279 279 | @expect('D213: Multi-line docstring summary should start at the second line') -280 280 | def asdfljdf24(): -281 |- """Summary. - 281 |+ """ - 282 |+ Summary. -282 283 | -283 284 | Description.""" -284 285 | +278 | 'line') +279 | @expect('D213: Multi-line docstring summary should start at the second line') +280 | def asdfljdf24(): + - """Summary. +281 + """ +282 + Summary. +283 | +284 | Description.""" +285 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:299:5 @@ -236,17 +218,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -296 296 | @expect('D210: No whitespaces allowed surrounding docstring text') -297 297 | @expect('D213: Multi-line docstring summary should start at the second line') -298 298 | def multiline(): -299 |- """ Whitespace at the beginning. - 299 |+ """ - 300 |+ Whitespace at the beginning. -300 301 | -301 302 | This is the end. -302 303 | """ +296 | @expect('D210: No whitespaces allowed surrounding docstring text') +297 | @expect('D213: Multi-line docstring summary should start at the second line') +298 | def multiline(): + - """ Whitespace at the beginning. +299 + """ +300 + Whitespace at the beginning. +301 | +302 | This is the end. +303 | """ D213 [*] Multi-line docstring summary should start at the second line --> D.py:343:5 @@ -262,17 +242,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -340 340 | -341 341 | @expect('D213: Multi-line docstring summary should start at the second line') -342 342 | def exceptions_of_D301(): -343 |- """Exclude some backslashes from D301. - 343 |+ """ - 344 |+ Exclude some backslashes from D301. -344 345 | -345 346 | In particular, line continuations \ -346 347 | and unicode literals \u0394 and \N{GREEK CAPITAL LETTER DELTA}. +340 | +341 | @expect('D213: Multi-line docstring summary should start at the second line') +342 | def exceptions_of_D301(): + - """Exclude some backslashes from D301. +343 + """ +344 + Exclude some backslashes from D301. +345 | +346 | In particular, line continuations \ +347 | and unicode literals \u0394 and \N{GREEK CAPITAL LETTER DELTA}. D213 [*] Multi-line docstring summary should start at the second line --> D.py:383:5 @@ -287,17 +265,15 @@ D213 [*] Multi-line docstring summary should start at the second line 387 | pass | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -380 380 | -381 381 | @expect('D213: Multi-line docstring summary should start at the second line') -382 382 | def new_209(): -383 |- """First line. - 383 |+ """ - 384 |+ First line. -384 385 | -385 386 | More lines. -386 387 | """ +380 | +381 | @expect('D213: Multi-line docstring summary should start at the second line') +382 | def new_209(): + - """First line. +383 + """ +384 + First line. +385 | +386 | More lines. +387 | """ D213 [*] Multi-line docstring summary should start at the second line --> D.py:392:5 @@ -312,17 +288,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -389 389 | -390 390 | @expect('D213: Multi-line docstring summary should start at the second line') -391 391 | def old_209(): -392 |- """One liner. - 392 |+ """ - 393 |+ One liner. -393 394 | -394 395 | Multi-line comments. OK to have extra blank line -395 396 | +389 | +390 | @expect('D213: Multi-line docstring summary should start at the second line') +391 | def old_209(): + - """One liner. +392 + """ +393 + One liner. +394 | +395 | Multi-line comments. OK to have extra blank line +396 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:438:37 @@ -337,17 +311,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -435 435 | -436 436 | @expect("D207: Docstring is under-indented") -437 437 | @expect('D213: Multi-line docstring summary should start at the second line') -438 |-def docstring_start_in_same_line(): """First Line. - 438 |+def docstring_start_in_same_line(): """ - 439 |+ First Line. -439 440 | -440 441 | Second Line -441 442 | """ +435 | +436 | @expect("D207: Docstring is under-indented") +437 | @expect('D213: Multi-line docstring summary should start at the second line') + - def docstring_start_in_same_line(): """First Line. +438 + def docstring_start_in_same_line(): """ +439 + First Line. +440 | +441 | Second Line +442 | """ D213 [*] Multi-line docstring summary should start at the second line --> D.py:450:5 @@ -362,17 +334,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -447 447 | -448 448 | @expect('D213: Multi-line docstring summary should start at the second line') -449 449 | def a_following_valid_function(x=None): -450 |- """Check for a bug where the previous function caused an assertion. - 450 |+ """ - 451 |+ Check for a bug where the previous function caused an assertion. -451 452 | -452 453 | The assertion was caused in the next function, so this one is necessary. -453 454 | +447 | +448 | @expect('D213: Multi-line docstring summary should start at the second line') +449 | def a_following_valid_function(x=None): + - """Check for a bug where the previous function caused an assertion. +450 + """ +451 + Check for a bug where the previous function caused an assertion. +452 | +453 | The assertion was caused in the next function, so this one is necessary. +454 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:526:5 @@ -391,17 +361,15 @@ D213 [*] Multi-line docstring summary should start at the second line 534 | def __init__(self, x): | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -523 523 | # This is reproducing a bug where AttributeError is raised when parsing class -524 524 | # parameters as functions for Google / Numpy conventions. -525 525 | class Blah: # noqa: D203,D213 -526 |- """A Blah. - 526 |+ """ - 527 |+ A Blah. -527 528 | -528 529 | Parameters -529 530 | ---------- +523 | # This is reproducing a bug where AttributeError is raised when parsing class +524 | # parameters as functions for Google / Numpy conventions. +525 | class Blah: # noqa: D203,D213 + - """A Blah. +526 + """ +527 + A Blah. +528 | +529 | Parameters +530 | ---------- D213 [*] Multi-line docstring summary should start at the second line --> D.py:546:5 @@ -415,17 +383,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -543 543 | @expect('D213: Multi-line docstring summary should start at the second line') -544 544 | def multiline_leading_space(): -545 545 | -546 |- """Leading space. - 546 |+ """ - 547 |+ Leading space. -547 548 | -548 549 | More content. -549 550 | """ +543 | @expect('D213: Multi-line docstring summary should start at the second line') +544 | def multiline_leading_space(): +545 | + - """Leading space. +546 + """ +547 + Leading space. +548 | +549 | More content. +550 | """ D213 [*] Multi-line docstring summary should start at the second line --> D.py:555:5 @@ -441,17 +407,15 @@ D213 [*] Multi-line docstring summary should start at the second line 560 | pass | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -552 552 | @expect('D202: No blank lines allowed after function docstring (found 1)') -553 553 | @expect('D213: Multi-line docstring summary should start at the second line') -554 554 | def multiline_trailing_space(): -555 |- """Leading space. - 555 |+ """ - 556 |+ Leading space. -556 557 | -557 558 | More content. -558 559 | """ +552 | @expect('D202: No blank lines allowed after function docstring (found 1)') +553 | @expect('D213: Multi-line docstring summary should start at the second line') +554 | def multiline_trailing_space(): + - """Leading space. +555 + """ +556 + Leading space. +557 | +558 | More content. +559 | """ D213 [*] Multi-line docstring summary should start at the second line --> D.py:568:5 @@ -467,17 +431,15 @@ D213 [*] Multi-line docstring summary should start at the second line 573 | pass | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -565 565 | @expect('D213: Multi-line docstring summary should start at the second line') -566 566 | def multiline_trailing_and_leading_space(): -567 567 | -568 |- """Trailing and leading space. - 568 |+ """ - 569 |+ Trailing and leading space. -569 570 | -570 571 | More content. -571 572 | """ +565 | @expect('D213: Multi-line docstring summary should start at the second line') +566 | def multiline_trailing_and_leading_space(): +567 | + - """Trailing and leading space. +568 + """ +569 + Trailing and leading space. +570 | +571 | More content. +572 | """ D213 [*] Multi-line docstring summary should start at the second line --> D.py:588:5 @@ -490,17 +452,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_____________________^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -585 585 | 'line') -586 586 | @expect('D213: Multi-line docstring summary should start at the second line') -587 587 | def asdfljdjgf24(): -588 |- """Summary. - 588 |+ """ - 589 |+ Summary. -589 590 | -590 591 | Description. """ -591 592 | +585 | 'line') +586 | @expect('D213: Multi-line docstring summary should start at the second line') +587 | def asdfljdjgf24(): + - """Summary. +588 + """ +589 + Summary. +590 | +591 | Description. """ +592 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:606:5 @@ -513,17 +473,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -603 603 | '(found 3)') -604 604 | @expect('D212: Multi-line docstring summary should start at the first line') -605 605 | def one_liner(): -606 |- r"""Wrong. - 606 |+ r""" - 607 |+ Wrong. -607 608 | -608 609 | """ -609 610 | +603 | '(found 3)') +604 | @expect('D212: Multi-line docstring summary should start at the first line') +605 | def one_liner(): + - r"""Wrong. +606 + r""" +607 + Wrong. +608 | +609 | """ +610 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:615:5 @@ -536,17 +494,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -612 612 | '(found 3)') -613 613 | @expect('D212: Multi-line docstring summary should start at the first line') -614 614 | def one_liner(): -615 |- """Wrong." - 615 |+ """ - 616 |+ Wrong." -616 617 | -617 618 | """ -618 619 | +612 | '(found 3)') +613 | @expect('D212: Multi-line docstring summary should start at the first line') +614 | def one_liner(): + - """Wrong." +615 + """ +616 + Wrong." +617 | +618 | """ +619 | D213 [*] Multi-line docstring summary should start at the second line --> D.py:671:5 @@ -561,17 +517,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -668 668 | -669 669 | -670 670 | def retain_extra_whitespace(): -671 |- """Summary. - 671 |+ """ - 672 |+ Summary. -672 673 | -673 674 | This is overindented -674 675 | And so is this, but it we should preserve the extra space on this line relative +668 | +669 | +670 | def retain_extra_whitespace(): + - """Summary. +671 + """ +672 + Summary. +673 | +674 | This is overindented +675 | And so is this, but it we should preserve the extra space on this line relative D213 [*] Multi-line docstring summary should start at the second line --> D.py:680:5 @@ -589,17 +543,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -677 677 | -678 678 | -679 679 | def retain_extra_whitespace_multiple(): -680 |- """Summary. - 680 |+ """ - 681 |+ Summary. -681 682 | -682 683 | This is overindented -683 684 | And so is this, but it we should preserve the extra space on this line relative +677 | +678 | +679 | def retain_extra_whitespace_multiple(): + - """Summary. +680 + """ +681 + Summary. +682 | +683 | This is overindented +684 | And so is this, but it we should preserve the extra space on this line relative D213 [*] Multi-line docstring summary should start at the second line --> D.py:693:5 @@ -617,17 +569,15 @@ D213 [*] Multi-line docstring summary should start at the second line 701 | def retain_extra_whitespace_followed_by_same_offset(): | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -690 690 | -691 691 | -692 692 | def retain_extra_whitespace_deeper(): -693 |- """Summary. - 693 |+ """ - 694 |+ Summary. -694 695 | -695 696 | This is overindented -696 697 | And so is this, but it we should preserve the extra space on this line relative +690 | +691 | +692 | def retain_extra_whitespace_deeper(): + - """Summary. +693 + """ +694 + Summary. +695 | +696 | This is overindented +697 | And so is this, but it we should preserve the extra space on this line relative D213 [*] Multi-line docstring summary should start at the second line --> D.py:702:5 @@ -643,17 +593,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -699 699 | """ -700 700 | -701 701 | def retain_extra_whitespace_followed_by_same_offset(): -702 |- """Summary. - 702 |+ """ - 703 |+ Summary. -703 704 | -704 705 | This is overindented -705 706 | And so is this, but it we should preserve the extra space on this line relative +699 | """ +700 | +701 | def retain_extra_whitespace_followed_by_same_offset(): + - """Summary. +702 + """ +703 + Summary. +704 | +705 | This is overindented +706 | And so is this, but it we should preserve the extra space on this line relative D213 [*] Multi-line docstring summary should start at the second line --> D.py:712:5 @@ -668,17 +616,15 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -709 709 | -710 710 | -711 711 | def retain_extra_whitespace_not_overindented(): -712 |- """Summary. - 712 |+ """ - 713 |+ Summary. -713 714 | -714 715 | This is not overindented -715 716 | This is overindented, but since one line is not overindented this should not raise +709 | +710 | +711 | def retain_extra_whitespace_not_overindented(): + - """Summary. +712 + """ +713 + Summary. +714 | +715 | This is not overindented +716 | This is overindented, but since one line is not overindented this should not raise D213 [*] Multi-line docstring summary should start at the second line --> D.py:721:5 @@ -691,14 +637,12 @@ D213 [*] Multi-line docstring summary should start at the second line | |_______^ | help: Insert line break and indentation after opening quotes - -ℹ Safe fix -718 718 | -719 719 | -720 720 | def inconsistent_indent_byte_size(): -721 |- """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080). - 721 |+ """ - 722 |+ There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080). -722 723 | -723 724 |     Returns: -724 725 | """ +718 | +719 | +720 | def inconsistent_indent_byte_size(): + - """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080). +721 + """ +722 + There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080). +723 | +724 |     Returns: +725 | """ diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap index 19876f408e..76a70d0927 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_D214_module.py.snap @@ -12,15 +12,13 @@ D214 [*] Section is over-indented ("Returns") 5 | valid returns | help: Remove over-indentation from "Returns" - -ℹ Safe fix -1 1 | """A module docstring with D214 violations -2 2 | -3 |- Returns - 3 |+Returns -4 4 | ----- -5 5 | valid returns -6 6 | +1 | """A module docstring with D214 violations +2 | + - Returns +3 + Returns +4 | ----- +5 | valid returns +6 | D214 [*] Section is over-indented ("Args") --> D214_module.py:7:5 @@ -33,13 +31,11 @@ D214 [*] Section is over-indented ("Args") 9 | valid args | help: Remove over-indentation from "Args" - -ℹ Safe fix -4 4 | ----- -5 5 | valid returns -6 6 | -7 |- Args - 7 |+Args -8 8 | ----- -9 9 | valid args -10 10 | """ +4 | ----- +5 | valid returns +6 | + - Args +7 + Args +8 | ----- +9 | valid args +10 | """ diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap index d84cea76af..8853029784 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D214_sections.py.snap @@ -12,16 +12,14 @@ D214 [*] Section is over-indented ("Returns") 148 | A value of some sort. | help: Remove over-indentation from "Returns" - -ℹ Safe fix -143 143 | def section_overindented(): # noqa: D416 -144 144 | """Toggle the gizmo. -145 145 | -146 |- Returns - 146 |+ Returns -147 147 | ------- -148 148 | A value of some sort. -149 149 | +143 | def section_overindented(): # noqa: D416 +144 | """Toggle the gizmo. +145 | + - Returns +146 + Returns +147 | ------- +148 | A value of some sort. +149 | D214 [*] Section is over-indented ("Returns") --> sections.py:563:9 @@ -33,13 +31,11 @@ D214 [*] Section is over-indented ("Returns") 564 | """ | help: Remove over-indentation from "Returns" - -ℹ Safe fix -560 560 | Args: -561 561 | Here's a note. -562 562 | -563 |- Returns: - 563 |+ Returns: -564 564 | """ -565 565 | -566 566 | +560 | Args: +561 | Here's a note. +562 | + - Returns: +563 + Returns: +564 | """ +565 | +566 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap index b3d204755b..2d9cb0a76c 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_D215.py.snap @@ -11,10 +11,8 @@ D215 [*] Section underline is over-indented ("TODO") 4 | """ | help: Remove over-indentation from "TODO" underline - -ℹ Safe fix -1 1 | """ -2 2 | TODO: -3 |- - - 3 |+ -4 4 | """ +1 | """ +2 | TODO: + - - +3 + +4 | """ diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap index 6039da3d4a..5b3e878dd6 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D215_sections.py.snap @@ -10,16 +10,14 @@ D215 [*] Section underline is over-indented ("Returns") 160 | A value of some sort. | help: Remove over-indentation from "Returns" underline - -ℹ Safe fix -156 156 | """Toggle the gizmo. -157 157 | -158 158 | Returns -159 |- ------- - 159 |+ ------ -160 160 | A value of some sort. -161 161 | -162 162 | """ +156 | """Toggle the gizmo. +157 | +158 | Returns + - ------- +159 + ------ +160 | A value of some sort. +161 | +162 | """ D215 [*] Section underline is over-indented ("Returns") --> sections.py:173:9 @@ -30,13 +28,11 @@ D215 [*] Section underline is over-indented ("Returns") 174 | """ | help: Remove over-indentation from "Returns" underline - -ℹ Safe fix -170 170 | """Toggle the gizmo. -171 171 | -172 172 | Returns -173 |- ------- - 173 |+ ------ -174 174 | """ -175 175 | -176 176 | +170 | """Toggle the gizmo. +171 | +172 | Returns + - ------- +173 + ------ +174 | """ +175 | +176 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap index f2ecfcbc5e..5d32d79d4d 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D.py.snap @@ -10,16 +10,14 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -304 304 | -305 305 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)') -306 306 | def triple_single_quotes_raw(): -307 |- r'''Summary.''' - 307 |+ r"""Summary.""" -308 308 | -309 309 | -310 310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)') +304 | +305 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)') +306 | def triple_single_quotes_raw(): + - r'''Summary.''' +307 + r"""Summary.""" +308 | +309 | +310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)') D300 [*] Use triple double quotes `"""` --> D.py:312:5 @@ -30,16 +28,14 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -309 309 | -310 310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)') -311 311 | def triple_single_quotes_raw_uppercase(): -312 |- R'''Summary.''' - 312 |+ R"""Summary.""" -313 313 | -314 314 | -315 315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') +309 | +310 | @expect('D300: Use """triple double quotes""" (found \'\'\'-quotes)') +311 | def triple_single_quotes_raw_uppercase(): + - R'''Summary.''' +312 + R"""Summary.""" +313 | +314 | +315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') D300 [*] Use triple double quotes `"""` --> D.py:317:5 @@ -50,16 +46,14 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -314 314 | -315 315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') -316 316 | def single_quotes_raw(): -317 |- r'Summary.' - 317 |+ r"""Summary.""" -318 318 | -319 319 | -320 320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') +314 | +315 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') +316 | def single_quotes_raw(): + - r'Summary.' +317 + r"""Summary.""" +318 | +319 | +320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') D300 [*] Use triple double quotes `"""` --> D.py:322:5 @@ -70,16 +64,14 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -319 319 | -320 320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') -321 321 | def single_quotes_raw_uppercase(): -322 |- R'Summary.' - 322 |+ R"""Summary.""" -323 323 | -324 324 | -325 325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') +319 | +320 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') +321 | def single_quotes_raw_uppercase(): + - R'Summary.' +322 + R"""Summary.""" +323 | +324 | +325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') D300 [*] Use triple double quotes `"""` --> D.py:328:5 @@ -90,16 +82,14 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -325 325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') -326 326 | @expect('D301: Use r""" if any backslashes in a docstring') -327 327 | def single_quotes_raw_uppercase_backslash(): -328 |- R'Sum\mary.' - 328 |+ R"""Sum\mary.""" -329 329 | -330 330 | -331 331 | @expect('D301: Use r""" if any backslashes in a docstring') +325 | @expect('D300: Use """triple double quotes""" (found \'-quotes)') +326 | @expect('D301: Use r""" if any backslashes in a docstring') +327 | def single_quotes_raw_uppercase_backslash(): + - R'Sum\mary.' +328 + R"""Sum\mary.""" +329 | +330 | +331 | @expect('D301: Use r""" if any backslashes in a docstring') D300 [*] Use triple double quotes `"""` --> D.py:645:5 @@ -112,18 +102,16 @@ D300 [*] Use triple double quotes `"""` 648 | class StatementOnSameLineAsDocstring: | help: Convert to triple double quotes - -ℹ Safe fix -642 642 | -643 643 | -644 644 | def single_line_docstring_with_an_escaped_backslash(): -645 |- "\ -646 |- " - 645 |+ """\ - 646 |+ """ -647 647 | -648 648 | class StatementOnSameLineAsDocstring: -649 649 | "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 +642 | +643 | +644 | def single_line_docstring_with_an_escaped_backslash(): + - "\ + - " +645 + """\ +646 + """ +647 | +648 | class StatementOnSameLineAsDocstring: +649 | "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 D300 [*] Use triple double quotes `"""` --> D.py:649:5 @@ -135,16 +123,14 @@ D300 [*] Use triple double quotes `"""` 651 | pass | help: Convert to triple double quotes - -ℹ Safe fix -646 646 | " -647 647 | -648 648 | class StatementOnSameLineAsDocstring: -649 |- "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 - 649 |+ """After this docstring there's another statement on the same line separated by a semicolon.""" ; priorities=1 -650 650 | def sort_services(self): -651 651 | pass -652 652 | +646 | " +647 | +648 | class StatementOnSameLineAsDocstring: + - "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1 +649 + """After this docstring there's another statement on the same line separated by a semicolon.""" ; priorities=1 +650 | def sort_services(self): +651 | pass +652 | D300 [*] Use triple double quotes `"""` --> D.py:654:5 @@ -154,16 +140,14 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -651 651 | pass -652 652 | -653 653 | class StatementOnSameLineAsDocstring: -654 |- "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1 - 654 |+ """After this docstring there's another statement on the same line separated by a semicolon."""; priorities=1 -655 655 | -656 656 | -657 657 | class CommentAfterDocstring: +651 | pass +652 | +653 | class StatementOnSameLineAsDocstring: + - "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1 +654 + """After this docstring there's another statement on the same line separated by a semicolon."""; priorities=1 +655 | +656 | +657 | class CommentAfterDocstring: D300 [*] Use triple double quotes `"""` --> D.py:658:5 @@ -175,16 +159,14 @@ D300 [*] Use triple double quotes `"""` 660 | pass | help: Convert to triple double quotes - -ℹ Safe fix -655 655 | -656 656 | -657 657 | class CommentAfterDocstring: -658 |- "After this docstring there's a comment." # priorities=1 - 658 |+ """After this docstring there's a comment.""" # priorities=1 -659 659 | def sort_services(self): -660 660 | pass -661 661 | +655 | +656 | +657 | class CommentAfterDocstring: + - "After this docstring there's a comment." # priorities=1 +658 + """After this docstring there's a comment.""" # priorities=1 +659 | def sort_services(self): +660 | pass +661 | D300 [*] Use triple double quotes `"""` --> D.py:664:5 @@ -195,15 +177,13 @@ D300 [*] Use triple double quotes `"""` | |_________________________________________________________^ | help: Convert to triple double quotes - -ℹ Safe fix -661 661 | -662 662 | -663 663 | def newline_after_closing_quote(self): -664 |- "We enforce a newline after the closing quote for a multi-line docstring \ -665 |- but continuations shouldn't be considered multi-line" - 664 |+ """We enforce a newline after the closing quote for a multi-line docstring \ - 665 |+ but continuations shouldn't be considered multi-line""" -666 666 | -667 667 | -668 668 | +661 | +662 | +663 | def newline_after_closing_quote(self): + - "We enforce a newline after the closing quote for a multi-line docstring \ + - but continuations shouldn't be considered multi-line" +664 + """We enforce a newline after the closing quote for a multi-line docstring \ +665 + but continuations shouldn't be considered multi-line""" +666 | +667 | +668 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap index 8aa4ccb908..69baa65bee 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D300_D300.py.snap @@ -18,13 +18,11 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -7 7 | -8 8 | -9 9 | def contains_quote(): -10 |- 'Sum"\\mary.' - 10 |+ """Sum"\\mary.""" -11 11 | -12 12 | -13 13 | # OK +7 | +8 | +9 | def contains_quote(): + - 'Sum"\\mary.' +10 + """Sum"\\mary.""" +11 | +12 | +13 | # OK diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap index 72289dc8b2..8fed86924c 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D.py.snap @@ -10,13 +10,12 @@ D301 [*] Use `r"""` if any backslashes in a docstring | ^^^^^^^^^^^^^^^^ | help: Add `r` prefix - -ℹ Unsafe fix -330 330 | -331 331 | @expect('D301: Use r""" if any backslashes in a docstring') -332 332 | def double_quotes_backslash(): -333 |- """Sum\\mary.""" - 333 |+ r"""Sum\\mary.""" -334 334 | -335 335 | -336 336 | @expect('D301: Use r""" if any backslashes in a docstring') +330 | +331 | @expect('D301: Use r""" if any backslashes in a docstring') +332 | def double_quotes_backslash(): + - """Sum\\mary.""" +333 + r"""Sum\\mary.""" +334 | +335 | +336 | @expect('D301: Use r""" if any backslashes in a docstring') +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap index 984047111e..1d87a1179a 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D301_D301.py.snap @@ -9,14 +9,13 @@ D301 [*] Use `r"""` if any backslashes in a docstring | ^^^^^^^^^^^^^^^^ | help: Add `r` prefix - -ℹ Unsafe fix -1 1 | def double_quotes_backslash(): -2 |- """Sum\\mary.""" - 2 |+ r"""Sum\\mary.""" -3 3 | -4 4 | -5 5 | def double_quotes_backslash_raw(): +1 | def double_quotes_backslash(): + - """Sum\\mary.""" +2 + r"""Sum\\mary.""" +3 | +4 | +5 | def double_quotes_backslash_raw(): +note: This is an unsafe fix and may change runtime behavior D301 Use `r"""` if any backslashes in a docstring --> D301.py:37:5 @@ -37,16 +36,15 @@ D301 [*] Use `r"""` if any backslashes in a docstring | |_______^ | help: Add `r` prefix - -ℹ Unsafe fix -90 90 | -91 91 | -92 92 | def should_add_raw_for_single_double_quote_escape(): -93 |- """ - 93 |+ r""" -94 94 | This is single quote escape \". -95 95 | """ -96 96 | +90 | +91 | +92 | def should_add_raw_for_single_double_quote_escape(): + - """ +93 + r""" +94 | This is single quote escape \". +95 | """ +96 | +note: This is an unsafe fix and may change runtime behavior D301 [*] Use `r"""` if any backslashes in a docstring --> D301.py:99:5 @@ -58,12 +56,11 @@ D301 [*] Use `r"""` if any backslashes in a docstring | |_______^ | help: Add `r` prefix - -ℹ Unsafe fix -96 96 | -97 97 | -98 98 | def should_add_raw_for_single_single_quote_escape(): -99 |- ''' - 99 |+ r''' -100 100 | This is single quote escape \'. -101 101 | ''' +96 | +97 | +98 | def should_add_raw_for_single_single_quote_escape(): + - ''' +99 + r''' +100 | This is single quote escape \'. +101 | ''' +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap index 4c97147f52..f3ce740ea0 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D.py.snap @@ -10,16 +10,15 @@ D400 [*] First line should end with a period | ^^^^^^^^^^^^^ | help: Add period - -ℹ Unsafe fix -352 352 | @expect("D415: First line should end with a period, question mark, " -353 353 | "or exclamation point (not 'y')") -354 354 | def lwnlkjl(): -355 |- """Summary""" - 355 |+ """Summary.""" -356 356 | -357 357 | -358 358 | @expect("D401: First line should be in imperative mood " +352 | @expect("D415: First line should end with a period, question mark, " +353 | "or exclamation point (not 'y')") +354 | def lwnlkjl(): + - """Summary""" +355 + """Summary.""" +356 | +357 | +358 | @expect("D401: First line should be in imperative mood " +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:406:25 @@ -30,16 +29,15 @@ D400 [*] First line should end with a period | ^^^^^^^^^^^^^^^ | help: Add period - -ℹ Unsafe fix -403 403 | @expect("D400: First line should end with a period (not 'r')") -404 404 | @expect("D415: First line should end with a period, question mark," -405 405 | " or exclamation point (not 'r')") -406 |-def oneliner_withdoc(): """One liner""" - 406 |+def oneliner_withdoc(): """One liner.""" -407 407 | -408 408 | -409 409 | def ignored_decorator(func): # noqa: D400,D401,D415 +403 | @expect("D400: First line should end with a period (not 'r')") +404 | @expect("D415: First line should end with a period, question mark," +405 | " or exclamation point (not 'r')") + - def oneliner_withdoc(): """One liner""" +406 + def oneliner_withdoc(): """One liner.""" +407 | +408 | +409 | def ignored_decorator(func): # noqa: D400,D401,D415 +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:410:5 @@ -51,16 +49,15 @@ D400 [*] First line should end with a period 412 | pass | help: Add period - -ℹ Unsafe fix -407 407 | -408 408 | -409 409 | def ignored_decorator(func): # noqa: D400,D401,D415 -410 |- """Runs something""" - 410 |+ """Runs something.""" -411 411 | func() -412 412 | pass -413 413 | +407 | +408 | +409 | def ignored_decorator(func): # noqa: D400,D401,D415 + - """Runs something""" +410 + """Runs something.""" +411 | func() +412 | pass +413 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:416:5 @@ -72,16 +69,15 @@ D400 [*] First line should end with a period 418 | pass | help: Add period - -ℹ Unsafe fix -413 413 | -414 414 | -415 415 | def decorator_for_test(func): # noqa: D400,D401,D415 -416 |- """Runs something""" - 416 |+ """Runs something.""" -417 417 | func() -418 418 | pass -419 419 | +413 | +414 | +415 | def decorator_for_test(func): # noqa: D400,D401,D415 + - """Runs something""" +416 + """Runs something.""" +417 | func() +418 | pass +419 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:422:35 @@ -91,16 +87,15 @@ D400 [*] First line should end with a period | ^^^^^^^^^^^^^^^ | help: Add period - -ℹ Unsafe fix -419 419 | -420 420 | -421 421 | @ignored_decorator -422 |-def oneliner_ignored_decorator(): """One liner""" - 422 |+def oneliner_ignored_decorator(): """One liner.""" -423 423 | -424 424 | -425 425 | @decorator_for_test +419 | +420 | +421 | @ignored_decorator + - def oneliner_ignored_decorator(): """One liner""" +422 + def oneliner_ignored_decorator(): """One liner.""" +423 | +424 | +425 | @decorator_for_test +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:429:49 @@ -111,16 +106,15 @@ D400 [*] First line should end with a period | ^^^^^^^^^^^^^^^ | help: Add period - -ℹ Unsafe fix -426 426 | @expect("D400: First line should end with a period (not 'r')") -427 427 | @expect("D415: First line should end with a period, question mark," -428 428 | " or exclamation point (not 'r')") -429 |-def oneliner_with_decorator_expecting_errors(): """One liner""" - 429 |+def oneliner_with_decorator_expecting_errors(): """One liner.""" -430 430 | -431 431 | -432 432 | @decorator_for_test +426 | @expect("D400: First line should end with a period (not 'r')") +427 | @expect("D415: First line should end with a period, question mark," +428 | " or exclamation point (not 'r')") + - def oneliner_with_decorator_expecting_errors(): """One liner""" +429 + def oneliner_with_decorator_expecting_errors(): """One liner.""" +430 | +431 | +432 | @decorator_for_test +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:470:5 @@ -132,16 +126,15 @@ D400 [*] First line should end with a period 471 | pass | help: Add period - -ℹ Unsafe fix -467 467 | @expect("D415: First line should end with a period, question mark, " -468 468 | "or exclamation point (not 'g')") -469 469 | def docstring_bad(): -470 |- """Runs something""" - 470 |+ """Runs something.""" -471 471 | pass -472 472 | -473 473 | +467 | @expect("D415: First line should end with a period, question mark, " +468 | "or exclamation point (not 'g')") +469 | def docstring_bad(): + - """Runs something""" +470 + """Runs something.""" +471 | pass +472 | +473 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:475:5 @@ -152,16 +145,15 @@ D400 [*] First line should end with a period 476 | pass | help: Add period - -ℹ Unsafe fix -472 472 | -473 473 | -474 474 | def docstring_bad_ignore_all(): # noqa -475 |- """Runs something""" - 475 |+ """Runs something.""" -476 476 | pass -477 477 | -478 478 | +472 | +473 | +474 | def docstring_bad_ignore_all(): # noqa + - """Runs something""" +475 + """Runs something.""" +476 | pass +477 | +478 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:480:5 @@ -172,16 +164,15 @@ D400 [*] First line should end with a period 481 | pass | help: Add period - -ℹ Unsafe fix -477 477 | -478 478 | -479 479 | def docstring_bad_ignore_one(): # noqa: D400,D401,D415 -480 |- """Runs something""" - 480 |+ """Runs something.""" -481 481 | pass -482 482 | -483 483 | +477 | +478 | +479 | def docstring_bad_ignore_one(): # noqa: D400,D401,D415 + - """Runs something""" +480 + """Runs something.""" +481 | pass +482 | +483 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:487:5 @@ -193,16 +184,15 @@ D400 [*] First line should end with a period 488 | pass | help: Add period - -ℹ Unsafe fix -484 484 | @expect("D401: First line should be in imperative mood " -485 485 | "(perhaps 'Run', not 'Runs')") -486 486 | def docstring_ignore_some_violations_but_catch_D401(): # noqa: E501,D400,D415 -487 |- """Runs something""" - 487 |+ """Runs something.""" -488 488 | pass -489 489 | -490 490 | +484 | @expect("D401: First line should be in imperative mood " +485 | "(perhaps 'Run', not 'Runs')") +486 | def docstring_ignore_some_violations_but_catch_D401(): # noqa: E501,D400,D415 + - """Runs something""" +487 + """Runs something.""" +488 | pass +489 | +490 | +note: This is an unsafe fix and may change runtime behavior D400 First line should end with a period --> D.py:514:5 @@ -222,16 +212,15 @@ D400 [*] First line should end with a period | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add period - -ℹ Unsafe fix -517 517 | @expect("D415: First line should end with a period, question mark, " -518 518 | "or exclamation point (not 'g')") -519 519 | def bad_google_string(): # noqa: D400 -520 |- """Test a valid something""" - 520 |+ """Test a valid something.""" -521 521 | -522 522 | -523 523 | # This is reproducing a bug where AttributeError is raised when parsing class +517 | @expect("D415: First line should end with a period, question mark, " +518 | "or exclamation point (not 'g')") +519 | def bad_google_string(): # noqa: D400 + - """Test a valid something""" +520 + """Test a valid something.""" +521 | +522 | +523 | # This is reproducing a bug where AttributeError is raised when parsing class +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:581:5 @@ -242,16 +231,15 @@ D400 [*] First line should end with a period | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add period - -ℹ Unsafe fix -578 578 | @expect("D415: First line should end with a period, question mark, " -579 579 | "or exclamation point (not '\"')") -580 580 | def endswith_quote(): -581 |- """Whitespace at the end, but also a quote" """ - 581 |+ """Whitespace at the end, but also a quote". """ -582 582 | -583 583 | -584 584 | @expect('D209: Multi-line docstring closing quotes should be on a separate ' +578 | @expect("D415: First line should end with a period, question mark, " +579 | "or exclamation point (not '\"')") +580 | def endswith_quote(): + - """Whitespace at the end, but also a quote" """ +581 + """Whitespace at the end, but also a quote". """ +582 | +583 | +584 | @expect('D209: Multi-line docstring closing quotes should be on a separate ' +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:615:5 @@ -264,16 +252,15 @@ D400 [*] First line should end with a period | |_______^ | help: Add period - -ℹ Unsafe fix -612 612 | '(found 3)') -613 613 | @expect('D212: Multi-line docstring summary should start at the first line') -614 614 | def one_liner(): -615 |- """Wrong." - 615 |+ """Wrong.". -616 616 | -617 617 | """ -618 618 | +612 | '(found 3)') +613 | @expect('D212: Multi-line docstring summary should start at the first line') +614 | def one_liner(): + - """Wrong." +615 + """Wrong.". +616 | +617 | """ +618 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:639:17 @@ -284,16 +271,15 @@ D400 [*] First line should end with a period 641 | def same_line(): """This is a docstring on the same line""" | help: Add period - -ℹ Unsafe fix -636 636 | """ This is a docstring that starts with a space.""" # noqa: D210 -637 637 | -638 638 | -639 |-class SameLine: """This is a docstring on the same line""" - 639 |+class SameLine: """This is a docstring on the same line.""" -640 640 | -641 641 | def same_line(): """This is a docstring on the same line""" -642 642 | +636 | """ This is a docstring that starts with a space.""" # noqa: D210 +637 | +638 | + - class SameLine: """This is a docstring on the same line""" +639 + class SameLine: """This is a docstring on the same line.""" +640 | +641 | def same_line(): """This is a docstring on the same line""" +642 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:641:18 @@ -304,16 +290,15 @@ D400 [*] First line should end with a period | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add period - -ℹ Unsafe fix -638 638 | -639 639 | class SameLine: """This is a docstring on the same line""" -640 640 | -641 |-def same_line(): """This is a docstring on the same line""" - 641 |+def same_line(): """This is a docstring on the same line.""" -642 642 | -643 643 | -644 644 | def single_line_docstring_with_an_escaped_backslash(): +638 | +639 | class SameLine: """This is a docstring on the same line""" +640 | + - def same_line(): """This is a docstring on the same line""" +641 + def same_line(): """This is a docstring on the same line.""" +642 | +643 | +644 | def single_line_docstring_with_an_escaped_backslash(): +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D.py:664:5 @@ -324,13 +309,12 @@ D400 [*] First line should end with a period | |_________________________________________________________^ | help: Add period - -ℹ Unsafe fix -662 662 | -663 663 | def newline_after_closing_quote(self): -664 664 | "We enforce a newline after the closing quote for a multi-line docstring \ -665 |- but continuations shouldn't be considered multi-line" - 665 |+ but continuations shouldn't be considered multi-line." -666 666 | -667 667 | -668 668 | +662 | +663 | def newline_after_closing_quote(self): +664 | "We enforce a newline after the closing quote for a multi-line docstring \ + - but continuations shouldn't be considered multi-line" +665 + but continuations shouldn't be considered multi-line." +666 | +667 | +668 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap index 096ffb22e5..a3db38099d 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400.py.snap @@ -10,14 +10,13 @@ D400 [*] First line should end with a period 3 | ... | help: Add period - -ℹ Unsafe fix -1 1 | def f(): -2 |- "Here's a line without a period" - 2 |+ "Here's a line without a period." -3 3 | ... -4 4 | -5 5 | +1 | def f(): + - "Here's a line without a period" +2 + "Here's a line without a period." +3 | ... +4 | +5 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:7:5 @@ -28,16 +27,15 @@ D400 [*] First line should end with a period 8 | ... | help: Add period - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | def f(): -7 |- """Here's a line without a period""" - 7 |+ """Here's a line without a period.""" -8 8 | ... -9 9 | -10 10 | +4 | +5 | +6 | def f(): + - """Here's a line without a period""" +7 + """Here's a line without a period.""" +8 | ... +9 | +10 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:12:5 @@ -51,16 +49,15 @@ D400 [*] First line should end with a period 16 | ... | help: Add period - -ℹ Unsafe fix -11 11 | def f(): -12 12 | """ -13 13 | Here's a line without a period, -14 |- but here's the next line - 14 |+ but here's the next line. -15 15 | """ -16 16 | ... -17 17 | +11 | def f(): +12 | """ +13 | Here's a line without a period, + - but here's the next line +14 + but here's the next line. +15 | """ +16 | ... +17 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:20:5 @@ -71,16 +68,15 @@ D400 [*] First line should end with a period 21 | ... | help: Add period - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def f(): -20 |- """Here's a line without a period""" - 20 |+ """Here's a line without a period.""" -21 21 | ... -22 22 | -23 23 | +17 | +18 | +19 | def f(): + - """Here's a line without a period""" +20 + """Here's a line without a period.""" +21 | ... +22 | +23 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:25:5 @@ -93,16 +89,15 @@ D400 [*] First line should end with a period 28 | ... | help: Add period - -ℹ Unsafe fix -24 24 | def f(): -25 25 | """ -26 26 | Here's a line without a period, -27 |- but here's the next line""" - 27 |+ but here's the next line.""" -28 28 | ... -29 29 | -30 30 | +24 | def f(): +25 | """ +26 | Here's a line without a period, + - but here's the next line""" +27 + but here's the next line.""" +28 | ... +29 | +30 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:32:5 @@ -115,16 +110,15 @@ D400 [*] First line should end with a period 35 | ... | help: Add period - -ℹ Unsafe fix -31 31 | def f(): -32 32 | """ -33 33 | Here's a line without a period, -34 |- but here's the next line with trailing space """ - 34 |+ but here's the next line with trailing space. """ -35 35 | ... -36 36 | -37 37 | +31 | def f(): +32 | """ +33 | Here's a line without a period, + - but here's the next line with trailing space """ +34 + but here's the next line with trailing space. """ +35 | ... +36 | +37 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:39:5 @@ -135,16 +129,15 @@ D400 [*] First line should end with a period 40 | ... | help: Add period - -ℹ Unsafe fix -36 36 | -37 37 | -38 38 | def f(): -39 |- r"Here's a line without a period" - 39 |+ r"Here's a line without a period." -40 40 | ... -41 41 | -42 42 | +36 | +37 | +38 | def f(): + - r"Here's a line without a period" +39 + r"Here's a line without a period." +40 | ... +41 | +42 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:44:5 @@ -155,16 +148,15 @@ D400 [*] First line should end with a period 45 | ... | help: Add period - -ℹ Unsafe fix -41 41 | -42 42 | -43 43 | def f(): -44 |- r"""Here's a line without a period""" - 44 |+ r"""Here's a line without a period.""" -45 45 | ... -46 46 | -47 47 | +41 | +42 | +43 | def f(): + - r"""Here's a line without a period""" +44 + r"""Here's a line without a period.""" +45 | ... +46 | +47 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:49:5 @@ -178,16 +170,15 @@ D400 [*] First line should end with a period 53 | ... | help: Add period - -ℹ Unsafe fix -48 48 | def f(): -49 49 | r""" -50 50 | Here's a line without a period, -51 |- but here's the next line - 51 |+ but here's the next line. -52 52 | """ -53 53 | ... -54 54 | +48 | def f(): +49 | r""" +50 | Here's a line without a period, + - but here's the next line +51 + but here's the next line. +52 | """ +53 | ... +54 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:57:5 @@ -198,16 +189,15 @@ D400 [*] First line should end with a period 58 | ... | help: Add period - -ℹ Unsafe fix -54 54 | -55 55 | -56 56 | def f(): -57 |- r"""Here's a line without a period""" - 57 |+ r"""Here's a line without a period.""" -58 58 | ... -59 59 | -60 60 | +54 | +55 | +56 | def f(): + - r"""Here's a line without a period""" +57 + r"""Here's a line without a period.""" +58 | ... +59 | +60 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:62:5 @@ -220,16 +210,15 @@ D400 [*] First line should end with a period 65 | ... | help: Add period - -ℹ Unsafe fix -61 61 | def f(): -62 62 | r""" -63 63 | Here's a line without a period, -64 |- but here's the next line""" - 64 |+ but here's the next line.""" -65 65 | ... -66 66 | -67 67 | +61 | def f(): +62 | r""" +63 | Here's a line without a period, + - but here's the next line""" +64 + but here's the next line.""" +65 | ... +66 | +67 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:69:5 @@ -242,16 +231,15 @@ D400 [*] First line should end with a period 72 | ... | help: Add period - -ℹ Unsafe fix -68 68 | def f(): -69 69 | r""" -70 70 | Here's a line without a period, -71 |- but here's the next line with trailing space """ - 71 |+ but here's the next line with trailing space. """ -72 72 | ... -73 73 | -74 74 | +68 | def f(): +69 | r""" +70 | Here's a line without a period, + - but here's the next line with trailing space """ +71 + but here's the next line with trailing space. """ +72 | ... +73 | +74 | +note: This is an unsafe fix and may change runtime behavior D400 [*] First line should end with a period --> D400.py:97:5 @@ -266,13 +254,12 @@ D400 [*] First line should end with a period | |_______^ | help: Add period - -ℹ Unsafe fix -95 95 | -96 96 | def f(): -97 97 | """ -98 |- My example - 98 |+ My example. -99 99 | ========== -100 100 | -101 101 | My example explanation +95 | +96 | def f(): +97 | """ + - My example +98 + My example. +99 | ========== +100 | +101 | My example explanation +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap index 5f64adf444..9945f1290d 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D400_D400_415.py.snap @@ -50,11 +50,10 @@ D400 [*] First line should end with a period 20 | ... | help: Add period - -ℹ Unsafe fix -16 16 | ... -17 17 | -18 18 | def f(): -19 |- """Here's a line ending with a whitespace """ - 19 |+ """Here's a line ending with a whitespace. """ -20 20 | ... +16 | ... +17 | +18 | def f(): + - """Here's a line ending with a whitespace """ +19 + """Here's a line ending with a whitespace. """ +20 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap index a2f48de1d4..7459658816 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D403_D403.py.snap @@ -11,14 +11,12 @@ D403 [*] First word of the docstring should be capitalized: `this` -> `This` 4 | def good_function(): | help: Capitalize `this` to `This` - -ℹ Safe fix -1 1 | def bad_function(): -2 |- """this docstring is not capitalized""" - 2 |+ """This docstring is not capitalized""" -3 3 | -4 4 | def good_function(): -5 5 | """This docstring is capitalized.""" +1 | def bad_function(): + - """this docstring is not capitalized""" +2 + """This docstring is not capitalized""" +3 | +4 | def good_function(): +5 | """This docstring is capitalized.""" D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:30:5 @@ -30,16 +28,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 32 | def single_word_no_dot(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -27 27 | """th•s is not capitalized.""" -28 28 | -29 29 | def single_word(): -30 |- """singleword.""" - 30 |+ """Singleword.""" -31 31 | -32 32 | def single_word_no_dot(): -33 33 | """singleword""" +27 | """th•s is not capitalized.""" +28 | +29 | def single_word(): + - """singleword.""" +30 + """Singleword.""" +31 | +32 | def single_word_no_dot(): +33 | """singleword""" D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:33:5 @@ -51,16 +47,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 35 | def first_word_lots_of_whitespace(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -30 30 | """singleword.""" -31 31 | -32 32 | def single_word_no_dot(): -33 |- """singleword""" - 33 |+ """Singleword""" -34 34 | -35 35 | def first_word_lots_of_whitespace(): -36 36 | """ +30 | """singleword.""" +31 | +32 | def single_word_no_dot(): + - """singleword""" +33 + """Singleword""" +34 | +35 | def first_word_lots_of_whitespace(): +36 | """ D403 [*] First word of the docstring should be capitalized: `here` -> `Here` --> D403.py:36:5 @@ -79,16 +73,14 @@ D403 [*] First word of the docstring should be capitalized: `here` -> `Here` 45 | def single_word_newline(): | help: Capitalize `here` to `Here` - -ℹ Safe fix -37 37 | -38 38 | -39 39 | -40 |- here is the start of my docstring! - 40 |+ Here is the start of my docstring! -41 41 | -42 42 | What do you think? -43 43 | """ +37 | +38 | +39 | + - here is the start of my docstring! +40 + Here is the start of my docstring! +41 | +42 | What do you think? +43 | """ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:46:5 @@ -102,16 +94,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 50 | def single_word_dot_newline(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -43 43 | """ -44 44 | -45 45 | def single_word_newline(): -46 |- """singleword - 46 |+ """Singleword -47 47 | -48 48 | """ -49 49 | +43 | """ +44 | +45 | def single_word_newline(): + - """singleword +46 + """Singleword +47 | +48 | """ +49 | D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:51:5 @@ -125,16 +115,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 55 | def single_word_second_line(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -48 48 | """ -49 49 | -50 50 | def single_word_dot_newline(): -51 |- """singleword. - 51 |+ """Singleword. -52 52 | -53 53 | """ -54 54 | +48 | """ +49 | +50 | def single_word_dot_newline(): + - """singleword. +51 + """Singleword. +52 | +53 | """ +54 | D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:56:5 @@ -148,16 +136,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 60 | def single_word_dot_second_line(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -54 54 | -55 55 | def single_word_second_line(): -56 56 | """ -57 |- singleword - 57 |+ Singleword -58 58 | """ -59 59 | -60 60 | def single_word_dot_second_line(): +54 | +55 | def single_word_second_line(): +56 | """ + - singleword +57 + Singleword +58 | """ +59 | +60 | def single_word_dot_second_line(): D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:61:5 @@ -171,16 +157,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 65 | def single_word_then_more_text(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -59 59 | -60 60 | def single_word_dot_second_line(): -61 61 | """ -62 |- singleword. - 62 |+ Singleword. -63 63 | """ -64 64 | -65 65 | def single_word_then_more_text(): +59 | +60 | def single_word_dot_second_line(): +61 | """ + - singleword. +62 + Singleword. +63 | """ +64 | +65 | def single_word_then_more_text(): D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:66:5 @@ -195,16 +179,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 71 | def single_word_dot_then_more_text(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -63 63 | """ -64 64 | -65 65 | def single_word_then_more_text(): -66 |- """singleword - 66 |+ """Singleword -67 67 | -68 68 | This is more text. -69 69 | """ +63 | """ +64 | +65 | def single_word_then_more_text(): + - """singleword +66 + """Singleword +67 | +68 | This is more text. +69 | """ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:72:5 @@ -219,16 +201,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 77 | def single_word_second_line_then_more_text(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -69 69 | """ -70 70 | -71 71 | def single_word_dot_then_more_text(): -72 |- """singleword. - 72 |+ """Singleword. -73 73 | -74 74 | This is more text. -75 75 | """ +69 | """ +70 | +71 | def single_word_dot_then_more_text(): + - """singleword. +72 + """Singleword. +73 | +74 | This is more text. +75 | """ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:78:5 @@ -244,16 +224,14 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin 84 | def single_word_dot_second_line_then_more_text(): | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -76 76 | -77 77 | def single_word_second_line_then_more_text(): -78 78 | """ -79 |- singleword - 79 |+ Singleword -80 80 | -81 81 | This is more text. -82 82 | """ +76 | +77 | def single_word_second_line_then_more_text(): +78 | """ + - singleword +79 + Singleword +80 | +81 | This is more text. +82 | """ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Singleword` --> D403.py:85:5 @@ -267,13 +245,11 @@ D403 [*] First word of the docstring should be capitalized: `singleword` -> `Sin | |_______^ | help: Capitalize `singleword` to `Singleword` - -ℹ Safe fix -83 83 | -84 84 | def single_word_dot_second_line_then_more_text(): -85 85 | """ -86 |- singleword. - 86 |+ Singleword. -87 87 | -88 88 | This is more text. -89 89 | """ +83 | +84 | def single_word_dot_second_line_then_more_text(): +85 | """ + - singleword. +86 + Singleword. +87 | +88 | This is more text. +89 | """ diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap index 7a3cecaa19..12b39f0b6e 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D405_sections.py.snap @@ -12,16 +12,14 @@ D405 [*] Section name should be properly capitalized ("returns") 21 | A value of some sort. | help: Capitalize "returns" - -ℹ Safe fix -16 16 | def not_capitalized(): # noqa: D416 -17 17 | """Toggle the gizmo. -18 18 | -19 |- returns - 19 |+ Returns -20 20 | ------- -21 21 | A value of some sort. -22 22 | +16 | def not_capitalized(): # noqa: D416 +17 | """Toggle the gizmo. +18 | + - returns +19 + Returns +20 | ------- +21 | A value of some sort. +22 | D405 [*] Section name should be properly capitalized ("Short summary") --> sections.py:218:5 @@ -33,16 +31,14 @@ D405 [*] Section name should be properly capitalized ("Short summary") 219 | ------------- | help: Capitalize "Short summary" - -ℹ Safe fix -215 215 | def multiple_sections(): # noqa: D416 -216 216 | """Toggle the gizmo. -217 217 | -218 |- Short summary - 218 |+ Short Summary -219 219 | ------------- -220 220 | -221 221 | This is the function's description, which will also specify what it +215 | def multiple_sections(): # noqa: D416 +216 | """Toggle the gizmo. +217 | + - Short summary +218 + Short Summary +219 | ------------- +220 | +221 | This is the function's description, which will also specify what it D405 [*] Section name should be properly capitalized ("returns") --> sections.py:573:5 @@ -55,13 +51,11 @@ D405 [*] Section name should be properly capitalized ("returns") 575 | """ | help: Capitalize "returns" - -ℹ Safe fix -570 570 | Args: -571 571 | arg: Here's a note. -572 572 | -573 |- returns: - 573 |+ Returns: -574 574 | Here's another note. -575 575 | """ -576 576 | +570 | Args: +571 | arg: Here's a note. +572 | + - returns: +573 + Returns: +574 | Here's another note. +575 | """ +576 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap index d2f758e3a5..cb5e3a4582 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D406_sections.py.snap @@ -12,16 +12,14 @@ D406 [*] Section name should end with a newline ("Returns") 34 | A value of some sort. | help: Add newline after "Returns" - -ℹ Safe fix -29 29 | def superfluous_suffix(): # noqa: D416 -30 30 | """Toggle the gizmo. -31 31 | -32 |- Returns: - 32 |+ Returns -33 33 | ------- -34 34 | A value of some sort. -35 35 | +29 | def superfluous_suffix(): # noqa: D416 +30 | """Toggle the gizmo. +31 | + - Returns: +32 + Returns +33 | ------- +34 | A value of some sort. +35 | D406 [*] Section name should end with a newline ("Raises") --> sections.py:227:5 @@ -33,16 +31,14 @@ D406 [*] Section name should end with a newline ("Raises") 228 | My attention. | help: Add newline after "Raises" - -ℹ Safe fix -224 224 | Returns -225 225 | ------ -226 226 | Many many wonderful things. -227 |- Raises: - 227 |+ Raises -228 228 | My attention. -229 229 | -230 230 | """ +224 | Returns +225 | ------ +226 | Many many wonderful things. + - Raises: +227 + Raises +228 | My attention. +229 | +230 | """ D406 [*] Section name should end with a newline ("Parameters") --> sections.py:601:5 @@ -55,13 +51,11 @@ D406 [*] Section name should end with a newline ("Parameters") 603 | parameters: | help: Add newline after "Parameters" - -ℹ Safe fix -598 598 | def test_lowercase_sub_section_header_should_be_valid(parameters: list[str], value: int): # noqa: D213 -599 599 | """Test that lower case subsection header is valid even if it has the same name as section kind. -600 600 | -601 |- Parameters: - 601 |+ Parameters -602 602 | ---------- -603 603 | parameters: -604 604 | A list of string parameters +598 | def test_lowercase_sub_section_header_should_be_valid(parameters: list[str], value: int): # noqa: D213 +599 | """Test that lower case subsection header is valid even if it has the same name as section kind. +600 | + - Parameters: +601 + Parameters +602 | ---------- +603 | parameters: +604 | A list of string parameters diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap index 6a46781233..66af4769f3 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D407_sections.py.snap @@ -11,15 +11,13 @@ D407 [*] Missing dashed underline after section ("Returns") 45 | A value of some sort. | help: Add dashed line under "Returns" - -ℹ Safe fix -42 42 | """Toggle the gizmo. -43 43 | -44 44 | Returns - 45 |+ ------- -45 46 | A value of some sort. -46 47 | -47 48 | """ +42 | """Toggle the gizmo. +43 | +44 | Returns +45 + ------- +46 | A value of some sort. +47 | +48 | """ D407 [*] Missing dashed underline after section ("Returns") --> sections.py:56:5 @@ -32,15 +30,13 @@ D407 [*] Missing dashed underline after section ("Returns") 58 | """ | help: Add dashed line under "Returns" - -ℹ Safe fix -54 54 | """Toggle the gizmo. -55 55 | -56 56 | Returns - 57 |+ ------- -57 58 | -58 59 | """ -59 60 | +54 | """Toggle the gizmo. +55 | +56 | Returns +57 + ------- +58 | +59 | """ +60 | D407 [*] Missing dashed underline after section ("Returns") --> sections.py:67:5 @@ -51,17 +47,15 @@ D407 [*] Missing dashed underline after section ("Returns") | ^^^^^^^ | help: Add dashed line under "Returns" - -ℹ Safe fix -64 64 | def no_underline_and_no_newline(): # noqa: D416 -65 65 | """Toggle the gizmo. -66 66 | -67 |- Returns""" - 67 |+ Returns - 68 |+ -------""" -68 69 | -69 70 | -70 71 | @expect(_D213) +64 | def no_underline_and_no_newline(): # noqa: D416 +65 | """Toggle the gizmo. +66 | + - Returns""" +67 + Returns +68 + -------""" +69 | +70 | +71 | @expect(_D213) D407 [*] Missing dashed underline after section ("Raises") --> sections.py:227:5 @@ -73,15 +67,13 @@ D407 [*] Missing dashed underline after section ("Raises") 228 | My attention. | help: Add dashed line under "Raises" - -ℹ Safe fix -225 225 | ------ -226 226 | Many many wonderful things. -227 227 | Raises: - 228 |+ ------ -228 229 | My attention. -229 230 | -230 231 | """ +225 | ------ +226 | Many many wonderful things. +227 | Raises: +228 + ------ +229 | My attention. +230 | +231 | """ D407 [*] Missing dashed underline after section ("Parameters") --> sections.py:522:5 @@ -92,16 +84,14 @@ D407 [*] Missing dashed underline after section ("Parameters") 523 | """ | help: Add dashed line under "Parameters" - -ℹ Safe fix -519 519 | """Equal length equals should be replaced with dashes. -520 520 | -521 521 | Parameters -522 |- ========== - 522 |+ ---------- -523 523 | """ -524 524 | -525 525 | +519 | """Equal length equals should be replaced with dashes. +520 | +521 | Parameters + - ========== +522 + ---------- +523 | """ +524 | +525 | D407 [*] Missing dashed underline after section ("Parameters") --> sections.py:530:5 @@ -112,16 +102,14 @@ D407 [*] Missing dashed underline after section ("Parameters") 531 | """ | help: Add dashed line under "Parameters" - -ℹ Safe fix -527 527 | """Here, the length of equals is not the same. -528 528 | -529 529 | Parameters -530 |- =========== - 530 |+ ---------- -531 531 | """ -532 532 | -533 533 | +527 | """Here, the length of equals is not the same. +528 | +529 | Parameters + - =========== +530 + ---------- +531 | """ +532 | +533 | D407 [*] Missing dashed underline after section ("Parameters") --> sections.py:613:4 @@ -134,12 +122,10 @@ D407 [*] Missing dashed underline after section ("Parameters") 615 | returns: | help: Add dashed line under "Parameters" - -ℹ Safe fix -611 611 | """Test that lower case subsection header is valid even if it is of a different kind. -612 612 | -613 613 | Parameters - 614 |+ ---------- -614 615 | -‐----------------- -615 616 | returns: -616 617 | some value +611 | """Test that lower case subsection header is valid even if it is of a different kind. +612 | +613 | Parameters +614 + ---------- +615 | -‐----------------- +616 | returns: +617 | some value diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap index 4ebd79bda4..3a668bc5ae 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D408_sections.py.snap @@ -11,12 +11,10 @@ D408 [*] Section underline should be in the line following the section's name (" 99 | A value of some sort. | help: Add underline to "Returns" - -ℹ Safe fix -94 94 | """Toggle the gizmo. -95 95 | -96 96 | Returns -97 |- -98 97 | ------- -99 98 | A value of some sort. -100 99 | +94 | """Toggle the gizmo. +95 | +96 | Returns + - +97 | ------- +98 | A value of some sort. +99 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap index a87eb5ac32..cdb27b3d52 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D409_sections.py.snap @@ -10,16 +10,14 @@ D409 [*] Section underline should match the length of its name ("Returns") 112 | A value of some sort. | help: Adjust underline length to match "Returns" - -ℹ Safe fix -108 108 | """Toggle the gizmo. -109 109 | -110 110 | Returns -111 |- -- - 111 |+ ------- -112 112 | A value of some sort. -113 113 | -114 114 | """ +108 | """Toggle the gizmo. +109 | +110 | Returns + - -- +111 + ------- +112 | A value of some sort. +113 | +114 | """ D409 [*] Section underline should match the length of its name ("Returns") --> sections.py:225:5 @@ -31,16 +29,14 @@ D409 [*] Section underline should match the length of its name ("Returns") 227 | Raises: | help: Adjust underline length to match "Returns" - -ℹ Safe fix -222 222 | returns. -223 223 | -224 224 | Returns -225 |- ------ - 225 |+ ------- -226 226 | Many many wonderful things. -227 227 | Raises: -228 228 | My attention. +222 | returns. +223 | +224 | Returns + - ------ +225 + ------- +226 | Many many wonderful things. +227 | Raises: +228 | My attention. D409 [*] Section underline should match the length of its name ("Other Parameters") --> sections.py:589:5 @@ -52,13 +48,11 @@ D409 [*] Section underline should match the length of its name ("Other Parameter 591 | A dictionary of string attributes | help: Adjust underline length to match "Other Parameters" - -ℹ Safe fix -586 586 | A dictionary of string attributes -587 587 | -588 588 | Other Parameters -589 |- ---------- - 589 |+ ---------------- -590 590 | other_parameters: -591 591 | A dictionary of string attributes -592 592 | parameters: +586 | A dictionary of string attributes +587 | +588 | Other Parameters + - ---------- +589 + ---------------- +590 | other_parameters: +591 | A dictionary of string attributes +592 | parameters: diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap index d4cba2ca9f..5b6c02d505 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_D410.py.snap @@ -12,15 +12,13 @@ D410 [*] Missing blank line after section ("Parameters") 6 | a : int | help: Add blank line after "Parameters" - -ℹ Safe fix -7 7 | _description_ -8 8 | b : int -9 9 | _description_ - 10 |+ -10 11 | Returns -11 12 | ------- -12 13 | int +7 | _description_ +8 | b : int +9 | _description_ +10 + +11 | Returns +12 | ------- +13 | int D410 [*] Missing blank line after section ("Parameters") --> D410.py:21:5 @@ -33,12 +31,10 @@ D410 [*] Missing blank line after section ("Parameters") 23 | Returns | help: Add blank line after "Parameters" - -ℹ Safe fix -20 20 | -21 21 | Parameters -22 22 | ---------- - 23 |+ -23 24 | Returns -24 25 | ------- -25 26 | """ +20 | +21 | Parameters +22 | ---------- +23 + +24 | Returns +25 | ------- +26 | """ diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap index efd8950322..ac9a6968a8 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D410_sections.py.snap @@ -12,15 +12,13 @@ D410 [*] Missing blank line after section ("Returns") 80 | Yields | help: Add blank line after "Returns" - -ℹ Safe fix -77 77 | -78 78 | Returns -79 79 | ------- - 80 |+ -80 81 | Yields -81 82 | ------ -82 83 | +77 | +78 | Returns +79 | ------- +80 + +81 | Yields +82 | ------ +83 | D410 [*] Missing blank line after section ("Returns") --> sections.py:224:5 @@ -33,12 +31,10 @@ D410 [*] Missing blank line after section ("Returns") 226 | Many many wonderful things. | help: Add blank line after "Returns" - -ℹ Safe fix -224 224 | Returns -225 225 | ------ -226 226 | Many many wonderful things. - 227 |+ -227 228 | Raises: -228 229 | My attention. -229 230 | +224 | Returns +225 | ------ +226 | Many many wonderful things. +227 + +228 | Raises: +229 | My attention. +230 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap index f4b40fa690..4a12abe6e5 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D411_sections.py.snap @@ -11,15 +11,13 @@ D411 [*] Missing blank line before section ("Yields") 81 | ------ | help: Add blank line before "Yields" - -ℹ Safe fix -77 77 | -78 78 | Returns -79 79 | ------- - 80 |+ -80 81 | Yields -81 82 | ------ -82 83 | +77 | +78 | Returns +79 | ------- +80 + +81 | Yields +82 | ------ +83 | D411 [*] Missing blank line before section ("Returns") --> sections.py:134:5 @@ -31,15 +29,13 @@ D411 [*] Missing blank line before section ("Returns") 136 | A value of some sort. | help: Add blank line before "Returns" - -ℹ Safe fix -131 131 | """Toggle the gizmo. -132 132 | -133 133 | The function's description. - 134 |+ -134 135 | Returns -135 136 | ------- -136 137 | A value of some sort. +131 | """Toggle the gizmo. +132 | +133 | The function's description. +134 + +135 | Returns +136 | ------- +137 | A value of some sort. D411 [*] Missing blank line before section ("Raises") --> sections.py:227:5 @@ -51,12 +47,10 @@ D411 [*] Missing blank line before section ("Raises") 228 | My attention. | help: Add blank line before "Raises" - -ℹ Safe fix -224 224 | Returns -225 225 | ------ -226 226 | Many many wonderful things. - 227 |+ -227 228 | Raises: -228 229 | My attention. -229 230 | +224 | Returns +225 | ------ +226 | Many many wonderful things. +227 + +228 | Raises: +229 | My attention. +230 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap index 715e1abb87..40bad80d92 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sections.py.snap @@ -11,12 +11,10 @@ D412 [*] No blank lines allowed between a section header and its content ("Short 219 | ------------- | help: Remove blank line(s) - -ℹ Safe fix -217 217 | -218 218 | Short summary -219 219 | ------------- -220 |- -221 220 | This is the function's description, which will also specify what it -222 221 | returns. -223 222 | +217 | +218 | Short summary +219 | ------------- + - +220 | This is the function's description, which will also specify what it +221 | returns. +222 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap index 98b536302c..67cc310129 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D412_sphinx.py.snap @@ -10,15 +10,13 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp | ^^^^^^^ | help: Remove blank line(s) - -ℹ Safe fix -12 12 | """ -13 13 | Example: -14 14 | -15 |- -16 15 | .. code-block:: python -17 16 | -18 17 | import foo +12 | """ +13 | Example: +14 | + - +15 | .. code-block:: python +16 | +17 | import foo D412 [*] No blank lines allowed between a section header and its content ("Example") --> sphinx.py:24:5 @@ -29,16 +27,14 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp | ^^^^^^^ | help: Remove blank line(s) - -ℹ Safe fix -23 23 | """ -24 24 | Example: -25 25 | -26 |- -27 |- -28 26 | .. code-block:: python -29 27 | -30 28 | import foo +23 | """ +24 | Example: +25 | + - + - +26 | .. code-block:: python +27 | +28 | import foo D412 [*] No blank lines allowed between a section header and its content ("Example") --> sphinx.py:47:5 @@ -50,15 +46,13 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp 48 | ------- | help: Remove blank line(s) - -ℹ Safe fix -47 47 | Example -48 48 | ------- -49 49 | -50 |- -51 50 | .. code-block:: python -52 51 | -53 52 | import foo +47 | Example +48 | ------- +49 | + - +50 | .. code-block:: python +51 | +52 | import foo D412 [*] No blank lines allowed between a section header and its content ("Example") --> sphinx.py:59:5 @@ -70,13 +64,11 @@ D412 [*] No blank lines allowed between a section header and its content ("Examp 60 | ------- | help: Remove blank line(s) - -ℹ Safe fix -59 59 | Example -60 60 | ------- -61 61 | -62 |- -63 |- -64 62 | .. code-block:: python -65 63 | -66 64 | import foo +59 | Example +60 | ------- +61 | + - + - +62 | .. code-block:: python +63 | +64 | import foo diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap index 0830634d78..d0f44e907a 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_D413.py.snap @@ -12,15 +12,13 @@ D413 [*] Missing blank line after last section ("Returns") 9 | """ | help: Add blank line after "Returns" - -ℹ Safe fix -6 6 | -7 7 | Returns: -8 8 | the value - 9 |+ -9 10 | """ -10 11 | -11 12 | +6 | +7 | Returns: +8 | the value +9 + +10 | """ +11 | +12 | D413 [*] Missing blank line after last section ("Returns") --> D413.py:19:5 @@ -33,15 +31,13 @@ D413 [*] Missing blank line after last section ("Returns") 21 | """ | help: Add blank line after "Returns" - -ℹ Safe fix -18 18 | -19 19 | Returns: -20 20 | the value - 21 |+ -21 22 | """ -22 23 | -23 24 | +18 | +19 | Returns: +20 | the value +21 + +22 | """ +23 | +24 | D413 [*] Missing blank line after last section ("Returns") --> D413.py:58:5 @@ -53,18 +49,16 @@ D413 [*] Missing blank line after last section ("Returns") 59 | the value""" | help: Add blank line after "Returns" - -ℹ Safe fix -56 56 | with a hanging indent -57 57 | -58 58 | Returns: -59 |- the value""" - 59 |+ the value - 60 |+ - 61 |+ """ -60 62 | -61 63 | -62 64 | def func(): +56 | with a hanging indent +57 | +58 | Returns: + - the value""" +59 + the value +60 + +61 + """ +62 | +63 | +64 | def func(): D413 [*] Missing blank line after last section ("Returns") --> D413.py:69:5 @@ -77,18 +71,16 @@ D413 [*] Missing blank line after last section ("Returns") 71 | """ | help: Add blank line after "Returns" - -ℹ Safe fix -68 68 | -69 69 | Returns: -70 70 | the value -71 |- """ -72 71 | - 72 |+ """ - 73 |+ -73 74 | -74 75 | def func(): -75 76 | ("""Docstring. +68 | +69 | Returns: +70 | the value + - """ +71 | +72 + """ +73 + +74 | +75 | def func(): +76 | ("""Docstring. D413 [*] Missing blank line after last section ("Raises") --> D413.py:77:5 @@ -101,10 +93,8 @@ D413 [*] Missing blank line after last section ("Raises") 79 | """) | help: Add blank line after "Raises" - -ℹ Safe fix -76 76 | -77 77 | Raises: -78 78 | ValueError: An error. - 79 |+ -79 80 | """) +76 | +77 | Raises: +78 | ValueError: An error. +79 + +80 | """) diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap index ac2dba9162..0bad62bf08 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D413_sections.py.snap @@ -10,18 +10,16 @@ D413 [*] Missing blank line after last section ("Returns") | ^^^^^^^ | help: Add blank line after "Returns" - -ℹ Safe fix -64 64 | def no_underline_and_no_newline(): # noqa: D416 -65 65 | """Toggle the gizmo. -66 66 | -67 |- Returns""" - 67 |+ Returns - 68 |+ - 69 |+ """ -68 70 | -69 71 | -70 72 | @expect(_D213) +64 | def no_underline_and_no_newline(): # noqa: D416 +65 | """Toggle the gizmo. +66 | + - Returns""" +67 + Returns +68 + +69 + """ +70 | +71 | +72 | @expect(_D213) D413 [*] Missing blank line after last section ("Returns") --> sections.py:122:5 @@ -34,15 +32,13 @@ D413 [*] Missing blank line after last section ("Returns") 124 | A value of some sort. | help: Add blank line after "Returns" - -ℹ Safe fix -122 122 | Returns -123 123 | ------- -124 124 | A value of some sort. - 125 |+ -125 126 | """ -126 127 | -127 128 | +122 | Returns +123 | ------- +124 | A value of some sort. +125 + +126 | """ +127 | +128 | D413 [*] Missing blank line after last section ("Returns") --> sections.py:172:5 @@ -55,15 +51,13 @@ D413 [*] Missing blank line after last section ("Returns") 174 | """ | help: Add blank line after "Returns" - -ℹ Safe fix -171 171 | -172 172 | Returns -173 173 | ------- - 174 |+ -174 175 | """ -175 176 | -176 177 | +171 | +172 | Returns +173 | ------- +174 + +175 | """ +176 | +177 | D413 [*] Missing blank line after last section ("Parameters") --> sections.py:521:5 @@ -76,15 +70,13 @@ D413 [*] Missing blank line after last section ("Parameters") 523 | """ | help: Add blank line after "Parameters" - -ℹ Safe fix -520 520 | -521 521 | Parameters -522 522 | ========== - 523 |+ -523 524 | """ -524 525 | -525 526 | +520 | +521 | Parameters +522 | ========== +523 + +524 | """ +525 | +526 | D413 [*] Missing blank line after last section ("Parameters") --> sections.py:529:5 @@ -97,15 +89,13 @@ D413 [*] Missing blank line after last section ("Parameters") 531 | """ | help: Add blank line after "Parameters" - -ℹ Safe fix -528 528 | -529 529 | Parameters -530 530 | =========== - 531 |+ -531 532 | """ -532 533 | -533 534 | +528 | +529 | Parameters +530 | =========== +531 + +532 | """ +533 | +534 | D413 [*] Missing blank line after last section ("Args") --> sections.py:550:5 @@ -117,15 +107,13 @@ D413 [*] Missing blank line after last section ("Args") 551 | Here's a note. | help: Add blank line after "Args" - -ℹ Safe fix -551 551 | Here's a note. -552 552 | -553 553 | returns: - 554 |+ -554 555 | """ -555 556 | -556 557 | +551 | Here's a note. +552 | +553 | returns: +554 + +555 | """ +556 | +557 | D413 [*] Missing blank line after last section ("Returns") --> sections.py:563:9 @@ -137,15 +125,13 @@ D413 [*] Missing blank line after last section ("Returns") 564 | """ | help: Add blank line after "Returns" - -ℹ Safe fix -561 561 | Here's a note. -562 562 | -563 563 | Returns: - 564 |+ -564 565 | """ -565 566 | -566 567 | +561 | Here's a note. +562 | +563 | Returns: +564 + +565 | """ +566 | +567 | D413 [*] Missing blank line after last section ("returns") --> sections.py:573:5 @@ -158,15 +144,13 @@ D413 [*] Missing blank line after last section ("returns") 575 | """ | help: Add blank line after "returns" - -ℹ Safe fix -572 572 | -573 573 | returns: -574 574 | Here's another note. - 575 |+ -575 576 | """ -576 577 | -577 578 | +572 | +573 | returns: +574 | Here's another note. +575 + +576 | """ +577 | +578 | D413 [*] Missing blank line after last section ("Parameters") --> sections.py:601:5 @@ -179,12 +163,10 @@ D413 [*] Missing blank line after last section ("Parameters") 603 | parameters: | help: Add blank line after "Parameters" - -ℹ Safe fix -604 604 | A list of string parameters -605 605 | value: -606 606 | Some value - 607 |+ -607 608 | """ -608 609 | -609 610 | +604 | A list of string parameters +605 | value: +606 | Some value +607 + +608 | """ +609 | +610 | diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap index f342894e32..119389116a 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D.py.snap @@ -10,16 +10,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | ^^^^^^^^^^^^^ | help: Add closing punctuation - -ℹ Unsafe fix -352 352 | @expect("D415: First line should end with a period, question mark, " -353 353 | "or exclamation point (not 'y')") -354 354 | def lwnlkjl(): -355 |- """Summary""" - 355 |+ """Summary.""" -356 356 | -357 357 | -358 358 | @expect("D401: First line should be in imperative mood " +352 | @expect("D415: First line should end with a period, question mark, " +353 | "or exclamation point (not 'y')") +354 | def lwnlkjl(): + - """Summary""" +355 + """Summary.""" +356 | +357 | +358 | @expect("D401: First line should be in imperative mood " +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:406:25 @@ -30,16 +29,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | ^^^^^^^^^^^^^^^ | help: Add closing punctuation - -ℹ Unsafe fix -403 403 | @expect("D400: First line should end with a period (not 'r')") -404 404 | @expect("D415: First line should end with a period, question mark," -405 405 | " or exclamation point (not 'r')") -406 |-def oneliner_withdoc(): """One liner""" - 406 |+def oneliner_withdoc(): """One liner.""" -407 407 | -408 408 | -409 409 | def ignored_decorator(func): # noqa: D400,D401,D415 +403 | @expect("D400: First line should end with a period (not 'r')") +404 | @expect("D415: First line should end with a period, question mark," +405 | " or exclamation point (not 'r')") + - def oneliner_withdoc(): """One liner""" +406 + def oneliner_withdoc(): """One liner.""" +407 | +408 | +409 | def ignored_decorator(func): # noqa: D400,D401,D415 +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:410:5 @@ -51,16 +49,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 412 | pass | help: Add closing punctuation - -ℹ Unsafe fix -407 407 | -408 408 | -409 409 | def ignored_decorator(func): # noqa: D400,D401,D415 -410 |- """Runs something""" - 410 |+ """Runs something.""" -411 411 | func() -412 412 | pass -413 413 | +407 | +408 | +409 | def ignored_decorator(func): # noqa: D400,D401,D415 + - """Runs something""" +410 + """Runs something.""" +411 | func() +412 | pass +413 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:416:5 @@ -72,16 +69,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 418 | pass | help: Add closing punctuation - -ℹ Unsafe fix -413 413 | -414 414 | -415 415 | def decorator_for_test(func): # noqa: D400,D401,D415 -416 |- """Runs something""" - 416 |+ """Runs something.""" -417 417 | func() -418 418 | pass -419 419 | +413 | +414 | +415 | def decorator_for_test(func): # noqa: D400,D401,D415 + - """Runs something""" +416 + """Runs something.""" +417 | func() +418 | pass +419 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:422:35 @@ -91,16 +87,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | ^^^^^^^^^^^^^^^ | help: Add closing punctuation - -ℹ Unsafe fix -419 419 | -420 420 | -421 421 | @ignored_decorator -422 |-def oneliner_ignored_decorator(): """One liner""" - 422 |+def oneliner_ignored_decorator(): """One liner.""" -423 423 | -424 424 | -425 425 | @decorator_for_test +419 | +420 | +421 | @ignored_decorator + - def oneliner_ignored_decorator(): """One liner""" +422 + def oneliner_ignored_decorator(): """One liner.""" +423 | +424 | +425 | @decorator_for_test +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:429:49 @@ -111,16 +106,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | ^^^^^^^^^^^^^^^ | help: Add closing punctuation - -ℹ Unsafe fix -426 426 | @expect("D400: First line should end with a period (not 'r')") -427 427 | @expect("D415: First line should end with a period, question mark," -428 428 | " or exclamation point (not 'r')") -429 |-def oneliner_with_decorator_expecting_errors(): """One liner""" - 429 |+def oneliner_with_decorator_expecting_errors(): """One liner.""" -430 430 | -431 431 | -432 432 | @decorator_for_test +426 | @expect("D400: First line should end with a period (not 'r')") +427 | @expect("D415: First line should end with a period, question mark," +428 | " or exclamation point (not 'r')") + - def oneliner_with_decorator_expecting_errors(): """One liner""" +429 + def oneliner_with_decorator_expecting_errors(): """One liner.""" +430 | +431 | +432 | @decorator_for_test +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:470:5 @@ -132,16 +126,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 471 | pass | help: Add closing punctuation - -ℹ Unsafe fix -467 467 | @expect("D415: First line should end with a period, question mark, " -468 468 | "or exclamation point (not 'g')") -469 469 | def docstring_bad(): -470 |- """Runs something""" - 470 |+ """Runs something.""" -471 471 | pass -472 472 | -473 473 | +467 | @expect("D415: First line should end with a period, question mark, " +468 | "or exclamation point (not 'g')") +469 | def docstring_bad(): + - """Runs something""" +470 + """Runs something.""" +471 | pass +472 | +473 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:475:5 @@ -152,16 +145,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 476 | pass | help: Add closing punctuation - -ℹ Unsafe fix -472 472 | -473 473 | -474 474 | def docstring_bad_ignore_all(): # noqa -475 |- """Runs something""" - 475 |+ """Runs something.""" -476 476 | pass -477 477 | -478 478 | +472 | +473 | +474 | def docstring_bad_ignore_all(): # noqa + - """Runs something""" +475 + """Runs something.""" +476 | pass +477 | +478 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:480:5 @@ -172,16 +164,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 481 | pass | help: Add closing punctuation - -ℹ Unsafe fix -477 477 | -478 478 | -479 479 | def docstring_bad_ignore_one(): # noqa: D400,D401,D415 -480 |- """Runs something""" - 480 |+ """Runs something.""" -481 481 | pass -482 482 | -483 483 | +477 | +478 | +479 | def docstring_bad_ignore_one(): # noqa: D400,D401,D415 + - """Runs something""" +480 + """Runs something.""" +481 | pass +482 | +483 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:487:5 @@ -193,16 +184,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 488 | pass | help: Add closing punctuation - -ℹ Unsafe fix -484 484 | @expect("D401: First line should be in imperative mood " -485 485 | "(perhaps 'Run', not 'Runs')") -486 486 | def docstring_ignore_some_violations_but_catch_D401(): # noqa: E501,D400,D415 -487 |- """Runs something""" - 487 |+ """Runs something.""" -488 488 | pass -489 489 | -490 490 | +484 | @expect("D401: First line should be in imperative mood " +485 | "(perhaps 'Run', not 'Runs')") +486 | def docstring_ignore_some_violations_but_catch_D401(): # noqa: E501,D400,D415 + - """Runs something""" +487 + """Runs something.""" +488 | pass +489 | +490 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:520:5 @@ -213,16 +203,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add closing punctuation - -ℹ Unsafe fix -517 517 | @expect("D415: First line should end with a period, question mark, " -518 518 | "or exclamation point (not 'g')") -519 519 | def bad_google_string(): # noqa: D400 -520 |- """Test a valid something""" - 520 |+ """Test a valid something.""" -521 521 | -522 522 | -523 523 | # This is reproducing a bug where AttributeError is raised when parsing class +517 | @expect("D415: First line should end with a period, question mark, " +518 | "or exclamation point (not 'g')") +519 | def bad_google_string(): # noqa: D400 + - """Test a valid something""" +520 + """Test a valid something.""" +521 | +522 | +523 | # This is reproducing a bug where AttributeError is raised when parsing class +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:581:5 @@ -233,16 +222,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add closing punctuation - -ℹ Unsafe fix -578 578 | @expect("D415: First line should end with a period, question mark, " -579 579 | "or exclamation point (not '\"')") -580 580 | def endswith_quote(): -581 |- """Whitespace at the end, but also a quote" """ - 581 |+ """Whitespace at the end, but also a quote". """ -582 582 | -583 583 | -584 584 | @expect('D209: Multi-line docstring closing quotes should be on a separate ' +578 | @expect("D415: First line should end with a period, question mark, " +579 | "or exclamation point (not '\"')") +580 | def endswith_quote(): + - """Whitespace at the end, but also a quote" """ +581 + """Whitespace at the end, but also a quote". """ +582 | +583 | +584 | @expect('D209: Multi-line docstring closing quotes should be on a separate ' +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:615:5 @@ -255,16 +243,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | |_______^ | help: Add closing punctuation - -ℹ Unsafe fix -612 612 | '(found 3)') -613 613 | @expect('D212: Multi-line docstring summary should start at the first line') -614 614 | def one_liner(): -615 |- """Wrong." - 615 |+ """Wrong.". -616 616 | -617 617 | """ -618 618 | +612 | '(found 3)') +613 | @expect('D212: Multi-line docstring summary should start at the first line') +614 | def one_liner(): + - """Wrong." +615 + """Wrong.". +616 | +617 | """ +618 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:639:17 @@ -275,16 +262,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 641 | def same_line(): """This is a docstring on the same line""" | help: Add closing punctuation - -ℹ Unsafe fix -636 636 | """ This is a docstring that starts with a space.""" # noqa: D210 -637 637 | -638 638 | -639 |-class SameLine: """This is a docstring on the same line""" - 639 |+class SameLine: """This is a docstring on the same line.""" -640 640 | -641 641 | def same_line(): """This is a docstring on the same line""" -642 642 | +636 | """ This is a docstring that starts with a space.""" # noqa: D210 +637 | +638 | + - class SameLine: """This is a docstring on the same line""" +639 + class SameLine: """This is a docstring on the same line.""" +640 | +641 | def same_line(): """This is a docstring on the same line""" +642 | +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:641:18 @@ -295,16 +281,15 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add closing punctuation - -ℹ Unsafe fix -638 638 | -639 639 | class SameLine: """This is a docstring on the same line""" -640 640 | -641 |-def same_line(): """This is a docstring on the same line""" - 641 |+def same_line(): """This is a docstring on the same line.""" -642 642 | -643 643 | -644 644 | def single_line_docstring_with_an_escaped_backslash(): +638 | +639 | class SameLine: """This is a docstring on the same line""" +640 | + - def same_line(): """This is a docstring on the same line""" +641 + def same_line(): """This is a docstring on the same line.""" +642 | +643 | +644 | def single_line_docstring_with_an_escaped_backslash(): +note: This is an unsafe fix and may change runtime behavior D415 [*] First line should end with a period, question mark, or exclamation point --> D.py:664:5 @@ -315,13 +300,12 @@ D415 [*] First line should end with a period, question mark, or exclamation poin | |_________________________________________________________^ | help: Add closing punctuation - -ℹ Unsafe fix -662 662 | -663 663 | def newline_after_closing_quote(self): -664 664 | "We enforce a newline after the closing quote for a multi-line docstring \ -665 |- but continuations shouldn't be considered multi-line" - 665 |+ but continuations shouldn't be considered multi-line." -666 666 | -667 667 | -668 668 | +662 | +663 | def newline_after_closing_quote(self): +664 | "We enforce a newline after the closing quote for a multi-line docstring \ + - but continuations shouldn't be considered multi-line" +665 + but continuations shouldn't be considered multi-line." +666 | +667 | +668 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap index eba6769802..cdaf36bc26 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__D415_D400_415.py.snap @@ -30,11 +30,10 @@ D415 [*] First line should end with a period, question mark, or exclamation poin 20 | ... | help: Add closing punctuation - -ℹ Unsafe fix -16 16 | ... -17 17 | -18 18 | def f(): -19 |- """Here's a line ending with a whitespace """ - 19 |+ """Here's a line ending with a whitespace. """ -20 20 | ... +16 | ... +17 | +18 | def f(): + - """Here's a line ending with a whitespace """ +19 + """Here's a line ending with a whitespace. """ +20 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap index 5c3bf3e0bd..134327fe30 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__bom.snap @@ -8,7 +8,5 @@ D300 [*] Use triple double quotes `"""` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to triple double quotes - -ℹ Safe fix -1 |-''' SAM macro definitions ''' - 1 |+""" SAM macro definitions """ + - ''' SAM macro definitions ''' +1 + """ SAM macro definitions """ diff --git a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap index 262bc67768..cd1e64586a 100644 --- a/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap +++ b/crates/ruff_linter/src/rules/pydocstyle/snapshots/ruff_linter__rules__pydocstyle__tests__d209_d400.snap @@ -10,13 +10,11 @@ D209 [*] Multi-line docstring closing quotes should be on a separate line | |________________________________________________________________________^ | help: Move closing quotes to new line - -ℹ Safe fix -1 1 | def lorem(): -2 2 | """lorem ipsum dolor sit amet consectetur adipiscing elit -3 |- sed do eiusmod tempor incididunt ut labore et dolore magna aliqua""" - 3 |+ sed do eiusmod tempor incididunt ut labore et dolore magna aliqua - 4 |+ """ +1 | def lorem(): +2 | """lorem ipsum dolor sit amet consectetur adipiscing elit + - sed do eiusmod tempor incididunt ut labore et dolore magna aliqua""" +3 + sed do eiusmod tempor incididunt ut labore et dolore magna aliqua +4 + """ D400 [*] First line should end with a period --> D209_D400.py:2:5 @@ -27,9 +25,8 @@ D400 [*] First line should end with a period | |________________________________________________________________________^ | help: Add period - -ℹ Unsafe fix -1 1 | def lorem(): -2 2 | """lorem ipsum dolor sit amet consectetur adipiscing elit -3 |- sed do eiusmod tempor incididunt ut labore et dolore magna aliqua""" - 3 |+ sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.""" +1 | def lorem(): +2 | """lorem ipsum dolor sit amet consectetur adipiscing elit + - sed do eiusmod tempor incididunt ut labore et dolore magna aliqua""" +3 + sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.""" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap index 68c8fc9e8a..6f4ab6f43d 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_0.py.snap @@ -11,14 +11,12 @@ F401 [*] `functools` imported but unused 4 | from collections import ( | help: Remove unused import: `functools` - -ℹ Safe fix -1 1 | from __future__ import all_feature_names -2 |-import functools, os - 2 |+import os -3 3 | from datetime import datetime -4 4 | from collections import ( -5 5 | Counter, +1 | from __future__ import all_feature_names + - import functools, os +2 + import os +3 | from datetime import datetime +4 | from collections import ( +5 | Counter, F401 [*] `collections.OrderedDict` imported but unused --> F401_0.py:6:5 @@ -31,15 +29,13 @@ F401 [*] `collections.OrderedDict` imported but unused 8 | ) | help: Remove unused import: `collections.OrderedDict` - -ℹ Safe fix -3 3 | from datetime import datetime -4 4 | from collections import ( -5 5 | Counter, -6 |- OrderedDict, -7 6 | namedtuple, -8 7 | ) -9 8 | import multiprocessing.pool +3 | from datetime import datetime +4 | from collections import ( +5 | Counter, + - OrderedDict, +6 | namedtuple, +7 | ) +8 | import multiprocessing.pool F401 [*] `logging.handlers` imported but unused --> F401_0.py:12:8 @@ -52,15 +48,13 @@ F401 [*] `logging.handlers` imported but unused 14 | TYPE_CHECKING, | help: Remove unused import: `logging.handlers` - -ℹ Safe fix -9 9 | import multiprocessing.pool -10 10 | import multiprocessing.process -11 11 | import logging.config -12 |-import logging.handlers -13 12 | from typing import ( -14 13 | TYPE_CHECKING, -15 14 | NamedTuple, +9 | import multiprocessing.pool +10 | import multiprocessing.process +11 | import logging.config + - import logging.handlers +12 | from typing import ( +13 | TYPE_CHECKING, +14 | NamedTuple, F401 [*] `shelve` imported but unused --> F401_0.py:32:12 @@ -71,15 +65,13 @@ F401 [*] `shelve` imported but unused 33 | import importlib | help: Remove unused import: `shelve` - -ℹ Safe fix -29 29 | from models import Fruit, Nut, Vegetable -30 30 | -31 31 | if TYPE_CHECKING: -32 |- import shelve -33 32 | import importlib -34 33 | -35 34 | if TYPE_CHECKING: +29 | from models import Fruit, Nut, Vegetable +30 | +31 | if TYPE_CHECKING: + - import shelve +32 | import importlib +33 | +34 | if TYPE_CHECKING: F401 [*] `importlib` imported but unused --> F401_0.py:33:12 @@ -92,15 +84,13 @@ F401 [*] `importlib` imported but unused 35 | if TYPE_CHECKING: | help: Remove unused import: `importlib` - -ℹ Safe fix -30 30 | -31 31 | if TYPE_CHECKING: -32 32 | import shelve -33 |- import importlib -34 33 | -35 34 | if TYPE_CHECKING: -36 35 | """Hello, world!""" +30 | +31 | if TYPE_CHECKING: +32 | import shelve + - import importlib +33 | +34 | if TYPE_CHECKING: +35 | """Hello, world!""" F401 [*] `pathlib` imported but unused --> F401_0.py:37:12 @@ -113,15 +103,13 @@ F401 [*] `pathlib` imported but unused 39 | z = 1 | help: Remove unused import: `pathlib` - -ℹ Safe fix -34 34 | -35 35 | if TYPE_CHECKING: -36 36 | """Hello, world!""" -37 |- import pathlib -38 37 | -39 38 | z = 1 -40 39 | +34 | +35 | if TYPE_CHECKING: +36 | """Hello, world!""" + - import pathlib +37 | +38 | z = 1 +39 | F401 [*] `pickle` imported but unused --> F401_0.py:52:16 @@ -131,16 +119,14 @@ F401 [*] `pickle` imported but unused | ^^^^^^ | help: Remove unused import: `pickle` - -ℹ Safe fix -49 49 | z = multiprocessing.pool.ThreadPool() -50 50 | -51 51 | def b(self) -> None: -52 |- import pickle - 52 |+ pass -53 53 | -54 54 | -55 55 | __all__ = ["ClassA"] + ["ClassB"] +49 | z = multiprocessing.pool.ThreadPool() +50 | +51 | def b(self) -> None: + - import pickle +52 + pass +53 | +54 | +55 | __all__ = ["ClassA"] + ["ClassB"] F401 [*] `x` imported but unused --> F401_0.py:93:16 @@ -152,15 +138,13 @@ F401 [*] `x` imported but unused 94 | import y | help: Remove unused import: `x` - -ℹ Safe fix -90 90 | # Test: match statements. -91 91 | match *0, 1, *2: -92 92 | case 0,: -93 |- import x -94 93 | import y -95 94 | -96 95 | +90 | # Test: match statements. +91 | match *0, 1, *2: +92 | case 0,: + - import x +93 | import y +94 | +95 | F401 [*] `y` imported but unused --> F401_0.py:94:16 @@ -171,15 +155,13 @@ F401 [*] `y` imported but unused | ^ | help: Remove unused import: `y` - -ℹ Safe fix -91 91 | match *0, 1, *2: -92 92 | case 0,: -93 93 | import x -94 |- import y -95 94 | -96 95 | -97 96 | # Test: access a sub-importation via an alias. +91 | match *0, 1, *2: +92 | case 0,: +93 | import x + - import y +94 | +95 | +96 | # Test: access a sub-importation via an alias. F401 [*] `foo.bar.baz` imported but unused --> F401_0.py:99:8 @@ -192,15 +174,13 @@ F401 [*] `foo.bar.baz` imported but unused 101 | print(bop.baz.read_csv("test.csv")) | help: Remove unused import: `foo.bar.baz` - -ℹ Safe fix -96 96 | -97 97 | # Test: access a sub-importation via an alias. -98 98 | import foo.bar as bop -99 |-import foo.bar.baz -100 99 | -101 100 | print(bop.baz.read_csv("test.csv")) -102 101 | +96 | +97 | # Test: access a sub-importation via an alias. +98 | import foo.bar as bop + - import foo.bar.baz +99 | +100 | print(bop.baz.read_csv("test.csv")) +101 | F401 [*] `a1` imported but unused --> F401_0.py:105:12 @@ -213,15 +193,13 @@ F401 [*] `a1` imported but unused 107 | import a2 | help: Remove unused import: `a1` - -ℹ Safe fix -102 102 | -103 103 | # Test: isolated deletions. -104 104 | if TYPE_CHECKING: -105 |- import a1 -106 105 | -107 106 | import a2 -108 107 | +102 | +103 | # Test: isolated deletions. +104 | if TYPE_CHECKING: + - import a1 +105 | +106 | import a2 +107 | F401 [*] `a2` imported but unused --> F401_0.py:107:12 @@ -232,15 +210,13 @@ F401 [*] `a2` imported but unused | ^^ | help: Remove unused import: `a2` - -ℹ Safe fix -104 104 | if TYPE_CHECKING: -105 105 | import a1 -106 106 | -107 |- import a2 -108 107 | -109 108 | -110 109 | match *0, 1, *2: +104 | if TYPE_CHECKING: +105 | import a1 +106 | + - import a2 +107 | +108 | +109 | match *0, 1, *2: F401 [*] `b1` imported but unused --> F401_0.py:112:16 @@ -253,15 +229,13 @@ F401 [*] `b1` imported but unused 114 | import b2 | help: Remove unused import: `b1` - -ℹ Safe fix -109 109 | -110 110 | match *0, 1, *2: -111 111 | case 0,: -112 |- import b1 -113 112 | -114 113 | import b2 -115 114 | +109 | +110 | match *0, 1, *2: +111 | case 0,: + - import b1 +112 | +113 | import b2 +114 | F401 [*] `b2` imported but unused --> F401_0.py:114:16 @@ -272,15 +246,13 @@ F401 [*] `b2` imported but unused | ^^ | help: Remove unused import: `b2` - -ℹ Safe fix -111 111 | case 0,: -112 112 | import b1 -113 113 | -114 |- import b2 -115 114 | -116 115 | -117 116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7244 +111 | case 0,: +112 | import b1 +113 | + - import b2 +114 | +115 | +116 | # Regression test for: https://github.com/astral-sh/ruff/issues/7244 F401 [*] `datameta_client_lib.model_helpers.noqa` imported but unused --> F401_0.py:122:1 @@ -290,10 +262,8 @@ F401 [*] `datameta_client_lib.model_helpers.noqa` imported but unused | ^^^^ | help: Remove unused import: `datameta_client_lib.model_helpers.noqa` - -ℹ Safe fix -118 118 | from datameta_client_lib.model_utils import ( # noqa: F401 -119 119 | noqa ) -120 120 | -121 |-from datameta_client_lib.model_helpers import ( -122 |-noqa ) +118 | from datameta_client_lib.model_utils import ( # noqa: F401 +119 | noqa ) +120 | + - from datameta_client_lib.model_helpers import ( + - noqa ) diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap index 365fd6bce5..6c24a43245 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_11.py.snap @@ -9,13 +9,11 @@ F401 [*] `pathlib.PurePath` imported but unused | ^^^^^^^^ | help: Remove unused import: `pathlib.PurePath` - -ℹ Safe fix -1 1 | """Test: parsing of nested string annotations.""" -2 2 | -3 3 | from typing import List -4 |-from pathlib import Path, PurePath - 4 |+from pathlib import Path -5 5 | -6 6 | -7 7 | x: """List['Path']""" = [] +1 | """Test: parsing of nested string annotations.""" +2 | +3 | from typing import List + - from pathlib import Path, PurePath +4 + from pathlib import Path +5 | +6 | +7 | x: """List['Path']""" = [] diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap index f1a83cee3e..dbcc908056 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_15.py.snap @@ -9,13 +9,11 @@ F401 [*] `pathlib.Path` imported but unused | ^^^^ | help: Remove unused import: `pathlib.Path` - -ℹ Safe fix -2 2 | from django.db.models import ForeignKey -3 3 | -4 4 | if TYPE_CHECKING: -5 |- from pathlib import Path - 5 |+ pass -6 6 | -7 7 | -8 8 | class Foo: +2 | from django.db.models import ForeignKey +3 | +4 | if TYPE_CHECKING: + - from pathlib import Path +5 + pass +6 | +7 | +8 | class Foo: diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap index a3d870b502..462baf7cb5 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_17.py.snap @@ -11,15 +11,13 @@ F401 [*] `threading.Thread` imported but unused 14 | # The `Thread` on the left-hand side should resolve to the `Thread` imported at the | help: Remove unused import: `threading.Thread` - -ℹ Safe fix -9 9 | -10 10 | -11 11 | def fn(thread: Thread): -12 |- from threading import Thread -13 12 | -14 13 | # The `Thread` on the left-hand side should resolve to the `Thread` imported at the -15 14 | # top level. +9 | +10 | +11 | def fn(thread: Thread): + - from threading import Thread +12 | +13 | # The `Thread` on the left-hand side should resolve to the `Thread` imported at the +14 | # top level. F401 [*] `threading.Thread` imported but unused --> F401_17.py:20:27 @@ -31,12 +29,10 @@ F401 [*] `threading.Thread` imported but unused 22 | # The `Thread` on the left-hand side should resolve to the `Thread` imported at the | help: Remove unused import: `threading.Thread` - -ℹ Safe fix -17 17 | -18 18 | -19 19 | def fn(thread: Thread): -20 |- from threading import Thread -21 20 | -22 21 | # The `Thread` on the left-hand side should resolve to the `Thread` imported at the -23 22 | # top level. +17 | +18 | +19 | def fn(thread: Thread): + - from threading import Thread +20 | +21 | # The `Thread` on the left-hand side should resolve to the `Thread` imported at the +22 | # top level. diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap index 3bef4fd0f4..9f8421c760 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_18.py.snap @@ -9,13 +9,11 @@ F401 [*] `__future__` imported but unused | ^^^^^^^^^^ | help: Remove unused import: `__future__` - -ℹ Safe fix -2 2 | -3 3 | -4 4 | def f(): -5 |- import __future__ - 5 |+ pass -6 6 | -7 7 | -8 8 | def f(): +2 | +3 | +4 | def f(): + - import __future__ +5 + pass +6 | +7 | +8 | def f(): diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap index 13551928bf..eef29707e5 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_23.py.snap @@ -10,12 +10,10 @@ F401 [*] `re.RegexFlag` imported but unused 5 | from typing import Annotated | help: Remove unused import: `re.RegexFlag` - -ℹ Safe fix -1 1 | """Test: ensure that we treat strings in `typing.Annotation` as type definitions.""" -2 2 | -3 3 | from pathlib import Path -4 |-from re import RegexFlag -5 4 | from typing import Annotated -6 5 | -7 6 | p: Annotated["Path", int] = 1 +1 | """Test: ensure that we treat strings in `typing.Annotation` as type definitions.""" +2 | +3 | from pathlib import Path + - from re import RegexFlag +4 | from typing import Annotated +5 | +6 | p: Annotated["Path", int] = 1 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap index dbbc13c516..25bbc847af 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_34.py.snap @@ -12,15 +12,13 @@ F401 [*] `typing.Union` imported but unused 47 | from typing_extensions import TypeAliasType | help: Remove unused import: `typing.Union` - -ℹ Safe fix -42 42 | # expressions (and type checkers probably wouldn't understand them as type -43 43 | # expressions either!) -44 44 | def f(): -45 |- from typing import Union -46 45 | -47 46 | from typing_extensions import TypeAliasType -48 47 | +42 | # expressions (and type checkers probably wouldn't understand them as type +43 | # expressions either!) +44 | def f(): + - from typing import Union +45 | +46 | from typing_extensions import TypeAliasType +47 | F401 [*] `typing.Union` imported but unused --> F401_34.py:58:24 @@ -32,12 +30,10 @@ F401 [*] `typing.Union` imported but unused 60 | from typing_extensions import TypeAliasType | help: Remove unused import: `typing.Union` - -ℹ Safe fix -55 55 | -56 56 | -57 57 | def f(): -58 |- from typing import Union -59 58 | -60 59 | from typing_extensions import TypeAliasType -61 60 | +55 | +56 | +57 | def f(): + - from typing import Union +58 | +59 | from typing_extensions import TypeAliasType +60 | diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap index c1e8f17a83..f420d16ed1 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_5.py.snap @@ -11,13 +11,11 @@ F401 [*] `a.b.c` imported but unused 4 | import h.i | help: Remove unused import: `a.b.c` - -ℹ Safe fix -1 1 | """Test: removal of multi-segment and aliases imports.""" -2 |-from a.b import c -3 2 | from d.e import f as g -4 3 | import h.i -5 4 | import j.k as l +1 | """Test: removal of multi-segment and aliases imports.""" + - from a.b import c +2 | from d.e import f as g +3 | import h.i +4 | import j.k as l F401 [*] `d.e.f` imported but unused --> F401_5.py:3:22 @@ -30,13 +28,11 @@ F401 [*] `d.e.f` imported but unused 5 | import j.k as l | help: Remove unused import: `d.e.f` - -ℹ Safe fix -1 1 | """Test: removal of multi-segment and aliases imports.""" -2 2 | from a.b import c -3 |-from d.e import f as g -4 3 | import h.i -5 4 | import j.k as l +1 | """Test: removal of multi-segment and aliases imports.""" +2 | from a.b import c + - from d.e import f as g +3 | import h.i +4 | import j.k as l F401 [*] `h.i` imported but unused --> F401_5.py:4:8 @@ -48,13 +44,11 @@ F401 [*] `h.i` imported but unused 5 | import j.k as l | help: Remove unused import: `h.i` - -ℹ Safe fix -1 1 | """Test: removal of multi-segment and aliases imports.""" -2 2 | from a.b import c -3 3 | from d.e import f as g -4 |-import h.i -5 4 | import j.k as l +1 | """Test: removal of multi-segment and aliases imports.""" +2 | from a.b import c +3 | from d.e import f as g + - import h.i +4 | import j.k as l F401 [*] `j.k` imported but unused --> F401_5.py:5:15 @@ -65,9 +59,7 @@ F401 [*] `j.k` imported but unused | ^ | help: Remove unused import: `j.k` - -ℹ Safe fix -2 2 | from a.b import c -3 3 | from d.e import f as g -4 4 | import h.i -5 |-import j.k as l +2 | from a.b import c +3 | from d.e import f as g +4 | import h.i + - import j.k as l diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap index 97f478faa2..6a19f97f2d 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_6.py.snap @@ -11,15 +11,13 @@ F401 [*] `.background.BackgroundTasks` imported but unused 9 | # F401 `datastructures.UploadFile` imported but unused | help: Remove unused import: `.background.BackgroundTasks` - -ℹ Safe fix -4 4 | from .applications import FastAPI as FastAPI -5 5 | -6 6 | # F401 `background.BackgroundTasks` imported but unused -7 |-from .background import BackgroundTasks -8 7 | -9 8 | # F401 `datastructures.UploadFile` imported but unused -10 9 | from .datastructures import UploadFile as FileUpload +4 | from .applications import FastAPI as FastAPI +5 | +6 | # F401 `background.BackgroundTasks` imported but unused + - from .background import BackgroundTasks +7 | +8 | # F401 `datastructures.UploadFile` imported but unused +9 | from .datastructures import UploadFile as FileUpload F401 [*] `.datastructures.UploadFile` imported but unused --> F401_6.py:10:43 @@ -31,15 +29,13 @@ F401 [*] `.datastructures.UploadFile` imported but unused 12 | # OK | help: Remove unused import: `.datastructures.UploadFile` - -ℹ Safe fix -7 7 | from .background import BackgroundTasks -8 8 | -9 9 | # F401 `datastructures.UploadFile` imported but unused -10 |-from .datastructures import UploadFile as FileUpload -11 10 | -12 11 | # OK -13 12 | import applications as applications +7 | from .background import BackgroundTasks +8 | +9 | # F401 `datastructures.UploadFile` imported but unused + - from .datastructures import UploadFile as FileUpload +10 | +11 | # OK +12 | import applications as applications F401 [*] `background` imported but unused --> F401_6.py:16:8 @@ -51,15 +47,13 @@ F401 [*] `background` imported but unused 18 | # F401 `datastructures` imported but unused | help: Remove unused import: `background` - -ℹ Safe fix -13 13 | import applications as applications -14 14 | -15 15 | # F401 `background` imported but unused -16 |-import background -17 16 | -18 17 | # F401 `datastructures` imported but unused -19 18 | import datastructures as structures +13 | import applications as applications +14 | +15 | # F401 `background` imported but unused + - import background +16 | +17 | # F401 `datastructures` imported but unused +18 | import datastructures as structures F401 [*] `datastructures` imported but unused --> F401_6.py:19:26 @@ -69,9 +63,7 @@ F401 [*] `datastructures` imported but unused | ^^^^^^^^^^ | help: Remove unused import: `datastructures` - -ℹ Safe fix -16 16 | import background -17 17 | -18 18 | # F401 `datastructures` imported but unused -19 |-import datastructures as structures +16 | import background +17 | +18 | # F401 `datastructures` imported but unused + - import datastructures as structures diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap index f269ad8657..283e6c1fbc 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_7.py.snap @@ -11,17 +11,15 @@ F401 [*] `typing.Union` imported but unused 31 | ) | help: Remove unused import: `typing.Union` - -ℹ Safe fix -27 27 | # This should ignore the first error. -28 28 | from typing import ( -29 29 | Mapping, # noqa: F401 -30 |- Union, -31 |-) - 30 |+ ) -32 31 | -33 32 | # This should ignore both errors. -34 33 | from typing import ( # noqa +27 | # This should ignore the first error. +28 | from typing import ( +29 | Mapping, # noqa: F401 + - Union, + - ) +30 + ) +31 | +32 | # This should ignore both errors. +33 | from typing import ( # noqa F401 [*] `typing.Awaitable` imported but unused --> F401_7.py:66:20 @@ -31,12 +29,10 @@ F401 [*] `typing.Awaitable` imported but unused | ^^^^^^^^^ | help: Remove unused import - -ℹ Safe fix -63 63 | from typing import AsyncIterable, AsyncGenerator # noqa -64 64 | -65 65 | # This should mark F501 as unused. -66 |-from typing import Awaitable, AwaitableGenerator # noqa: F501 +63 | from typing import AsyncIterable, AsyncGenerator # noqa +64 | +65 | # This should mark F501 as unused. + - from typing import Awaitable, AwaitableGenerator # noqa: F501 F401 [*] `typing.AwaitableGenerator` imported but unused --> F401_7.py:66:31 @@ -46,9 +42,7 @@ F401 [*] `typing.AwaitableGenerator` imported but unused | ^^^^^^^^^^^^^^^^^^ | help: Remove unused import - -ℹ Safe fix -63 63 | from typing import AsyncIterable, AsyncGenerator # noqa -64 64 | -65 65 | # This should mark F501 as unused. -66 |-from typing import Awaitable, AwaitableGenerator # noqa: F501 +63 | from typing import AsyncIterable, AsyncGenerator # noqa +64 | +65 | # This should mark F501 as unused. + - from typing import Awaitable, AwaitableGenerator # noqa: F501 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap index 85c2ef1cc8..b5f8f7063e 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_F401_9.py.snap @@ -9,10 +9,8 @@ F401 [*] `foo.baz` imported but unused | ^^^ | help: Remove unused import: `foo.baz` - -ℹ Safe fix -1 1 | """Test: late-binding of `__all__`.""" -2 2 | -3 3 | __all__ = ("bar",) -4 |-from foo import bar, baz - 4 |+from foo import bar +1 | """Test: late-binding of `__all__`.""" +2 | +3 | __all__ = ("bar",) + - from foo import bar, baz +4 + from foo import bar diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap index 62d0728c6f..575370185e 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_24____init__.py.snap @@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused | ^^^ | help: Remove unused import: `sys` - -ℹ Unsafe fix -16 16 | import argparse as argparse # Ok: is redundant alias -17 17 | -18 18 | -19 |-import sys # F401: remove unused -20 19 | -21 20 | -22 21 | # first-party +16 | import argparse as argparse # Ok: is redundant alias +17 | +18 | + - import sys # F401: remove unused +19 | +20 | +21 | # first-party +note: This is an unsafe fix and may change runtime behavior F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:33:15 @@ -25,15 +24,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Remove unused import: `.unused` - -ℹ Unsafe fix -30 30 | from . import aliased as aliased # Ok: is redundant alias -31 31 | -32 32 | -33 |-from . import unused # F401: change to redundant alias -34 33 | -35 34 | -36 35 | from . import renamed as bees # F401: no fix +30 | from . import aliased as aliased # Ok: is redundant alias +31 | +32 | + - from . import unused # F401: change to redundant alias +33 | +34 | +35 | from . import renamed as bees # F401: no fix +note: This is an unsafe fix and may change runtime behavior F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:36:26 @@ -42,9 +40,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Remove unused import: `.renamed` - -ℹ Unsafe fix -33 33 | from . import unused # F401: change to redundant alias -34 34 | -35 35 | -36 |-from . import renamed as bees # F401: no fix +33 | from . import unused # F401: change to redundant alias +34 | +35 | + - from . import renamed as bees # F401: no fix +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap index 3be84f3e29..7e16f3ec9c 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_25__all_nonempty____init__.py.snap @@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused | ^^^ | help: Remove unused import: `sys` - -ℹ Unsafe fix -16 16 | import argparse # Ok: is exported in __all__ -17 17 | -18 18 | -19 |-import sys # F401: remove unused -20 19 | -21 20 | -22 21 | # first-party +16 | import argparse # Ok: is exported in __all__ +17 | +18 | + - import sys # F401: remove unused +19 | +20 | +21 | # first-party +note: This is an unsafe fix and may change runtime behavior F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:36:15 @@ -25,15 +24,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Remove unused import: `.unused` - -ℹ Unsafe fix -33 33 | from . import exported # Ok: is exported in __all__ -34 34 | -35 35 | -36 |-from . import unused # F401: add to __all__ -37 36 | -38 37 | -39 38 | from . import renamed as bees # F401: add to __all__ +33 | from . import exported # Ok: is exported in __all__ +34 | +35 | + - from . import unused # F401: add to __all__ +36 | +37 | +38 | from . import renamed as bees # F401: add to __all__ +note: This is an unsafe fix and may change runtime behavior F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:39:26 @@ -42,12 +40,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Remove unused import: `.renamed` - -ℹ Unsafe fix -36 36 | from . import unused # F401: add to __all__ -37 37 | -38 38 | -39 |-from . import renamed as bees # F401: add to __all__ -40 39 | -41 40 | -42 41 | __all__ = ["argparse", "exported"] +36 | from . import unused # F401: add to __all__ +37 | +38 | + - from . import renamed as bees # F401: add to __all__ +39 | +40 | +41 | __all__ = ["argparse", "exported"] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap index 52b04aa829..577fcb0a21 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_26__all_empty____init__.py.snap @@ -8,15 +8,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Remove unused import: `.unused` - -ℹ Unsafe fix -2 2 | """ -3 3 | -4 4 | -5 |-from . import unused # F401: add to __all__ -6 5 | -7 6 | -8 7 | from . import renamed as bees # F401: add to __all__ +2 | """ +3 | +4 | + - from . import unused # F401: add to __all__ +5 | +6 | +7 | from . import renamed as bees # F401: add to __all__ +note: This is an unsafe fix and may change runtime behavior F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:8:26 @@ -25,12 +24,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Remove unused import: `.renamed` - -ℹ Unsafe fix -5 5 | from . import unused # F401: add to __all__ -6 6 | -7 7 | -8 |-from . import renamed as bees # F401: add to __all__ -9 8 | -10 9 | -11 10 | __all__ = [] +5 | from . import unused # F401: add to __all__ +6 | +7 | + - from . import renamed as bees # F401: add to __all__ +8 | +9 | +10 | __all__ = [] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap index 5308d3121e..61891af74d 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_27__all_mistyped____init__.py.snap @@ -8,15 +8,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Remove unused import: `.unused` - -ℹ Unsafe fix -2 2 | """ -3 3 | -4 4 | -5 |-from . import unused # F401: recommend add to all w/o fix -6 5 | -7 6 | -8 7 | from . import renamed as bees # F401: recommend add to all w/o fix +2 | """ +3 | +4 | + - from . import unused # F401: recommend add to all w/o fix +5 | +6 | +7 | from . import renamed as bees # F401: recommend add to all w/o fix +note: This is an unsafe fix and may change runtime behavior F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:8:26 @@ -25,12 +24,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Remove unused import: `.renamed` - -ℹ Unsafe fix -5 5 | from . import unused # F401: recommend add to all w/o fix -6 6 | -7 7 | -8 |-from . import renamed as bees # F401: recommend add to all w/o fix -9 8 | -10 9 | -11 10 | __all__ = None +5 | from . import unused # F401: recommend add to all w/o fix +6 | +7 | + - from . import renamed as bees # F401: recommend add to all w/o fix +8 | +9 | +10 | __all__ = None +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap index 6f5291bb12..6b471beba3 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_28__all_multiple____init__.py.snap @@ -8,15 +8,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Remove unused import - -ℹ Unsafe fix -2 2 | """ -3 3 | -4 4 | -5 |-from . import unused, renamed as bees # F401: add to __all__ -6 5 | -7 6 | -8 7 | __all__ = []; +2 | """ +3 | +4 | + - from . import unused, renamed as bees # F401: add to __all__ +5 | +6 | +7 | __all__ = []; +note: This is an unsafe fix and may change runtime behavior F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:5:34 @@ -25,12 +24,11 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Remove unused import - -ℹ Unsafe fix -2 2 | """ -3 3 | -4 4 | -5 |-from . import unused, renamed as bees # F401: add to __all__ -6 5 | -7 6 | -8 7 | __all__ = []; +2 | """ +3 | +4 | + - from . import unused, renamed as bees # F401: add to __all__ +5 | +6 | +7 | __all__ = []; +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap index 8483e6b58f..5e21848e88 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_29__all_conditional____init__.py.snap @@ -12,16 +12,15 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, 10 | if sys.version_info > (3, 9): | help: Remove unused import - -ℹ Unsafe fix -5 5 | -6 6 | import sys -7 7 | -8 |-from . import unused, exported, renamed as bees - 8 |+from . import exported -9 9 | -10 10 | if sys.version_info > (3, 9): -11 11 | from . import also_exported +5 | +6 | import sys +7 | + - from . import unused, exported, renamed as bees +8 + from . import exported +9 | +10 | if sys.version_info > (3, 9): +11 | from . import also_exported +note: This is an unsafe fix and may change runtime behavior F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:8:44 @@ -34,13 +33,12 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, 10 | if sys.version_info > (3, 9): | help: Remove unused import - -ℹ Unsafe fix -5 5 | -6 6 | import sys -7 7 | -8 |-from . import unused, exported, renamed as bees - 8 |+from . import exported -9 9 | -10 10 | if sys.version_info > (3, 9): -11 11 | from . import also_exported +5 | +6 | import sys +7 | + - from . import unused, exported, renamed as bees +8 + from . import exported +9 | +10 | if sys.version_info > (3, 9): +11 | from . import also_exported +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap index 09741b40a6..ab41348146 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F401_deprecated_option_F401_30.py.snap @@ -10,9 +10,7 @@ F401 [*] `.main.MaμToMan` imported but unused | ^^^^^^^^ | help: Remove unused import: `.main.MaμToMan` - -ℹ Safe fix -3 3 | even if they have characters in them that undergo NFKC normalization -4 4 | """ -5 5 | -6 |-from .main import MaµToMan +3 | even if they have characters in them that undergo NFKC normalization +4 | """ +5 | + - from .main import MaµToMan diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap index e12ae328c0..27314e15d6 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F504.py.snap @@ -12,15 +12,13 @@ F504 [*] `%`-format string has unused named argument(s): b 5 | hidden = {"a": "!"} | help: Remove extra named arguments: b - -ℹ Safe fix -1 1 | # Ruff has no way of knowing if the following are F505s -2 2 | a = "wrong" -3 |-"%(a)s %(c)s" % {a: "?", "b": "!"} # F504 ("b" not used) - 3 |+"%(a)s %(c)s" % {a: "?", } # F504 ("b" not used) -4 4 | -5 5 | hidden = {"a": "!"} -6 6 | "%(a)s %(c)s" % {"x": 1, **hidden} # Ok (cannot see through splat) +1 | # Ruff has no way of knowing if the following are F505s +2 | a = "wrong" + - "%(a)s %(c)s" % {a: "?", "b": "!"} # F504 ("b" not used) +3 + "%(a)s %(c)s" % {a: "?", } # F504 ("b" not used) +4 | +5 | hidden = {"a": "!"} +6 | "%(a)s %(c)s" % {"x": 1, **hidden} # Ok (cannot see through splat) F504 [*] `%`-format string has unused named argument(s): b --> F504.py:8:1 @@ -32,16 +30,14 @@ F504 [*] `%`-format string has unused named argument(s): b 9 | "%(a)s" % {'a': 1, u"b": "!"} # F504 ("b" not used) | help: Remove extra named arguments: b - -ℹ Safe fix -5 5 | hidden = {"a": "!"} -6 6 | "%(a)s %(c)s" % {"x": 1, **hidden} # Ok (cannot see through splat) -7 7 | -8 |-"%(a)s" % {"a": 1, r"b": "!"} # F504 ("b" not used) - 8 |+"%(a)s" % {"a": 1, } # F504 ("b" not used) -9 9 | "%(a)s" % {'a': 1, u"b": "!"} # F504 ("b" not used) -10 10 | -11 11 | '' % {'a''b' : ''} # F504 ("ab" not used) +5 | hidden = {"a": "!"} +6 | "%(a)s %(c)s" % {"x": 1, **hidden} # Ok (cannot see through splat) +7 | + - "%(a)s" % {"a": 1, r"b": "!"} # F504 ("b" not used) +8 + "%(a)s" % {"a": 1, } # F504 ("b" not used) +9 | "%(a)s" % {'a': 1, u"b": "!"} # F504 ("b" not used) +10 | +11 | '' % {'a''b' : ''} # F504 ("ab" not used) F504 [*] `%`-format string has unused named argument(s): b --> F504.py:9:1 @@ -53,16 +49,14 @@ F504 [*] `%`-format string has unused named argument(s): b 11 | '' % {'a''b' : ''} # F504 ("ab" not used) | help: Remove extra named arguments: b - -ℹ Safe fix -6 6 | "%(a)s %(c)s" % {"x": 1, **hidden} # Ok (cannot see through splat) -7 7 | -8 8 | "%(a)s" % {"a": 1, r"b": "!"} # F504 ("b" not used) -9 |-"%(a)s" % {'a': 1, u"b": "!"} # F504 ("b" not used) - 9 |+"%(a)s" % {'a': 1, } # F504 ("b" not used) -10 10 | -11 11 | '' % {'a''b' : ''} # F504 ("ab" not used) -12 12 | +6 | "%(a)s %(c)s" % {"x": 1, **hidden} # Ok (cannot see through splat) +7 | +8 | "%(a)s" % {"a": 1, r"b": "!"} # F504 ("b" not used) + - "%(a)s" % {'a': 1, u"b": "!"} # F504 ("b" not used) +9 + "%(a)s" % {'a': 1, } # F504 ("b" not used) +10 | +11 | '' % {'a''b' : ''} # F504 ("ab" not used) +12 | F504 [*] `%`-format string has unused named argument(s): ab --> F504.py:11:1 @@ -75,16 +69,14 @@ F504 [*] `%`-format string has unused named argument(s): ab 13 | # https://github.com/astral-sh/ruff/issues/4899 | help: Remove extra named arguments: ab - -ℹ Safe fix -8 8 | "%(a)s" % {"a": 1, r"b": "!"} # F504 ("b" not used) -9 9 | "%(a)s" % {'a': 1, u"b": "!"} # F504 ("b" not used) -10 10 | -11 |-'' % {'a''b' : ''} # F504 ("ab" not used) - 11 |+'' % {} # F504 ("ab" not used) -12 12 | -13 13 | # https://github.com/astral-sh/ruff/issues/4899 -14 14 | "" % { +8 | "%(a)s" % {"a": 1, r"b": "!"} # F504 ("b" not used) +9 | "%(a)s" % {'a': 1, u"b": "!"} # F504 ("b" not used) +10 | + - '' % {'a''b' : ''} # F504 ("ab" not used) +11 + '' % {} # F504 ("ab" not used) +12 | +13 | # https://github.com/astral-sh/ruff/issues/4899 +14 | "" % { F504 [*] `%`-format string has unused named argument(s): test1, test2 --> F504.py:14:1 @@ -99,16 +91,14 @@ F504 [*] `%`-format string has unused named argument(s): test1, test2 19 | # https://github.com/astral-sh/ruff/issues/18806 | help: Remove extra named arguments: test1, test2 - -ℹ Safe fix -12 12 | -13 13 | # https://github.com/astral-sh/ruff/issues/4899 -14 14 | "" % { -15 |- 'test1': '', 16 |- 'test2': '', - 15 |+ -17 16 | } -18 17 | -19 18 | # https://github.com/astral-sh/ruff/issues/18806 +12 | +13 | # https://github.com/astral-sh/ruff/issues/4899 +14 | "" % { + - 'test1': '', - 'test2': '', +15 + +16 | } +17 | +18 | # https://github.com/astral-sh/ruff/issues/18806 F504 [*] `%`-format string has unused named argument(s): greeting --> F504.py:20:1 @@ -118,10 +108,9 @@ F504 [*] `%`-format string has unused named argument(s): greeting | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove extra named arguments: greeting - -ℹ Unsafe fix -17 17 | } -18 18 | -19 19 | # https://github.com/astral-sh/ruff/issues/18806 -20 |-"Hello, %(name)s" % {"greeting": print(1), "name": "World"} - 20 |+"Hello, %(name)s" % {"name": "World"} +17 | } +18 | +19 | # https://github.com/astral-sh/ruff/issues/18806 + - "Hello, %(name)s" % {"greeting": print(1), "name": "World"} +20 + "Hello, %(name)s" % {"name": "World"} +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap index a20aace19c..1bbf39535f 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F504_F50x.py.snap @@ -12,13 +12,11 @@ F504 [*] `%`-format string has unused named argument(s): baz 10 | '%s %s' % {'k': 'v'} # F503 | help: Remove extra named arguments: baz - -ℹ Safe fix -5 5 | '%s %s' % (1,) # F507 -6 6 | '%s %s' % (1, 2, 3) # F507 -7 7 | '%(bar)s' % {} # F505 -8 |-'%(bar)s' % {'bar': 1, 'baz': 2} # F504 - 8 |+'%(bar)s' % {'bar': 1, } # F504 -9 9 | '%(bar)s' % (1, 2, 3) # F502 -10 10 | '%s %s' % {'k': 'v'} # F503 -11 11 | '%(bar)*s' % {'bar': 'baz'} # F506, F508 +5 | '%s %s' % (1,) # F507 +6 | '%s %s' % (1, 2, 3) # F507 +7 | '%(bar)s' % {} # F505 + - '%(bar)s' % {'bar': 1, 'baz': 2} # F504 +8 + '%(bar)s' % {'bar': 1, } # F504 +9 | '%(bar)s' % (1, 2, 3) # F502 +10 | '%s %s' % {'k': 'v'} # F503 +11 | '%(bar)*s' % {'bar': 'baz'} # F506, F508 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap index e3cd10e673..fd45602cee 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F522_F522.py.snap @@ -10,13 +10,11 @@ F522 [*] `.format` call has unused named argument(s): bar 3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues | help: Remove extra named arguments: bar - -ℹ Safe fix -1 |-"{}".format(1, bar=2) # F522 - 1 |+"{}".format(1, ) # F522 -2 2 | "{bar}{}".format(1, bar=2, spam=3) # F522 -3 3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues -4 4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 + - "{}".format(1, bar=2) # F522 +1 + "{}".format(1, ) # F522 +2 | "{bar}{}".format(1, bar=2, spam=3) # F522 +3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues +4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 F522 [*] `.format` call has unused named argument(s): spam --> F522.py:2:1 @@ -28,14 +26,12 @@ F522 [*] `.format` call has unused named argument(s): spam 4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 | help: Remove extra named arguments: spam - -ℹ Safe fix -1 1 | "{}".format(1, bar=2) # F522 -2 |-"{bar}{}".format(1, bar=2, spam=3) # F522 - 2 |+"{bar}{}".format(1, bar=2, ) # F522 -3 3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues -4 4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 -5 5 | ('' +1 | "{}".format(1, bar=2) # F522 + - "{bar}{}".format(1, bar=2, spam=3) # F522 +2 + "{bar}{}".format(1, bar=2, ) # F522 +3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues +4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 +5 | ('' F522 [*] `.format` call has unused named argument(s): eggs, ham --> F522.py:4:1 @@ -48,16 +44,14 @@ F522 [*] `.format` call has unused named argument(s): eggs, ham 6 | .format(x=2)) # F522 | help: Remove extra named arguments: eggs, ham - -ℹ Safe fix -1 1 | "{}".format(1, bar=2) # F522 -2 2 | "{bar}{}".format(1, bar=2, spam=3) # F522 -3 3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues -4 |-"{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 - 4 |+"{bar:{spam}}".format(bar=2, spam=3, ) # F522 -5 5 | ('' -6 6 | .format(x=2)) # F522 -7 7 | +1 | "{}".format(1, bar=2) # F522 +2 | "{bar}{}".format(1, bar=2, spam=3) # F522 +3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues + - "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 +4 + "{bar:{spam}}".format(bar=2, spam=3, ) # F522 +5 | ('' +6 | .format(x=2)) # F522 +7 | F522 [*] `.format` call has unused named argument(s): x --> F522.py:5:2 @@ -72,16 +66,14 @@ F522 [*] `.format` call has unused named argument(s): x 8 | # https://github.com/astral-sh/ruff/issues/18806 | help: Remove extra named arguments: x - -ℹ Safe fix -3 3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues -4 4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 -5 5 | ('' -6 |- .format(x=2)) # F522 - 6 |+ .format()) # F522 -7 7 | -8 8 | # https://github.com/astral-sh/ruff/issues/18806 -9 9 | # The fix here is unsafe because the unused argument has side effect +3 | "{bar:{spam}}".format(bar=2, spam=3) # No issues +4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5) # F522 +5 | ('' + - .format(x=2)) # F522 +6 + .format()) # F522 +7 | +8 | # https://github.com/astral-sh/ruff/issues/18806 +9 | # The fix here is unsafe because the unused argument has side effect F522 [*] `.format` call has unused named argument(s): greeting --> F522.py:10:1 @@ -94,16 +86,15 @@ F522 [*] `.format` call has unused named argument(s): greeting 12 | # The fix here is safe because the unused argument has no side effect, | help: Remove extra named arguments: greeting - -ℹ Unsafe fix -7 7 | -8 8 | # https://github.com/astral-sh/ruff/issues/18806 -9 9 | # The fix here is unsafe because the unused argument has side effect -10 |-"Hello, {name}".format(greeting=print(1), name="World") - 10 |+"Hello, {name}".format(name="World") -11 11 | -12 12 | # The fix here is safe because the unused argument has no side effect, -13 13 | # even though the used argument has a side effect +7 | +8 | # https://github.com/astral-sh/ruff/issues/18806 +9 | # The fix here is unsafe because the unused argument has side effect + - "Hello, {name}".format(greeting=print(1), name="World") +10 + "Hello, {name}".format(name="World") +11 | +12 | # The fix here is safe because the unused argument has no side effect, +13 | # even though the used argument has a side effect +note: This is an unsafe fix and may change runtime behavior F522 [*] `.format` call has unused named argument(s): greeting --> F522.py:14:1 @@ -114,10 +105,8 @@ F522 [*] `.format` call has unused named argument(s): greeting | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove extra named arguments: greeting - -ℹ Safe fix -11 11 | -12 12 | # The fix here is safe because the unused argument has no side effect, -13 13 | # even though the used argument has a side effect -14 |-"Hello, {name}".format(greeting="Pikachu", name=print(1)) - 14 |+"Hello, {name}".format(name=print(1)) +11 | +12 | # The fix here is safe because the unused argument has no side effect, +13 | # even though the used argument has a side effect + - "Hello, {name}".format(greeting="Pikachu", name=print(1)) +14 + "Hello, {name}".format(name=print(1)) diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap index 73bff9f750..3ac5ff22bb 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F523_F523.py.snap @@ -11,14 +11,12 @@ F523 [*] `.format` call has unused arguments at position(s): 1 4 | "{1:{0}}".format(1, 2) # No issues | help: Remove extra positional arguments at position(s): 1 - -ℹ Safe fix -1 1 | # With indexes -2 |-"{0}".format(1, 2) # F523 - 2 |+"{0}".format(1, ) # F523 -3 3 | "{1}".format(1, 2, 3) # F523 -4 4 | "{1:{0}}".format(1, 2) # No issues -5 5 | "{1:{0}}".format(1, 2, 3) # F523 +1 | # With indexes + - "{0}".format(1, 2) # F523 +2 + "{0}".format(1, ) # F523 +3 | "{1}".format(1, 2, 3) # F523 +4 | "{1:{0}}".format(1, 2) # No issues +5 | "{1:{0}}".format(1, 2, 3) # F523 F523 `.format` call has unused arguments at position(s): 0, 2 --> F523.py:3:1 @@ -43,16 +41,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 | help: Remove extra positional arguments at position(s): 2 - -ℹ Safe fix -2 2 | "{0}".format(1, 2) # F523 -3 3 | "{1}".format(1, 2, 3) # F523 -4 4 | "{1:{0}}".format(1, 2) # No issues -5 |-"{1:{0}}".format(1, 2, 3) # F523 - 5 |+"{1:{0}}".format(1, 2, ) # F523 -6 6 | "{0}{2}".format(1, 2) # F523, # F524 -7 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 -8 8 | +2 | "{0}".format(1, 2) # F523 +3 | "{1}".format(1, 2, 3) # F523 +4 | "{1:{0}}".format(1, 2) # No issues + - "{1:{0}}".format(1, 2, 3) # F523 +5 + "{1:{0}}".format(1, 2, ) # F523 +6 | "{0}{2}".format(1, 2) # F523, # F524 +7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 +8 | F523 [*] `.format` call has unused arguments at position(s): 1 --> F523.py:6:1 @@ -64,16 +60,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 | help: Remove extra positional arguments at position(s): 1 - -ℹ Safe fix -3 3 | "{1}".format(1, 2, 3) # F523 -4 4 | "{1:{0}}".format(1, 2) # No issues -5 5 | "{1:{0}}".format(1, 2, 3) # F523 -6 |-"{0}{2}".format(1, 2) # F523, # F524 - 6 |+"{0}{2}".format(1, ) # F523, # F524 -7 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 -8 8 | -9 9 | # With no indexes +3 | "{1}".format(1, 2, 3) # F523 +4 | "{1:{0}}".format(1, 2) # No issues +5 | "{1:{0}}".format(1, 2, 3) # F523 + - "{0}{2}".format(1, 2) # F523, # F524 +6 + "{0}{2}".format(1, ) # F523, # F524 +7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 +8 | +9 | # With no indexes F523 `.format` call has unused arguments at position(s): 0, 3 --> F523.py:7:1 @@ -97,16 +91,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1 12 | "{:{}}".format(1, 2) # No issues | help: Remove extra positional arguments at position(s): 1 - -ℹ Safe fix -7 7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 -8 8 | -9 9 | # With no indexes -10 |-"{}".format(1, 2) # F523 - 10 |+"{}".format(1, ) # F523 -11 11 | "{}".format(1, 2, 3) # F523 -12 12 | "{:{}}".format(1, 2) # No issues -13 13 | "{:{}}".format(1, 2, 3) # F523 +7 | "{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523 +8 | +9 | # With no indexes + - "{}".format(1, 2) # F523 +10 + "{}".format(1, ) # F523 +11 | "{}".format(1, 2, 3) # F523 +12 | "{:{}}".format(1, 2) # No issues +13 | "{:{}}".format(1, 2, 3) # F523 F523 [*] `.format` call has unused arguments at position(s): 1, 2 --> F523.py:11:1 @@ -119,16 +111,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1, 2 13 | "{:{}}".format(1, 2, 3) # F523 | help: Remove extra positional arguments at position(s): 1, 2 - -ℹ Safe fix -8 8 | -9 9 | # With no indexes -10 10 | "{}".format(1, 2) # F523 -11 |-"{}".format(1, 2, 3) # F523 - 11 |+"{}".format(1, ) # F523 -12 12 | "{:{}}".format(1, 2) # No issues -13 13 | "{:{}}".format(1, 2, 3) # F523 -14 14 | +8 | +9 | # With no indexes +10 | "{}".format(1, 2) # F523 + - "{}".format(1, 2, 3) # F523 +11 + "{}".format(1, ) # F523 +12 | "{:{}}".format(1, 2) # No issues +13 | "{:{}}".format(1, 2, 3) # F523 +14 | F523 [*] `.format` call has unused arguments at position(s): 2 --> F523.py:13:1 @@ -141,16 +131,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2 15 | # With *args | help: Remove extra positional arguments at position(s): 2 - -ℹ Safe fix -10 10 | "{}".format(1, 2) # F523 -11 11 | "{}".format(1, 2, 3) # F523 -12 12 | "{:{}}".format(1, 2) # No issues -13 |-"{:{}}".format(1, 2, 3) # F523 - 13 |+"{:{}}".format(1, 2, ) # F523 -14 14 | -15 15 | # With *args -16 16 | "{0}{1}".format(*args) # No issues +10 | "{}".format(1, 2) # F523 +11 | "{}".format(1, 2, 3) # F523 +12 | "{:{}}".format(1, 2) # No issues + - "{:{}}".format(1, 2, 3) # F523 +13 + "{:{}}".format(1, 2, ) # F523 +14 | +15 | # With *args +16 | "{0}{1}".format(*args) # No issues F523 `.format` call has unused arguments at position(s): 2 --> F523.py:19:1 @@ -174,16 +162,14 @@ F523 [*] `.format` call has unused arguments at position(s): 1, 2 24 | '""{1}{0}'.format(1, 2, 3) # F523 | help: Remove extra positional arguments at position(s): 1, 2 - -ℹ Safe fix -19 19 | "{0}{1}".format(1, 2, 3, *args) # F523 -20 20 | -21 21 | # With nested quotes -22 |-"''1{0}".format(1, 2, 3) # F523 - 22 |+"''1{0}".format(1, ) # F523 -23 23 | "\"\"{1}{0}".format(1, 2, 3) # F523 -24 24 | '""{1}{0}'.format(1, 2, 3) # F523 -25 25 | +19 | "{0}{1}".format(1, 2, 3, *args) # F523 +20 | +21 | # With nested quotes + - "''1{0}".format(1, 2, 3) # F523 +22 + "''1{0}".format(1, ) # F523 +23 | "\"\"{1}{0}".format(1, 2, 3) # F523 +24 | '""{1}{0}'.format(1, 2, 3) # F523 +25 | F523 [*] `.format` call has unused arguments at position(s): 2 --> F523.py:23:1 @@ -195,16 +181,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2 24 | '""{1}{0}'.format(1, 2, 3) # F523 | help: Remove extra positional arguments at position(s): 2 - -ℹ Safe fix -20 20 | -21 21 | # With nested quotes -22 22 | "''1{0}".format(1, 2, 3) # F523 -23 |-"\"\"{1}{0}".format(1, 2, 3) # F523 - 23 |+"\"\"{1}{0}".format(1, 2, ) # F523 -24 24 | '""{1}{0}'.format(1, 2, 3) # F523 -25 25 | -26 26 | # With modified indexes +20 | +21 | # With nested quotes +22 | "''1{0}".format(1, 2, 3) # F523 + - "\"\"{1}{0}".format(1, 2, 3) # F523 +23 + "\"\"{1}{0}".format(1, 2, ) # F523 +24 | '""{1}{0}'.format(1, 2, 3) # F523 +25 | +26 | # With modified indexes F523 [*] `.format` call has unused arguments at position(s): 2 --> F523.py:24:1 @@ -217,16 +201,14 @@ F523 [*] `.format` call has unused arguments at position(s): 2 26 | # With modified indexes | help: Remove extra positional arguments at position(s): 2 - -ℹ Safe fix -21 21 | # With nested quotes -22 22 | "''1{0}".format(1, 2, 3) # F523 -23 23 | "\"\"{1}{0}".format(1, 2, 3) # F523 -24 |-'""{1}{0}'.format(1, 2, 3) # F523 - 24 |+'""{1}{0}'.format(1, 2, ) # F523 -25 25 | -26 26 | # With modified indexes -27 27 | "{1}{2}".format(1, 2, 3) # F523, # F524 +21 | # With nested quotes +22 | "''1{0}".format(1, 2, 3) # F523 +23 | "\"\"{1}{0}".format(1, 2, 3) # F523 + - '""{1}{0}'.format(1, 2, 3) # F523 +24 + '""{1}{0}'.format(1, 2, ) # F523 +25 | +26 | # With modified indexes +27 | "{1}{2}".format(1, 2, 3) # F523, # F524 F523 `.format` call has unused arguments at position(s): 0 --> F523.py:27:1 @@ -274,17 +256,15 @@ F523 [*] `.format` call has unused arguments at position(s): 0 35 | # Removing the final argument. | help: Remove extra positional arguments at position(s): 0 - -ℹ Safe fix -29 29 | "{1} {8}".format(0, 1) # F523, # F524 -30 30 | -31 31 | # Multiline -32 |-('' -33 |-.format(2)) - 32 |+('') -34 33 | -35 34 | # Removing the final argument. -36 35 | "Hello".format("world") +29 | "{1} {8}".format(0, 1) # F523, # F524 +30 | +31 | # Multiline + - ('' + - .format(2)) +32 + ('') +33 | +34 | # Removing the final argument. +35 | "Hello".format("world") F523 [*] `.format` call has unused arguments at position(s): 0 --> F523.py:36:1 @@ -295,16 +275,14 @@ F523 [*] `.format` call has unused arguments at position(s): 0 37 | "Hello".format("world", key="value") | help: Remove extra positional arguments at position(s): 0 - -ℹ Safe fix -33 33 | .format(2)) -34 34 | -35 35 | # Removing the final argument. -36 |-"Hello".format("world") - 36 |+"Hello" -37 37 | "Hello".format("world", key="value") -38 38 | -39 39 | # https://github.com/astral-sh/ruff/issues/18806 +33 | .format(2)) +34 | +35 | # Removing the final argument. + - "Hello".format("world") +36 + "Hello" +37 | "Hello".format("world", key="value") +38 | +39 | # https://github.com/astral-sh/ruff/issues/18806 F523 [*] `.format` call has unused arguments at position(s): 0 --> F523.py:37:1 @@ -317,16 +295,14 @@ F523 [*] `.format` call has unused arguments at position(s): 0 39 | # https://github.com/astral-sh/ruff/issues/18806 | help: Remove extra positional arguments at position(s): 0 - -ℹ Safe fix -34 34 | -35 35 | # Removing the final argument. -36 36 | "Hello".format("world") -37 |-"Hello".format("world", key="value") - 37 |+"Hello".format(key="value") -38 38 | -39 39 | # https://github.com/astral-sh/ruff/issues/18806 -40 40 | # The fix here is unsafe because the unused argument has side effect +34 | +35 | # Removing the final argument. +36 | "Hello".format("world") + - "Hello".format("world", key="value") +37 + "Hello".format(key="value") +38 | +39 | # https://github.com/astral-sh/ruff/issues/18806 +40 | # The fix here is unsafe because the unused argument has side effect F523 [*] `.format` call has unused arguments at position(s): 1 --> F523.py:41:1 @@ -339,16 +315,15 @@ F523 [*] `.format` call has unused arguments at position(s): 1 43 | # The fix here is safe because the unused argument has no side effect, | help: Remove extra positional arguments at position(s): 1 - -ℹ Unsafe fix -38 38 | -39 39 | # https://github.com/astral-sh/ruff/issues/18806 -40 40 | # The fix here is unsafe because the unused argument has side effect -41 |-"Hello, {0}".format("world", print(1)) - 41 |+"Hello, {0}".format("world", ) -42 42 | -43 43 | # The fix here is safe because the unused argument has no side effect, -44 44 | # even though the used argument has a side effect +38 | +39 | # https://github.com/astral-sh/ruff/issues/18806 +40 | # The fix here is unsafe because the unused argument has side effect + - "Hello, {0}".format("world", print(1)) +41 + "Hello, {0}".format("world", ) +42 | +43 | # The fix here is safe because the unused argument has no side effect, +44 | # even though the used argument has a side effect +note: This is an unsafe fix and may change runtime behavior F523 [*] `.format` call has unused arguments at position(s): 1 --> F523.py:45:1 @@ -359,10 +334,8 @@ F523 [*] `.format` call has unused arguments at position(s): 1 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove extra positional arguments at position(s): 1 - -ℹ Safe fix -42 42 | -43 43 | # The fix here is safe because the unused argument has no side effect, -44 44 | # even though the used argument has a side effect -45 |-"Hello, {0}".format(print(1), "Pikachu") - 45 |+"Hello, {0}".format(print(1), ) +42 | +43 | # The fix here is safe because the unused argument has no side effect, +44 | # even though the used argument has a side effect + - "Hello, {0}".format(print(1), "Pikachu") +45 + "Hello, {0}".format(print(1), ) diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap index a479bd02cb..c4e9cb08c8 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F541_F541.py.snap @@ -11,16 +11,14 @@ F541 [*] f-string without any placeholders 8 | e = ( | help: Remove extraneous `f` prefix - -ℹ Safe fix -3 3 | b = f"ghi{'jkl'}" -4 4 | -5 5 | # Errors -6 |-c = f"def" - 6 |+c = "def" -7 7 | d = f"def" + "ghi" -8 8 | e = ( -9 9 | f"def" + +3 | b = f"ghi{'jkl'}" +4 | +5 | # Errors + - c = f"def" +6 + c = "def" +7 | d = f"def" + "ghi" +8 | e = ( +9 | f"def" + F541 [*] f-string without any placeholders --> F541.py:7:5 @@ -33,16 +31,14 @@ F541 [*] f-string without any placeholders 9 | f"def" + | help: Remove extraneous `f` prefix - -ℹ Safe fix -4 4 | -5 5 | # Errors -6 6 | c = f"def" -7 |-d = f"def" + "ghi" - 7 |+d = "def" + "ghi" -8 8 | e = ( -9 9 | f"def" + -10 10 | "ghi" +4 | +5 | # Errors +6 | c = f"def" + - d = f"def" + "ghi" +7 + d = "def" + "ghi" +8 | e = ( +9 | f"def" + +10 | "ghi" F541 [*] f-string without any placeholders --> F541.py:9:5 @@ -55,16 +51,14 @@ F541 [*] f-string without any placeholders 11 | ) | help: Remove extraneous `f` prefix - -ℹ Safe fix -6 6 | c = f"def" -7 7 | d = f"def" + "ghi" -8 8 | e = ( -9 |- f"def" + - 9 |+ "def" + -10 10 | "ghi" -11 11 | ) -12 12 | f = ( +6 | c = f"def" +7 | d = f"def" + "ghi" +8 | e = ( + - f"def" + +9 + "def" + +10 | "ghi" +11 | ) +12 | f = ( F541 [*] f-string without any placeholders --> F541.py:13:5 @@ -77,16 +71,14 @@ F541 [*] f-string without any placeholders 15 | "c" | help: Remove extraneous `f` prefix - -ℹ Safe fix -10 10 | "ghi" -11 11 | ) -12 12 | f = ( -13 |- f"a" - 13 |+ "a" -14 14 | F"b" -15 15 | "c" -16 16 | rf"d" +10 | "ghi" +11 | ) +12 | f = ( + - f"a" +13 + "a" +14 | F"b" +15 | "c" +16 | rf"d" F541 [*] f-string without any placeholders --> F541.py:14:5 @@ -99,16 +91,14 @@ F541 [*] f-string without any placeholders 16 | rf"d" | help: Remove extraneous `f` prefix - -ℹ Safe fix -11 11 | ) -12 12 | f = ( -13 13 | f"a" -14 |- F"b" - 14 |+ "b" -15 15 | "c" -16 16 | rf"d" -17 17 | fr"e" +11 | ) +12 | f = ( +13 | f"a" + - F"b" +14 + "b" +15 | "c" +16 | rf"d" +17 | fr"e" F541 [*] f-string without any placeholders --> F541.py:16:5 @@ -121,16 +111,14 @@ F541 [*] f-string without any placeholders 18 | ) | help: Remove extraneous `f` prefix - -ℹ Safe fix -13 13 | f"a" -14 14 | F"b" -15 15 | "c" -16 |- rf"d" - 16 |+ r"d" -17 17 | fr"e" -18 18 | ) -19 19 | g = f"" +13 | f"a" +14 | F"b" +15 | "c" + - rf"d" +16 + r"d" +17 | fr"e" +18 | ) +19 | g = f"" F541 [*] f-string without any placeholders --> F541.py:17:5 @@ -143,16 +131,14 @@ F541 [*] f-string without any placeholders 19 | g = f"" | help: Remove extraneous `f` prefix - -ℹ Safe fix -14 14 | F"b" -15 15 | "c" -16 16 | rf"d" -17 |- fr"e" - 17 |+ r"e" -18 18 | ) -19 19 | g = f"" -20 20 | +14 | F"b" +15 | "c" +16 | rf"d" + - fr"e" +17 + r"e" +18 | ) +19 | g = f"" +20 | F541 [*] f-string without any placeholders --> F541.py:19:5 @@ -165,16 +151,14 @@ F541 [*] f-string without any placeholders 21 | # OK | help: Remove extraneous `f` prefix - -ℹ Safe fix -16 16 | rf"d" -17 17 | fr"e" -18 18 | ) -19 |-g = f"" - 19 |+g = "" -20 20 | -21 21 | # OK -22 22 | g = f"ghi{123:{45}}" +16 | rf"d" +17 | fr"e" +18 | ) + - g = f"" +19 + g = "" +20 | +21 | # OK +22 | g = f"ghi{123:{45}}" F541 [*] f-string without any placeholders --> F541.py:25:13 @@ -186,16 +170,14 @@ F541 [*] f-string without any placeholders 27 | v = 23.234234 | help: Remove extraneous `f` prefix - -ℹ Safe fix -22 22 | g = f"ghi{123:{45}}" -23 23 | -24 24 | # Error -25 |-h = "x" "y" f"z" - 25 |+h = "x" "y" "z" -26 26 | -27 27 | v = 23.234234 -28 28 | +22 | g = f"ghi{123:{45}}" +23 | +24 | # Error + - h = "x" "y" f"z" +25 + h = "x" "y" "z" +26 | +27 | v = 23.234234 +28 | F541 [*] f-string without any placeholders --> F541.py:34:7 @@ -207,16 +189,14 @@ F541 [*] f-string without any placeholders 36 | f"{{test}}" | help: Remove extraneous `f` prefix - -ℹ Safe fix -31 31 | f"{f'{v:0.2f}'}" -32 32 | -33 33 | # Errors -34 |-f"{v:{f'0.2f'}}" - 34 |+f"{v:{'0.2f'}}" -35 35 | f"{f''}" -36 36 | f"{{test}}" -37 37 | f'{{ 40 }}' +31 | f"{f'{v:0.2f}'}" +32 | +33 | # Errors + - f"{v:{f'0.2f'}}" +34 + f"{v:{'0.2f'}}" +35 | f"{f''}" +36 | f"{{test}}" +37 | f'{{ 40 }}' F541 [*] f-string without any placeholders --> F541.py:35:4 @@ -229,16 +209,14 @@ F541 [*] f-string without any placeholders 37 | f'{{ 40 }}' | help: Remove extraneous `f` prefix - -ℹ Safe fix -32 32 | -33 33 | # Errors -34 34 | f"{v:{f'0.2f'}}" -35 |-f"{f''}" - 35 |+f"{''}" -36 36 | f"{{test}}" -37 37 | f'{{ 40 }}' -38 38 | f"{{a {{x}}" +32 | +33 | # Errors +34 | f"{v:{f'0.2f'}}" + - f"{f''}" +35 + f"{''}" +36 | f"{{test}}" +37 | f'{{ 40 }}' +38 | f"{{a {{x}}" F541 [*] f-string without any placeholders --> F541.py:36:1 @@ -251,16 +229,14 @@ F541 [*] f-string without any placeholders 38 | f"{{a {{x}}" | help: Remove extraneous `f` prefix - -ℹ Safe fix -33 33 | # Errors -34 34 | f"{v:{f'0.2f'}}" -35 35 | f"{f''}" -36 |-f"{{test}}" - 36 |+"{test}" -37 37 | f'{{ 40 }}' -38 38 | f"{{a {{x}}" -39 39 | f"{{{{x}}}}" +33 | # Errors +34 | f"{v:{f'0.2f'}}" +35 | f"{f''}" + - f"{{test}}" +36 + "{test}" +37 | f'{{ 40 }}' +38 | f"{{a {{x}}" +39 | f"{{{{x}}}}" F541 [*] f-string without any placeholders --> F541.py:37:1 @@ -273,16 +249,14 @@ F541 [*] f-string without any placeholders 39 | f"{{{{x}}}}" | help: Remove extraneous `f` prefix - -ℹ Safe fix -34 34 | f"{v:{f'0.2f'}}" -35 35 | f"{f''}" -36 36 | f"{{test}}" -37 |-f'{{ 40 }}' - 37 |+'{ 40 }' -38 38 | f"{{a {{x}}" -39 39 | f"{{{{x}}}}" -40 40 | ""f"" +34 | f"{v:{f'0.2f'}}" +35 | f"{f''}" +36 | f"{{test}}" + - f'{{ 40 }}' +37 + '{ 40 }' +38 | f"{{a {{x}}" +39 | f"{{{{x}}}}" +40 | ""f"" F541 [*] f-string without any placeholders --> F541.py:38:1 @@ -295,16 +269,14 @@ F541 [*] f-string without any placeholders 40 | ""f"" | help: Remove extraneous `f` prefix - -ℹ Safe fix -35 35 | f"{f''}" -36 36 | f"{{test}}" -37 37 | f'{{ 40 }}' -38 |-f"{{a {{x}}" - 38 |+"{a {x}" -39 39 | f"{{{{x}}}}" -40 40 | ""f"" -41 41 | ''f"" +35 | f"{f''}" +36 | f"{{test}}" +37 | f'{{ 40 }}' + - f"{{a {{x}}" +38 + "{a {x}" +39 | f"{{{{x}}}}" +40 | ""f"" +41 | ''f"" F541 [*] f-string without any placeholders --> F541.py:39:1 @@ -317,16 +289,14 @@ F541 [*] f-string without any placeholders 41 | ''f"" | help: Remove extraneous `f` prefix - -ℹ Safe fix -36 36 | f"{{test}}" -37 37 | f'{{ 40 }}' -38 38 | f"{{a {{x}}" -39 |-f"{{{{x}}}}" - 39 |+"{{x}}" -40 40 | ""f"" -41 41 | ''f"" -42 42 | (""f""r"") +36 | f"{{test}}" +37 | f'{{ 40 }}' +38 | f"{{a {{x}}" + - f"{{{{x}}}}" +39 + "{{x}}" +40 | ""f"" +41 | ''f"" +42 | (""f""r"") F541 [*] f-string without any placeholders --> F541.py:40:3 @@ -339,16 +309,14 @@ F541 [*] f-string without any placeholders 42 | (""f""r"") | help: Remove extraneous `f` prefix - -ℹ Safe fix -37 37 | f'{{ 40 }}' -38 38 | f"{{a {{x}}" -39 39 | f"{{{{x}}}}" -40 |-""f"" - 40 |+"" "" -41 41 | ''f"" -42 42 | (""f""r"") -43 43 | f"{v:{f"0.2f"}}" +37 | f'{{ 40 }}' +38 | f"{{a {{x}}" +39 | f"{{{{x}}}}" + - ""f"" +40 + "" "" +41 | ''f"" +42 | (""f""r"") +43 | f"{v:{f"0.2f"}}" F541 [*] f-string without any placeholders --> F541.py:41:3 @@ -361,16 +329,14 @@ F541 [*] f-string without any placeholders 43 | f"{v:{f"0.2f"}}" | help: Remove extraneous `f` prefix - -ℹ Safe fix -38 38 | f"{{a {{x}}" -39 39 | f"{{{{x}}}}" -40 40 | ""f"" -41 |-''f"" - 41 |+''"" -42 42 | (""f""r"") -43 43 | f"{v:{f"0.2f"}}" -44 44 | f"\{{x}}" +38 | f"{{a {{x}}" +39 | f"{{{{x}}}}" +40 | ""f"" + - ''f"" +41 + ''"" +42 | (""f""r"") +43 | f"{v:{f"0.2f"}}" +44 | f"\{{x}}" F541 [*] f-string without any placeholders --> F541.py:42:4 @@ -383,15 +349,13 @@ F541 [*] f-string without any placeholders 44 | f"\{{x}}" | help: Remove extraneous `f` prefix - -ℹ Safe fix -39 39 | f"{{{{x}}}}" -40 40 | ""f"" -41 41 | ''f"" -42 |-(""f""r"") - 42 |+("" ""r"") -43 43 | f"{v:{f"0.2f"}}" -44 44 | f"\{{x}}" +39 | f"{{{{x}}}}" +40 | ""f"" +41 | ''f"" + - (""f""r"") +42 + ("" ""r"") +43 | f"{v:{f"0.2f"}}" +44 | f"\{{x}}" F541 [*] f-string without any placeholders --> F541.py:43:7 @@ -403,14 +367,12 @@ F541 [*] f-string without any placeholders 44 | f"\{{x}}" | help: Remove extraneous `f` prefix - -ℹ Safe fix -40 40 | ""f"" -41 41 | ''f"" -42 42 | (""f""r"") -43 |-f"{v:{f"0.2f"}}" - 43 |+f"{v:{"0.2f"}}" -44 44 | f"\{{x}}" +40 | ""f"" +41 | ''f"" +42 | (""f""r"") + - f"{v:{f"0.2f"}}" +43 + f"{v:{"0.2f"}}" +44 | f"\{{x}}" F541 [*] f-string without any placeholders --> F541.py:44:1 @@ -421,10 +383,8 @@ F541 [*] f-string without any placeholders | ^^^^^^^^^ | help: Remove extraneous `f` prefix - -ℹ Safe fix -41 41 | ''f"" -42 42 | (""f""r"") -43 43 | f"{v:{f"0.2f"}}" -44 |-f"\{{x}}" - 44 |+"\{x}" +41 | ''f"" +42 | (""f""r"") +43 | f"{v:{f"0.2f"}}" + - f"\{{x}}" +44 + "\{x}" diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap index adf7c6cfb2..3f893c9f48 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F601_F601.py.snap @@ -94,15 +94,14 @@ F601 [*] Dictionary key literal `"a"` repeated 19 | } | help: Remove repeated key literal `"a"` - -ℹ Unsafe fix -15 15 | "a": 1, -16 16 | "a": 2, -17 17 | "a": 3, -18 |- "a": 3, -19 18 | } -20 19 | -21 20 | x = { +15 | "a": 1, +16 | "a": 2, +17 | "a": 3, + - "a": 3, +18 | } +19 | +20 | x = { +note: This is an unsafe fix and may change runtime behavior F601 Dictionary key literal `"a"` repeated --> F601.py:23:5 @@ -139,15 +138,14 @@ F601 [*] Dictionary key literal `"a"` repeated 27 | } | help: Remove repeated key literal `"a"` - -ℹ Unsafe fix -22 22 | "a": 1, -23 23 | "a": 2, -24 24 | "a": 3, -25 |- "a": 3, -26 25 | "a": 4, -27 26 | } -28 27 | +22 | "a": 1, +23 | "a": 2, +24 | "a": 3, + - "a": 3, +25 | "a": 4, +26 | } +27 | +note: This is an unsafe fix and may change runtime behavior F601 Dictionary key literal `"a"` repeated --> F601.py:26:5 @@ -171,15 +169,14 @@ F601 [*] Dictionary key literal `"a"` repeated 33 | "a": 3, | help: Remove repeated key literal `"a"` - -ℹ Unsafe fix -28 28 | -29 29 | x = { -30 30 | "a": 1, -31 |- "a": 1, -32 31 | "a": 2, -33 32 | "a": 3, -34 33 | "a": 4, +28 | +29 | x = { +30 | "a": 1, + - "a": 1, +31 | "a": 2, +32 | "a": 3, +33 | "a": 4, +note: This is an unsafe fix and may change runtime behavior F601 Dictionary key literal `"a"` repeated --> F601.py:32:5 @@ -251,15 +248,14 @@ F601 [*] Dictionary key literal `"a"` repeated 47 | } | help: Remove repeated key literal `"a"` - -ℹ Unsafe fix -42 42 | a: 2, -43 43 | "a": 3, -44 44 | a: 3, -45 |- "a": 3, -46 45 | a: 4, -47 46 | } -48 47 | +42 | a: 2, +43 | "a": 3, +44 | a: 3, + - "a": 3, +45 | a: 4, +46 | } +47 | +note: This is an unsafe fix and may change runtime behavior F601 [*] Dictionary key literal `"a"` repeated --> F601.py:49:14 @@ -271,16 +267,15 @@ F601 [*] Dictionary key literal `"a"` repeated 50 | x = {"a": 1, "b": 2, "a": 1} | help: Remove repeated key literal `"a"` - -ℹ Unsafe fix -46 46 | a: 4, -47 47 | } -48 48 | -49 |-x = {"a": 1, "a": 1} - 49 |+x = {"a": 1} -50 50 | x = {"a": 1, "b": 2, "a": 1} -51 51 | -52 52 | x = { +46 | a: 4, +47 | } +48 | + - x = {"a": 1, "a": 1} +49 + x = {"a": 1} +50 | x = {"a": 1, "b": 2, "a": 1} +51 | +52 | x = { +note: This is an unsafe fix and may change runtime behavior F601 [*] Dictionary key literal `"a"` repeated --> F601.py:50:22 @@ -292,16 +287,15 @@ F601 [*] Dictionary key literal `"a"` repeated 52 | x = { | help: Remove repeated key literal `"a"` - -ℹ Unsafe fix -47 47 | } -48 48 | -49 49 | x = {"a": 1, "a": 1} -50 |-x = {"a": 1, "b": 2, "a": 1} - 50 |+x = {"a": 1, "b": 2} -51 51 | -52 52 | x = { -53 53 | ('a', 'b'): 'asdf', +47 | } +48 | +49 | x = {"a": 1, "a": 1} + - x = {"a": 1, "b": 2, "a": 1} +50 + x = {"a": 1, "b": 2} +51 | +52 | x = { +53 | ('a', 'b'): 'asdf', +note: This is an unsafe fix and may change runtime behavior F601 Dictionary key literal `('a', 'b')` repeated --> F601.py:54:5 @@ -324,16 +318,15 @@ F601 [*] Dictionary key literal `"x"` repeated 60 | t={"x":("test123"), "x":"test123"} | help: Remove repeated key literal `"x"` - -ℹ Unsafe fix -55 55 | } -56 56 | -57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897 -58 |-t={"x":"test123", "x":("test123")} - 58 |+t={"x":"test123"} -59 59 | -60 60 | t={"x":("test123"), "x":"test123"} -61 61 | +55 | } +56 | +57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897 + - t={"x":"test123", "x":("test123")} +58 + t={"x":"test123"} +59 | +60 | t={"x":("test123"), "x":"test123"} +61 | +note: This is an unsafe fix and may change runtime behavior F601 [*] Dictionary key literal `"x"` repeated --> F601.py:60:21 @@ -346,16 +339,15 @@ F601 [*] Dictionary key literal `"x"` repeated 62 | # Regression test for: https://github.com/astral-sh/ruff/issues/12772 | help: Remove repeated key literal `"x"` - -ℹ Unsafe fix -57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897 -58 58 | t={"x":"test123", "x":("test123")} -59 59 | -60 |-t={"x":("test123"), "x":"test123"} - 60 |+t={"x":("test123")} -61 61 | -62 62 | # Regression test for: https://github.com/astral-sh/ruff/issues/12772 -63 63 | x = { +57 | # Regression test for: https://github.com/astral-sh/ruff/issues/4897 +58 | t={"x":"test123", "x":("test123")} +59 | + - t={"x":("test123"), "x":"test123"} +60 + t={"x":("test123")} +61 | +62 | # Regression test for: https://github.com/astral-sh/ruff/issues/12772 +63 | x = { +note: This is an unsafe fix and may change runtime behavior F601 Dictionary key literal `1` repeated --> F601.py:65:5 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap index f49f8ea2ec..fef3946669 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F602_F602.py.snap @@ -47,15 +47,14 @@ F602 [*] Dictionary key `a` repeated 14 | } | help: Remove repeated key `a` - -ℹ Unsafe fix -10 10 | a: 1, -11 11 | a: 2, -12 12 | a: 3, -13 |- a: 3, -14 13 | } -15 14 | -16 15 | x = { +10 | a: 1, +11 | a: 2, +12 | a: 3, + - a: 3, +13 | } +14 | +15 | x = { +note: This is an unsafe fix and may change runtime behavior F602 Dictionary key `a` repeated --> F602.py:18:5 @@ -92,15 +91,14 @@ F602 [*] Dictionary key `a` repeated 22 | } | help: Remove repeated key `a` - -ℹ Unsafe fix -17 17 | a: 1, -18 18 | a: 2, -19 19 | a: 3, -20 |- a: 3, -21 20 | a: 4, -22 21 | } -23 22 | +17 | a: 1, +18 | a: 2, +19 | a: 3, + - a: 3, +20 | a: 4, +21 | } +22 | +note: This is an unsafe fix and may change runtime behavior F602 Dictionary key `a` repeated --> F602.py:21:5 @@ -124,15 +122,14 @@ F602 [*] Dictionary key `a` repeated 28 | a: 3, | help: Remove repeated key `a` - -ℹ Unsafe fix -23 23 | -24 24 | x = { -25 25 | a: 1, -26 |- a: 1, -27 26 | a: 2, -28 27 | a: 3, -29 28 | a: 4, +23 | +24 | x = { +25 | a: 1, + - a: 1, +26 | a: 2, +27 | a: 3, +28 | a: 4, +note: This is an unsafe fix and may change runtime behavior F602 Dictionary key `a` repeated --> F602.py:27:5 @@ -180,15 +177,14 @@ F602 [*] Dictionary key `a` repeated 37 | a: 2, | help: Remove repeated key `a` - -ℹ Unsafe fix -32 32 | x = { -33 33 | a: 1, -34 34 | "a": 1, -35 |- a: 1, -36 35 | "a": 2, -37 36 | a: 2, -38 37 | "a": 3, +32 | x = { +33 | a: 1, +34 | "a": 1, + - a: 1, +35 | "a": 2, +36 | a: 2, +37 | "a": 3, +note: This is an unsafe fix and may change runtime behavior F602 Dictionary key `a` repeated --> F602.py:37:5 @@ -235,14 +231,13 @@ F602 [*] Dictionary key `a` repeated 45 | x = {a: 1, b: 2, a: 1} | help: Remove repeated key `a` - -ℹ Unsafe fix -41 41 | a: 4, -42 42 | } -43 43 | -44 |-x = {a: 1, a: 1} - 44 |+x = {a: 1} -45 45 | x = {a: 1, b: 2, a: 1} +41 | a: 4, +42 | } +43 | + - x = {a: 1, a: 1} +44 + x = {a: 1} +45 | x = {a: 1, b: 2, a: 1} +note: This is an unsafe fix and may change runtime behavior F602 [*] Dictionary key `a` repeated --> F602.py:45:18 @@ -252,10 +247,9 @@ F602 [*] Dictionary key `a` repeated | ^ | help: Remove repeated key `a` - -ℹ Unsafe fix -42 42 | } -43 43 | -44 44 | x = {a: 1, a: 1} -45 |-x = {a: 1, b: 2, a: 1} - 45 |+x = {a: 1, b: 2} +42 | } +43 | +44 | x = {a: 1, a: 1} + - x = {a: 1, b: 2, a: 1} +45 + x = {a: 1, b: 2} +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap index a0fc045e36..a45eb31267 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F632_F632.py.snap @@ -9,13 +9,11 @@ F632 [*] Use `==` to compare constant literals 2 | pass | help: Replace `is` with `==` - -ℹ Safe fix -1 |-if x is "abc": - 1 |+if x == "abc": -2 2 | pass -3 3 | -4 4 | if 123 is not y: + - if x is "abc": +1 + if x == "abc": +2 | pass +3 | +4 | if 123 is not y: F632 [*] Use `!=` to compare constant literals --> F632.py:4:4 @@ -27,16 +25,14 @@ F632 [*] Use `!=` to compare constant literals 5 | pass | help: Replace `is not` with `!=` - -ℹ Safe fix -1 1 | if x is "abc": -2 2 | pass -3 3 | -4 |-if 123 is not y: - 4 |+if 123 != y: -5 5 | pass -6 6 | -7 7 | if 123 is \ +1 | if x is "abc": +2 | pass +3 | + - if 123 is not y: +4 + if 123 != y: +5 | pass +6 | +7 | if 123 is \ F632 [*] Use `!=` to compare constant literals --> F632.py:7:4 @@ -50,17 +46,15 @@ F632 [*] Use `!=` to compare constant literals 9 | pass | help: Replace `is not` with `!=` - -ℹ Safe fix -4 4 | if 123 is not y: -5 5 | pass -6 6 | -7 |-if 123 is \ -8 |- not y: - 7 |+if 123 != y: -9 8 | pass -10 9 | -11 10 | if "123" is x < 3: +4 | if 123 is not y: +5 | pass +6 | + - if 123 is \ + - not y: +7 + if 123 != y: +8 | pass +9 | +10 | if "123" is x < 3: F632 [*] Use `==` to compare constant literals --> F632.py:11:4 @@ -72,16 +66,14 @@ F632 [*] Use `==` to compare constant literals 12 | pass | help: Replace `is` with `==` - -ℹ Safe fix -8 8 | not y: -9 9 | pass -10 10 | -11 |-if "123" is x < 3: - 11 |+if "123" == x < 3: -12 12 | pass -13 13 | -14 14 | if "123" != x is 3: +8 | not y: +9 | pass +10 | + - if "123" is x < 3: +11 + if "123" == x < 3: +12 | pass +13 | +14 | if "123" != x is 3: F632 [*] Use `==` to compare constant literals --> F632.py:14:4 @@ -93,16 +85,14 @@ F632 [*] Use `==` to compare constant literals 15 | pass | help: Replace `is` with `==` - -ℹ Safe fix -11 11 | if "123" is x < 3: -12 12 | pass -13 13 | -14 |-if "123" != x is 3: - 14 |+if "123" != x == 3: -15 15 | pass -16 16 | -17 17 | if ("123" != x) is 3: +11 | if "123" is x < 3: +12 | pass +13 | + - if "123" != x is 3: +14 + if "123" != x == 3: +15 | pass +16 | +17 | if ("123" != x) is 3: F632 [*] Use `==` to compare constant literals --> F632.py:17:4 @@ -114,16 +104,14 @@ F632 [*] Use `==` to compare constant literals 18 | pass | help: Replace `is` with `==` - -ℹ Safe fix -14 14 | if "123" != x is 3: -15 15 | pass -16 16 | -17 |-if ("123" != x) is 3: - 17 |+if ("123" != x) == 3: -18 18 | pass -19 19 | -20 20 | if "123" != (x is 3): +14 | if "123" != x is 3: +15 | pass +16 | + - if ("123" != x) is 3: +17 + if ("123" != x) == 3: +18 | pass +19 | +20 | if "123" != (x is 3): F632 [*] Use `==` to compare constant literals --> F632.py:20:14 @@ -135,16 +123,14 @@ F632 [*] Use `==` to compare constant literals 21 | pass | help: Replace `is` with `==` - -ℹ Safe fix -17 17 | if ("123" != x) is 3: -18 18 | pass -19 19 | -20 |-if "123" != (x is 3): - 20 |+if "123" != (x == 3): -21 21 | pass -22 22 | -23 23 | {2 is +17 | if ("123" != x) is 3: +18 | pass +19 | + - if "123" != (x is 3): +20 + if "123" != (x == 3): +21 | pass +22 | +23 | {2 is F632 [*] Use `!=` to compare constant literals --> F632.py:23:2 @@ -159,17 +145,15 @@ F632 [*] Use `!=` to compare constant literals 26 | {2 is | help: Replace `is not` with `!=` - -ℹ Safe fix -20 20 | if "123" != (x is 3): -21 21 | pass -22 22 | -23 |-{2 is -24 |-not ''} - 23 |+{2 != ''} -25 24 | -26 25 | {2 is -27 26 | not ''} +20 | if "123" != (x is 3): +21 | pass +22 | + - {2 is + - not ''} +23 + {2 != ''} +24 | +25 | {2 is +26 | not ''} F632 [*] Use `!=` to compare constant literals --> F632.py:26:2 @@ -184,17 +168,15 @@ F632 [*] Use `!=` to compare constant literals 29 | # Regression test for | help: Replace `is not` with `!=` - -ℹ Safe fix -23 23 | {2 is -24 24 | not ''} -25 25 | -26 |-{2 is -27 |- not ''} - 26 |+{2 != ''} -28 27 | -29 28 | # Regression test for -30 29 | if values[1is not None ] is not '-': +23 | {2 is +24 | not ''} +25 | + - {2 is + - not ''} +26 + {2 != ''} +27 | +28 | # Regression test for +29 | if values[1is not None ] is not '-': F632 [*] Use `!=` to compare constant literals --> F632.py:30:4 @@ -205,16 +187,14 @@ F632 [*] Use `!=` to compare constant literals 31 | pass | help: Replace `is not` with `!=` - -ℹ Safe fix -27 27 | not ''} -28 28 | -29 29 | # Regression test for -30 |-if values[1is not None ] is not '-': - 30 |+if values[1is not None ] != '-': -31 31 | pass -32 32 | -33 33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736 +27 | not ''} +28 | +29 | # Regression test for + - if values[1is not None ] is not '-': +30 + if values[1is not None ] != '-': +31 | pass +32 | +33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736 F632 [*] Use `!=` to compare constant literals --> F632.py:30:11 @@ -225,16 +205,14 @@ F632 [*] Use `!=` to compare constant literals 31 | pass | help: Replace `is not` with `!=` - -ℹ Safe fix -27 27 | not ''} -28 28 | -29 29 | # Regression test for -30 |-if values[1is not None ] is not '-': - 30 |+if values[1!= None ] is not '-': -31 31 | pass -32 32 | -33 33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736 +27 | not ''} +28 | +29 | # Regression test for + - if values[1is not None ] is not '-': +30 + if values[1!= None ] is not '-': +31 | pass +32 | +33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736 F632 [*] Use `!=` to compare constant literals --> F632.py:34:12 @@ -244,10 +222,8 @@ F632 [*] Use `!=` to compare constant literals | ^^^^^^^^^^^^ | help: Replace `is not` with `!=` - -ℹ Safe fix -31 31 | pass -32 32 | -33 33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736 -34 |-variable: "123 is not y" - 34 |+variable: "123 != y" +31 | pass +32 | +33 | # Regression test for https://github.com/astral-sh/ruff/issues/11736 + - variable: "123 is not y" +34 + variable: "123 != y" diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap index 70cee8d8c0..4e2418dd03 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_17.py.snap @@ -17,15 +17,13 @@ F811 [*] Redefinition of unused `fu` from line 2 | -- previous definition of `fu` here | help: Remove definition: `fu` - -ℹ Safe fix -3 3 | -4 4 | -5 5 | def bar(): -6 |- import fu -7 6 | -8 7 | def baz(): -9 8 | def fu(): +3 | +4 | +5 | def bar(): + - import fu +6 | +7 | def baz(): +8 | def fu(): F811 Redefinition of unused `fu` from line 6 --> F811_17.py:6:12 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap index 196596c3ce..2da69cf461 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_21.py.snap @@ -19,15 +19,13 @@ F811 [*] Redefinition of unused `Sequence` from line 26 27 | ) | help: Remove definition: `Sequence` - -ℹ Safe fix -27 27 | ) -28 28 | -29 29 | # This should ignore the first error. -30 |-from typing import ( -31 |- List, # noqa: F811 -32 |- Sequence, -33 |-) -34 30 | -35 31 | # This should ignore both errors. -36 32 | from typing import ( # noqa +27 | ) +28 | +29 | # This should ignore the first error. + - from typing import ( + - List, # noqa: F811 + - Sequence, + - ) +30 | +31 | # This should ignore both errors. +32 | from typing import ( # noqa diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap index c6a3a8d8fb..13e51004a0 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_32.py.snap @@ -12,12 +12,10 @@ F811 [*] Redefinition of unused `List` from line 4 6 | ) | help: Remove definition: `List` - -ℹ Safe fix -2 2 | -3 3 | from typing import ( -4 4 | List, -5 |- List, -6 5 | ) -7 6 | -8 7 | +2 | +3 | from typing import ( +4 | List, + - List, +5 | ) +6 | +7 | diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap index cd6894d8c0..ab553d62fc 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_6.py.snap @@ -13,10 +13,8 @@ F811 [*] Redefinition of unused `os` from line 5 7 | os.path | help: Remove definition: `os` - -ℹ Safe fix -3 3 | i = 2 -4 4 | if i == 1: -5 5 | import os -6 |- import os -7 6 | os.path +3 | i = 2 +4 | if i == 1: +5 | import os + - import os +6 | os.path diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap index e198880e37..356a2d20b6 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F811_F811_8.py.snap @@ -13,12 +13,10 @@ F811 [*] Redefinition of unused `os` from line 4 7 | pass | help: Remove definition: `os` - -ℹ Safe fix -2 2 | -3 3 | try: -4 4 | import os -5 |- import os -6 5 | except: -7 6 | pass -8 7 | os.path +2 | +3 | try: +4 | import os + - import os +5 | except: +6 | pass +7 | os.path diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap index b03ac3b0dd..78d16bb9be 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_0.py.snap @@ -11,15 +11,13 @@ F841 [*] Local variable `e` is assigned to but never used 4 | pass | help: Remove assignment to unused variable `e` - -ℹ Safe fix -1 1 | try: -2 2 | 1 / 0 -3 |-except ValueError as e: - 3 |+except ValueError: -4 4 | pass -5 5 | -6 6 | +1 | try: +2 | 1 / 0 + - except ValueError as e: +3 + except ValueError: +4 | pass +5 | +6 | F841 [*] Local variable `z` is assigned to but never used --> F841_0.py:16:5 @@ -30,16 +28,15 @@ F841 [*] Local variable `z` is assigned to but never used | ^ | help: Remove assignment to unused variable `z` - -ℹ Unsafe fix -13 13 | def f(): -14 14 | x = 1 -15 15 | y = 2 -16 |- z = x + y - 16 |+ x + y -17 17 | -18 18 | -19 19 | def f(): +13 | def f(): +14 | x = 1 +15 | y = 2 + - z = x + y +16 + x + y +17 | +18 | +19 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `foo` is assigned to but never used --> F841_0.py:20:5 @@ -50,15 +47,14 @@ F841 [*] Local variable `foo` is assigned to but never used 21 | (a, b) = (1, 2) | help: Remove assignment to unused variable `foo` - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def f(): -20 |- foo = (1, 2) -21 20 | (a, b) = (1, 2) -22 21 | -23 22 | bar = (1, 2) +17 | +18 | +19 | def f(): + - foo = (1, 2) +20 | (a, b) = (1, 2) +21 | +22 | bar = (1, 2) +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `a` is assigned to but never used --> F841_0.py:21:6 @@ -71,16 +67,15 @@ F841 [*] Local variable `a` is assigned to but never used 23 | bar = (1, 2) | help: Remove assignment to unused variable `a` - -ℹ Unsafe fix -18 18 | -19 19 | def f(): -20 20 | foo = (1, 2) -21 |- (a, b) = (1, 2) - 21 |+ (_a, b) = (1, 2) -22 22 | -23 23 | bar = (1, 2) -24 24 | (c, d) = bar +18 | +19 | def f(): +20 | foo = (1, 2) + - (a, b) = (1, 2) +21 + (_a, b) = (1, 2) +22 | +23 | bar = (1, 2) +24 | (c, d) = bar +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `b` is assigned to but never used --> F841_0.py:21:9 @@ -93,16 +88,15 @@ F841 [*] Local variable `b` is assigned to but never used 23 | bar = (1, 2) | help: Remove assignment to unused variable `b` - -ℹ Unsafe fix -18 18 | -19 19 | def f(): -20 20 | foo = (1, 2) -21 |- (a, b) = (1, 2) - 21 |+ (a, _b) = (1, 2) -22 22 | -23 23 | bar = (1, 2) -24 24 | (c, d) = bar +18 | +19 | def f(): +20 | foo = (1, 2) + - (a, b) = (1, 2) +21 + (a, _b) = (1, 2) +22 | +23 | bar = (1, 2) +24 | (c, d) = bar +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `baz` is assigned to but never used --> F841_0.py:26:14 @@ -113,16 +107,15 @@ F841 [*] Local variable `baz` is assigned to but never used | ^^^ | help: Remove assignment to unused variable `baz` - -ℹ Unsafe fix -23 23 | bar = (1, 2) -24 24 | (c, d) = bar -25 25 | -26 |- (x, y) = baz = bar - 26 |+ (x, y) = bar -27 27 | -28 28 | -29 29 | def f(): +23 | bar = (1, 2) +24 | (c, d) = bar +25 | + - (x, y) = baz = bar +26 + (x, y) = bar +27 | +28 | +29 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `b` is assigned to but never used --> F841_0.py:51:9 @@ -135,16 +128,15 @@ F841 [*] Local variable `b` is assigned to but never used 53 | def d(): | help: Remove assignment to unused variable `b` - -ℹ Unsafe fix -48 48 | -49 49 | def c(): -50 50 | # F841 -51 |- b = 1 - 51 |+ pass -52 52 | -53 53 | def d(): -54 54 | nonlocal b +48 | +49 | def c(): +50 | # F841 + - b = 1 +51 + pass +52 | +53 | def d(): +54 | nonlocal b +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `my_file` is assigned to but never used --> F841_0.py:79:26 @@ -155,16 +147,15 @@ F841 [*] Local variable `my_file` is assigned to but never used 80 | print("hello") | help: Remove assignment to unused variable `my_file` - -ℹ Unsafe fix -76 76 | -77 77 | -78 78 | def f(): -79 |- with open("file") as my_file, open("") as ((this, that)): - 79 |+ with open("file"), open("") as ((this, that)): -80 80 | print("hello") -81 81 | -82 82 | +76 | +77 | +78 | def f(): + - with open("file") as my_file, open("") as ((this, that)): +79 + with open("file"), open("") as ((this, that)): +80 | print("hello") +81 | +82 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `my_file` is assigned to but never used --> F841_0.py:85:25 @@ -177,16 +168,15 @@ F841 [*] Local variable `my_file` is assigned to but never used 87 | ): | help: Remove assignment to unused variable `my_file` - -ℹ Unsafe fix -82 82 | -83 83 | def f(): -84 84 | with ( -85 |- open("file") as my_file, - 85 |+ open("file"), -86 86 | open("") as ((this, that)), -87 87 | ): -88 88 | print("hello") +82 | +83 | def f(): +84 | with ( + - open("file") as my_file, +85 + open("file"), +86 | open("") as ((this, that)), +87 | ): +88 | print("hello") +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `msg3` is assigned to but never used --> F841_0.py:102:5 @@ -199,15 +189,14 @@ F841 [*] Local variable `msg3` is assigned to but never used 104 | case 1: | help: Remove assignment to unused variable `msg3` - -ℹ Unsafe fix -99 99 | def f(x: int): -100 100 | msg1 = "Hello, world!" -101 101 | msg2 = "Hello, world!" -102 |- msg3 = "Hello, world!" -103 102 | match x: -104 103 | case 1: -105 104 | print(msg1) +99 | def f(x: int): +100 | msg1 = "Hello, world!" +101 | msg2 = "Hello, world!" + - msg3 = "Hello, world!" +102 | match x: +103 | case 1: +104 | print(msg1) +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `Baz` is assigned to but never used --> F841_0.py:115:5 @@ -220,16 +209,15 @@ F841 [*] Local variable `Baz` is assigned to but never used 117 | match x: | help: Remove assignment to unused variable `Baz` - -ℹ Unsafe fix -112 112 | -113 113 | Foo = enum.Enum("Foo", "A B") -114 114 | Bar = enum.Enum("Bar", "A B") -115 |- Baz = enum.Enum("Baz", "A B") - 115 |+ enum.Enum("Baz", "A B") -116 116 | -117 117 | match x: -118 118 | case (Foo.A): +112 | +113 | Foo = enum.Enum("Foo", "A B") +114 | Bar = enum.Enum("Bar", "A B") + - Baz = enum.Enum("Baz", "A B") +115 + enum.Enum("Baz", "A B") +116 | +117 | match x: +118 | case (Foo.A): +note: This is an unsafe fix and may change runtime behavior F841 Local variable `y` is assigned to but never used --> F841_0.py:122:14 @@ -261,16 +249,15 @@ F841 [*] Local variable `__class__` is assigned to but never used | ^^^^^^^^^ | help: Remove assignment to unused variable `__class__` - -ℹ Unsafe fix -165 165 | # variables that don't refer to the special `__class__` cell. -166 166 | class A: -167 167 | def set_class(self, cls): -168 |- __class__ = cls # F841 - 168 |+ pass # F841 -169 169 | -170 170 | -171 171 | class A: +165 | # variables that don't refer to the special `__class__` cell. +166 | class A: +167 | def set_class(self, cls): + - __class__ = cls # F841 +168 + pass # F841 +169 | +170 | +171 | class A: +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `__class__` is assigned to but never used --> F841_0.py:174:13 @@ -281,16 +268,15 @@ F841 [*] Local variable `__class__` is assigned to but never used | ^^^^^^^^^ | help: Remove assignment to unused variable `__class__` - -ℹ Unsafe fix -171 171 | class A: -172 172 | class B: -173 173 | def set_class(self, cls): -174 |- __class__ = cls # F841 - 174 |+ pass # F841 -175 175 | -176 176 | -177 177 | class A: +171 | class A: +172 | class B: +173 | def set_class(self, cls): + - __class__ = cls # F841 +174 + pass # F841 +175 | +176 | +177 | class A: +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `__class__` is assigned to but never used --> F841_0.py:182:17 @@ -301,13 +287,12 @@ F841 [*] Local variable `__class__` is assigned to but never used | ^^^^^^^^^ | help: Remove assignment to unused variable `__class__` - -ℹ Unsafe fix -179 179 | class B: -180 180 | print(__class__) -181 181 | def set_class(self, cls): -182 |- __class__ = cls # F841 - 182 |+ pass # F841 -183 183 | -184 184 | -185 185 | # OK, the `__class__` cell is nonlocal and declared as such. +179 | class B: +180 | print(__class__) +181 | def set_class(self, cls): + - __class__ = cls # F841 +182 + pass # F841 +183 | +184 | +185 | # OK, the `__class__` cell is nonlocal and declared as such. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap index f1b8ea02c3..68bcb7655d 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_1.py.snap @@ -9,16 +9,15 @@ F841 [*] Local variable `x` is assigned to but never used | ^ | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -3 3 | -4 4 | -5 5 | def f(): -6 |- x, y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed - 6 |+ _x, y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed -7 7 | -8 8 | -9 9 | def f(): +3 | +4 | +5 | def f(): + - x, y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed +6 + _x, y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed +7 | +8 | +9 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_1.py:6:8 @@ -28,16 +27,15 @@ F841 [*] Local variable `y` is assigned to but never used | ^ | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -3 3 | -4 4 | -5 5 | def f(): -6 |- x, y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed - 6 |+ x, _y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed -7 7 | -8 8 | -9 9 | def f(): +3 | +4 | +5 | def f(): + - x, y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed +6 + x, _y = 1, 2 # this triggers F841 as it's just a simple assignment where unpacking isn't needed +7 | +8 | +9 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `coords` is assigned to but never used --> F841_1.py:16:14 @@ -47,16 +45,15 @@ F841 [*] Local variable `coords` is assigned to but never used | ^^^^^^ | help: Remove assignment to unused variable `coords` - -ℹ Unsafe fix -13 13 | -14 14 | -15 15 | def f(): -16 |- (x, y) = coords = 1, 2 - 16 |+ (x, y) = 1, 2 -17 17 | -18 18 | -19 19 | def f(): +13 | +14 | +15 | def f(): + - (x, y) = coords = 1, 2 +16 + (x, y) = 1, 2 +17 | +18 | +19 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `coords` is assigned to but never used --> F841_1.py:20:5 @@ -66,16 +63,15 @@ F841 [*] Local variable `coords` is assigned to but never used | ^^^^^^ | help: Remove assignment to unused variable `coords` - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def f(): -20 |- coords = (x, y) = 1, 2 - 20 |+ (x, y) = 1, 2 -21 21 | -22 22 | -23 23 | def f(): +17 | +18 | +19 | def f(): + - coords = (x, y) = 1, 2 +20 + (x, y) = 1, 2 +21 | +22 | +23 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `a` is assigned to but never used --> F841_1.py:24:6 @@ -85,13 +81,12 @@ F841 [*] Local variable `a` is assigned to but never used | ^ | help: Remove assignment to unused variable `a` - -ℹ Unsafe fix -21 21 | -22 22 | -23 23 | def f(): -24 |- (a, b) = (x, y) = 1, 2 # this triggers F841 on everything - 24 |+ (_a, b) = (x, y) = 1, 2 # this triggers F841 on everything +21 | +22 | +23 | def f(): + - (a, b) = (x, y) = 1, 2 # this triggers F841 on everything +24 + (_a, b) = (x, y) = 1, 2 # this triggers F841 on everything +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `b` is assigned to but never used --> F841_1.py:24:9 @@ -101,13 +96,12 @@ F841 [*] Local variable `b` is assigned to but never used | ^ | help: Remove assignment to unused variable `b` - -ℹ Unsafe fix -21 21 | -22 22 | -23 23 | def f(): -24 |- (a, b) = (x, y) = 1, 2 # this triggers F841 on everything - 24 |+ (a, _b) = (x, y) = 1, 2 # this triggers F841 on everything +21 | +22 | +23 | def f(): + - (a, b) = (x, y) = 1, 2 # this triggers F841 on everything +24 + (a, _b) = (x, y) = 1, 2 # this triggers F841 on everything +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x` is assigned to but never used --> F841_1.py:24:15 @@ -117,13 +111,12 @@ F841 [*] Local variable `x` is assigned to but never used | ^ | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -21 21 | -22 22 | -23 23 | def f(): -24 |- (a, b) = (x, y) = 1, 2 # this triggers F841 on everything - 24 |+ (a, b) = (_x, y) = 1, 2 # this triggers F841 on everything +21 | +22 | +23 | def f(): + - (a, b) = (x, y) = 1, 2 # this triggers F841 on everything +24 + (a, b) = (_x, y) = 1, 2 # this triggers F841 on everything +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_1.py:24:18 @@ -133,10 +126,9 @@ F841 [*] Local variable `y` is assigned to but never used | ^ | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -21 21 | -22 22 | -23 23 | def f(): -24 |- (a, b) = (x, y) = 1, 2 # this triggers F841 on everything - 24 |+ (a, b) = (x, _y) = 1, 2 # this triggers F841 on everything +21 | +22 | +23 | def f(): + - (a, b) = (x, y) = 1, 2 # this triggers F841 on everything +24 + (a, b) = (x, _y) = 1, 2 # this triggers F841 on everything +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap index 9ddc03a282..0eb98d599e 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F841_F841_3.py.snap @@ -10,15 +10,14 @@ F841 [*] Local variable `x` is assigned to but never used 6 | y = 2 | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -2 2 | -3 3 | -4 4 | def f(): -5 |- x = 1 -6 5 | y = 2 -7 6 | -8 7 | z = 3 +2 | +3 | +4 | def f(): + - x = 1 +5 | y = 2 +6 | +7 | z = 3 +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_3.py:6:5 @@ -31,15 +30,14 @@ F841 [*] Local variable `y` is assigned to but never used 8 | z = 3 | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -3 3 | -4 4 | def f(): -5 5 | x = 1 -6 |- y = 2 -7 6 | -8 7 | z = 3 -9 8 | print(z) +3 | +4 | def f(): +5 | x = 1 + - y = 2 +6 | +7 | z = 3 +8 | print(z) +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x` is assigned to but never used --> F841_3.py:13:5 @@ -50,15 +48,14 @@ F841 [*] Local variable `x` is assigned to but never used 14 | y: int = 2 | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -10 10 | -11 11 | -12 12 | def f(): -13 |- x: int = 1 -14 13 | y: int = 2 -15 14 | -16 15 | z: int = 3 +10 | +11 | +12 | def f(): + - x: int = 1 +13 | y: int = 2 +14 | +15 | z: int = 3 +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_3.py:14:5 @@ -71,15 +68,14 @@ F841 [*] Local variable `y` is assigned to but never used 16 | z: int = 3 | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -11 11 | -12 12 | def f(): -13 13 | x: int = 1 -14 |- y: int = 2 -15 14 | -16 15 | z: int = 3 -17 16 | print(z) +11 | +12 | def f(): +13 | x: int = 1 + - y: int = 2 +14 | +15 | z: int = 3 +16 | print(z) +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x1` is assigned to but never used --> F841_3.py:21:19 @@ -90,16 +86,15 @@ F841 [*] Local variable `x1` is assigned to but never used 22 | pass | help: Remove assignment to unused variable `x1` - -ℹ Unsafe fix -18 18 | -19 19 | -20 20 | def f(): -21 |- with foo() as x1: - 21 |+ with foo(): -22 22 | pass -23 23 | -24 24 | with foo() as (x2, y2): +18 | +19 | +20 | def f(): + - with foo() as x1: +21 + with foo(): +22 | pass +23 | +24 | with foo() as (x2, y2): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x3` is assigned to but never used --> F841_3.py:27:20 @@ -111,16 +106,15 @@ F841 [*] Local variable `x3` is assigned to but never used 28 | pass | help: Remove assignment to unused variable `x3` - -ℹ Unsafe fix -24 24 | with foo() as (x2, y2): -25 25 | pass -26 26 | -27 |- with (foo() as x3, foo() as y3, foo() as z3): - 27 |+ with (foo(), foo() as y3, foo() as z3): -28 28 | pass -29 29 | -30 30 | +24 | with foo() as (x2, y2): +25 | pass +26 | + - with (foo() as x3, foo() as y3, foo() as z3): +27 + with (foo(), foo() as y3, foo() as z3): +28 | pass +29 | +30 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y3` is assigned to but never used --> F841_3.py:27:33 @@ -132,16 +126,15 @@ F841 [*] Local variable `y3` is assigned to but never used 28 | pass | help: Remove assignment to unused variable `y3` - -ℹ Unsafe fix -24 24 | with foo() as (x2, y2): -25 25 | pass -26 26 | -27 |- with (foo() as x3, foo() as y3, foo() as z3): - 27 |+ with (foo() as x3, foo(), foo() as z3): -28 28 | pass -29 29 | -30 30 | +24 | with foo() as (x2, y2): +25 | pass +26 | + - with (foo() as x3, foo() as y3, foo() as z3): +27 + with (foo() as x3, foo(), foo() as z3): +28 | pass +29 | +30 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `z3` is assigned to but never used --> F841_3.py:27:46 @@ -153,16 +146,15 @@ F841 [*] Local variable `z3` is assigned to but never used 28 | pass | help: Remove assignment to unused variable `z3` - -ℹ Unsafe fix -24 24 | with foo() as (x2, y2): -25 25 | pass -26 26 | -27 |- with (foo() as x3, foo() as y3, foo() as z3): - 27 |+ with (foo() as x3, foo() as y3, foo()): -28 28 | pass -29 29 | -30 30 | +24 | with foo() as (x2, y2): +25 | pass +26 | + - with (foo() as x3, foo() as y3, foo() as z3): +27 + with (foo() as x3, foo() as y3, foo()): +28 | pass +29 | +30 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x1` is assigned to but never used --> F841_3.py:32:6 @@ -174,16 +166,15 @@ F841 [*] Local variable `x1` is assigned to but never used 34 | coords3 = (x3, y3) = (1, 2) | help: Remove assignment to unused variable `x1` - -ℹ Unsafe fix -29 29 | -30 30 | -31 31 | def f(): -32 |- (x1, y1) = (1, 2) - 32 |+ (_x1, y1) = (1, 2) -33 33 | (x2, y2) = coords2 = (1, 2) -34 34 | coords3 = (x3, y3) = (1, 2) -35 35 | +29 | +30 | +31 | def f(): + - (x1, y1) = (1, 2) +32 + (_x1, y1) = (1, 2) +33 | (x2, y2) = coords2 = (1, 2) +34 | coords3 = (x3, y3) = (1, 2) +35 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y1` is assigned to but never used --> F841_3.py:32:10 @@ -195,16 +186,15 @@ F841 [*] Local variable `y1` is assigned to but never used 34 | coords3 = (x3, y3) = (1, 2) | help: Remove assignment to unused variable `y1` - -ℹ Unsafe fix -29 29 | -30 30 | -31 31 | def f(): -32 |- (x1, y1) = (1, 2) - 32 |+ (x1, _y1) = (1, 2) -33 33 | (x2, y2) = coords2 = (1, 2) -34 34 | coords3 = (x3, y3) = (1, 2) -35 35 | +29 | +30 | +31 | def f(): + - (x1, y1) = (1, 2) +32 + (x1, _y1) = (1, 2) +33 | (x2, y2) = coords2 = (1, 2) +34 | coords3 = (x3, y3) = (1, 2) +35 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `coords2` is assigned to but never used --> F841_3.py:33:16 @@ -216,16 +206,15 @@ F841 [*] Local variable `coords2` is assigned to but never used 34 | coords3 = (x3, y3) = (1, 2) | help: Remove assignment to unused variable `coords2` - -ℹ Unsafe fix -30 30 | -31 31 | def f(): -32 32 | (x1, y1) = (1, 2) -33 |- (x2, y2) = coords2 = (1, 2) - 33 |+ (x2, y2) = (1, 2) -34 34 | coords3 = (x3, y3) = (1, 2) -35 35 | -36 36 | +30 | +31 | def f(): +32 | (x1, y1) = (1, 2) + - (x2, y2) = coords2 = (1, 2) +33 + (x2, y2) = (1, 2) +34 | coords3 = (x3, y3) = (1, 2) +35 | +36 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `coords3` is assigned to but never used --> F841_3.py:34:5 @@ -236,16 +225,15 @@ F841 [*] Local variable `coords3` is assigned to but never used | ^^^^^^^ | help: Remove assignment to unused variable `coords3` - -ℹ Unsafe fix -31 31 | def f(): -32 32 | (x1, y1) = (1, 2) -33 33 | (x2, y2) = coords2 = (1, 2) -34 |- coords3 = (x3, y3) = (1, 2) - 34 |+ (x3, y3) = (1, 2) -35 35 | -36 36 | -37 37 | def f(): +31 | def f(): +32 | (x1, y1) = (1, 2) +33 | (x2, y2) = coords2 = (1, 2) + - coords3 = (x3, y3) = (1, 2) +34 + (x3, y3) = (1, 2) +35 | +36 | +37 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x1` is assigned to but never used --> F841_3.py:40:26 @@ -257,16 +245,14 @@ F841 [*] Local variable `x1` is assigned to but never used 41 | pass | help: Remove assignment to unused variable `x1` - -ℹ Safe fix -37 37 | def f(): -38 38 | try: -39 39 | 1 / 0 -40 |- except ValueError as x1: - 40 |+ except ValueError: -41 41 | pass -42 42 | -43 43 | try: +37 | def f(): +38 | try: +39 | 1 / 0 + - except ValueError as x1: +40 + except ValueError: +41 | pass +42 | +43 | try: F841 [*] Local variable `x2` is assigned to but never used --> F841_3.py:45:47 @@ -278,16 +264,14 @@ F841 [*] Local variable `x2` is assigned to but never used 46 | pass | help: Remove assignment to unused variable `x2` - -ℹ Safe fix -42 42 | -43 43 | try: -44 44 | 1 / 0 -45 |- except (ValueError, ZeroDivisionError) as x2: - 45 |+ except (ValueError, ZeroDivisionError): -46 46 | pass -47 47 | -48 48 | +42 | +43 | try: +44 | 1 / 0 + - except (ValueError, ZeroDivisionError) as x2: +45 + except (ValueError, ZeroDivisionError): +46 | pass +47 | +48 | F841 [*] Local variable `x` is assigned to but never used --> F841_3.py:50:5 @@ -299,16 +283,15 @@ F841 [*] Local variable `x` is assigned to but never used 52 | if a is not None | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -47 47 | -48 48 | -49 49 | def f(a, b): -50 |- x = ( - 50 |+ ( -51 51 | a() -52 52 | if a is not None -53 53 | else b +47 | +48 | +49 | def f(a, b): + - x = ( +50 + ( +51 | a() +52 | if a is not None +53 | else b +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_3.py:56:5 @@ -320,17 +303,16 @@ F841 [*] Local variable `y` is assigned to but never used 57 | a() if a is not None else b | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -53 53 | else b -54 54 | ) -55 55 | -56 |- y = \ -57 |- a() if a is not None else b - 56 |+ a() if a is not None else b -58 57 | -59 58 | -60 59 | def f(a, b): +53 | else b +54 | ) +55 | + - y = \ + - a() if a is not None else b +56 + a() if a is not None else b +57 | +58 | +59 | def f(a, b): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x` is assigned to but never used --> F841_3.py:61:5 @@ -342,19 +324,18 @@ F841 [*] Local variable `x` is assigned to but never used 63 | if a is not None | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -58 58 | -59 59 | -60 60 | def f(a, b): -61 |- x = ( -62 |- a -63 |- if a is not None -64 |- else b -65 |- ) -66 61 | -67 62 | y = \ -68 63 | a if a is not None else b +58 | +59 | +60 | def f(a, b): + - x = ( + - a + - if a is not None + - else b + - ) +61 | +62 | y = \ +63 | a if a is not None else b +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_3.py:67:5 @@ -366,16 +347,15 @@ F841 [*] Local variable `y` is assigned to but never used 68 | a if a is not None else b | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -64 64 | else b -65 65 | ) -66 66 | -67 |- y = \ -68 |- a if a is not None else b -69 67 | -70 68 | -71 69 | def f(): +64 | else b +65 | ) +66 | + - y = \ + - a if a is not None else b +67 | +68 | +69 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `cm` is assigned to but never used --> F841_3.py:72:24 @@ -386,16 +366,15 @@ F841 [*] Local variable `cm` is assigned to but never used 73 | pass | help: Remove assignment to unused variable `cm` - -ℹ Unsafe fix -69 69 | -70 70 | -71 71 | def f(): -72 |- with Nested(m) as (cm): - 72 |+ with Nested(m): -73 73 | pass -74 74 | -75 75 | +69 | +70 | +71 | def f(): + - with Nested(m) as (cm): +72 + with Nested(m): +73 | pass +74 | +75 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `cm` is assigned to but never used --> F841_3.py:77:25 @@ -406,16 +385,15 @@ F841 [*] Local variable `cm` is assigned to but never used 78 | pass | help: Remove assignment to unused variable `cm` - -ℹ Unsafe fix -74 74 | -75 75 | -76 76 | def f(): -77 |- with (Nested(m) as (cm),): - 77 |+ with (Nested(m),): -78 78 | pass -79 79 | -80 80 | +74 | +75 | +76 | def f(): + - with (Nested(m) as (cm),): +77 + with (Nested(m),): +78 | pass +79 | +80 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `cm` is assigned to but never used --> F841_3.py:87:26 @@ -426,16 +404,15 @@ F841 [*] Local variable `cm` is assigned to but never used 88 | pass | help: Remove assignment to unused variable `cm` - -ℹ Unsafe fix -84 84 | -85 85 | -86 86 | def f(): -87 |- with (Nested(m)) as (cm): - 87 |+ with (Nested(m)): -88 88 | pass -89 89 | -90 90 | +84 | +85 | +86 | def f(): + - with (Nested(m)) as (cm): +87 + with (Nested(m)): +88 | pass +89 | +90 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `toplevel` is assigned to but never used --> F841_3.py:92:5 @@ -447,16 +424,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used 94 | break | help: Remove assignment to unused variable `toplevel` - -ℹ Unsafe fix -89 89 | -90 90 | -91 91 | def f(): -92 |- toplevel = tt = lexer.get_token() - 92 |+ tt = lexer.get_token() -93 93 | if not tt: -94 94 | break -95 95 | +89 | +90 | +91 | def f(): + - toplevel = tt = lexer.get_token() +92 + tt = lexer.get_token() +93 | if not tt: +94 | break +95 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `toplevel` is assigned to but never used --> F841_3.py:98:5 @@ -466,16 +442,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used | ^^^^^^^^ | help: Remove assignment to unused variable `toplevel` - -ℹ Unsafe fix -95 95 | -96 96 | -97 97 | def f(): -98 |- toplevel = tt = lexer.get_token() - 98 |+ tt = lexer.get_token() -99 99 | -100 100 | -101 101 | def f(): +95 | +96 | +97 | def f(): + - toplevel = tt = lexer.get_token() +98 + tt = lexer.get_token() +99 | +100 | +101 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `tt` is assigned to but never used --> F841_3.py:98:16 @@ -485,16 +460,15 @@ F841 [*] Local variable `tt` is assigned to but never used | ^^ | help: Remove assignment to unused variable `tt` - -ℹ Unsafe fix -95 95 | -96 96 | -97 97 | def f(): -98 |- toplevel = tt = lexer.get_token() - 98 |+ toplevel = lexer.get_token() -99 99 | -100 100 | -101 101 | def f(): +95 | +96 | +97 | def f(): + - toplevel = tt = lexer.get_token() +98 + toplevel = lexer.get_token() +99 | +100 | +101 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `toplevel` is assigned to but never used --> F841_3.py:102:5 @@ -504,16 +478,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used | ^^^^^^^^ | help: Remove assignment to unused variable `toplevel` - -ℹ Unsafe fix -99 99 | -100 100 | -101 101 | def f(): -102 |- toplevel = (a, b) = lexer.get_token() - 102 |+ (a, b) = lexer.get_token() -103 103 | -104 104 | -105 105 | def f(): +99 | +100 | +101 | def f(): + - toplevel = (a, b) = lexer.get_token() +102 + (a, b) = lexer.get_token() +103 | +104 | +105 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `toplevel` is assigned to but never used --> F841_3.py:106:14 @@ -523,16 +496,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used | ^^^^^^^^ | help: Remove assignment to unused variable `toplevel` - -ℹ Unsafe fix -103 103 | -104 104 | -105 105 | def f(): -106 |- (a, b) = toplevel = lexer.get_token() - 106 |+ (a, b) = lexer.get_token() -107 107 | -108 108 | -109 109 | def f(): +103 | +104 | +105 | def f(): + - (a, b) = toplevel = lexer.get_token() +106 + (a, b) = lexer.get_token() +107 | +108 | +109 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `toplevel` is assigned to but never used --> F841_3.py:110:5 @@ -542,16 +514,15 @@ F841 [*] Local variable `toplevel` is assigned to but never used | ^^^^^^^^ | help: Remove assignment to unused variable `toplevel` - -ℹ Unsafe fix -107 107 | -108 108 | -109 109 | def f(): -110 |- toplevel = tt = 1 - 110 |+ tt = 1 -111 111 | -112 112 | -113 113 | def f(provided: int) -> int: +107 | +108 | +109 | def f(): + - toplevel = tt = 1 +110 + tt = 1 +111 | +112 | +113 | def f(provided: int) -> int: +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `tt` is assigned to but never used --> F841_3.py:110:16 @@ -561,16 +532,15 @@ F841 [*] Local variable `tt` is assigned to but never used | ^^ | help: Remove assignment to unused variable `tt` - -ℹ Unsafe fix -107 107 | -108 108 | -109 109 | def f(): -110 |- toplevel = tt = 1 - 110 |+ toplevel = 1 -111 111 | -112 112 | -113 113 | def f(provided: int) -> int: +107 | +108 | +109 | def f(): + - toplevel = tt = 1 +110 + toplevel = 1 +111 | +112 | +113 | def f(provided: int) -> int: +note: This is an unsafe fix and may change runtime behavior F841 Local variable `x` is assigned to but never used --> F841_3.py:115:19 @@ -648,16 +618,14 @@ F841 [*] Local variable `e` is assigned to but never used 156 | print("oh no!") | help: Remove assignment to unused variable `e` - -ℹ Safe 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!") -157 157 | -158 158 | +152 | def f() -> None: +153 | try: +154 | print("hello") + - except A as e : +155 + except A: +156 | print("oh no!") +157 | +158 | F841 [*] Local variable `x` is assigned to but never used --> F841_3.py:160:5 @@ -668,15 +636,14 @@ F841 [*] Local variable `x` is assigned to but never used 161 | y = 2 | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -157 157 | -158 158 | -159 159 | def f(): -160 |- x = 1 -161 160 | y = 2 -162 161 | -163 162 | +157 | +158 | +159 | def f(): + - x = 1 +160 | y = 2 +161 | +162 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_3.py:161:5 @@ -687,15 +654,14 @@ F841 [*] Local variable `y` is assigned to but never used | ^ | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -158 158 | -159 159 | def f(): -160 160 | x = 1 -161 |- y = 2 -162 161 | -163 162 | -164 163 | def f(): +158 | +159 | def f(): +160 | x = 1 + - y = 2 +161 | +162 | +163 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x` is assigned to but never used --> F841_3.py:165:5 @@ -707,15 +673,14 @@ F841 [*] Local variable `x` is assigned to but never used 167 | y = 2 | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -162 162 | -163 163 | -164 164 | def f(): -165 |- x = 1 -166 165 | -167 166 | y = 2 -168 167 | +162 | +163 | +164 | def f(): + - x = 1 +165 | +166 | y = 2 +167 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `y` is assigned to but never used --> F841_3.py:167:5 @@ -726,15 +691,14 @@ F841 [*] Local variable `y` is assigned to but never used | ^ | help: Remove assignment to unused variable `y` - -ℹ Unsafe fix -164 164 | def f(): -165 165 | x = 1 -166 166 | -167 |- y = 2 -168 167 | -169 168 | -170 169 | def f(): +164 | def f(): +165 | x = 1 +166 | + - y = 2 +167 | +168 | +169 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `x` is assigned to but never used --> F841_3.py:173:6 @@ -745,10 +709,9 @@ F841 [*] Local variable `x` is assigned to but never used | ^ | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -170 170 | def f(): -171 171 | (x) = foo() -172 172 | ((x)) = foo() -173 |- (x) = (y.z) = foo() - 173 |+ (y.z) = foo() +170 | def f(): +171 | (x) = foo() +172 | ((x)) = foo() + - (x) = (y.z) = foo() +173 + (y.z) = foo() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap index 689aab5390..67450b5d4e 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__F901_F901.py.snap @@ -9,14 +9,12 @@ F901 [*] `raise NotImplemented` should be `raise NotImplementedError` | ^^^^^^^^^^^^^^ | help: Use `raise NotImplementedError` - -ℹ Safe fix -1 1 | def f() -> None: -2 |- raise NotImplemented() - 2 |+ raise NotImplementedError() -3 3 | -4 4 | -5 5 | def g() -> None: +1 | def f() -> None: + - raise NotImplemented() +2 + raise NotImplementedError() +3 | +4 | +5 | def g() -> None: F901 [*] `raise NotImplemented` should be `raise NotImplementedError` --> F901.py:6:11 @@ -26,16 +24,14 @@ F901 [*] `raise NotImplemented` should be `raise NotImplementedError` | ^^^^^^^^^^^^^^ | help: Use `raise NotImplementedError` - -ℹ Safe fix -3 3 | -4 4 | -5 5 | def g() -> None: -6 |- raise NotImplemented - 6 |+ raise NotImplementedError -7 7 | -8 8 | -9 9 | def h() -> None: +3 | +4 | +5 | def g() -> None: + - raise NotImplemented +6 + raise NotImplementedError +7 | +8 | +9 | def h() -> None: F901 [*] `raise NotImplemented` should be `raise NotImplementedError` --> F901.py:11:11 @@ -46,15 +42,13 @@ F901 [*] `raise NotImplemented` should be `raise NotImplementedError` | ^^^^^^^^^^^^^^ | help: Use `raise NotImplementedError` - -ℹ Safe fix - 1 |+import builtins -1 2 | def f() -> None: -2 3 | raise NotImplemented() -3 4 | +1 + import builtins +2 | def f() -> None: +3 | raise NotImplemented() +4 | -------------------------------------------------------------------------------- -8 9 | -9 10 | def h() -> None: -10 11 | NotImplementedError = "foo" -11 |- raise NotImplemented - 12 |+ raise builtins.NotImplementedError +9 | +10 | def h() -> None: +11 | NotImplementedError = "foo" + - raise NotImplemented +12 + raise builtins.NotImplementedError diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap index 772f183bbe..a226d1836b 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_global_scope.snap @@ -11,13 +11,11 @@ F401 [*] `os` imported but unused 7 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused | help: Remove unused import: `os` - -ℹ Safe fix -2 2 | import os -3 3 | -4 4 | def f(): -5 |- import os - 5 |+ pass -6 6 | -7 7 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused -8 8 | # import. (This is a false negative, but is consistent with Pyflakes.) +2 | import os +3 | +4 | def f(): + - import os +5 + pass +6 | +7 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused +8 | # import. (This is a false negative, but is consistent with Pyflakes.) diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap index e8abef0b53..5cf22905e2 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_global_import_in_local_scope.snap @@ -10,13 +10,11 @@ F401 [*] `os` imported but unused 4 | def f(): | help: Remove unused import: `os` - -ℹ Safe fix -1 1 | -2 |-import os -3 2 | -4 3 | def f(): -5 4 | import os +1 | + - import os +2 | +3 | def f(): +4 | import os F811 [*] Redefinition of unused `os` from line 2 --> :2:8 @@ -31,12 +29,10 @@ F811 [*] Redefinition of unused `os` from line 2 7 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused | help: Remove definition: `os` - -ℹ Safe fix -2 2 | import os -3 3 | -4 4 | def f(): -5 |- import os -6 5 | -7 6 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused -8 7 | # import. +2 | import os +3 | +4 | def f(): + - import os +5 | +6 | # Despite this `del`, `import os` in `f` should still be flagged as shadowing an unused +7 | # import. diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap index 02e03119dc..02764438de 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_import_shadow_in_local_scope.snap @@ -10,13 +10,11 @@ F401 [*] `os` imported but unused 4 | def f(): | help: Remove unused import: `os` - -ℹ Safe fix -1 1 | -2 |-import os -3 2 | -4 3 | def f(): -5 4 | os = 1 +1 | + - import os +2 | +3 | def f(): +4 | os = 1 F811 Redefinition of unused `os` from line 2 --> :2:8 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap index 41041f5262..c8d4b0c292 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__del_shadowed_local_import_in_local_scope.snap @@ -13,12 +13,10 @@ F811 [*] Redefinition of unused `os` from line 3 6 | # Despite this `del`, `import os` should still be flagged as shadowing an unused | help: Remove definition: `os` - -ℹ Safe fix -1 1 | -2 2 | def f(): -3 3 | import os -4 |- import os -5 4 | -6 5 | # Despite this `del`, `import os` should still be flagged as shadowing an unused -7 6 | # import. +1 | +2 | def f(): +3 | import os + - import os +4 | +5 | # Despite this `del`, `import os` should still be flagged as shadowing an unused +6 | # import. diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap index 8a0e8d0ebb..347e1d44e0 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_allowed_unused_imports_option.snap @@ -9,9 +9,7 @@ F401 [*] `hvplot.pandas_alias.scatter_matrix` imported but unused | ^^^^^^^^^^^^^^ | help: Remove unused import: `hvplot.pandas_alias.scatter_matrix` - -ℹ Safe fix -9 9 | from hvplot.pandas.plots import scatter_matrix -10 10 | -11 11 | # Errors -12 |-from hvplot.pandas_alias import scatter_matrix +9 | from hvplot.pandas.plots import scatter_matrix +10 | +11 | # Errors + - from hvplot.pandas_alias import scatter_matrix diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap index a51f6d418d..80e75e2376 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f401_preview_first_party_submodule_dunder_all.snap @@ -10,10 +10,8 @@ F401 [*] `submodule.a` imported but unused; consider removing, adding to `__all_ 4 | FOO = 42 | help: Add `submodule` to __all__ - -ℹ Safe fix -1 1 | -2 2 | import submodule.a -3 |-__all__ = ['FOO'] - 3 |+__all__ = ['FOO', 'submodule'] -4 4 | FOO = 42 +1 | +2 | import submodule.a + - __all__ = ['FOO'] +3 + __all__ = ['FOO', 'submodule'] +4 | FOO = 42 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap index 7caaa6ef15..8cde364bb1 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__f841_dummy_variable_rgx.snap @@ -11,15 +11,13 @@ F841 [*] Local variable `e` is assigned to but never used 4 | pass | help: Remove assignment to unused variable `e` - -ℹ Safe fix -1 1 | try: -2 2 | 1 / 0 -3 |-except ValueError as e: - 3 |+except ValueError: -4 4 | pass -5 5 | -6 6 | +1 | try: +2 | 1 / 0 + - except ValueError as e: +3 + except ValueError: +4 | pass +5 | +6 | F841 [*] Local variable `foo` is assigned to but never used --> F841_0.py:20:5 @@ -30,15 +28,14 @@ F841 [*] Local variable `foo` is assigned to but never used 21 | (a, b) = (1, 2) | help: Remove assignment to unused variable `foo` - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def f(): -20 |- foo = (1, 2) -21 20 | (a, b) = (1, 2) -22 21 | -23 22 | bar = (1, 2) +17 | +18 | +19 | def f(): + - foo = (1, 2) +20 | (a, b) = (1, 2) +21 | +22 | bar = (1, 2) +note: This is an unsafe fix and may change runtime behavior F841 Local variable `a` is assigned to but never used --> F841_0.py:21:6 @@ -73,16 +70,15 @@ F841 [*] Local variable `baz` is assigned to but never used | ^^^ | help: Remove assignment to unused variable `baz` - -ℹ Unsafe fix -23 23 | bar = (1, 2) -24 24 | (c, d) = bar -25 25 | -26 |- (x, y) = baz = bar - 26 |+ (x, y) = bar -27 27 | -28 28 | -29 29 | def f(): +23 | bar = (1, 2) +24 | (c, d) = bar +25 | + - (x, y) = baz = bar +26 + (x, y) = bar +27 | +28 | +29 | def f(): +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `_` is assigned to but never used --> F841_0.py:35:5 @@ -94,15 +90,14 @@ F841 [*] Local variable `_` is assigned to but never used 37 | _discarded = 1 | help: Remove assignment to unused variable `_` - -ℹ Unsafe fix -32 32 | -33 33 | -34 34 | def f(): -35 |- _ = 1 -36 35 | __ = 1 -37 36 | _discarded = 1 -38 37 | +32 | +33 | +34 | def f(): + - _ = 1 +35 | __ = 1 +36 | _discarded = 1 +37 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `__` is assigned to but never used --> F841_0.py:36:5 @@ -114,15 +109,14 @@ F841 [*] Local variable `__` is assigned to but never used 37 | _discarded = 1 | help: Remove assignment to unused variable `__` - -ℹ Unsafe fix -33 33 | -34 34 | def f(): -35 35 | _ = 1 -36 |- __ = 1 -37 36 | _discarded = 1 -38 37 | -39 38 | +33 | +34 | def f(): +35 | _ = 1 + - __ = 1 +36 | _discarded = 1 +37 | +38 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `_discarded` is assigned to but never used --> F841_0.py:37:5 @@ -133,15 +127,14 @@ F841 [*] Local variable `_discarded` is assigned to but never used | ^^^^^^^^^^ | help: Remove assignment to unused variable `_discarded` - -ℹ Unsafe fix -34 34 | def f(): -35 35 | _ = 1 -36 36 | __ = 1 -37 |- _discarded = 1 -38 37 | -39 38 | -40 39 | a = 1 +34 | def f(): +35 | _ = 1 +36 | __ = 1 + - _discarded = 1 +37 | +38 | +39 | a = 1 +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `b` is assigned to but never used --> F841_0.py:51:9 @@ -154,16 +147,15 @@ F841 [*] Local variable `b` is assigned to but never used 53 | def d(): | help: Remove assignment to unused variable `b` - -ℹ Unsafe fix -48 48 | -49 49 | def c(): -50 50 | # F841 -51 |- b = 1 - 51 |+ pass -52 52 | -53 53 | def d(): -54 54 | nonlocal b +48 | +49 | def c(): +50 | # F841 + - b = 1 +51 + pass +52 | +53 | def d(): +54 | nonlocal b +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `my_file` is assigned to but never used --> F841_0.py:79:26 @@ -174,16 +166,15 @@ F841 [*] Local variable `my_file` is assigned to but never used 80 | print("hello") | help: Remove assignment to unused variable `my_file` - -ℹ Unsafe fix -76 76 | -77 77 | -78 78 | def f(): -79 |- with open("file") as my_file, open("") as ((this, that)): - 79 |+ with open("file"), open("") as ((this, that)): -80 80 | print("hello") -81 81 | -82 82 | +76 | +77 | +78 | def f(): + - with open("file") as my_file, open("") as ((this, that)): +79 + with open("file"), open("") as ((this, that)): +80 | print("hello") +81 | +82 | +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `my_file` is assigned to but never used --> F841_0.py:85:25 @@ -196,16 +187,15 @@ F841 [*] Local variable `my_file` is assigned to but never used 87 | ): | help: Remove assignment to unused variable `my_file` - -ℹ Unsafe fix -82 82 | -83 83 | def f(): -84 84 | with ( -85 |- open("file") as my_file, - 85 |+ open("file"), -86 86 | open("") as ((this, that)), -87 87 | ): -88 88 | print("hello") +82 | +83 | def f(): +84 | with ( + - open("file") as my_file, +85 + open("file"), +86 | open("") as ((this, that)), +87 | ): +88 | print("hello") +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `msg3` is assigned to but never used --> F841_0.py:102:5 @@ -218,15 +208,14 @@ F841 [*] Local variable `msg3` is assigned to but never used 104 | case 1: | help: Remove assignment to unused variable `msg3` - -ℹ Unsafe fix -99 99 | def f(x: int): -100 100 | msg1 = "Hello, world!" -101 101 | msg2 = "Hello, world!" -102 |- msg3 = "Hello, world!" -103 102 | match x: -104 103 | case 1: -105 104 | print(msg1) +99 | def f(x: int): +100 | msg1 = "Hello, world!" +101 | msg2 = "Hello, world!" + - msg3 = "Hello, world!" +102 | match x: +103 | case 1: +104 | print(msg1) +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `Baz` is assigned to but never used --> F841_0.py:115:5 @@ -239,16 +228,15 @@ F841 [*] Local variable `Baz` is assigned to but never used 117 | match x: | help: Remove assignment to unused variable `Baz` - -ℹ Unsafe fix -112 112 | -113 113 | Foo = enum.Enum("Foo", "A B") -114 114 | Bar = enum.Enum("Bar", "A B") -115 |- Baz = enum.Enum("Baz", "A B") - 115 |+ enum.Enum("Baz", "A B") -116 116 | -117 117 | match x: -118 118 | case (Foo.A): +112 | +113 | Foo = enum.Enum("Foo", "A B") +114 | Bar = enum.Enum("Bar", "A B") + - Baz = enum.Enum("Baz", "A B") +115 + enum.Enum("Baz", "A B") +116 | +117 | match x: +118 | case (Foo.A): +note: This is an unsafe fix and may change runtime behavior F841 Local variable `y` is assigned to but never used --> F841_0.py:122:14 @@ -281,16 +269,14 @@ F841 [*] Local variable `_` is assigned to but never used 153 | pass | help: Remove assignment to unused variable `_` - -ℹ Safe fix -149 149 | def f(): -150 150 | try: -151 151 | pass -152 |- except Exception as _: - 152 |+ except Exception: -153 153 | pass -154 154 | -155 155 | +149 | def f(): +150 | try: +151 | pass + - except Exception as _: +152 + except Exception: +153 | pass +154 | +155 | F841 [*] Local variable `__class__` is assigned to but never used --> F841_0.py:168:9 @@ -301,16 +287,15 @@ F841 [*] Local variable `__class__` is assigned to but never used | ^^^^^^^^^ | help: Remove assignment to unused variable `__class__` - -ℹ Unsafe fix -165 165 | # variables that don't refer to the special `__class__` cell. -166 166 | class A: -167 167 | def set_class(self, cls): -168 |- __class__ = cls # F841 - 168 |+ pass # F841 -169 169 | -170 170 | -171 171 | class A: +165 | # variables that don't refer to the special `__class__` cell. +166 | class A: +167 | def set_class(self, cls): + - __class__ = cls # F841 +168 + pass # F841 +169 | +170 | +171 | class A: +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `__class__` is assigned to but never used --> F841_0.py:174:13 @@ -321,16 +306,15 @@ F841 [*] Local variable `__class__` is assigned to but never used | ^^^^^^^^^ | help: Remove assignment to unused variable `__class__` - -ℹ Unsafe fix -171 171 | class A: -172 172 | class B: -173 173 | def set_class(self, cls): -174 |- __class__ = cls # F841 - 174 |+ pass # F841 -175 175 | -176 176 | -177 177 | class A: +171 | class A: +172 | class B: +173 | def set_class(self, cls): + - __class__ = cls # F841 +174 + pass # F841 +175 | +176 | +177 | class A: +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `__class__` is assigned to but never used --> F841_0.py:182:17 @@ -341,13 +325,12 @@ F841 [*] Local variable `__class__` is assigned to but never used | ^^^^^^^^^ | help: Remove assignment to unused variable `__class__` - -ℹ Unsafe fix -179 179 | class B: -180 180 | print(__class__) -181 181 | def set_class(self, cls): -182 |- __class__ = cls # F841 - 182 |+ pass # F841 -183 183 | -184 184 | -185 185 | # OK, the `__class__` cell is nonlocal and declared as such. +179 | class B: +180 | print(__class__) +181 | def set_class(self, cls): + - __class__ = cls # F841 +182 + pass # F841 +183 | +184 | +185 | # OK, the `__class__` cell is nonlocal and declared as such. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap index 82363cecfc..bdb210f50f 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__future_annotations.snap @@ -11,15 +11,13 @@ F401 [*] `models.Nut` imported but unused 9 | ) | help: Remove unused import: `models.Nut` - -ℹ Safe fix -5 5 | -6 6 | from models import ( -7 7 | Fruit, -8 |- Nut, -9 8 | ) -10 9 | -11 10 | +5 | +6 | from models import ( +7 | Fruit, + - Nut, +8 | ) +9 | +10 | F821 Undefined name `Bar` --> future_annotations.py:26:19 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap index 2972d12298..45632ee2d5 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_multiple_unbinds_from_module_scope.snap @@ -11,16 +11,14 @@ F841 [*] Local variable `x` is assigned to but never used 8 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -4 4 | def f(): -5 5 | try: -6 6 | pass -7 |- except ValueError as x: - 7 |+ except ValueError: -8 8 | pass -9 9 | -10 10 | try: +4 | def f(): +5 | try: +6 | pass + - except ValueError as x: +7 + except ValueError: +8 | pass +9 | +10 | try: F841 [*] Local variable `x` is assigned to but never used --> :12:26 @@ -32,13 +30,11 @@ F841 [*] Local variable `x` is assigned to but never used 13 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -9 9 | -10 10 | try: -11 11 | pass -12 |- except ValueError as x: - 12 |+ except ValueError: -13 13 | pass -14 14 | -15 15 | # This should resolve to the `x` in `x = 1`. +9 | +10 | try: +11 | pass + - except ValueError as x: +12 + except ValueError: +13 | pass +14 | +15 | # This should resolve to the `x` in `x = 1`. diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap index 377df1d4a9..8dc6cc0bde 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_class_scope.snap @@ -11,16 +11,14 @@ F841 [*] Local variable `x` is assigned to but never used 9 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -5 5 | def f(): -6 6 | try: -7 7 | pass -8 |- except ValueError as x: - 8 |+ except ValueError: -9 9 | pass -10 10 | -11 11 | # This should raise an F821 error, rather than resolving to the +5 | def f(): +6 | try: +7 | pass + - except ValueError as x: +8 + except ValueError: +9 | pass +10 | +11 | # This should raise an F821 error, rather than resolving to the F821 Undefined name `x` --> :13:15 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap index fc2a79d306..18c8a200f8 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_module_scope.snap @@ -11,13 +11,11 @@ F841 [*] Local variable `x` is assigned to but never used 8 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -4 4 | def f(): -5 5 | try: -6 6 | pass -7 |- except ValueError as x: - 7 |+ except ValueError: -8 8 | pass -9 9 | -10 10 | # This should resolve to the `x` in `x = 1`. +4 | def f(): +5 | try: +6 | pass + - except ValueError as x: +7 + except ValueError: +8 | pass +9 | +10 | # This should resolve to the `x` in `x = 1`. diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap index ab3f650e89..a6922aa855 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__load_after_unbind_from_nested_module_scope.snap @@ -11,16 +11,14 @@ F841 [*] Local variable `x` is assigned to but never used 8 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -4 4 | def f(): -5 5 | try: -6 6 | pass -7 |- except ValueError as x: - 7 |+ except ValueError: -8 8 | pass -9 9 | -10 10 | def g(): +4 | def f(): +5 | try: +6 | pass + - except ValueError as x: +7 + except ValueError: +8 | pass +9 | +10 | def g(): F841 [*] Local variable `x` is assigned to but never used --> :13:30 @@ -32,13 +30,11 @@ F841 [*] Local variable `x` is assigned to but never used 14 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -10 10 | def g(): -11 11 | try: -12 12 | pass -13 |- except ValueError as x: - 13 |+ except ValueError: -14 14 | pass -15 15 | -16 16 | # This should resolve to the `x` in `x = 1`. +10 | def g(): +11 | try: +12 | pass + - except ValueError as x: +13 + except ValueError: +14 | pass +15 | +16 | # This should resolve to the `x` in `x = 1`. diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap index a19d8ab553..7a1f5580a6 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__multi_statement_lines.snap @@ -10,14 +10,12 @@ F401 [*] `foo1` imported but unused 3 | import foo2; x = 1 | help: Remove unused import: `foo1` - -ℹ Safe fix -1 1 | if True: -2 |- import foo1; x = 1 - 2 |+ x = 1 -3 3 | import foo2; x = 1 -4 4 | -5 5 | if True: +1 | if True: + - import foo1; x = 1 +2 + x = 1 +3 | import foo2; x = 1 +4 | +5 | if True: F401 [*] `foo2` imported but unused --> multi_statement_lines.py:3:12 @@ -30,15 +28,13 @@ F401 [*] `foo2` imported but unused 5 | if True: | help: Remove unused import: `foo2` - -ℹ Safe fix -1 1 | if True: -2 2 | import foo1; x = 1 -3 |- import foo2; x = 1 - 3 |+ x = 1 -4 4 | -5 5 | if True: -6 6 | import foo3; \ +1 | if True: +2 | import foo1; x = 1 + - import foo2; x = 1 +3 + x = 1 +4 | +5 | if True: +6 | import foo3; \ F401 [*] `foo3` imported but unused --> multi_statement_lines.py:6:12 @@ -49,17 +45,15 @@ F401 [*] `foo3` imported but unused 7 | x = 1 | help: Remove unused import: `foo3` - -ℹ Safe fix -3 3 | import foo2; x = 1 -4 4 | -5 5 | if True: -6 |- import foo3; \ -7 |-x = 1 - 6 |+ x = 1 -8 7 | -9 8 | if True: -10 9 | import foo4 \ +3 | import foo2; x = 1 +4 | +5 | if True: + - import foo3; \ + - x = 1 +6 + x = 1 +7 | +8 | if True: +9 | import foo4 \ F401 [*] `foo4` imported but unused --> multi_statement_lines.py:10:12 @@ -70,17 +64,15 @@ F401 [*] `foo4` imported but unused 11 | ; x = 1 | help: Remove unused import: `foo4` - -ℹ Safe fix -7 7 | x = 1 -8 8 | -9 9 | if True: -10 |- import foo4 \ -11 |- ; x = 1 - 10 |+ x = 1 -12 11 | -13 12 | if True: -14 13 | x = 1; import foo5 +7 | x = 1 +8 | +9 | if True: + - import foo4 \ + - ; x = 1 +10 + x = 1 +11 | +12 | if True: +13 | x = 1; import foo5 F401 [*] `foo5` imported but unused --> multi_statement_lines.py:14:19 @@ -90,16 +82,14 @@ F401 [*] `foo5` imported but unused | ^^^^ | help: Remove unused import: `foo5` - -ℹ Safe fix -11 11 | ; x = 1 -12 12 | -13 13 | if True: -14 |- x = 1; import foo5 - 14 |+ x = 1; -15 15 | -16 16 | -17 17 | if True: +11 | ; x = 1 +12 | +13 | if True: + - x = 1; import foo5 +14 + x = 1; +15 | +16 | +17 | if True: F401 [*] `foo6` imported but unused --> multi_statement_lines.py:19:17 @@ -112,17 +102,15 @@ F401 [*] `foo6` imported but unused 21 | if True: | help: Remove unused import: `foo6` - -ℹ Safe fix -15 15 | -16 16 | -17 17 | if True: -18 |- x = 1; \ -19 |- import foo6 - 18 |+ x = 1; -20 19 | -21 20 | if True: -22 21 | x = 1 \ +15 | +16 | +17 | if True: + - x = 1; \ + - import foo6 +18 + x = 1; +19 | +20 | if True: +21 | x = 1 \ F401 [*] `foo7` imported but unused --> multi_statement_lines.py:23:18 @@ -135,16 +123,14 @@ F401 [*] `foo7` imported but unused 25 | if True: | help: Remove unused import: `foo7` - -ℹ Safe fix -20 20 | -21 21 | if True: -22 22 | x = 1 \ -23 |- ; import foo7 - 23 |+ ; -24 24 | -25 25 | if True: -26 26 | x = 1; import foo8; x = 1 +20 | +21 | if True: +22 | x = 1 \ + - ; import foo7 +23 + ; +24 | +25 | if True: +26 | x = 1; import foo8; x = 1 F401 [*] `foo8` imported but unused --> multi_statement_lines.py:26:19 @@ -155,16 +141,14 @@ F401 [*] `foo8` imported but unused 27 | x = 1; import foo9; x = 1 | help: Remove unused import: `foo8` - -ℹ Safe fix -23 23 | ; import foo7 -24 24 | -25 25 | if True: -26 |- x = 1; import foo8; x = 1 - 26 |+ x = 1; x = 1 -27 27 | x = 1; import foo9; x = 1 -28 28 | -29 29 | if True: +23 | ; import foo7 +24 | +25 | if True: + - x = 1; import foo8; x = 1 +26 + x = 1; x = 1 +27 | x = 1; import foo9; x = 1 +28 | +29 | if True: F401 [*] `foo9` imported but unused --> multi_statement_lines.py:27:23 @@ -177,16 +161,14 @@ F401 [*] `foo9` imported but unused 29 | if True: | help: Remove unused import: `foo9` - -ℹ Safe fix -24 24 | -25 25 | if True: -26 26 | x = 1; import foo8; x = 1 -27 |- x = 1; import foo9; x = 1 - 27 |+ x = 1; x = 1 -28 28 | -29 29 | if True: -30 30 | x = 1; \ +24 | +25 | if True: +26 | x = 1; import foo8; x = 1 + - x = 1; import foo9; x = 1 +27 + x = 1; x = 1 +28 | +29 | if True: +30 | x = 1; \ F401 [*] `foo10` imported but unused --> multi_statement_lines.py:31:16 @@ -198,17 +180,15 @@ F401 [*] `foo10` imported but unused 32 | x = 1 | help: Remove unused import: `foo10` - -ℹ Safe fix -28 28 | -29 29 | if True: -30 30 | x = 1; \ -31 |- import foo10; \ -32 |- x = 1 - 31 |+ x = 1 -33 32 | -34 33 | if True: -35 34 | x = 1 \ +28 | +29 | if True: +30 | x = 1; \ + - import foo10; \ + - x = 1 +31 + x = 1 +32 | +33 | if True: +34 | x = 1 \ F401 [*] `foo11` imported but unused --> multi_statement_lines.py:36:17 @@ -220,15 +200,13 @@ F401 [*] `foo11` imported but unused 37 | ;x = 1 | help: Remove unused import: `foo11` - -ℹ Safe fix -33 33 | -34 34 | if True: -35 35 | x = 1 \ -36 |- ;import foo11 \ -37 36 | ;x = 1 -38 37 | -39 38 | if True: +33 | +34 | if True: +35 | x = 1 \ + - ;import foo11 \ +36 | ;x = 1 +37 | +38 | if True: F401 [*] `foo12` imported but unused --> multi_statement_lines.py:42:16 @@ -241,18 +219,16 @@ F401 [*] `foo12` imported but unused 44 | if True: | help: Remove unused import: `foo12` - -ℹ Safe fix -37 37 | ;x = 1 -38 38 | -39 39 | if True: -40 |- x = 1; \ -41 |- \ -42 |- import foo12 - 40 |+ x = 1; -43 41 | -44 42 | if True: -45 43 | x = 1; \ +37 | ;x = 1 +38 | +39 | if True: + - x = 1; \ + - \ + - import foo12 +40 + x = 1; +41 | +42 | if True: +43 | x = 1; \ F401 [*] `foo13` imported but unused --> multi_statement_lines.py:47:12 @@ -263,18 +239,16 @@ F401 [*] `foo13` imported but unused | ^^^^^ | help: Remove unused import: `foo13` - -ℹ Safe fix -42 42 | import foo12 -43 43 | -44 44 | if True: -45 |- x = 1; \ -46 |-\ -47 |- import foo13 - 45 |+ x = 1; -48 46 | -49 47 | -50 48 | if True: +42 | import foo12 +43 | +44 | if True: + - x = 1; \ + - \ + - import foo13 +45 + x = 1; +46 | +47 | +48 | if True: F401 [*] `foo14` imported but unused --> multi_statement_lines.py:53:12 @@ -287,15 +261,13 @@ F401 [*] `foo14` imported but unused 55 | # Continuation, but not as the last content in the file. | help: Remove unused import: `foo14` - -ℹ Safe fix -50 50 | if True: -51 51 | x = 1; \ -52 52 | # \ -53 |- import foo14 -54 53 | -55 54 | # Continuation, but not as the last content in the file. -56 55 | x = 1; \ +50 | if True: +51 | x = 1; \ +52 | # \ + - import foo14 +53 | +54 | # Continuation, but not as the last content in the file. +55 | x = 1; \ F401 [*] `foo15` imported but unused --> multi_statement_lines.py:57:8 @@ -308,17 +280,15 @@ F401 [*] `foo15` imported but unused 59 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax | help: Remove unused import: `foo15` - -ℹ Safe fix -53 53 | import foo14 -54 54 | -55 55 | # Continuation, but not as the last content in the file. -56 |-x = 1; \ -57 |-import foo15 - 56 |+x = 1; -58 57 | -59 58 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax -60 59 | # error.) +53 | import foo14 +54 | +55 | # Continuation, but not as the last content in the file. + - x = 1; \ + - import foo15 +56 + x = 1; +57 | +58 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax +59 | # error.) F401 [*] `foo16` imported but unused --> multi_statement_lines.py:62:8 @@ -329,11 +299,9 @@ F401 [*] `foo16` imported but unused | ^^^^^ | help: Remove unused import: `foo16` - -ℹ Safe fix -58 58 | -59 59 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax -60 60 | # error.) -61 |-x = 1; \ -62 |-import foo16 - 61 |+x = 1; +58 | +59 | # Continuation, followed by end-of-file. (Removing `import foo` would cause a syntax +60 | # error.) + - x = 1; \ + - import foo16 +61 + x = 1; diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap index dc63a9b851..7a52a39e9b 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_24____init__.py.snap @@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused | ^^^ | help: Remove unused import: `sys` - -ℹ Unsafe fix -16 16 | import argparse as argparse # Ok: is redundant alias -17 17 | -18 18 | -19 |-import sys # F401: remove unused -20 19 | -21 20 | -22 21 | # first-party +16 | import argparse as argparse # Ok: is redundant alias +17 | +18 | + - import sys # F401: remove unused +19 | +20 | +21 | # first-party +note: This is an unsafe fix and may change runtime behavior F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:33:15 @@ -25,16 +24,14 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Use an explicit re-export: `unused as unused` - -ℹ Safe fix -30 30 | from . import aliased as aliased # Ok: is redundant alias -31 31 | -32 32 | -33 |-from . import unused # F401: change to redundant alias - 33 |+from . import unused as unused # F401: change to redundant alias -34 34 | -35 35 | -36 36 | from . import renamed as bees # F401: no fix +30 | from . import aliased as aliased # Ok: is redundant alias +31 | +32 | + - from . import unused # F401: change to redundant alias +33 + from . import unused as unused # F401: change to redundant alias +34 | +35 | +36 | from . import renamed as bees # F401: no fix F401 `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:36:26 diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap index ca0228f64f..2327fc9b6d 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_25__all_nonempty____init__.py.snap @@ -8,15 +8,14 @@ F401 [*] `sys` imported but unused | ^^^ | help: Remove unused import: `sys` - -ℹ Unsafe fix -16 16 | import argparse # Ok: is exported in __all__ -17 17 | -18 18 | -19 |-import sys # F401: remove unused -20 19 | -21 20 | -22 21 | # first-party +16 | import argparse # Ok: is exported in __all__ +17 | +18 | + - import sys # F401: remove unused +19 | +20 | +21 | # first-party +note: This is an unsafe fix and may change runtime behavior F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:36:15 @@ -25,13 +24,11 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Add unused import `unused` to __all__ - -ℹ Safe fix -39 39 | from . import renamed as bees # F401: add to __all__ -40 40 | -41 41 | -42 |-__all__ = ["argparse", "exported"] - 42 |+__all__ = ["argparse", "exported", "unused"] +39 | from . import renamed as bees # F401: add to __all__ +40 | +41 | + - __all__ = ["argparse", "exported"] +42 + __all__ = ["argparse", "exported", "unused"] F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:39:26 @@ -40,10 +37,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Add unused import `bees` to __all__ - -ℹ Safe fix -39 39 | from . import renamed as bees # F401: add to __all__ -40 40 | -41 41 | -42 |-__all__ = ["argparse", "exported"] - 42 |+__all__ = ["argparse", "exported", "bees"] +39 | from . import renamed as bees # F401: add to __all__ +40 | +41 | + - __all__ = ["argparse", "exported"] +42 + __all__ = ["argparse", "exported", "bees"] diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap index 9cdd127afb..683f767628 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_26__all_empty____init__.py.snap @@ -8,13 +8,11 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Add unused import `unused` to __all__ - -ℹ Safe fix -8 8 | from . import renamed as bees # F401: add to __all__ -9 9 | -10 10 | -11 |-__all__ = [] - 11 |+__all__ = ["unused"] +8 | from . import renamed as bees # F401: add to __all__ +9 | +10 | + - __all__ = [] +11 + __all__ = ["unused"] F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:8:26 @@ -23,10 +21,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Add unused import `bees` to __all__ - -ℹ Safe fix -8 8 | from . import renamed as bees # F401: add to __all__ -9 9 | -10 10 | -11 |-__all__ = [] - 11 |+__all__ = ["bees"] +8 | from . import renamed as bees # F401: add to __all__ +9 | +10 | + - __all__ = [] +11 + __all__ = ["bees"] diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap index b85570c0c7..91db5a2dfc 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_28__all_multiple____init__.py.snap @@ -8,13 +8,11 @@ F401 [*] `.unused` imported but unused; consider removing, adding to `__all__`, | ^^^^^^ | help: Add unused import `unused` to __all__ - -ℹ Safe fix -5 5 | from . import unused, renamed as bees # F401: add to __all__ -6 6 | -7 7 | -8 |-__all__ = []; - 8 |+__all__ = ["bees", "unused"]; +5 | from . import unused, renamed as bees # F401: add to __all__ +6 | +7 | + - __all__ = []; +8 + __all__ = ["bees", "unused"]; F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, or using a redundant alias --> __init__.py:5:34 @@ -23,10 +21,8 @@ F401 [*] `.renamed` imported but unused; consider removing, adding to `__all__`, | ^^^^ | help: Add unused import `bees` to __all__ - -ℹ Safe fix -5 5 | from . import unused, renamed as bees # F401: add to __all__ -6 6 | -7 7 | -8 |-__all__ = []; - 8 |+__all__ = ["bees", "unused"]; +5 | from . import unused, renamed as bees # F401: add to __all__ +6 | +7 | + - __all__ = []; +8 + __all__ = ["bees", "unused"]; diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap index 1f40e7cb69..582259435a 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401_F401_33____init__.py.snap @@ -10,10 +10,9 @@ F401 [*] `F401_33.other.Ham` imported but unused | ^^^ | help: Remove unused import: `F401_33.other.Ham` - -ℹ Unsafe fix -5 5 | -6 6 | class Spam: -7 7 | def __init__(self) -> None: -8 |- from F401_33.other import Ham - 8 |+ pass +5 | +6 | class Spam: +7 | def __init__(self) -> None: + - from F401_33.other import Ham +8 + pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap index 89b804e26f..f7e0d2ce60 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__preview__F401___init__.py.snap @@ -10,9 +10,8 @@ F401 [*] `os` imported but unused 3 | print(__path__) | help: Remove unused import: `os` - -ℹ Unsafe fix -1 |-import os -2 1 | -3 2 | print(__path__) -4 3 | + - import os +1 | +2 | print(__path__) +3 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap index 30100ddb2d..0b79f06eb5 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_double_shadowing_except.snap @@ -12,16 +12,14 @@ F841 [*] Local variable `x` is assigned to but never used 9 | except ImportError as x: | help: Remove assignment to unused variable `x` - -ℹ Safe fix -4 4 | -5 5 | try: -6 6 | 1 / 0 -7 |- except ValueError as x: - 7 |+ except ValueError: -8 8 | pass -9 9 | except ImportError as x: -10 10 | pass +4 | +5 | try: +6 | 1 / 0 + - except ValueError as x: +7 + except ValueError: +8 | pass +9 | except ImportError as x: +10 | pass F841 [*] Local variable `x` is assigned to but never used --> :9:27 @@ -33,13 +31,11 @@ F841 [*] Local variable `x` is assigned to but never used 10 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -6 6 | 1 / 0 -7 7 | except ValueError as x: -8 8 | pass -9 |- except ImportError as x: - 9 |+ except ImportError: -10 10 | pass -11 11 | -12 12 | # No error here, though it should arguably be an F821 error. `x` will +6 | 1 / 0 +7 | except ValueError as x: +8 | pass + - except ImportError as x: +9 + except ImportError: +10 | pass +11 | +12 | # No error here, though it should arguably be an F821 error. `x` will diff --git a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap index 2c495fdf7d..c885642cf7 100644 --- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap +++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linter__rules__pyflakes__tests__print_in_body_after_shadowing_except.snap @@ -11,13 +11,11 @@ F841 [*] Local variable `x` is assigned to but never used 8 | pass | help: Remove assignment to unused variable `x` - -ℹ Safe fix -4 4 | -5 5 | try: -6 6 | 1 / 0 -7 |- except Exception as x: - 7 |+ except Exception: -8 8 | pass -9 9 | -10 10 | # No error here, though it should arguably be an F821 error. `x` will +4 | +5 | try: +6 | 1 / 0 + - except Exception as x: +7 + except Exception: +8 | pass +9 | +10 | # No error here, though it should arguably be an F821 error. `x` will diff --git a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap b/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap index 86fd2f43f6..11914bed8c 100644 --- a/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap +++ b/crates/ruff_linter/src/rules/pygrep_hooks/snapshots/ruff_linter__rules__pygrep_hooks__tests__PGH004_PGH004_0.py.snap @@ -42,16 +42,15 @@ PGH004 [*] Use a colon when specifying `noqa` rule codes 20 | # PGH004 | help: Add missing colon - -ℹ Unsafe fix -15 15 | x = 2 # noqa:X100 -16 16 | -17 17 | # PGH004 -18 |-x = 2 # noqa X100 - 18 |+x = 2 # noqa: X100 -19 19 | -20 20 | # PGH004 -21 21 | x = 2 # noqa X100, X200 +15 | x = 2 # noqa:X100 +16 | +17 | # PGH004 + - x = 2 # noqa X100 +18 + x = 2 # noqa: X100 +19 | +20 | # PGH004 +21 | x = 2 # noqa X100, X200 +note: This is an unsafe fix and may change runtime behavior PGH004 [*] Use a colon when specifying `noqa` rule codes --> PGH004_0.py:21:8 @@ -63,13 +62,12 @@ PGH004 [*] Use a colon when specifying `noqa` rule codes 23 | # PGH004 | help: Add missing colon - -ℹ Unsafe fix -18 18 | x = 2 # noqa X100 -19 19 | -20 20 | # PGH004 -21 |-x = 2 # noqa X100, X200 - 21 |+x = 2 # noqa: X100, X200 -22 22 | -23 23 | # PGH004 -24 24 | x = 2 # noqa : X300 +18 | x = 2 # noqa X100 +19 | +20 | # PGH004 + - x = 2 # noqa X100, X200 +21 + x = 2 # noqa: X100, X200 +22 | +23 | # PGH004 +24 | x = 2 # noqa : X300 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap index 9e974b0905..7b5f384b49 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0207_missing_maxsplit_arg.py.snap @@ -12,16 +12,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 16 | "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -11 11 | -12 12 | # Errors -13 13 | ## Test split called directly on string literal -14 |-"1,2,3".split(",")[0] # [missing-maxsplit-arg] - 14 |+"1,2,3".split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -15 15 | "1,2,3".split(",")[-1] # [missing-maxsplit-arg] -16 16 | "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] -17 17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] +11 | +12 | # Errors +13 | ## Test split called directly on string literal + - "1,2,3".split(",")[0] # [missing-maxsplit-arg] +14 + "1,2,3".split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +15 | "1,2,3".split(",")[-1] # [missing-maxsplit-arg] +16 | "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] +17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:15:1 @@ -34,16 +32,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.rsplit()` and pass `maxsplit=1` - -ℹ Safe fix -12 12 | # Errors -13 13 | ## Test split called directly on string literal -14 14 | "1,2,3".split(",")[0] # [missing-maxsplit-arg] -15 |-"1,2,3".split(",")[-1] # [missing-maxsplit-arg] - 15 |+"1,2,3".rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -16 16 | "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] -17 17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] -18 18 | +12 | # Errors +13 | ## Test split called directly on string literal +14 | "1,2,3".split(",")[0] # [missing-maxsplit-arg] + - "1,2,3".split(",")[-1] # [missing-maxsplit-arg] +15 + "1,2,3".rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +16 | "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] +17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] +18 | PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:16:1 @@ -55,16 +51,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -13 13 | ## Test split called directly on string literal -14 14 | "1,2,3".split(",")[0] # [missing-maxsplit-arg] -15 15 | "1,2,3".split(",")[-1] # [missing-maxsplit-arg] -16 |-"1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] - 16 |+"1,2,3".split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -17 17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] -18 18 | -19 19 | ## Test split called on string variable +13 | ## Test split called directly on string literal +14 | "1,2,3".split(",")[0] # [missing-maxsplit-arg] +15 | "1,2,3".split(",")[-1] # [missing-maxsplit-arg] + - "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] +16 + "1,2,3".split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] +18 | +19 | ## Test split called on string variable PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:17:1 @@ -77,16 +71,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 19 | ## Test split called on string variable | help: Pass `maxsplit=1` into `str.rsplit()` - -ℹ Safe fix -14 14 | "1,2,3".split(",")[0] # [missing-maxsplit-arg] -15 15 | "1,2,3".split(",")[-1] # [missing-maxsplit-arg] -16 16 | "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] -17 |-"1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] - 17 |+"1,2,3".rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -18 18 | -19 19 | ## Test split called on string variable -20 20 | SEQ.split(",")[0] # [missing-maxsplit-arg] +14 | "1,2,3".split(",")[0] # [missing-maxsplit-arg] +15 | "1,2,3".split(",")[-1] # [missing-maxsplit-arg] +16 | "1,2,3".rsplit(",")[0] # [missing-maxsplit-arg] + - "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] +17 + "1,2,3".rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +18 | +19 | ## Test split called on string variable +20 | SEQ.split(",")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:20:1 @@ -98,16 +90,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 22 | SEQ.rsplit(",")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -17 17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] -18 18 | -19 19 | ## Test split called on string variable -20 |-SEQ.split(",")[0] # [missing-maxsplit-arg] - 20 |+SEQ.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -21 21 | SEQ.split(",")[-1] # [missing-maxsplit-arg] -22 22 | SEQ.rsplit(",")[0] # [missing-maxsplit-arg] -23 23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] +17 | "1,2,3".rsplit(",")[-1] # [missing-maxsplit-arg] +18 | +19 | ## Test split called on string variable + - SEQ.split(",")[0] # [missing-maxsplit-arg] +20 + SEQ.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +21 | SEQ.split(",")[-1] # [missing-maxsplit-arg] +22 | SEQ.rsplit(",")[0] # [missing-maxsplit-arg] +23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:21:1 @@ -120,16 +110,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.rsplit()` and pass `maxsplit=1` - -ℹ Safe fix -18 18 | -19 19 | ## Test split called on string variable -20 20 | SEQ.split(",")[0] # [missing-maxsplit-arg] -21 |-SEQ.split(",")[-1] # [missing-maxsplit-arg] - 21 |+SEQ.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -22 22 | SEQ.rsplit(",")[0] # [missing-maxsplit-arg] -23 23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] -24 24 | +18 | +19 | ## Test split called on string variable +20 | SEQ.split(",")[0] # [missing-maxsplit-arg] + - SEQ.split(",")[-1] # [missing-maxsplit-arg] +21 + SEQ.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +22 | SEQ.rsplit(",")[0] # [missing-maxsplit-arg] +23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] +24 | PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:22:1 @@ -141,16 +129,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -19 19 | ## Test split called on string variable -20 20 | SEQ.split(",")[0] # [missing-maxsplit-arg] -21 21 | SEQ.split(",")[-1] # [missing-maxsplit-arg] -22 |-SEQ.rsplit(",")[0] # [missing-maxsplit-arg] - 22 |+SEQ.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -23 23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] -24 24 | -25 25 | ## Test split called on class attribute +19 | ## Test split called on string variable +20 | SEQ.split(",")[0] # [missing-maxsplit-arg] +21 | SEQ.split(",")[-1] # [missing-maxsplit-arg] + - SEQ.rsplit(",")[0] # [missing-maxsplit-arg] +22 + SEQ.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] +24 | +25 | ## Test split called on class attribute PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:23:1 @@ -163,16 +149,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 25 | ## Test split called on class attribute | help: Pass `maxsplit=1` into `str.rsplit()` - -ℹ Safe fix -20 20 | SEQ.split(",")[0] # [missing-maxsplit-arg] -21 21 | SEQ.split(",")[-1] # [missing-maxsplit-arg] -22 22 | SEQ.rsplit(",")[0] # [missing-maxsplit-arg] -23 |-SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] - 23 |+SEQ.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -24 24 | -25 25 | ## Test split called on class attribute -26 26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] +20 | SEQ.split(",")[0] # [missing-maxsplit-arg] +21 | SEQ.split(",")[-1] # [missing-maxsplit-arg] +22 | SEQ.rsplit(",")[0] # [missing-maxsplit-arg] + - SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] +23 + SEQ.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +24 | +25 | ## Test split called on class attribute +26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:26:1 @@ -184,16 +168,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 28 | Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -23 23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] -24 24 | -25 25 | ## Test split called on class attribute -26 |-Foo.class_str.split(",")[0] # [missing-maxsplit-arg] - 26 |+Foo.class_str.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -27 27 | Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] -28 28 | Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] -29 29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] +23 | SEQ.rsplit(",")[-1] # [missing-maxsplit-arg] +24 | +25 | ## Test split called on class attribute + - Foo.class_str.split(",")[0] # [missing-maxsplit-arg] +26 + Foo.class_str.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +27 | Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] +28 | Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] +29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:27:1 @@ -206,16 +188,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.rsplit()` and pass `maxsplit=1` - -ℹ Safe fix -24 24 | -25 25 | ## Test split called on class attribute -26 26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] -27 |-Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] - 27 |+Foo.class_str.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -28 28 | Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] -29 29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] -30 30 | +24 | +25 | ## Test split called on class attribute +26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] + - Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] +27 + Foo.class_str.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +28 | Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] +29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] +30 | PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:28:1 @@ -227,16 +207,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -25 25 | ## Test split called on class attribute -26 26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] -27 27 | Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] -28 |-Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] - 28 |+Foo.class_str.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -29 29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] -30 30 | -31 31 | ## Test split called on sliced string +25 | ## Test split called on class attribute +26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] +27 | Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] + - Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] +28 + Foo.class_str.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] +30 | +31 | ## Test split called on sliced string PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:29:1 @@ -249,16 +227,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 31 | ## Test split called on sliced string | help: Pass `maxsplit=1` into `str.rsplit()` - -ℹ Safe fix -26 26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] -27 27 | Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] -28 28 | Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] -29 |-Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] - 29 |+Foo.class_str.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -30 30 | -31 31 | ## Test split called on sliced string -32 32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] +26 | Foo.class_str.split(",")[0] # [missing-maxsplit-arg] +27 | Foo.class_str.split(",")[-1] # [missing-maxsplit-arg] +28 | Foo.class_str.rsplit(",")[0] # [missing-maxsplit-arg] + - Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] +29 + Foo.class_str.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +30 | +31 | ## Test split called on sliced string +32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:32:1 @@ -270,16 +246,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -29 29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] -30 30 | -31 31 | ## Test split called on sliced string -32 |-"1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] - 32 |+"1,2,3"[::-1].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -33 33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] -34 34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] -35 35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] +29 | Foo.class_str.rsplit(",")[-1] # [missing-maxsplit-arg] +30 | +31 | ## Test split called on sliced string + - "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] +32 + "1,2,3"[::-1].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] +34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] +35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:33:1 @@ -292,16 +266,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -30 30 | -31 31 | ## Test split called on sliced string -32 32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] -33 |-"1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] - 33 |+"1,2,3"[::-1][::-1].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -34 34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] -35 35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] -36 36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] +30 | +31 | ## Test split called on sliced string +32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] + - "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] +33 + "1,2,3"[::-1][::-1].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] +35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] +36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:34:1 @@ -314,16 +286,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -31 31 | ## Test split called on sliced string -32 32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] -33 33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] -34 |-SEQ[:3].split(",")[0] # [missing-maxsplit-arg] - 34 |+SEQ[:3].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -35 35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] -36 36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] -37 37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] +31 | ## Test split called on sliced string +32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] +33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] + - SEQ[:3].split(",")[0] # [missing-maxsplit-arg] +34 + SEQ[:3].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] +36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] +37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:35:1 @@ -336,16 +306,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] | help: Use `str.rsplit()` and pass `maxsplit=1` - -ℹ Safe fix -32 32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] -33 33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] -34 34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] -35 |-Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] - 35 |+Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -36 36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] -37 37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] -38 38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] +32 | "1,2,3"[::-1].split(",")[0] # [missing-maxsplit-arg] +33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] +34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] + - Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] +35 + Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] +37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] +38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:36:1 @@ -358,16 +326,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -33 33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] -34 34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] -35 35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] -36 |-"1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] - 36 |+"1,2,3"[::-1].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -37 37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] -38 38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] -39 39 | +33 | "1,2,3"[::-1][::-1].split(",")[0] # [missing-maxsplit-arg] +34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] +35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] + - "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] +36 + "1,2,3"[::-1].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] +38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] +39 | PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:37:1 @@ -379,16 +345,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -34 34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] -35 35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] -36 36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] -37 |-SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] - 37 |+SEQ[:3].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -38 38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] -39 39 | -40 40 | ## Test sep given as named argument +34 | SEQ[:3].split(",")[0] # [missing-maxsplit-arg] +35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] +36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] + - SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] +37 + SEQ[:3].split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] +39 | +40 | ## Test sep given as named argument PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:38:1 @@ -401,16 +365,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 40 | ## Test sep given as named argument | help: Pass `maxsplit=1` into `str.rsplit()` - -ℹ Safe fix -35 35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] -36 36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] -37 37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] -38 |-Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] - 38 |+Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -39 39 | -40 40 | ## Test sep given as named argument -41 41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] +35 | Foo.class_str[1:3].split(",")[-1] # [missing-maxsplit-arg] +36 | "1,2,3"[::-1].rsplit(",")[0] # [missing-maxsplit-arg] +37 | SEQ[:3].rsplit(",")[0] # [missing-maxsplit-arg] + - Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] +38 + Foo.class_str[1:3].rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +39 | +40 | ## Test sep given as named argument +41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:41:1 @@ -422,16 +384,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 43 | "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -38 38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] -39 39 | -40 40 | ## Test sep given as named argument -41 |-"1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] - 41 |+"1,2,3".split(maxsplit=1, sep=",")[0] # [missing-maxsplit-arg] -42 42 | "1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] -43 43 | "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] -44 44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] +38 | Foo.class_str[1:3].rsplit(",")[-1] # [missing-maxsplit-arg] +39 | +40 | ## Test sep given as named argument + - "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] +41 + "1,2,3".split(maxsplit=1, sep=",")[0] # [missing-maxsplit-arg] +42 | "1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] +43 | "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] +44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:42:1 @@ -444,16 +404,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] | help: Use `str.rsplit()` and pass `maxsplit=1` - -ℹ Safe fix -39 39 | -40 40 | ## Test sep given as named argument -41 41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] -42 |-"1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] - 42 |+"1,2,3".rsplit(maxsplit=1, sep=",")[-1] # [missing-maxsplit-arg] -43 43 | "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] -44 44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] -45 45 | +39 | +40 | ## Test sep given as named argument +41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] + - "1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] +42 + "1,2,3".rsplit(maxsplit=1, sep=",")[-1] # [missing-maxsplit-arg] +43 | "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] +44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] +45 | PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:43:1 @@ -465,16 +423,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -40 40 | ## Test sep given as named argument -41 41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] -42 42 | "1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] -43 |-"1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] - 43 |+"1,2,3".split(maxsplit=1, sep=",")[0] # [missing-maxsplit-arg] -44 44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] -45 45 | -46 46 | ## Special cases +40 | ## Test sep given as named argument +41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] +42 | "1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] + - "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] +43 + "1,2,3".split(maxsplit=1, sep=",")[0] # [missing-maxsplit-arg] +44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] +45 | +46 | ## Special cases PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:44:1 @@ -487,16 +443,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 46 | ## Special cases | help: Pass `maxsplit=1` into `str.rsplit()` - -ℹ Safe fix -41 41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] -42 42 | "1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] -43 43 | "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] -44 |-"1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] - 44 |+"1,2,3".rsplit(maxsplit=1, sep=",")[-1] # [missing-maxsplit-arg] -45 45 | -46 46 | ## Special cases -47 47 | "1,2,3".split("\n")[0] # [missing-maxsplit-arg] +41 | "1,2,3".split(sep=",")[0] # [missing-maxsplit-arg] +42 | "1,2,3".split(sep=",")[-1] # [missing-maxsplit-arg] +43 | "1,2,3".rsplit(sep=",")[0] # [missing-maxsplit-arg] + - "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] +44 + "1,2,3".rsplit(maxsplit=1, sep=",")[-1] # [missing-maxsplit-arg] +45 | +46 | ## Special cases +47 | "1,2,3".split("\n")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:47:1 @@ -508,16 +462,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -44 44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] -45 45 | -46 46 | ## Special cases -47 |-"1,2,3".split("\n")[0] # [missing-maxsplit-arg] - 47 |+"1,2,3".split("\n", maxsplit=1)[0] # [missing-maxsplit-arg] -48 48 | "1,2,3".split("split")[-1] # [missing-maxsplit-arg] -49 49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] -50 50 | +44 | "1,2,3".rsplit(sep=",")[-1] # [missing-maxsplit-arg] +45 | +46 | ## Special cases + - "1,2,3".split("\n")[0] # [missing-maxsplit-arg] +47 + "1,2,3".split("\n", maxsplit=1)[0] # [missing-maxsplit-arg] +48 | "1,2,3".split("split")[-1] # [missing-maxsplit-arg] +49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] +50 | PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:48:1 @@ -529,16 +481,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] | help: Use `str.rsplit()` and pass `maxsplit=1` - -ℹ Safe fix -45 45 | -46 46 | ## Special cases -47 47 | "1,2,3".split("\n")[0] # [missing-maxsplit-arg] -48 |-"1,2,3".split("split")[-1] # [missing-maxsplit-arg] - 48 |+"1,2,3".rsplit("split", maxsplit=1)[-1] # [missing-maxsplit-arg] -49 49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] -50 50 | -51 51 | ## Test class attribute named split +45 | +46 | ## Special cases +47 | "1,2,3".split("\n")[0] # [missing-maxsplit-arg] + - "1,2,3".split("split")[-1] # [missing-maxsplit-arg] +48 + "1,2,3".rsplit("split", maxsplit=1)[-1] # [missing-maxsplit-arg] +49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] +50 | +51 | ## Test class attribute named split PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:49:1 @@ -551,16 +501,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 51 | ## Test class attribute named split | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -46 46 | ## Special cases -47 47 | "1,2,3".split("\n")[0] # [missing-maxsplit-arg] -48 48 | "1,2,3".split("split")[-1] # [missing-maxsplit-arg] -49 |-"1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] - 49 |+"1,2,3".split("rsplit", maxsplit=1)[0] # [missing-maxsplit-arg] -50 50 | -51 51 | ## Test class attribute named split -52 52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] +46 | ## Special cases +47 | "1,2,3".split("\n")[0] # [missing-maxsplit-arg] +48 | "1,2,3".split("split")[-1] # [missing-maxsplit-arg] + - "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] +49 + "1,2,3".split("rsplit", maxsplit=1)[0] # [missing-maxsplit-arg] +50 | +51 | ## Test class attribute named split +52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:52:1 @@ -572,16 +520,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 54 | Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] | help: Pass `maxsplit=1` into `str.split()` - -ℹ Safe fix -49 49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] -50 50 | -51 51 | ## Test class attribute named split -52 |-Bar.split.split(",")[0] # [missing-maxsplit-arg] - 52 |+Bar.split.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -53 53 | Bar.split.split(",")[-1] # [missing-maxsplit-arg] -54 54 | Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] -55 55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] +49 | "1,2,3".rsplit("rsplit")[0] # [missing-maxsplit-arg] +50 | +51 | ## Test class attribute named split + - Bar.split.split(",")[0] # [missing-maxsplit-arg] +52 + Bar.split.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +53 | Bar.split.split(",")[-1] # [missing-maxsplit-arg] +54 | Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] +55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:53:1 @@ -594,16 +540,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.rsplit()` and pass `maxsplit=1` - -ℹ Safe fix -50 50 | -51 51 | ## Test class attribute named split -52 52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] -53 |-Bar.split.split(",")[-1] # [missing-maxsplit-arg] - 53 |+Bar.split.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -54 54 | Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] -55 55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] -56 56 | +50 | +51 | ## Test class attribute named split +52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] + - Bar.split.split(",")[-1] # [missing-maxsplit-arg] +53 + Bar.split.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +54 | Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] +55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] +56 | PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:54:1 @@ -615,16 +559,14 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] | help: Use `str.split()` and pass `maxsplit=1` - -ℹ Safe fix -51 51 | ## Test class attribute named split -52 52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] -53 53 | Bar.split.split(",")[-1] # [missing-maxsplit-arg] -54 |-Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] - 54 |+Bar.split.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] -55 55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] -56 56 | -57 57 | ## Test unpacked dict literal kwargs +51 | ## Test class attribute named split +52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] +53 | Bar.split.split(",")[-1] # [missing-maxsplit-arg] + - Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] +54 + Bar.split.split(",", maxsplit=1)[0] # [missing-maxsplit-arg] +55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] +56 | +57 | ## Test unpacked dict literal kwargs PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. --> missing_maxsplit_arg.py:55:1 @@ -637,16 +579,14 @@ PLC0207 [*] Replace with `rsplit(..., maxsplit=1)`. 57 | ## Test unpacked dict literal kwargs | help: Pass `maxsplit=1` into `str.rsplit()` - -ℹ Safe fix -52 52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] -53 53 | Bar.split.split(",")[-1] # [missing-maxsplit-arg] -54 54 | Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] -55 |-Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] - 55 |+Bar.split.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] -56 56 | -57 57 | ## Test unpacked dict literal kwargs -58 58 | "1,2,3".split(**{"sep": ","})[0] # [missing-maxsplit-arg] +52 | Bar.split.split(",")[0] # [missing-maxsplit-arg] +53 | Bar.split.split(",")[-1] # [missing-maxsplit-arg] +54 | Bar.split.rsplit(",")[0] # [missing-maxsplit-arg] + - Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] +55 + Bar.split.rsplit(",", maxsplit=1)[-1] # [missing-maxsplit-arg] +56 | +57 | ## Test unpacked dict literal kwargs +58 | "1,2,3".split(**{"sep": ","})[0] # [missing-maxsplit-arg] PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:58:1 @@ -656,16 +596,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Pass `maxsplit=1` into `str.split()` - -ℹ Unsafe fix -55 55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] -56 56 | -57 57 | ## Test unpacked dict literal kwargs -58 |-"1,2,3".split(**{"sep": ","})[0] # [missing-maxsplit-arg] - 58 |+"1,2,3".split(maxsplit=1, **{"sep": ","})[0] # [missing-maxsplit-arg] -59 59 | -60 60 | -61 61 | # OK +55 | Bar.split.rsplit(",")[-1] # [missing-maxsplit-arg] +56 | +57 | ## Test unpacked dict literal kwargs + - "1,2,3".split(**{"sep": ","})[0] # [missing-maxsplit-arg] +58 + "1,2,3".split(maxsplit=1, **{"sep": ","})[0] # [missing-maxsplit-arg] +59 | +60 | +61 | # OK +note: This is an unsafe fix and may change runtime behavior PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:179:1 @@ -678,16 +617,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 181 | kwargs_with_maxsplit = {"maxsplit": 1} | help: Pass `maxsplit=1` into `str.split()` - -ℹ Unsafe fix -176 176 | ## TODO: These require the ability to resolve a dict variable name to a value -177 177 | # Errors -178 178 | kwargs_without_maxsplit = {"seq": ","} -179 |-"1,2,3".split(**kwargs_without_maxsplit)[0] # TODO: [missing-maxsplit-arg] - 179 |+"1,2,3".split(maxsplit=1, **kwargs_without_maxsplit)[0] # TODO: [missing-maxsplit-arg] -180 180 | # OK -181 181 | kwargs_with_maxsplit = {"maxsplit": 1} -182 182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0] # TODO: false positive +176 | ## TODO: These require the ability to resolve a dict variable name to a value +177 | # Errors +178 | kwargs_without_maxsplit = {"seq": ","} + - "1,2,3".split(**kwargs_without_maxsplit)[0] # TODO: [missing-maxsplit-arg] +179 + "1,2,3".split(maxsplit=1, **kwargs_without_maxsplit)[0] # TODO: [missing-maxsplit-arg] +180 | # OK +181 | kwargs_with_maxsplit = {"maxsplit": 1} +182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0] # TODO: false positive +note: This is an unsafe fix and may change runtime behavior PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:182:1 @@ -700,16 +638,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 184 | "1,2,3".split(**kwargs_with_maxsplit)[0] # TODO: false positive | help: Pass `maxsplit=1` into `str.split()` - -ℹ Unsafe fix -179 179 | "1,2,3".split(**kwargs_without_maxsplit)[0] # TODO: [missing-maxsplit-arg] -180 180 | # OK -181 181 | kwargs_with_maxsplit = {"maxsplit": 1} -182 |-"1,2,3".split(",", **kwargs_with_maxsplit)[0] # TODO: false positive - 182 |+"1,2,3".split(",", maxsplit=1, **kwargs_with_maxsplit)[0] # TODO: false positive -183 183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1} -184 184 | "1,2,3".split(**kwargs_with_maxsplit)[0] # TODO: false positive -185 185 | +179 | "1,2,3".split(**kwargs_without_maxsplit)[0] # TODO: [missing-maxsplit-arg] +180 | # OK +181 | kwargs_with_maxsplit = {"maxsplit": 1} + - "1,2,3".split(",", **kwargs_with_maxsplit)[0] # TODO: false positive +182 + "1,2,3".split(",", maxsplit=1, **kwargs_with_maxsplit)[0] # TODO: false positive +183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1} +184 | "1,2,3".split(**kwargs_with_maxsplit)[0] # TODO: false positive +185 | +note: This is an unsafe fix and may change runtime behavior PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:184:1 @@ -720,16 +657,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Pass `maxsplit=1` into `str.split()` - -ℹ Unsafe fix -181 181 | kwargs_with_maxsplit = {"maxsplit": 1} -182 182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0] # TODO: false positive -183 183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1} -184 |-"1,2,3".split(**kwargs_with_maxsplit)[0] # TODO: false positive - 184 |+"1,2,3".split(maxsplit=1, **kwargs_with_maxsplit)[0] # TODO: false positive -185 185 | -186 186 | -187 187 | ## Test unpacked list literal args (starred expressions) +181 | kwargs_with_maxsplit = {"maxsplit": 1} +182 | "1,2,3".split(",", **kwargs_with_maxsplit)[0] # TODO: false positive +183 | kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1} + - "1,2,3".split(**kwargs_with_maxsplit)[0] # TODO: false positive +184 + "1,2,3".split(maxsplit=1, **kwargs_with_maxsplit)[0] # TODO: false positive +185 | +186 | +187 | ## Test unpacked list literal args (starred expressions) +note: This is an unsafe fix and may change runtime behavior PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:189:1 @@ -742,16 +678,15 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. 191 | ## Test unpacked list variable args | help: Pass `maxsplit=1` into `str.split()` - -ℹ Unsafe fix -186 186 | -187 187 | ## Test unpacked list literal args (starred expressions) -188 188 | # Errors -189 |-"1,2,3".split(",", *[-1])[0] - 189 |+"1,2,3".split(",", *[-1], maxsplit=1)[0] -190 190 | -191 191 | ## Test unpacked list variable args -192 192 | # Errors +186 | +187 | ## Test unpacked list literal args (starred expressions) +188 | # Errors + - "1,2,3".split(",", *[-1])[0] +189 + "1,2,3".split(",", *[-1], maxsplit=1)[0] +190 | +191 | ## Test unpacked list variable args +192 | # Errors +note: This is an unsafe fix and may change runtime behavior PLC0207 [*] Replace with `split(..., maxsplit=1)`. --> missing_maxsplit_arg.py:194:1 @@ -762,10 +697,9 @@ PLC0207 [*] Replace with `split(..., maxsplit=1)`. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Pass `maxsplit=1` into `str.split()` - -ℹ Unsafe fix -191 191 | ## Test unpacked list variable args -192 192 | # Errors -193 193 | args_list = [-1] -194 |-"1,2,3".split(",", *args_list)[0] - 194 |+"1,2,3".split(",", *args_list, maxsplit=1)[0] +191 | ## Test unpacked list variable args +192 | # Errors +193 | args_list = [-1] + - "1,2,3".split(",", *args_list)[0] +194 + "1,2,3".split(",", *args_list, maxsplit=1)[0] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap index a8aa72f1c5..1c1ae92df6 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0208_iteration_over_set.py.snap @@ -11,15 +11,13 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 4 | print(f"I can count to {item}!") | help: Convert to `tuple` - -ℹ Safe fix -1 1 | # Errors -2 2 | -3 |-for item in {1}: - 3 |+for item in (1,): -4 4 | print(f"I can count to {item}!") -5 5 | -6 6 | for item in {"apples", "lemons", "water"}: # flags in-line set literals +1 | # Errors +2 | + - for item in {1}: +3 + for item in (1,): +4 | print(f"I can count to {item}!") +5 | +6 | for item in {"apples", "lemons", "water"}: # flags in-line set literals PLC0208 [*] Use a sequence type instead of a `set` when iterating over values --> iteration_over_set.py:6:13 @@ -31,16 +29,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 7 | print(f"I like {item}.") | help: Convert to `tuple` - -ℹ Safe fix -3 3 | for item in {1}: -4 4 | print(f"I can count to {item}!") -5 5 | -6 |-for item in {"apples", "lemons", "water"}: # flags in-line set literals - 6 |+for item in ("apples", "lemons", "water"): # flags in-line set literals -7 7 | print(f"I like {item}.") -8 8 | -9 9 | for item in {1,}: +3 | for item in {1}: +4 | print(f"I can count to {item}!") +5 | + - for item in {"apples", "lemons", "water"}: # flags in-line set literals +6 + for item in ("apples", "lemons", "water"): # flags in-line set literals +7 | print(f"I like {item}.") +8 | +9 | for item in {1,}: PLC0208 [*] Use a sequence type instead of a `set` when iterating over values --> iteration_over_set.py:9:13 @@ -52,16 +48,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 10 | print(f"I can count to {item}!") | help: Convert to `tuple` - -ℹ Safe fix -6 6 | for item in {"apples", "lemons", "water"}: # flags in-line set literals -7 7 | print(f"I like {item}.") -8 8 | -9 |-for item in {1,}: - 9 |+for item in (1,): -10 10 | print(f"I can count to {item}!") -11 11 | -12 12 | for item in { +6 | for item in {"apples", "lemons", "water"}: # flags in-line set literals +7 | print(f"I like {item}.") +8 | + - for item in {1,}: +9 + for item in (1,): +10 | print(f"I can count to {item}!") +11 | +12 | for item in { PLC0208 [*] Use a sequence type instead of a `set` when iterating over values --> iteration_over_set.py:12:13 @@ -76,19 +70,17 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 15 | print(f"I like {item}.") | help: Convert to `tuple` - -ℹ Safe fix -9 9 | for item in {1,}: -10 10 | print(f"I can count to {item}!") -11 11 | -12 |-for item in { - 12 |+for item in ( -13 13 | "apples", "lemons", "water" -14 |-}: # flags in-line set literals - 14 |+): # flags in-line set literals -15 15 | print(f"I like {item}.") -16 16 | -17 17 | numbers_list = [i for i in {1, 2, 3}] # flags sets in list comprehensions +9 | for item in {1,}: +10 | print(f"I can count to {item}!") +11 | + - for item in { +12 + for item in ( +13 | "apples", "lemons", "water" + - }: # flags in-line set literals +14 + ): # flags in-line set literals +15 | print(f"I like {item}.") +16 | +17 | numbers_list = [i for i in {1, 2, 3}] # flags sets in list comprehensions PLC0208 [*] Use a sequence type instead of a `set` when iterating over values --> iteration_over_set.py:17:28 @@ -101,16 +93,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 19 | numbers_set = {i for i in {1, 2, 3}} # flags sets in set comprehensions | help: Convert to `tuple` - -ℹ Safe fix -14 14 | }: # flags in-line set literals -15 15 | print(f"I like {item}.") -16 16 | -17 |-numbers_list = [i for i in {1, 2, 3}] # flags sets in list comprehensions - 17 |+numbers_list = [i for i in (1, 2, 3)] # flags sets in list comprehensions -18 18 | -19 19 | numbers_set = {i for i in {1, 2, 3}} # flags sets in set comprehensions -20 20 | +14 | }: # flags in-line set literals +15 | print(f"I like {item}.") +16 | + - numbers_list = [i for i in {1, 2, 3}] # flags sets in list comprehensions +17 + numbers_list = [i for i in (1, 2, 3)] # flags sets in list comprehensions +18 | +19 | numbers_set = {i for i in {1, 2, 3}} # flags sets in set comprehensions +20 | PLC0208 [*] Use a sequence type instead of a `set` when iterating over values --> iteration_over_set.py:19:27 @@ -123,16 +113,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 21 | numbers_dict = {str(i): i for i in {1, 2, 3}} # flags sets in dict comprehensions | help: Convert to `tuple` - -ℹ Safe fix -16 16 | -17 17 | numbers_list = [i for i in {1, 2, 3}] # flags sets in list comprehensions -18 18 | -19 |-numbers_set = {i for i in {1, 2, 3}} # flags sets in set comprehensions - 19 |+numbers_set = {i for i in (1, 2, 3)} # flags sets in set comprehensions -20 20 | -21 21 | numbers_dict = {str(i): i for i in {1, 2, 3}} # flags sets in dict comprehensions -22 22 | +16 | +17 | numbers_list = [i for i in {1, 2, 3}] # flags sets in list comprehensions +18 | + - numbers_set = {i for i in {1, 2, 3}} # flags sets in set comprehensions +19 + numbers_set = {i for i in (1, 2, 3)} # flags sets in set comprehensions +20 | +21 | numbers_dict = {str(i): i for i in {1, 2, 3}} # flags sets in dict comprehensions +22 | PLC0208 [*] Use a sequence type instead of a `set` when iterating over values --> iteration_over_set.py:21:36 @@ -145,16 +133,14 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 23 | numbers_gen = (i for i in {1, 2, 3}) # flags sets in generator expressions | help: Convert to `tuple` - -ℹ Safe fix -18 18 | -19 19 | numbers_set = {i for i in {1, 2, 3}} # flags sets in set comprehensions -20 20 | -21 |-numbers_dict = {str(i): i for i in {1, 2, 3}} # flags sets in dict comprehensions - 21 |+numbers_dict = {str(i): i for i in (1, 2, 3)} # flags sets in dict comprehensions -22 22 | -23 23 | numbers_gen = (i for i in {1, 2, 3}) # flags sets in generator expressions -24 24 | +18 | +19 | numbers_set = {i for i in {1, 2, 3}} # flags sets in set comprehensions +20 | + - numbers_dict = {str(i): i for i in {1, 2, 3}} # flags sets in dict comprehensions +21 + numbers_dict = {str(i): i for i in (1, 2, 3)} # flags sets in dict comprehensions +22 | +23 | numbers_gen = (i for i in {1, 2, 3}) # flags sets in generator expressions +24 | PLC0208 [*] Use a sequence type instead of a `set` when iterating over values --> iteration_over_set.py:23:27 @@ -167,13 +153,11 @@ PLC0208 [*] Use a sequence type instead of a `set` when iterating over values 25 | # Non-errors | help: Convert to `tuple` - -ℹ Safe fix -20 20 | -21 21 | numbers_dict = {str(i): i for i in {1, 2, 3}} # flags sets in dict comprehensions -22 22 | -23 |-numbers_gen = (i for i in {1, 2, 3}) # flags sets in generator expressions - 23 |+numbers_gen = (i for i in (1, 2, 3)) # flags sets in generator expressions -24 24 | -25 25 | # Non-errors -26 26 | +20 | +21 | numbers_dict = {str(i): i for i in {1, 2, 3}} # flags sets in dict comprehensions +22 | + - numbers_gen = (i for i in {1, 2, 3}) # flags sets in generator expressions +23 + numbers_gen = (i for i in (1, 2, 3)) # flags sets in generator expressions +24 | +25 | # Non-errors +26 | diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap index df64c6bbfb..a191218fab 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing.py.snap @@ -12,16 +12,15 @@ PLC0414 [*] Import alias does not rename original package 8 | from collections import OrderedDict as o_dict | help: Remove import alias - -ℹ Unsafe fix -3 3 | # 1. useless-import-alias -4 4 | # 2. consider-using-from-import -5 5 | -6 |-import collections as collections # [useless-import-alias] - 6 |+import collections # [useless-import-alias] -7 7 | from collections import OrderedDict as OrderedDict # [useless-import-alias] -8 8 | from collections import OrderedDict as o_dict -9 9 | import os.path as path # [consider-using-from-import] +3 | # 1. useless-import-alias +4 | # 2. consider-using-from-import +5 | + - import collections as collections # [useless-import-alias] +6 + import collections # [useless-import-alias] +7 | from collections import OrderedDict as OrderedDict # [useless-import-alias] +8 | from collections import OrderedDict as o_dict +9 | import os.path as path # [consider-using-from-import] +note: This is an unsafe fix and may change runtime behavior PLC0414 [*] Import alias does not rename original package --> import_aliasing.py:7:25 @@ -33,16 +32,15 @@ PLC0414 [*] Import alias does not rename original package 9 | import os.path as path # [consider-using-from-import] | help: Remove import alias - -ℹ Unsafe fix -4 4 | # 2. consider-using-from-import -5 5 | -6 6 | import collections as collections # [useless-import-alias] -7 |-from collections import OrderedDict as OrderedDict # [useless-import-alias] - 7 |+from collections import OrderedDict # [useless-import-alias] -8 8 | from collections import OrderedDict as o_dict -9 9 | import os.path as path # [consider-using-from-import] -10 10 | import os.path as p +4 | # 2. consider-using-from-import +5 | +6 | import collections as collections # [useless-import-alias] + - from collections import OrderedDict as OrderedDict # [useless-import-alias] +7 + from collections import OrderedDict # [useless-import-alias] +8 | from collections import OrderedDict as o_dict +9 | import os.path as path # [consider-using-from-import] +10 | import os.path as p +note: This is an unsafe fix and may change runtime behavior PLC0414 [*] Import alias does not rename original package --> import_aliasing.py:16:15 @@ -55,16 +53,15 @@ PLC0414 [*] Import alias does not rename original package 18 | from . import bar | help: Remove import alias - -ℹ Unsafe fix -13 13 | import os -14 14 | import os as OS -15 15 | from sys import version -16 |-from . import bar as bar # [useless-import-alias] - 16 |+from . import bar # [useless-import-alias] -17 17 | from . import bar as Bar -18 18 | from . import bar -19 19 | from ..foo import bar as bar # [useless-import-alias] +13 | import os +14 | import os as OS +15 | from sys import version + - from . import bar as bar # [useless-import-alias] +16 + from . import bar # [useless-import-alias] +17 | from . import bar as Bar +18 | from . import bar +19 | from ..foo import bar as bar # [useless-import-alias] +note: This is an unsafe fix and may change runtime behavior PLC0414 [*] Import alias does not rename original package --> import_aliasing.py:19:19 @@ -77,16 +74,15 @@ PLC0414 [*] Import alias does not rename original package 21 | from ..foo.bar import foobar as anotherfoobar | help: Remove import alias - -ℹ Unsafe fix -16 16 | from . import bar as bar # [useless-import-alias] -17 17 | from . import bar as Bar -18 18 | from . import bar -19 |-from ..foo import bar as bar # [useless-import-alias] - 19 |+from ..foo import bar # [useless-import-alias] -20 20 | from ..foo.bar import foobar as foobar # [useless-import-alias] -21 21 | from ..foo.bar import foobar as anotherfoobar -22 22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] +16 | from . import bar as bar # [useless-import-alias] +17 | from . import bar as Bar +18 | from . import bar + - from ..foo import bar as bar # [useless-import-alias] +19 + from ..foo import bar # [useless-import-alias] +20 | from ..foo.bar import foobar as foobar # [useless-import-alias] +21 | from ..foo.bar import foobar as anotherfoobar +22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] +note: This is an unsafe fix and may change runtime behavior PLC0414 [*] Import alias does not rename original package --> import_aliasing.py:20:23 @@ -99,16 +95,15 @@ PLC0414 [*] Import alias does not rename original package 22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] | help: Remove import alias - -ℹ Unsafe fix -17 17 | from . import bar as Bar -18 18 | from . import bar -19 19 | from ..foo import bar as bar # [useless-import-alias] -20 |-from ..foo.bar import foobar as foobar # [useless-import-alias] - 20 |+from ..foo.bar import foobar # [useless-import-alias] -21 21 | from ..foo.bar import foobar as anotherfoobar -22 22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] -23 23 | from . import foo as bar, foo2 as foo2 # [useless-import-alias] +17 | from . import bar as Bar +18 | from . import bar +19 | from ..foo import bar as bar # [useless-import-alias] + - from ..foo.bar import foobar as foobar # [useless-import-alias] +20 + from ..foo.bar import foobar # [useless-import-alias] +21 | from ..foo.bar import foobar as anotherfoobar +22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] +23 | from . import foo as bar, foo2 as foo2 # [useless-import-alias] +note: This is an unsafe fix and may change runtime behavior PLC0414 [*] Import alias does not rename original package --> import_aliasing.py:22:15 @@ -121,16 +116,15 @@ PLC0414 [*] Import alias does not rename original package 24 | from . import foo as bar, foo2 as bar2 | help: Remove import alias - -ℹ Unsafe fix -19 19 | from ..foo import bar as bar # [useless-import-alias] -20 20 | from ..foo.bar import foobar as foobar # [useless-import-alias] -21 21 | from ..foo.bar import foobar as anotherfoobar -22 |-from . import foo as foo, foo2 as bar2 # [useless-import-alias] - 22 |+from . import foo, foo2 as bar2 # [useless-import-alias] -23 23 | from . import foo as bar, foo2 as foo2 # [useless-import-alias] -24 24 | from . import foo as bar, foo2 as bar2 -25 25 | from foo.bar import foobar as foobar # [useless-import-alias] +19 | from ..foo import bar as bar # [useless-import-alias] +20 | from ..foo.bar import foobar as foobar # [useless-import-alias] +21 | from ..foo.bar import foobar as anotherfoobar + - from . import foo as foo, foo2 as bar2 # [useless-import-alias] +22 + from . import foo, foo2 as bar2 # [useless-import-alias] +23 | from . import foo as bar, foo2 as foo2 # [useless-import-alias] +24 | from . import foo as bar, foo2 as bar2 +25 | from foo.bar import foobar as foobar # [useless-import-alias] +note: This is an unsafe fix and may change runtime behavior PLC0414 [*] Import alias does not rename original package --> import_aliasing.py:23:27 @@ -143,16 +137,15 @@ PLC0414 [*] Import alias does not rename original package 25 | from foo.bar import foobar as foobar # [useless-import-alias] | help: Remove import alias - -ℹ Unsafe fix -20 20 | from ..foo.bar import foobar as foobar # [useless-import-alias] -21 21 | from ..foo.bar import foobar as anotherfoobar -22 22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] -23 |-from . import foo as bar, foo2 as foo2 # [useless-import-alias] - 23 |+from . import foo as bar, foo2 # [useless-import-alias] -24 24 | from . import foo as bar, foo2 as bar2 -25 25 | from foo.bar import foobar as foobar # [useless-import-alias] -26 26 | from foo.bar import foobar as foo +20 | from ..foo.bar import foobar as foobar # [useless-import-alias] +21 | from ..foo.bar import foobar as anotherfoobar +22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] + - from . import foo as bar, foo2 as foo2 # [useless-import-alias] +23 + from . import foo as bar, foo2 # [useless-import-alias] +24 | from . import foo as bar, foo2 as bar2 +25 | from foo.bar import foobar as foobar # [useless-import-alias] +26 | from foo.bar import foobar as foo +note: This is an unsafe fix and may change runtime behavior PLC0414 [*] Import alias does not rename original package --> import_aliasing.py:25:21 @@ -165,13 +158,12 @@ PLC0414 [*] Import alias does not rename original package 27 | from .foo.bar import f as foobar | help: Remove import alias - -ℹ Unsafe fix -22 22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] -23 23 | from . import foo as bar, foo2 as foo2 # [useless-import-alias] -24 24 | from . import foo as bar, foo2 as bar2 -25 |-from foo.bar import foobar as foobar # [useless-import-alias] - 25 |+from foo.bar import foobar # [useless-import-alias] -26 26 | from foo.bar import foobar as foo -27 27 | from .foo.bar import f as foobar -28 28 | from ............a import b # [relative-beyond-top-level] +22 | from . import foo as foo, foo2 as bar2 # [useless-import-alias] +23 | from . import foo as bar, foo2 as foo2 # [useless-import-alias] +24 | from . import foo as bar, foo2 as bar2 + - from foo.bar import foobar as foobar # [useless-import-alias] +25 + from foo.bar import foobar # [useless-import-alias] +26 | from foo.bar import foobar as foo +27 | from .foo.bar import f as foobar +28 | from ............a import b # [relative-beyond-top-level] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap index 5ab1f223aa..8386fac7b7 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC0414_import_aliasing_2____init__.py.snap @@ -10,10 +10,9 @@ PLC0414 [*] Import alias does not rename original package 3 | from . import foo as foo | help: Remove import alias - -ℹ Unsafe fix -1 |-import collections as collections - 1 |+import collections -2 2 | from collections import OrderedDict as OrderedDict -3 3 | from . import foo as foo -4 4 | from .foo import bar as bar + - import collections as collections +1 + import collections +2 | from collections import OrderedDict as OrderedDict +3 | from . import foo as foo +4 | from .foo import bar as bar +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap index ad3929bb35..9605e4c62a 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC1802_len_as_condition.py.snap @@ -9,13 +9,11 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 2 | pass | help: Remove `len` - -ℹ Safe fix -1 |-if len('TEST'): # [PLC1802] - 1 |+if 'TEST': # [PLC1802] -2 2 | pass -3 3 | -4 4 | if not len('TEST'): # [PLC1802] + - if len('TEST'): # [PLC1802] +1 + if 'TEST': # [PLC1802] +2 | pass +3 | +4 | if not len('TEST'): # [PLC1802] PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:4:8 @@ -27,16 +25,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 5 | pass | help: Remove `len` - -ℹ Safe fix -1 1 | if len('TEST'): # [PLC1802] -2 2 | pass -3 3 | -4 |-if not len('TEST'): # [PLC1802] - 4 |+if not 'TEST': # [PLC1802] -5 5 | pass -6 6 | -7 7 | z = [] +1 | if len('TEST'): # [PLC1802] +2 | pass +3 | + - if not len('TEST'): # [PLC1802] +4 + if not 'TEST': # [PLC1802] +5 | pass +6 | +7 | z = [] PLC1802 [*] `len(['T', 'E', 'S', 'T'])` used as condition without comparison --> len_as_condition.py:8:10 @@ -47,16 +43,14 @@ PLC1802 [*] `len(['T', 'E', 'S', 'T'])` used as condition without comparison 9 | pass | help: Remove `len` - -ℹ Safe fix -5 5 | pass -6 6 | -7 7 | z = [] -8 |-if z and len(['T', 'E', 'S', 'T']): # [PLC1802] - 8 |+if z and ['T', 'E', 'S', 'T']: # [PLC1802] -9 9 | pass -10 10 | -11 11 | if True or len('TEST'): # [PLC1802] +5 | pass +6 | +7 | z = [] + - if z and len(['T', 'E', 'S', 'T']): # [PLC1802] +8 + if z and ['T', 'E', 'S', 'T']: # [PLC1802] +9 | pass +10 | +11 | if True or len('TEST'): # [PLC1802] PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:11:12 @@ -68,16 +62,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 12 | pass | help: Remove `len` - -ℹ Safe fix -8 8 | if z and len(['T', 'E', 'S', 'T']): # [PLC1802] -9 9 | pass -10 10 | -11 |-if True or len('TEST'): # [PLC1802] - 11 |+if True or 'TEST': # [PLC1802] -12 12 | pass -13 13 | -14 14 | if len('TEST') == 0: # Should be fine +8 | if z and len(['T', 'E', 'S', 'T']): # [PLC1802] +9 | pass +10 | + - if True or len('TEST'): # [PLC1802] +11 + if True or 'TEST': # [PLC1802] +12 | pass +13 | +14 | if len('TEST') == 0: # Should be fine PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:53:6 @@ -89,16 +81,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 54 | pass | help: Remove `len` - -ℹ Safe fix -50 50 | -51 51 | if z: -52 52 | pass -53 |-elif len('TEST'): # [PLC1802] - 53 |+elif 'TEST': # [PLC1802] -54 54 | pass -55 55 | -56 56 | if z: +50 | +51 | if z: +52 | pass + - elif len('TEST'): # [PLC1802] +53 + elif 'TEST': # [PLC1802] +54 | pass +55 | +56 | if z: PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:58:10 @@ -110,16 +100,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 59 | pass | help: Remove `len` - -ℹ Safe fix -55 55 | -56 56 | if z: -57 57 | pass -58 |-elif not len('TEST'): # [PLC1802] - 58 |+elif not 'TEST': # [PLC1802] -59 59 | pass -60 60 | -61 61 | while len('TEST'): # [PLC1802] +55 | +56 | if z: +57 | pass + - elif not len('TEST'): # [PLC1802] +58 + elif not 'TEST': # [PLC1802] +59 | pass +60 | +61 | while len('TEST'): # [PLC1802] PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:61:7 @@ -131,16 +119,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 62 | pass | help: Remove `len` - -ℹ Safe fix -58 58 | elif not len('TEST'): # [PLC1802] -59 59 | pass -60 60 | -61 |-while len('TEST'): # [PLC1802] - 61 |+while 'TEST': # [PLC1802] -62 62 | pass -63 63 | -64 64 | while not len('TEST'): # [PLC1802] +58 | elif not len('TEST'): # [PLC1802] +59 | pass +60 | + - while len('TEST'): # [PLC1802] +61 + while 'TEST': # [PLC1802] +62 | pass +63 | +64 | while not len('TEST'): # [PLC1802] PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:64:11 @@ -152,16 +138,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 65 | pass | help: Remove `len` - -ℹ Safe fix -61 61 | while len('TEST'): # [PLC1802] -62 62 | pass -63 63 | -64 |-while not len('TEST'): # [PLC1802] - 64 |+while not 'TEST': # [PLC1802] -65 65 | pass -66 66 | -67 67 | while z and len('TEST'): # [PLC1802] +61 | while len('TEST'): # [PLC1802] +62 | pass +63 | + - while not len('TEST'): # [PLC1802] +64 + while not 'TEST': # [PLC1802] +65 | pass +66 | +67 | while z and len('TEST'): # [PLC1802] PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:67:13 @@ -173,16 +157,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 68 | pass | help: Remove `len` - -ℹ Safe fix -64 64 | while not len('TEST'): # [PLC1802] -65 65 | pass -66 66 | -67 |-while z and len('TEST'): # [PLC1802] - 67 |+while z and 'TEST': # [PLC1802] -68 68 | pass -69 69 | -70 70 | while not len('TEST') and z: # [PLC1802] +64 | while not len('TEST'): # [PLC1802] +65 | pass +66 | + - while z and len('TEST'): # [PLC1802] +67 + while z and 'TEST': # [PLC1802] +68 | pass +69 | +70 | while not len('TEST') and z: # [PLC1802] PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:70:11 @@ -194,16 +176,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 71 | pass | help: Remove `len` - -ℹ Safe fix -67 67 | while z and len('TEST'): # [PLC1802] -68 68 | pass -69 69 | -70 |-while not len('TEST') and z: # [PLC1802] - 70 |+while not 'TEST' and z: # [PLC1802] -71 71 | pass -72 72 | -73 73 | assert len('TEST') > 0 # Should be fine +67 | while z and len('TEST'): # [PLC1802] +68 | pass +69 | + - while not len('TEST') and z: # [PLC1802] +70 + while not 'TEST' and z: # [PLC1802] +71 | pass +72 | +73 | assert len('TEST') > 0 # Should be fine PLC1802 [*] `len(args)` used as condition without comparison --> len_as_condition.py:93:12 @@ -215,16 +195,14 @@ PLC1802 [*] `len(args)` used as condition without comparison 95 | def github_issue_1331_v3(*args): | help: Remove `len` - -ℹ Safe fix -90 90 | assert False, len(args) # Should be fine -91 91 | -92 92 | def github_issue_1331_v2(*args): -93 |- assert len(args), args # [PLC1802] - 93 |+ assert args, args # [PLC1802] -94 94 | -95 95 | def github_issue_1331_v3(*args): -96 96 | assert len(args) or z, args # [PLC1802] +90 | assert False, len(args) # Should be fine +91 | +92 | def github_issue_1331_v2(*args): + - assert len(args), args # [PLC1802] +93 + assert args, args # [PLC1802] +94 | +95 | def github_issue_1331_v3(*args): +96 | assert len(args) or z, args # [PLC1802] PLC1802 [*] `len(args)` used as condition without comparison --> len_as_condition.py:96:12 @@ -236,16 +214,14 @@ PLC1802 [*] `len(args)` used as condition without comparison 98 | def github_issue_1331_v4(*args): | help: Remove `len` - -ℹ Safe fix -93 93 | assert len(args), args # [PLC1802] -94 94 | -95 95 | def github_issue_1331_v3(*args): -96 |- assert len(args) or z, args # [PLC1802] - 96 |+ assert args or z, args # [PLC1802] -97 97 | -98 98 | def github_issue_1331_v4(*args): -99 99 | assert z and len(args), args # [PLC1802] +93 | assert len(args), args # [PLC1802] +94 | +95 | def github_issue_1331_v3(*args): + - assert len(args) or z, args # [PLC1802] +96 + assert args or z, args # [PLC1802] +97 | +98 | def github_issue_1331_v4(*args): +99 | assert z and len(args), args # [PLC1802] PLC1802 [*] `len(args)` used as condition without comparison --> len_as_condition.py:99:18 @@ -257,16 +233,14 @@ PLC1802 [*] `len(args)` used as condition without comparison 101 | def github_issue_1331_v5(**args): | help: Remove `len` - -ℹ Safe fix -96 96 | assert len(args) or z, args # [PLC1802] -97 97 | -98 98 | def github_issue_1331_v4(*args): -99 |- assert z and len(args), args # [PLC1802] - 99 |+ assert z and args, args # [PLC1802] -100 100 | -101 101 | def github_issue_1331_v5(**args): -102 102 | assert z and len(args), args # [PLC1802] +96 | assert len(args) or z, args # [PLC1802] +97 | +98 | def github_issue_1331_v4(*args): + - assert z and len(args), args # [PLC1802] +99 + assert z and args, args # [PLC1802] +100 | +101 | def github_issue_1331_v5(**args): +102 | assert z and len(args), args # [PLC1802] PLC1802 [*] `len(args)` used as condition without comparison --> len_as_condition.py:102:18 @@ -278,16 +252,14 @@ PLC1802 [*] `len(args)` used as condition without comparison 104 | b = bool(len(z)) # [PLC1802] | help: Remove `len` - -ℹ Safe fix -99 99 | assert z and len(args), args # [PLC1802] -100 100 | -101 101 | def github_issue_1331_v5(**args): -102 |- assert z and len(args), args # [PLC1802] - 102 |+ assert z and args, args # [PLC1802] -103 103 | -104 104 | b = bool(len(z)) # [PLC1802] -105 105 | c = bool(len('TEST') or 42) # [PLC1802] +99 | assert z and len(args), args # [PLC1802] +100 | +101 | def github_issue_1331_v5(**args): + - assert z and len(args), args # [PLC1802] +102 + assert z and args, args # [PLC1802] +103 | +104 | b = bool(len(z)) # [PLC1802] +105 | c = bool(len('TEST') or 42) # [PLC1802] PLC1802 [*] `len(z)` used as condition without comparison --> len_as_condition.py:104:10 @@ -299,16 +271,14 @@ PLC1802 [*] `len(z)` used as condition without comparison 105 | c = bool(len('TEST') or 42) # [PLC1802] | help: Remove `len` - -ℹ Safe fix -101 101 | def github_issue_1331_v5(**args): -102 102 | assert z and len(args), args # [PLC1802] -103 103 | -104 |-b = bool(len(z)) # [PLC1802] - 104 |+b = bool(z) # [PLC1802] -105 105 | c = bool(len('TEST') or 42) # [PLC1802] -106 106 | -107 107 | def github_issue_1879(): +101 | def github_issue_1331_v5(**args): +102 | assert z and len(args), args # [PLC1802] +103 | + - b = bool(len(z)) # [PLC1802] +104 + b = bool(z) # [PLC1802] +105 | c = bool(len('TEST') or 42) # [PLC1802] +106 | +107 | def github_issue_1879(): PLC1802 [*] `len('TEST')` used as condition without comparison --> len_as_condition.py:105:10 @@ -320,16 +290,14 @@ PLC1802 [*] `len('TEST')` used as condition without comparison 107 | def github_issue_1879(): | help: Remove `len` - -ℹ Safe fix -102 102 | assert z and len(args), args # [PLC1802] -103 103 | -104 104 | b = bool(len(z)) # [PLC1802] -105 |-c = bool(len('TEST') or 42) # [PLC1802] - 105 |+c = bool('TEST' or 42) # [PLC1802] -106 106 | -107 107 | def github_issue_1879(): -108 108 | +102 | assert z and len(args), args # [PLC1802] +103 | +104 | b = bool(len(z)) # [PLC1802] + - c = bool(len('TEST') or 42) # [PLC1802] +105 + c = bool('TEST' or 42) # [PLC1802] +106 | +107 | def github_issue_1879(): +108 | PLC1802 [*] `len(range(0))` used as condition without comparison --> len_as_condition.py:126:12 @@ -342,16 +310,14 @@ PLC1802 [*] `len(range(0))` used as condition without comparison 128 | # assert len(u + 1 for u in []) generator has no len | help: Remove `len` - -ℹ Safe fix -123 123 | assert len(ChildClassWithBool()) -124 124 | assert len(ClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] -125 125 | assert len(ChildClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] -126 |- assert len(range(0)) # [PLC1802] - 126 |+ assert range(0) # [PLC1802] -127 127 | assert len([t + 1 for t in []]) # [PLC1802] -128 128 | # assert len(u + 1 for u in []) generator has no len -129 129 | assert len({"1":(v + 1) for v in {}}) # [PLC1802] +123 | assert len(ChildClassWithBool()) +124 | assert len(ClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] +125 | assert len(ChildClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] + - assert len(range(0)) # [PLC1802] +126 + assert range(0) # [PLC1802] +127 | assert len([t + 1 for t in []]) # [PLC1802] +128 | # assert len(u + 1 for u in []) generator has no len +129 | assert len({"1":(v + 1) for v in {}}) # [PLC1802] PLC1802 [*] `len([t + 1 for t in []])` used as condition without comparison --> len_as_condition.py:127:12 @@ -364,16 +330,14 @@ PLC1802 [*] `len([t + 1 for t in []])` used as condition without comparison 129 | assert len({"1":(v + 1) for v in {}}) # [PLC1802] | help: Remove `len` - -ℹ Safe fix -124 124 | assert len(ClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] -125 125 | assert len(ChildClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] -126 126 | assert len(range(0)) # [PLC1802] -127 |- assert len([t + 1 for t in []]) # [PLC1802] - 127 |+ assert [t + 1 for t in []] # [PLC1802] -128 128 | # assert len(u + 1 for u in []) generator has no len -129 129 | assert len({"1":(v + 1) for v in {}}) # [PLC1802] -130 130 | assert len(set((w + 1) for w in set())) # [PLC1802] +124 | assert len(ClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] +125 | assert len(ChildClassWithoutBool()) # unintuitive?, in pylint: [PLC1802] +126 | assert len(range(0)) # [PLC1802] + - assert len([t + 1 for t in []]) # [PLC1802] +127 + assert [t + 1 for t in []] # [PLC1802] +128 | # assert len(u + 1 for u in []) generator has no len +129 | assert len({"1":(v + 1) for v in {}}) # [PLC1802] +130 | assert len(set((w + 1) for w in set())) # [PLC1802] PLC1802 [*] `len({"1":(v + 1) for v in {}})` used as condition without comparison --> len_as_condition.py:129:12 @@ -385,16 +349,14 @@ PLC1802 [*] `len({"1":(v + 1) for v in {}})` used as condition without compariso 130 | assert len(set((w + 1) for w in set())) # [PLC1802] | help: Remove `len` - -ℹ Safe fix -126 126 | assert len(range(0)) # [PLC1802] -127 127 | assert len([t + 1 for t in []]) # [PLC1802] -128 128 | # assert len(u + 1 for u in []) generator has no len -129 |- assert len({"1":(v + 1) for v in {}}) # [PLC1802] - 129 |+ assert {"1":(v + 1) for v in {}} # [PLC1802] -130 130 | assert len(set((w + 1) for w in set())) # [PLC1802] -131 131 | -132 132 | +126 | assert len(range(0)) # [PLC1802] +127 | assert len([t + 1 for t in []]) # [PLC1802] +128 | # assert len(u + 1 for u in []) generator has no len + - assert len({"1":(v + 1) for v in {}}) # [PLC1802] +129 + assert {"1":(v + 1) for v in {}} # [PLC1802] +130 | assert len(set((w + 1) for w in set())) # [PLC1802] +131 | +132 | PLC1802 [*] `len(set((w + 1) for w in set()))` used as condition without comparison --> len_as_condition.py:130:12 @@ -405,16 +367,14 @@ PLC1802 [*] `len(set((w + 1) for w in set()))` used as condition without compari | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove `len` - -ℹ Safe fix -127 127 | assert len([t + 1 for t in []]) # [PLC1802] -128 128 | # assert len(u + 1 for u in []) generator has no len -129 129 | assert len({"1":(v + 1) for v in {}}) # [PLC1802] -130 |- assert len(set((w + 1) for w in set())) # [PLC1802] - 130 |+ assert set((w + 1) for w in set()) # [PLC1802] -131 131 | -132 132 | -133 133 | import numpy +127 | assert len([t + 1 for t in []]) # [PLC1802] +128 | # assert len(u + 1 for u in []) generator has no len +129 | assert len({"1":(v + 1) for v in {}}) # [PLC1802] + - assert len(set((w + 1) for w in set())) # [PLC1802] +130 + assert set((w + 1) for w in set()) # [PLC1802] +131 | +132 | +133 | import numpy PLC1802 [*] `len(x)` used as condition without comparison --> len_as_condition.py:193:8 @@ -426,16 +386,14 @@ PLC1802 [*] `len(x)` used as condition without comparison 194 | print(x) | help: Remove `len` - -ℹ Safe fix -190 190 | x = [1,2,3] -191 191 | if cond: -192 192 | x = [4,5,6] -193 |- if len(x): # this should be addressed - 193 |+ if x: # this should be addressed -194 194 | print(x) -195 195 | -196 196 | def g(cond:bool): +190 | x = [1,2,3] +191 | if cond: +192 | x = [4,5,6] + - if len(x): # this should be addressed +193 + if x: # this should be addressed +194 | print(x) +195 | +196 | def g(cond:bool): PLC1802 [*] `len(x)` used as condition without comparison --> len_as_condition.py:200:8 @@ -448,16 +406,14 @@ PLC1802 [*] `len(x)` used as condition without comparison 202 | del x | help: Remove `len` - -ℹ Safe fix -197 197 | x = [1,2,3] -198 198 | if cond: -199 199 | x = [4,5,6] -200 |- if len(x): # this should be addressed - 200 |+ if x: # this should be addressed -201 201 | print(x) -202 202 | del x -203 203 | +197 | x = [1,2,3] +198 | if cond: +199 | x = [4,5,6] + - if len(x): # this should be addressed +200 + if x: # this should be addressed +201 | print(x) +202 | del x +203 | PLC1802 [*] `len(x)` used as condition without comparison --> len_as_condition.py:214:8 @@ -469,16 +425,14 @@ PLC1802 [*] `len(x)` used as condition without comparison 215 | print(x) | help: Remove `len` - -ℹ Safe fix -211 211 | x = [1,2,3] -212 212 | def inner(x:int): -213 213 | return x+1 -214 |- if len(x): # [PLC1802] - 214 |+ if x: # [PLC1802] -215 215 | print(x) -216 216 | -217 217 | def redefined(): +211 | x = [1,2,3] +212 | def inner(x:int): +213 | return x+1 + - if len(x): # [PLC1802] +214 + if x: # [PLC1802] +215 | print(x) +216 | +217 | def redefined(): PLC1802 [*] `len(x)` used as condition without comparison --> len_as_condition.py:220:8 @@ -490,16 +444,14 @@ PLC1802 [*] `len(x)` used as condition without comparison 221 | print(x) | help: Remove `len` - -ℹ Safe fix -217 217 | def redefined(): -218 218 | x = 123 -219 219 | x = [1, 2, 3] -220 |- if len(x): # this should be addressed - 220 |+ if x: # this should be addressed -221 221 | print(x) -222 222 | -223 223 | global_seq = [1, 2, 3] +217 | def redefined(): +218 | x = 123 +219 | x = [1, 2, 3] + - if len(x): # this should be addressed +220 + if x: # this should be addressed +221 | print(x) +222 | +223 | global_seq = [1, 2, 3] PLC1802 [*] `len(x)` used as condition without comparison --> len_as_condition.py:233:8 @@ -511,16 +463,14 @@ PLC1802 [*] `len(x)` used as condition without comparison 234 | print(x) | help: Remove `len` - -ℹ Safe fix -230 230 | def j(): -231 231 | if False: -232 232 | x = [1, 2, 3] -233 |- if len(x): # [PLC1802] should be fine - 233 |+ if x: # [PLC1802] should be fine -234 234 | print(x) -235 235 | -236 236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690 +230 | def j(): +231 | if False: +232 | x = [1, 2, 3] + - if len(x): # [PLC1802] should be fine +233 + if x: # [PLC1802] should be fine +234 | print(x) +235 | +236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690 PLC1802 [*] `len(ascii(1))` used as condition without comparison --> len_as_condition.py:237:6 @@ -531,16 +481,14 @@ PLC1802 [*] `len(ascii(1))` used as condition without comparison 238 | bool(len(sorted(""))) | help: Remove `len` - -ℹ Safe fix -234 234 | print(x) -235 235 | -236 236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690 -237 |-bool(len(ascii(1))) - 237 |+bool(ascii(1)) -238 238 | bool(len(sorted(""))) -239 239 | -240 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811 +234 | print(x) +235 | +236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690 + - bool(len(ascii(1))) +237 + bool(ascii(1)) +238 | bool(len(sorted(""))) +239 | +240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811 PLC1802 [*] `len(sorted(""))` used as condition without comparison --> len_as_condition.py:238:6 @@ -553,16 +501,14 @@ PLC1802 [*] `len(sorted(""))` used as condition without comparison 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811 | help: Remove `len` - -ℹ Safe fix -235 235 | -236 236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690 -237 237 | bool(len(ascii(1))) -238 |-bool(len(sorted(""))) - 238 |+bool(sorted("")) -239 239 | -240 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811 -241 241 | fruits = [] +235 | +236 | # regression tests for https://github.com/astral-sh/ruff/issues/14690 +237 | bool(len(ascii(1))) + - bool(len(sorted(""))) +238 + bool(sorted("")) +239 | +240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811 +241 | fruits = [] PLC1802 [*] `len(fruits)` used as condition without comparison --> len_as_condition.py:242:3 @@ -574,16 +520,14 @@ PLC1802 [*] `len(fruits)` used as condition without comparison 243 | ... | help: Remove `len` - -ℹ Safe fix -239 239 | -240 240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811 -241 241 | fruits = [] -242 |-if(len)(fruits): - 242 |+if fruits: -243 243 | ... -244 244 | -245 245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812 +239 | +240 | # regression tests for https://github.com/astral-sh/ruff/issues/18811 +241 | fruits = [] + - if(len)(fruits): +242 + if fruits: +243 | ... +244 | +245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812 PLC1802 [*] `len(fruits)` used as condition without comparison --> len_as_condition.py:247:4 @@ -598,13 +542,12 @@ PLC1802 [*] `len(fruits)` used as condition without comparison 250 | ... | help: Remove `len` - -ℹ Unsafe fix -244 244 | -245 245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812 -246 246 | fruits = [] -247 |-if len( -248 |- fruits # comment -249 |-): - 247 |+if fruits: -250 248 | ... +244 | +245 | # regression tests for https://github.com/astral-sh/ruff/issues/18812 +246 | fruits = [] + - if len( + - fruits # comment + - ): +247 + if fruits: +248 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap index d91c5b99fc..154bbc9fc2 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLC2801_unnecessary_dunder_call.py.snap @@ -11,16 +11,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 6 | print((3.0).__mul__(4.0)) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -1 1 | from typing import Any -2 2 | -3 3 | a = 2 -4 |-print((3.0).__add__(4.0)) # PLC2801 - 4 |+print(3.0 + 4.0) # PLC2801 -5 5 | print((3.0).__sub__(4.0)) # PLC2801 -6 6 | print((3.0).__mul__(4.0)) # PLC2801 -7 7 | print((3.0).__truediv__(4.0)) # PLC2801 +1 | from typing import Any +2 | +3 | a = 2 + - print((3.0).__add__(4.0)) # PLC2801 +4 + print(3.0 + 4.0) # PLC2801 +5 | print((3.0).__sub__(4.0)) # PLC2801 +6 | print((3.0).__mul__(4.0)) # PLC2801 +7 | print((3.0).__truediv__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:5:7 @@ -33,16 +32,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 7 | print((3.0).__truediv__(4.0)) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -2 2 | -3 3 | a = 2 -4 4 | print((3.0).__add__(4.0)) # PLC2801 -5 |-print((3.0).__sub__(4.0)) # PLC2801 - 5 |+print(3.0 - 4.0) # PLC2801 -6 6 | print((3.0).__mul__(4.0)) # PLC2801 -7 7 | print((3.0).__truediv__(4.0)) # PLC2801 -8 8 | print((3.0).__floordiv__(4.0)) # PLC2801 +2 | +3 | a = 2 +4 | print((3.0).__add__(4.0)) # PLC2801 + - print((3.0).__sub__(4.0)) # PLC2801 +5 + print(3.0 - 4.0) # PLC2801 +6 | print((3.0).__mul__(4.0)) # PLC2801 +7 | print((3.0).__truediv__(4.0)) # PLC2801 +8 | print((3.0).__floordiv__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__mul__`. Use `*` operator. --> unnecessary_dunder_call.py:6:7 @@ -55,16 +53,15 @@ PLC2801 [*] Unnecessary dunder call to `__mul__`. Use `*` operator. 8 | print((3.0).__floordiv__(4.0)) # PLC2801 | help: Use `*` operator - -ℹ Unsafe fix -3 3 | a = 2 -4 4 | print((3.0).__add__(4.0)) # PLC2801 -5 5 | print((3.0).__sub__(4.0)) # PLC2801 -6 |-print((3.0).__mul__(4.0)) # PLC2801 - 6 |+print(3.0 * 4.0) # PLC2801 -7 7 | print((3.0).__truediv__(4.0)) # PLC2801 -8 8 | print((3.0).__floordiv__(4.0)) # PLC2801 -9 9 | print((3.0).__mod__(4.0)) # PLC2801 +3 | a = 2 +4 | print((3.0).__add__(4.0)) # PLC2801 +5 | print((3.0).__sub__(4.0)) # PLC2801 + - print((3.0).__mul__(4.0)) # PLC2801 +6 + print(3.0 * 4.0) # PLC2801 +7 | print((3.0).__truediv__(4.0)) # PLC2801 +8 | print((3.0).__floordiv__(4.0)) # PLC2801 +9 | print((3.0).__mod__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__truediv__`. Use `/` operator. --> unnecessary_dunder_call.py:7:7 @@ -77,16 +74,15 @@ PLC2801 [*] Unnecessary dunder call to `__truediv__`. Use `/` operator. 9 | print((3.0).__mod__(4.0)) # PLC2801 | help: Use `/` operator - -ℹ Unsafe fix -4 4 | print((3.0).__add__(4.0)) # PLC2801 -5 5 | print((3.0).__sub__(4.0)) # PLC2801 -6 6 | print((3.0).__mul__(4.0)) # PLC2801 -7 |-print((3.0).__truediv__(4.0)) # PLC2801 - 7 |+print(3.0 / 4.0) # PLC2801 -8 8 | print((3.0).__floordiv__(4.0)) # PLC2801 -9 9 | print((3.0).__mod__(4.0)) # PLC2801 -10 10 | print((3.0).__eq__(4.0)) # PLC2801 +4 | print((3.0).__add__(4.0)) # PLC2801 +5 | print((3.0).__sub__(4.0)) # PLC2801 +6 | print((3.0).__mul__(4.0)) # PLC2801 + - print((3.0).__truediv__(4.0)) # PLC2801 +7 + print(3.0 / 4.0) # PLC2801 +8 | print((3.0).__floordiv__(4.0)) # PLC2801 +9 | print((3.0).__mod__(4.0)) # PLC2801 +10 | print((3.0).__eq__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__floordiv__`. Use `//` operator. --> unnecessary_dunder_call.py:8:7 @@ -99,16 +95,15 @@ PLC2801 [*] Unnecessary dunder call to `__floordiv__`. Use `//` operator. 10 | print((3.0).__eq__(4.0)) # PLC2801 | help: Use `//` operator - -ℹ Unsafe fix -5 5 | print((3.0).__sub__(4.0)) # PLC2801 -6 6 | print((3.0).__mul__(4.0)) # PLC2801 -7 7 | print((3.0).__truediv__(4.0)) # PLC2801 -8 |-print((3.0).__floordiv__(4.0)) # PLC2801 - 8 |+print(3.0 // 4.0) # PLC2801 -9 9 | print((3.0).__mod__(4.0)) # PLC2801 -10 10 | print((3.0).__eq__(4.0)) # PLC2801 -11 11 | print((3.0).__ne__(4.0)) # PLC2801 +5 | print((3.0).__sub__(4.0)) # PLC2801 +6 | print((3.0).__mul__(4.0)) # PLC2801 +7 | print((3.0).__truediv__(4.0)) # PLC2801 + - print((3.0).__floordiv__(4.0)) # PLC2801 +8 + print(3.0 // 4.0) # PLC2801 +9 | print((3.0).__mod__(4.0)) # PLC2801 +10 | print((3.0).__eq__(4.0)) # PLC2801 +11 | print((3.0).__ne__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__mod__`. Use `%` operator. --> unnecessary_dunder_call.py:9:7 @@ -121,16 +116,15 @@ PLC2801 [*] Unnecessary dunder call to `__mod__`. Use `%` operator. 11 | print((3.0).__ne__(4.0)) # PLC2801 | help: Use `%` operator - -ℹ Unsafe fix -6 6 | print((3.0).__mul__(4.0)) # PLC2801 -7 7 | print((3.0).__truediv__(4.0)) # PLC2801 -8 8 | print((3.0).__floordiv__(4.0)) # PLC2801 -9 |-print((3.0).__mod__(4.0)) # PLC2801 - 9 |+print(3.0 % 4.0) # PLC2801 -10 10 | print((3.0).__eq__(4.0)) # PLC2801 -11 11 | print((3.0).__ne__(4.0)) # PLC2801 -12 12 | print((3.0).__lt__(4.0)) # PLC2801 +6 | print((3.0).__mul__(4.0)) # PLC2801 +7 | print((3.0).__truediv__(4.0)) # PLC2801 +8 | print((3.0).__floordiv__(4.0)) # PLC2801 + - print((3.0).__mod__(4.0)) # PLC2801 +9 + print(3.0 % 4.0) # PLC2801 +10 | print((3.0).__eq__(4.0)) # PLC2801 +11 | print((3.0).__ne__(4.0)) # PLC2801 +12 | print((3.0).__lt__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__eq__`. Use `==` operator. --> unnecessary_dunder_call.py:10:7 @@ -143,16 +137,15 @@ PLC2801 [*] Unnecessary dunder call to `__eq__`. Use `==` operator. 12 | print((3.0).__lt__(4.0)) # PLC2801 | help: Use `==` operator - -ℹ Unsafe fix -7 7 | print((3.0).__truediv__(4.0)) # PLC2801 -8 8 | print((3.0).__floordiv__(4.0)) # PLC2801 -9 9 | print((3.0).__mod__(4.0)) # PLC2801 -10 |-print((3.0).__eq__(4.0)) # PLC2801 - 10 |+print(3.0 == 4.0) # PLC2801 -11 11 | print((3.0).__ne__(4.0)) # PLC2801 -12 12 | print((3.0).__lt__(4.0)) # PLC2801 -13 13 | print((3.0).__le__(4.0)) # PLC2801 +7 | print((3.0).__truediv__(4.0)) # PLC2801 +8 | print((3.0).__floordiv__(4.0)) # PLC2801 +9 | print((3.0).__mod__(4.0)) # PLC2801 + - print((3.0).__eq__(4.0)) # PLC2801 +10 + print(3.0 == 4.0) # PLC2801 +11 | print((3.0).__ne__(4.0)) # PLC2801 +12 | print((3.0).__lt__(4.0)) # PLC2801 +13 | print((3.0).__le__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__ne__`. Use `!=` operator. --> unnecessary_dunder_call.py:11:7 @@ -165,16 +158,15 @@ PLC2801 [*] Unnecessary dunder call to `__ne__`. Use `!=` operator. 13 | print((3.0).__le__(4.0)) # PLC2801 | help: Use `!=` operator - -ℹ Unsafe fix -8 8 | print((3.0).__floordiv__(4.0)) # PLC2801 -9 9 | print((3.0).__mod__(4.0)) # PLC2801 -10 10 | print((3.0).__eq__(4.0)) # PLC2801 -11 |-print((3.0).__ne__(4.0)) # PLC2801 - 11 |+print(3.0 != 4.0) # PLC2801 -12 12 | print((3.0).__lt__(4.0)) # PLC2801 -13 13 | print((3.0).__le__(4.0)) # PLC2801 -14 14 | print((3.0).__gt__(4.0)) # PLC2801 +8 | print((3.0).__floordiv__(4.0)) # PLC2801 +9 | print((3.0).__mod__(4.0)) # PLC2801 +10 | print((3.0).__eq__(4.0)) # PLC2801 + - print((3.0).__ne__(4.0)) # PLC2801 +11 + print(3.0 != 4.0) # PLC2801 +12 | print((3.0).__lt__(4.0)) # PLC2801 +13 | print((3.0).__le__(4.0)) # PLC2801 +14 | print((3.0).__gt__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__lt__`. Use `<` operator. --> unnecessary_dunder_call.py:12:7 @@ -187,16 +179,15 @@ PLC2801 [*] Unnecessary dunder call to `__lt__`. Use `<` operator. 14 | print((3.0).__gt__(4.0)) # PLC2801 | help: Use `<` operator - -ℹ Unsafe fix -9 9 | print((3.0).__mod__(4.0)) # PLC2801 -10 10 | print((3.0).__eq__(4.0)) # PLC2801 -11 11 | print((3.0).__ne__(4.0)) # PLC2801 -12 |-print((3.0).__lt__(4.0)) # PLC2801 - 12 |+print(3.0 < 4.0) # PLC2801 -13 13 | print((3.0).__le__(4.0)) # PLC2801 -14 14 | print((3.0).__gt__(4.0)) # PLC2801 -15 15 | print((3.0).__ge__(4.0)) # PLC2801 +9 | print((3.0).__mod__(4.0)) # PLC2801 +10 | print((3.0).__eq__(4.0)) # PLC2801 +11 | print((3.0).__ne__(4.0)) # PLC2801 + - print((3.0).__lt__(4.0)) # PLC2801 +12 + print(3.0 < 4.0) # PLC2801 +13 | print((3.0).__le__(4.0)) # PLC2801 +14 | print((3.0).__gt__(4.0)) # PLC2801 +15 | print((3.0).__ge__(4.0)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__le__`. Use `<=` operator. --> unnecessary_dunder_call.py:13:7 @@ -209,16 +200,15 @@ PLC2801 [*] Unnecessary dunder call to `__le__`. Use `<=` operator. 15 | print((3.0).__ge__(4.0)) # PLC2801 | help: Use `<=` operator - -ℹ Unsafe fix -10 10 | print((3.0).__eq__(4.0)) # PLC2801 -11 11 | print((3.0).__ne__(4.0)) # PLC2801 -12 12 | print((3.0).__lt__(4.0)) # PLC2801 -13 |-print((3.0).__le__(4.0)) # PLC2801 - 13 |+print(3.0 <= 4.0) # PLC2801 -14 14 | print((3.0).__gt__(4.0)) # PLC2801 -15 15 | print((3.0).__ge__(4.0)) # PLC2801 -16 16 | print((3.0).__str__()) # PLC2801 +10 | print((3.0).__eq__(4.0)) # PLC2801 +11 | print((3.0).__ne__(4.0)) # PLC2801 +12 | print((3.0).__lt__(4.0)) # PLC2801 + - print((3.0).__le__(4.0)) # PLC2801 +13 + print(3.0 <= 4.0) # PLC2801 +14 | print((3.0).__gt__(4.0)) # PLC2801 +15 | print((3.0).__ge__(4.0)) # PLC2801 +16 | print((3.0).__str__()) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__gt__`. Use `>` operator. --> unnecessary_dunder_call.py:14:7 @@ -231,16 +221,15 @@ PLC2801 [*] Unnecessary dunder call to `__gt__`. Use `>` operator. 16 | print((3.0).__str__()) # PLC2801 | help: Use `>` operator - -ℹ Unsafe fix -11 11 | print((3.0).__ne__(4.0)) # PLC2801 -12 12 | print((3.0).__lt__(4.0)) # PLC2801 -13 13 | print((3.0).__le__(4.0)) # PLC2801 -14 |-print((3.0).__gt__(4.0)) # PLC2801 - 14 |+print(3.0 > 4.0) # PLC2801 -15 15 | print((3.0).__ge__(4.0)) # PLC2801 -16 16 | print((3.0).__str__()) # PLC2801 -17 17 | print((3.0).__repr__()) # PLC2801 +11 | print((3.0).__ne__(4.0)) # PLC2801 +12 | print((3.0).__lt__(4.0)) # PLC2801 +13 | print((3.0).__le__(4.0)) # PLC2801 + - print((3.0).__gt__(4.0)) # PLC2801 +14 + print(3.0 > 4.0) # PLC2801 +15 | print((3.0).__ge__(4.0)) # PLC2801 +16 | print((3.0).__str__()) # PLC2801 +17 | print((3.0).__repr__()) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__ge__`. Use `>=` operator. --> unnecessary_dunder_call.py:15:7 @@ -253,16 +242,15 @@ PLC2801 [*] Unnecessary dunder call to `__ge__`. Use `>=` operator. 17 | print((3.0).__repr__()) # PLC2801 | help: Use `>=` operator - -ℹ Unsafe fix -12 12 | print((3.0).__lt__(4.0)) # PLC2801 -13 13 | print((3.0).__le__(4.0)) # PLC2801 -14 14 | print((3.0).__gt__(4.0)) # PLC2801 -15 |-print((3.0).__ge__(4.0)) # PLC2801 - 15 |+print(3.0 >= 4.0) # PLC2801 -16 16 | print((3.0).__str__()) # PLC2801 -17 17 | print((3.0).__repr__()) # PLC2801 -18 18 | print([1, 2, 3].__len__()) # PLC2801 +12 | print((3.0).__lt__(4.0)) # PLC2801 +13 | print((3.0).__le__(4.0)) # PLC2801 +14 | print((3.0).__gt__(4.0)) # PLC2801 + - print((3.0).__ge__(4.0)) # PLC2801 +15 + print(3.0 >= 4.0) # PLC2801 +16 | print((3.0).__str__()) # PLC2801 +17 | print((3.0).__repr__()) # PLC2801 +18 | print([1, 2, 3].__len__()) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin. --> unnecessary_dunder_call.py:16:7 @@ -275,16 +263,15 @@ PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin. 18 | print([1, 2, 3].__len__()) # PLC2801 | help: Use `str()` builtin - -ℹ Unsafe fix -13 13 | print((3.0).__le__(4.0)) # PLC2801 -14 14 | print((3.0).__gt__(4.0)) # PLC2801 -15 15 | print((3.0).__ge__(4.0)) # PLC2801 -16 |-print((3.0).__str__()) # PLC2801 - 16 |+print(str(3.0)) # PLC2801 -17 17 | print((3.0).__repr__()) # PLC2801 -18 18 | print([1, 2, 3].__len__()) # PLC2801 -19 19 | print((1).__neg__()) # PLC2801 +13 | print((3.0).__le__(4.0)) # PLC2801 +14 | print((3.0).__gt__(4.0)) # PLC2801 +15 | print((3.0).__ge__(4.0)) # PLC2801 + - print((3.0).__str__()) # PLC2801 +16 + print(str(3.0)) # PLC2801 +17 | print((3.0).__repr__()) # PLC2801 +18 | print([1, 2, 3].__len__()) # PLC2801 +19 | print((1).__neg__()) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__repr__`. Use `repr()` builtin. --> unnecessary_dunder_call.py:17:7 @@ -297,16 +284,15 @@ PLC2801 [*] Unnecessary dunder call to `__repr__`. Use `repr()` builtin. 19 | print((1).__neg__()) # PLC2801 | help: Use `repr()` builtin - -ℹ Unsafe fix -14 14 | print((3.0).__gt__(4.0)) # PLC2801 -15 15 | print((3.0).__ge__(4.0)) # PLC2801 -16 16 | print((3.0).__str__()) # PLC2801 -17 |-print((3.0).__repr__()) # PLC2801 - 17 |+print(repr(3.0)) # PLC2801 -18 18 | print([1, 2, 3].__len__()) # PLC2801 -19 19 | print((1).__neg__()) # PLC2801 -20 20 | print(-a.__sub__(1)) # PLC2801 +14 | print((3.0).__gt__(4.0)) # PLC2801 +15 | print((3.0).__ge__(4.0)) # PLC2801 +16 | print((3.0).__str__()) # PLC2801 + - print((3.0).__repr__()) # PLC2801 +17 + print(repr(3.0)) # PLC2801 +18 | print([1, 2, 3].__len__()) # PLC2801 +19 | print((1).__neg__()) # PLC2801 +20 | print(-a.__sub__(1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__len__`. Use `len()` builtin. --> unnecessary_dunder_call.py:18:7 @@ -319,16 +305,15 @@ PLC2801 [*] Unnecessary dunder call to `__len__`. Use `len()` builtin. 20 | print(-a.__sub__(1)) # PLC2801 | help: Use `len()` builtin - -ℹ Unsafe fix -15 15 | print((3.0).__ge__(4.0)) # PLC2801 -16 16 | print((3.0).__str__()) # PLC2801 -17 17 | print((3.0).__repr__()) # PLC2801 -18 |-print([1, 2, 3].__len__()) # PLC2801 - 18 |+print(len([1, 2, 3])) # PLC2801 -19 19 | print((1).__neg__()) # PLC2801 -20 20 | print(-a.__sub__(1)) # PLC2801 -21 21 | print(-(a).__sub__(1)) # PLC2801 +15 | print((3.0).__ge__(4.0)) # PLC2801 +16 | print((3.0).__str__()) # PLC2801 +17 | print((3.0).__repr__()) # PLC2801 + - print([1, 2, 3].__len__()) # PLC2801 +18 + print(len([1, 2, 3])) # PLC2801 +19 | print((1).__neg__()) # PLC2801 +20 | print(-a.__sub__(1)) # PLC2801 +21 | print(-(a).__sub__(1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 Unnecessary dunder call to `__neg__`. Multiply by -1 instead. --> unnecessary_dunder_call.py:19:7 @@ -353,16 +338,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 22 | print(-(-a.__sub__(1))) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -17 17 | print((3.0).__repr__()) # PLC2801 -18 18 | print([1, 2, 3].__len__()) # PLC2801 -19 19 | print((1).__neg__()) # PLC2801 -20 |-print(-a.__sub__(1)) # PLC2801 - 20 |+print(-(a - 1)) # PLC2801 -21 21 | print(-(a).__sub__(1)) # PLC2801 -22 22 | print(-(-a.__sub__(1))) # PLC2801 -23 23 | print((5 - a).__sub__(1)) # PLC2801 +17 | print((3.0).__repr__()) # PLC2801 +18 | print([1, 2, 3].__len__()) # PLC2801 +19 | print((1).__neg__()) # PLC2801 + - print(-a.__sub__(1)) # PLC2801 +20 + print(-(a - 1)) # PLC2801 +21 | print(-(a).__sub__(1)) # PLC2801 +22 | print(-(-a.__sub__(1))) # PLC2801 +23 | print((5 - a).__sub__(1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:21:8 @@ -375,16 +359,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 23 | print((5 - a).__sub__(1)) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -18 18 | print([1, 2, 3].__len__()) # PLC2801 -19 19 | print((1).__neg__()) # PLC2801 -20 20 | print(-a.__sub__(1)) # PLC2801 -21 |-print(-(a).__sub__(1)) # PLC2801 - 21 |+print(-(a - 1)) # PLC2801 -22 22 | print(-(-a.__sub__(1))) # PLC2801 -23 23 | print((5 - a).__sub__(1)) # PLC2801 -24 24 | print(-(5 - a).__sub__(1)) # PLC2801 +18 | print([1, 2, 3].__len__()) # PLC2801 +19 | print((1).__neg__()) # PLC2801 +20 | print(-a.__sub__(1)) # PLC2801 + - print(-(a).__sub__(1)) # PLC2801 +21 + print(-(a - 1)) # PLC2801 +22 | print(-(-a.__sub__(1))) # PLC2801 +23 | print((5 - a).__sub__(1)) # PLC2801 +24 | print(-(5 - a).__sub__(1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:22:10 @@ -397,16 +380,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 24 | print(-(5 - a).__sub__(1)) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -19 19 | print((1).__neg__()) # PLC2801 -20 20 | print(-a.__sub__(1)) # PLC2801 -21 21 | print(-(a).__sub__(1)) # PLC2801 -22 |-print(-(-a.__sub__(1))) # PLC2801 - 22 |+print(-(-(a - 1))) # PLC2801 -23 23 | print((5 - a).__sub__(1)) # PLC2801 -24 24 | print(-(5 - a).__sub__(1)) # PLC2801 -25 25 | print(-(-5 - a).__sub__(1)) # PLC2801 +19 | print((1).__neg__()) # PLC2801 +20 | print(-a.__sub__(1)) # PLC2801 +21 | print(-(a).__sub__(1)) # PLC2801 + - print(-(-a.__sub__(1))) # PLC2801 +22 + print(-(-(a - 1))) # PLC2801 +23 | print((5 - a).__sub__(1)) # PLC2801 +24 | print(-(5 - a).__sub__(1)) # PLC2801 +25 | print(-(-5 - a).__sub__(1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:23:7 @@ -419,16 +401,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 25 | print(-(-5 - a).__sub__(1)) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -20 20 | print(-a.__sub__(1)) # PLC2801 -21 21 | print(-(a).__sub__(1)) # PLC2801 -22 22 | print(-(-a.__sub__(1))) # PLC2801 -23 |-print((5 - a).__sub__(1)) # PLC2801 - 23 |+print(5 - a - 1) # PLC2801 -24 24 | print(-(5 - a).__sub__(1)) # PLC2801 -25 25 | print(-(-5 - a).__sub__(1)) # PLC2801 -26 26 | print(+-+-+-a.__sub__(1)) # PLC2801 +20 | print(-a.__sub__(1)) # PLC2801 +21 | print(-(a).__sub__(1)) # PLC2801 +22 | print(-(-a.__sub__(1))) # PLC2801 + - print((5 - a).__sub__(1)) # PLC2801 +23 + print(5 - a - 1) # PLC2801 +24 | print(-(5 - a).__sub__(1)) # PLC2801 +25 | print(-(-5 - a).__sub__(1)) # PLC2801 +26 | print(+-+-+-a.__sub__(1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:24:8 @@ -441,16 +422,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 26 | print(+-+-+-a.__sub__(1)) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -21 21 | print(-(a).__sub__(1)) # PLC2801 -22 22 | print(-(-a.__sub__(1))) # PLC2801 -23 23 | print((5 - a).__sub__(1)) # PLC2801 -24 |-print(-(5 - a).__sub__(1)) # PLC2801 - 24 |+print(-(5 - a - 1)) # PLC2801 -25 25 | print(-(-5 - a).__sub__(1)) # PLC2801 -26 26 | print(+-+-+-a.__sub__(1)) # PLC2801 -27 27 | print(a.__rsub__(2 - 1)) # PLC2801 +21 | print(-(a).__sub__(1)) # PLC2801 +22 | print(-(-a.__sub__(1))) # PLC2801 +23 | print((5 - a).__sub__(1)) # PLC2801 + - print(-(5 - a).__sub__(1)) # PLC2801 +24 + print(-(5 - a - 1)) # PLC2801 +25 | print(-(-5 - a).__sub__(1)) # PLC2801 +26 | print(+-+-+-a.__sub__(1)) # PLC2801 +27 | print(a.__rsub__(2 - 1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:25:8 @@ -463,16 +443,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 27 | print(a.__rsub__(2 - 1)) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -22 22 | print(-(-a.__sub__(1))) # PLC2801 -23 23 | print((5 - a).__sub__(1)) # PLC2801 -24 24 | print(-(5 - a).__sub__(1)) # PLC2801 -25 |-print(-(-5 - a).__sub__(1)) # PLC2801 - 25 |+print(-(-5 - a - 1)) # PLC2801 -26 26 | print(+-+-+-a.__sub__(1)) # PLC2801 -27 27 | print(a.__rsub__(2 - 1)) # PLC2801 -28 28 | print(a.__sub__(((((1)))))) # PLC2801 +22 | print(-(-a.__sub__(1))) # PLC2801 +23 | print((5 - a).__sub__(1)) # PLC2801 +24 | print(-(5 - a).__sub__(1)) # PLC2801 + - print(-(-5 - a).__sub__(1)) # PLC2801 +25 + print(-(-5 - a - 1)) # PLC2801 +26 | print(+-+-+-a.__sub__(1)) # PLC2801 +27 | print(a.__rsub__(2 - 1)) # PLC2801 +28 | print(a.__sub__(((((1)))))) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:26:13 @@ -485,16 +464,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 28 | print(a.__sub__(((((1)))))) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -23 23 | print((5 - a).__sub__(1)) # PLC2801 -24 24 | print(-(5 - a).__sub__(1)) # PLC2801 -25 25 | print(-(-5 - a).__sub__(1)) # PLC2801 -26 |-print(+-+-+-a.__sub__(1)) # PLC2801 - 26 |+print(+-+-+-(a - 1)) # PLC2801 -27 27 | print(a.__rsub__(2 - 1)) # PLC2801 -28 28 | print(a.__sub__(((((1)))))) # PLC2801 -29 29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 +23 | print((5 - a).__sub__(1)) # PLC2801 +24 | print(-(5 - a).__sub__(1)) # PLC2801 +25 | print(-(-5 - a).__sub__(1)) # PLC2801 + - print(+-+-+-a.__sub__(1)) # PLC2801 +26 + print(+-+-+-(a - 1)) # PLC2801 +27 | print(a.__rsub__(2 - 1)) # PLC2801 +28 | print(a.__sub__(((((1)))))) # PLC2801 +29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator. --> unnecessary_dunder_call.py:27:7 @@ -507,16 +485,15 @@ PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator. 29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -24 24 | print(-(5 - a).__sub__(1)) # PLC2801 -25 25 | print(-(-5 - a).__sub__(1)) # PLC2801 -26 26 | print(+-+-+-a.__sub__(1)) # PLC2801 -27 |-print(a.__rsub__(2 - 1)) # PLC2801 - 27 |+print((2 - 1) - a) # PLC2801 -28 28 | print(a.__sub__(((((1)))))) # PLC2801 -29 29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 -30 30 | print(a.__sub__( +24 | print(-(5 - a).__sub__(1)) # PLC2801 +25 | print(-(-5 - a).__sub__(1)) # PLC2801 +26 | print(+-+-+-a.__sub__(1)) # PLC2801 + - print(a.__rsub__(2 - 1)) # PLC2801 +27 + print((2 - 1) - a) # PLC2801 +28 | print(a.__sub__(((((1)))))) # PLC2801 +29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 +30 | print(a.__sub__( +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:28:7 @@ -529,16 +506,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 30 | print(a.__sub__( | help: Use `-` operator - -ℹ Unsafe fix -25 25 | print(-(-5 - a).__sub__(1)) # PLC2801 -26 26 | print(+-+-+-a.__sub__(1)) # PLC2801 -27 27 | print(a.__rsub__(2 - 1)) # PLC2801 -28 |-print(a.__sub__(((((1)))))) # PLC2801 - 28 |+print(a - 1) # PLC2801 -29 29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 -30 30 | print(a.__sub__( -31 31 | 3 +25 | print(-(-5 - a).__sub__(1)) # PLC2801 +26 | print(+-+-+-a.__sub__(1)) # PLC2801 +27 | print(a.__rsub__(2 - 1)) # PLC2801 + - print(a.__sub__(((((1)))))) # PLC2801 +28 + print(a - 1) # PLC2801 +29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 +30 | print(a.__sub__( +31 | 3 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:29:7 @@ -551,16 +527,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 31 | 3 | help: Use `-` operator - -ℹ Unsafe fix -26 26 | print(+-+-+-a.__sub__(1)) # PLC2801 -27 27 | print(a.__rsub__(2 - 1)) # PLC2801 -28 28 | print(a.__sub__(((((1)))))) # PLC2801 -29 |-print(a.__sub__(((((2 - 1)))))) # PLC2801 - 29 |+print(a - (2 - 1)) # PLC2801 -30 30 | print(a.__sub__( -31 31 | 3 -32 32 | + +26 | print(+-+-+-a.__sub__(1)) # PLC2801 +27 | print(a.__rsub__(2 - 1)) # PLC2801 +28 | print(a.__sub__(((((1)))))) # PLC2801 + - print(a.__sub__(((((2 - 1)))))) # PLC2801 +29 + print(a - (2 - 1)) # PLC2801 +30 | print(a.__sub__( +31 | 3 +32 | + +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:30:7 @@ -578,21 +553,20 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 36 | 3 | help: Use `-` operator - -ℹ Unsafe fix -27 27 | print(a.__rsub__(2 - 1)) # PLC2801 -28 28 | print(a.__sub__(((((1)))))) # PLC2801 -29 29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 -30 |-print(a.__sub__( -31 |- 3 - 30 |+print(a - (3 -32 31 | + -33 |- 4 -34 |-)) - 32 |+ 4)) -35 33 | print(a.__rsub__( -36 34 | 3 -37 35 | + +27 | print(a.__rsub__(2 - 1)) # PLC2801 +28 | print(a.__sub__(((((1)))))) # PLC2801 +29 | print(a.__sub__(((((2 - 1)))))) # PLC2801 + - print(a.__sub__( + - 3 +30 + print(a - (3 +31 | + + - 4 + - )) +32 + 4)) +33 | print(a.__rsub__( +34 | 3 +35 | + +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator. --> unnecessary_dunder_call.py:35:7 @@ -610,21 +584,20 @@ PLC2801 [*] Unnecessary dunder call to `__rsub__`. Use `-` operator. 41 | x = 2 * a.__add__(3) # PLC2801 | help: Use `-` operator - -ℹ Unsafe fix -32 32 | + -33 33 | 4 -34 34 | )) -35 |-print(a.__rsub__( -36 |- 3 - 35 |+print((3 -37 36 | + -38 |- 4 -39 |-)) - 37 |+ 4) - a) -40 38 | print(2 * a.__add__(3)) # PLC2801 -41 39 | x = 2 * a.__add__(3) # PLC2801 -42 40 | x = 2 * -a.__add__(3) # PLC2801 +32 | + +33 | 4 +34 | )) + - print(a.__rsub__( + - 3 +35 + print((3 +36 | + + - 4 + - )) +37 + 4) - a) +38 | print(2 * a.__add__(3)) # PLC2801 +39 | x = 2 * a.__add__(3) # PLC2801 +40 | x = 2 * -a.__add__(3) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:40:11 @@ -637,16 +610,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 42 | x = 2 * -a.__add__(3) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -37 37 | + -38 38 | 4 -39 39 | )) -40 |-print(2 * a.__add__(3)) # PLC2801 - 40 |+print(2 * (a + 3)) # PLC2801 -41 41 | x = 2 * a.__add__(3) # PLC2801 -42 42 | x = 2 * -a.__add__(3) # PLC2801 -43 43 | x = a.__add__(3) # PLC2801 +37 | + +38 | 4 +39 | )) + - print(2 * a.__add__(3)) # PLC2801 +40 + print(2 * (a + 3)) # PLC2801 +41 | x = 2 * a.__add__(3) # PLC2801 +42 | x = 2 * -a.__add__(3) # PLC2801 +43 | x = a.__add__(3) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:41:9 @@ -659,16 +631,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 43 | x = a.__add__(3) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -38 38 | 4 -39 39 | )) -40 40 | print(2 * a.__add__(3)) # PLC2801 -41 |-x = 2 * a.__add__(3) # PLC2801 - 41 |+x = 2 * (a + 3) # PLC2801 -42 42 | x = 2 * -a.__add__(3) # PLC2801 -43 43 | x = a.__add__(3) # PLC2801 -44 44 | x = -a.__add__(3) # PLC2801 +38 | 4 +39 | )) +40 | print(2 * a.__add__(3)) # PLC2801 + - x = 2 * a.__add__(3) # PLC2801 +41 + x = 2 * (a + 3) # PLC2801 +42 | x = 2 * -a.__add__(3) # PLC2801 +43 | x = a.__add__(3) # PLC2801 +44 | x = -a.__add__(3) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:42:10 @@ -681,16 +652,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 44 | x = -a.__add__(3) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -39 39 | )) -40 40 | print(2 * a.__add__(3)) # PLC2801 -41 41 | x = 2 * a.__add__(3) # PLC2801 -42 |-x = 2 * -a.__add__(3) # PLC2801 - 42 |+x = 2 * -(a + 3) # PLC2801 -43 43 | x = a.__add__(3) # PLC2801 -44 44 | x = -a.__add__(3) # PLC2801 -45 45 | x = (-a).__add__(3) # PLC2801 +39 | )) +40 | print(2 * a.__add__(3)) # PLC2801 +41 | x = 2 * a.__add__(3) # PLC2801 + - x = 2 * -a.__add__(3) # PLC2801 +42 + x = 2 * -(a + 3) # PLC2801 +43 | x = a.__add__(3) # PLC2801 +44 | x = -a.__add__(3) # PLC2801 +45 | x = (-a).__add__(3) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:43:5 @@ -703,16 +673,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 45 | x = (-a).__add__(3) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -40 40 | print(2 * a.__add__(3)) # PLC2801 -41 41 | x = 2 * a.__add__(3) # PLC2801 -42 42 | x = 2 * -a.__add__(3) # PLC2801 -43 |-x = a.__add__(3) # PLC2801 - 43 |+x = a + 3 # PLC2801 -44 44 | x = -a.__add__(3) # PLC2801 -45 45 | x = (-a).__add__(3) # PLC2801 -46 46 | x = -(-a).__add__(3) # PLC2801 +40 | print(2 * a.__add__(3)) # PLC2801 +41 | x = 2 * a.__add__(3) # PLC2801 +42 | x = 2 * -a.__add__(3) # PLC2801 + - x = a.__add__(3) # PLC2801 +43 + x = a + 3 # PLC2801 +44 | x = -a.__add__(3) # PLC2801 +45 | x = (-a).__add__(3) # PLC2801 +46 | x = -(-a).__add__(3) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:44:6 @@ -725,16 +694,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 46 | x = -(-a).__add__(3) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -41 41 | x = 2 * a.__add__(3) # PLC2801 -42 42 | x = 2 * -a.__add__(3) # PLC2801 -43 43 | x = a.__add__(3) # PLC2801 -44 |-x = -a.__add__(3) # PLC2801 - 44 |+x = -(a + 3) # PLC2801 -45 45 | x = (-a).__add__(3) # PLC2801 -46 46 | x = -(-a).__add__(3) # PLC2801 -47 47 | +41 | x = 2 * a.__add__(3) # PLC2801 +42 | x = 2 * -a.__add__(3) # PLC2801 +43 | x = a.__add__(3) # PLC2801 + - x = -a.__add__(3) # PLC2801 +44 + x = -(a + 3) # PLC2801 +45 | x = (-a).__add__(3) # PLC2801 +46 | x = -(-a).__add__(3) # PLC2801 +47 | +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:45:5 @@ -746,16 +714,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 46 | x = -(-a).__add__(3) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -42 42 | x = 2 * -a.__add__(3) # PLC2801 -43 43 | x = a.__add__(3) # PLC2801 -44 44 | x = -a.__add__(3) # PLC2801 -45 |-x = (-a).__add__(3) # PLC2801 - 45 |+x = -a + 3 # PLC2801 -46 46 | x = -(-a).__add__(3) # PLC2801 -47 47 | -48 48 | # Calls +42 | x = 2 * -a.__add__(3) # PLC2801 +43 | x = a.__add__(3) # PLC2801 +44 | x = -a.__add__(3) # PLC2801 + - x = (-a).__add__(3) # PLC2801 +45 + x = -a + 3 # PLC2801 +46 | x = -(-a).__add__(3) # PLC2801 +47 | +48 | # Calls +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:46:6 @@ -768,16 +735,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 48 | # Calls | help: Use `+` operator - -ℹ Unsafe fix -43 43 | x = a.__add__(3) # PLC2801 -44 44 | x = -a.__add__(3) # PLC2801 -45 45 | x = (-a).__add__(3) # PLC2801 -46 |-x = -(-a).__add__(3) # PLC2801 - 46 |+x = -(-a + 3) # PLC2801 -47 47 | -48 48 | # Calls -49 49 | print(a.__call__()) # PLC2801 (no fix, intentional) +43 | x = a.__add__(3) # PLC2801 +44 | x = -a.__add__(3) # PLC2801 +45 | x = (-a).__add__(3) # PLC2801 + - x = -(-a).__add__(3) # PLC2801 +46 + x = -(-a + 3) # PLC2801 +47 | +48 | # Calls +49 | print(a.__call__()) # PLC2801 (no fix, intentional) +note: This is an unsafe fix and may change runtime behavior PLC2801 Unnecessary dunder call to `__call__` --> unnecessary_dunder_call.py:49:7 @@ -797,16 +763,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. | ^^^^^^^^^^^^^^ | help: Use `+` operator - -ℹ Unsafe fix -60 60 | return self.v -61 61 | -62 62 | foo = Foo(1) -63 |-foo.__add__(2).get_v() # PLC2801 - 63 |+(foo + 2).get_v() # PLC2801 -64 64 | -65 65 | -66 66 | # Lambda expressions +60 | return self.v +61 | +62 | foo = Foo(1) + - foo.__add__(2).get_v() # PLC2801 +63 + (foo + 2).get_v() # PLC2801 +64 | +65 | +66 | # Lambda expressions +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:67:16 @@ -818,16 +783,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 69 | # If expressions | help: Use `+` operator - -ℹ Unsafe fix -64 64 | -65 65 | -66 66 | # Lambda expressions -67 |-blah = lambda: a.__add__(1) # PLC2801 - 67 |+blah = lambda: a + 1 # PLC2801 -68 68 | -69 69 | # If expressions -70 70 | print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 +64 | +65 | +66 | # Lambda expressions + - blah = lambda: a.__add__(1) # PLC2801 +67 + blah = lambda: a + 1 # PLC2801 +68 | +69 | # If expressions +70 | print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:70:7 @@ -839,16 +803,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 72 | # Dict/Set/List/Tuple | help: Use `+` operator - -ℹ Unsafe fix -67 67 | blah = lambda: a.__add__(1) # PLC2801 -68 68 | -69 69 | # If expressions -70 |-print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 - 70 |+print(a + 1 if a > 0 else a.__sub__(1)) # PLC2801 -71 71 | -72 72 | # Dict/Set/List/Tuple -73 73 | print({"a": a.__add__(1)}) # PLC2801 +67 | blah = lambda: a.__add__(1) # PLC2801 +68 | +69 | # If expressions + - print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 +70 + print(a + 1 if a > 0 else a.__sub__(1)) # PLC2801 +71 | +72 | # Dict/Set/List/Tuple +73 | print({"a": a.__add__(1)}) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:70:34 @@ -860,16 +823,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 72 | # Dict/Set/List/Tuple | help: Use `-` operator - -ℹ Unsafe fix -67 67 | blah = lambda: a.__add__(1) # PLC2801 -68 68 | -69 69 | # If expressions -70 |-print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 - 70 |+print(a.__add__(1) if a > 0 else a - 1) # PLC2801 -71 71 | -72 72 | # Dict/Set/List/Tuple -73 73 | print({"a": a.__add__(1)}) # PLC2801 +67 | blah = lambda: a.__add__(1) # PLC2801 +68 | +69 | # If expressions + - print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 +70 + print(a.__add__(1) if a > 0 else a - 1) # PLC2801 +71 | +72 | # Dict/Set/List/Tuple +73 | print({"a": a.__add__(1)}) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:73:13 @@ -881,16 +843,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 75 | print([a.__add__(1)]) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -70 70 | print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 -71 71 | -72 72 | # Dict/Set/List/Tuple -73 |-print({"a": a.__add__(1)}) # PLC2801 - 73 |+print({"a": (a + 1)}) # PLC2801 -74 74 | print({a.__add__(1)}) # PLC2801 -75 75 | print([a.__add__(1)]) # PLC2801 -76 76 | print((a.__add__(1),)) # PLC2801 +70 | print(a.__add__(1) if a > 0 else a.__sub__(1)) # PLC2801 +71 | +72 | # Dict/Set/List/Tuple + - print({"a": a.__add__(1)}) # PLC2801 +73 + print({"a": (a + 1)}) # PLC2801 +74 | print({a.__add__(1)}) # PLC2801 +75 | print([a.__add__(1)]) # PLC2801 +76 | print((a.__add__(1),)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:74:8 @@ -903,16 +864,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 76 | print((a.__add__(1),)) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -71 71 | -72 72 | # Dict/Set/List/Tuple -73 73 | print({"a": a.__add__(1)}) # PLC2801 -74 |-print({a.__add__(1)}) # PLC2801 - 74 |+print({(a + 1)}) # PLC2801 -75 75 | print([a.__add__(1)]) # PLC2801 -76 76 | print((a.__add__(1),)) # PLC2801 -77 77 | +71 | +72 | # Dict/Set/List/Tuple +73 | print({"a": a.__add__(1)}) # PLC2801 + - print({a.__add__(1)}) # PLC2801 +74 + print({(a + 1)}) # PLC2801 +75 | print([a.__add__(1)]) # PLC2801 +76 | print((a.__add__(1),)) # PLC2801 +77 | +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:75:8 @@ -924,16 +884,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 76 | print((a.__add__(1),)) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -72 72 | # Dict/Set/List/Tuple -73 73 | print({"a": a.__add__(1)}) # PLC2801 -74 74 | print({a.__add__(1)}) # PLC2801 -75 |-print([a.__add__(1)]) # PLC2801 - 75 |+print([(a + 1)]) # PLC2801 -76 76 | print((a.__add__(1),)) # PLC2801 -77 77 | -78 78 | # Comprehension variants +72 | # Dict/Set/List/Tuple +73 | print({"a": a.__add__(1)}) # PLC2801 +74 | print({a.__add__(1)}) # PLC2801 + - print([a.__add__(1)]) # PLC2801 +75 + print([(a + 1)]) # PLC2801 +76 | print((a.__add__(1),)) # PLC2801 +77 | +78 | # Comprehension variants +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:76:8 @@ -946,16 +905,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 78 | # Comprehension variants | help: Use `+` operator - -ℹ Unsafe fix -73 73 | print({"a": a.__add__(1)}) # PLC2801 -74 74 | print({a.__add__(1)}) # PLC2801 -75 75 | print([a.__add__(1)]) # PLC2801 -76 |-print((a.__add__(1),)) # PLC2801 - 76 |+print(((a + 1),)) # PLC2801 -77 77 | -78 78 | # Comprehension variants -79 79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 +73 | print({"a": a.__add__(1)}) # PLC2801 +74 | print({a.__add__(1)}) # PLC2801 +75 | print([a.__add__(1)]) # PLC2801 + - print((a.__add__(1),)) # PLC2801 +76 + print(((a + 1),)) # PLC2801 +77 | +78 | # Comprehension variants +79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:79:11 @@ -967,16 +925,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 81 | print([i.__add__(1) for i in range(5)]) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -76 76 | print((a.__add__(1),)) # PLC2801 -77 77 | -78 78 | # Comprehension variants -79 |-print({i: i.__add__(1) for i in range(5)}) # PLC2801 - 79 |+print({i: (i + 1) for i in range(5)}) # PLC2801 -80 80 | print({i.__add__(1) for i in range(5)}) # PLC2801 -81 81 | print([i.__add__(1) for i in range(5)]) # PLC2801 -82 82 | print((i.__add__(1) for i in range(5))) # PLC2801 +76 | print((a.__add__(1),)) # PLC2801 +77 | +78 | # Comprehension variants + - print({i: i.__add__(1) for i in range(5)}) # PLC2801 +79 + print({i: (i + 1) for i in range(5)}) # PLC2801 +80 | print({i.__add__(1) for i in range(5)}) # PLC2801 +81 | print([i.__add__(1) for i in range(5)]) # PLC2801 +82 | print((i.__add__(1) for i in range(5))) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:80:8 @@ -989,16 +946,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 82 | print((i.__add__(1) for i in range(5))) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -77 77 | -78 78 | # Comprehension variants -79 79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 -80 |-print({i.__add__(1) for i in range(5)}) # PLC2801 - 80 |+print({(i + 1) for i in range(5)}) # PLC2801 -81 81 | print([i.__add__(1) for i in range(5)]) # PLC2801 -82 82 | print((i.__add__(1) for i in range(5))) # PLC2801 -83 83 | +77 | +78 | # Comprehension variants +79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 + - print({i.__add__(1) for i in range(5)}) # PLC2801 +80 + print({(i + 1) for i in range(5)}) # PLC2801 +81 | print([i.__add__(1) for i in range(5)]) # PLC2801 +82 | print((i.__add__(1) for i in range(5))) # PLC2801 +83 | +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:81:8 @@ -1010,16 +966,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 82 | print((i.__add__(1) for i in range(5))) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -78 78 | # Comprehension variants -79 79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 -80 80 | print({i.__add__(1) for i in range(5)}) # PLC2801 -81 |-print([i.__add__(1) for i in range(5)]) # PLC2801 - 81 |+print([(i + 1) for i in range(5)]) # PLC2801 -82 82 | print((i.__add__(1) for i in range(5))) # PLC2801 -83 83 | -84 84 | # Generators +78 | # Comprehension variants +79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 +80 | print({i.__add__(1) for i in range(5)}) # PLC2801 + - print([i.__add__(1) for i in range(5)]) # PLC2801 +81 + print([(i + 1) for i in range(5)]) # PLC2801 +82 | print((i.__add__(1) for i in range(5))) # PLC2801 +83 | +84 | # Generators +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:82:8 @@ -1032,16 +987,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 84 | # Generators | help: Use `+` operator - -ℹ Unsafe fix -79 79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 -80 80 | print({i.__add__(1) for i in range(5)}) # PLC2801 -81 81 | print([i.__add__(1) for i in range(5)]) # PLC2801 -82 |-print((i.__add__(1) for i in range(5))) # PLC2801 - 82 |+print(((i + 1) for i in range(5))) # PLC2801 -83 83 | -84 84 | # Generators -85 85 | gen = (i.__add__(1) for i in range(5)) # PLC2801 +79 | print({i: i.__add__(1) for i in range(5)}) # PLC2801 +80 | print({i.__add__(1) for i in range(5)}) # PLC2801 +81 | print([i.__add__(1) for i in range(5)]) # PLC2801 + - print((i.__add__(1) for i in range(5))) # PLC2801 +82 + print(((i + 1) for i in range(5))) # PLC2801 +83 | +84 | # Generators +85 | gen = (i.__add__(1) for i in range(5)) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:85:8 @@ -1052,16 +1006,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 86 | print(next(gen)) | help: Use `+` operator - -ℹ Unsafe fix -82 82 | print((i.__add__(1) for i in range(5))) # PLC2801 -83 83 | -84 84 | # Generators -85 |-gen = (i.__add__(1) for i in range(5)) # PLC2801 - 85 |+gen = ((i + 1) for i in range(5)) # PLC2801 -86 86 | print(next(gen)) -87 87 | -88 88 | # Subscripts +82 | print((i.__add__(1) for i in range(5))) # PLC2801 +83 | +84 | # Generators + - gen = (i.__add__(1) for i in range(5)) # PLC2801 +85 + gen = ((i + 1) for i in range(5)) # PLC2801 +86 | print(next(gen)) +87 | +88 | # Subscripts +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:89:13 @@ -1073,16 +1026,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 91 | print("x".__add__("y")[0]) # PLC2801 | help: Use `+` operator - -ℹ Unsafe fix -86 86 | print(next(gen)) -87 87 | -88 88 | # Subscripts -89 |-print({"a": a.__add__(1)}["a"]) # PLC2801 - 89 |+print({"a": (a + 1)}["a"]) # PLC2801 -90 90 | # https://github.com/astral-sh/ruff/issues/15745 -91 91 | print("x".__add__("y")[0]) # PLC2801 -92 92 | +86 | print(next(gen)) +87 | +88 | # Subscripts + - print({"a": a.__add__(1)}["a"]) # PLC2801 +89 + print({"a": (a + 1)}["a"]) # PLC2801 +90 | # https://github.com/astral-sh/ruff/issues/15745 +91 | print("x".__add__("y")[0]) # PLC2801 +92 | +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:91:7 @@ -1095,16 +1047,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 93 | # Starred | help: Use `+` operator - -ℹ Unsafe fix -88 88 | # Subscripts -89 89 | print({"a": a.__add__(1)}["a"]) # PLC2801 -90 90 | # https://github.com/astral-sh/ruff/issues/15745 -91 |-print("x".__add__("y")[0]) # PLC2801 - 91 |+print(("x" + "y")[0]) # PLC2801 -92 92 | -93 93 | # Starred -94 94 | print(*[a.__add__(1)]) # PLC2801 +88 | # Subscripts +89 | print({"a": a.__add__(1)}["a"]) # PLC2801 +90 | # https://github.com/astral-sh/ruff/issues/15745 + - print("x".__add__("y")[0]) # PLC2801 +91 + print(("x" + "y")[0]) # PLC2801 +92 | +93 | # Starred +94 | print(*[a.__add__(1)]) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:94:9 @@ -1116,16 +1067,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 96 | list1 = [1, 2, 3] | help: Use `+` operator - -ℹ Unsafe fix -91 91 | print("x".__add__("y")[0]) # PLC2801 -92 92 | -93 93 | # Starred -94 |-print(*[a.__add__(1)]) # PLC2801 - 94 |+print(*[(a + 1)]) # PLC2801 -95 95 | -96 96 | list1 = [1, 2, 3] -97 97 | list2 = [4, 5, 6] +91 | print("x".__add__("y")[0]) # PLC2801 +92 | +93 | # Starred + - print(*[a.__add__(1)]) # PLC2801 +94 + print(*[(a + 1)]) # PLC2801 +95 | +96 | list1 = [1, 2, 3] +97 | list2 = [4, 5, 6] +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:98:9 @@ -1138,16 +1088,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 100 | # Slices | help: Use `+` operator - -ℹ Unsafe fix -95 95 | -96 96 | list1 = [1, 2, 3] -97 97 | list2 = [4, 5, 6] -98 |-print([*list1.__add__(list2)]) # PLC2801 - 98 |+print([*list1 + list2]) # PLC2801 -99 99 | -100 100 | # Slices -101 101 | print([a.__add__(1), a.__sub__(1)][0:1]) # PLC2801 +95 | +96 | list1 = [1, 2, 3] +97 | list2 = [4, 5, 6] + - print([*list1.__add__(list2)]) # PLC2801 +98 + print([*list1 + list2]) # PLC2801 +99 | +100 | # Slices +101 | print([a.__add__(1), a.__sub__(1)][0:1]) # PLC2801 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:101:8 @@ -1159,16 +1108,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 103 | # Attribute access | help: Use `+` operator - -ℹ Unsafe fix -98 98 | print([*list1.__add__(list2)]) # PLC2801 -99 99 | -100 100 | # Slices -101 |-print([a.__add__(1), a.__sub__(1)][0:1]) # PLC2801 - 101 |+print([(a + 1), a.__sub__(1)][0:1]) # PLC2801 -102 102 | -103 103 | # Attribute access -104 104 | # https://github.com/astral-sh/ruff/issues/15745 +98 | print([*list1.__add__(list2)]) # PLC2801 +99 | +100 | # Slices + - print([a.__add__(1), a.__sub__(1)][0:1]) # PLC2801 +101 + print([(a + 1), a.__sub__(1)][0:1]) # PLC2801 +102 | +103 | # Attribute access +104 | # https://github.com/astral-sh/ruff/issues/15745 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. --> unnecessary_dunder_call.py:101:22 @@ -1180,16 +1128,15 @@ PLC2801 [*] Unnecessary dunder call to `__sub__`. Use `-` operator. 103 | # Attribute access | help: Use `-` operator - -ℹ Unsafe fix -98 98 | print([*list1.__add__(list2)]) # PLC2801 -99 99 | -100 100 | # Slices -101 |-print([a.__add__(1), a.__sub__(1)][0:1]) # PLC2801 - 101 |+print([a.__add__(1), (a - 1)][0:1]) # PLC2801 -102 102 | -103 103 | # Attribute access -104 104 | # https://github.com/astral-sh/ruff/issues/15745 +98 | print([*list1.__add__(list2)]) # PLC2801 +99 | +100 | # Slices + - print([a.__add__(1), a.__sub__(1)][0:1]) # PLC2801 +101 + print([a.__add__(1), (a - 1)][0:1]) # PLC2801 +102 | +103 | # Attribute access +104 | # https://github.com/astral-sh/ruff/issues/15745 +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. --> unnecessary_dunder_call.py:105:7 @@ -1202,16 +1149,15 @@ PLC2801 [*] Unnecessary dunder call to `__add__`. Use `+` operator. 107 | class Thing: | help: Use `+` operator - -ℹ Unsafe fix -102 102 | -103 103 | # Attribute access -104 104 | # https://github.com/astral-sh/ruff/issues/15745 -105 |-print(1j.__add__(1.0).real) # PLC2801 - 105 |+print((1j + 1.0).real) # PLC2801 -106 106 | -107 107 | class Thing: -108 108 | def __init__(self, stuff: Any) -> None: +102 | +103 | # Attribute access +104 | # https://github.com/astral-sh/ruff/issues/15745 + - print(1j.__add__(1.0).real) # PLC2801 +105 + print((1j + 1.0).real) # PLC2801 +106 | +107 | class Thing: +108 | def __init__(self, stuff: Any) -> None: +note: This is an unsafe fix and may change runtime behavior PLC2801 Unnecessary dunder call to `__getattribute__`. Access attribute directly or use getattr built-in function. --> unnecessary_dunder_call.py:116:16 @@ -1235,16 +1181,15 @@ PLC2801 [*] Unnecessary dunder call to `__contains__`. Use `in` operator. 130 | # https://github.com/astral-sh/ruff/issues/14597 | help: Use `in` operator - -ℹ Unsafe fix -125 125 | -126 126 | blah = dict[{"a": 1}.__delitem__("a")] # OK -127 127 | -128 |-"abc".__contains__("a") - 128 |+"a" in "abc" -129 129 | -130 130 | # https://github.com/astral-sh/ruff/issues/14597 -131 131 | assert "abc".__str__() == "abc" +125 | +126 | blah = dict[{"a": 1}.__delitem__("a")] # OK +127 | + - "abc".__contains__("a") +128 + "a" in "abc" +129 | +130 | # https://github.com/astral-sh/ruff/issues/14597 +131 | assert "abc".__str__() == "abc" +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin. --> unnecessary_dunder_call.py:131:8 @@ -1256,16 +1201,15 @@ PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin. 133 | # https://github.com/astral-sh/ruff/issues/18813 | help: Use `str()` builtin - -ℹ Unsafe fix -128 128 | "abc".__contains__("a") -129 129 | -130 130 | # https://github.com/astral-sh/ruff/issues/14597 -131 |-assert "abc".__str__() == "abc" - 131 |+assert str("abc") == "abc" -132 132 | -133 133 | # https://github.com/astral-sh/ruff/issues/18813 -134 134 | three = 1 if 1 else(3.0).__str__() +128 | "abc".__contains__("a") +129 | +130 | # https://github.com/astral-sh/ruff/issues/14597 + - assert "abc".__str__() == "abc" +131 + assert str("abc") == "abc" +132 | +133 | # https://github.com/astral-sh/ruff/issues/18813 +134 | three = 1 if 1 else(3.0).__str__() +note: This is an unsafe fix and may change runtime behavior PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin. --> unnecessary_dunder_call.py:134:20 @@ -1275,10 +1219,9 @@ PLC2801 [*] Unnecessary dunder call to `__str__`. Use `str()` builtin. | ^^^^^^^^^^^^^^^ | help: Use `str()` builtin - -ℹ Unsafe fix -131 131 | assert "abc".__str__() == "abc" -132 132 | -133 133 | # https://github.com/astral-sh/ruff/issues/18813 -134 |-three = 1 if 1 else(3.0).__str__() - 134 |+three = 1 if 1 else str(3.0) +131 | assert "abc".__str__() == "abc" +132 | +133 | # https://github.com/astral-sh/ruff/issues/18813 + - three = 1 if 1 else(3.0).__str__() +134 + three = 1 if 1 else str(3.0) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap index 5961b78d8e..c130605693 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE0241_duplicate_bases.py.snap @@ -10,16 +10,14 @@ PLE0241 [*] Duplicate base `A` for class `F1` 14 | ... | help: Remove duplicate base - -ℹ Safe fix -10 10 | -11 11 | -12 12 | # Duplicate base class is last. -13 |-class F1(A, A): - 13 |+class F1(A): -14 14 | ... -15 15 | -16 16 | +10 | +11 | +12 | # Duplicate base class is last. + - class F1(A, A): +13 + class F1(A): +14 | ... +15 | +16 | PLE0241 [*] Duplicate base `A` for class `F2` --> duplicate_bases.py:17:13 @@ -29,16 +27,14 @@ PLE0241 [*] Duplicate base `A` for class `F2` 18 | ... | help: Remove duplicate base - -ℹ Safe fix -14 14 | ... -15 15 | -16 16 | -17 |-class F2(A, A,): - 17 |+class F2(A,): -18 18 | ... -19 19 | -20 20 | +14 | ... +15 | +16 | + - class F2(A, A,): +17 + class F2(A,): +18 | ... +19 | +20 | PLE0241 [*] Duplicate base `A` for class `F3` --> duplicate_bases.py:23:5 @@ -51,15 +47,13 @@ PLE0241 [*] Duplicate base `A` for class `F3` 25 | ... | help: Remove duplicate base - -ℹ Safe fix -19 19 | -20 20 | -21 21 | class F3( -22 |- A, -23 22 | A -24 23 | ): -25 24 | ... +19 | +20 | +21 | class F3( + - A, +22 | A +23 | ): +24 | ... PLE0241 [*] Duplicate base `A` for class `F4` --> duplicate_bases.py:30:5 @@ -72,15 +66,13 @@ PLE0241 [*] Duplicate base `A` for class `F4` 32 | ... | help: Remove duplicate base - -ℹ Safe fix -27 27 | -28 28 | class F4( -29 29 | A, -30 |- A, -31 30 | ): -32 31 | ... -33 32 | +27 | +28 | class F4( +29 | A, + - A, +30 | ): +31 | ... +32 | PLE0241 [*] Duplicate base `A` for class `G1` --> duplicate_bases.py:36:13 @@ -91,16 +83,14 @@ PLE0241 [*] Duplicate base `A` for class `G1` 37 | ... | help: Remove duplicate base - -ℹ Safe fix -33 33 | -34 34 | -35 35 | # Duplicate base class is not last. -36 |-class G1(A, A, B): - 36 |+class G1(A, B): -37 37 | ... -38 38 | -39 39 | +33 | +34 | +35 | # Duplicate base class is not last. + - class G1(A, A, B): +36 + class G1(A, B): +37 | ... +38 | +39 | PLE0241 [*] Duplicate base `A` for class `G2` --> duplicate_bases.py:40:13 @@ -110,16 +100,14 @@ PLE0241 [*] Duplicate base `A` for class `G2` 41 | ... | help: Remove duplicate base - -ℹ Safe fix -37 37 | ... -38 38 | -39 39 | -40 |-class G2(A, A, B,): - 40 |+class G2(A, B,): -41 41 | ... -42 42 | -43 43 | +37 | ... +38 | +39 | + - class G2(A, A, B,): +40 + class G2(A, B,): +41 | ... +42 | +43 | PLE0241 [*] Duplicate base `A` for class `G3` --> duplicate_bases.py:46:5 @@ -132,15 +120,13 @@ PLE0241 [*] Duplicate base `A` for class `G3` 48 | ): | help: Remove duplicate base - -ℹ Safe fix -43 43 | -44 44 | class G3( -45 45 | A, -46 |- A, -47 46 | B -48 47 | ): -49 48 | ... +43 | +44 | class G3( +45 | A, + - A, +46 | B +47 | ): +48 | ... PLE0241 [*] Duplicate base `A` for class `G4` --> duplicate_bases.py:54:5 @@ -153,15 +139,13 @@ PLE0241 [*] Duplicate base `A` for class `G4` 56 | ): | help: Remove duplicate base - -ℹ Safe fix -51 51 | -52 52 | class G4( -53 53 | A, -54 |- A, -55 54 | B, -56 55 | ): -57 56 | ... +51 | +52 | class G4( +53 | A, + - A, +54 | B, +55 | ): +56 | ... PLE0241 [*] Duplicate base `Foo` for class `Bar` --> duplicate_bases.py:76:5 @@ -174,13 +158,12 @@ PLE0241 [*] Duplicate base `Foo` for class `Bar` 78 | pass | help: Remove duplicate base - -ℹ Unsafe fix -72 72 | ... -73 73 | -74 74 | # https://github.com/astral-sh/ruff/issues/18814 -75 |-class Bar(Foo, # 1 -76 |- Foo # 2 - 75 |+class Bar(Foo # 2 -77 76 | ): -78 77 | pass +72 | ... +73 | +74 | # https://github.com/astral-sh/ruff/issues/18814 + - class Bar(Foo, # 1 + - Foo # 2 +75 + class Bar(Foo # 2 +76 | ): +77 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap index e50e12a1fa..eb244c5aae 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1141_dict_iter_missing_items.py.snap @@ -10,16 +10,15 @@ PLE1141 [*] Unpacking a dictionary in iteration without calling `.items()` 14 | pass | help: Add a call to `.items()` - -ℹ Unsafe fix -10 10 | s2 = {1, 2, 3} -11 11 | -12 12 | # Errors -13 |-for k, v in d: - 13 |+for k, v in d.items(): -14 14 | pass -15 15 | -16 16 | for k, v in d_tuple_incorrect_tuple: +10 | s2 = {1, 2, 3} +11 | +12 | # Errors + - for k, v in d: +13 + for k, v in d.items(): +14 | pass +15 | +16 | for k, v in d_tuple_incorrect_tuple: +note: This is an unsafe fix and may change runtime behavior PLE1141 [*] Unpacking a dictionary in iteration without calling `.items()` --> dict_iter_missing_items.py:16:13 @@ -31,13 +30,12 @@ PLE1141 [*] Unpacking a dictionary in iteration without calling `.items()` 17 | pass | help: Add a call to `.items()` - -ℹ Unsafe fix -13 13 | for k, v in d: -14 14 | pass -15 15 | -16 |-for k, v in d_tuple_incorrect_tuple: - 16 |+for k, v in d_tuple_incorrect_tuple.items(): -17 17 | pass -18 18 | -19 19 | +13 | for k, v in d: +14 | pass +15 | + - for k, v in d_tuple_incorrect_tuple: +16 + for k, v in d_tuple_incorrect_tuple.items(): +17 | pass +18 | +19 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap index 3b95a4d1db..5a21e4714f 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1519_singledispatch_method.py.snap @@ -11,16 +11,15 @@ PLE1519 [*] `@singledispatch` decorator should not be used on methods 12 | def convert_position(cls, position): | help: Replace with `@singledispatchmethod` - -ℹ Unsafe fix -7 7 | -8 8 | -9 9 | class Board: -10 |- @singledispatch # [singledispatch-method] - 10 |+ @singledispatchmethod # [singledispatch-method] -11 11 | @classmethod -12 12 | def convert_position(cls, position): -13 13 | pass +7 | +8 | +9 | class Board: + - @singledispatch # [singledispatch-method] +10 + @singledispatchmethod # [singledispatch-method] +11 | @classmethod +12 | def convert_position(cls, position): +13 | pass +note: This is an unsafe fix and may change runtime behavior PLE1519 [*] `@singledispatch` decorator should not be used on methods --> singledispatch_method.py:15:5 @@ -33,16 +32,15 @@ PLE1519 [*] `@singledispatch` decorator should not be used on methods 17 | pass | help: Replace with `@singledispatchmethod` - -ℹ Unsafe fix -12 12 | def convert_position(cls, position): -13 13 | pass -14 14 | -15 |- @singledispatch # [singledispatch-method] - 15 |+ @singledispatchmethod # [singledispatch-method] -16 16 | def move(self, position): -17 17 | pass -18 18 | +12 | def convert_position(cls, position): +13 | pass +14 | + - @singledispatch # [singledispatch-method] +15 + @singledispatchmethod # [singledispatch-method] +16 | def move(self, position): +17 | pass +18 | +note: This is an unsafe fix and may change runtime behavior PLE1519 [*] `@singledispatch` decorator should not be used on methods --> singledispatch_method.py:23:5 @@ -55,13 +53,12 @@ PLE1519 [*] `@singledispatch` decorator should not be used on methods 25 | def do(position): | help: Replace with `@singledispatchmethod` - -ℹ Unsafe fix -20 20 | def place(self, position): -21 21 | pass -22 22 | -23 |- @singledispatch # [singledispatch-method] - 23 |+ @singledispatchmethod # [singledispatch-method] -24 24 | @staticmethod -25 25 | def do(position): -26 26 | pass +20 | def place(self, position): +21 | pass +22 | + - @singledispatch # [singledispatch-method] +23 + @singledispatchmethod # [singledispatch-method] +24 | @staticmethod +25 | def do(position): +26 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap index 07d807862a..cc3aae795f 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE1520_singledispatchmethod_function.py.snap @@ -10,14 +10,13 @@ PLE1520 [*] `@singledispatchmethod` decorator should not be used on non-method f 6 | pass | help: Replace with `@singledispatch` - -ℹ Unsafe fix -1 |-from functools import singledispatchmethod - 1 |+from functools import singledispatchmethod, singledispatch -2 2 | -3 3 | -4 |-@singledispatchmethod # [singledispatchmethod-function] - 4 |+@singledispatch # [singledispatchmethod-function] -5 5 | def convert_position(position): -6 6 | pass -7 7 | + - from functools import singledispatchmethod +1 + from functools import singledispatchmethod, singledispatch +2 | +3 | + - @singledispatchmethod # [singledispatchmethod-function] +4 + @singledispatch # [singledispatchmethod-function] +5 | def convert_position(position): +6 | pass +7 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2510_invalid_characters.py.snap index f2bd3e976d087c3c8d7fbba733eb2708f640e92c..ec84ce68869e6eec904311ba13294a6439685664 100644 GIT binary patch delta 270 zcmaDNw_bLGKjY*CMu*9Z8Qmtn<19;(oy*WvK^wx2NdofB6l%b{ zG^ngOkk2*QhUw?z1&p2(-zk_t^unagpqkUv!Mee!4J|-s#OG&&?1%x0Z~no&jB)aM z*5t{XSoJ5bWHDw_-~u^g@ zU2bt!u)8PU=TT?1FaX**nU7a delta 513 zcmZ{gF-yZh6vwIQm2x!^k-DWkPzY^^_M+EI2fD{-#}Ti~4~9v2em=%8x~le-&_)0K+aPb-}+wKRaD!4%@}9-)Aufr|)mdG2%8 zxBGwPXb2_rg94rr}Bfg}PM) z6#Azy=npQFi_<<=O~8`lGGglhYfg4m*?~!n&BzRB2G`_Gj6WwXl5kT1DXc+O2-J&YTpHXwQ@D8$F_3{kYapiS zFiUK9XI{oQ`5#O2m4t*3fv3-wL}w=_R-&nB6%CpIMurj{9CaW!PA)pS znK1bW{1p!3ZsO|ZZHuO0d^yQW@5edk-oD$^r}nfUWR&--XQ-OiK3I*e!pcCfq2Ag# zJ%$a))M~Aa!Wdvth^N^Kr4+UbbnHU=Y}cu9u0%$m5GCv!nnJAq77MX8AUNeZ;I;5I zHzDLvUi?xz%`i^MxL?TfD{)ftioI~HTQ*rW}e197xd_?#{?*#(ZE)CR!NRe@d_>nHt|ND#=e{!Jjzw6FuqY;2Lid(4ItRC z1f6!L)i^n5D|!X+LtT_yAvD8T$tb!1DxARcNE8p%f^0A#*ns!KHpbPL^aTCCthlZg XN6bw%CmHm9a@bUpcsU!D97^RId+MeA diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2513_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2513_invalid_characters.py.snap index b29aada7e1f2d5f1ed1f02c84d1652e78efbc2f8..a04dfd8296389aa8e1e5c5777f451b43c0461a59 100644 GIT binary patch delta 409 zcmcbkc3WkG9^+(tMu~|_#n}|N6ciM6Cms})Fg8%oR!A*QRp#Q(>4iIfqGx z&DcnxMuBVd4MtAJiHoEd6(;VHWz?PcLCnn95Uwi?MVmSoM31pCP$$r=`21{;$siNe zxiBZx8i3Y+lcRCZrku!aht!D&iLO0~6#k0#7c0BUf|Y~&MVHMazrb&gMR z@>9VuRtvCU3z_34ujIeM3f4P$C9fW%?&SBpn#@3JfwcT&SwY^(QhZuSs`m<>oV3X{Erd6{as0DK2~3`uBgSQ$H%t}X^aRN^O3pFg<{5M+@H z^-HDq9eV(hxwpfN^N}xFlm6s6uDQ14>Q@tE9Tp-IQZK)=Db-hMcF|&P7V1CLb7kml z@7w|I;H{d$q-NudTI%Cj*$n3`2RI#_(I_E}>1Z)u`*TX_{eJpotYJl0&0iY9g!ADdIAx}^ST=S4wn_uG0ixEPyi$~522V(c3(3>q5Q5bQ52jKj15 diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2514_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2514_invalid_characters.py.snap index 84e551149af9e04b4a7e61b2e12a08b563c76a31..bb9e09f4e6ef397ce1425d38d03d7204820cbc56 100644 GIT binary patch delta 127 zcmey%yODPTFXLo6MoH}&1ukPVg&Kvt(i{a_1$A|GE(HYzT`-pc#4|Qm&<68j3?}n2 pDNUZq_-NvMSz}`hxSljDnk?a(K$0c~K*d~>-!X}8W@rA!3;^nHACCY4 delta 285 zcmdnU`GmK3YY81GP%@lyBMj@{>N5NJ> zU0t2a*jxb!YIH#&3?Km@4=7fn4HAek04uRjFt&heN&^d7Di~Wrg}}N@3>1I}Xv0LS zn8{Ze8|u+qfz4i!HDH&3O#oVf#THDr0j))H8{A$KLj@oLn-`y-t-uBJ9nke$CPoUI JcQE~A1^^7iMrZ&4 diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2515_invalid_characters.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLE2515_invalid_characters.py.snap index ab4bd9aaacb5c1f9efaf86658e2abb76681bd720..735cbf023b6f3e6ef206430a7f13156154c28b5d 100644 GIT binary patch delta 422 zcmca=v(##X4Wp2Wp+b#9UTIEzezt+KC zK(bY-MfowMMg|5+lY5zz*-XrUdbuX|vPw+8#+)-bk7@SAjS`Fs6Hm%B>Q4M4!D?a( z)H}I`S(X{1OnUPH<~@u+_0p3ASfpTYgj8z^W`ZWK|QtjWeb`3k%4*U*<+>cc0W6oeTr zJ9!_6K2+akM#pO+LJArWjT?}lHOd%ydT3Xur<lLN>FiUAD-3G89zpL~$Zc=AWC1ZGoXg~=0y5;yN;dxc@F zg#yS(PPmbi4cLuX!M+C?qsM9r3@VU;YLk69xseTHH8oK%HJR)nTDZA`tDjK{&F7X1 zC? modified_iterating_set.py:8:1 @@ -34,16 +33,15 @@ PLE4703 [*] Iterated set `animals` is modified within the `for` loop 11 | fruits = {"apple", "orange", "grape"} | help: Iterate over a copy of `animals` - -ℹ Unsafe fix -5 5 | nums.add(num + 1) -6 6 | -7 7 | animals = {"dog", "cat", "cow"} -8 |-for animal in animals: - 8 |+for animal in animals.copy(): -9 9 | animals.pop("cow") -10 10 | -11 11 | fruits = {"apple", "orange", "grape"} +5 | nums.add(num + 1) +6 | +7 | animals = {"dog", "cat", "cow"} + - for animal in animals: +8 + for animal in animals.copy(): +9 | animals.pop("cow") +10 | +11 | fruits = {"apple", "orange", "grape"} +note: This is an unsafe fix and may change runtime behavior PLE4703 [*] Iterated set `fruits` is modified within the `for` loop --> modified_iterating_set.py:12:1 @@ -56,16 +54,15 @@ PLE4703 [*] Iterated set `fruits` is modified within the `for` loop 15 | planets = {"mercury", "venus", "earth"} | help: Iterate over a copy of `fruits` - -ℹ Unsafe fix -9 9 | animals.pop("cow") -10 10 | -11 11 | fruits = {"apple", "orange", "grape"} -12 |-for fruit in fruits: - 12 |+for fruit in fruits.copy(): -13 13 | fruits.clear() -14 14 | -15 15 | planets = {"mercury", "venus", "earth"} +9 | animals.pop("cow") +10 | +11 | fruits = {"apple", "orange", "grape"} + - for fruit in fruits: +12 + for fruit in fruits.copy(): +13 | fruits.clear() +14 | +15 | planets = {"mercury", "venus", "earth"} +note: This is an unsafe fix and may change runtime behavior PLE4703 [*] Iterated set `planets` is modified within the `for` loop --> modified_iterating_set.py:16:1 @@ -78,16 +75,15 @@ PLE4703 [*] Iterated set `planets` is modified within the `for` loop 19 | colors = {"red", "green", "blue"} | help: Iterate over a copy of `planets` - -ℹ Unsafe fix -13 13 | fruits.clear() -14 14 | -15 15 | planets = {"mercury", "venus", "earth"} -16 |-for planet in planets: - 16 |+for planet in planets.copy(): -17 17 | planets.discard("mercury") -18 18 | -19 19 | colors = {"red", "green", "blue"} +13 | fruits.clear() +14 | +15 | planets = {"mercury", "venus", "earth"} + - for planet in planets: +16 + for planet in planets.copy(): +17 | planets.discard("mercury") +18 | +19 | colors = {"red", "green", "blue"} +note: This is an unsafe fix and may change runtime behavior PLE4703 [*] Iterated set `colors` is modified within the `for` loop --> modified_iterating_set.py:20:1 @@ -100,16 +96,15 @@ PLE4703 [*] Iterated set `colors` is modified within the `for` loop 23 | odds = {1, 3, 5} | help: Iterate over a copy of `colors` - -ℹ Unsafe fix -17 17 | planets.discard("mercury") -18 18 | -19 19 | colors = {"red", "green", "blue"} -20 |-for color in colors: - 20 |+for color in colors.copy(): -21 21 | colors.remove("red") -22 22 | -23 23 | odds = {1, 3, 5} +17 | planets.discard("mercury") +18 | +19 | colors = {"red", "green", "blue"} + - for color in colors: +20 + for color in colors.copy(): +21 | colors.remove("red") +22 | +23 | odds = {1, 3, 5} +note: This is an unsafe fix and may change runtime behavior PLE4703 [*] Iterated set `odds` is modified within the `for` loop --> modified_iterating_set.py:24:1 @@ -123,13 +118,12 @@ PLE4703 [*] Iterated set `odds` is modified within the `for` loop 28 | # OK | help: Iterate over a copy of `odds` - -ℹ Unsafe fix -21 21 | colors.remove("red") -22 22 | -23 23 | odds = {1, 3, 5} -24 |-for num in odds: - 24 |+for num in odds.copy(): -25 25 | if num > 1: -26 26 | odds.add(num + 1) -27 27 | +21 | colors.remove("red") +22 | +23 | odds = {1, 3, 5} + - for num in odds: +24 + for num in odds.copy(): +25 | if num > 1: +26 | odds.add(num + 1) +27 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap index 785b6a2f91..cc429e4c9e 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0202_no_method_decorator.py.snap @@ -12,20 +12,18 @@ PLR0202 [*] Class method defined without decorator 11 | cls.COLORS = args | help: Add @classmethod decorator - -ℹ Safe fix -6 6 | def __init__(self, color): -7 7 | self.color = color -8 8 | - 9 |+ @classmethod -9 10 | def pick_colors(cls, *args): # [no-classmethod-decorator] -10 11 | """classmethod to pick fruit colors""" -11 12 | cls.COLORS = args -12 13 | -13 |- pick_colors = classmethod(pick_colors) -14 14 | -15 15 | def pick_one_color(): # [no-staticmethod-decorator] -16 16 | """staticmethod to pick one fruit color""" +6 | def __init__(self, color): +7 | self.color = color +8 | +9 + @classmethod +10 | def pick_colors(cls, *args): # [no-classmethod-decorator] +11 | """classmethod to pick fruit colors""" +12 | cls.COLORS = args +13 | + - pick_colors = classmethod(pick_colors) +14 | +15 | def pick_one_color(): # [no-staticmethod-decorator] +16 | """staticmethod to pick one fruit color""" PLR0202 [*] Class method defined without decorator --> no_method_decorator.py:22:5 @@ -36,17 +34,15 @@ PLR0202 [*] Class method defined without decorator 23 | pass | help: Add @classmethod decorator - -ℹ Safe fix -19 19 | pick_one_color = staticmethod(pick_one_color) -20 20 | -21 21 | class Class: - 22 |+ @classmethod -22 23 | def class_method(cls): -23 24 | pass -24 25 | -25 |- class_method = classmethod(class_method);another_statement - 26 |+ another_statement -26 27 | -27 28 | def static_method(): -28 29 | pass +19 | pick_one_color = staticmethod(pick_one_color) +20 | +21 | class Class: +22 + @classmethod +23 | def class_method(cls): +24 | pass +25 | + - class_method = classmethod(class_method);another_statement +26 + another_statement +27 | +28 | def static_method(): +29 | pass diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap index 7634dbb586..513e451d32 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0203_no_method_decorator.py.snap @@ -12,20 +12,18 @@ PLR0203 [*] Static method defined without decorator 17 | return choice(Fruit.COLORS) | help: Add @staticmethod decorator - -ℹ Safe fix -12 12 | -13 13 | pick_colors = classmethod(pick_colors) -14 14 | - 15 |+ @staticmethod -15 16 | def pick_one_color(): # [no-staticmethod-decorator] -16 17 | """staticmethod to pick one fruit color""" -17 18 | return choice(Fruit.COLORS) -18 19 | -19 |- pick_one_color = staticmethod(pick_one_color) -20 20 | -21 21 | class Class: -22 22 | def class_method(cls): +12 | +13 | pick_colors = classmethod(pick_colors) +14 | +15 + @staticmethod +16 | def pick_one_color(): # [no-staticmethod-decorator] +17 | """staticmethod to pick one fruit color""" +18 | return choice(Fruit.COLORS) +19 | + - pick_one_color = staticmethod(pick_one_color) +20 | +21 | class Class: +22 | def class_method(cls): PLR0203 [*] Static method defined without decorator --> no_method_decorator.py:27:5 @@ -37,14 +35,12 @@ PLR0203 [*] Static method defined without decorator 28 | pass | help: Add @staticmethod decorator - -ℹ Safe fix -24 24 | -25 25 | class_method = classmethod(class_method);another_statement -26 26 | - 27 |+ @staticmethod -27 28 | def static_method(): -28 29 | pass -29 30 | -30 |- static_method = staticmethod(static_method); - 31 |+ +24 | +25 | class_method = classmethod(class_method);another_statement +26 | +27 + @staticmethod +28 | def static_method(): +29 | pass +30 | + - static_method = staticmethod(static_method); +31 + diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap index d204598a9d..0359c54f4d 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR0402_import_aliasing.py.snap @@ -12,16 +12,14 @@ PLR0402 [*] Use `from os import path` in lieu of alias 11 | import foo.bar.foobar as foobar # [consider-using-from-import] | help: Replace with `from os import path` - -ℹ Safe fix -6 6 | import collections as collections # [useless-import-alias] -7 7 | from collections import OrderedDict as OrderedDict # [useless-import-alias] -8 8 | from collections import OrderedDict as o_dict -9 |-import os.path as path # [consider-using-from-import] - 9 |+from os import path # [consider-using-from-import] -10 10 | import os.path as p -11 11 | import foo.bar.foobar as foobar # [consider-using-from-import] -12 12 | import foo.bar.foobar as foobar, sys # [consider-using-from-import] +6 | import collections as collections # [useless-import-alias] +7 | from collections import OrderedDict as OrderedDict # [useless-import-alias] +8 | from collections import OrderedDict as o_dict + - import os.path as path # [consider-using-from-import] +9 + from os import path # [consider-using-from-import] +10 | import os.path as p +11 | import foo.bar.foobar as foobar # [consider-using-from-import] +12 | import foo.bar.foobar as foobar, sys # [consider-using-from-import] PLR0402 [*] Use `from foo.bar import foobar` in lieu of alias --> import_aliasing.py:11:8 @@ -34,16 +32,14 @@ PLR0402 [*] Use `from foo.bar import foobar` in lieu of alias 13 | import os | help: Replace with `from foo.bar import foobar` - -ℹ Safe fix -8 8 | from collections import OrderedDict as o_dict -9 9 | import os.path as path # [consider-using-from-import] -10 10 | import os.path as p -11 |-import foo.bar.foobar as foobar # [consider-using-from-import] - 11 |+from foo.bar import foobar # [consider-using-from-import] -12 12 | import foo.bar.foobar as foobar, sys # [consider-using-from-import] -13 13 | import os -14 14 | import os as OS +8 | from collections import OrderedDict as o_dict +9 | import os.path as path # [consider-using-from-import] +10 | import os.path as p + - import foo.bar.foobar as foobar # [consider-using-from-import] +11 + from foo.bar import foobar # [consider-using-from-import] +12 | import foo.bar.foobar as foobar, sys # [consider-using-from-import] +13 | import os +14 | import os as OS PLR0402 Use `from foo.bar import foobar` in lieu of alias --> import_aliasing.py:12:8 diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap index f43de224b9..adc2d40651 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1711_useless_return.py.snap @@ -10,15 +10,13 @@ PLR1711 [*] Useless `return` statement at end of function | ^^^^^^^^^^^ | help: Remove useless `return` statement - -ℹ Safe fix -3 3 | -4 4 | def print_python_version(): -5 5 | print(sys.version) -6 |- return None # [useless-return] -7 6 | -8 7 | -9 8 | def print_python_version(): +3 | +4 | def print_python_version(): +5 | print(sys.version) + - return None # [useless-return] +6 | +7 | +8 | def print_python_version(): PLR1711 [*] Useless `return` statement at end of function --> useless_return.py:11:5 @@ -29,15 +27,13 @@ PLR1711 [*] Useless `return` statement at end of function | ^^^^^^^^^^^ | help: Remove useless `return` statement - -ℹ Safe fix -8 8 | -9 9 | def print_python_version(): -10 10 | print(sys.version) -11 |- return None # [useless-return] -12 11 | -13 12 | -14 13 | def print_python_version(): +8 | +9 | def print_python_version(): +10 | print(sys.version) + - return None # [useless-return] +11 | +12 | +13 | def print_python_version(): PLR1711 [*] Useless `return` statement at end of function --> useless_return.py:16:5 @@ -48,15 +44,13 @@ PLR1711 [*] Useless `return` statement at end of function | ^^^^^^^^^^^ | help: Remove useless `return` statement - -ℹ Safe fix -13 13 | -14 14 | def print_python_version(): -15 15 | print(sys.version) -16 |- return None # [useless-return] -17 16 | -18 17 | -19 18 | class SomeClass: +13 | +14 | def print_python_version(): +15 | print(sys.version) + - return None # [useless-return] +16 | +17 | +18 | class SomeClass: PLR1711 [*] Useless `return` statement at end of function --> useless_return.py:22:9 @@ -67,15 +61,13 @@ PLR1711 [*] Useless `return` statement at end of function | ^^^^^^^^^^^ | help: Remove useless `return` statement - -ℹ Safe fix -19 19 | class SomeClass: -20 20 | def print_python_version(self): -21 21 | print(sys.version) -22 |- return None # [useless-return] -23 22 | -24 23 | -25 24 | def print_python_version(): +19 | class SomeClass: +20 | def print_python_version(self): +21 | print(sys.version) + - return None # [useless-return] +22 | +23 | +24 | def print_python_version(): PLR1711 [*] Useless `return` statement at end of function --> useless_return.py:50:5 @@ -86,15 +78,13 @@ PLR1711 [*] Useless `return` statement at end of function | ^^^^^^^^^^^ | help: Remove useless `return` statement - -ℹ Safe fix -47 47 | def print_python_version(): -48 48 | """This function returns None.""" -49 49 | print(sys.version) -50 |- return None # [useless-return] -51 50 | -52 51 | -53 52 | class BaseCache: +47 | def print_python_version(): +48 | """This function returns None.""" +49 | print(sys.version) + - return None # [useless-return] +50 | +51 | +52 | class BaseCache: PLR1711 [*] Useless `return` statement at end of function --> useless_return.py:60:9 @@ -105,9 +95,7 @@ PLR1711 [*] Useless `return` statement at end of function | ^^^^^^^^^^^ | help: Remove useless `return` statement - -ℹ Safe fix -57 57 | -58 58 | def get(self, key: str) -> None: -59 59 | print(f"{key} not found") -60 |- return None +57 | +58 | def get(self, key: str) -> None: +59 | print(f"{key} not found") + - return None diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap index 725efe59ed..59b3f5b3ea 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1714_repeated_equality_comparison.py.snap @@ -11,14 +11,13 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`. 4 | foo != "a" and foo != "b" | help: Merge multiple comparisons - -ℹ Unsafe fix -1 1 | # Errors. -2 |-foo == "a" or foo == "b" - 2 |+foo in {"a", "b"} -3 3 | -4 4 | foo != "a" and foo != "b" -5 5 | +1 | # Errors. + - foo == "a" or foo == "b" +2 + foo in {"a", "b"} +3 | +4 | foo != "a" and foo != "b" +5 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b"}`. --> repeated_equality_comparison.py:4:1 @@ -31,16 +30,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b"}`. 6 | foo == "a" or foo == "b" or foo == "c" | help: Merge multiple comparisons - -ℹ Unsafe fix -1 1 | # Errors. -2 2 | foo == "a" or foo == "b" -3 3 | -4 |-foo != "a" and foo != "b" - 4 |+foo not in {"a", "b"} -5 5 | -6 6 | foo == "a" or foo == "b" or foo == "c" -7 7 | +1 | # Errors. +2 | foo == "a" or foo == "b" +3 | + - foo != "a" and foo != "b" +4 + foo not in {"a", "b"} +5 | +6 | foo == "a" or foo == "b" or foo == "c" +7 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. --> repeated_equality_comparison.py:6:1 @@ -53,16 +51,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. 8 | foo != "a" and foo != "b" and foo != "c" | help: Merge multiple comparisons - -ℹ Unsafe fix -3 3 | -4 4 | foo != "a" and foo != "b" -5 5 | -6 |-foo == "a" or foo == "b" or foo == "c" - 6 |+foo in {"a", "b", "c"} -7 7 | -8 8 | foo != "a" and foo != "b" and foo != "c" -9 9 | +3 | +4 | foo != "a" and foo != "b" +5 | + - foo == "a" or foo == "b" or foo == "c" +6 + foo in {"a", "b", "c"} +7 | +8 | foo != "a" and foo != "b" and foo != "c" +9 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`. --> repeated_equality_comparison.py:8:1 @@ -75,16 +72,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`. 10 | foo == a or foo == "b" or foo == 3 # Mixed types. | help: Merge multiple comparisons - -ℹ Unsafe fix -5 5 | -6 6 | foo == "a" or foo == "b" or foo == "c" -7 7 | -8 |-foo != "a" and foo != "b" and foo != "c" - 8 |+foo not in {"a", "b", "c"} -9 9 | -10 10 | foo == a or foo == "b" or foo == 3 # Mixed types. -11 11 | +5 | +6 | foo == "a" or foo == "b" or foo == "c" +7 | + - foo != "a" and foo != "b" and foo != "c" +8 + foo not in {"a", "b", "c"} +9 | +10 | foo == a or foo == "b" or foo == 3 # Mixed types. +11 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in (a, "b", 3)`. Use a `set` if the elements are hashable. --> repeated_equality_comparison.py:10:1 @@ -97,16 +93,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in (a, "b", 3)`. Use a ` 12 | "a" == foo or "b" == foo or "c" == foo | help: Merge multiple comparisons - -ℹ Unsafe fix -7 7 | -8 8 | foo != "a" and foo != "b" and foo != "c" -9 9 | -10 |-foo == a or foo == "b" or foo == 3 # Mixed types. - 10 |+foo in (a, "b", 3) # Mixed types. -11 11 | -12 12 | "a" == foo or "b" == foo or "c" == foo -13 13 | +7 | +8 | foo != "a" and foo != "b" and foo != "c" +9 | + - foo == a or foo == "b" or foo == 3 # Mixed types. +10 + foo in (a, "b", 3) # Mixed types. +11 | +12 | "a" == foo or "b" == foo or "c" == foo +13 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. --> repeated_equality_comparison.py:12:1 @@ -119,16 +114,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. 14 | "a" != foo and "b" != foo and "c" != foo | help: Merge multiple comparisons - -ℹ Unsafe fix -9 9 | -10 10 | foo == a or foo == "b" or foo == 3 # Mixed types. -11 11 | -12 |-"a" == foo or "b" == foo or "c" == foo - 12 |+foo in {"a", "b", "c"} -13 13 | -14 14 | "a" != foo and "b" != foo and "c" != foo -15 15 | +9 | +10 | foo == a or foo == "b" or foo == 3 # Mixed types. +11 | + - "a" == foo or "b" == foo or "c" == foo +12 + foo in {"a", "b", "c"} +13 | +14 | "a" != foo and "b" != foo and "c" != foo +15 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`. --> repeated_equality_comparison.py:14:1 @@ -141,16 +135,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`. 16 | "a" == foo or foo == "b" or "c" == foo | help: Merge multiple comparisons - -ℹ Unsafe fix -11 11 | -12 12 | "a" == foo or "b" == foo or "c" == foo -13 13 | -14 |-"a" != foo and "b" != foo and "c" != foo - 14 |+foo not in {"a", "b", "c"} -15 15 | -16 16 | "a" == foo or foo == "b" or "c" == foo -17 17 | +11 | +12 | "a" == foo or "b" == foo or "c" == foo +13 | + - "a" != foo and "b" != foo and "c" != foo +14 + foo not in {"a", "b", "c"} +15 | +16 | "a" == foo or foo == "b" or "c" == foo +17 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. --> repeated_equality_comparison.py:16:1 @@ -163,16 +156,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. 18 | foo == bar or baz == foo or qux == foo | help: Merge multiple comparisons - -ℹ Unsafe fix -13 13 | -14 14 | "a" != foo and "b" != foo and "c" != foo -15 15 | -16 |-"a" == foo or foo == "b" or "c" == foo - 16 |+foo in {"a", "b", "c"} -17 17 | -18 18 | foo == bar or baz == foo or qux == foo -19 19 | +13 | +14 | "a" != foo and "b" != foo and "c" != foo +15 | + - "a" == foo or foo == "b" or "c" == foo +16 + foo in {"a", "b", "c"} +17 | +18 | foo == bar or baz == foo or qux == foo +19 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in (bar, baz, qux)`. Use a `set` if the elements are hashable. --> repeated_equality_comparison.py:18:1 @@ -185,16 +177,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in (bar, baz, qux)`. Use 20 | foo == "a" or "b" == foo or foo == "c" | help: Merge multiple comparisons - -ℹ Unsafe fix -15 15 | -16 16 | "a" == foo or foo == "b" or "c" == foo -17 17 | -18 |-foo == bar or baz == foo or qux == foo - 18 |+foo in (bar, baz, qux) -19 19 | -20 20 | foo == "a" or "b" == foo or foo == "c" -21 21 | +15 | +16 | "a" == foo or foo == "b" or "c" == foo +17 | + - foo == bar or baz == foo or qux == foo +18 + foo in (bar, baz, qux) +19 | +20 | foo == "a" or "b" == foo or foo == "c" +21 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. --> repeated_equality_comparison.py:20:1 @@ -207,16 +198,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b", "c"}`. 22 | foo != "a" and "b" != foo and foo != "c" | help: Merge multiple comparisons - -ℹ Unsafe fix -17 17 | -18 18 | foo == bar or baz == foo or qux == foo -19 19 | -20 |-foo == "a" or "b" == foo or foo == "c" - 20 |+foo in {"a", "b", "c"} -21 21 | -22 22 | foo != "a" and "b" != foo and foo != "c" -23 23 | +17 | +18 | foo == bar or baz == foo or qux == foo +19 | + - foo == "a" or "b" == foo or foo == "c" +20 + foo in {"a", "b", "c"} +21 | +22 | foo != "a" and "b" != foo and foo != "c" +23 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`. --> repeated_equality_comparison.py:22:1 @@ -229,16 +219,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo not in {"a", "b", "c"}`. 24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets | help: Merge multiple comparisons - -ℹ Unsafe fix -19 19 | -20 20 | foo == "a" or "b" == foo or foo == "c" -21 21 | -22 |-foo != "a" and "b" != foo and foo != "c" - 22 |+foo not in {"a", "b", "c"} -23 23 | -24 24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets -25 25 | +19 | +20 | foo == "a" or "b" == foo or foo == "c" +21 | + - foo != "a" and "b" != foo and foo != "c" +22 + foo not in {"a", "b", "c"} +23 | +24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets +25 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`. --> repeated_equality_comparison.py:24:1 @@ -251,16 +240,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`. 26 | foo.bar == "a" or foo.bar == "b" # Attributes. | help: Merge multiple comparisons - -ℹ Unsafe fix -21 21 | -22 22 | foo != "a" and "b" != foo and foo != "c" -23 23 | -24 |-foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets - 24 |+foo in {"a", "b"} or "c" == bar or "d" == bar # Multiple targets -25 25 | -26 26 | foo.bar == "a" or foo.bar == "b" # Attributes. -27 27 | +21 | +22 | foo != "a" and "b" != foo and foo != "c" +23 | + - foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets +24 + foo in {"a", "b"} or "c" == bar or "d" == bar # Multiple targets +25 | +26 | foo.bar == "a" or foo.bar == "b" # Attributes. +27 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`. --> repeated_equality_comparison.py:24:1 @@ -273,16 +261,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`. 26 | foo.bar == "a" or foo.bar == "b" # Attributes. | help: Merge multiple comparisons - -ℹ Unsafe fix -21 21 | -22 22 | foo != "a" and "b" != foo and foo != "c" -23 23 | -24 |-foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets - 24 |+foo == "a" or foo == "b" or bar in {"c", "d"} # Multiple targets -25 25 | -26 26 | foo.bar == "a" or foo.bar == "b" # Attributes. -27 27 | +21 | +22 | foo != "a" and "b" != foo and foo != "c" +23 | + - foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets +24 + foo == "a" or foo == "b" or bar in {"c", "d"} # Multiple targets +25 | +26 | foo.bar == "a" or foo.bar == "b" # Attributes. +27 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo.bar in {"a", "b"}`. --> repeated_equality_comparison.py:26:1 @@ -295,16 +282,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo.bar in {"a", "b"}`. 28 | # OK | help: Merge multiple comparisons - -ℹ Unsafe fix -23 23 | -24 24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets -25 25 | -26 |-foo.bar == "a" or foo.bar == "b" # Attributes. - 26 |+foo.bar in {"a", "b"} # Attributes. -27 27 | -28 28 | # OK -29 29 | foo == "a" and foo == "b" and foo == "c" # `and` mixed with `==`. +23 | +24 | foo == "a" or foo == "b" or "c" == bar or "d" == bar # Multiple targets +25 | + - foo.bar == "a" or foo.bar == "b" # Attributes. +26 + foo.bar in {"a", "b"} # Attributes. +27 | +28 | # OK +29 | foo == "a" and foo == "b" and foo == "c" # `and` mixed with `==`. +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`. --> repeated_equality_comparison.py:61:16 @@ -317,16 +303,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar in {"c", "d"}`. 63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets | help: Merge multiple comparisons - -ℹ Unsafe fix -58 58 | -59 59 | foo == "a" or "c" == bar or foo == "b" or "d" == bar # Multiple targets -60 60 | -61 |-foo == "a" or ("c" == bar or "d" == bar) or foo == "b" # Multiple targets - 61 |+foo == "a" or (bar in {"c", "d"}) or foo == "b" # Multiple targets -62 62 | -63 63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets -64 64 | +58 | +59 | foo == "a" or "c" == bar or foo == "b" or "d" == bar # Multiple targets +60 | + - foo == "a" or ("c" == bar or "d" == bar) or foo == "b" # Multiple targets +61 + foo == "a" or (bar in {"c", "d"}) or foo == "b" # Multiple targets +62 | +63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets +64 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`. --> repeated_equality_comparison.py:63:1 @@ -339,16 +324,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {"a", "b"}`. 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets | help: Merge multiple comparisons - -ℹ Unsafe fix -60 60 | -61 61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b" # Multiple targets -62 62 | -63 |-foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets - 63 |+foo in {"a", "b"} or "c" != bar and "d" != bar # Multiple targets -64 64 | -65 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets -66 66 | +60 | +61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b" # Multiple targets +62 | + - foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets +63 + foo in {"a", "b"} or "c" != bar and "d" != bar # Multiple targets +64 | +65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets +66 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`. --> repeated_equality_comparison.py:63:29 @@ -361,16 +345,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`. 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets | help: Merge multiple comparisons - -ℹ Unsafe fix -60 60 | -61 61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b" # Multiple targets -62 62 | -63 |-foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets - 63 |+foo == "a" or foo == "b" or bar not in {"c", "d"} # Multiple targets -64 64 | -65 65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets -66 66 | +60 | +61 | foo == "a" or ("c" == bar or "d" == bar) or foo == "b" # Multiple targets +62 | + - foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets +63 + foo == "a" or foo == "b" or bar not in {"c", "d"} # Multiple targets +64 | +65 | foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets +66 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`. --> repeated_equality_comparison.py:65:16 @@ -383,16 +366,15 @@ PLR1714 [*] Consider merging multiple comparisons: `bar not in {"c", "d"}`. 67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar # Multiple targets | help: Merge multiple comparisons - -ℹ Unsafe fix -62 62 | -63 63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets -64 64 | -65 |-foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets - 65 |+foo == "a" or (bar not in {"c", "d"}) or foo == "b" # Multiple targets -66 66 | -67 67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar # Multiple targets -68 68 | +62 | +63 | foo == "a" or foo == "b" or "c" != bar and "d" != bar # Multiple targets +64 | + - foo == "a" or ("c" != bar and "d" != bar) or foo == "b" # Multiple targets +65 + foo == "a" or (bar not in {"c", "d"}) or foo == "b" # Multiple targets +66 | +67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar # Multiple targets +68 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {1, True}`. --> repeated_equality_comparison.py:69:1 @@ -405,16 +387,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {1, True}`. 71 | foo == 1 or foo == 1.0 # Different types, same hashed value | help: Merge multiple comparisons - -ℹ Unsafe fix -66 66 | -67 67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar # Multiple targets -68 68 | -69 |-foo == 1 or foo == True # Different types, same hashed value - 69 |+foo in {1, True} # Different types, same hashed value -70 70 | -71 71 | foo == 1 or foo == 1.0 # Different types, same hashed value -72 72 | +66 | +67 | foo == "a" and "c" != bar or foo == "b" and "d" != bar # Multiple targets +68 | + - foo == 1 or foo == True # Different types, same hashed value +69 + foo in {1, True} # Different types, same hashed value +70 | +71 | foo == 1 or foo == 1.0 # Different types, same hashed value +72 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {1, 1.0}`. --> repeated_equality_comparison.py:71:1 @@ -427,16 +408,15 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {1, 1.0}`. 73 | foo == False or foo == 0 # Different types, same hashed value | help: Merge multiple comparisons - -ℹ Unsafe fix -68 68 | -69 69 | foo == 1 or foo == True # Different types, same hashed value -70 70 | -71 |-foo == 1 or foo == 1.0 # Different types, same hashed value - 71 |+foo in {1, 1.0} # Different types, same hashed value -72 72 | -73 73 | foo == False or foo == 0 # Different types, same hashed value -74 74 | +68 | +69 | foo == 1 or foo == True # Different types, same hashed value +70 | + - foo == 1 or foo == 1.0 # Different types, same hashed value +71 + foo in {1, 1.0} # Different types, same hashed value +72 | +73 | foo == False or foo == 0 # Different types, same hashed value +74 | +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {False, 0}`. --> repeated_equality_comparison.py:73:1 @@ -449,15 +429,14 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {False, 0}`. 75 | foo == 0.0 or foo == 0j # Different types, same hashed value | help: Merge multiple comparisons - -ℹ Unsafe fix -70 70 | -71 71 | foo == 1 or foo == 1.0 # Different types, same hashed value -72 72 | -73 |-foo == False or foo == 0 # Different types, same hashed value - 73 |+foo in {False, 0} # Different types, same hashed value -74 74 | -75 75 | foo == 0.0 or foo == 0j # Different types, same hashed value +70 | +71 | foo == 1 or foo == 1.0 # Different types, same hashed value +72 | + - foo == False or foo == 0 # Different types, same hashed value +73 + foo in {False, 0} # Different types, same hashed value +74 | +75 | foo == 0.0 or foo == 0j # Different types, same hashed value +note: This is an unsafe fix and may change runtime behavior PLR1714 [*] Consider merging multiple comparisons: `foo in {0.0, 0j}`. --> repeated_equality_comparison.py:75:1 @@ -468,10 +447,9 @@ PLR1714 [*] Consider merging multiple comparisons: `foo in {0.0, 0j}`. | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Merge multiple comparisons - -ℹ Unsafe fix -72 72 | -73 73 | foo == False or foo == 0 # Different types, same hashed value -74 74 | -75 |-foo == 0.0 or foo == 0j # Different types, same hashed value - 75 |+foo in {0.0, 0j} # Different types, same hashed value +72 | +73 | foo == False or foo == 0 # Different types, same hashed value +74 | + - foo == 0.0 or foo == 0j # Different types, same hashed value +75 + foo in {0.0, 0j} # Different types, same hashed value +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap index faf07307cc..857e364771 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1716_boolean_chained_comparison.py.snap @@ -11,16 +11,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 9 | pass | help: Use a single compare expression - -ℹ Safe fix -5 5 | a = int(input()) -6 6 | b = int(input()) -7 7 | c = int(input()) -8 |-if a < b and b < c: # [boolean-chained-comparison] - 8 |+if a < b < c: # [boolean-chained-comparison] -9 9 | pass -10 10 | -11 11 | a = int(input()) +5 | a = int(input()) +6 | b = int(input()) +7 | c = int(input()) + - if a < b and b < c: # [boolean-chained-comparison] +8 + if a < b < c: # [boolean-chained-comparison] +9 | pass +10 | +11 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:14:4 @@ -32,16 +30,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 15 | pass | help: Use a single compare expression - -ℹ Safe fix -11 11 | a = int(input()) -12 12 | b = int(input()) -13 13 | c = int(input()) -14 |-if a < b and b <= c: # [boolean-chained-comparison] - 14 |+if a < b <= c: # [boolean-chained-comparison] -15 15 | pass -16 16 | -17 17 | a = int(input()) +11 | a = int(input()) +12 | b = int(input()) +13 | c = int(input()) + - if a < b and b <= c: # [boolean-chained-comparison] +14 + if a < b <= c: # [boolean-chained-comparison] +15 | pass +16 | +17 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:20:4 @@ -53,16 +49,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 21 | pass | help: Use a single compare expression - -ℹ Safe fix -17 17 | a = int(input()) -18 18 | b = int(input()) -19 19 | c = int(input()) -20 |-if a <= b and b < c: # [boolean-chained-comparison] - 20 |+if a <= b < c: # [boolean-chained-comparison] -21 21 | pass -22 22 | -23 23 | a = int(input()) +17 | a = int(input()) +18 | b = int(input()) +19 | c = int(input()) + - if a <= b and b < c: # [boolean-chained-comparison] +20 + if a <= b < c: # [boolean-chained-comparison] +21 | pass +22 | +23 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:26:4 @@ -74,16 +68,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 27 | pass | help: Use a single compare expression - -ℹ Safe fix -23 23 | a = int(input()) -24 24 | b = int(input()) -25 25 | c = int(input()) -26 |-if a <= b and b <= c: # [boolean-chained-comparison] - 26 |+if a <= b <= c: # [boolean-chained-comparison] -27 27 | pass -28 28 | -29 29 | # --------------------- +23 | a = int(input()) +24 | b = int(input()) +25 | c = int(input()) + - if a <= b and b <= c: # [boolean-chained-comparison] +26 + if a <= b <= c: # [boolean-chained-comparison] +27 | pass +28 | +29 | # --------------------- PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:36:4 @@ -95,16 +87,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 37 | pass | help: Use a single compare expression - -ℹ Safe fix -33 33 | a = int(input()) -34 34 | b = int(input()) -35 35 | c = int(input()) -36 |-if a > b and b > c: # [boolean-chained-comparison] - 36 |+if a > b > c: # [boolean-chained-comparison] -37 37 | pass -38 38 | -39 39 | a = int(input()) +33 | a = int(input()) +34 | b = int(input()) +35 | c = int(input()) + - if a > b and b > c: # [boolean-chained-comparison] +36 + if a > b > c: # [boolean-chained-comparison] +37 | pass +38 | +39 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:42:4 @@ -116,16 +106,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 43 | pass | help: Use a single compare expression - -ℹ Safe fix -39 39 | a = int(input()) -40 40 | b = int(input()) -41 41 | c = int(input()) -42 |-if a >= b and b > c: # [boolean-chained-comparison] - 42 |+if a >= b > c: # [boolean-chained-comparison] -43 43 | pass -44 44 | -45 45 | a = int(input()) +39 | a = int(input()) +40 | b = int(input()) +41 | c = int(input()) + - if a >= b and b > c: # [boolean-chained-comparison] +42 + if a >= b > c: # [boolean-chained-comparison] +43 | pass +44 | +45 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:48:4 @@ -137,16 +125,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 49 | pass | help: Use a single compare expression - -ℹ Safe fix -45 45 | a = int(input()) -46 46 | b = int(input()) -47 47 | c = int(input()) -48 |-if a > b and b >= c: # [boolean-chained-comparison] - 48 |+if a > b >= c: # [boolean-chained-comparison] -49 49 | pass -50 50 | -51 51 | a = int(input()) +45 | a = int(input()) +46 | b = int(input()) +47 | c = int(input()) + - if a > b and b >= c: # [boolean-chained-comparison] +48 + if a > b >= c: # [boolean-chained-comparison] +49 | pass +50 | +51 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:54:4 @@ -158,16 +144,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 55 | pass | help: Use a single compare expression - -ℹ Safe fix -51 51 | a = int(input()) -52 52 | b = int(input()) -53 53 | c = int(input()) -54 |-if a >= b and b >= c: # [boolean-chained-comparison] - 54 |+if a >= b >= c: # [boolean-chained-comparison] -55 55 | pass -56 56 | -57 57 | # ----------------------- +51 | a = int(input()) +52 | b = int(input()) +53 | c = int(input()) + - if a >= b and b >= c: # [boolean-chained-comparison] +54 + if a >= b >= c: # [boolean-chained-comparison] +55 | pass +56 | +57 | # ----------------------- PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:65:4 @@ -179,16 +163,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 66 | pass | help: Use a single compare expression - -ℹ Safe fix -62 62 | b = int(input()) -63 63 | c = int(input()) -64 64 | d = int(input()) -65 |-if a < b and b < c and c < d: # [boolean-chained-comparison] - 65 |+if a < b < c and c < d: # [boolean-chained-comparison] -66 66 | pass -67 67 | -68 68 | a = int(input()) +62 | b = int(input()) +63 | c = int(input()) +64 | d = int(input()) + - if a < b and b < c and c < d: # [boolean-chained-comparison] +65 + if a < b < c and c < d: # [boolean-chained-comparison] +66 | pass +67 | +68 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:65:14 @@ -200,16 +182,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 66 | pass | help: Use a single compare expression - -ℹ Safe fix -62 62 | b = int(input()) -63 63 | c = int(input()) -64 64 | d = int(input()) -65 |-if a < b and b < c and c < d: # [boolean-chained-comparison] - 65 |+if a < b and b < c < d: # [boolean-chained-comparison] -66 66 | pass -67 67 | -68 68 | a = int(input()) +62 | b = int(input()) +63 | c = int(input()) +64 | d = int(input()) + - if a < b and b < c and c < d: # [boolean-chained-comparison] +65 + if a < b and b < c < d: # [boolean-chained-comparison] +66 | pass +67 | +68 | a = int(input()) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:73:4 @@ -221,16 +201,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 74 | pass | help: Use a single compare expression - -ℹ Safe fix -70 70 | c = int(input()) -71 71 | d = int(input()) -72 72 | e = int(input()) -73 |-if a < b and b < c and c < d and d < e: # [boolean-chained-comparison] - 73 |+if a < b < c and c < d and d < e: # [boolean-chained-comparison] -74 74 | pass -75 75 | -76 76 | # ------------ +70 | c = int(input()) +71 | d = int(input()) +72 | e = int(input()) + - if a < b and b < c and c < d and d < e: # [boolean-chained-comparison] +73 + if a < b < c and c < d and d < e: # [boolean-chained-comparison] +74 | pass +75 | +76 | # ------------ PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:73:14 @@ -242,16 +220,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 74 | pass | help: Use a single compare expression - -ℹ Safe fix -70 70 | c = int(input()) -71 71 | d = int(input()) -72 72 | e = int(input()) -73 |-if a < b and b < c and c < d and d < e: # [boolean-chained-comparison] - 73 |+if a < b and b < c < d and d < e: # [boolean-chained-comparison] -74 74 | pass -75 75 | -76 76 | # ------------ +70 | c = int(input()) +71 | d = int(input()) +72 | e = int(input()) + - if a < b and b < c and c < d and d < e: # [boolean-chained-comparison] +73 + if a < b and b < c < d and d < e: # [boolean-chained-comparison] +74 | pass +75 | +76 | # ------------ PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:73:24 @@ -263,16 +239,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 74 | pass | help: Use a single compare expression - -ℹ Safe fix -70 70 | c = int(input()) -71 71 | d = int(input()) -72 72 | e = int(input()) -73 |-if a < b and b < c and c < d and d < e: # [boolean-chained-comparison] - 73 |+if a < b and b < c and c < d < e: # [boolean-chained-comparison] -74 74 | pass -75 75 | -76 76 | # ------------ +70 | c = int(input()) +71 | d = int(input()) +72 | e = int(input()) + - if a < b and b < c and c < d and d < e: # [boolean-chained-comparison] +73 + if a < b and b < c and c < d < e: # [boolean-chained-comparison] +74 | pass +75 | +76 | # ------------ PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:123:2 @@ -284,16 +258,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 125 | ((a < b) and b < c) | help: Use a single compare expression - -ℹ Safe fix -120 120 | pass -121 121 | -122 122 | # fixes will balance parentheses -123 |-(a < b) and b < c - 123 |+(a < b < c) -124 124 | a < b and (b < c) -125 125 | ((a < b) and b < c) -126 126 | (a < b) and (b < c) +120 | pass +121 | +122 | # fixes will balance parentheses + - (a < b) and b < c +123 + (a < b < c) +124 | a < b and (b < c) +125 | ((a < b) and b < c) +126 | (a < b) and (b < c) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:124:1 @@ -306,16 +278,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 126 | (a < b) and (b < c) | help: Use a single compare expression - -ℹ Safe fix -121 121 | -122 122 | # fixes will balance parentheses -123 123 | (a < b) and b < c -124 |-a < b and (b < c) - 124 |+(a < b < c) -125 125 | ((a < b) and b < c) -126 126 | (a < b) and (b < c) -127 127 | (((a < b))) and (b < c) +121 | +122 | # fixes will balance parentheses +123 | (a < b) and b < c + - a < b and (b < c) +124 + (a < b < c) +125 | ((a < b) and b < c) +126 | (a < b) and (b < c) +127 | (((a < b))) and (b < c) PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:125:3 @@ -328,16 +298,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 127 | (((a < b))) and (b < c) | help: Use a single compare expression - -ℹ Safe fix -122 122 | # fixes will balance parentheses -123 123 | (a < b) and b < c -124 124 | a < b and (b < c) -125 |-((a < b) and b < c) - 125 |+((a < b < c)) -126 126 | (a < b) and (b < c) -127 127 | (((a < b))) and (b < c) -128 128 | +122 | # fixes will balance parentheses +123 | (a < b) and b < c +124 | a < b and (b < c) + - ((a < b) and b < c) +125 + ((a < b < c)) +126 | (a < b) and (b < c) +127 | (((a < b))) and (b < c) +128 | PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:126:2 @@ -349,16 +317,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 127 | (((a < b))) and (b < c) | help: Use a single compare expression - -ℹ Safe fix -123 123 | (a < b) and b < c -124 124 | a < b and (b < c) -125 125 | ((a < b) and b < c) -126 |-(a < b) and (b < c) - 126 |+(a < b < c) -127 127 | (((a < b))) and (b < c) -128 128 | -129 129 | (a boolean_chained_comparison.py:127:4 @@ -371,16 +337,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 129 | (a boolean_chained_comparison.py:129:2 @@ -393,16 +357,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 131 | # should error and fix | help: Use a single compare expression - -ℹ Safe fix -126 126 | (a < b) and (b < c) -127 127 | (((a < b))) and (b < c) -128 128 | -129 |-(a boolean_chained_comparison.py:129:11 @@ -415,16 +377,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 131 | # should error and fix | help: Use a single compare expression - -ℹ Safe fix -126 126 | (a < b) and (b < c) -127 127 | (((a < b))) and (b < c) -128 128 | -129 |-(a boolean_chained_comparison.py:132:1 @@ -436,16 +396,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 134 | # more involved examples (all should error and fix) | help: Use a single compare expression - -ℹ Safe fix -129 129 | (a boolean_chained_comparison.py:135:1 @@ -460,16 +418,14 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 140 | ( | help: Use a single compare expression - -ℹ Safe fix -135 135 | a < ( # sneaky comment -136 136 | b -137 137 | # more comments -138 |-) and b < c - 138 |+) < c -139 139 | -140 140 | ( -141 141 | a +135 | a < ( # sneaky comment +136 | b +137 | # more comments + - ) and b < c +138 + ) < c +139 | +140 | ( +141 | a PLR1716 [*] Contains chained boolean comparison that can be simplified --> boolean_chained_comparison.py:141:5 @@ -484,21 +440,19 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified 146 | ) | help: Use a single compare expression - -ℹ Safe fix -138 138 | ) and b < c -139 139 | -140 140 | ( -141 |- a - 141 |+ ((a -142 142 | boolean_chained_comparison.py:148:1 @@ -509,10 +463,8 @@ PLR1716 [*] Contains chained boolean comparison that can be simplified | ^^^^^^^^^^^^^^^^^^^^^^ | help: Use a single compare expression - -ℹ Safe fix -145 145 | and ((c sys_exit_alias_0.py:2:1 @@ -26,15 +25,14 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | exit(0) -2 |-quit(0) - 3 |+sys.exit(0) -3 4 | -4 5 | -5 6 | def main(): +1 + import sys +2 | exit(0) + - quit(0) +3 + sys.exit(0) +4 | +5 | +6 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `exit` --> sys_exit_alias_0.py:6:5 @@ -45,17 +43,16 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 7 | quit(2) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | exit(0) -2 3 | quit(0) -3 4 | -4 5 | -5 6 | def main(): -6 |- exit(2) - 7 |+ sys.exit(2) -7 8 | quit(2) +1 + import sys +2 | exit(0) +3 | quit(0) +4 | +5 | +6 | def main(): + - exit(2) +7 + sys.exit(2) +8 | quit(2) +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_0.py:7:5 @@ -66,14 +63,13 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | exit(0) -2 3 | quit(0) -3 4 | -4 5 | -5 6 | def main(): -6 7 | exit(2) -7 |- quit(2) - 8 |+ sys.exit(2) +1 + import sys +2 | exit(0) +3 | quit(0) +4 | +5 | +6 | def main(): +7 | exit(2) + - quit(2) +8 + sys.exit(2) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap index fe9dbde798..2a7b32f974 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_1.py.snap @@ -11,15 +11,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 4 | quit(0) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | import sys -2 2 | -3 |-exit(0) - 3 |+sys.exit(0) -4 4 | quit(0) -5 5 | -6 6 | +1 | import sys +2 | + - exit(0) +3 + sys.exit(0) +4 | quit(0) +5 | +6 | +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_1.py:4:1 @@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | import sys -2 2 | -3 3 | exit(0) -4 |-quit(0) - 4 |+sys.exit(0) -5 5 | -6 6 | -7 7 | def main(): +1 | import sys +2 | +3 | exit(0) + - quit(0) +4 + sys.exit(0) +5 | +6 | +7 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `exit` --> sys_exit_alias_1.py:8:5 @@ -49,16 +47,15 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 9 | quit(1) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -5 5 | -6 6 | -7 7 | def main(): -8 |- exit(1) - 8 |+ sys.exit(1) -9 9 | quit(1) -10 10 | -11 11 | +5 | +6 | +7 | def main(): + - exit(1) +8 + sys.exit(1) +9 | quit(1) +10 | +11 | +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_1.py:9:5 @@ -69,16 +66,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -6 6 | -7 7 | def main(): -8 8 | exit(1) -9 |- quit(1) - 9 |+ sys.exit(1) -10 10 | -11 11 | -12 12 | def main(): +6 | +7 | def main(): +8 | exit(1) + - quit(1) +9 + sys.exit(1) +10 | +11 | +12 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 Use `sys.exit()` instead of `exit` --> sys_exit_alias_1.py:15:5 diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap index 815d6fcb23..a12c33d7a4 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_11.py.snap @@ -10,10 +10,9 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import * - 2 |+import sys -2 3 | -3 |-exit(0) - 4 |+sys.exit(0) +1 | from sys import * +2 + import sys +3 | + - exit(0) +4 + sys.exit(0) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap index 3e0a0aa135..95e178f98d 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_12.py.snap @@ -10,10 +10,9 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 |-import os \ - 1 |+import os; import sys \ -2 2 | -3 |-exit(0) - 3 |+sys.exit(0) + - import os \ +1 + import os; import sys \ +2 | + - exit(0) +3 + sys.exit(0) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap index f5ac04576c..1ee6c1e7b3 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_13.py.snap @@ -8,9 +8,8 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 |-exit(code=2) - 1 |+import sys - 2 |+sys.exit(2) -2 3 | + - exit(code=2) +1 + import sys +2 + sys.exit(2) +3 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap index dc80fda262..7bb497e475 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_15.py.snap @@ -10,13 +10,12 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | success = True -2 3 | if success: -3 4 | code = 0 -4 5 | else: -5 6 | code = 1 -6 |-exit(code) - 7 |+sys.exit(code) +1 + import sys +2 | success = True +3 | if success: +4 | code = 0 +5 | else: +6 | code = 1 + - exit(code) +7 + sys.exit(code) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap index c6ba6451e5..d3b14405ea 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_16.py.snap @@ -12,16 +12,15 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 5 | ) # 3 | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | def test_case_1(): -2 3 | # comments preserved with a positional argument -3 |- exit( # comment - 4 |+ sys.exit( # comment -4 5 | 1, # 2 -5 6 | ) # 3 -6 7 | +1 + import sys +2 | def test_case_1(): +3 | # comments preserved with a positional argument + - exit( # comment +4 + sys.exit( # comment +5 | 1, # 2 +6 | ) # 3 +7 | +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `exit` --> sys_exit_alias_16.py:10:5 @@ -34,23 +33,22 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 12 | ) # 3 | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | def test_case_1(): -2 3 | # comments preserved with a positional argument -3 4 | exit( # comment +1 + import sys +2 | def test_case_1(): +3 | # comments preserved with a positional argument +4 | exit( # comment -------------------------------------------------------------------------------- -7 8 | -8 9 | def test_case_2(): -9 10 | # comments preserved with a single keyword argument -10 |- exit( # comment -11 |- code=1, # 2 - 11 |+ sys.exit( # comment - 12 |+ 1, # 2 -12 13 | ) # 3 -13 14 | -14 15 | +8 | +9 | def test_case_2(): +10 | # comments preserved with a single keyword argument + - exit( # comment + - code=1, # 2 +11 + sys.exit( # comment +12 + 1, # 2 +13 | ) # 3 +14 | +15 | +note: This is an unsafe fix and may change runtime behavior PLR1722 Use `sys.exit()` instead of `exit` --> sys_exit_alias_16.py:17:5 @@ -71,15 +69,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | def test_case_1(): -2 3 | # comments preserved with a positional argument -3 4 | exit( # comment +1 + import sys +2 | def test_case_1(): +3 | # comments preserved with a positional argument +4 | exit( # comment -------------------------------------------------------------------------------- -20 21 | def test_case_4(): -21 22 | # this should now be fixable -22 23 | codes = [1] -23 |- exit(*codes) - 24 |+ sys.exit(*codes) +21 | def test_case_4(): +22 | # this should now be fixable +23 | codes = [1] + - exit(*codes) +24 + sys.exit(*codes) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap index 642d47a335..0ba847b6e1 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_2.py.snap @@ -11,15 +11,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 4 | quit(0) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | import sys as sys2 -2 2 | -3 |-exit(0) - 3 |+sys2.exit(0) -4 4 | quit(0) -5 5 | -6 6 | +1 | import sys as sys2 +2 | + - exit(0) +3 + sys2.exit(0) +4 | quit(0) +5 | +6 | +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_2.py:4:1 @@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | import sys as sys2 -2 2 | -3 3 | exit(0) -4 |-quit(0) - 4 |+sys2.exit(0) -5 5 | -6 6 | -7 7 | def main(): +1 | import sys as sys2 +2 | +3 | exit(0) + - quit(0) +4 + sys2.exit(0) +5 | +6 | +7 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `exit` --> sys_exit_alias_2.py:8:5 @@ -49,14 +47,13 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 9 | quit(1) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -5 5 | -6 6 | -7 7 | def main(): -8 |- exit(1) - 8 |+ sys2.exit(1) -9 9 | quit(1) +5 | +6 | +7 | def main(): + - exit(1) +8 + sys2.exit(1) +9 | quit(1) +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_2.py:9:5 @@ -67,10 +64,9 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -6 6 | -7 7 | def main(): -8 8 | exit(1) -9 |- quit(1) - 9 |+ sys2.exit(1) +6 | +7 | def main(): +8 | exit(1) + - quit(1) +9 + sys2.exit(1) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap index c3e57c562a..47737c2cfa 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_3.py.snap @@ -9,16 +9,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import exit -2 2 | -3 3 | exit(0) -4 |-quit(0) - 4 |+exit(0) -5 5 | -6 6 | -7 7 | def main(): +1 | from sys import exit +2 | +3 | exit(0) + - quit(0) +4 + exit(0) +5 | +6 | +7 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_3.py:9:5 @@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -6 6 | -7 7 | def main(): -8 8 | exit(1) -9 |- quit(1) - 9 |+ exit(1) -10 10 | -11 11 | -12 12 | def main(): +6 | +7 | def main(): +8 | exit(1) + - quit(1) +9 + exit(1) +10 | +11 | +12 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 Use `sys.exit()` instead of `quit` --> sys_exit_alias_3.py:16:5 diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap index a488ad084d..f5fecf8781 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_4.py.snap @@ -11,15 +11,14 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 4 | quit(0) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import exit as exit2 -2 2 | -3 |-exit(0) - 3 |+exit2(0) -4 4 | quit(0) -5 5 | -6 6 | +1 | from sys import exit as exit2 +2 | + - exit(0) +3 + exit2(0) +4 | quit(0) +5 | +6 | +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_4.py:4:1 @@ -29,16 +28,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import exit as exit2 -2 2 | -3 3 | exit(0) -4 |-quit(0) - 4 |+exit2(0) -5 5 | -6 6 | -7 7 | def main(): +1 | from sys import exit as exit2 +2 | +3 | exit(0) + - quit(0) +4 + exit2(0) +5 | +6 | +7 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `exit` --> sys_exit_alias_4.py:8:5 @@ -49,14 +47,13 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 9 | quit(1) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -5 5 | -6 6 | -7 7 | def main(): -8 |- exit(1) - 8 |+ exit2(1) -9 9 | quit(1) +5 | +6 | +7 | def main(): + - exit(1) +8 + exit2(1) +9 | quit(1) +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_4.py:9:5 @@ -67,10 +64,9 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -6 6 | -7 7 | def main(): -8 8 | exit(1) -9 |- quit(1) - 9 |+ exit2(1) +6 | +7 | def main(): +8 | exit(1) + - quit(1) +9 + exit2(1) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap index e1ba1969a6..a05a708419 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_5.py.snap @@ -11,16 +11,15 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 4 | quit(0) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import * - 2 |+import sys -2 3 | -3 |-exit(0) - 4 |+sys.exit(0) -4 5 | quit(0) -5 6 | -6 7 | +1 | from sys import * +2 + import sys +3 | + - exit(0) +4 + sys.exit(0) +5 | quit(0) +6 | +7 | +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_5.py:4:1 @@ -30,17 +29,16 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import * - 2 |+import sys -2 3 | -3 4 | exit(0) -4 |-quit(0) - 5 |+sys.exit(0) -5 6 | -6 7 | -7 8 | def main(): +1 | from sys import * +2 + import sys +3 | +4 | exit(0) + - quit(0) +5 + sys.exit(0) +6 | +7 | +8 | def main(): +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `exit` --> sys_exit_alias_5.py:8:5 @@ -51,19 +49,18 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 9 | quit(1) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import * - 2 |+import sys -2 3 | -3 4 | exit(0) -4 5 | quit(0) -5 6 | -6 7 | -7 8 | def main(): -8 |- exit(1) - 9 |+ sys.exit(1) -9 10 | quit(1) +1 | from sys import * +2 + import sys +3 | +4 | exit(0) +5 | quit(0) +6 | +7 | +8 | def main(): + - exit(1) +9 + sys.exit(1) +10 | quit(1) +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_5.py:9:5 @@ -74,16 +71,15 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix -1 1 | from sys import * - 2 |+import sys -2 3 | -3 4 | exit(0) -4 5 | quit(0) +1 | from sys import * +2 + import sys +3 | +4 | exit(0) +5 | quit(0) -------------------------------------------------------------------------------- -6 7 | -7 8 | def main(): -8 9 | exit(1) -9 |- quit(1) - 10 |+ sys.exit(1) +7 | +8 | def main(): +9 | exit(1) + - quit(1) +10 + sys.exit(1) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap index 50fccc0bb8..816f3a77d4 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_6.py.snap @@ -9,14 +9,13 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` 2 | quit(0) | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 |-exit(0) - 1 |+import sys - 2 |+sys.exit(0) -2 3 | quit(0) -3 4 | -4 5 | + - exit(0) +1 + import sys +2 + sys.exit(0) +3 | quit(0) +4 | +5 | +note: This is an unsafe fix and may change runtime behavior PLR1722 [*] Use `sys.exit()` instead of `quit` --> sys_exit_alias_6.py:2:1 @@ -26,12 +25,11 @@ PLR1722 [*] Use `sys.exit()` instead of `quit` | ^^^^ | help: Replace `quit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | exit(0) -2 |-quit(0) - 3 |+sys.exit(0) -3 4 | -4 5 | -5 6 | def exit(e): +1 + import sys +2 | exit(0) + - quit(0) +3 + sys.exit(0) +4 | +5 | +6 | def exit(e): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap index 43c99f3f74..eb4d08baae 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_7.py.snap @@ -9,12 +9,11 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | def main(): -2 |- exit(0) - 3 |+ sys.exit(0) -3 4 | -4 5 | -5 6 | import functools +1 + import sys +2 | def main(): + - exit(0) +3 + sys.exit(0) +4 | +5 | +6 | import functools +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap index 2008a11682..f8b9fead38 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_8.py.snap @@ -9,10 +9,9 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix -1 |-from sys import argv - 1 |+from sys import argv, exit -2 2 | -3 3 | -4 4 | def main(): + - from sys import argv +1 + from sys import argv, exit +2 | +3 | +4 | def main(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap index 667a82f2f6..bbcca9a69f 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1722_sys_exit_alias_9.py.snap @@ -9,12 +9,11 @@ PLR1722 [*] Use `sys.exit()` instead of `exit` | ^^^^ | help: Replace `exit` with `sys.exit()` - -ℹ Unsafe fix - 1 |+import sys -1 2 | def main(): -2 |- exit(0) - 3 |+ sys.exit(0) -3 4 | -4 5 | -5 6 | from sys import argv +1 + import sys +2 | def main(): + - exit(0) +3 + sys.exit(0) +4 | +5 | +6 | from sys import argv +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap index 6b97573e49..28b3d9acdc 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1730_if_stmt_min_max.py.snap @@ -12,17 +12,15 @@ PLR1730 [*] Replace `if` statement with `a = min(b, a)` 24 | # case 2: a = max(b, a) | help: Replace with `a = min(b, a)` - -ℹ Safe fix -18 18 | a, b = [], [] -19 19 | -20 20 | # case 1: a = min(b, a) -21 |-if a >= b: -22 |- a = b - 21 |+a = min(b, a) -23 22 | -24 23 | # case 2: a = max(b, a) -25 24 | if a <= b: +18 | a, b = [], [] +19 | +20 | # case 1: a = min(b, a) + - if a >= b: + - a = b +21 + a = min(b, a) +22 | +23 | # case 2: a = max(b, a) +24 | if a <= b: PLR1730 [*] Replace `if` statement with `a = max(b, a)` --> if_stmt_min_max.py:25:1 @@ -35,17 +33,15 @@ PLR1730 [*] Replace `if` statement with `a = max(b, a)` 28 | # case 3: b = min(a, b) | help: Replace with `a = max(b, a)` - -ℹ Safe fix -22 22 | a = b -23 23 | -24 24 | # case 2: a = max(b, a) -25 |-if a <= b: -26 |- a = b - 25 |+a = max(b, a) -27 26 | -28 27 | # case 3: b = min(a, b) -29 28 | if a <= b: +22 | a = b +23 | +24 | # case 2: a = max(b, a) + - if a <= b: + - a = b +25 + a = max(b, a) +26 | +27 | # case 3: b = min(a, b) +28 | if a <= b: PLR1730 [*] Replace `if` statement with `b = min(a, b)` --> if_stmt_min_max.py:29:1 @@ -58,17 +54,15 @@ PLR1730 [*] Replace `if` statement with `b = min(a, b)` 32 | # case 4: b = max(a, b) | help: Replace with `b = min(a, b)` - -ℹ Safe fix -26 26 | a = b -27 27 | -28 28 | # case 3: b = min(a, b) -29 |-if a <= b: -30 |- b = a - 29 |+b = min(a, b) -31 30 | -32 31 | # case 4: b = max(a, b) -33 32 | if a >= b: +26 | a = b +27 | +28 | # case 3: b = min(a, b) + - if a <= b: + - b = a +29 + b = min(a, b) +30 | +31 | # case 4: b = max(a, b) +32 | if a >= b: PLR1730 [*] Replace `if` statement with `b = max(a, b)` --> if_stmt_min_max.py:33:1 @@ -81,17 +75,15 @@ PLR1730 [*] Replace `if` statement with `b = max(a, b)` 36 | # case 5: a = min(a, b) | help: Replace with `b = max(a, b)` - -ℹ Safe fix -30 30 | b = a -31 31 | -32 32 | # case 4: b = max(a, b) -33 |-if a >= b: -34 |- b = a - 33 |+b = max(a, b) -35 34 | -36 35 | # case 5: a = min(a, b) -37 36 | if a > b: +30 | b = a +31 | +32 | # case 4: b = max(a, b) + - if a >= b: + - b = a +33 + b = max(a, b) +34 | +35 | # case 5: a = min(a, b) +36 | if a > b: PLR1730 [*] Replace `if` statement with `a = min(a, b)` --> if_stmt_min_max.py:37:1 @@ -104,17 +96,15 @@ PLR1730 [*] Replace `if` statement with `a = min(a, b)` 40 | # case 6: a = max(a, b) | help: Replace with `a = min(a, b)` - -ℹ Safe fix -34 34 | b = a -35 35 | -36 36 | # case 5: a = min(a, b) -37 |-if a > b: -38 |- a = b - 37 |+a = min(a, b) -39 38 | -40 39 | # case 6: a = max(a, b) -41 40 | if a < b: +34 | b = a +35 | +36 | # case 5: a = min(a, b) + - if a > b: + - a = b +37 + a = min(a, b) +38 | +39 | # case 6: a = max(a, b) +40 | if a < b: PLR1730 [*] Replace `if` statement with `a = max(a, b)` --> if_stmt_min_max.py:41:1 @@ -127,17 +117,15 @@ PLR1730 [*] Replace `if` statement with `a = max(a, b)` 44 | # case 7: b = min(b, a) | help: Replace with `a = max(a, b)` - -ℹ Safe fix -38 38 | a = b -39 39 | -40 40 | # case 6: a = max(a, b) -41 |-if a < b: -42 |- a = b - 41 |+a = max(a, b) -43 42 | -44 43 | # case 7: b = min(b, a) -45 44 | if a < b: +38 | a = b +39 | +40 | # case 6: a = max(a, b) + - if a < b: + - a = b +41 + a = max(a, b) +42 | +43 | # case 7: b = min(b, a) +44 | if a < b: PLR1730 [*] Replace `if` statement with `b = min(b, a)` --> if_stmt_min_max.py:45:1 @@ -150,17 +138,15 @@ PLR1730 [*] Replace `if` statement with `b = min(b, a)` 48 | # case 8: b = max(b, a) | help: Replace with `b = min(b, a)` - -ℹ Safe fix -42 42 | a = b -43 43 | -44 44 | # case 7: b = min(b, a) -45 |-if a < b: -46 |- b = a - 45 |+b = min(b, a) -47 46 | -48 47 | # case 8: b = max(b, a) -49 48 | if a > b: +42 | a = b +43 | +44 | # case 7: b = min(b, a) + - if a < b: + - b = a +45 + b = min(b, a) +46 | +47 | # case 8: b = max(b, a) +48 | if a > b: PLR1730 [*] Replace `if` statement with `b = max(b, a)` --> if_stmt_min_max.py:49:1 @@ -171,17 +157,15 @@ PLR1730 [*] Replace `if` statement with `b = max(b, a)` | |_________^ | help: Replace with `b = max(b, a)` - -ℹ Safe fix -46 46 | b = a -47 47 | -48 48 | # case 8: b = max(b, a) -49 |-if a > b: -50 |- b = a - 49 |+b = max(b, a) -51 50 | -52 51 | -53 52 | # test cases with assigned variables and primitives +46 | b = a +47 | +48 | # case 8: b = max(b, a) + - if a > b: + - b = a +49 + b = max(b, a) +50 | +51 | +52 | # test cases with assigned variables and primitives PLR1730 [*] Replace `if` statement with `value = max(value, 10)` --> if_stmt_min_max.py:59:1 @@ -194,17 +178,15 @@ PLR1730 [*] Replace `if` statement with `value = max(value, 10)` 62 | # base case 2: value = max(10, value) | help: Replace with `value = max(value, 10)` - -ℹ Safe fix -56 56 | value3 = 3 -57 57 | -58 58 | # base case 6: value = max(value, 10) -59 |-if value < 10: -60 |- value = 10 - 59 |+value = max(value, 10) -61 60 | -62 61 | # base case 2: value = max(10, value) -63 62 | if value <= 10: +56 | value3 = 3 +57 | +58 | # base case 6: value = max(value, 10) + - if value < 10: + - value = 10 +59 + value = max(value, 10) +60 | +61 | # base case 2: value = max(10, value) +62 | if value <= 10: PLR1730 [*] Replace `if` statement with `value = max(10, value)` --> if_stmt_min_max.py:63:1 @@ -217,17 +199,15 @@ PLR1730 [*] Replace `if` statement with `value = max(10, value)` 66 | # base case 6: value = max(value, value2) | help: Replace with `value = max(10, value)` - -ℹ Safe fix -60 60 | value = 10 -61 61 | -62 62 | # base case 2: value = max(10, value) -63 |-if value <= 10: -64 |- value = 10 - 63 |+value = max(10, value) -65 64 | -66 65 | # base case 6: value = max(value, value2) -67 66 | if value < value2: +60 | value = 10 +61 | +62 | # base case 2: value = max(10, value) + - if value <= 10: + - value = 10 +63 + value = max(10, value) +64 | +65 | # base case 6: value = max(value, value2) +66 | if value < value2: PLR1730 [*] Replace `if` statement with `value = max(value, value2)` --> if_stmt_min_max.py:67:1 @@ -240,17 +220,15 @@ PLR1730 [*] Replace `if` statement with `value = max(value, value2)` 70 | # base case 5: value = min(value, 10) | help: Replace with `value = max(value, value2)` - -ℹ Safe fix -64 64 | value = 10 -65 65 | -66 66 | # base case 6: value = max(value, value2) -67 |-if value < value2: -68 |- value = value2 - 67 |+value = max(value, value2) -69 68 | -70 69 | # base case 5: value = min(value, 10) -71 70 | if value > 10: +64 | value = 10 +65 | +66 | # base case 6: value = max(value, value2) + - if value < value2: + - value = value2 +67 + value = max(value, value2) +68 | +69 | # base case 5: value = min(value, 10) +70 | if value > 10: PLR1730 [*] Replace `if` statement with `value = min(value, 10)` --> if_stmt_min_max.py:71:1 @@ -263,17 +241,15 @@ PLR1730 [*] Replace `if` statement with `value = min(value, 10)` 74 | # base case 1: value = min(10, value) | help: Replace with `value = min(value, 10)` - -ℹ Safe fix -68 68 | value = value2 -69 69 | -70 70 | # base case 5: value = min(value, 10) -71 |-if value > 10: -72 |- value = 10 - 71 |+value = min(value, 10) -73 72 | -74 73 | # base case 1: value = min(10, value) -75 74 | if value >= 10: +68 | value = value2 +69 | +70 | # base case 5: value = min(value, 10) + - if value > 10: + - value = 10 +71 + value = min(value, 10) +72 | +73 | # base case 1: value = min(10, value) +74 | if value >= 10: PLR1730 [*] Replace `if` statement with `value = min(10, value)` --> if_stmt_min_max.py:75:1 @@ -286,17 +262,15 @@ PLR1730 [*] Replace `if` statement with `value = min(10, value)` 78 | # base case 5: value = min(value, value2) | help: Replace with `value = min(10, value)` - -ℹ Safe fix -72 72 | value = 10 -73 73 | -74 74 | # base case 1: value = min(10, value) -75 |-if value >= 10: -76 |- value = 10 - 75 |+value = min(10, value) -77 76 | -78 77 | # base case 5: value = min(value, value2) -79 78 | if value > value2: +72 | value = 10 +73 | +74 | # base case 1: value = min(10, value) + - if value >= 10: + - value = 10 +75 + value = min(10, value) +76 | +77 | # base case 5: value = min(value, value2) +78 | if value > value2: PLR1730 [*] Replace `if` statement with `value = min(value, value2)` --> if_stmt_min_max.py:79:1 @@ -307,17 +281,15 @@ PLR1730 [*] Replace `if` statement with `value = min(value, value2)` | |__________________^ | help: Replace with `value = min(value, value2)` - -ℹ Safe fix -76 76 | value = 10 -77 77 | -78 78 | # base case 5: value = min(value, value2) -79 |-if value > value2: -80 |- value = value2 - 79 |+value = min(value, value2) -81 80 | -82 81 | -83 82 | # cases with calls +76 | value = 10 +77 | +78 | # base case 5: value = min(value, value2) + - if value > value2: + - value = value2 +79 + value = min(value, value2) +80 | +81 | +82 | # cases with calls PLR1730 [*] Replace `if` statement with `A1.value = max(A1.value, 10)` --> if_stmt_min_max.py:92:1 @@ -329,17 +301,15 @@ PLR1730 [*] Replace `if` statement with `A1.value = max(A1.value, 10)` 95 | if A1.value > 10: | help: Replace with `A1.value = max(A1.value, 10)` - -ℹ Safe fix -89 89 | A1 = A() -90 90 | -91 91 | -92 |-if A1.value < 10: -93 |- A1.value = 10 - 92 |+A1.value = max(A1.value, 10) -94 93 | -95 94 | if A1.value > 10: -96 95 | A1.value = 10 +89 | A1 = A() +90 | +91 | + - if A1.value < 10: + - A1.value = 10 +92 + A1.value = max(A1.value, 10) +93 | +94 | if A1.value > 10: +95 | A1.value = 10 PLR1730 [*] Replace `if` statement with `A1.value = min(A1.value, 10)` --> if_stmt_min_max.py:95:1 @@ -351,17 +321,15 @@ PLR1730 [*] Replace `if` statement with `A1.value = min(A1.value, 10)` | |_________________^ | help: Replace with `A1.value = min(A1.value, 10)` - -ℹ Safe fix -92 92 | if A1.value < 10: -93 93 | A1.value = 10 -94 94 | -95 |-if A1.value > 10: -96 |- A1.value = 10 - 95 |+A1.value = min(A1.value, 10) -97 96 | -98 97 | -99 98 | class AA: +92 | if A1.value < 10: +93 | A1.value = 10 +94 | + - if A1.value > 10: + - A1.value = 10 +95 + A1.value = min(A1.value, 10) +96 | +97 | +98 | class AA: PLR1730 [*] Replace `if` statement with `A2 = max(A2, A1)` --> if_stmt_min_max.py:119:1 @@ -375,17 +343,16 @@ PLR1730 [*] Replace `if` statement with `A2 = max(A2, A1)` 122 | if A2 <= A1: # [max-instead-of-if] | help: Replace with `A2 = max(A2, A1)` - -ℹ Unsafe fix -116 116 | A1 = AA(0) -117 117 | A2 = AA(3) -118 118 | -119 |-if A2 < A1: # [max-instead-of-if] -120 |- A2 = A1 - 119 |+A2 = max(A2, A1) -121 120 | -122 121 | if A2 <= A1: # [max-instead-of-if] -123 122 | A2 = A1 +116 | A1 = AA(0) +117 | A2 = AA(3) +118 | + - if A2 < A1: # [max-instead-of-if] + - A2 = A1 +119 + A2 = max(A2, A1) +120 | +121 | if A2 <= A1: # [max-instead-of-if] +122 | A2 = A1 +note: This is an unsafe fix and may change runtime behavior PLR1730 [*] Replace `if` statement with `A2 = max(A1, A2)` --> if_stmt_min_max.py:122:1 @@ -399,17 +366,16 @@ PLR1730 [*] Replace `if` statement with `A2 = max(A1, A2)` 125 | if A2 > A1: # [min-instead-of-if] | help: Replace with `A2 = max(A1, A2)` - -ℹ Unsafe fix -119 119 | if A2 < A1: # [max-instead-of-if] -120 120 | A2 = A1 -121 121 | -122 |-if A2 <= A1: # [max-instead-of-if] -123 |- A2 = A1 - 122 |+A2 = max(A1, A2) -124 123 | -125 124 | if A2 > A1: # [min-instead-of-if] -126 125 | A2 = A1 +119 | if A2 < A1: # [max-instead-of-if] +120 | A2 = A1 +121 | + - if A2 <= A1: # [max-instead-of-if] + - A2 = A1 +122 + A2 = max(A1, A2) +123 | +124 | if A2 > A1: # [min-instead-of-if] +125 | A2 = A1 +note: This is an unsafe fix and may change runtime behavior PLR1730 [*] Replace `if` statement with `A2 = min(A2, A1)` --> if_stmt_min_max.py:125:1 @@ -423,17 +389,16 @@ PLR1730 [*] Replace `if` statement with `A2 = min(A2, A1)` 128 | if A2 >= A1: # [min-instead-of-if] | help: Replace with `A2 = min(A2, A1)` - -ℹ Unsafe fix -122 122 | if A2 <= A1: # [max-instead-of-if] -123 123 | A2 = A1 -124 124 | -125 |-if A2 > A1: # [min-instead-of-if] -126 |- A2 = A1 - 125 |+A2 = min(A2, A1) -127 126 | -128 127 | if A2 >= A1: # [min-instead-of-if] -129 128 | A2 = A1 +122 | if A2 <= A1: # [max-instead-of-if] +123 | A2 = A1 +124 | + - if A2 > A1: # [min-instead-of-if] + - A2 = A1 +125 + A2 = min(A2, A1) +126 | +127 | if A2 >= A1: # [min-instead-of-if] +128 | A2 = A1 +note: This is an unsafe fix and may change runtime behavior PLR1730 [*] Replace `if` statement with `A2 = min(A1, A2)` --> if_stmt_min_max.py:128:1 @@ -447,17 +412,16 @@ PLR1730 [*] Replace `if` statement with `A2 = min(A1, A2)` 131 | # Negative | help: Replace with `A2 = min(A1, A2)` - -ℹ Unsafe fix -125 125 | if A2 > A1: # [min-instead-of-if] -126 126 | A2 = A1 -127 127 | -128 |-if A2 >= A1: # [min-instead-of-if] -129 |- A2 = A1 - 128 |+A2 = min(A1, A2) -130 129 | -131 130 | # Negative -132 131 | if value < 10: +125 | if A2 > A1: # [min-instead-of-if] +126 | A2 = A1 +127 | + - if A2 >= A1: # [min-instead-of-if] + - A2 = A1 +128 + A2 = min(A1, A2) +129 | +130 | # Negative +131 | if value < 10: +note: This is an unsafe fix and may change runtime behavior PLR1730 [*] Replace `if` statement with `min` call --> if_stmt_min_max.py:191:1 @@ -473,21 +437,19 @@ PLR1730 [*] Replace `if` statement with `min` call 197 | class Foo: | help: Replace with `min` call - -ℹ Safe fix -188 188 | value = 2 -189 189 | -190 190 | # Parenthesized expressions -191 |-if value.attr > 3: -192 |- ( - 191 |+( -193 192 | value. -194 193 | attr -195 |- ) = 3 - 194 |+ ) = min(value.attr, 3) -196 195 | -197 196 | class Foo: -198 197 | _min = 0 +188 | value = 2 +189 | +190 | # Parenthesized expressions + - if value.attr > 3: + - ( +191 + ( +192 | value. +193 | attr + - ) = 3 +194 + ) = min(value.attr, 3) +195 | +196 | class Foo: +197 | _min = 0 PLR1730 [*] Replace `if` statement with `self._min = min(self._min, value)` --> if_stmt_min_max.py:202:9 @@ -500,17 +462,15 @@ PLR1730 [*] Replace `if` statement with `self._min = min(self._min, value)` 205 | self._max = value | help: Replace with `self._min = min(self._min, value)` - -ℹ Safe fix -199 199 | _max = 0 -200 200 | -201 201 | def foo(self, value) -> None: -202 |- if value < self._min: -203 |- self._min = value - 202 |+ self._min = min(self._min, value) -204 203 | if value > self._max: -205 204 | self._max = value -206 205 | +199 | _max = 0 +200 | +201 | def foo(self, value) -> None: + - if value < self._min: + - self._min = value +202 + self._min = min(self._min, value) +203 | if value > self._max: +204 | self._max = value +205 | PLR1730 [*] Replace `if` statement with `self._max = max(self._max, value)` --> if_stmt_min_max.py:204:9 @@ -524,17 +484,15 @@ PLR1730 [*] Replace `if` statement with `self._max = max(self._max, value)` 207 | if self._min < value: | help: Replace with `self._max = max(self._max, value)` - -ℹ Safe fix -201 201 | def foo(self, value) -> None: -202 202 | if value < self._min: -203 203 | self._min = value -204 |- if value > self._max: -205 |- self._max = value - 204 |+ self._max = max(self._max, value) -206 205 | -207 206 | if self._min < value: -208 207 | self._min = value +201 | def foo(self, value) -> None: +202 | if value < self._min: +203 | self._min = value + - if value > self._max: + - self._max = value +204 + self._max = max(self._max, value) +205 | +206 | if self._min < value: +207 | self._min = value PLR1730 [*] Replace `if` statement with `self._min = max(self._min, value)` --> if_stmt_min_max.py:207:9 @@ -548,17 +506,15 @@ PLR1730 [*] Replace `if` statement with `self._min = max(self._min, value)` 210 | self._max = value | help: Replace with `self._min = max(self._min, value)` - -ℹ Safe fix -204 204 | if value > self._max: -205 205 | self._max = value -206 206 | -207 |- if self._min < value: -208 |- self._min = value - 207 |+ self._min = max(self._min, value) -209 208 | if self._max > value: -210 209 | self._max = value -211 210 | +204 | if value > self._max: +205 | self._max = value +206 | + - if self._min < value: + - self._min = value +207 + self._min = max(self._min, value) +208 | if self._max > value: +209 | self._max = value +210 | PLR1730 [*] Replace `if` statement with `self._max = min(self._max, value)` --> if_stmt_min_max.py:209:9 @@ -572,17 +528,15 @@ PLR1730 [*] Replace `if` statement with `self._max = min(self._max, value)` 212 | if value <= self._min: | help: Replace with `self._max = min(self._max, value)` - -ℹ Safe fix -206 206 | -207 207 | if self._min < value: -208 208 | self._min = value -209 |- if self._max > value: -210 |- self._max = value - 209 |+ self._max = min(self._max, value) -211 210 | -212 211 | if value <= self._min: -213 212 | self._min = value +206 | +207 | if self._min < value: +208 | self._min = value + - if self._max > value: + - self._max = value +209 + self._max = min(self._max, value) +210 | +211 | if value <= self._min: +212 | self._min = value PLR1730 [*] Replace `if` statement with `self._min = min(value, self._min)` --> if_stmt_min_max.py:212:9 @@ -596,17 +550,15 @@ PLR1730 [*] Replace `if` statement with `self._min = min(value, self._min)` 215 | self._max = value | help: Replace with `self._min = min(value, self._min)` - -ℹ Safe fix -209 209 | if self._max > value: -210 210 | self._max = value -211 211 | -212 |- if value <= self._min: -213 |- self._min = value - 212 |+ self._min = min(value, self._min) -214 213 | if value >= self._max: -215 214 | self._max = value -216 215 | +209 | if self._max > value: +210 | self._max = value +211 | + - if value <= self._min: + - self._min = value +212 + self._min = min(value, self._min) +213 | if value >= self._max: +214 | self._max = value +215 | PLR1730 [*] Replace `if` statement with `self._max = max(value, self._max)` --> if_stmt_min_max.py:214:9 @@ -620,17 +572,15 @@ PLR1730 [*] Replace `if` statement with `self._max = max(value, self._max)` 217 | if self._min <= value: | help: Replace with `self._max = max(value, self._max)` - -ℹ Safe fix -211 211 | -212 212 | if value <= self._min: -213 213 | self._min = value -214 |- if value >= self._max: -215 |- self._max = value - 214 |+ self._max = max(value, self._max) -216 215 | -217 216 | if self._min <= value: -218 217 | self._min = value +211 | +212 | if value <= self._min: +213 | self._min = value + - if value >= self._max: + - self._max = value +214 + self._max = max(value, self._max) +215 | +216 | if self._min <= value: +217 | self._min = value PLR1730 [*] Replace `if` statement with `self._min = max(value, self._min)` --> if_stmt_min_max.py:217:9 @@ -644,17 +594,15 @@ PLR1730 [*] Replace `if` statement with `self._min = max(value, self._min)` 220 | self._max = value | help: Replace with `self._min = max(value, self._min)` - -ℹ Safe fix -214 214 | if value >= self._max: -215 215 | self._max = value -216 216 | -217 |- if self._min <= value: -218 |- self._min = value - 217 |+ self._min = max(value, self._min) -219 218 | if self._max >= value: -220 219 | self._max = value -221 220 | +214 | if value >= self._max: +215 | self._max = value +216 | + - if self._min <= value: + - self._min = value +217 + self._min = max(value, self._min) +218 | if self._max >= value: +219 | self._max = value +220 | PLR1730 [*] Replace `if` statement with `self._max = min(value, self._max)` --> if_stmt_min_max.py:219:9 @@ -666,17 +614,15 @@ PLR1730 [*] Replace `if` statement with `self._max = min(value, self._max)` | |_____________________________^ | help: Replace with `self._max = min(value, self._max)` - -ℹ Safe fix -216 216 | -217 217 | if self._min <= value: -218 218 | self._min = value -219 |- if self._max >= value: -220 |- self._max = value - 219 |+ self._max = min(value, self._max) -221 220 | -222 221 | -223 222 | counter = {"a": 0, "b": 0} +216 | +217 | if self._min <= value: +218 | self._min = value + - if self._max >= value: + - self._max = value +219 + self._max = min(value, self._max) +220 | +221 | +222 | counter = {"a": 0, "b": 0} PLR1730 [*] Replace `if` statement with `counter["a"] = max(counter["b"], counter["a"])` --> if_stmt_min_max.py:226:1 @@ -689,17 +635,15 @@ PLR1730 [*] Replace `if` statement with `counter["a"] = max(counter["b"], counte 229 | # case 3: counter["b"] = min(counter["a"], counter["b"]) | help: Replace with `counter["a"] = max(counter["b"], counter["a"])` - -ℹ Safe fix -223 223 | counter = {"a": 0, "b": 0} -224 224 | -225 225 | # base case 2: counter["a"] = max(counter["b"], counter["a"]) -226 |-if counter["a"] <= counter["b"]: -227 |- counter["a"] = counter["b"] - 226 |+counter["a"] = max(counter["b"], counter["a"]) -228 227 | -229 228 | # case 3: counter["b"] = min(counter["a"], counter["b"]) -230 229 | if counter["a"] <= counter["b"]: +223 | counter = {"a": 0, "b": 0} +224 | +225 | # base case 2: counter["a"] = max(counter["b"], counter["a"]) + - if counter["a"] <= counter["b"]: + - counter["a"] = counter["b"] +226 + counter["a"] = max(counter["b"], counter["a"]) +227 | +228 | # case 3: counter["b"] = min(counter["a"], counter["b"]) +229 | if counter["a"] <= counter["b"]: PLR1730 [*] Replace `if` statement with `counter["b"] = min(counter["a"], counter["b"])` --> if_stmt_min_max.py:230:1 @@ -712,17 +656,15 @@ PLR1730 [*] Replace `if` statement with `counter["b"] = min(counter["a"], counte 233 | # case 5: counter["a"] = min(counter["a"], counter["b"]) | help: Replace with `counter["b"] = min(counter["a"], counter["b"])` - -ℹ Safe fix -227 227 | counter["a"] = counter["b"] -228 228 | -229 229 | # case 3: counter["b"] = min(counter["a"], counter["b"]) -230 |-if counter["a"] <= counter["b"]: -231 |- counter["b"] = counter["a"] - 230 |+counter["b"] = min(counter["a"], counter["b"]) -232 231 | -233 232 | # case 5: counter["a"] = min(counter["a"], counter["b"]) -234 233 | if counter["a"] > counter["b"]: +227 | counter["a"] = counter["b"] +228 | +229 | # case 3: counter["b"] = min(counter["a"], counter["b"]) + - if counter["a"] <= counter["b"]: + - counter["b"] = counter["a"] +230 + counter["b"] = min(counter["a"], counter["b"]) +231 | +232 | # case 5: counter["a"] = min(counter["a"], counter["b"]) +233 | if counter["a"] > counter["b"]: PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counter["a"])` --> if_stmt_min_max.py:234:1 @@ -735,17 +677,15 @@ PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counte 237 | # case 8: counter["a"] = max(counter["b"], counter["a"]) | help: Replace with `counter["b"] = max(counter["b"], counter["a"])` - -ℹ Safe fix -231 231 | counter["b"] = counter["a"] -232 232 | -233 233 | # case 5: counter["a"] = min(counter["a"], counter["b"]) -234 |-if counter["a"] > counter["b"]: -235 |- counter["b"] = counter["a"] - 234 |+counter["b"] = max(counter["b"], counter["a"]) -236 235 | -237 236 | # case 8: counter["a"] = max(counter["b"], counter["a"]) -238 237 | if counter["a"] > counter["b"]: +231 | counter["b"] = counter["a"] +232 | +233 | # case 5: counter["a"] = min(counter["a"], counter["b"]) + - if counter["a"] > counter["b"]: + - counter["b"] = counter["a"] +234 + counter["b"] = max(counter["b"], counter["a"]) +235 | +236 | # case 8: counter["a"] = max(counter["b"], counter["a"]) +237 | if counter["a"] > counter["b"]: PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counter["a"])` --> if_stmt_min_max.py:238:1 @@ -758,17 +698,15 @@ PLR1730 [*] Replace `if` statement with `counter["b"] = max(counter["b"], counte 241 | # https://github.com/astral-sh/ruff/issues/17311 | help: Replace with `counter["b"] = max(counter["b"], counter["a"])` - -ℹ Safe fix -235 235 | counter["b"] = counter["a"] -236 236 | -237 237 | # case 8: counter["a"] = max(counter["b"], counter["a"]) -238 |-if counter["a"] > counter["b"]: -239 |- counter["b"] = counter["a"] - 238 |+counter["b"] = max(counter["b"], counter["a"]) -240 239 | -241 240 | # https://github.com/astral-sh/ruff/issues/17311 -242 241 | +235 | counter["b"] = counter["a"] +236 | +237 | # case 8: counter["a"] = max(counter["b"], counter["a"]) + - if counter["a"] > counter["b"]: + - counter["b"] = counter["a"] +238 + counter["b"] = max(counter["b"], counter["a"]) +239 | +240 | # https://github.com/astral-sh/ruff/issues/17311 +241 | PLR1730 [*] Replace `if` statement with `a = min(b, a)` --> if_stmt_min_max.py:245:1 @@ -783,18 +721,17 @@ PLR1730 [*] Replace `if` statement with `a = min(b, a)` 249 | # fix marked safe as preserve comments | help: Replace with `a = min(b, a)` - -ℹ Unsafe fix -242 242 | -243 243 | # fix marked unsafe as delete comments -244 244 | a, b = [], [] -245 |-if a >= b: -246 |- # very important comment -247 |- a = b - 245 |+a = min(b, a) -248 246 | -249 247 | # fix marked safe as preserve comments -250 248 | if a >= b: +242 | +243 | # fix marked unsafe as delete comments +244 | a, b = [], [] + - if a >= b: + - # very important comment + - a = b +245 + a = min(b, a) +246 | +247 | # fix marked safe as preserve comments +248 | if a >= b: +note: This is an unsafe fix and may change runtime behavior PLR1730 [*] Replace `if` statement with `a = min(b, a)` --> if_stmt_min_max.py:250:1 @@ -805,11 +742,9 @@ PLR1730 [*] Replace `if` statement with `a = min(b, a)` | |_________^ | help: Replace with `a = min(b, a)` - -ℹ Safe fix -247 247 | a = b -248 248 | -249 249 | # fix marked safe as preserve comments -250 |-if a >= b: -251 |- a = b # very important comment - 250 |+a = min(b, a) # very important comment +247 | a = b +248 | +249 | # fix marked safe as preserve comments + - if a >= b: + - a = b # very important comment +250 + a = min(b, a) # very important comment diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap index 8445685d8b..4709d8b257 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1733_unnecessary_dict_index_lookup.py.snap @@ -11,16 +11,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key 6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 | help: Use existing variable - -ℹ Safe fix -1 1 | FRUITS = {"apple": 1, "orange": 10, "berry": 22} -2 2 | -3 3 | def fix_these(): -4 |- [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()] # PLR1733 - 4 |+ [fruit_count for fruit_name, fruit_count in FRUITS.items()] # PLR1733 -5 5 | {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 -6 6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 -7 7 | +1 | FRUITS = {"apple": 1, "orange": 10, "berry": 22} +2 | +3 | def fix_these(): + - [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()] # PLR1733 +4 + [fruit_count for fruit_name, fruit_count in FRUITS.items()] # PLR1733 +5 | {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +7 | PLR1733 [*] Unnecessary lookup of dictionary value by key --> unnecessary_dict_index_lookup.py:5:6 @@ -32,16 +30,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key 6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 | help: Use existing variable - -ℹ Safe fix -2 2 | -3 3 | def fix_these(): -4 4 | [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()] # PLR1733 -5 |- {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 - 5 |+ {fruit_count for fruit_name, fruit_count in FRUITS.items()} # PLR1733 -6 6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 -7 7 | -8 8 | for fruit_name, fruit_count in FRUITS.items(): +2 | +3 | def fix_these(): +4 | [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()] # PLR1733 + - {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +5 + {fruit_count for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +7 | +8 | for fruit_name, fruit_count in FRUITS.items(): PLR1733 [*] Unnecessary lookup of dictionary value by key --> unnecessary_dict_index_lookup.py:6:18 @@ -54,16 +50,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key 8 | for fruit_name, fruit_count in FRUITS.items(): | help: Use existing variable - -ℹ Safe fix -3 3 | def fix_these(): -4 4 | [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()] # PLR1733 -5 5 | {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 -6 |- {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 - 6 |+ {fruit_name: fruit_count for fruit_name, fruit_count in FRUITS.items()} # PLR1733 -7 7 | -8 8 | for fruit_name, fruit_count in FRUITS.items(): -9 9 | print(FRUITS[fruit_name]) # PLR1733 +3 | def fix_these(): +4 | [FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()] # PLR1733 +5 | {FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 + - {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +6 + {fruit_name: fruit_count for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +7 | +8 | for fruit_name, fruit_count in FRUITS.items(): +9 | print(FRUITS[fruit_name]) # PLR1733 PLR1733 [*] Unnecessary lookup of dictionary value by key --> unnecessary_dict_index_lookup.py:9:15 @@ -75,16 +69,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key 11 | assert FRUITS[fruit_name] == "pear" # PLR1733 | help: Use existing variable - -ℹ Safe fix -6 6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 -7 7 | -8 8 | for fruit_name, fruit_count in FRUITS.items(): -9 |- print(FRUITS[fruit_name]) # PLR1733 - 9 |+ print(fruit_count) # PLR1733 -10 10 | blah = FRUITS[fruit_name] # PLR1733 -11 11 | assert FRUITS[fruit_name] == "pear" # PLR1733 -12 12 | +6 | {fruit_name: FRUITS[fruit_name] for fruit_name, fruit_count in FRUITS.items()} # PLR1733 +7 | +8 | for fruit_name, fruit_count in FRUITS.items(): + - print(FRUITS[fruit_name]) # PLR1733 +9 + print(fruit_count) # PLR1733 +10 | blah = FRUITS[fruit_name] # PLR1733 +11 | assert FRUITS[fruit_name] == "pear" # PLR1733 +12 | PLR1733 [*] Unnecessary lookup of dictionary value by key --> unnecessary_dict_index_lookup.py:10:16 @@ -96,16 +88,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key 11 | assert FRUITS[fruit_name] == "pear" # PLR1733 | help: Use existing variable - -ℹ Safe fix -7 7 | -8 8 | for fruit_name, fruit_count in FRUITS.items(): -9 9 | print(FRUITS[fruit_name]) # PLR1733 -10 |- blah = FRUITS[fruit_name] # PLR1733 - 10 |+ blah = fruit_count # PLR1733 -11 11 | assert FRUITS[fruit_name] == "pear" # PLR1733 -12 12 | -13 13 | +7 | +8 | for fruit_name, fruit_count in FRUITS.items(): +9 | print(FRUITS[fruit_name]) # PLR1733 + - blah = FRUITS[fruit_name] # PLR1733 +10 + blah = fruit_count # PLR1733 +11 | assert FRUITS[fruit_name] == "pear" # PLR1733 +12 | +13 | PLR1733 [*] Unnecessary lookup of dictionary value by key --> unnecessary_dict_index_lookup.py:11:16 @@ -116,16 +106,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key | ^^^^^^^^^^^^^^^^^^ | help: Use existing variable - -ℹ Safe fix -8 8 | for fruit_name, fruit_count in FRUITS.items(): -9 9 | print(FRUITS[fruit_name]) # PLR1733 -10 10 | blah = FRUITS[fruit_name] # PLR1733 -11 |- assert FRUITS[fruit_name] == "pear" # PLR1733 - 11 |+ assert fruit_count == "pear" # PLR1733 -12 12 | -13 13 | -14 14 | def dont_fix_these(): +8 | for fruit_name, fruit_count in FRUITS.items(): +9 | print(FRUITS[fruit_name]) # PLR1733 +10 | blah = FRUITS[fruit_name] # PLR1733 + - assert FRUITS[fruit_name] == "pear" # PLR1733 +11 + assert fruit_count == "pear" # PLR1733 +12 | +13 | +14 | def dont_fix_these(): PLR1733 [*] Unnecessary lookup of dictionary value by key --> unnecessary_dict_index_lookup.py:50:51 @@ -138,16 +126,14 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key 52 | mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))] # PLR1733 | help: Use existing variable - -ℹ Safe fix -47 47 | mapped_label = client_label_map(label) -48 48 | if mapped_label in mapped_arrays: -49 49 | for i in range(len(array)): -50 |- mapped_arrays[mapped_label][i] += value_arrays[label][i] # PLR1733 - 50 |+ mapped_arrays[mapped_label][i] += array[i] # PLR1733 -51 51 | else: -52 52 | mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))] # PLR1733 -53 53 | return mapped_arrays +47 | mapped_label = client_label_map(label) +48 | if mapped_label in mapped_arrays: +49 | for i in range(len(array)): + - mapped_arrays[mapped_label][i] += value_arrays[label][i] # PLR1733 +50 + mapped_arrays[mapped_label][i] += array[i] # PLR1733 +51 | else: +52 | mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))] # PLR1733 +53 | return mapped_arrays PLR1733 [*] Unnecessary lookup of dictionary value by key --> unnecessary_dict_index_lookup.py:52:44 @@ -159,11 +145,9 @@ PLR1733 [*] Unnecessary lookup of dictionary value by key 53 | return mapped_arrays | help: Use existing variable - -ℹ Safe fix -49 49 | for i in range(len(array)): -50 50 | mapped_arrays[mapped_label][i] += value_arrays[label][i] # PLR1733 -51 51 | else: -52 |- mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))] # PLR1733 - 52 |+ mapped_arrays[mapped_label] = [array[i] for i in range(len(array))] # PLR1733 -53 53 | return mapped_arrays +49 | for i in range(len(array)): +50 | mapped_arrays[mapped_label][i] += value_arrays[label][i] # PLR1733 +51 | else: + - mapped_arrays[mapped_label] = [value_arrays[label][i] for i in range(len(array))] # PLR1733 +52 + mapped_arrays[mapped_label] = [array[i] for i in range(len(array))] # PLR1733 +53 | return mapped_arrays diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap index 037f20311c..6154cbf825 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap @@ -11,16 +11,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 | help: Use the loop variable directly - -ℹ Safe fix -4 4 | -5 5 | -6 6 | def fix_these(): -7 |- [letters[index] for index, letter in enumerate(letters)] # PLR1736 - 7 |+ [letter for index, letter in enumerate(letters)] # PLR1736 -8 8 | {letters[index] for index, letter in enumerate(letters)} # PLR1736 -9 9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 -10 10 | +4 | +5 | +6 | def fix_these(): + - [letters[index] for index, letter in enumerate(letters)] # PLR1736 +7 + [letter for index, letter in enumerate(letters)] # PLR1736 +8 | {letters[index] for index, letter in enumerate(letters)} # PLR1736 +9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 +10 | PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:8:6 @@ -32,16 +30,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 | help: Use the loop variable directly - -ℹ Safe fix -5 5 | -6 6 | def fix_these(): -7 7 | [letters[index] for index, letter in enumerate(letters)] # PLR1736 -8 |- {letters[index] for index, letter in enumerate(letters)} # PLR1736 - 8 |+ {letter for index, letter in enumerate(letters)} # PLR1736 -9 9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 -10 10 | -11 11 | for index, letter in enumerate(letters): +5 | +6 | def fix_these(): +7 | [letters[index] for index, letter in enumerate(letters)] # PLR1736 + - {letters[index] for index, letter in enumerate(letters)} # PLR1736 +8 + {letter for index, letter in enumerate(letters)} # PLR1736 +9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 +10 | +11 | for index, letter in enumerate(letters): PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:9:14 @@ -54,16 +50,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 11 | for index, letter in enumerate(letters): | help: Use the loop variable directly - -ℹ Safe fix -6 6 | def fix_these(): -7 7 | [letters[index] for index, letter in enumerate(letters)] # PLR1736 -8 8 | {letters[index] for index, letter in enumerate(letters)} # PLR1736 -9 |- {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 - 9 |+ {letter: letter for index, letter in enumerate(letters)} # PLR1736 -10 10 | -11 11 | for index, letter in enumerate(letters): -12 12 | print(letters[index]) # PLR1736 +6 | def fix_these(): +7 | [letters[index] for index, letter in enumerate(letters)] # PLR1736 +8 | {letters[index] for index, letter in enumerate(letters)} # PLR1736 + - {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 +9 + {letter: letter for index, letter in enumerate(letters)} # PLR1736 +10 | +11 | for index, letter in enumerate(letters): +12 | print(letters[index]) # PLR1736 PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:12:15 @@ -75,16 +69,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 14 | assert letters[index] == "d" # PLR1736 | help: Use the loop variable directly - -ℹ Safe fix -9 9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 -10 10 | -11 11 | for index, letter in enumerate(letters): -12 |- print(letters[index]) # PLR1736 - 12 |+ print(letter) # PLR1736 -13 13 | blah = letters[index] # PLR1736 -14 14 | assert letters[index] == "d" # PLR1736 -15 15 | +9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736 +10 | +11 | for index, letter in enumerate(letters): + - print(letters[index]) # PLR1736 +12 + print(letter) # PLR1736 +13 | blah = letters[index] # PLR1736 +14 | assert letters[index] == "d" # PLR1736 +15 | PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:13:16 @@ -96,16 +88,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 14 | assert letters[index] == "d" # PLR1736 | help: Use the loop variable directly - -ℹ Safe fix -10 10 | -11 11 | for index, letter in enumerate(letters): -12 12 | print(letters[index]) # PLR1736 -13 |- blah = letters[index] # PLR1736 - 13 |+ blah = letter # PLR1736 -14 14 | assert letters[index] == "d" # PLR1736 -15 15 | -16 16 | for index, letter in builtins.enumerate(letters): +10 | +11 | for index, letter in enumerate(letters): +12 | print(letters[index]) # PLR1736 + - blah = letters[index] # PLR1736 +13 + blah = letter # PLR1736 +14 | assert letters[index] == "d" # PLR1736 +15 | +16 | for index, letter in builtins.enumerate(letters): PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:14:16 @@ -118,16 +108,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 16 | for index, letter in builtins.enumerate(letters): | help: Use the loop variable directly - -ℹ Safe fix -11 11 | for index, letter in enumerate(letters): -12 12 | print(letters[index]) # PLR1736 -13 13 | blah = letters[index] # PLR1736 -14 |- assert letters[index] == "d" # PLR1736 - 14 |+ assert letter == "d" # PLR1736 -15 15 | -16 16 | for index, letter in builtins.enumerate(letters): -17 17 | print(letters[index]) # PLR1736 +11 | for index, letter in enumerate(letters): +12 | print(letters[index]) # PLR1736 +13 | blah = letters[index] # PLR1736 + - assert letters[index] == "d" # PLR1736 +14 + assert letter == "d" # PLR1736 +15 | +16 | for index, letter in builtins.enumerate(letters): +17 | print(letters[index]) # PLR1736 PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:17:15 @@ -139,16 +127,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 19 | assert letters[index] == "d" # PLR1736 | help: Use the loop variable directly - -ℹ Safe fix -14 14 | assert letters[index] == "d" # PLR1736 -15 15 | -16 16 | for index, letter in builtins.enumerate(letters): -17 |- print(letters[index]) # PLR1736 - 17 |+ print(letter) # PLR1736 -18 18 | blah = letters[index] # PLR1736 -19 19 | assert letters[index] == "d" # PLR1736 -20 20 | +14 | assert letters[index] == "d" # PLR1736 +15 | +16 | for index, letter in builtins.enumerate(letters): + - print(letters[index]) # PLR1736 +17 + print(letter) # PLR1736 +18 | blah = letters[index] # PLR1736 +19 | assert letters[index] == "d" # PLR1736 +20 | PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:18:16 @@ -160,16 +146,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 19 | assert letters[index] == "d" # PLR1736 | help: Use the loop variable directly - -ℹ Safe fix -15 15 | -16 16 | for index, letter in builtins.enumerate(letters): -17 17 | print(letters[index]) # PLR1736 -18 |- blah = letters[index] # PLR1736 - 18 |+ blah = letter # PLR1736 -19 19 | assert letters[index] == "d" # PLR1736 -20 20 | -21 21 | +15 | +16 | for index, letter in builtins.enumerate(letters): +17 | print(letters[index]) # PLR1736 + - blah = letters[index] # PLR1736 +18 + blah = letter # PLR1736 +19 | assert letters[index] == "d" # PLR1736 +20 | +21 | PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:19:16 @@ -180,16 +164,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop | ^^^^^^^^^^^^^^ | help: Use the loop variable directly - -ℹ Safe fix -16 16 | for index, letter in builtins.enumerate(letters): -17 17 | print(letters[index]) # PLR1736 -18 18 | blah = letters[index] # PLR1736 -19 |- assert letters[index] == "d" # PLR1736 - 19 |+ assert letter == "d" # PLR1736 -20 20 | -21 21 | -22 22 | def dont_fix_these(): +16 | for index, letter in builtins.enumerate(letters): +17 | print(letters[index]) # PLR1736 +18 | blah = letters[index] # PLR1736 + - assert letters[index] == "d" # PLR1736 +19 + assert letter == "d" # PLR1736 +20 | +21 | +22 | def dont_fix_these(): PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:74:15 @@ -202,16 +184,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop 76 | # PLR1736 | help: Use the loop variable directly - -ℹ Safe fix -71 71 | -72 72 | # PLR1736 -73 73 | for index, list_item in enumerate(some_list, start=0): -74 |- print(some_list[index]) - 74 |+ print(list_item) -75 75 | -76 76 | # PLR1736 -77 77 | for index, list_item in enumerate(some_list): +71 | +72 | # PLR1736 +73 | for index, list_item in enumerate(some_list, start=0): + - print(some_list[index]) +74 + print(list_item) +75 | +76 | # PLR1736 +77 | for index, list_item in enumerate(some_list): PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:78:15 @@ -222,16 +202,14 @@ PLR1736 [*] List index lookup in `enumerate()` loop | ^^^^^^^^^^^^^^^^ | help: Use the loop variable directly - -ℹ Safe fix -75 75 | -76 76 | # PLR1736 -77 77 | for index, list_item in enumerate(some_list): -78 |- print(some_list[index]) - 78 |+ print(list_item) -79 79 | -80 80 | -81 81 | def nested_index_lookup(): +75 | +76 | # PLR1736 +77 | for index, list_item in enumerate(some_list): + - print(some_list[index]) +78 + print(list_item) +79 | +80 | +81 | def nested_index_lookup(): PLR1736 [*] List index lookup in `enumerate()` loop --> unnecessary_list_index_lookup.py:85:18 @@ -242,10 +220,8 @@ PLR1736 [*] List index lookup in `enumerate()` loop | ^^^^^^^^^^^^^^^^^^^ | help: Use the loop variable directly - -ℹ Safe fix -82 82 | data = {"a": 1, "b": 2} -83 83 | column_names = ["a", "b"] -84 84 | for index, column_name in enumerate(column_names): -85 |- _ = data[column_names[index]] # PLR1736 - 85 |+ _ = data[column_name] # PLR1736 +82 | data = {"a": 1, "b": 2} +83 | column_names = ["a", "b"] +84 | for index, column_name in enumerate(column_names): + - _ = data[column_names[index]] # PLR1736 +85 + _ = data[column_name] # PLR1736 diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap index 34f07f7c76..625c658359 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment.py.snap @@ -12,14 +12,12 @@ PLR2044 [*] Line with empty comment 5 | # | help: Delete the empty comment - -ℹ Safe fix -1 1 | # this line has a non-empty comment and is OK -2 2 | # this line is also OK, but the three following lines are not -3 |-# -4 3 | # -5 4 | # -6 5 | +1 | # this line has a non-empty comment and is OK +2 | # this line is also OK, but the three following lines are not + - # +3 | # +4 | # +5 | PLR2044 [*] Line with empty comment --> empty_comment.py:4:5 @@ -31,15 +29,13 @@ PLR2044 [*] Line with empty comment 5 | # | help: Delete the empty comment - -ℹ Safe fix -1 1 | # this line has a non-empty comment and is OK -2 2 | # this line is also OK, but the three following lines are not -3 3 | # -4 |- # -5 4 | # -6 5 | -7 6 | # this non-empty comment has trailing whitespace and is OK +1 | # this line has a non-empty comment and is OK +2 | # this line is also OK, but the three following lines are not +3 | # + - # +4 | # +5 | +6 | # this non-empty comment has trailing whitespace and is OK PLR2044 [*] Line with empty comment --> empty_comment.py:5:9 @@ -52,15 +48,13 @@ PLR2044 [*] Line with empty comment 7 | # this non-empty comment has trailing whitespace and is OK | help: Delete the empty comment - -ℹ Safe fix -2 2 | # this line is also OK, but the three following lines are not -3 3 | # -4 4 | # -5 |- # -6 5 | -7 6 | # this non-empty comment has trailing whitespace and is OK -8 7 | +2 | # this line is also OK, but the three following lines are not +3 | # +4 | # + - # +5 | +6 | # this non-empty comment has trailing whitespace and is OK +7 | PLR2044 [*] Line with empty comment --> empty_comment.py:18:11 @@ -70,16 +64,14 @@ PLR2044 [*] Line with empty comment | ^ | help: Delete the empty comment - -ℹ Safe fix -15 15 | -16 16 | -17 17 | def foo(): # this comment is OK, the one below is not -18 |- pass # - 18 |+ pass -19 19 | -20 20 | -21 21 | # the lines below have no comments and are OK +15 | +16 | +17 | def foo(): # this comment is OK, the one below is not + - pass # +18 + pass +19 | +20 | +21 | # the lines below have no comments and are OK PLR2044 [*] Line with empty comment --> empty_comment.py:44:1 @@ -91,15 +83,13 @@ PLR2044 [*] Line with empty comment 45 | # | help: Delete the empty comment - -ℹ Safe fix -42 42 | # These should be removed, despite being an empty "block comment". -43 43 | -44 44 | # -45 |-# -46 45 | -47 46 | # These should also be removed. -48 47 | +42 | # These should be removed, despite being an empty "block comment". +43 | +44 | # + - # +45 | +46 | # These should also be removed. +47 | PLR2044 [*] Line with empty comment --> empty_comment.py:45:1 @@ -111,15 +101,13 @@ PLR2044 [*] Line with empty comment 47 | # These should also be removed. | help: Delete the empty comment - -ℹ Safe fix -42 42 | # These should be removed, despite being an empty "block comment". -43 43 | -44 44 | # -45 |-# -46 45 | -47 46 | # These should also be removed. -48 47 | +42 | # These should be removed, despite being an empty "block comment". +43 | +44 | # + - # +45 | +46 | # These should also be removed. +47 | PLR2044 [*] Line with empty comment --> empty_comment.py:58:2 @@ -129,10 +117,8 @@ PLR2044 [*] Line with empty comment | ^ | help: Delete the empty comment - -ℹ Safe fix -55 55 | # This should be removed. -56 56 | -57 57 | α = 1 -58 |-α# - 58 |+α +55 | # This should be removed. +56 | +57 | α = 1 + - α# +58 + α diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap index bd171d35a0..0be542bd04 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR2044_empty_comment_line_continuation.py.snap @@ -10,12 +10,10 @@ PLR2044 [*] Line with empty comment 3 | # | help: Delete the empty comment - -ℹ Safe fix -1 |-# -2 1 | x = 0 \ -3 2 | # -4 3 | +1 + - # +1 | x = 0 \ +2 | # +3 | +1 PLR2044 [*] Line with empty comment --> empty_comment_line_continuation.py:3:1 @@ -28,11 +26,9 @@ PLR2044 [*] Line with empty comment 5 | print(x) | help: Delete the empty comment - -ℹ Safe fix -1 1 | # -2 2 | x = 0 \ -3 |-# - 3 |+ -4 4 | +1 -5 5 | print(x) +1 | # +2 | x = 0 \ + - # +3 + +4 | +1 +5 | print(x) diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap index e85ad02790..b22d71e821 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR5501_collapsible_else_if.py.snap @@ -12,19 +12,17 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 39 | pass | help: Convert to `elif` - -ℹ Safe fix -34 34 | def not_ok0(): -35 35 | if 1: -36 36 | pass -37 |- else: -38 |- if 2: -39 |- pass - 37 |+ elif 2: - 38 |+ pass -40 39 | -41 40 | -42 41 | def not_ok1(): +34 | def not_ok0(): +35 | if 1: +36 | pass + - else: + - if 2: + - pass +37 + elif 2: +38 + pass +39 | +40 | +41 | def not_ok1(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:45:5 @@ -38,22 +36,20 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 48 | else: | help: Convert to `elif` - -ℹ Safe fix -42 42 | def not_ok1(): -43 43 | if 1: -44 44 | pass - 45 |+ elif 2: - 46 |+ pass -45 47 | else: -46 |- if 2: -47 |- pass -48 |- else: -49 |- pass - 48 |+ pass -50 49 | -51 50 | -52 51 | def not_ok1_with_comments(): +42 | def not_ok1(): +43 | if 1: +44 | pass +45 + elif 2: +46 + pass +47 | else: + - if 2: + - pass + - else: + - pass +48 + pass +49 | +50 | +51 | def not_ok1_with_comments(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:55:5 @@ -68,24 +64,22 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 59 | else: | help: Convert to `elif` - -ℹ Safe fix -52 52 | def not_ok1_with_comments(): -53 53 | if 1: -54 54 | pass - 55 |+ # inner comment - 56 |+ elif 2: - 57 |+ pass -55 58 | else: -56 |- # inner comment -57 |- if 2: -58 |- pass -59 |- else: -60 |- pass # final pass comment - 59 |+ pass # final pass comment -61 60 | -62 61 | -63 62 | # Regression test for https://github.com/apache/airflow/blob/f1e1cdcc3b2826e68ba133f350300b5065bbca33/airflow/models/dag.py#L1737 +52 | def not_ok1_with_comments(): +53 | if 1: +54 | pass +55 + # inner comment +56 + elif 2: +57 + pass +58 | else: + - # inner comment + - if 2: + - pass + - else: + - pass # final pass comment +59 + pass # final pass comment +60 | +61 | +62 | # Regression test for https://github.com/apache/airflow/blob/f1e1cdcc3b2826e68ba133f350300b5065bbca33/airflow/models/dag.py#L1737 PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:69:5 @@ -99,22 +93,20 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 72 | else: | help: Convert to `elif` - -ℹ Safe fix -66 66 | print(1) -67 67 | elif True: -68 68 | print(2) - 69 |+ elif True: - 70 |+ print(3) -69 71 | else: -70 |- if True: -71 |- print(3) -72 |- else: -73 |- print(4) - 72 |+ print(4) -74 73 | -75 74 | -76 75 | def not_ok3(): +66 | print(1) +67 | elif True: +68 | print(2) +69 + elif True: +70 + print(3) +71 | else: + - if True: + - print(3) + - else: + - print(4) +72 + print(4) +73 | +74 | +75 | def not_ok3(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:79:5 @@ -127,19 +119,17 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 81 | else: pass | help: Convert to `elif` - -ℹ Safe fix -76 76 | def not_ok3(): -77 77 | if 1: -78 78 | pass -79 |- else: -80 |- if 2: pass -81 |- else: pass - 79 |+ elif 2: pass - 80 |+ else: pass -82 81 | -83 82 | -84 83 | def not_ok4(): +76 | def not_ok3(): +77 | if 1: +78 | pass + - else: + - if 2: pass + - else: pass +79 + elif 2: pass +80 + else: pass +81 | +82 | +83 | def not_ok4(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:87:5 @@ -153,20 +143,18 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 90 | pass | help: Convert to `elif` - -ℹ Safe fix -84 84 | def not_ok4(): -85 85 | if 1: -86 86 | pass - 87 |+ elif 2: pass -87 88 | else: -88 |- if 2: pass -89 |- else: -90 |- pass - 89 |+ pass -91 90 | -92 91 | -93 92 | def not_ok5(): +84 | def not_ok4(): +85 | if 1: +86 | pass +87 + elif 2: pass +88 | else: + - if 2: pass + - else: + - pass +89 + pass +90 | +91 | +92 | def not_ok5(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:96:5 @@ -180,21 +168,19 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 99 | else: pass | help: Convert to `elif` - -ℹ Safe fix -93 93 | def not_ok5(): -94 94 | if 1: -95 95 | pass -96 |- else: -97 |- if 2: -98 |- pass -99 |- else: pass - 96 |+ elif 2: - 97 |+ pass - 98 |+ else: pass -100 99 | -101 100 | -102 101 | def not_ok1_with_multiline_comments(): +93 | def not_ok5(): +94 | if 1: +95 | pass + - else: + - if 2: + - pass + - else: pass +96 + elif 2: +97 + pass +98 + else: pass +99 | +100 | +101 | def not_ok1_with_multiline_comments(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:105:5 @@ -210,26 +196,24 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 110 | else: | help: Convert to `elif` - -ℹ Safe fix -102 102 | def not_ok1_with_multiline_comments(): -103 103 | if 1: -104 104 | pass - 105 |+ # inner comment which happens - 106 |+ # to be longer than one line - 107 |+ elif 2: - 108 |+ pass -105 109 | else: -106 |- # inner comment which happens -107 |- # to be longer than one line -108 |- if 2: -109 |- pass -110 |- else: -111 |- pass # final pass comment - 110 |+ pass # final pass comment -112 111 | -113 112 | -114 113 | def not_ok1_with_deep_indented_comments(): +102 | def not_ok1_with_multiline_comments(): +103 | if 1: +104 | pass +105 + # inner comment which happens +106 + # to be longer than one line +107 + elif 2: +108 + pass +109 | else: + - # inner comment which happens + - # to be longer than one line + - if 2: + - pass + - else: + - pass # final pass comment +110 + pass # final pass comment +111 | +112 | +113 | def not_ok1_with_deep_indented_comments(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:117:5 @@ -244,24 +228,22 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 121 | else: | help: Convert to `elif` - -ℹ Safe fix -114 114 | def not_ok1_with_deep_indented_comments(): -115 115 | if 1: -116 116 | pass - 117 |+ # inner comment which happens to be overly indented - 118 |+ elif 2: - 119 |+ pass -117 120 | else: -118 |- # inner comment which happens to be overly indented -119 |- if 2: -120 |- pass -121 |- else: -122 |- pass # final pass comment - 121 |+ pass # final pass comment -123 122 | -124 123 | -125 124 | def not_ok1_with_shallow_indented_comments(): +114 | def not_ok1_with_deep_indented_comments(): +115 | if 1: +116 | pass +117 + # inner comment which happens to be overly indented +118 + elif 2: +119 + pass +120 | else: + - # inner comment which happens to be overly indented + - if 2: + - pass + - else: + - pass # final pass comment +121 + pass # final pass comment +122 | +123 | +124 | def not_ok1_with_shallow_indented_comments(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:128:5 @@ -276,24 +258,22 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 132 | else: | help: Convert to `elif` - -ℹ Safe fix -125 125 | def not_ok1_with_shallow_indented_comments(): -126 126 | if 1: -127 127 | pass -128 |- else: -129 128 | # inner comment which happens to be under indented -130 |- if 2: -131 |- pass -132 |- else: -133 |- pass # final pass comment - 129 |+ elif 2: - 130 |+ pass - 131 |+ else: - 132 |+ pass # final pass comment -134 133 | -135 134 | -136 135 | def not_ok1_with_mixed_indented_comments(): +125 | def not_ok1_with_shallow_indented_comments(): +126 | if 1: +127 | pass + - else: +128 | # inner comment which happens to be under indented + - if 2: + - pass + - else: + - pass # final pass comment +129 + elif 2: +130 + pass +131 + else: +132 + pass # final pass comment +133 | +134 | +135 | def not_ok1_with_mixed_indented_comments(): PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation --> collapsible_else_if.py:139:5 @@ -310,22 +290,20 @@ PLR5501 [*] Use `elif` instead of `else` then `if`, to reduce indentation 145 | else: | help: Convert to `elif` - -ℹ Safe fix -136 136 | def not_ok1_with_mixed_indented_comments(): -137 137 | if 1: -138 138 | pass - 139 |+ # inner comment which has mixed - 140 |+ # indentation levels - 141 |+ # which is pretty weird - 142 |+ elif 2: - 143 |+ pass -139 144 | else: -140 |- # inner comment which has mixed -141 |- # indentation levels -142 |- # which is pretty weird -143 |- if 2: -144 |- pass -145 |- else: -146 |- pass # final pass comment - 145 |+ pass # final pass comment +136 | def not_ok1_with_mixed_indented_comments(): +137 | if 1: +138 | pass +139 + # inner comment which has mixed +140 + # indentation levels +141 + # which is pretty weird +142 + elif 2: +143 + pass +144 | else: + - # inner comment which has mixed + - # indentation levels + - # which is pretty weird + - if 2: + - pass + - else: + - pass # final pass comment +145 + pass # final pass comment diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap index c8f98fb600..c31d2b5662 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6104_non_augmented_assignment.py.snap @@ -12,16 +12,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 18 | a_list = a_list + ["to concat"] | help: Replace with augmented assignment - -ℹ Unsafe fix -13 13 | some_set = {"elem"} -14 14 | mat1, mat2 = None, None -15 15 | -16 |-some_string = some_string + "a very long end of string" - 16 |+some_string += "a very long end of string" -17 17 | index = index - 1 -18 18 | a_list = a_list + ["to concat"] -19 19 | some_set = some_set | {"to concat"} +13 | some_set = {"elem"} +14 | mat1, mat2 = None, None +15 | + - some_string = some_string + "a very long end of string" +16 + some_string += "a very long end of string" +17 | index = index - 1 +18 | a_list = a_list + ["to concat"] +19 | some_set = some_set | {"to concat"} +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `-=` to perform an augmented assignment directly --> non_augmented_assignment.py:17:1 @@ -33,16 +32,15 @@ PLR6104 [*] Use `-=` to perform an augmented assignment directly 19 | some_set = some_set | {"to concat"} | help: Replace with augmented assignment - -ℹ Unsafe fix -14 14 | mat1, mat2 = None, None -15 15 | -16 16 | some_string = some_string + "a very long end of string" -17 |-index = index - 1 - 17 |+index -= 1 -18 18 | a_list = a_list + ["to concat"] -19 19 | some_set = some_set | {"to concat"} -20 20 | to_multiply = to_multiply * 5 +14 | mat1, mat2 = None, None +15 | +16 | some_string = some_string + "a very long end of string" + - index = index - 1 +17 + index -= 1 +18 | a_list = a_list + ["to concat"] +19 | some_set = some_set | {"to concat"} +20 | to_multiply = to_multiply * 5 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:18:1 @@ -55,16 +53,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 20 | to_multiply = to_multiply * 5 | help: Replace with augmented assignment - -ℹ Unsafe fix -15 15 | -16 16 | some_string = some_string + "a very long end of string" -17 17 | index = index - 1 -18 |-a_list = a_list + ["to concat"] - 18 |+a_list += ["to concat"] -19 19 | some_set = some_set | {"to concat"} -20 20 | to_multiply = to_multiply * 5 -21 21 | to_multiply = 5 * to_multiply +15 | +16 | some_string = some_string + "a very long end of string" +17 | index = index - 1 + - a_list = a_list + ["to concat"] +18 + a_list += ["to concat"] +19 | some_set = some_set | {"to concat"} +20 | to_multiply = to_multiply * 5 +21 | to_multiply = 5 * to_multiply +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `|=` to perform an augmented assignment directly --> non_augmented_assignment.py:19:1 @@ -77,16 +74,15 @@ PLR6104 [*] Use `|=` to perform an augmented assignment directly 21 | to_multiply = 5 * to_multiply | help: Replace with augmented assignment - -ℹ Unsafe fix -16 16 | some_string = some_string + "a very long end of string" -17 17 | index = index - 1 -18 18 | a_list = a_list + ["to concat"] -19 |-some_set = some_set | {"to concat"} - 19 |+some_set |= {"to concat"} -20 20 | to_multiply = to_multiply * 5 -21 21 | to_multiply = 5 * to_multiply -22 22 | to_multiply = to_multiply * to_multiply +16 | some_string = some_string + "a very long end of string" +17 | index = index - 1 +18 | a_list = a_list + ["to concat"] + - some_set = some_set | {"to concat"} +19 + some_set |= {"to concat"} +20 | to_multiply = to_multiply * 5 +21 | to_multiply = 5 * to_multiply +22 | to_multiply = to_multiply * to_multiply +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:20:1 @@ -99,16 +95,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly 22 | to_multiply = to_multiply * to_multiply | help: Replace with augmented assignment - -ℹ Unsafe fix -17 17 | index = index - 1 -18 18 | a_list = a_list + ["to concat"] -19 19 | some_set = some_set | {"to concat"} -20 |-to_multiply = to_multiply * 5 - 20 |+to_multiply *= 5 -21 21 | to_multiply = 5 * to_multiply -22 22 | to_multiply = to_multiply * to_multiply -23 23 | to_divide = to_divide / 5 +17 | index = index - 1 +18 | a_list = a_list + ["to concat"] +19 | some_set = some_set | {"to concat"} + - to_multiply = to_multiply * 5 +20 + to_multiply *= 5 +21 | to_multiply = 5 * to_multiply +22 | to_multiply = to_multiply * to_multiply +23 | to_divide = to_divide / 5 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:21:1 @@ -121,16 +116,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly 23 | to_divide = to_divide / 5 | help: Replace with augmented assignment - -ℹ Unsafe fix -18 18 | a_list = a_list + ["to concat"] -19 19 | some_set = some_set | {"to concat"} -20 20 | to_multiply = to_multiply * 5 -21 |-to_multiply = 5 * to_multiply - 21 |+to_multiply *= 5 -22 22 | to_multiply = to_multiply * to_multiply -23 23 | to_divide = to_divide / 5 -24 24 | to_divide = to_divide // 5 +18 | a_list = a_list + ["to concat"] +19 | some_set = some_set | {"to concat"} +20 | to_multiply = to_multiply * 5 + - to_multiply = 5 * to_multiply +21 + to_multiply *= 5 +22 | to_multiply = to_multiply * to_multiply +23 | to_divide = to_divide / 5 +24 | to_divide = to_divide // 5 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:22:1 @@ -143,16 +137,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly 24 | to_divide = to_divide // 5 | help: Replace with augmented assignment - -ℹ Unsafe fix -19 19 | some_set = some_set | {"to concat"} -20 20 | to_multiply = to_multiply * 5 -21 21 | to_multiply = 5 * to_multiply -22 |-to_multiply = to_multiply * to_multiply - 22 |+to_multiply *= to_multiply -23 23 | to_divide = to_divide / 5 -24 24 | to_divide = to_divide // 5 -25 25 | to_cube = to_cube**3 +19 | some_set = some_set | {"to concat"} +20 | to_multiply = to_multiply * 5 +21 | to_multiply = 5 * to_multiply + - to_multiply = to_multiply * to_multiply +22 + to_multiply *= to_multiply +23 | to_divide = to_divide / 5 +24 | to_divide = to_divide // 5 +25 | to_cube = to_cube**3 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `/=` to perform an augmented assignment directly --> non_augmented_assignment.py:23:1 @@ -165,16 +158,15 @@ PLR6104 [*] Use `/=` to perform an augmented assignment directly 25 | to_cube = to_cube**3 | help: Replace with augmented assignment - -ℹ Unsafe fix -20 20 | to_multiply = to_multiply * 5 -21 21 | to_multiply = 5 * to_multiply -22 22 | to_multiply = to_multiply * to_multiply -23 |-to_divide = to_divide / 5 - 23 |+to_divide /= 5 -24 24 | to_divide = to_divide // 5 -25 25 | to_cube = to_cube**3 -26 26 | to_cube = 3**to_cube +20 | to_multiply = to_multiply * 5 +21 | to_multiply = 5 * to_multiply +22 | to_multiply = to_multiply * to_multiply + - to_divide = to_divide / 5 +23 + to_divide /= 5 +24 | to_divide = to_divide // 5 +25 | to_cube = to_cube**3 +26 | to_cube = 3**to_cube +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `//=` to perform an augmented assignment directly --> non_augmented_assignment.py:24:1 @@ -187,16 +179,15 @@ PLR6104 [*] Use `//=` to perform an augmented assignment directly 26 | to_cube = 3**to_cube | help: Replace with augmented assignment - -ℹ Unsafe fix -21 21 | to_multiply = 5 * to_multiply -22 22 | to_multiply = to_multiply * to_multiply -23 23 | to_divide = to_divide / 5 -24 |-to_divide = to_divide // 5 - 24 |+to_divide //= 5 -25 25 | to_cube = to_cube**3 -26 26 | to_cube = 3**to_cube -27 27 | to_cube = to_cube**to_cube +21 | to_multiply = 5 * to_multiply +22 | to_multiply = to_multiply * to_multiply +23 | to_divide = to_divide / 5 + - to_divide = to_divide // 5 +24 + to_divide //= 5 +25 | to_cube = to_cube**3 +26 | to_cube = 3**to_cube +27 | to_cube = to_cube**to_cube +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `**=` to perform an augmented assignment directly --> non_augmented_assignment.py:25:1 @@ -209,16 +200,15 @@ PLR6104 [*] Use `**=` to perform an augmented assignment directly 27 | to_cube = to_cube**to_cube | help: Replace with augmented assignment - -ℹ Unsafe fix -22 22 | to_multiply = to_multiply * to_multiply -23 23 | to_divide = to_divide / 5 -24 24 | to_divide = to_divide // 5 -25 |-to_cube = to_cube**3 - 25 |+to_cube **= 3 -26 26 | to_cube = 3**to_cube -27 27 | to_cube = to_cube**to_cube -28 28 | timeDiffSeconds = timeDiffSeconds % 60 +22 | to_multiply = to_multiply * to_multiply +23 | to_divide = to_divide / 5 +24 | to_divide = to_divide // 5 + - to_cube = to_cube**3 +25 + to_cube **= 3 +26 | to_cube = 3**to_cube +27 | to_cube = to_cube**to_cube +28 | timeDiffSeconds = timeDiffSeconds % 60 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `**=` to perform an augmented assignment directly --> non_augmented_assignment.py:27:1 @@ -231,16 +221,15 @@ PLR6104 [*] Use `**=` to perform an augmented assignment directly 29 | flags = flags & 0x1 | help: Replace with augmented assignment - -ℹ Unsafe fix -24 24 | to_divide = to_divide // 5 -25 25 | to_cube = to_cube**3 -26 26 | to_cube = 3**to_cube -27 |-to_cube = to_cube**to_cube - 27 |+to_cube **= to_cube -28 28 | timeDiffSeconds = timeDiffSeconds % 60 -29 29 | flags = flags & 0x1 -30 30 | flags = flags | 0x1 +24 | to_divide = to_divide // 5 +25 | to_cube = to_cube**3 +26 | to_cube = 3**to_cube + - to_cube = to_cube**to_cube +27 + to_cube **= to_cube +28 | timeDiffSeconds = timeDiffSeconds % 60 +29 | flags = flags & 0x1 +30 | flags = flags | 0x1 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `%=` to perform an augmented assignment directly --> non_augmented_assignment.py:28:1 @@ -253,16 +242,15 @@ PLR6104 [*] Use `%=` to perform an augmented assignment directly 30 | flags = flags | 0x1 | help: Replace with augmented assignment - -ℹ Unsafe fix -25 25 | to_cube = to_cube**3 -26 26 | to_cube = 3**to_cube -27 27 | to_cube = to_cube**to_cube -28 |-timeDiffSeconds = timeDiffSeconds % 60 - 28 |+timeDiffSeconds %= 60 -29 29 | flags = flags & 0x1 -30 30 | flags = flags | 0x1 -31 31 | flags = flags ^ 0x1 +25 | to_cube = to_cube**3 +26 | to_cube = 3**to_cube +27 | to_cube = to_cube**to_cube + - timeDiffSeconds = timeDiffSeconds % 60 +28 + timeDiffSeconds %= 60 +29 | flags = flags & 0x1 +30 | flags = flags | 0x1 +31 | flags = flags ^ 0x1 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `&=` to perform an augmented assignment directly --> non_augmented_assignment.py:29:1 @@ -275,16 +263,15 @@ PLR6104 [*] Use `&=` to perform an augmented assignment directly 31 | flags = flags ^ 0x1 | help: Replace with augmented assignment - -ℹ Unsafe fix -26 26 | to_cube = 3**to_cube -27 27 | to_cube = to_cube**to_cube -28 28 | timeDiffSeconds = timeDiffSeconds % 60 -29 |-flags = flags & 0x1 - 29 |+flags &= 0x1 -30 30 | flags = flags | 0x1 -31 31 | flags = flags ^ 0x1 -32 32 | flags = flags << 1 +26 | to_cube = 3**to_cube +27 | to_cube = to_cube**to_cube +28 | timeDiffSeconds = timeDiffSeconds % 60 + - flags = flags & 0x1 +29 + flags &= 0x1 +30 | flags = flags | 0x1 +31 | flags = flags ^ 0x1 +32 | flags = flags << 1 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `|=` to perform an augmented assignment directly --> non_augmented_assignment.py:30:1 @@ -297,16 +284,15 @@ PLR6104 [*] Use `|=` to perform an augmented assignment directly 32 | flags = flags << 1 | help: Replace with augmented assignment - -ℹ Unsafe fix -27 27 | to_cube = to_cube**to_cube -28 28 | timeDiffSeconds = timeDiffSeconds % 60 -29 29 | flags = flags & 0x1 -30 |-flags = flags | 0x1 - 30 |+flags |= 0x1 -31 31 | flags = flags ^ 0x1 -32 32 | flags = flags << 1 -33 33 | flags = flags >> 1 +27 | to_cube = to_cube**to_cube +28 | timeDiffSeconds = timeDiffSeconds % 60 +29 | flags = flags & 0x1 + - flags = flags | 0x1 +30 + flags |= 0x1 +31 | flags = flags ^ 0x1 +32 | flags = flags << 1 +33 | flags = flags >> 1 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `^=` to perform an augmented assignment directly --> non_augmented_assignment.py:31:1 @@ -319,16 +305,15 @@ PLR6104 [*] Use `^=` to perform an augmented assignment directly 33 | flags = flags >> 1 | help: Replace with augmented assignment - -ℹ Unsafe fix -28 28 | timeDiffSeconds = timeDiffSeconds % 60 -29 29 | flags = flags & 0x1 -30 30 | flags = flags | 0x1 -31 |-flags = flags ^ 0x1 - 31 |+flags ^= 0x1 -32 32 | flags = flags << 1 -33 33 | flags = flags >> 1 -34 34 | mat1 = mat1 @ mat2 +28 | timeDiffSeconds = timeDiffSeconds % 60 +29 | flags = flags & 0x1 +30 | flags = flags | 0x1 + - flags = flags ^ 0x1 +31 + flags ^= 0x1 +32 | flags = flags << 1 +33 | flags = flags >> 1 +34 | mat1 = mat1 @ mat2 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `<<=` to perform an augmented assignment directly --> non_augmented_assignment.py:32:1 @@ -341,16 +326,15 @@ PLR6104 [*] Use `<<=` to perform an augmented assignment directly 34 | mat1 = mat1 @ mat2 | help: Replace with augmented assignment - -ℹ Unsafe fix -29 29 | flags = flags & 0x1 -30 30 | flags = flags | 0x1 -31 31 | flags = flags ^ 0x1 -32 |-flags = flags << 1 - 32 |+flags <<= 1 -33 33 | flags = flags >> 1 -34 34 | mat1 = mat1 @ mat2 -35 35 | a_list[1] = a_list[1] + 1 +29 | flags = flags & 0x1 +30 | flags = flags | 0x1 +31 | flags = flags ^ 0x1 + - flags = flags << 1 +32 + flags <<= 1 +33 | flags = flags >> 1 +34 | mat1 = mat1 @ mat2 +35 | a_list[1] = a_list[1] + 1 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `>>=` to perform an augmented assignment directly --> non_augmented_assignment.py:33:1 @@ -363,16 +347,15 @@ PLR6104 [*] Use `>>=` to perform an augmented assignment directly 35 | a_list[1] = a_list[1] + 1 | help: Replace with augmented assignment - -ℹ Unsafe fix -30 30 | flags = flags | 0x1 -31 31 | flags = flags ^ 0x1 -32 32 | flags = flags << 1 -33 |-flags = flags >> 1 - 33 |+flags >>= 1 -34 34 | mat1 = mat1 @ mat2 -35 35 | a_list[1] = a_list[1] + 1 -36 36 | +30 | flags = flags | 0x1 +31 | flags = flags ^ 0x1 +32 | flags = flags << 1 + - flags = flags >> 1 +33 + flags >>= 1 +34 | mat1 = mat1 @ mat2 +35 | a_list[1] = a_list[1] + 1 +36 | +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `@=` to perform an augmented assignment directly --> non_augmented_assignment.py:34:1 @@ -384,16 +367,15 @@ PLR6104 [*] Use `@=` to perform an augmented assignment directly 35 | a_list[1] = a_list[1] + 1 | help: Replace with augmented assignment - -ℹ Unsafe fix -31 31 | flags = flags ^ 0x1 -32 32 | flags = flags << 1 -33 33 | flags = flags >> 1 -34 |-mat1 = mat1 @ mat2 - 34 |+mat1 @= mat2 -35 35 | a_list[1] = a_list[1] + 1 -36 36 | -37 37 | a_list[0:2] = a_list[0:2] * 3 +31 | flags = flags ^ 0x1 +32 | flags = flags << 1 +33 | flags = flags >> 1 + - mat1 = mat1 @ mat2 +34 + mat1 @= mat2 +35 | a_list[1] = a_list[1] + 1 +36 | +37 | a_list[0:2] = a_list[0:2] * 3 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:35:1 @@ -406,16 +388,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 37 | a_list[0:2] = a_list[0:2] * 3 | help: Replace with augmented assignment - -ℹ Unsafe fix -32 32 | flags = flags << 1 -33 33 | flags = flags >> 1 -34 34 | mat1 = mat1 @ mat2 -35 |-a_list[1] = a_list[1] + 1 - 35 |+a_list[1] += 1 -36 36 | -37 37 | a_list[0:2] = a_list[0:2] * 3 -38 38 | a_list[:2] = a_list[:2] * 3 +32 | flags = flags << 1 +33 | flags = flags >> 1 +34 | mat1 = mat1 @ mat2 + - a_list[1] = a_list[1] + 1 +35 + a_list[1] += 1 +36 | +37 | a_list[0:2] = a_list[0:2] * 3 +38 | a_list[:2] = a_list[:2] * 3 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:37:1 @@ -428,16 +409,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly 39 | a_list[1:] = a_list[1:] * 3 | help: Replace with augmented assignment - -ℹ Unsafe fix -34 34 | mat1 = mat1 @ mat2 -35 35 | a_list[1] = a_list[1] + 1 -36 36 | -37 |-a_list[0:2] = a_list[0:2] * 3 - 37 |+a_list[0:2] *= 3 -38 38 | a_list[:2] = a_list[:2] * 3 -39 39 | a_list[1:] = a_list[1:] * 3 -40 40 | a_list[:] = a_list[:] * 3 +34 | mat1 = mat1 @ mat2 +35 | a_list[1] = a_list[1] + 1 +36 | + - a_list[0:2] = a_list[0:2] * 3 +37 + a_list[0:2] *= 3 +38 | a_list[:2] = a_list[:2] * 3 +39 | a_list[1:] = a_list[1:] * 3 +40 | a_list[:] = a_list[:] * 3 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:38:1 @@ -449,16 +429,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly 40 | a_list[:] = a_list[:] * 3 | help: Replace with augmented assignment - -ℹ Unsafe fix -35 35 | a_list[1] = a_list[1] + 1 -36 36 | -37 37 | a_list[0:2] = a_list[0:2] * 3 -38 |-a_list[:2] = a_list[:2] * 3 - 38 |+a_list[:2] *= 3 -39 39 | a_list[1:] = a_list[1:] * 3 -40 40 | a_list[:] = a_list[:] * 3 -41 41 | +35 | a_list[1] = a_list[1] + 1 +36 | +37 | a_list[0:2] = a_list[0:2] * 3 + - a_list[:2] = a_list[:2] * 3 +38 + a_list[:2] *= 3 +39 | a_list[1:] = a_list[1:] * 3 +40 | a_list[:] = a_list[:] * 3 +41 | +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:39:1 @@ -470,16 +449,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly 40 | a_list[:] = a_list[:] * 3 | help: Replace with augmented assignment - -ℹ Unsafe fix -36 36 | -37 37 | a_list[0:2] = a_list[0:2] * 3 -38 38 | a_list[:2] = a_list[:2] * 3 -39 |-a_list[1:] = a_list[1:] * 3 - 39 |+a_list[1:] *= 3 -40 40 | a_list[:] = a_list[:] * 3 -41 41 | -42 42 | index = index * (index + 10) +36 | +37 | a_list[0:2] = a_list[0:2] * 3 +38 | a_list[:2] = a_list[:2] * 3 + - a_list[1:] = a_list[1:] * 3 +39 + a_list[1:] *= 3 +40 | a_list[:] = a_list[:] * 3 +41 | +42 | index = index * (index + 10) +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:40:1 @@ -492,16 +470,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly 42 | index = index * (index + 10) | help: Replace with augmented assignment - -ℹ Unsafe fix -37 37 | a_list[0:2] = a_list[0:2] * 3 -38 38 | a_list[:2] = a_list[:2] * 3 -39 39 | a_list[1:] = a_list[1:] * 3 -40 |-a_list[:] = a_list[:] * 3 - 40 |+a_list[:] *= 3 -41 41 | -42 42 | index = index * (index + 10) -43 43 | +37 | a_list[0:2] = a_list[0:2] * 3 +38 | a_list[:2] = a_list[:2] * 3 +39 | a_list[1:] = a_list[1:] * 3 + - a_list[:] = a_list[:] * 3 +40 + a_list[:] *= 3 +41 | +42 | index = index * (index + 10) +43 | +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `*=` to perform an augmented assignment directly --> non_augmented_assignment.py:42:1 @@ -512,16 +489,15 @@ PLR6104 [*] Use `*=` to perform an augmented assignment directly | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with augmented assignment - -ℹ Unsafe fix -39 39 | a_list[1:] = a_list[1:] * 3 -40 40 | a_list[:] = a_list[:] * 3 -41 41 | -42 |-index = index * (index + 10) - 42 |+index *= (index + 10) -43 43 | -44 44 | -45 45 | class T: +39 | a_list[1:] = a_list[1:] * 3 +40 | a_list[:] = a_list[:] * 3 +41 | + - index = index * (index + 10) +42 + index *= (index + 10) +43 | +44 | +45 | class T: +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:47:9 @@ -532,16 +508,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly | ^^^^^^^^^^^^^^^^^^^ | help: Replace with augmented assignment - -ℹ Unsafe fix -44 44 | -45 45 | class T: -46 46 | def t(self): -47 |- self.a = self.a + 1 - 47 |+ self.a += 1 -48 48 | -49 49 | -50 50 | obj = T() +44 | +45 | class T: +46 | def t(self): + - self.a = self.a + 1 +47 + self.a += 1 +48 | +49 | +50 | obj = T() +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:51:1 @@ -551,16 +526,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly | ^^^^^^^^^^^^^^^^^ | help: Replace with augmented assignment - -ℹ Unsafe fix -48 48 | -49 49 | -50 50 | obj = T() -51 |-obj.a = obj.a + 1 - 51 |+obj.a += 1 -52 52 | -53 53 | -54 54 | a = a+-1 +48 | +49 | +50 | obj = T() + - obj.a = obj.a + 1 +51 + obj.a += 1 +52 | +53 | +54 | a = a+-1 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:54:1 @@ -571,16 +545,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672 | help: Replace with augmented assignment - -ℹ Unsafe fix -51 51 | obj.a = obj.a + 1 -52 52 | -53 53 | -54 |-a = a+-1 - 54 |+a += -1 -55 55 | -56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672 -57 57 | test = 0x5 +51 | obj.a = obj.a + 1 +52 | +53 | + - a = a+-1 +54 + a += -1 +55 | +56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672 +57 | test = 0x5 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:58:1 @@ -593,16 +566,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 60 | test2 = b"" | help: Replace with augmented assignment - -ℹ Unsafe fix -55 55 | -56 56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672 -57 57 | test = 0x5 -58 |-test = test + 0xBA - 58 |+test += 0xBA -59 59 | -60 60 | test2 = b"" -61 61 | test2 = test2 + b"\000" +55 | +56 | # Regression tests for https://github.com/astral-sh/ruff/issues/11672 +57 | test = 0x5 + - test = test + 0xBA +58 + test += 0xBA +59 | +60 | test2 = b"" +61 | test2 = test2 + b"\000" +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:61:1 @@ -614,16 +586,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 63 | test3 = "" | help: Replace with augmented assignment - -ℹ Unsafe fix -58 58 | test = test + 0xBA -59 59 | -60 60 | test2 = b"" -61 |-test2 = test2 + b"\000" - 61 |+test2 += b"\000" -62 62 | -63 63 | test3 = "" -64 64 | test3 = test3 + ( a := R"" +58 | test = test + 0xBA +59 | +60 | test2 = b"" + - test2 = test2 + b"\000" +61 + test2 += b"\000" +62 | +63 | test3 = "" +64 | test3 = test3 + ( a := R"" +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:64:1 @@ -636,16 +607,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 67 | test4 = [] | help: Replace with augmented assignment - -ℹ Unsafe fix -61 61 | test2 = test2 + b"\000" -62 62 | -63 63 | test3 = "" -64 |-test3 = test3 + ( a := R"" - 64 |+test3 += ( a := R"" -65 65 | f"oo" ) -66 66 | -67 67 | test4 = [] +61 | test2 = test2 + b"\000" +62 | +63 | test3 = "" + - test3 = test3 + ( a := R"" +64 + test3 += ( a := R"" +65 | f"oo" ) +66 | +67 | test4 = [] +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:68:1 @@ -660,16 +630,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 73 | test5 = test5 + ( | help: Replace with augmented assignment - -ℹ Unsafe fix -65 65 | f"oo" ) -66 66 | -67 67 | test4 = [] -68 |-test4 = test4 + ( e - 68 |+test4 += ( e -69 69 | for e in -70 70 | range(10) -71 71 | ) +65 | f"oo" ) +66 | +67 | test4 = [] + - test4 = test4 + ( e +68 + test4 += ( e +69 | for e in +70 | range(10) +71 | ) +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:73:1 @@ -686,16 +655,15 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 79 | test6 = test6 + \ | help: Replace with augmented assignment - -ℹ Unsafe fix -70 70 | range(10) -71 71 | ) -72 72 | -73 |-test5 = test5 + ( - 73 |+test5 += ( -74 74 | 4 -75 75 | * -76 76 | 10 +70 | range(10) +71 | ) +72 | + - test5 = test5 + ( +73 + test5 += ( +74 | 4 +75 | * +76 | 10 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:79:1 @@ -713,17 +681,16 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 86 | test7 = \ | help: Replace with augmented assignment - -ℹ Unsafe fix -76 76 | 10 -77 77 | ) -78 78 | -79 |-test6 = test6 + \ -80 |- ( - 79 |+test6 += ( -81 80 | 4 -82 81 | * -83 82 | 10 +76 | 10 +77 | ) +78 | + - test6 = test6 + \ + - ( +79 + test6 += ( +80 | 4 +81 | * +82 | 10 +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:86:1 @@ -738,18 +705,17 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly 90 | test8 = \ | help: Replace with augmented assignment - -ℹ Unsafe fix -83 83 | 10 -84 84 | ) -85 85 | -86 |-test7 = \ -87 |- 100 \ -88 |- + test7 - 86 |+test7 += 100 -89 87 | -90 88 | test8 = \ -91 89 | 886 \ +83 | 10 +84 | ) +85 | + - test7 = \ + - 100 \ + - + test7 +86 + test7 += 100 +87 | +88 | test8 = \ +89 | 886 \ +note: This is an unsafe fix and may change runtime behavior PLR6104 [*] Use `+=` to perform an augmented assignment directly --> non_augmented_assignment.py:90:1 @@ -764,17 +730,16 @@ PLR6104 [*] Use `+=` to perform an augmented assignment directly | |_________^ | help: Replace with augmented assignment - -ℹ Unsafe fix -87 87 | 100 \ -88 88 | + test7 -89 89 | -90 |-test8 = \ -91 |- 886 \ -92 |- + \ -93 |- \ -94 |- test8 - 90 |+test8 += 886 -95 91 | -96 92 | -97 93 | # OK +87 | 100 \ +88 | + test7 +89 | + - test8 = \ + - 886 \ + - + \ + - \ + - test8 +90 + test8 += 886 +91 | +92 | +93 | # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap index caf82f42de..256db784d9 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap @@ -11,14 +11,13 @@ PLR6201 [*] Use a set literal when testing for membership 4 | 1 in ( | help: Convert to `set` - -ℹ Unsafe fix -1 1 | # Errors -2 |-1 in [1, 2, 3] - 2 |+1 in {1, 2, 3} -3 3 | 1 in (1, 2, 3) -4 4 | 1 in ( -5 5 | 1, 2, 3 +1 | # Errors + - 1 in [1, 2, 3] +2 + 1 in {1, 2, 3} +3 | 1 in (1, 2, 3) +4 | 1 in ( +5 | 1, 2, 3 +note: This is an unsafe fix and may change runtime behavior PLR6201 [*] Use a set literal when testing for membership --> literal_membership.py:3:6 @@ -31,15 +30,14 @@ PLR6201 [*] Use a set literal when testing for membership 5 | 1, 2, 3 | help: Convert to `set` - -ℹ Unsafe fix -1 1 | # Errors -2 2 | 1 in [1, 2, 3] -3 |-1 in (1, 2, 3) - 3 |+1 in {1, 2, 3} -4 4 | 1 in ( -5 5 | 1, 2, 3 -6 6 | ) +1 | # Errors +2 | 1 in [1, 2, 3] + - 1 in (1, 2, 3) +3 + 1 in {1, 2, 3} +4 | 1 in ( +5 | 1, 2, 3 +6 | ) +note: This is an unsafe fix and may change runtime behavior PLR6201 [*] Use a set literal when testing for membership --> literal_membership.py:4:6 @@ -55,19 +53,18 @@ PLR6201 [*] Use a set literal when testing for membership 8 | "cherry" in fruits | help: Convert to `set` - -ℹ Unsafe fix -1 1 | # Errors -2 2 | 1 in [1, 2, 3] -3 3 | 1 in (1, 2, 3) -4 |-1 in ( - 4 |+1 in { -5 5 | 1, 2, 3 -6 |-) - 6 |+} -7 7 | fruits = ["cherry", "grapes"] -8 8 | "cherry" in fruits -9 9 | _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")} +1 | # Errors +2 | 1 in [1, 2, 3] +3 | 1 in (1, 2, 3) + - 1 in ( +4 + 1 in { +5 | 1, 2, 3 + - ) +6 + } +7 | fruits = ["cherry", "grapes"] +8 | "cherry" in fruits +9 | _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")} +note: This is an unsafe fix and may change runtime behavior PLR6201 [*] Use a set literal when testing for membership --> literal_membership.py:9:70 @@ -80,13 +77,12 @@ PLR6201 [*] Use a set literal when testing for membership 11 | # OK | help: Convert to `set` - -ℹ Unsafe fix -6 6 | ) -7 7 | fruits = ["cherry", "grapes"] -8 8 | "cherry" in fruits -9 |-_ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")} - 9 |+_ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in {"a", "b"}} -10 10 | -11 11 | # OK -12 12 | fruits in [[1, 2, 3], [4, 5, 6]] +6 | ) +7 | fruits = ["cherry", "grapes"] +8 | "cherry" in fruits + - _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")} +9 + _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in {"a", "b"}} +10 | +11 | # OK +12 | fruits in [[1, 2, 3], [4, 5, 6]] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap index 5d267e44ef..37415d51a2 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0108_unnecessary_lambda.py.snap @@ -9,13 +9,12 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda] | help: Inline function call - -ℹ Unsafe fix -1 |-_ = lambda: print() # [unnecessary-lambda] - 1 |+_ = print # [unnecessary-lambda] -2 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda] -3 3 | -4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda] + - _ = lambda: print() # [unnecessary-lambda] +1 + _ = print # [unnecessary-lambda] +2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda] +3 | +4 | _ = lambda *args: f(*args) # [unnecessary-lambda] +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:2:5 @@ -27,14 +26,13 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 4 | _ = lambda *args: f(*args) # [unnecessary-lambda] | help: Inline function call - -ℹ Unsafe fix -1 1 | _ = lambda: print() # [unnecessary-lambda] -2 |-_ = lambda x, y: min(x, y) # [unnecessary-lambda] - 2 |+_ = min # [unnecessary-lambda] -3 3 | -4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda] -5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] +1 | _ = lambda: print() # [unnecessary-lambda] + - _ = lambda x, y: min(x, y) # [unnecessary-lambda] +2 + _ = min # [unnecessary-lambda] +3 | +4 | _ = lambda *args: f(*args) # [unnecessary-lambda] +5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:4:5 @@ -47,16 +45,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] | help: Inline function call - -ℹ Unsafe fix -1 1 | _ = lambda: print() # [unnecessary-lambda] -2 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda] -3 3 | -4 |-_ = lambda *args: f(*args) # [unnecessary-lambda] - 4 |+_ = f # [unnecessary-lambda] -5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] -6 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] -7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] +1 | _ = lambda: print() # [unnecessary-lambda] +2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda] +3 | + - _ = lambda *args: f(*args) # [unnecessary-lambda] +4 + _ = f # [unnecessary-lambda] +5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] +6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] +7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:5:5 @@ -68,16 +65,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] | help: Inline function call - -ℹ Unsafe fix -2 2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda] -3 3 | -4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda] -5 |-_ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] - 5 |+_ = f # [unnecessary-lambda] -6 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] -7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] -8 8 | +2 | _ = lambda x, y: min(x, y) # [unnecessary-lambda] +3 | +4 | _ = lambda *args: f(*args) # [unnecessary-lambda] + - _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] +5 + _ = f # [unnecessary-lambda] +6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] +7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] +8 | +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:6:5 @@ -89,16 +85,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] | help: Inline function call - -ℹ Unsafe fix -3 3 | -4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda] -5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] -6 |-_ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] - 6 |+_ = f # [unnecessary-lambda] -7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] -8 8 | -9 9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] +3 | +4 | _ = lambda *args: f(*args) # [unnecessary-lambda] +5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] + - _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] +6 + _ = f # [unnecessary-lambda] +7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] +8 | +9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:7:5 @@ -111,16 +106,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] | help: Inline function call - -ℹ Unsafe fix -4 4 | _ = lambda *args: f(*args) # [unnecessary-lambda] -5 5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] -6 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] -7 |-_ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] - 7 |+_ = f # [unnecessary-lambda] -8 8 | -9 9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] -10 10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda] +4 | _ = lambda *args: f(*args) # [unnecessary-lambda] +5 | _ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda] +6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] + - _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] +7 + _ = f # [unnecessary-lambda] +8 | +9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] +10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda] +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:9:5 @@ -132,16 +126,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda] | help: Inline function call - -ℹ Unsafe fix -6 6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] -7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] -8 8 | -9 |-_ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] - 9 |+_ = f(lambda x: x) # [unnecessary-lambda] -10 10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda] -11 11 | -12 12 | # default value in lambda parameters +6 | _ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda] +7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] +8 | + - _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] +9 + _ = f(lambda x: x) # [unnecessary-lambda] +10 | _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda] +11 | +12 | # default value in lambda parameters +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:10:5 @@ -153,16 +146,15 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 12 | # default value in lambda parameters | help: Inline function call - -ℹ Unsafe fix -7 7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] -8 8 | -9 9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] -10 |-_ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda] - 10 |+_ = f(lambda x, y: x + y) # [unnecessary-lambda] -11 11 | -12 12 | # default value in lambda parameters -13 13 | _ = lambda x=42: print(x) +7 | _ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda] +8 | +9 | _ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda] + - _ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda] +10 + _ = f(lambda x, y: x + y) # [unnecessary-lambda] +11 | +12 | # default value in lambda parameters +13 | _ = lambda x=42: print(x) +note: This is an unsafe fix and may change runtime behavior PLW0108 [*] Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:62:5 @@ -173,14 +165,13 @@ PLW0108 [*] Lambda may be unnecessary; consider inlining inner function 63 | _ = lambda x: ((x := 1) and str)(x) | help: Inline function call - -ℹ Unsafe fix -59 59 | _ = lambda *args: f(*args, y=x) -60 60 | -61 61 | # https://github.com/astral-sh/ruff/issues/18675 -62 |-_ = lambda x: (string := str)(x) - 62 |+_ = (string := str) -63 63 | _ = lambda x: ((x := 1) and str)(x) +59 | _ = lambda *args: f(*args, y=x) +60 | +61 | # https://github.com/astral-sh/ruff/issues/18675 + - _ = lambda x: (string := str)(x) +62 + _ = (string := str) +63 | _ = lambda x: ((x := 1) and str)(x) +note: This is an unsafe fix and may change runtime behavior PLW0108 Lambda may be unnecessary; consider inlining inner function --> unnecessary_lambda.py:63:5 diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap index 39be92ea3a..911e26a8dd 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0120_useless_else_on_loop.py.snap @@ -12,17 +12,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 11 | return None | help: Remove `else` - -ℹ Safe fix -6 6 | for i in range(10): -7 7 | if i % 2: -8 8 | return i -9 |- else: # [useless-else-on-loop] -10 |- print("math is broken") - 9 |+ print("math is broken") -11 10 | return None -12 11 | -13 12 | +6 | for i in range(10): +7 | if i % 2: +8 | return i + - else: # [useless-else-on-loop] + - print("math is broken") +9 + print("math is broken") +10 | return None +11 | +12 | PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents --> useless_else_on_loop.py:18:5 @@ -35,17 +33,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 20 | return None | help: Remove `else` - -ℹ Safe fix -15 15 | """else + return is not acceptable.""" -16 16 | while True: -17 17 | return 1 -18 |- else: # [useless-else-on-loop] -19 |- print("math is broken") - 18 |+ print("math is broken") -20 19 | return None -21 20 | -22 21 | +15 | """else + return is not acceptable.""" +16 | while True: +17 | return 1 + - else: # [useless-else-on-loop] + - print("math is broken") +18 + print("math is broken") +19 | return None +20 | +21 | PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents --> useless_else_on_loop.py:30:1 @@ -57,17 +53,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 31 | print("or else!") | help: Remove `else` - -ℹ Safe fix -27 27 | for _ in range(10): -28 28 | break -29 29 | -30 |-else: # [useless-else-on-loop] -31 |- print("or else!") - 30 |+print("or else!") -32 31 | -33 32 | -34 33 | while True: +27 | for _ in range(10): +28 | break +29 | + - else: # [useless-else-on-loop] + - print("or else!") +30 + print("or else!") +31 | +32 | +33 | while True: PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents --> useless_else_on_loop.py:37:1 @@ -79,17 +73,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 38 | print("or else!") | help: Remove `else` - -ℹ Safe fix -34 34 | while True: -35 35 | while False: -36 36 | break -37 |-else: # [useless-else-on-loop] -38 |- print("or else!") - 37 |+print("or else!") -39 38 | -40 39 | for j in range(10): -41 40 | pass +34 | while True: +35 | while False: +36 | break + - else: # [useless-else-on-loop] + - print("or else!") +37 + print("or else!") +38 | +39 | for j in range(10): +40 | pass PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents --> useless_else_on_loop.py:42:1 @@ -102,21 +94,19 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 44 | for j in range(10): | help: Remove `else` - -ℹ Safe fix -39 39 | -40 40 | for j in range(10): -41 41 | pass -42 |-else: # [useless-else-on-loop] -43 |- print("fat chance") -44 |- for j in range(10): -45 |- break - 42 |+print("fat chance") - 43 |+for j in range(10): - 44 |+ break -46 45 | -47 46 | -48 47 | def test_return_for2(): +39 | +40 | for j in range(10): +41 | pass + - else: # [useless-else-on-loop] + - print("fat chance") + - for j in range(10): + - break +42 + print("fat chance") +43 + for j in range(10): +44 + break +45 | +46 | +47 | def test_return_for2(): PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents --> useless_else_on_loop.py:88:5 @@ -129,17 +119,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 90 | return False | help: Remove `else` - -ℹ Safe fix -85 85 | break -86 86 | else: -87 87 | print("all right") -88 |- else: # [useless-else-on-loop] -89 |- return True - 88 |+ return True -90 89 | return False -91 90 | -92 91 | +85 | break +86 | else: +87 | print("all right") + - else: # [useless-else-on-loop] + - return True +88 + return True +89 | return False +90 | +91 | PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents --> useless_else_on_loop.py:98:9 @@ -152,19 +140,17 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 100 | break | help: Remove `else` - -ℹ Safe fix -95 95 | for _ in range(10): -96 96 | for _ in range(3): -97 97 | pass -98 |- else: -99 |- if 1 < 2: # pylint: disable=comparison-of-constants -100 |- break - 98 |+ if 1 < 2: # pylint: disable=comparison-of-constants - 99 |+ break -101 100 | else: -102 101 | return True -103 102 | return False +95 | for _ in range(10): +96 | for _ in range(3): +97 | pass + - else: + - if 1 < 2: # pylint: disable=comparison-of-constants + - break +98 + if 1 < 2: # pylint: disable=comparison-of-constants +99 + break +100 | else: +101 | return True +102 | return False PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` and dedent its contents --> useless_else_on_loop.py:144:5 @@ -177,17 +163,15 @@ PLW0120 [*] `else` clause on loop without a `break` statement; remove the `else` 146 | print("fat chance") | help: Remove `else` - -ℹ Safe fix -141 141 | """Retain the comment within the `else` block""" -142 142 | for j in range(10): -143 143 | pass -144 |- else: -145 |- # [useless-else-on-loop] -146 |- print("fat chance") -147 |- for j in range(10): -148 |- break - 144 |+ # [useless-else-on-loop] - 145 |+ print("fat chance") - 146 |+ for j in range(10): - 147 |+ break +141 | """Retain the comment within the `else` block""" +142 | for j in range(10): +143 | pass + - else: + - # [useless-else-on-loop] + - print("fat chance") + - for j in range(10): + - break +144 + # [useless-else-on-loop] +145 + print("fat chance") +146 + for j in range(10): +147 + break diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap index 3bb64a4e40..6199c06156 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0133_useless_exception_statement.py.snap @@ -10,16 +10,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -4 4 | -5 5 | # Test case 1: Useless exception statement -6 6 | def func(): -7 |- AssertionError("This is an assertion error") # PLW0133 - 7 |+ raise AssertionError("This is an assertion error") # PLW0133 -8 8 | -9 9 | -10 10 | # Test case 2: Useless exception statement in try-except block +4 | +5 | # Test case 1: Useless exception statement +6 | def func(): + - AssertionError("This is an assertion error") # PLW0133 +7 + raise AssertionError("This is an assertion error") # PLW0133 +8 | +9 | +10 | # Test case 2: Useless exception statement in try-except block +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:13:9 @@ -32,16 +31,15 @@ PLW0133 [*] Missing `raise` statement on exception 15 | pass | help: Add `raise` keyword - -ℹ Unsafe fix -10 10 | # Test case 2: Useless exception statement in try-except block -11 11 | def func(): -12 12 | try: -13 |- Exception("This is an exception") # PLW0133 - 13 |+ raise Exception("This is an exception") # PLW0133 -14 14 | except Exception as err: -15 15 | pass -16 16 | +10 | # Test case 2: Useless exception statement in try-except block +11 | def func(): +12 | try: + - Exception("This is an exception") # PLW0133 +13 + raise Exception("This is an exception") # PLW0133 +14 | except Exception as err: +15 | pass +16 | +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:21:9 @@ -52,16 +50,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -18 18 | # Test case 3: Useless exception statement in if statement -19 19 | def func(): -20 20 | if True: -21 |- RuntimeError("This is an exception") # PLW0133 - 21 |+ raise RuntimeError("This is an exception") # PLW0133 -22 22 | -23 23 | -24 24 | # Test case 4: Useless exception statement in class +18 | # Test case 3: Useless exception statement in if statement +19 | def func(): +20 | if True: + - RuntimeError("This is an exception") # PLW0133 +21 + raise RuntimeError("This is an exception") # PLW0133 +22 | +23 | +24 | # Test case 4: Useless exception statement in class +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:28:13 @@ -72,16 +69,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -25 25 | def func(): -26 26 | class Class: -27 27 | def __init__(self): -28 |- TypeError("This is an exception") # PLW0133 - 28 |+ raise TypeError("This is an exception") # PLW0133 -29 29 | -30 30 | -31 31 | # Test case 5: Useless exception statement in function +25 | def func(): +26 | class Class: +27 | def __init__(self): + - TypeError("This is an exception") # PLW0133 +28 + raise TypeError("This is an exception") # PLW0133 +29 | +30 | +31 | # Test case 5: Useless exception statement in function +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:34:9 @@ -94,16 +90,15 @@ PLW0133 [*] Missing `raise` statement on exception 36 | inner() | help: Add `raise` keyword - -ℹ Unsafe fix -31 31 | # Test case 5: Useless exception statement in function -32 32 | def func(): -33 33 | def inner(): -34 |- IndexError("This is an exception") # PLW0133 - 34 |+ raise IndexError("This is an exception") # PLW0133 -35 35 | -36 36 | inner() -37 37 | +31 | # Test case 5: Useless exception statement in function +32 | def func(): +33 | def inner(): + - IndexError("This is an exception") # PLW0133 +34 + raise IndexError("This is an exception") # PLW0133 +35 | +36 | inner() +37 | +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:42:9 @@ -114,16 +109,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -39 39 | # Test case 6: Useless exception statement in while loop -40 40 | def func(): -41 41 | while True: -42 |- KeyError("This is an exception") # PLW0133 - 42 |+ raise KeyError("This is an exception") # PLW0133 -43 43 | -44 44 | -45 45 | # Test case 7: Useless exception statement in abstract class +39 | # Test case 6: Useless exception statement in while loop +40 | def func(): +41 | while True: + - KeyError("This is an exception") # PLW0133 +42 + raise KeyError("This is an exception") # PLW0133 +43 | +44 | +45 | # Test case 7: Useless exception statement in abstract class +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:50:13 @@ -134,16 +128,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -47 47 | class Class(ABC): -48 48 | @abstractmethod -49 49 | def method(self): -50 |- NotImplementedError("This is an exception") # PLW0133 - 50 |+ raise NotImplementedError("This is an exception") # PLW0133 -51 51 | -52 52 | -53 53 | # Test case 8: Useless exception statement inside context manager +47 | class Class(ABC): +48 | @abstractmethod +49 | def method(self): + - NotImplementedError("This is an exception") # PLW0133 +50 + raise NotImplementedError("This is an exception") # PLW0133 +51 | +52 | +53 | # Test case 8: Useless exception statement inside context manager +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:56:9 @@ -154,16 +147,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -53 53 | # Test case 8: Useless exception statement inside context manager -54 54 | def func(): -55 55 | with suppress(AttributeError): -56 |- AttributeError("This is an exception") # PLW0133 - 56 |+ raise AttributeError("This is an exception") # PLW0133 -57 57 | -58 58 | -59 59 | # Test case 9: Useless exception statement in parentheses +53 | # Test case 8: Useless exception statement inside context manager +54 | def func(): +55 | with suppress(AttributeError): + - AttributeError("This is an exception") # PLW0133 +56 + raise AttributeError("This is an exception") # PLW0133 +57 | +58 | +59 | # Test case 9: Useless exception statement in parentheses +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:61:5 @@ -174,16 +166,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -58 58 | -59 59 | # Test case 9: Useless exception statement in parentheses -60 60 | def func(): -61 |- (RuntimeError("This is an exception")) # PLW0133 - 61 |+ raise (RuntimeError("This is an exception")) # PLW0133 -62 62 | -63 63 | -64 64 | # Test case 10: Useless exception statement in continuation +58 | +59 | # Test case 9: Useless exception statement in parentheses +60 | def func(): + - (RuntimeError("This is an exception")) # PLW0133 +61 + raise (RuntimeError("This is an exception")) # PLW0133 +62 | +63 | +64 | # Test case 10: Useless exception statement in continuation +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:66:12 @@ -194,16 +185,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -63 63 | -64 64 | # Test case 10: Useless exception statement in continuation -65 65 | def func(): -66 |- x = 1; (RuntimeError("This is an exception")); y = 2 # PLW0133 - 66 |+ x = 1; raise (RuntimeError("This is an exception")); y = 2 # PLW0133 -67 67 | -68 68 | -69 69 | # Test case 11: Useless warning statement +63 | +64 | # Test case 10: Useless exception statement in continuation +65 | def func(): + - x = 1; (RuntimeError("This is an exception")); y = 2 # PLW0133 +66 + x = 1; raise (RuntimeError("This is an exception")); y = 2 # PLW0133 +67 | +68 | +69 | # Test case 11: Useless warning statement +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:71:5 @@ -214,16 +204,15 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -68 68 | -69 69 | # Test case 11: Useless warning statement -70 70 | def func(): -71 |- UserWarning("This is an assertion error") # PLW0133 - 71 |+ raise UserWarning("This is an assertion error") # PLW0133 -72 72 | -73 73 | -74 74 | # Non-violation test cases: PLW0133 +68 | +69 | # Test case 11: Useless warning statement +70 | def func(): + - UserWarning("This is an assertion error") # PLW0133 +71 + raise UserWarning("This is an assertion error") # PLW0133 +72 | +73 | +74 | # Non-violation test cases: PLW0133 +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:126:1 @@ -236,15 +225,14 @@ PLW0133 [*] Missing `raise` statement on exception 128 | PythonFinalizationError("Added in Python 3.13") | help: Add `raise` keyword - -ℹ Unsafe fix -123 123 | -124 124 | import builtins -125 125 | -126 |-builtins.TypeError("still an exception even though it's an Attribute") - 126 |+raise builtins.TypeError("still an exception even though it's an Attribute") -127 127 | -128 128 | PythonFinalizationError("Added in Python 3.13") +123 | +124 | import builtins +125 | + - builtins.TypeError("still an exception even though it's an Attribute") +126 + raise builtins.TypeError("still an exception even though it's an Attribute") +127 | +128 | PythonFinalizationError("Added in Python 3.13") +note: This is an unsafe fix and may change runtime behavior PLW0133 [*] Missing `raise` statement on exception --> useless_exception_statement.py:128:1 @@ -255,10 +243,9 @@ PLW0133 [*] Missing `raise` statement on exception | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `raise` keyword - -ℹ Unsafe fix -125 125 | -126 126 | builtins.TypeError("still an exception even though it's an Attribute") -127 127 | -128 |-PythonFinalizationError("Added in Python 3.13") - 128 |+raise PythonFinalizationError("Added in Python 3.13") +125 | +126 | builtins.TypeError("still an exception even though it's an Attribute") +127 | + - PythonFinalizationError("Added in Python 3.13") +128 + raise PythonFinalizationError("Added in Python 3.13") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap index f940cf92ca..1645100047 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW0245_super_without_brackets.py.snap @@ -11,13 +11,11 @@ PLW0245 [*] `super` call is missing parentheses 11 | return f"{original_speak} But as a dog, it barks!" | help: Add parentheses to `super` call - -ℹ Safe fix -7 7 | class BadDog(Animal): -8 8 | @staticmethod -9 9 | def speak(): -10 |- original_speak = super.speak() # PLW0245 - 10 |+ original_speak = super().speak() # PLW0245 -11 11 | return f"{original_speak} But as a dog, it barks!" -12 12 | -13 13 | +7 | class BadDog(Animal): +8 | @staticmethod +9 | def speak(): + - original_speak = super.speak() # PLW0245 +10 + original_speak = super().speak() # PLW0245 +11 | return f"{original_speak} But as a dog, it barks!" +12 | +13 | diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap index 02b7108617..5ece209fcc 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1507_shallow_copy_environ.py.snap @@ -10,16 +10,15 @@ PLW1507 [*] Shallow copy of `os.environ` via `copy.copy(os.environ)` | ^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `os.environ.copy()` - -ℹ Unsafe fix -1 1 | import copy -2 2 | import os -3 3 | -4 |-copied_env = copy.copy(os.environ) # [shallow-copy-environ] - 4 |+copied_env = os.environ.copy() # [shallow-copy-environ] -5 5 | -6 6 | -7 7 | # Test case where the proposed fix is wrong, i.e., unsafe fix +1 | import copy +2 | import os +3 | + - copied_env = copy.copy(os.environ) # [shallow-copy-environ] +4 + copied_env = os.environ.copy() # [shallow-copy-environ] +5 | +6 | +7 | # Test case where the proposed fix is wrong, i.e., unsafe fix +note: This is an unsafe fix and may change runtime behavior PLW1507 [*] Shallow copy of `os.environ` via `copy.copy(os.environ)` --> shallow_copy_environ.py:11:7 @@ -30,11 +29,10 @@ PLW1507 [*] Shallow copy of `os.environ` via `copy.copy(os.environ)` 12 | os.environ["X"] = "1" | help: Replace with `os.environ.copy()` - -ℹ Unsafe fix -8 8 | # Ref: https://github.com/astral-sh/ruff/issues/16274#event-16423475135 -9 9 | -10 10 | os.environ["X"] = "0" -11 |-env = copy.copy(os.environ) - 11 |+env = os.environ.copy() -12 12 | os.environ["X"] = "1" +8 | # Ref: https://github.com/astral-sh/ruff/issues/16274#event-16423475135 +9 | +10 | os.environ["X"] = "0" + - env = copy.copy(os.environ) +11 + env = os.environ.copy() +12 | os.environ["X"] = "1" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap index 4d980923ac..360048b2d6 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1510_subprocess_run_without_check.py.snap @@ -11,16 +11,14 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument 6 | subprocess.run( | help: Add explicit `check=False` - -ℹ Safe fix -1 1 | import subprocess -2 2 | -3 3 | # Errors. -4 |-subprocess.run("ls") - 4 |+subprocess.run("ls", check=False) -5 5 | subprocess.run("ls", shell=True) -6 6 | subprocess.run( -7 7 | ["ls"], +1 | import subprocess +2 | +3 | # Errors. + - subprocess.run("ls") +4 + subprocess.run("ls", check=False) +5 | subprocess.run("ls", shell=True) +6 | subprocess.run( +7 | ["ls"], PLW1510 [*] `subprocess.run` without explicit `check` argument --> subprocess_run_without_check.py:5:1 @@ -33,16 +31,14 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument 7 | ["ls"], | help: Add explicit `check=False` - -ℹ Safe fix -2 2 | -3 3 | # Errors. -4 4 | subprocess.run("ls") -5 |-subprocess.run("ls", shell=True) - 5 |+subprocess.run("ls", check=False, shell=True) -6 6 | subprocess.run( -7 7 | ["ls"], -8 8 | shell=False, +2 | +3 | # Errors. +4 | subprocess.run("ls") + - subprocess.run("ls", shell=True) +5 + subprocess.run("ls", check=False, shell=True) +6 | subprocess.run( +7 | ["ls"], +8 | shell=False, PLW1510 [*] `subprocess.run` without explicit `check` argument --> subprocess_run_without_check.py:6:1 @@ -55,16 +51,14 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument 8 | shell=False, | help: Add explicit `check=False` - -ℹ Safe fix -5 5 | subprocess.run("ls", shell=True) -6 6 | subprocess.run( -7 7 | ["ls"], -8 |- shell=False, - 8 |+ check=False, shell=False, -9 9 | ) -10 10 | subprocess.run(["ls"], **kwargs) -11 11 | +5 | subprocess.run("ls", shell=True) +6 | subprocess.run( +7 | ["ls"], + - shell=False, +8 + check=False, shell=False, +9 | ) +10 | subprocess.run(["ls"], **kwargs) +11 | PLW1510 [*] `subprocess.run` without explicit `check` argument --> subprocess_run_without_check.py:10:1 @@ -77,13 +71,12 @@ PLW1510 [*] `subprocess.run` without explicit `check` argument 12 | # Non-errors. | help: Add explicit `check=False` - -ℹ Unsafe fix -7 7 | ["ls"], -8 8 | shell=False, -9 9 | ) -10 |-subprocess.run(["ls"], **kwargs) - 10 |+subprocess.run(["ls"], check=False, **kwargs) -11 11 | -12 12 | # Non-errors. -13 13 | subprocess.run("ls", check=True) +7 | ["ls"], +8 | shell=False, +9 | ) + - subprocess.run(["ls"], **kwargs) +10 + subprocess.run(["ls"], check=False, **kwargs) +11 | +12 | # Non-errors. +13 | subprocess.run("ls", check=True) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap index d8fd1c6d90..0223a6777e 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1514_unspecified_encoding.py.snap @@ -11,16 +11,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) | help: Add explicit `encoding` argument - -ℹ Unsafe fix -5 5 | import codecs -6 6 | -7 7 | # Errors. -8 |-open("test.txt") - 8 |+open("test.txt", encoding="utf-8") -9 9 | io.TextIOWrapper(io.FileIO("test.txt")) -10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) -11 11 | tempfile.NamedTemporaryFile("w") +5 | import codecs +6 | +7 | # Errors. + - open("test.txt") +8 + open("test.txt", encoding="utf-8") +9 | io.TextIOWrapper(io.FileIO("test.txt")) +10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) +11 | tempfile.NamedTemporaryFile("w") +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument --> unspecified_encoding.py:9:1 @@ -33,16 +32,15 @@ PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument 11 | tempfile.NamedTemporaryFile("w") | help: Add explicit `encoding` argument - -ℹ Unsafe fix -6 6 | -7 7 | # Errors. -8 8 | open("test.txt") -9 |-io.TextIOWrapper(io.FileIO("test.txt")) - 9 |+io.TextIOWrapper(io.FileIO("test.txt"), encoding="utf-8") -10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) -11 11 | tempfile.NamedTemporaryFile("w") -12 12 | tempfile.TemporaryFile("w") +6 | +7 | # Errors. +8 | open("test.txt") + - io.TextIOWrapper(io.FileIO("test.txt")) +9 + io.TextIOWrapper(io.FileIO("test.txt"), encoding="utf-8") +10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) +11 | tempfile.NamedTemporaryFile("w") +12 | tempfile.TemporaryFile("w") +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument --> unspecified_encoding.py:10:1 @@ -55,16 +53,15 @@ PLW1514 [*] `io.TextIOWrapper` without explicit `encoding` argument 12 | tempfile.TemporaryFile("w") | help: Add explicit `encoding` argument - -ℹ Unsafe fix -7 7 | # Errors. -8 8 | open("test.txt") -9 9 | io.TextIOWrapper(io.FileIO("test.txt")) -10 |-hugo.TextIOWrapper(hugo.FileIO("test.txt")) - 10 |+hugo.TextIOWrapper(hugo.FileIO("test.txt"), encoding="utf-8") -11 11 | tempfile.NamedTemporaryFile("w") -12 12 | tempfile.TemporaryFile("w") -13 13 | codecs.open("test.txt") +7 | # Errors. +8 | open("test.txt") +9 | io.TextIOWrapper(io.FileIO("test.txt")) + - hugo.TextIOWrapper(hugo.FileIO("test.txt")) +10 + hugo.TextIOWrapper(hugo.FileIO("test.txt"), encoding="utf-8") +11 | tempfile.NamedTemporaryFile("w") +12 | tempfile.TemporaryFile("w") +13 | codecs.open("test.txt") +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `tempfile.NamedTemporaryFile` in text mode without explicit `encoding` argument --> unspecified_encoding.py:11:1 @@ -77,16 +74,15 @@ PLW1514 [*] `tempfile.NamedTemporaryFile` in text mode without explicit `encodin 13 | codecs.open("test.txt") | help: Add explicit `encoding` argument - -ℹ Unsafe fix -8 8 | open("test.txt") -9 9 | io.TextIOWrapper(io.FileIO("test.txt")) -10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) -11 |-tempfile.NamedTemporaryFile("w") - 11 |+tempfile.NamedTemporaryFile("w", encoding="utf-8") -12 12 | tempfile.TemporaryFile("w") -13 13 | codecs.open("test.txt") -14 14 | tempfile.SpooledTemporaryFile(0, "w") +8 | open("test.txt") +9 | io.TextIOWrapper(io.FileIO("test.txt")) +10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) + - tempfile.NamedTemporaryFile("w") +11 + tempfile.NamedTemporaryFile("w", encoding="utf-8") +12 | tempfile.TemporaryFile("w") +13 | codecs.open("test.txt") +14 | tempfile.SpooledTemporaryFile(0, "w") +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `tempfile.TemporaryFile` in text mode without explicit `encoding` argument --> unspecified_encoding.py:12:1 @@ -99,16 +95,15 @@ PLW1514 [*] `tempfile.TemporaryFile` in text mode without explicit `encoding` ar 14 | tempfile.SpooledTemporaryFile(0, "w") | help: Add explicit `encoding` argument - -ℹ Unsafe fix -9 9 | io.TextIOWrapper(io.FileIO("test.txt")) -10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) -11 11 | tempfile.NamedTemporaryFile("w") -12 |-tempfile.TemporaryFile("w") - 12 |+tempfile.TemporaryFile("w", encoding="utf-8") -13 13 | codecs.open("test.txt") -14 14 | tempfile.SpooledTemporaryFile(0, "w") -15 15 | +9 | io.TextIOWrapper(io.FileIO("test.txt")) +10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) +11 | tempfile.NamedTemporaryFile("w") + - tempfile.TemporaryFile("w") +12 + tempfile.TemporaryFile("w", encoding="utf-8") +13 | codecs.open("test.txt") +14 | tempfile.SpooledTemporaryFile(0, "w") +15 | +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `codecs.open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:13:1 @@ -120,16 +115,15 @@ PLW1514 [*] `codecs.open` in text mode without explicit `encoding` argument 14 | tempfile.SpooledTemporaryFile(0, "w") | help: Add explicit `encoding` argument - -ℹ Unsafe fix -10 10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) -11 11 | tempfile.NamedTemporaryFile("w") -12 12 | tempfile.TemporaryFile("w") -13 |-codecs.open("test.txt") - 13 |+codecs.open("test.txt", encoding="utf-8") -14 14 | tempfile.SpooledTemporaryFile(0, "w") -15 15 | -16 16 | # Non-errors. +10 | hugo.TextIOWrapper(hugo.FileIO("test.txt")) +11 | tempfile.NamedTemporaryFile("w") +12 | tempfile.TemporaryFile("w") + - codecs.open("test.txt") +13 + codecs.open("test.txt", encoding="utf-8") +14 | tempfile.SpooledTemporaryFile(0, "w") +15 | +16 | # Non-errors. +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `tempfile.SpooledTemporaryFile` in text mode without explicit `encoding` argument --> unspecified_encoding.py:14:1 @@ -142,16 +136,15 @@ PLW1514 [*] `tempfile.SpooledTemporaryFile` in text mode without explicit `encod 16 | # Non-errors. | help: Add explicit `encoding` argument - -ℹ Unsafe fix -11 11 | tempfile.NamedTemporaryFile("w") -12 12 | tempfile.TemporaryFile("w") -13 13 | codecs.open("test.txt") -14 |-tempfile.SpooledTemporaryFile(0, "w") - 14 |+tempfile.SpooledTemporaryFile(0, "w", encoding="utf-8") -15 15 | -16 16 | # Non-errors. -17 17 | open("test.txt", encoding="utf-8") +11 | tempfile.NamedTemporaryFile("w") +12 | tempfile.TemporaryFile("w") +13 | codecs.open("test.txt") + - tempfile.SpooledTemporaryFile(0, "w") +14 + tempfile.SpooledTemporaryFile(0, "w", encoding="utf-8") +15 | +16 | # Non-errors. +17 | open("test.txt", encoding="utf-8") +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:46:1 @@ -164,16 +157,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 48 | open( | help: Add explicit `encoding` argument - -ℹ Unsafe fix -43 43 | tempfile.SpooledTemporaryFile(0, "wb") -44 44 | tempfile.SpooledTemporaryFile(0, ) -45 45 | -46 |-open("test.txt",) - 46 |+open("test.txt", encoding="utf-8",) -47 47 | open() -48 48 | open( -49 49 | "test.txt", # comment +43 | tempfile.SpooledTemporaryFile(0, "wb") +44 | tempfile.SpooledTemporaryFile(0, ) +45 | + - open("test.txt",) +46 + open("test.txt", encoding="utf-8",) +47 | open() +48 | open( +49 | "test.txt", # comment +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:47:1 @@ -185,16 +177,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 49 | "test.txt", # comment | help: Add explicit `encoding` argument - -ℹ Unsafe fix -44 44 | tempfile.SpooledTemporaryFile(0, ) -45 45 | -46 46 | open("test.txt",) -47 |-open() - 47 |+open(encoding="utf-8") -48 48 | open( -49 49 | "test.txt", # comment -50 50 | ) +44 | tempfile.SpooledTemporaryFile(0, ) +45 | +46 | open("test.txt",) + - open() +47 + open(encoding="utf-8") +48 | open( +49 | "test.txt", # comment +50 | ) +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:48:1 @@ -207,16 +198,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 50 | ) | help: Add explicit `encoding` argument - -ℹ Unsafe fix -46 46 | open("test.txt",) -47 47 | open() -48 48 | open( -49 |- "test.txt", # comment - 49 |+ "test.txt", encoding="utf-8", # comment -50 50 | ) -51 51 | open( -52 52 | "test.txt", +46 | open("test.txt",) +47 | open() +48 | open( + - "test.txt", # comment +49 + "test.txt", encoding="utf-8", # comment +50 | ) +51 | open( +52 | "test.txt", +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:51:1 @@ -229,16 +219,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 53 | # comment | help: Add explicit `encoding` argument - -ℹ Unsafe fix -49 49 | "test.txt", # comment -50 50 | ) -51 51 | open( -52 |- "test.txt", - 52 |+ "test.txt", encoding="utf-8", -53 53 | # comment -54 54 | ) -55 55 | open(("test.txt"),) +49 | "test.txt", # comment +50 | ) +51 | open( + - "test.txt", +52 + "test.txt", encoding="utf-8", +53 | # comment +54 | ) +55 | open(("test.txt"),) +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:55:1 @@ -251,16 +240,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 57 | ("test.txt"), # comment | help: Add explicit `encoding` argument - -ℹ Unsafe fix -52 52 | "test.txt", -53 53 | # comment -54 54 | ) -55 |-open(("test.txt"),) - 55 |+open(("test.txt"), encoding="utf-8",) -56 56 | open( -57 57 | ("test.txt"), # comment -58 58 | ) +52 | "test.txt", +53 | # comment +54 | ) + - open(("test.txt"),) +55 + open(("test.txt"), encoding="utf-8",) +56 | open( +57 | ("test.txt"), # comment +58 | ) +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:56:1 @@ -273,16 +261,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 58 | ) | help: Add explicit `encoding` argument - -ℹ Unsafe fix -54 54 | ) -55 55 | open(("test.txt"),) -56 56 | open( -57 |- ("test.txt"), # comment - 57 |+ ("test.txt"), encoding="utf-8", # comment -58 58 | ) -59 59 | open( -60 60 | ("test.txt"), +54 | ) +55 | open(("test.txt"),) +56 | open( + - ("test.txt"), # comment +57 + ("test.txt"), encoding="utf-8", # comment +58 | ) +59 | open( +60 | ("test.txt"), +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:59:1 @@ -295,16 +282,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 61 | # comment | help: Add explicit `encoding` argument - -ℹ Unsafe fix -57 57 | ("test.txt"), # comment -58 58 | ) -59 59 | open( -60 |- ("test.txt"), - 60 |+ ("test.txt"), encoding="utf-8", -61 61 | # comment -62 62 | ) -63 63 | +57 | ("test.txt"), # comment +58 | ) +59 | open( + - ("test.txt"), +60 + ("test.txt"), encoding="utf-8", +61 | # comment +62 | ) +63 | +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:64:1 @@ -317,16 +303,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 66 | (("test.txt")), # comment | help: Add explicit `encoding` argument - -ℹ Unsafe fix -61 61 | # comment -62 62 | ) -63 63 | -64 |-open((("test.txt")),) - 64 |+open((("test.txt")), encoding="utf-8",) -65 65 | open( -66 66 | (("test.txt")), # comment -67 67 | ) +61 | # comment +62 | ) +63 | + - open((("test.txt")),) +64 + open((("test.txt")), encoding="utf-8",) +65 | open( +66 | (("test.txt")), # comment +67 | ) +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:65:1 @@ -338,16 +323,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 67 | ) | help: Add explicit `encoding` argument - -ℹ Unsafe fix -63 63 | -64 64 | open((("test.txt")),) -65 65 | open( -66 |- (("test.txt")), # comment - 66 |+ (("test.txt")), encoding="utf-8", # comment -67 67 | ) -68 68 | open( -69 69 | (("test.txt")), +63 | +64 | open((("test.txt")),) +65 | open( + - (("test.txt")), # comment +66 + (("test.txt")), encoding="utf-8", # comment +67 | ) +68 | open( +69 | (("test.txt")), +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:68:1 @@ -360,16 +344,15 @@ PLW1514 [*] `open` in text mode without explicit `encoding` argument 70 | # comment | help: Add explicit `encoding` argument - -ℹ Unsafe fix -66 66 | (("test.txt")), # comment -67 67 | ) -68 68 | open( -69 |- (("test.txt")), - 69 |+ (("test.txt")), encoding="utf-8", -70 70 | # comment -71 71 | ) -72 72 | +66 | (("test.txt")), # comment +67 | ) +68 | open( + - (("test.txt")), +69 + (("test.txt")), encoding="utf-8", +70 | # comment +71 | ) +72 | +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:77:1 @@ -381,16 +364,15 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar 79 | text = Path("foo.txt").read_text() | help: Add explicit `encoding` argument - -ℹ Unsafe fix -74 74 | from pathlib import Path -75 75 | -76 76 | # Errors. -77 |-Path("foo.txt").open() - 77 |+Path("foo.txt").open(encoding="utf-8") -78 78 | Path("foo.txt").open("w") -79 79 | text = Path("foo.txt").read_text() -80 80 | Path("foo.txt").write_text(text) +74 | from pathlib import Path +75 | +76 | # Errors. + - Path("foo.txt").open() +77 + Path("foo.txt").open(encoding="utf-8") +78 | Path("foo.txt").open("w") +79 | text = Path("foo.txt").read_text() +80 | Path("foo.txt").write_text(text) +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:78:1 @@ -403,16 +385,15 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar 80 | Path("foo.txt").write_text(text) | help: Add explicit `encoding` argument - -ℹ Unsafe fix -75 75 | -76 76 | # Errors. -77 77 | Path("foo.txt").open() -78 |-Path("foo.txt").open("w") - 78 |+Path("foo.txt").open("w", encoding="utf-8") -79 79 | text = Path("foo.txt").read_text() -80 80 | Path("foo.txt").write_text(text) -81 81 | +75 | +76 | # Errors. +77 | Path("foo.txt").open() + - Path("foo.txt").open("w") +78 + Path("foo.txt").open("w", encoding="utf-8") +79 | text = Path("foo.txt").read_text() +80 | Path("foo.txt").write_text(text) +81 | +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `pathlib.Path(...).read_text` without explicit `encoding` argument --> unspecified_encoding.py:79:8 @@ -424,16 +405,15 @@ PLW1514 [*] `pathlib.Path(...).read_text` without explicit `encoding` argument 80 | Path("foo.txt").write_text(text) | help: Add explicit `encoding` argument - -ℹ Unsafe fix -76 76 | # Errors. -77 77 | Path("foo.txt").open() -78 78 | Path("foo.txt").open("w") -79 |-text = Path("foo.txt").read_text() - 79 |+text = Path("foo.txt").read_text(encoding="utf-8") -80 80 | Path("foo.txt").write_text(text) -81 81 | -82 82 | # Non-errors. +76 | # Errors. +77 | Path("foo.txt").open() +78 | Path("foo.txt").open("w") + - text = Path("foo.txt").read_text() +79 + text = Path("foo.txt").read_text(encoding="utf-8") +80 | Path("foo.txt").write_text(text) +81 | +82 | # Non-errors. +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `pathlib.Path(...).write_text` without explicit `encoding` argument --> unspecified_encoding.py:80:1 @@ -446,16 +426,15 @@ PLW1514 [*] `pathlib.Path(...).write_text` without explicit `encoding` argument 82 | # Non-errors. | help: Add explicit `encoding` argument - -ℹ Unsafe fix -77 77 | Path("foo.txt").open() -78 78 | Path("foo.txt").open("w") -79 79 | text = Path("foo.txt").read_text() -80 |-Path("foo.txt").write_text(text) - 80 |+Path("foo.txt").write_text(text, encoding="utf-8") -81 81 | -82 82 | # Non-errors. -83 83 | Path("foo.txt").open(encoding="utf-8") +77 | Path("foo.txt").open() +78 | Path("foo.txt").open("w") +79 | text = Path("foo.txt").read_text() + - Path("foo.txt").write_text(text) +80 + Path("foo.txt").write_text(text, encoding="utf-8") +81 | +82 | # Non-errors. +83 | Path("foo.txt").open(encoding="utf-8") +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:96:1 @@ -468,16 +447,15 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar 98 | # https://github.com/astral-sh/ruff/issues/18107 | help: Add explicit `encoding` argument - -ℹ Unsafe fix -93 93 | -94 94 | # https://github.com/astral-sh/ruff/issues/19294 -95 95 | x = Path("foo.txt") -96 |-x.open() - 96 |+x.open(encoding="utf-8") -97 97 | -98 98 | # https://github.com/astral-sh/ruff/issues/18107 -99 99 | codecs.open("plw1514.py", "r", "utf-8").close() # this is fine +93 | +94 | # https://github.com/astral-sh/ruff/issues/19294 +95 | x = Path("foo.txt") + - x.open() +96 + x.open(encoding="utf-8") +97 | +98 | # https://github.com/astral-sh/ruff/issues/18107 +99 | codecs.open("plw1514.py", "r", "utf-8").close() # this is fine +note: This is an unsafe fix and may change runtime behavior PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` argument --> unspecified_encoding.py:105:10 @@ -488,11 +466,10 @@ PLW1514 [*] `pathlib.Path(...).open` in text mode without explicit `encoding` ar 106 | contents = f.read() | help: Add explicit `encoding` argument - -ℹ Unsafe fix -102 102 | from pathlib import Path -103 103 | -104 104 | def format_file(file: Path): -105 |- with file.open() as f: - 105 |+ with file.open(encoding="utf-8") as f: -106 106 | contents = f.read() +102 | from pathlib import Path +103 | +104 | def format_file(file: Path): + - with file.open() as f: +105 + with file.open(encoding="utf-8") as f: +106 | contents = f.read() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap index 9c0c63af9d..0106c57cd1 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW3301_nested_min_max.py.snap @@ -11,14 +11,13 @@ PLW3301 [*] Nested `min` calls can be flattened 4 | min(1, foo("a", "b"), min(3, 4)) | help: Flatten nested `min` calls - -ℹ Unsafe fix -1 1 | min(1, 2, 3) -2 |-min(1, min(2, 3)) - 2 |+min(1, 2, 3) -3 3 | min(1, min(2, min(3, 4))) -4 4 | min(1, foo("a", "b"), min(3, 4)) -5 5 | min(1, max(2, 3)) +1 | min(1, 2, 3) + - min(1, min(2, 3)) +2 + min(1, 2, 3) +3 | min(1, min(2, min(3, 4))) +4 | min(1, foo("a", "b"), min(3, 4)) +5 | min(1, max(2, 3)) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:3:1 @@ -31,15 +30,14 @@ PLW3301 [*] Nested `min` calls can be flattened 5 | min(1, max(2, 3)) | help: Flatten nested `min` calls - -ℹ Unsafe fix -1 1 | min(1, 2, 3) -2 2 | min(1, min(2, 3)) -3 |-min(1, min(2, min(3, 4))) - 3 |+min(1, 2, 3, 4) -4 4 | min(1, foo("a", "b"), min(3, 4)) -5 5 | min(1, max(2, 3)) -6 6 | max(1, 2, 3) +1 | min(1, 2, 3) +2 | min(1, min(2, 3)) + - min(1, min(2, min(3, 4))) +3 + min(1, 2, 3, 4) +4 | min(1, foo("a", "b"), min(3, 4)) +5 | min(1, max(2, 3)) +6 | max(1, 2, 3) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:3:8 @@ -52,15 +50,14 @@ PLW3301 [*] Nested `min` calls can be flattened 5 | min(1, max(2, 3)) | help: Flatten nested `min` calls - -ℹ Unsafe fix -1 1 | min(1, 2, 3) -2 2 | min(1, min(2, 3)) -3 |-min(1, min(2, min(3, 4))) - 3 |+min(1, min(2, 3, 4)) -4 4 | min(1, foo("a", "b"), min(3, 4)) -5 5 | min(1, max(2, 3)) -6 6 | max(1, 2, 3) +1 | min(1, 2, 3) +2 | min(1, min(2, 3)) + - min(1, min(2, min(3, 4))) +3 + min(1, min(2, 3, 4)) +4 | min(1, foo("a", "b"), min(3, 4)) +5 | min(1, max(2, 3)) +6 | max(1, 2, 3) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:4:1 @@ -73,16 +70,15 @@ PLW3301 [*] Nested `min` calls can be flattened 6 | max(1, 2, 3) | help: Flatten nested `min` calls - -ℹ Unsafe fix -1 1 | min(1, 2, 3) -2 2 | min(1, min(2, 3)) -3 3 | min(1, min(2, min(3, 4))) -4 |-min(1, foo("a", "b"), min(3, 4)) - 4 |+min(1, foo("a", "b"), 3, 4) -5 5 | min(1, max(2, 3)) -6 6 | max(1, 2, 3) -7 7 | max(1, max(2, 3)) +1 | min(1, 2, 3) +2 | min(1, min(2, 3)) +3 | min(1, min(2, min(3, 4))) + - min(1, foo("a", "b"), min(3, 4)) +4 + min(1, foo("a", "b"), 3, 4) +5 | min(1, max(2, 3)) +6 | max(1, 2, 3) +7 | max(1, max(2, 3)) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:7:1 @@ -95,16 +91,15 @@ PLW3301 [*] Nested `max` calls can be flattened 9 | max(1, foo("a", "b"), max(3, 4)) | help: Flatten nested `max` calls - -ℹ Unsafe fix -4 4 | min(1, foo("a", "b"), min(3, 4)) -5 5 | min(1, max(2, 3)) -6 6 | max(1, 2, 3) -7 |-max(1, max(2, 3)) - 7 |+max(1, 2, 3) -8 8 | max(1, max(2, max(3, 4))) -9 9 | max(1, foo("a", "b"), max(3, 4)) -10 10 | +4 | min(1, foo("a", "b"), min(3, 4)) +5 | min(1, max(2, 3)) +6 | max(1, 2, 3) + - max(1, max(2, 3)) +7 + max(1, 2, 3) +8 | max(1, max(2, max(3, 4))) +9 | max(1, foo("a", "b"), max(3, 4)) +10 | +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:8:1 @@ -116,16 +111,15 @@ PLW3301 [*] Nested `max` calls can be flattened 9 | max(1, foo("a", "b"), max(3, 4)) | help: Flatten nested `max` calls - -ℹ Unsafe fix -5 5 | min(1, max(2, 3)) -6 6 | max(1, 2, 3) -7 7 | max(1, max(2, 3)) -8 |-max(1, max(2, max(3, 4))) - 8 |+max(1, 2, 3, 4) -9 9 | max(1, foo("a", "b"), max(3, 4)) -10 10 | -11 11 | # These should not trigger; we do not flag cases with keyword args. +5 | min(1, max(2, 3)) +6 | max(1, 2, 3) +7 | max(1, max(2, 3)) + - max(1, max(2, max(3, 4))) +8 + max(1, 2, 3, 4) +9 | max(1, foo("a", "b"), max(3, 4)) +10 | +11 | # These should not trigger; we do not flag cases with keyword args. +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:8:8 @@ -137,16 +131,15 @@ PLW3301 [*] Nested `max` calls can be flattened 9 | max(1, foo("a", "b"), max(3, 4)) | help: Flatten nested `max` calls - -ℹ Unsafe fix -5 5 | min(1, max(2, 3)) -6 6 | max(1, 2, 3) -7 7 | max(1, max(2, 3)) -8 |-max(1, max(2, max(3, 4))) - 8 |+max(1, max(2, 3, 4)) -9 9 | max(1, foo("a", "b"), max(3, 4)) -10 10 | -11 11 | # These should not trigger; we do not flag cases with keyword args. +5 | min(1, max(2, 3)) +6 | max(1, 2, 3) +7 | max(1, max(2, 3)) + - max(1, max(2, max(3, 4))) +8 + max(1, max(2, 3, 4)) +9 | max(1, foo("a", "b"), max(3, 4)) +10 | +11 | # These should not trigger; we do not flag cases with keyword args. +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:9:1 @@ -159,16 +152,15 @@ PLW3301 [*] Nested `max` calls can be flattened 11 | # These should not trigger; we do not flag cases with keyword args. | help: Flatten nested `max` calls - -ℹ Unsafe fix -6 6 | max(1, 2, 3) -7 7 | max(1, max(2, 3)) -8 8 | max(1, max(2, max(3, 4))) -9 |-max(1, foo("a", "b"), max(3, 4)) - 9 |+max(1, foo("a", "b"), 3, 4) -10 10 | -11 11 | # These should not trigger; we do not flag cases with keyword args. -12 12 | min(1, min(2, 3), key=test) +6 | max(1, 2, 3) +7 | max(1, max(2, 3)) +8 | max(1, max(2, max(3, 4))) + - max(1, foo("a", "b"), max(3, 4)) +9 + max(1, foo("a", "b"), 3, 4) +10 | +11 | # These should not trigger; we do not flag cases with keyword args. +12 | min(1, min(2, 3), key=test) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:15:1 @@ -181,16 +173,15 @@ PLW3301 [*] Nested `min` calls can be flattened 17 | # The fix is already unsafe, so deleting comments is okay. | help: Flatten nested `min` calls - -ℹ Unsafe fix -12 12 | min(1, min(2, 3), key=test) -13 13 | min(1, min(2, 3, key=test)) -14 14 | # This will still trigger, to merge the calls without keyword args. -15 |-min(1, min(2, 3, key=test), min(4, 5)) - 15 |+min(1, min(2, 3, key=test), 4, 5) -16 16 | -17 17 | # The fix is already unsafe, so deleting comments is okay. -18 18 | min( +12 | min(1, min(2, 3), key=test) +13 | min(1, min(2, 3, key=test)) +14 | # This will still trigger, to merge the calls without keyword args. + - min(1, min(2, 3, key=test), min(4, 5)) +15 + min(1, min(2, 3, key=test), 4, 5) +16 | +17 | # The fix is already unsafe, so deleting comments is okay. +18 | min( +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:18:1 @@ -205,19 +196,18 @@ PLW3301 [*] Nested `min` calls can be flattened 23 | # Handle iterable expressions. | help: Flatten nested `min` calls - -ℹ Unsafe fix -15 15 | min(1, min(2, 3, key=test), min(4, 5)) -16 16 | -17 17 | # The fix is already unsafe, so deleting comments is okay. -18 |-min( -19 |- 1, # This is a comment. -20 |- min(2, 3), -21 |-) - 18 |+min(1, 2, 3) -22 19 | -23 20 | # Handle iterable expressions. -24 21 | min(1, min(a)) +15 | min(1, min(2, 3, key=test), min(4, 5)) +16 | +17 | # The fix is already unsafe, so deleting comments is okay. + - min( + - 1, # This is a comment. + - min(2, 3), + - ) +18 + min(1, 2, 3) +19 | +20 | # Handle iterable expressions. +21 | min(1, min(a)) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:24:1 @@ -229,16 +219,15 @@ PLW3301 [*] Nested `min` calls can be flattened 26 | max(1, max(a)) | help: Flatten nested `min` calls - -ℹ Unsafe fix -21 21 | ) -22 22 | -23 23 | # Handle iterable expressions. -24 |-min(1, min(a)) - 24 |+min(1, *a) -25 25 | min(1, min(i for i in range(10))) -26 26 | max(1, max(a)) -27 27 | max(1, max(i for i in range(10))) +21 | ) +22 | +23 | # Handle iterable expressions. + - min(1, min(a)) +24 + min(1, *a) +25 | min(1, min(i for i in range(10))) +26 | max(1, max(a)) +27 | max(1, max(i for i in range(10))) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:25:1 @@ -251,16 +240,15 @@ PLW3301 [*] Nested `min` calls can be flattened 27 | max(1, max(i for i in range(10))) | help: Flatten nested `min` calls - -ℹ Unsafe fix -22 22 | -23 23 | # Handle iterable expressions. -24 24 | min(1, min(a)) -25 |-min(1, min(i for i in range(10))) - 25 |+min(1, *(i for i in range(10))) -26 26 | max(1, max(a)) -27 27 | max(1, max(i for i in range(10))) -28 28 | +22 | +23 | # Handle iterable expressions. +24 | min(1, min(a)) + - min(1, min(i for i in range(10))) +25 + min(1, *(i for i in range(10))) +26 | max(1, max(a)) +27 | max(1, max(i for i in range(10))) +28 | +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:26:1 @@ -272,16 +260,15 @@ PLW3301 [*] Nested `max` calls can be flattened 27 | max(1, max(i for i in range(10))) | help: Flatten nested `max` calls - -ℹ Unsafe fix -23 23 | # Handle iterable expressions. -24 24 | min(1, min(a)) -25 25 | min(1, min(i for i in range(10))) -26 |-max(1, max(a)) - 26 |+max(1, *a) -27 27 | max(1, max(i for i in range(10))) -28 28 | -29 29 | tuples_list = [ +23 | # Handle iterable expressions. +24 | min(1, min(a)) +25 | min(1, min(i for i in range(10))) + - max(1, max(a)) +26 + max(1, *a) +27 | max(1, max(i for i in range(10))) +28 | +29 | tuples_list = [ +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:27:1 @@ -294,16 +281,15 @@ PLW3301 [*] Nested `max` calls can be flattened 29 | tuples_list = [ | help: Flatten nested `max` calls - -ℹ Unsafe fix -24 24 | min(1, min(a)) -25 25 | min(1, min(i for i in range(10))) -26 26 | max(1, max(a)) -27 |-max(1, max(i for i in range(10))) - 27 |+max(1, *(i for i in range(10))) -28 28 | -29 29 | tuples_list = [ -30 30 | (1, 2), +24 | min(1, min(a)) +25 | min(1, min(i for i in range(10))) +26 | max(1, max(a)) + - max(1, max(i for i in range(10))) +27 + max(1, *(i for i in range(10))) +28 | +29 | tuples_list = [ +30 | (1, 2), +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:41:1 @@ -315,16 +301,15 @@ PLW3301 [*] Nested `max` calls can be flattened 43 | import builtins | help: Flatten nested `max` calls - -ℹ Unsafe fix -38 38 | max(max(tuples_list)) -39 39 | -40 40 | # Starred argument should be copied as it is. -41 |-max(1, max(*a)) - 41 |+max(1, *a) -42 42 | -43 43 | import builtins -44 44 | builtins.min(1, min(2, 3)) +38 | max(max(tuples_list)) +39 | +40 | # Starred argument should be copied as it is. + - max(1, max(*a)) +41 + max(1, *a) +42 | +43 | import builtins +44 | builtins.min(1, min(2, 3)) +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `min` calls can be flattened --> nested_min_max.py:44:1 @@ -334,16 +319,15 @@ PLW3301 [*] Nested `min` calls can be flattened | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Flatten nested `min` calls - -ℹ Unsafe fix -41 41 | max(1, max(*a)) -42 42 | -43 43 | import builtins -44 |-builtins.min(1, min(2, 3)) - 44 |+builtins.min(1, 2, 3) -45 45 | -46 46 | -47 47 | # PLW3301 +41 | max(1, max(*a)) +42 | +43 | import builtins + - builtins.min(1, min(2, 3)) +44 + builtins.min(1, 2, 3) +45 | +46 | +47 | # PLW3301 +note: This is an unsafe fix and may change runtime behavior PLW3301 [*] Nested `max` calls can be flattened --> nested_min_max.py:48:16 @@ -359,16 +343,15 @@ PLW3301 [*] Nested `max` calls can be flattened 53 | # OK | help: Flatten nested `max` calls - -ℹ Unsafe fix -45 45 | -46 46 | -47 47 | # PLW3301 -48 |-max_word_len = max( -49 |- max(len(word) for word in "blah blah blah".split(" ")), -50 |- len("Done!"), -51 |-) - 48 |+max_word_len = max(*(len(word) for word in "blah blah blah".split(" ")), len("Done!")) -52 49 | -53 50 | # OK -54 51 | max_word_len = max( +45 | +46 | +47 | # PLW3301 + - max_word_len = max( + - max(len(word) for word in "blah blah blah".split(" ")), + - len("Done!"), + - ) +48 + max_word_len = max(*(len(word) for word in "blah blah blah".split(" ")), len("Done!")) +49 | +50 | # OK +51 | max_word_len = max( +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/mod.rs b/crates/ruff_linter/src/rules/pyupgrade/mod.rs index 763e9f34b7..94a40baa9d 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/mod.rs +++ b/crates/ruff_linter/src/rules/pyupgrade/mod.rs @@ -340,27 +340,21 @@ mod tests { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Import from `shlex` - - ℹ Safe fix - 1 |-from pipes import quote, Template - 1 |+from pipes import Template - 2 |+from shlex import quote + - from pipes import quote, Template + 1 + from pipes import Template + 2 + from shlex import quote I002 [*] Missing required import: `from __future__ import generator_stop` --> :1:1 help: Insert required import: `from __future__ import generator_stop` - - ℹ Safe fix - 1 |+from __future__ import generator_stop - 1 2 | from pipes import quote, Template + 1 + from __future__ import generator_stop + 2 | from pipes import quote, Template I002 [*] Missing required import: `from collections import Sequence` --> :1:1 help: Insert required import: `from collections import Sequence` - - ℹ Safe fix - 1 |+from collections import Sequence - 1 2 | from pipes import quote, Template + 1 + from collections import Sequence + 2 | from pipes import quote, Template "); } } diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap index 7f1c7a75a1..d986bbe165 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP001.py.snap @@ -9,14 +9,12 @@ UP001 [*] `__metaclass__ = type` is implied | ^^^^^^^^^^^^^^^^^^^^ | help: Remove `__metaclass__ = type` - -ℹ Safe fix -1 1 | class A: -2 |- __metaclass__ = type - 2 |+ pass -3 3 | -4 4 | -5 5 | class B: +1 | class A: + - __metaclass__ = type +2 + pass +3 | +4 | +5 | class B: UP001 [*] `__metaclass__ = type` is implied --> UP001.py:6:5 @@ -28,12 +26,10 @@ UP001 [*] `__metaclass__ = type` is implied 8 | def __init__(self) -> None: | help: Remove `__metaclass__ = type` - -ℹ Safe fix -3 3 | -4 4 | -5 5 | class B: -6 |- __metaclass__ = type -7 6 | -8 7 | def __init__(self) -> None: -9 8 | pass +3 | +4 | +5 | class B: + - __metaclass__ = type +6 | +7 | def __init__(self) -> None: +8 | pass diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap index 08d84dd2bb..44ca5f32bc 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP003.py.snap @@ -10,13 +10,11 @@ UP003 [*] Use `str` instead of `type(...)` 3 | type(0) | help: Replace `type(...)` with `str` - -ℹ Safe fix -1 |-type("") - 1 |+str -2 2 | type(b"") -3 3 | type(0) -4 4 | type(0.0) + - type("") +1 + str +2 | type(b"") +3 | type(0) +4 | type(0.0) UP003 [*] Use `bytes` instead of `type(...)` --> UP003.py:2:1 @@ -28,14 +26,12 @@ UP003 [*] Use `bytes` instead of `type(...)` 4 | type(0.0) | help: Replace `type(...)` with `bytes` - -ℹ Safe fix -1 1 | type("") -2 |-type(b"") - 2 |+bytes -3 3 | type(0) -4 4 | type(0.0) -5 5 | type(0j) +1 | type("") + - type(b"") +2 + bytes +3 | type(0) +4 | type(0.0) +5 | type(0j) UP003 [*] Use `int` instead of `type(...)` --> UP003.py:3:1 @@ -48,15 +44,13 @@ UP003 [*] Use `int` instead of `type(...)` 5 | type(0j) | help: Replace `type(...)` with `int` - -ℹ Safe fix -1 1 | type("") -2 2 | type(b"") -3 |-type(0) - 3 |+int -4 4 | type(0.0) -5 5 | type(0j) -6 6 | +1 | type("") +2 | type(b"") + - type(0) +3 + int +4 | type(0.0) +5 | type(0j) +6 | UP003 [*] Use `float` instead of `type(...)` --> UP003.py:4:1 @@ -68,16 +62,14 @@ UP003 [*] Use `float` instead of `type(...)` 5 | type(0j) | help: Replace `type(...)` with `float` - -ℹ Safe fix -1 1 | type("") -2 2 | type(b"") -3 3 | type(0) -4 |-type(0.0) - 4 |+float -5 5 | type(0j) -6 6 | -7 7 | # OK +1 | type("") +2 | type(b"") +3 | type(0) + - type(0.0) +4 + float +5 | type(0j) +6 | +7 | # OK UP003 [*] Use `complex` instead of `type(...)` --> UP003.py:5:1 @@ -90,16 +82,14 @@ UP003 [*] Use `complex` instead of `type(...)` 7 | # OK | help: Replace `type(...)` with `complex` - -ℹ Safe fix -2 2 | type(b"") -3 3 | type(0) -4 4 | type(0.0) -5 |-type(0j) - 5 |+complex -6 6 | -7 7 | # OK -8 8 | type(arg)(" ") +2 | type(b"") +3 | type(0) +4 | type(0.0) + - type(0j) +5 + complex +6 | +7 | # OK +8 | type(arg)(" ") UP003 [*] Use `str` instead of `type(...)` --> UP003.py:14:29 @@ -109,10 +99,8 @@ UP003 [*] Use `str` instead of `type(...)` | ^^^^^^^^ | help: Replace `type(...)` with `str` - -ℹ Safe fix -11 11 | y = x.dtype.type(0.0) -12 12 | -13 13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459841 -14 |-assert isinstance(fullname, type("")is not True) - 14 |+assert isinstance(fullname, str is not True) +11 | y = x.dtype.type(0.0) +12 | +13 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459841 + - assert isinstance(fullname, type("")is not True) +14 + assert isinstance(fullname, str is not True) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap index 06bc6b37d4..51d694ac7d 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP004.py.snap @@ -9,16 +9,14 @@ UP004 [*] Class `A` inherits from `object` 6 | ... | help: Remove `object` inheritance - -ℹ Safe fix -2 2 | ... -3 3 | -4 4 | -5 |-class A(object): - 5 |+class A: -6 6 | ... -7 7 | -8 8 | +2 | ... +3 | +4 | + - class A(object): +5 + class A: +6 | ... +7 | +8 | UP004 [*] Class `A` inherits from `object` --> UP004.py:10:5 @@ -30,18 +28,16 @@ UP004 [*] Class `A` inherits from `object` 12 | ... | help: Remove `object` inheritance - -ℹ Safe fix -6 6 | ... -7 7 | -8 8 | -9 |-class A( -10 |- object, -11 |-): - 9 |+class A: -12 10 | ... -13 11 | -14 12 | +6 | ... +7 | +8 | + - class A( + - object, + - ): +9 + class A: +10 | ... +11 | +12 | UP004 [*] Class `A` inherits from `object` --> UP004.py:16:5 @@ -53,19 +49,18 @@ UP004 [*] Class `A` inherits from `object` 18 | ): | help: Remove `object` inheritance - -ℹ Unsafe fix -12 12 | ... -13 13 | -14 14 | -15 |-class A( -16 |- object, -17 |- # -18 |-): - 15 |+class A: -19 16 | ... -20 17 | -21 18 | +12 | ... +13 | +14 | + - class A( + - object, + - # + - ): +15 + class A: +16 | ... +17 | +18 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:24:5 @@ -78,19 +73,18 @@ UP004 [*] Class `A` inherits from `object` 26 | ... | help: Remove `object` inheritance - -ℹ Unsafe fix -19 19 | ... -20 20 | -21 21 | -22 |-class A( -23 |- # -24 |- object, -25 |-): - 22 |+class A: -26 23 | ... -27 24 | -28 25 | +19 | ... +20 | +21 | + - class A( + - # + - object, + - ): +22 + class A: +23 | ... +24 | +25 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:31:5 @@ -103,19 +97,18 @@ UP004 [*] Class `A` inherits from `object` 33 | ... | help: Remove `object` inheritance - -ℹ Unsafe fix -26 26 | ... -27 27 | -28 28 | -29 |-class A( -30 |- # -31 |- object -32 |-): - 29 |+class A: -33 30 | ... -34 31 | -35 32 | +26 | ... +27 | +28 | + - class A( + - # + - object + - ): +29 + class A: +30 | ... +31 | +32 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:37:5 @@ -127,19 +120,18 @@ UP004 [*] Class `A` inherits from `object` 39 | ): | help: Remove `object` inheritance - -ℹ Unsafe fix -33 33 | ... -34 34 | -35 35 | -36 |-class A( -37 |- object -38 |- # -39 |-): - 36 |+class A: -40 37 | ... -41 38 | -42 39 | +33 | ... +34 | +35 | + - class A( + - object + - # + - ): +36 + class A: +37 | ... +38 | +39 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:45:5 @@ -152,20 +144,19 @@ UP004 [*] Class `A` inherits from `object` 47 | ): | help: Remove `object` inheritance - -ℹ Unsafe fix -40 40 | ... -41 41 | -42 42 | -43 |-class A( -44 |- # -45 |- object, -46 |- # -47 |-): - 43 |+class A: -48 44 | ... -49 45 | -50 46 | +40 | ... +41 | +42 | + - class A( + - # + - object, + - # + - ): +43 + class A: +44 | ... +45 | +46 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:53:5 @@ -178,20 +169,19 @@ UP004 [*] Class `A` inherits from `object` 55 | ): | help: Remove `object` inheritance - -ℹ Unsafe fix -48 48 | ... -49 49 | -50 50 | -51 |-class A( -52 |- # -53 |- object, -54 |- # -55 |-): - 51 |+class A: -56 52 | ... -57 53 | -58 54 | +48 | ... +49 | +50 | + - class A( + - # + - object, + - # + - ): +51 + class A: +52 | ... +53 | +54 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:61:5 @@ -204,20 +194,19 @@ UP004 [*] Class `A` inherits from `object` 63 | ): | help: Remove `object` inheritance - -ℹ Unsafe fix -56 56 | ... -57 57 | -58 58 | -59 |-class A( -60 |- # -61 |- object -62 |- # -63 |-): - 59 |+class A: -64 60 | ... -65 61 | -66 62 | +56 | ... +57 | +58 | + - class A( + - # + - object + - # + - ): +59 + class A: +60 | ... +61 | +62 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:69:5 @@ -230,20 +219,19 @@ UP004 [*] Class `A` inherits from `object` 71 | ): | help: Remove `object` inheritance - -ℹ Unsafe fix -64 64 | ... -65 65 | -66 66 | -67 |-class A( -68 |- # -69 |- object -70 |- # -71 |-): - 67 |+class A: -72 68 | ... -73 69 | -74 70 | +64 | ... +65 | +66 | + - class A( + - # + - object + - # + - ): +67 + class A: +68 | ... +69 | +70 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `B` inherits from `object` --> UP004.py:75:12 @@ -253,16 +241,14 @@ UP004 [*] Class `B` inherits from `object` 76 | ... | help: Remove `object` inheritance - -ℹ Safe fix -72 72 | ... -73 73 | -74 74 | -75 |-class B(A, object): - 75 |+class B(A): -76 76 | ... -77 77 | -78 78 | +72 | ... +73 | +74 | + - class B(A, object): +75 + class B(A): +76 | ... +77 | +78 | UP004 [*] Class `B` inherits from `object` --> UP004.py:79:9 @@ -272,16 +258,14 @@ UP004 [*] Class `B` inherits from `object` 80 | ... | help: Remove `object` inheritance - -ℹ Safe fix -76 76 | ... -77 77 | -78 78 | -79 |-class B(object, A): - 79 |+class B(A): -80 80 | ... -81 81 | -82 82 | +76 | ... +77 | +78 | + - class B(object, A): +79 + class B(A): +80 | ... +81 | +82 | UP004 [*] Class `B` inherits from `object` --> UP004.py:84:5 @@ -293,15 +277,13 @@ UP004 [*] Class `B` inherits from `object` 86 | ): | help: Remove `object` inheritance - -ℹ Safe fix -81 81 | -82 82 | -83 83 | class B( -84 |- object, -85 84 | A, -86 85 | ): -87 86 | ... +81 | +82 | +83 | class B( + - object, +84 | A, +85 | ): +86 | ... UP004 [*] Class `B` inherits from `object` --> UP004.py:92:5 @@ -314,15 +296,13 @@ UP004 [*] Class `B` inherits from `object` 94 | ... | help: Remove `object` inheritance - -ℹ Safe fix -89 89 | -90 90 | class B( -91 91 | A, -92 |- object, -93 92 | ): -94 93 | ... -95 94 | +89 | +90 | class B( +91 | A, + - object, +92 | ): +93 | ... +94 | UP004 [*] Class `B` inherits from `object` --> UP004.py:98:5 @@ -334,15 +314,14 @@ UP004 [*] Class `B` inherits from `object` 100 | A, | help: Remove `object` inheritance - -ℹ Unsafe fix -95 95 | -96 96 | -97 97 | class B( -98 |- object, -99 98 | # Comment on A. -100 99 | A, -101 100 | ): +95 | +96 | +97 | class B( + - object, +98 | # Comment on A. +99 | A, +100 | ): +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `B` inherits from `object` --> UP004.py:108:5 @@ -355,15 +334,13 @@ UP004 [*] Class `B` inherits from `object` 110 | ... | help: Remove `object` inheritance - -ℹ Safe fix -105 105 | class B( -106 106 | # Comment on A. -107 107 | A, -108 |- object, -109 108 | ): -110 109 | ... -111 110 | +105 | class B( +106 | # Comment on A. +107 | A, + - object, +108 | ): +109 | ... +110 | UP004 [*] Class `A` inherits from `object` --> UP004.py:119:5 @@ -375,18 +352,16 @@ UP004 [*] Class `A` inherits from `object` 121 | ... | help: Remove `object` inheritance - -ℹ Safe fix -115 115 | ... -116 116 | -117 117 | -118 |-class A( -119 |- object, -120 |-): - 118 |+class A: -121 119 | ... -122 120 | -123 121 | +115 | ... +116 | +117 | + - class A( + - object, + - ): +118 + class A: +119 | ... +120 | +121 | UP004 [*] Class `A` inherits from `object` --> UP004.py:125:5 @@ -398,18 +373,17 @@ UP004 [*] Class `A` inherits from `object` 127 | ... | help: Remove `object` inheritance - -ℹ Unsafe fix -121 121 | ... -122 122 | -123 123 | -124 |-class A( -125 |- object, # ) -126 |-): - 124 |+class A: -127 125 | ... -128 126 | -129 127 | +121 | ... +122 | +123 | + - class A( + - object, # ) + - ): +124 + class A: +125 | ... +126 | +127 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:131:5 @@ -421,19 +395,18 @@ UP004 [*] Class `A` inherits from `object` 133 | ): | help: Remove `object` inheritance - -ℹ Unsafe fix -127 127 | ... -128 128 | -129 129 | -130 |-class A( -131 |- object # ) -132 |- , -133 |-): - 130 |+class A: -134 131 | ... -135 132 | -136 133 | +127 | ... +128 | +129 | + - class A( + - object # ) + - , + - ): +130 + class A: +131 | ... +132 | +133 | +note: This is an unsafe fix and may change runtime behavior UP004 [*] Class `A` inherits from `object` --> UP004.py:137:9 @@ -443,16 +416,14 @@ UP004 [*] Class `A` inherits from `object` 138 | ... | help: Remove `object` inheritance - -ℹ Safe fix -134 134 | ... -135 135 | -136 136 | -137 |-class A(object, object): - 137 |+class A(object): -138 138 | ... -139 139 | -140 140 | +134 | ... +135 | +136 | + - class A(object, object): +137 + class A(object): +138 | ... +139 | +140 | UP004 [*] Class `A` inherits from `object` --> UP004.py:137:17 @@ -462,16 +433,14 @@ UP004 [*] Class `A` inherits from `object` 138 | ... | help: Remove `object` inheritance - -ℹ Safe fix -134 134 | ... -135 135 | -136 136 | -137 |-class A(object, object): - 137 |+class A(object): -138 138 | ... -139 139 | -140 140 | +134 | ... +135 | +136 | + - class A(object, object): +137 + class A(object): +138 | ... +139 | +140 | UP004 [*] Class `A` inherits from `object` --> UP004.py:142:9 @@ -482,16 +451,14 @@ UP004 [*] Class `A` inherits from `object` 143 | ... | help: Remove `object` inheritance - -ℹ Safe fix -139 139 | -140 140 | -141 141 | @decorator() -142 |-class A(object): - 142 |+class A: -143 143 | ... -144 144 | -145 145 | @decorator() # class A(object): +139 | +140 | +141 | @decorator() + - class A(object): +142 + class A: +143 | ... +144 | +145 | @decorator() # class A(object): UP004 [*] Class `A` inherits from `object` --> UP004.py:146:9 @@ -502,16 +469,14 @@ UP004 [*] Class `A` inherits from `object` 147 | ... | help: Remove `object` inheritance - -ℹ Safe fix -143 143 | ... -144 144 | -145 145 | @decorator() # class A(object): -146 |-class A(object): - 146 |+class A: -147 147 | ... -148 148 | -149 149 | +143 | ... +144 | +145 | @decorator() # class A(object): + - class A(object): +146 + class A: +147 | ... +148 | +149 | UP004 [*] Class `Unusual` inherits from `object` --> UP004.py:159:15 @@ -523,11 +488,9 @@ UP004 [*] Class `Unusual` inherits from `object` 160 | ... | help: Remove `object` inheritance - -ℹ Safe fix -156 156 | -157 157 | import builtins -158 158 | -159 |-class Unusual(builtins.object): - 159 |+class Unusual: -160 160 | ... +156 | +157 | import builtins +158 | + - class Unusual(builtins.object): +159 + class Unusual: +160 | ... diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap index 062d02bd62..299cdb2e84 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP005.py.snap @@ -12,16 +12,14 @@ UP005 [*] `assertEquals` is deprecated, use `assertEqual` 8 | self.assertEqual(3, 4) | help: Replace `assertEqual` with `assertEquals` - -ℹ Safe fix -3 3 | -4 4 | class Suite(unittest.TestCase): -5 5 | def test(self) -> None: -6 |- self.assertEquals (1, 2) - 6 |+ self.assertEqual (1, 2) -7 7 | self.assertEquals(1, 2) -8 8 | self.assertEqual(3, 4) -9 9 | self.failUnlessAlmostEqual(1, 1.1) +3 | +4 | class Suite(unittest.TestCase): +5 | def test(self) -> None: + - self.assertEquals (1, 2) +6 + self.assertEqual (1, 2) +7 | self.assertEquals(1, 2) +8 | self.assertEqual(3, 4) +9 | self.failUnlessAlmostEqual(1, 1.1) UP005 [*] `assertEquals` is deprecated, use `assertEqual` --> UP005.py:7:9 @@ -34,16 +32,14 @@ UP005 [*] `assertEquals` is deprecated, use `assertEqual` 9 | self.failUnlessAlmostEqual(1, 1.1) | help: Replace `assertEqual` with `assertEquals` - -ℹ Safe fix -4 4 | class Suite(unittest.TestCase): -5 5 | def test(self) -> None: -6 6 | self.assertEquals (1, 2) -7 |- self.assertEquals(1, 2) - 7 |+ self.assertEqual(1, 2) -8 8 | self.assertEqual(3, 4) -9 9 | self.failUnlessAlmostEqual(1, 1.1) -10 10 | self.assertNotRegexpMatches("a", "b") +4 | class Suite(unittest.TestCase): +5 | def test(self) -> None: +6 | self.assertEquals (1, 2) + - self.assertEquals(1, 2) +7 + self.assertEqual(1, 2) +8 | self.assertEqual(3, 4) +9 | self.failUnlessAlmostEqual(1, 1.1) +10 | self.assertNotRegexpMatches("a", "b") UP005 [*] `failUnlessAlmostEqual` is deprecated, use `assertAlmostEqual` --> UP005.py:9:9 @@ -55,14 +51,12 @@ UP005 [*] `failUnlessAlmostEqual` is deprecated, use `assertAlmostEqual` 10 | self.assertNotRegexpMatches("a", "b") | help: Replace `assertAlmostEqual` with `failUnlessAlmostEqual` - -ℹ Safe fix -6 6 | self.assertEquals (1, 2) -7 7 | self.assertEquals(1, 2) -8 8 | self.assertEqual(3, 4) -9 |- self.failUnlessAlmostEqual(1, 1.1) - 9 |+ self.assertAlmostEqual(1, 1.1) -10 10 | self.assertNotRegexpMatches("a", "b") +6 | self.assertEquals (1, 2) +7 | self.assertEquals(1, 2) +8 | self.assertEqual(3, 4) + - self.failUnlessAlmostEqual(1, 1.1) +9 + self.assertAlmostEqual(1, 1.1) +10 | self.assertNotRegexpMatches("a", "b") UP005 [*] `assertNotRegexpMatches` is deprecated, use `assertNotRegex` --> UP005.py:10:9 @@ -73,10 +67,8 @@ UP005 [*] `assertNotRegexpMatches` is deprecated, use `assertNotRegex` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace `assertNotRegex` with `assertNotRegexpMatches` - -ℹ Safe fix -7 7 | self.assertEquals(1, 2) -8 8 | self.assertEqual(3, 4) -9 9 | self.failUnlessAlmostEqual(1, 1.1) -10 |- self.assertNotRegexpMatches("a", "b") - 10 |+ self.assertNotRegex("a", "b") +7 | self.assertEquals(1, 2) +8 | self.assertEqual(3, 4) +9 | self.failUnlessAlmostEqual(1, 1.1) + - self.assertNotRegexpMatches("a", "b") +10 + self.assertNotRegex("a", "b") diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap index c5370c7563..afe4a58b6e 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_0.py.snap @@ -9,16 +9,14 @@ UP006 [*] Use `list` instead of `typing.List` for type annotation 5 | ... | help: Replace with `list` - -ℹ Safe fix -1 1 | import typing -2 2 | -3 3 | -4 |-def f(x: typing.List[str]) -> None: - 4 |+def f(x: list[str]) -> None: -5 5 | ... -6 6 | -7 7 | +1 | import typing +2 | +3 | + - def f(x: typing.List[str]) -> None: +4 + def f(x: list[str]) -> None: +5 | ... +6 | +7 | UP006 [*] Use `list` instead of `List` for type annotation --> UP006_0.py:11:10 @@ -28,16 +26,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 12 | ... | help: Replace with `list` - -ℹ Safe fix -8 8 | from typing import List -9 9 | -10 10 | -11 |-def f(x: List[str]) -> None: - 11 |+def f(x: list[str]) -> None: -12 12 | ... -13 13 | -14 14 | +8 | from typing import List +9 | +10 | + - def f(x: List[str]) -> None: +11 + def f(x: list[str]) -> None: +12 | ... +13 | +14 | UP006 [*] Use `list` instead of `t.List` for type annotation --> UP006_0.py:18:10 @@ -47,16 +43,14 @@ UP006 [*] Use `list` instead of `t.List` for type annotation 19 | ... | help: Replace with `list` - -ℹ Safe fix -15 15 | import typing as t -16 16 | -17 17 | -18 |-def f(x: t.List[str]) -> None: - 18 |+def f(x: list[str]) -> None: -19 19 | ... -20 20 | -21 21 | +15 | import typing as t +16 | +17 | + - def f(x: t.List[str]) -> None: +18 + def f(x: list[str]) -> None: +19 | ... +20 | +21 | UP006 [*] Use `list` instead of `IList` for type annotation --> UP006_0.py:25:10 @@ -66,16 +60,14 @@ UP006 [*] Use `list` instead of `IList` for type annotation 26 | ... | help: Replace with `list` - -ℹ Safe fix -22 22 | from typing import List as IList -23 23 | -24 24 | -25 |-def f(x: IList[str]) -> None: - 25 |+def f(x: list[str]) -> None: -26 26 | ... -27 27 | -28 28 | +22 | from typing import List as IList +23 | +24 | + - def f(x: IList[str]) -> None: +25 + def f(x: list[str]) -> None: +26 | ... +27 | +28 | UP006 [*] Use `list` instead of `List` for type annotation --> UP006_0.py:29:11 @@ -85,16 +77,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 30 | ... | help: Replace with `list` - -ℹ Safe fix -26 26 | ... -27 27 | -28 28 | -29 |-def f(x: "List[str]") -> None: - 29 |+def f(x: "list[str]") -> None: -30 30 | ... -31 31 | -32 32 | +26 | ... +27 | +28 | + - def f(x: "List[str]") -> None: +29 + def f(x: "list[str]") -> None: +30 | ... +31 | +32 | UP006 [*] Use `list` instead of `List` for type annotation --> UP006_0.py:33:12 @@ -104,16 +94,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 34 | ... | help: Replace with `list` - -ℹ Safe fix -30 30 | ... -31 31 | -32 32 | -33 |-def f(x: r"List[str]") -> None: - 33 |+def f(x: r"list[str]") -> None: -34 34 | ... -35 35 | -36 36 | +30 | ... +31 | +32 | + - def f(x: r"List[str]") -> None: +33 + def f(x: r"list[str]") -> None: +34 | ... +35 | +36 | UP006 [*] Use `list` instead of `List` for type annotation --> UP006_0.py:37:11 @@ -123,16 +111,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 38 | ... | help: Replace with `list` - -ℹ Safe fix -34 34 | ... -35 35 | -36 36 | -37 |-def f(x: "List[str]") -> None: - 37 |+def f(x: "list[str]") -> None: -38 38 | ... -39 39 | -40 40 | +34 | ... +35 | +36 | + - def f(x: "List[str]") -> None: +37 + def f(x: "list[str]") -> None: +38 | ... +39 | +40 | UP006 [*] Use `list` instead of `List` for type annotation --> UP006_0.py:41:13 @@ -142,16 +128,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 42 | ... | help: Replace with `list` - -ℹ Safe fix -38 38 | ... -39 39 | -40 40 | -41 |-def f(x: """List[str]""") -> None: - 41 |+def f(x: """list[str]""") -> None: -42 42 | ... -43 43 | -44 44 | +38 | ... +39 | +40 | + - def f(x: """List[str]""") -> None: +41 + def f(x: """list[str]""") -> None: +42 | ... +43 | +44 | UP006 Use `list` instead of `List` for type annotation --> UP006_0.py:45:10 @@ -170,16 +154,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 50 | ... | help: Replace with `list` - -ℹ Safe fix -46 46 | ... -47 47 | -48 48 | -49 |-def f(x: "List['List[str]']") -> None: - 49 |+def f(x: "list['List[str]']") -> None: -50 50 | ... -51 51 | -52 52 | +46 | ... +47 | +48 | + - def f(x: "List['List[str]']") -> None: +49 + def f(x: "list['List[str]']") -> None: +50 | ... +51 | +52 | UP006 [*] Use `list` instead of `List` for type annotation --> UP006_0.py:49:17 @@ -189,16 +171,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 50 | ... | help: Replace with `list` - -ℹ Safe fix -46 46 | ... -47 47 | -48 48 | -49 |-def f(x: "List['List[str]']") -> None: - 49 |+def f(x: "List['list[str]']") -> None: -50 50 | ... -51 51 | -52 52 | +46 | ... +47 | +48 | + - def f(x: "List['List[str]']") -> None: +49 + def f(x: "List['list[str]']") -> None: +50 | ... +51 | +52 | UP006 [*] Use `list` instead of `List` for type annotation --> UP006_0.py:53:11 @@ -208,16 +188,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 54 | ... | help: Replace with `list` - -ℹ Safe fix -50 50 | ... -51 51 | -52 52 | -53 |-def f(x: "List['Li' 'st[str]']") -> None: - 53 |+def f(x: "list['Li' 'st[str]']") -> None: -54 54 | ... -55 55 | -56 56 | +50 | ... +51 | +52 | + - def f(x: "List['Li' 'st[str]']") -> None: +53 + def f(x: "list['Li' 'st[str]']") -> None: +54 | ... +55 | +56 | UP006 Use `list` instead of `List` for type annotation --> UP006_0.py:53:16 @@ -254,24 +232,22 @@ UP006 [*] Use `collections.deque` instead of `typing.Deque` for type annotation 62 | ... | help: Replace with `collections.deque` - -ℹ Safe fix -20 20 | -21 21 | -22 22 | from typing import List as IList - 23 |+from collections import deque -23 24 | -24 25 | -25 26 | def f(x: IList[str]) -> None: +20 | +21 | +22 | from typing import List as IList +23 + from collections import deque +24 | +25 | +26 | def f(x: IList[str]) -> None: -------------------------------------------------------------------------------- -58 59 | ... -59 60 | -60 61 | -61 |-def f(x: typing.Deque[str]) -> None: - 62 |+def f(x: deque[str]) -> None: -62 63 | ... -63 64 | -64 65 | +59 | ... +60 | +61 | + - def f(x: typing.Deque[str]) -> None: +62 + def f(x: deque[str]) -> None: +63 | ... +64 | +65 | UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type annotation --> UP006_0.py:65:10 @@ -281,19 +257,17 @@ UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type 66 | ... | help: Replace with `collections.defaultdict` - -ℹ Safe fix -20 20 | -21 21 | -22 22 | from typing import List as IList - 23 |+from collections import defaultdict -23 24 | -24 25 | -25 26 | def f(x: IList[str]) -> None: +20 | +21 | +22 | from typing import List as IList +23 + from collections import defaultdict +24 | +25 | +26 | def f(x: IList[str]) -> None: -------------------------------------------------------------------------------- -62 63 | ... -63 64 | -64 65 | -65 |-def f(x: typing.DefaultDict[str, str]) -> None: - 66 |+def f(x: defaultdict[str, str]) -> None: -66 67 | ... +63 | ... +64 | +65 | + - def f(x: typing.DefaultDict[str, str]) -> None: +66 + def f(x: defaultdict[str, str]) -> None: +67 | ... diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap index 680fe6a594..4381ef616a 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_1.py.snap @@ -9,11 +9,9 @@ UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type 10 | ... | help: Replace with `collections.defaultdict` - -ℹ Safe fix -6 6 | from collections import defaultdict -7 7 | -8 8 | -9 |-def f(x: typing.DefaultDict[str, str]) -> None: - 9 |+def f(x: defaultdict[str, str]) -> None: -10 10 | ... +6 | from collections import defaultdict +7 | +8 | + - def f(x: typing.DefaultDict[str, str]) -> None: +9 + def f(x: defaultdict[str, str]) -> None: +10 | ... diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap index 956d599409..c9034d7ee6 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP006_3.py.snap @@ -9,11 +9,9 @@ UP006 [*] Use `collections.defaultdict` instead of `typing.DefaultDict` for type 8 | ... | help: Replace with `collections.defaultdict` - -ℹ Safe fix -4 4 | from collections import defaultdict -5 5 | -6 6 | -7 |-def f(x: "typing.DefaultDict[str, str]") -> None: - 7 |+def f(x: "defaultdict[str, str]") -> None: -8 8 | ... +4 | from collections import defaultdict +5 | +6 | + - def f(x: "typing.DefaultDict[str, str]") -> None: +7 + def f(x: "defaultdict[str, str]") -> None: +8 | ... diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap index 8d7774bbe1..c050ba4988 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP007.py.snap @@ -9,16 +9,14 @@ UP007 [*] Use `X | Y` for type annotations 6 | ... | help: Convert to `X | Y` - -ℹ Safe fix -2 2 | from typing import Union -3 3 | -4 4 | -5 |-def f(x: Union[str, int, Union[float, bytes]]) -> None: - 5 |+def f(x: str | int | Union[float, bytes]) -> None: -6 6 | ... -7 7 | -8 8 | +2 | from typing import Union +3 | +4 | + - def f(x: Union[str, int, Union[float, bytes]]) -> None: +5 + def f(x: str | int | Union[float, bytes]) -> None: +6 | ... +7 | +8 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:5:26 @@ -28,16 +26,14 @@ UP007 [*] Use `X | Y` for type annotations 6 | ... | help: Convert to `X | Y` - -ℹ Safe fix -2 2 | from typing import Union -3 3 | -4 4 | -5 |-def f(x: Union[str, int, Union[float, bytes]]) -> None: - 5 |+def f(x: Union[str, int, float | bytes]) -> None: -6 6 | ... -7 7 | -8 8 | +2 | from typing import Union +3 | +4 | + - def f(x: Union[str, int, Union[float, bytes]]) -> None: +5 + def f(x: Union[str, int, float | bytes]) -> None: +6 | ... +7 | +8 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:9:10 @@ -47,16 +43,14 @@ UP007 [*] Use `X | Y` for type annotations 10 | ... | help: Convert to `X | Y` - -ℹ Safe fix -6 6 | ... -7 7 | -8 8 | -9 |-def f(x: typing.Union[str, int]) -> None: - 9 |+def f(x: str | int) -> None: -10 10 | ... -11 11 | -12 12 | +6 | ... +7 | +8 | + - def f(x: typing.Union[str, int]) -> None: +9 + def f(x: str | int) -> None: +10 | ... +11 | +12 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:13:10 @@ -66,16 +60,14 @@ UP007 [*] Use `X | Y` for type annotations 14 | ... | help: Convert to `X | Y` - -ℹ Safe fix -10 10 | ... -11 11 | -12 12 | -13 |-def f(x: typing.Union[(str, int)]) -> None: - 13 |+def f(x: str | int) -> None: -14 14 | ... -15 15 | -16 16 | +10 | ... +11 | +12 | + - def f(x: typing.Union[(str, int)]) -> None: +13 + def f(x: str | int) -> None: +14 | ... +15 | +16 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:17:10 @@ -85,16 +77,14 @@ UP007 [*] Use `X | Y` for type annotations 18 | ... | help: Convert to `X | Y` - -ℹ Safe fix -14 14 | ... -15 15 | -16 16 | -17 |-def f(x: typing.Union[(str, int), float]) -> None: - 17 |+def f(x: str | int | float) -> None: -18 18 | ... -19 19 | -20 20 | +14 | ... +15 | +16 | + - def f(x: typing.Union[(str, int), float]) -> None: +17 + def f(x: str | int | float) -> None: +18 | ... +19 | +20 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:21:10 @@ -104,16 +94,14 @@ UP007 [*] Use `X | Y` for type annotations 22 | ... | help: Convert to `X | Y` - -ℹ Safe fix -18 18 | ... -19 19 | -20 20 | -21 |-def f(x: typing.Union[(int,)]) -> None: - 21 |+def f(x: int) -> None: -22 22 | ... -23 23 | -24 24 | +18 | ... +19 | +20 | + - def f(x: typing.Union[(int,)]) -> None: +21 + def f(x: int) -> None: +22 | ... +23 | +24 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:25:10 @@ -123,16 +111,14 @@ UP007 [*] Use `X | Y` for type annotations 26 | ... | help: Convert to `X | Y` - -ℹ Safe fix -22 22 | ... -23 23 | -24 24 | -25 |-def f(x: typing.Union[()]) -> None: - 25 |+def f(x: ()) -> None: -26 26 | ... -27 27 | -28 28 | +22 | ... +23 | +24 | + - def f(x: typing.Union[()]) -> None: +25 + def f(x: ()) -> None: +26 | ... +27 | +28 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:29:11 @@ -142,16 +128,14 @@ UP007 [*] Use `X | Y` for type annotations 30 | ... | help: Convert to `X | Y` - -ℹ Safe fix -26 26 | ... -27 27 | -28 28 | -29 |-def f(x: "Union[str, int, Union[float, bytes]]") -> None: - 29 |+def f(x: "str | int | Union[float, bytes]") -> None: -30 30 | ... -31 31 | -32 32 | +26 | ... +27 | +28 | + - def f(x: "Union[str, int, Union[float, bytes]]") -> None: +29 + def f(x: "str | int | Union[float, bytes]") -> None: +30 | ... +31 | +32 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:29:27 @@ -161,16 +145,14 @@ UP007 [*] Use `X | Y` for type annotations 30 | ... | help: Convert to `X | Y` - -ℹ Safe fix -26 26 | ... -27 27 | -28 28 | -29 |-def f(x: "Union[str, int, Union[float, bytes]]") -> None: - 29 |+def f(x: "Union[str, int, float | bytes]") -> None: -30 30 | ... -31 31 | -32 32 | +26 | ... +27 | +28 | + - def f(x: "Union[str, int, Union[float, bytes]]") -> None: +29 + def f(x: "Union[str, int, float | bytes]") -> None: +30 | ... +31 | +32 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:33:11 @@ -180,16 +162,14 @@ UP007 [*] Use `X | Y` for type annotations 34 | ... | help: Convert to `X | Y` - -ℹ Safe fix -30 30 | ... -31 31 | -32 32 | -33 |-def f(x: "typing.Union[str, int]") -> None: - 33 |+def f(x: "str | int") -> None: -34 34 | ... -35 35 | -36 36 | +30 | ... +31 | +32 | + - def f(x: "typing.Union[str, int]") -> None: +33 + def f(x: "str | int") -> None: +34 | ... +35 | +36 | UP007 Use `X | Y` for type annotations --> UP007.py:46:9 @@ -212,16 +192,14 @@ UP007 [*] Use `X | Y` for type annotations 49 | x: Union["str", "int"] | help: Convert to `X | Y` - -ℹ Safe fix -45 45 | def f() -> None: -46 46 | x = Union[str, int] -47 47 | x = Union["str", "int"] -48 |- x: Union[str, int] - 48 |+ x: str | int -49 49 | x: Union["str", "int"] -50 50 | -51 51 | +45 | def f() -> None: +46 | x = Union[str, int] +47 | x = Union["str", "int"] + - x: Union[str, int] +48 + x: str | int +49 | x: Union["str", "int"] +50 | +51 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:49:8 @@ -232,16 +210,14 @@ UP007 [*] Use `X | Y` for type annotations | ^^^^^^^^^^^^^^^^^^^ | help: Convert to `X | Y` - -ℹ Safe fix -46 46 | x = Union[str, int] -47 47 | x = Union["str", "int"] -48 48 | x: Union[str, int] -49 |- x: Union["str", "int"] - 49 |+ x: "str" | "int" -50 50 | -51 51 | -52 52 | def f(x: Union[int : float]) -> None: +46 | x = Union[str, int] +47 | x = Union["str", "int"] +48 | x: Union[str, int] + - x: Union["str", "int"] +49 + x: "str" | "int" +50 | +51 | +52 | def f(x: Union[int : float]) -> None: UP007 Use `X | Y` for type annotations --> UP007.py:52:10 @@ -306,16 +282,14 @@ UP007 [*] Use `X | Y` for type annotations 84 | ... | help: Convert to `X | Y` - -ℹ Safe fix -80 80 | -81 81 | -82 82 | # Regression test for: https://github.com/astral-sh/ruff/issues/8609 -83 |-def f(x: Union[int, str, bytes]) -> None: - 83 |+def f(x: int | str | bytes) -> None: -84 84 | ... -85 85 | -86 86 | +80 | +81 | +82 | # Regression test for: https://github.com/astral-sh/ruff/issues/8609 + - def f(x: Union[int, str, bytes]) -> None: +83 + def f(x: int | str | bytes) -> None: +84 | ... +85 | +86 | UP007 [*] Use `X | Y` for type annotations --> UP007.py:91:26 @@ -327,13 +301,11 @@ UP007 [*] Use `X | Y` for type annotations 92 | print(param) | help: Convert to `X | Y` - -ℹ Safe fix -88 88 | class AClass: -89 89 | ... -90 90 | -91 |-def myfunc(param: "tuple[Union[int, 'AClass', None], str]"): - 91 |+def myfunc(param: "tuple[int | 'AClass' | None, str]"): -92 92 | print(param) -93 93 | -94 94 | +88 | class AClass: +89 | ... +90 | + - def myfunc(param: "tuple[Union[int, 'AClass', None], str]"): +91 + def myfunc(param: "tuple[int | 'AClass' | None, str]"): +92 | print(param) +93 | +94 | diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap index b0d8a7da1c..3d8a9b4638 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py.snap @@ -11,16 +11,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 19 | super( | help: Remove `super()` parameters - -ℹ Unsafe fix -14 14 | Parent.super(1, 2) # ok -15 15 | -16 16 | def wrong(self): -17 |- parent = super(Child, self) # wrong - 17 |+ parent = super() # wrong -18 18 | super(Child, self).method # wrong -19 19 | super( -20 20 | Child, +14 | Parent.super(1, 2) # ok +15 | +16 | def wrong(self): + - parent = super(Child, self) # wrong +17 + parent = super() # wrong +18 | super(Child, self).method # wrong +19 | super( +20 | Child, +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:18:14 @@ -33,16 +32,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 20 | Child, | help: Remove `super()` parameters - -ℹ Unsafe fix -15 15 | -16 16 | def wrong(self): -17 17 | parent = super(Child, self) # wrong -18 |- super(Child, self).method # wrong - 18 |+ super().method # wrong -19 19 | super( -20 20 | Child, -21 21 | self, +15 | +16 | def wrong(self): +17 | parent = super(Child, self) # wrong + - super(Child, self).method # wrong +18 + super().method # wrong +19 | super( +20 | Child, +21 | self, +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:19:14 @@ -57,19 +55,18 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | |_________^ | help: Remove `super()` parameters - -ℹ Unsafe fix -16 16 | def wrong(self): -17 17 | parent = super(Child, self) # wrong -18 18 | super(Child, self).method # wrong -19 |- super( -20 |- Child, -21 |- self, -22 |- ).method() # wrong - 19 |+ super().method() # wrong -23 20 | -24 21 | -25 22 | class BaseClass: +16 | def wrong(self): +17 | parent = super(Child, self) # wrong +18 | super(Child, self).method # wrong + - super( + - Child, + - self, + - ).method() # wrong +19 + super().method() # wrong +20 | +21 | +22 | class BaseClass: +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:36:14 @@ -81,16 +78,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 37 | super().f() | help: Remove `super()` parameters - -ℹ Unsafe fix -33 33 | -34 34 | class MyClass(BaseClass): -35 35 | def normal(self): -36 |- super(MyClass, self).f() # can use super() - 36 |+ super().f() # can use super() -37 37 | super().f() -38 38 | -39 39 | def different_argument(self, other): +33 | +34 | class MyClass(BaseClass): +35 | def normal(self): + - super(MyClass, self).f() # can use super() +36 + super().f() # can use super() +37 | super().f() +38 | +39 | def different_argument(self, other): +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:50:18 @@ -101,16 +97,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 51 | super().f() | help: Remove `super()` parameters - -ℹ Unsafe fix -47 47 | super(MyClass, self).f() # CANNOT use super() -48 48 | -49 49 | def inner_argument(self): -50 |- super(MyClass, self).f() # can use super() - 50 |+ super().f() # can use super() -51 51 | super().f() -52 52 | -53 53 | outer_argument() +47 | super(MyClass, self).f() # CANNOT use super() +48 | +49 | def inner_argument(self): + - super(MyClass, self).f() # can use super() +50 + super().f() # can use super() +51 | super().f() +52 | +53 | outer_argument() +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:74:14 @@ -122,16 +117,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 75 | super().f() # OK | help: Remove `super()` parameters - -ℹ Unsafe fix -71 71 | @dataclass -72 72 | class DataClass: -73 73 | def normal(self): -74 |- super(DataClass, self).f() # Error - 74 |+ super().f() # Error -75 75 | super().f() # OK -76 76 | -77 77 | +71 | @dataclass +72 | class DataClass: +73 | def normal(self): + - super(DataClass, self).f() # Error +74 + super().f() # Error +75 | super().f() # OK +76 | +77 | +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:92:14 @@ -142,16 +136,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | ^^^^^^^^^^^^^^^^^ | help: Remove `super()` parameters - -ℹ Unsafe fix -89 89 | -90 90 | class B(A): -91 91 | def bar(self): -92 |- super(__class__, self).foo() - 92 |+ super().foo() -93 93 | -94 94 | -95 95 | # see: https://github.com/astral-sh/ruff/issues/18684 +89 | +90 | class B(A): +91 | def bar(self): + - super(__class__, self).foo() +92 + super().foo() +93 | +94 | +95 | # see: https://github.com/astral-sh/ruff/issues/18684 +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:107:23 @@ -162,16 +155,15 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | ^^^^^^^^^ | help: Remove `super()` parameters - -ℹ Unsafe fix -104 104 | -105 105 | class C: -106 106 | def f(self): -107 |- builtins.super(C, self) - 107 |+ builtins.super() -108 108 | -109 109 | -110 110 | # see: https://github.com/astral-sh/ruff/issues/18533 +104 | +105 | class C: +106 | def f(self): + - builtins.super(C, self) +107 + builtins.super() +108 | +109 | +110 | # see: https://github.com/astral-sh/ruff/issues/18533 +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:113:14 @@ -189,20 +181,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 119 | ClassForCommentEnthusiasts, | help: Remove `super()` parameters - -ℹ Unsafe fix -110 110 | # see: https://github.com/astral-sh/ruff/issues/18533 -111 111 | class ClassForCommentEnthusiasts(BaseClass): -112 112 | def with_comments(self): -113 |- super( -114 |- # super helpful comment -115 |- ClassForCommentEnthusiasts, -116 |- self -117 |- ).f() - 113 |+ super().f() -118 114 | super( -119 115 | ClassForCommentEnthusiasts, -120 116 | # even more helpful comment +110 | # see: https://github.com/astral-sh/ruff/issues/18533 +111 | class ClassForCommentEnthusiasts(BaseClass): +112 | def with_comments(self): + - super( + - # super helpful comment + - ClassForCommentEnthusiasts, + - self + - ).f() +113 + super().f() +114 | super( +115 | ClassForCommentEnthusiasts, +116 | # even more helpful comment +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:118:14 @@ -220,20 +211,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 124 | ClassForCommentEnthusiasts, | help: Remove `super()` parameters - -ℹ Unsafe fix -115 115 | ClassForCommentEnthusiasts, -116 116 | self -117 117 | ).f() -118 |- super( -119 |- ClassForCommentEnthusiasts, -120 |- # even more helpful comment -121 |- self -122 |- ).f() - 118 |+ super().f() -123 119 | super( -124 120 | ClassForCommentEnthusiasts, -125 121 | self +115 | ClassForCommentEnthusiasts, +116 | self +117 | ).f() + - super( + - ClassForCommentEnthusiasts, + - # even more helpful comment + - self + - ).f() +118 + super().f() +119 | super( +120 | ClassForCommentEnthusiasts, +121 | self +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:123:14 @@ -249,20 +239,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | |_________^ | help: Remove `super()` parameters - -ℹ Unsafe fix -120 120 | # even more helpful comment -121 121 | self -122 122 | ).f() -123 |- super( -124 |- ClassForCommentEnthusiasts, -125 |- self -126 |- # also a comment -127 |- ).f() - 123 |+ super().f() -128 124 | -129 125 | -130 126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed +120 | # even more helpful comment +121 | self +122 | ).f() + - super( + - ClassForCommentEnthusiasts, + - self + - # also a comment + - ).f() +123 + super().f() +124 | +125 | +126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed +note: This is an unsafe fix and may change runtime behavior UP008 Use `super()` instead of `super(__class__, self)` --> UP008.py:133:21 @@ -307,10 +296,9 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove `super()` parameters - -ℹ Unsafe fix -140 140 | super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method() # Should emit diagnostic but NOT be fixed -141 141 | -142 142 | def method3(self): -143 |- super(ExampleWithKeywords, self).some_method() # Should be fixed - no keywords - 143 |+ super().some_method() # Should be fixed - no keywords +140 | super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method() # Should emit diagnostic but NOT be fixed +141 | +142 | def method3(self): + - super(ExampleWithKeywords, self).some_method() # Should be fixed - no keywords +143 + super().some_method() # Should be fixed - no keywords +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap index ab4386423d..818c959b74 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP008.py__preview.snap @@ -11,16 +11,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 19 | super( | help: Remove `super()` parameters - -ℹ Safe fix -14 14 | Parent.super(1, 2) # ok -15 15 | -16 16 | def wrong(self): -17 |- parent = super(Child, self) # wrong - 17 |+ parent = super() # wrong -18 18 | super(Child, self).method # wrong -19 19 | super( -20 20 | Child, +14 | Parent.super(1, 2) # ok +15 | +16 | def wrong(self): + - parent = super(Child, self) # wrong +17 + parent = super() # wrong +18 | super(Child, self).method # wrong +19 | super( +20 | Child, UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:18:14 @@ -33,16 +31,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 20 | Child, | help: Remove `super()` parameters - -ℹ Safe fix -15 15 | -16 16 | def wrong(self): -17 17 | parent = super(Child, self) # wrong -18 |- super(Child, self).method # wrong - 18 |+ super().method # wrong -19 19 | super( -20 20 | Child, -21 21 | self, +15 | +16 | def wrong(self): +17 | parent = super(Child, self) # wrong + - super(Child, self).method # wrong +18 + super().method # wrong +19 | super( +20 | Child, +21 | self, UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:19:14 @@ -57,19 +53,17 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | |_________^ | help: Remove `super()` parameters - -ℹ Safe fix -16 16 | def wrong(self): -17 17 | parent = super(Child, self) # wrong -18 18 | super(Child, self).method # wrong -19 |- super( -20 |- Child, -21 |- self, -22 |- ).method() # wrong - 19 |+ super().method() # wrong -23 20 | -24 21 | -25 22 | class BaseClass: +16 | def wrong(self): +17 | parent = super(Child, self) # wrong +18 | super(Child, self).method # wrong + - super( + - Child, + - self, + - ).method() # wrong +19 + super().method() # wrong +20 | +21 | +22 | class BaseClass: UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:36:14 @@ -81,16 +75,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 37 | super().f() | help: Remove `super()` parameters - -ℹ Safe fix -33 33 | -34 34 | class MyClass(BaseClass): -35 35 | def normal(self): -36 |- super(MyClass, self).f() # can use super() - 36 |+ super().f() # can use super() -37 37 | super().f() -38 38 | -39 39 | def different_argument(self, other): +33 | +34 | class MyClass(BaseClass): +35 | def normal(self): + - super(MyClass, self).f() # can use super() +36 + super().f() # can use super() +37 | super().f() +38 | +39 | def different_argument(self, other): UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:50:18 @@ -101,16 +93,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 51 | super().f() | help: Remove `super()` parameters - -ℹ Safe fix -47 47 | super(MyClass, self).f() # CANNOT use super() -48 48 | -49 49 | def inner_argument(self): -50 |- super(MyClass, self).f() # can use super() - 50 |+ super().f() # can use super() -51 51 | super().f() -52 52 | -53 53 | outer_argument() +47 | super(MyClass, self).f() # CANNOT use super() +48 | +49 | def inner_argument(self): + - super(MyClass, self).f() # can use super() +50 + super().f() # can use super() +51 | super().f() +52 | +53 | outer_argument() UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:74:14 @@ -122,16 +112,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 75 | super().f() # OK | help: Remove `super()` parameters - -ℹ Safe fix -71 71 | @dataclass -72 72 | class DataClass: -73 73 | def normal(self): -74 |- super(DataClass, self).f() # Error - 74 |+ super().f() # Error -75 75 | super().f() # OK -76 76 | -77 77 | +71 | @dataclass +72 | class DataClass: +73 | def normal(self): + - super(DataClass, self).f() # Error +74 + super().f() # Error +75 | super().f() # OK +76 | +77 | UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:92:14 @@ -142,16 +130,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | ^^^^^^^^^^^^^^^^^ | help: Remove `super()` parameters - -ℹ Safe fix -89 89 | -90 90 | class B(A): -91 91 | def bar(self): -92 |- super(__class__, self).foo() - 92 |+ super().foo() -93 93 | -94 94 | -95 95 | # see: https://github.com/astral-sh/ruff/issues/18684 +89 | +90 | class B(A): +91 | def bar(self): + - super(__class__, self).foo() +92 + super().foo() +93 | +94 | +95 | # see: https://github.com/astral-sh/ruff/issues/18684 UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:107:23 @@ -162,16 +148,14 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | ^^^^^^^^^ | help: Remove `super()` parameters - -ℹ Safe fix -104 104 | -105 105 | class C: -106 106 | def f(self): -107 |- builtins.super(C, self) - 107 |+ builtins.super() -108 108 | -109 109 | -110 110 | # see: https://github.com/astral-sh/ruff/issues/18533 +104 | +105 | class C: +106 | def f(self): + - builtins.super(C, self) +107 + builtins.super() +108 | +109 | +110 | # see: https://github.com/astral-sh/ruff/issues/18533 UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:113:14 @@ -189,20 +173,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 119 | ClassForCommentEnthusiasts, | help: Remove `super()` parameters - -ℹ Unsafe fix -110 110 | # see: https://github.com/astral-sh/ruff/issues/18533 -111 111 | class ClassForCommentEnthusiasts(BaseClass): -112 112 | def with_comments(self): -113 |- super( -114 |- # super helpful comment -115 |- ClassForCommentEnthusiasts, -116 |- self -117 |- ).f() - 113 |+ super().f() -118 114 | super( -119 115 | ClassForCommentEnthusiasts, -120 116 | # even more helpful comment +110 | # see: https://github.com/astral-sh/ruff/issues/18533 +111 | class ClassForCommentEnthusiasts(BaseClass): +112 | def with_comments(self): + - super( + - # super helpful comment + - ClassForCommentEnthusiasts, + - self + - ).f() +113 + super().f() +114 | super( +115 | ClassForCommentEnthusiasts, +116 | # even more helpful comment +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:118:14 @@ -220,20 +203,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` 124 | ClassForCommentEnthusiasts, | help: Remove `super()` parameters - -ℹ Unsafe fix -115 115 | ClassForCommentEnthusiasts, -116 116 | self -117 117 | ).f() -118 |- super( -119 |- ClassForCommentEnthusiasts, -120 |- # even more helpful comment -121 |- self -122 |- ).f() - 118 |+ super().f() -123 119 | super( -124 120 | ClassForCommentEnthusiasts, -125 121 | self +115 | ClassForCommentEnthusiasts, +116 | self +117 | ).f() + - super( + - ClassForCommentEnthusiasts, + - # even more helpful comment + - self + - ).f() +118 + super().f() +119 | super( +120 | ClassForCommentEnthusiasts, +121 | self +note: This is an unsafe fix and may change runtime behavior UP008 [*] Use `super()` instead of `super(__class__, self)` --> UP008.py:123:14 @@ -249,20 +231,19 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | |_________^ | help: Remove `super()` parameters - -ℹ Unsafe fix -120 120 | # even more helpful comment -121 121 | self -122 122 | ).f() -123 |- super( -124 |- ClassForCommentEnthusiasts, -125 |- self -126 |- # also a comment -127 |- ).f() - 123 |+ super().f() -128 124 | -129 125 | -130 126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed +120 | # even more helpful comment +121 | self +122 | ).f() + - super( + - ClassForCommentEnthusiasts, + - self + - # also a comment + - ).f() +123 + super().f() +124 | +125 | +126 | # Issue #19096: super calls with keyword arguments should emit diagnostic but not be fixed +note: This is an unsafe fix and may change runtime behavior UP008 Use `super()` instead of `super(__class__, self)` --> UP008.py:133:21 @@ -307,10 +288,8 @@ UP008 [*] Use `super()` instead of `super(__class__, self)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove `super()` parameters - -ℹ Safe fix -140 140 | super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method() # Should emit diagnostic but NOT be fixed -141 141 | -142 142 | def method3(self): -143 |- super(ExampleWithKeywords, self).some_method() # Should be fixed - no keywords - 143 |+ super().some_method() # Should be fixed - no keywords +140 | super(ExampleWithKeywords, self, **{"kwarg": "value"}).some_method() # Should emit diagnostic but NOT be fixed +141 | +142 | def method3(self): + - super(ExampleWithKeywords, self).some_method() # Should be fixed - no keywords +143 + super().some_method() # Should be fixed - no keywords diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap index d13be47734..67b831c505 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_0.py.snap @@ -10,8 +10,6 @@ UP009 [*] UTF-8 encoding declaration is unnecessary 3 | print("Hello world") | help: Remove unnecessary coding comment - -ℹ Safe fix -1 |-# coding=utf8 -2 1 | -3 2 | print("Hello world") + - # coding=utf8 +1 | +2 | print("Hello world") diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap index 518d66064e..e9fecded89 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_1.py.snap @@ -11,9 +11,7 @@ UP009 [*] UTF-8 encoding declaration is unnecessary 4 | print('Hello world') | help: Remove unnecessary coding comment - -ℹ Safe fix -1 1 | #!/usr/bin/python -2 |-# -*- coding: utf-8 -*- -3 2 | -4 3 | print('Hello world') +1 | #!/usr/bin/python + - # -*- coding: utf-8 -*- +2 | +3 | print('Hello world') diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap index 51aa5c1f21..e96f9db7fd 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_6.py.snap @@ -9,9 +9,7 @@ UP009 [*] UTF-8 encoding declaration is unnecessary 2 | print("Hello world") | help: Remove unnecessary coding comment - -ℹ Safe fix -1 |- # coding=utf8 -2 1 | print("Hello world") -3 2 | -4 3 | """ + - # coding=utf8 +1 | print("Hello world") +2 | +3 | """ diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap index 172cef836e..b9f0146c9e 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_7.py.snap @@ -9,9 +9,7 @@ UP009 [*] UTF-8 encoding declaration is unnecessary 2 | print("Hello world") | help: Remove unnecessary coding comment - -ℹ Safe fix -1 |- # coding=utf8 -2 1 | print("Hello world") -3 2 | -4 3 | """ + - # coding=utf8 +1 | print("Hello world") +2 | +3 | """ diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap index 62c3c09c76..69ad15e018 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_code_other.py.snap @@ -10,8 +10,6 @@ UP009 [*] UTF-8 encoding declaration is unnecessary 3 | # -*- coding: ascii -*- | help: Remove unnecessary coding comment - -ℹ Safe fix -1 |-# -*- coding: utf8 -*- -2 1 | print("the following is not a coding comment") -3 2 | # -*- coding: ascii -*- + - # -*- coding: utf8 -*- +1 | print("the following is not a coding comment") +2 | # -*- coding: ascii -*- diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap index cdf3e2b5b1..1345d78543 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8.py.snap @@ -9,7 +9,5 @@ UP009 [*] UTF-8 encoding declaration is unnecessary 2 | # -*- coding: utf-8 -*- | help: Remove unnecessary coding comment - -ℹ Safe fix -1 1 | # -*- coding: utf-8 -*- -2 |-# -*- coding: utf-8 -*- +1 | # -*- coding: utf-8 -*- + - # -*- coding: utf-8 -*- diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap index 6cefa818a7..bd91f21128 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP009_utf8_utf8_other.py.snap @@ -10,8 +10,6 @@ UP009 [*] UTF-8 encoding declaration is unnecessary 3 | # -*- coding: ascii -*- | help: Remove unnecessary coding comment - -ℹ Safe fix -1 1 | # -*- coding: utf-8 -*- -2 |-# -*- coding: utf-8 -*- -3 2 | # -*- coding: ascii -*- +1 | # -*- coding: utf-8 -*- + - # -*- coding: utf-8 -*- +2 | # -*- coding: ascii -*- diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap index dc038f9c44..f173eda454 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_0.py.snap @@ -10,12 +10,10 @@ UP010 [*] Unnecessary `__future__` imports `generators`, `nested_scopes` for tar 3 | from __future__ import absolute_import, division | help: Remove unnecessary `__future__` import - -ℹ Safe fix -1 |-from __future__ import nested_scopes, generators -2 1 | from __future__ import with_statement, unicode_literals -3 2 | from __future__ import absolute_import, division -4 3 | from __future__ import generator_stop + - from __future__ import nested_scopes, generators +1 | from __future__ import with_statement, unicode_literals +2 | from __future__ import absolute_import, division +3 | from __future__ import generator_stop UP010 [*] Unnecessary `__future__` imports `unicode_literals`, `with_statement` for target Python version --> UP010_0.py:2:1 @@ -27,13 +25,11 @@ UP010 [*] Unnecessary `__future__` imports `unicode_literals`, `with_statement` 4 | from __future__ import generator_stop | help: Remove unnecessary `__future__` import - -ℹ Safe fix -1 1 | from __future__ import nested_scopes, generators -2 |-from __future__ import with_statement, unicode_literals -3 2 | from __future__ import absolute_import, division -4 3 | from __future__ import generator_stop -5 4 | from __future__ import print_function, generator_stop +1 | from __future__ import nested_scopes, generators + - from __future__ import with_statement, unicode_literals +2 | from __future__ import absolute_import, division +3 | from __future__ import generator_stop +4 | from __future__ import print_function, generator_stop UP010 [*] Unnecessary `__future__` imports `absolute_import`, `division` for target Python version --> UP010_0.py:3:1 @@ -46,14 +42,12 @@ UP010 [*] Unnecessary `__future__` imports `absolute_import`, `division` for tar 5 | from __future__ import print_function, generator_stop | help: Remove unnecessary `__future__` import - -ℹ Safe fix -1 1 | from __future__ import nested_scopes, generators -2 2 | from __future__ import with_statement, unicode_literals -3 |-from __future__ import absolute_import, division -4 3 | from __future__ import generator_stop -5 4 | from __future__ import print_function, generator_stop -6 5 | from __future__ import invalid_module, generators +1 | from __future__ import nested_scopes, generators +2 | from __future__ import with_statement, unicode_literals + - from __future__ import absolute_import, division +3 | from __future__ import generator_stop +4 | from __future__ import print_function, generator_stop +5 | from __future__ import invalid_module, generators UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version --> UP010_0.py:4:1 @@ -66,15 +60,13 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver 6 | from __future__ import invalid_module, generators | help: Remove unnecessary `__future__` import - -ℹ Safe fix -1 1 | from __future__ import nested_scopes, generators -2 2 | from __future__ import with_statement, unicode_literals -3 3 | from __future__ import absolute_import, division -4 |-from __future__ import generator_stop -5 4 | from __future__ import print_function, generator_stop -6 5 | from __future__ import invalid_module, generators -7 6 | +1 | from __future__ import nested_scopes, generators +2 | from __future__ import with_statement, unicode_literals +3 | from __future__ import absolute_import, division + - from __future__ import generator_stop +4 | from __future__ import print_function, generator_stop +5 | from __future__ import invalid_module, generators +6 | UP010 [*] Unnecessary `__future__` imports `generator_stop`, `print_function` for target Python version --> UP010_0.py:5:1 @@ -86,15 +78,13 @@ UP010 [*] Unnecessary `__future__` imports `generator_stop`, `print_function` fo 6 | from __future__ import invalid_module, generators | help: Remove unnecessary `__future__` import - -ℹ Safe fix -2 2 | from __future__ import with_statement, unicode_literals -3 3 | from __future__ import absolute_import, division -4 4 | from __future__ import generator_stop -5 |-from __future__ import print_function, generator_stop -6 5 | from __future__ import invalid_module, generators -7 6 | -8 7 | if True: +2 | from __future__ import with_statement, unicode_literals +3 | from __future__ import absolute_import, division +4 | from __future__ import generator_stop + - from __future__ import print_function, generator_stop +5 | from __future__ import invalid_module, generators +6 | +7 | if True: UP010 [*] Unnecessary `__future__` import `generators` for target Python version --> UP010_0.py:6:1 @@ -107,16 +97,14 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version 8 | if True: | help: Remove unnecessary `__future__` import - -ℹ Safe fix -3 3 | from __future__ import absolute_import, division -4 4 | from __future__ import generator_stop -5 5 | from __future__ import print_function, generator_stop -6 |-from __future__ import invalid_module, generators - 6 |+from __future__ import invalid_module -7 7 | -8 8 | if True: -9 9 | from __future__ import generator_stop +3 | from __future__ import absolute_import, division +4 | from __future__ import generator_stop +5 | from __future__ import print_function, generator_stop + - from __future__ import invalid_module, generators +6 + from __future__ import invalid_module +7 | +8 | if True: +9 | from __future__ import generator_stop UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version --> UP010_0.py:9:5 @@ -127,15 +115,13 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver 10 | from __future__ import generators | help: Remove unnecessary `__future__` import - -ℹ Safe fix -6 6 | from __future__ import invalid_module, generators -7 7 | -8 8 | if True: -9 |- from __future__ import generator_stop -10 9 | from __future__ import generators -11 10 | -12 11 | if True: +6 | from __future__ import invalid_module, generators +7 | +8 | if True: + - from __future__ import generator_stop +9 | from __future__ import generators +10 | +11 | if True: UP010 [*] Unnecessary `__future__` import `generators` for target Python version --> UP010_0.py:10:5 @@ -148,15 +134,13 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version 12 | if True: | help: Remove unnecessary `__future__` import - -ℹ Safe fix -7 7 | -8 8 | if True: -9 9 | from __future__ import generator_stop -10 |- from __future__ import generators -11 10 | -12 11 | if True: -13 12 | from __future__ import generator_stop +7 | +8 | if True: +9 | from __future__ import generator_stop + - from __future__ import generators +10 | +11 | if True: +12 | from __future__ import generator_stop UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version --> UP010_0.py:13:5 @@ -168,14 +152,12 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver 15 | from __future__ import generators # comment | help: Remove unnecessary `__future__` import - -ℹ Safe fix -10 10 | from __future__ import generators -11 11 | -12 12 | if True: -13 |- from __future__ import generator_stop -14 13 | from __future__ import invalid_module, generators -15 14 | from __future__ import generators # comment +10 | from __future__ import generators +11 | +12 | if True: + - from __future__ import generator_stop +13 | from __future__ import invalid_module, generators +14 | from __future__ import generators # comment UP010 [*] Unnecessary `__future__` import `generators` for target Python version --> UP010_0.py:14:5 @@ -187,14 +169,12 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version 15 | from __future__ import generators # comment | help: Remove unnecessary `__future__` import - -ℹ Safe fix -11 11 | -12 12 | if True: -13 13 | from __future__ import generator_stop -14 |- from __future__ import invalid_module, generators - 14 |+ from __future__ import invalid_module -15 15 | from __future__ import generators # comment +11 | +12 | if True: +13 | from __future__ import generator_stop + - from __future__ import invalid_module, generators +14 + from __future__ import invalid_module +15 | from __future__ import generators # comment UP010 [*] Unnecessary `__future__` import `generators` for target Python version --> UP010_0.py:15:5 @@ -205,9 +185,8 @@ UP010 [*] Unnecessary `__future__` import `generators` for target Python version | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove unnecessary `__future__` import - -ℹ Unsafe fix -12 12 | if True: -13 13 | from __future__ import generator_stop -14 14 | from __future__ import invalid_module, generators -15 |- from __future__ import generators # comment +12 | if True: +13 | from __future__ import generator_stop +14 | from __future__ import invalid_module, generators + - from __future__ import generators # comment +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap index be0f0ce24d..9e032d2de9 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP010_1.py.snap @@ -9,12 +9,10 @@ UP010 [*] Unnecessary `__future__` imports `generators`, `nested_scopes` for tar 2 | from __future__ import with_statement, unicode_literals | help: Remove unnecessary `__future__` import - -ℹ Safe fix -1 |-from __future__ import nested_scopes, generators -2 1 | from __future__ import with_statement, unicode_literals -3 2 | -4 3 | from __future__ import absolute_import, division + - from __future__ import nested_scopes, generators +1 | from __future__ import with_statement, unicode_literals +2 | +3 | from __future__ import absolute_import, division UP010 [*] Unnecessary `__future__` import `unicode_literals` for target Python version --> UP010_1.py:2:1 @@ -26,14 +24,12 @@ UP010 [*] Unnecessary `__future__` import `unicode_literals` for target Python v 4 | from __future__ import absolute_import, division | help: Remove unnecessary `__future__` import - -ℹ Safe fix -1 1 | from __future__ import nested_scopes, generators -2 |-from __future__ import with_statement, unicode_literals - 2 |+from __future__ import with_statement -3 3 | -4 4 | from __future__ import absolute_import, division -5 5 | from __future__ import generator_stop +1 | from __future__ import nested_scopes, generators + - from __future__ import with_statement, unicode_literals +2 + from __future__ import with_statement +3 | +4 | from __future__ import absolute_import, division +5 | from __future__ import generator_stop UP010 [*] Unnecessary `__future__` import `absolute_import` for target Python version --> UP010_1.py:4:1 @@ -46,16 +42,14 @@ UP010 [*] Unnecessary `__future__` import `absolute_import` for target Python ve 6 | from __future__ import print_function, nested_scopes, generator_stop | help: Remove unnecessary `__future__` import - -ℹ Safe fix -1 1 | from __future__ import nested_scopes, generators -2 2 | from __future__ import with_statement, unicode_literals -3 3 | -4 |-from __future__ import absolute_import, division - 4 |+from __future__ import division -5 5 | from __future__ import generator_stop -6 6 | from __future__ import print_function, nested_scopes, generator_stop -7 7 | +1 | from __future__ import nested_scopes, generators +2 | from __future__ import with_statement, unicode_literals +3 | + - from __future__ import absolute_import, division +4 + from __future__ import division +5 | from __future__ import generator_stop +6 | from __future__ import print_function, nested_scopes, generator_stop +7 | UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python version --> UP010_1.py:5:1 @@ -66,15 +60,13 @@ UP010 [*] Unnecessary `__future__` import `generator_stop` for target Python ver 6 | from __future__ import print_function, nested_scopes, generator_stop | help: Remove unnecessary `__future__` import - -ℹ Safe fix -2 2 | from __future__ import with_statement, unicode_literals -3 3 | -4 4 | from __future__ import absolute_import, division -5 |-from __future__ import generator_stop -6 5 | from __future__ import print_function, nested_scopes, generator_stop -7 6 | -8 7 | print(with_statement) +2 | from __future__ import with_statement, unicode_literals +3 | +4 | from __future__ import absolute_import, division + - from __future__ import generator_stop +5 | from __future__ import print_function, nested_scopes, generator_stop +6 | +7 | print(with_statement) UP010 [*] Unnecessary `__future__` import `nested_scopes` for target Python version --> UP010_1.py:6:1 @@ -87,13 +79,11 @@ UP010 [*] Unnecessary `__future__` import `nested_scopes` for target Python vers 8 | print(with_statement) | help: Remove unnecessary `__future__` import - -ℹ Safe fix -3 3 | -4 4 | from __future__ import absolute_import, division -5 5 | from __future__ import generator_stop -6 |-from __future__ import print_function, nested_scopes, generator_stop - 6 |+from __future__ import print_function, generator_stop -7 7 | -8 8 | print(with_statement) -9 9 | generators = 1 +3 | +4 | from __future__ import absolute_import, division +5 | from __future__ import generator_stop + - from __future__ import print_function, nested_scopes, generator_stop +6 + from __future__ import print_function, generator_stop +7 | +8 | print(with_statement) +9 | generators = 1 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap index fe85949af8..54294a3686 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP011.py.snap @@ -10,16 +10,14 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache` 7 | pass | help: Remove unnecessary parentheses - -ℹ Safe fix -2 2 | from functools import lru_cache -3 3 | -4 4 | -5 |-@functools.lru_cache() - 5 |+@functools.lru_cache -6 6 | def fixme(): -7 7 | pass -8 8 | +2 | from functools import lru_cache +3 | +4 | + - @functools.lru_cache() +5 + @functools.lru_cache +6 | def fixme(): +7 | pass +8 | UP011 [*] Unnecessary parentheses to `functools.lru_cache` --> UP011.py:10:11 @@ -30,16 +28,14 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache` 12 | pass | help: Remove unnecessary parentheses - -ℹ Safe fix -7 7 | pass -8 8 | -9 9 | -10 |-@lru_cache() - 10 |+@lru_cache -11 11 | def fixme(): -12 12 | pass -13 13 | +7 | pass +8 | +9 | + - @lru_cache() +10 + @lru_cache +11 | def fixme(): +12 | pass +13 | UP011 [*] Unnecessary parentheses to `functools.lru_cache` --> UP011.py:16:21 @@ -51,16 +47,14 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache` 18 | pass | help: Remove unnecessary parentheses - -ℹ Safe fix -13 13 | -14 14 | -15 15 | @other_decorator -16 |-@functools.lru_cache() - 16 |+@functools.lru_cache -17 17 | def fixme(): -18 18 | pass -19 19 | +13 | +14 | +15 | @other_decorator + - @functools.lru_cache() +16 + @functools.lru_cache +17 | def fixme(): +18 | pass +19 | UP011 [*] Unnecessary parentheses to `functools.lru_cache` --> UP011.py:21:21 @@ -71,13 +65,11 @@ UP011 [*] Unnecessary parentheses to `functools.lru_cache` 23 | def fixme(): | help: Remove unnecessary parentheses - -ℹ Safe fix -18 18 | pass -19 19 | -20 20 | -21 |-@functools.lru_cache() - 21 |+@functools.lru_cache -22 22 | @other_decorator -23 23 | def fixme(): -24 24 | pass +18 | pass +19 | +20 | + - @functools.lru_cache() +21 + @functools.lru_cache +22 | @other_decorator +23 | def fixme(): +24 | pass diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap index cc02002e15..4bafedb9d1 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP012.py.snap @@ -11,14 +11,12 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 4 | "foo".encode() # b"foo" | help: Rewrite as bytes literal - -ℹ Safe fix -1 1 | # ASCII literals should be replaced by a bytes literal -2 |-"foo".encode("utf-8") # b"foo" - 2 |+b"foo" # b"foo" -3 3 | "foo".encode("u8") # b"foo" -4 4 | "foo".encode() # b"foo" -5 5 | "foo".encode("UTF8") # b"foo" +1 | # ASCII literals should be replaced by a bytes literal + - "foo".encode("utf-8") # b"foo" +2 + b"foo" # b"foo" +3 | "foo".encode("u8") # b"foo" +4 | "foo".encode() # b"foo" +5 | "foo".encode("UTF8") # b"foo" UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:3:1 @@ -31,15 +29,13 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 5 | "foo".encode("UTF8") # b"foo" | help: Rewrite as bytes literal - -ℹ Safe fix -1 1 | # ASCII literals should be replaced by a bytes literal -2 2 | "foo".encode("utf-8") # b"foo" -3 |-"foo".encode("u8") # b"foo" - 3 |+b"foo" # b"foo" -4 4 | "foo".encode() # b"foo" -5 5 | "foo".encode("UTF8") # b"foo" -6 6 | U"foo".encode("utf-8") # b"foo" +1 | # ASCII literals should be replaced by a bytes literal +2 | "foo".encode("utf-8") # b"foo" + - "foo".encode("u8") # b"foo" +3 + b"foo" # b"foo" +4 | "foo".encode() # b"foo" +5 | "foo".encode("UTF8") # b"foo" +6 | U"foo".encode("utf-8") # b"foo" UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:4:1 @@ -52,16 +48,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 6 | U"foo".encode("utf-8") # b"foo" | help: Rewrite as bytes literal - -ℹ Safe fix -1 1 | # ASCII literals should be replaced by a bytes literal -2 2 | "foo".encode("utf-8") # b"foo" -3 3 | "foo".encode("u8") # b"foo" -4 |-"foo".encode() # b"foo" - 4 |+b"foo" # b"foo" -5 5 | "foo".encode("UTF8") # b"foo" -6 6 | U"foo".encode("utf-8") # b"foo" -7 7 | "foo".encode(encoding="utf-8") # b"foo" +1 | # ASCII literals should be replaced by a bytes literal +2 | "foo".encode("utf-8") # b"foo" +3 | "foo".encode("u8") # b"foo" + - "foo".encode() # b"foo" +4 + b"foo" # b"foo" +5 | "foo".encode("UTF8") # b"foo" +6 | U"foo".encode("utf-8") # b"foo" +7 | "foo".encode(encoding="utf-8") # b"foo" UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:5:1 @@ -74,16 +68,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 7 | "foo".encode(encoding="utf-8") # b"foo" | help: Rewrite as bytes literal - -ℹ Safe fix -2 2 | "foo".encode("utf-8") # b"foo" -3 3 | "foo".encode("u8") # b"foo" -4 4 | "foo".encode() # b"foo" -5 |-"foo".encode("UTF8") # b"foo" - 5 |+b"foo" # b"foo" -6 6 | U"foo".encode("utf-8") # b"foo" -7 7 | "foo".encode(encoding="utf-8") # b"foo" -8 8 | """ +2 | "foo".encode("utf-8") # b"foo" +3 | "foo".encode("u8") # b"foo" +4 | "foo".encode() # b"foo" + - "foo".encode("UTF8") # b"foo" +5 + b"foo" # b"foo" +6 | U"foo".encode("utf-8") # b"foo" +7 | "foo".encode(encoding="utf-8") # b"foo" +8 | """ UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:6:1 @@ -96,16 +88,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 8 | """ | help: Rewrite as bytes literal - -ℹ Safe fix -3 3 | "foo".encode("u8") # b"foo" -4 4 | "foo".encode() # b"foo" -5 5 | "foo".encode("UTF8") # b"foo" -6 |-U"foo".encode("utf-8") # b"foo" - 6 |+b"foo" # b"foo" -7 7 | "foo".encode(encoding="utf-8") # b"foo" -8 8 | """ -9 9 | Lorem +3 | "foo".encode("u8") # b"foo" +4 | "foo".encode() # b"foo" +5 | "foo".encode("UTF8") # b"foo" + - U"foo".encode("utf-8") # b"foo" +6 + b"foo" # b"foo" +7 | "foo".encode(encoding="utf-8") # b"foo" +8 | """ +9 | Lorem UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:7:1 @@ -118,16 +108,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 9 | Lorem | help: Rewrite as bytes literal - -ℹ Safe fix -4 4 | "foo".encode() # b"foo" -5 5 | "foo".encode("UTF8") # b"foo" -6 6 | U"foo".encode("utf-8") # b"foo" -7 |-"foo".encode(encoding="utf-8") # b"foo" - 7 |+b"foo" # b"foo" -8 8 | """ -9 9 | Lorem -10 10 | +4 | "foo".encode() # b"foo" +5 | "foo".encode("UTF8") # b"foo" +6 | U"foo".encode("utf-8") # b"foo" + - "foo".encode(encoding="utf-8") # b"foo" +7 + b"foo" # b"foo" +8 | """ +9 | Lorem +10 | UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:8:1 @@ -146,23 +134,21 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 16 | "Lorem " | help: Rewrite as bytes literal - -ℹ Safe fix -5 5 | "foo".encode("UTF8") # b"foo" -6 6 | U"foo".encode("utf-8") # b"foo" -7 7 | "foo".encode(encoding="utf-8") # b"foo" -8 |-""" - 8 |+b""" -9 9 | Lorem -10 10 | -11 11 | Ipsum -12 |-""".encode( -13 |- "utf-8" -14 |-) - 12 |+""" -15 13 | ( -16 14 | "Lorem " -17 15 | "Ipsum".encode() +5 | "foo".encode("UTF8") # b"foo" +6 | U"foo".encode("utf-8") # b"foo" +7 | "foo".encode(encoding="utf-8") # b"foo" + - """ +8 + b""" +9 | Lorem +10 | +11 | Ipsum + - """.encode( + - "utf-8" + - ) +12 + """ +13 | ( +14 | "Lorem " +15 | "Ipsum".encode() UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:16:5 @@ -176,18 +162,16 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 19 | ( | help: Rewrite as bytes literal - -ℹ Safe fix -13 13 | "utf-8" -14 14 | ) -15 15 | ( -16 |- "Lorem " -17 |- "Ipsum".encode() - 16 |+ b"Lorem " - 17 |+ b"Ipsum" -18 18 | ) -19 19 | ( -20 20 | "Lorem " # Comment +13 | "utf-8" +14 | ) +15 | ( + - "Lorem " + - "Ipsum".encode() +16 + b"Lorem " +17 + b"Ipsum" +18 | ) +19 | ( +20 | "Lorem " # Comment UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:20:5 @@ -201,18 +185,16 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 23 | ( | help: Rewrite as bytes literal - -ℹ Safe fix -17 17 | "Ipsum".encode() -18 18 | ) -19 19 | ( -20 |- "Lorem " # Comment -21 |- "Ipsum".encode() # Comment - 20 |+ b"Lorem " # Comment - 21 |+ b"Ipsum" # Comment -22 22 | ) -23 23 | ( -24 24 | "Lorem " "Ipsum".encode() +17 | "Ipsum".encode() +18 | ) +19 | ( + - "Lorem " # Comment + - "Ipsum".encode() # Comment +20 + b"Lorem " # Comment +21 + b"Ipsum" # Comment +22 | ) +23 | ( +24 | "Lorem " "Ipsum".encode() UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:24:5 @@ -224,16 +206,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 25 | ) | help: Rewrite as bytes literal - -ℹ Safe fix -21 21 | "Ipsum".encode() # Comment -22 22 | ) -23 23 | ( -24 |- "Lorem " "Ipsum".encode() - 24 |+ b"Lorem " b"Ipsum" -25 25 | ) -26 26 | -27 27 | # `encode` on variables should not be processed. +21 | "Ipsum".encode() # Comment +22 | ) +23 | ( + - "Lorem " "Ipsum".encode() +24 + b"Lorem " b"Ipsum" +25 | ) +26 | +27 | # `encode` on variables should not be processed. UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:32:1 @@ -245,16 +225,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` 34 | "foo".encode(encoding) | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -29 29 | string.encode("utf-8") -30 30 | -31 31 | bar = "bar" -32 |-f"foo{bar}".encode("utf-8") - 32 |+f"foo{bar}".encode() -33 33 | encoding = "latin" -34 34 | "foo".encode(encoding) -35 35 | f"foo{bar}".encode(encoding) +29 | string.encode("utf-8") +30 | +31 | bar = "bar" + - f"foo{bar}".encode("utf-8") +32 + f"foo{bar}".encode() +33 | encoding = "latin" +34 | "foo".encode(encoding) +35 | f"foo{bar}".encode(encoding) UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:36:1 @@ -269,18 +247,16 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` 40 | # `encode` with custom args and kwargs should not be processed. | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -33 33 | encoding = "latin" -34 34 | "foo".encode(encoding) -35 35 | f"foo{bar}".encode(encoding) -36 |-f"{a=} {b=}".encode( -37 |- "utf-8", -38 |-) - 36 |+f"{a=} {b=}".encode() -39 37 | -40 38 | # `encode` with custom args and kwargs should not be processed. -41 39 | "foo".encode("utf-8", errors="replace") +33 | encoding = "latin" +34 | "foo".encode(encoding) +35 | f"foo{bar}".encode(encoding) + - f"{a=} {b=}".encode( + - "utf-8", + - ) +36 + f"{a=} {b=}".encode() +37 | +38 | # `encode` with custom args and kwargs should not be processed. +39 | "foo".encode("utf-8", errors="replace") UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:53:1 @@ -292,16 +268,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` 55 | "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -50 50 | "unicode text©".encode(encoding="utf-8", errors="replace") -51 51 | -52 52 | # Unicode literals should only be stripped of default encoding. -53 |-"unicode text©".encode("utf-8") # "unicode text©".encode() - 53 |+"unicode text©".encode() # "unicode text©".encode() -54 54 | "unicode text©".encode() -55 55 | "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() -56 56 | +50 | "unicode text©".encode(encoding="utf-8", errors="replace") +51 | +52 | # Unicode literals should only be stripped of default encoding. + - "unicode text©".encode("utf-8") # "unicode text©".encode() +53 + "unicode text©".encode() # "unicode text©".encode() +54 | "unicode text©".encode() +55 | "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() +56 | UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:55:1 @@ -314,16 +288,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` 57 | r"foo\o".encode("utf-8") # br"foo\o" | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -52 52 | # Unicode literals should only be stripped of default encoding. -53 53 | "unicode text©".encode("utf-8") # "unicode text©".encode() -54 54 | "unicode text©".encode() -55 |-"unicode text©".encode(encoding="UTF8") # "unicode text©".encode() - 55 |+"unicode text©".encode() # "unicode text©".encode() -56 56 | -57 57 | r"foo\o".encode("utf-8") # br"foo\o" -58 58 | u"foo".encode("utf-8") # b"foo" +52 | # Unicode literals should only be stripped of default encoding. +53 | "unicode text©".encode("utf-8") # "unicode text©".encode() +54 | "unicode text©".encode() + - "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() +55 + "unicode text©".encode() # "unicode text©".encode() +56 | +57 | r"foo\o".encode("utf-8") # br"foo\o" +58 | u"foo".encode("utf-8") # b"foo" UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:57:1 @@ -336,16 +308,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 59 | R"foo\o".encode("utf-8") # br"foo\o" | help: Rewrite as bytes literal - -ℹ Safe fix -54 54 | "unicode text©".encode() -55 55 | "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() -56 56 | -57 |-r"foo\o".encode("utf-8") # br"foo\o" - 57 |+br"foo\o" # br"foo\o" -58 58 | u"foo".encode("utf-8") # b"foo" -59 59 | R"foo\o".encode("utf-8") # br"foo\o" -60 60 | U"foo".encode("utf-8") # b"foo" +54 | "unicode text©".encode() +55 | "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() +56 | + - r"foo\o".encode("utf-8") # br"foo\o" +57 + br"foo\o" # br"foo\o" +58 | u"foo".encode("utf-8") # b"foo" +59 | R"foo\o".encode("utf-8") # br"foo\o" +60 | U"foo".encode("utf-8") # b"foo" UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:58:1 @@ -357,16 +327,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 60 | U"foo".encode("utf-8") # b"foo" | help: Rewrite as bytes literal - -ℹ Safe fix -55 55 | "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() -56 56 | -57 57 | r"foo\o".encode("utf-8") # br"foo\o" -58 |-u"foo".encode("utf-8") # b"foo" - 58 |+b"foo" # b"foo" -59 59 | R"foo\o".encode("utf-8") # br"foo\o" -60 60 | U"foo".encode("utf-8") # b"foo" -61 61 | print("foo".encode()) # print(b"foo") +55 | "unicode text©".encode(encoding="UTF8") # "unicode text©".encode() +56 | +57 | r"foo\o".encode("utf-8") # br"foo\o" + - u"foo".encode("utf-8") # b"foo" +58 + b"foo" # b"foo" +59 | R"foo\o".encode("utf-8") # br"foo\o" +60 | U"foo".encode("utf-8") # b"foo" +61 | print("foo".encode()) # print(b"foo") UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:59:1 @@ -379,16 +347,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 61 | print("foo".encode()) # print(b"foo") | help: Rewrite as bytes literal - -ℹ Safe fix -56 56 | -57 57 | r"foo\o".encode("utf-8") # br"foo\o" -58 58 | u"foo".encode("utf-8") # b"foo" -59 |-R"foo\o".encode("utf-8") # br"foo\o" - 59 |+bR"foo\o" # br"foo\o" -60 60 | U"foo".encode("utf-8") # b"foo" -61 61 | print("foo".encode()) # print(b"foo") -62 62 | +56 | +57 | r"foo\o".encode("utf-8") # br"foo\o" +58 | u"foo".encode("utf-8") # b"foo" + - R"foo\o".encode("utf-8") # br"foo\o" +59 + bR"foo\o" # br"foo\o" +60 | U"foo".encode("utf-8") # b"foo" +61 | print("foo".encode()) # print(b"foo") +62 | UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:60:1 @@ -400,16 +366,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 61 | print("foo".encode()) # print(b"foo") | help: Rewrite as bytes literal - -ℹ Safe fix -57 57 | r"foo\o".encode("utf-8") # br"foo\o" -58 58 | u"foo".encode("utf-8") # b"foo" -59 59 | R"foo\o".encode("utf-8") # br"foo\o" -60 |-U"foo".encode("utf-8") # b"foo" - 60 |+b"foo" # b"foo" -61 61 | print("foo".encode()) # print(b"foo") -62 62 | -63 63 | # `encode` on parenthesized strings. +57 | r"foo\o".encode("utf-8") # br"foo\o" +58 | u"foo".encode("utf-8") # b"foo" +59 | R"foo\o".encode("utf-8") # br"foo\o" + - U"foo".encode("utf-8") # b"foo" +60 + b"foo" # b"foo" +61 | print("foo".encode()) # print(b"foo") +62 | +63 | # `encode` on parenthesized strings. UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:61:7 @@ -422,16 +386,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 63 | # `encode` on parenthesized strings. | help: Rewrite as bytes literal - -ℹ Safe fix -58 58 | u"foo".encode("utf-8") # b"foo" -59 59 | R"foo\o".encode("utf-8") # br"foo\o" -60 60 | U"foo".encode("utf-8") # b"foo" -61 |-print("foo".encode()) # print(b"foo") - 61 |+print(b"foo") # print(b"foo") -62 62 | -63 63 | # `encode` on parenthesized strings. -64 64 | ( +58 | u"foo".encode("utf-8") # b"foo" +59 | R"foo\o".encode("utf-8") # br"foo\o" +60 | U"foo".encode("utf-8") # b"foo" + - print("foo".encode()) # print(b"foo") +61 + print(b"foo") # print(b"foo") +62 | +63 | # `encode` on parenthesized strings. +64 | ( UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:64:1 @@ -446,20 +408,18 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 69 | (( | help: Rewrite as bytes literal - -ℹ Safe fix -62 62 | -63 63 | # `encode` on parenthesized strings. -64 64 | ( -65 |- "abc" -66 |- "def" -67 |-).encode() - 65 |+ b"abc" - 66 |+ b"def" - 67 |+) -68 68 | -69 69 | (( -70 70 | "abc" +62 | +63 | # `encode` on parenthesized strings. +64 | ( + - "abc" + - "def" + - ).encode() +65 + b"abc" +66 + b"def" +67 + ) +68 | +69 | (( +70 | "abc" UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:69:1 @@ -475,20 +435,18 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 74 | (f"foo{bar}").encode("utf-8") | help: Rewrite as bytes literal - -ℹ Safe fix -67 67 | ).encode() -68 68 | -69 69 | (( -70 |- "abc" -71 |- "def" -72 |-)).encode() - 70 |+ b"abc" - 71 |+ b"def" - 72 |+)) -73 73 | -74 74 | (f"foo{bar}").encode("utf-8") -75 75 | (f"foo{bar}").encode(encoding="utf-8") +67 | ).encode() +68 | +69 | (( + - "abc" + - "def" + - )).encode() +70 + b"abc" +71 + b"def" +72 + )) +73 | +74 | (f"foo{bar}").encode("utf-8") +75 | (f"foo{bar}").encode(encoding="utf-8") UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:74:1 @@ -501,16 +459,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` 76 | ("unicode text©").encode("utf-8") | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -71 71 | "def" -72 72 | )).encode() -73 73 | -74 |-(f"foo{bar}").encode("utf-8") - 74 |+(f"foo{bar}").encode() -75 75 | (f"foo{bar}").encode(encoding="utf-8") -76 76 | ("unicode text©").encode("utf-8") -77 77 | ("unicode text©").encode(encoding="utf-8") +71 | "def" +72 | )).encode() +73 | + - (f"foo{bar}").encode("utf-8") +74 + (f"foo{bar}").encode() +75 | (f"foo{bar}").encode(encoding="utf-8") +76 | ("unicode text©").encode("utf-8") +77 | ("unicode text©").encode(encoding="utf-8") UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:75:1 @@ -522,16 +478,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` 77 | ("unicode text©").encode(encoding="utf-8") | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -72 72 | )).encode() -73 73 | -74 74 | (f"foo{bar}").encode("utf-8") -75 |-(f"foo{bar}").encode(encoding="utf-8") - 75 |+(f"foo{bar}").encode() -76 76 | ("unicode text©").encode("utf-8") -77 77 | ("unicode text©").encode(encoding="utf-8") -78 78 | +72 | )).encode() +73 | +74 | (f"foo{bar}").encode("utf-8") + - (f"foo{bar}").encode(encoding="utf-8") +75 + (f"foo{bar}").encode() +76 | ("unicode text©").encode("utf-8") +77 | ("unicode text©").encode(encoding="utf-8") +78 | UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:76:1 @@ -543,16 +497,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` 77 | ("unicode text©").encode(encoding="utf-8") | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -73 73 | -74 74 | (f"foo{bar}").encode("utf-8") -75 75 | (f"foo{bar}").encode(encoding="utf-8") -76 |-("unicode text©").encode("utf-8") - 76 |+("unicode text©").encode() -77 77 | ("unicode text©").encode(encoding="utf-8") -78 78 | -79 79 | +73 | +74 | (f"foo{bar}").encode("utf-8") +75 | (f"foo{bar}").encode(encoding="utf-8") + - ("unicode text©").encode("utf-8") +76 + ("unicode text©").encode() +77 | ("unicode text©").encode(encoding="utf-8") +78 | +79 | UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` --> UP012.py:77:1 @@ -563,16 +515,14 @@ UP012 [*] Unnecessary UTF-8 `encoding` argument to `encode` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove unnecessary `encoding` argument - -ℹ Safe fix -74 74 | (f"foo{bar}").encode("utf-8") -75 75 | (f"foo{bar}").encode(encoding="utf-8") -76 76 | ("unicode text©").encode("utf-8") -77 |-("unicode text©").encode(encoding="utf-8") - 77 |+("unicode text©").encode() -78 78 | -79 79 | -80 80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882 +74 | (f"foo{bar}").encode("utf-8") +75 | (f"foo{bar}").encode(encoding="utf-8") +76 | ("unicode text©").encode("utf-8") + - ("unicode text©").encode(encoding="utf-8") +77 + ("unicode text©").encode() +78 | +79 | +80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882 UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:82:17 @@ -585,16 +535,14 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 84 | # Not a valid type annotation but this test shouldn't result in a panic. | help: Rewrite as bytes literal - -ℹ Safe fix -79 79 | -80 80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882 -81 81 | def _match_ignore(line): -82 |- input=stdin and'\n'.encode()or None - 82 |+ input=stdin and b'\n' or None -83 83 | -84 84 | # Not a valid type annotation but this test shouldn't result in a panic. -85 85 | # Refer: https://github.com/astral-sh/ruff/issues/11736 +79 | +80 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882 +81 | def _match_ignore(line): + - input=stdin and'\n'.encode()or None +82 + input=stdin and b'\n' or None +83 | +84 | # Not a valid type annotation but this test shouldn't result in a panic. +85 | # Refer: https://github.com/astral-sh/ruff/issues/11736 UP012 [*] Unnecessary call to `encode` as UTF-8 --> UP012.py:86:5 @@ -607,13 +555,11 @@ UP012 [*] Unnecessary call to `encode` as UTF-8 88 | # AttributeError for t-strings so skip lint | help: Rewrite as bytes literal - -ℹ Safe fix -83 83 | -84 84 | # Not a valid type annotation but this test shouldn't result in a panic. -85 85 | # Refer: https://github.com/astral-sh/ruff/issues/11736 -86 |-x: '"foo".encode("utf-8")' - 86 |+x: 'b"foo"' -87 87 | -88 88 | # AttributeError for t-strings so skip lint -89 89 | (t"foo{bar}").encode("utf-8") +83 | +84 | # Not a valid type annotation but this test shouldn't result in a panic. +85 | # Refer: https://github.com/astral-sh/ruff/issues/11736 + - x: '"foo".encode("utf-8")' +86 + x: 'b"foo"' +87 | +88 | # AttributeError for t-strings so skip lint +89 | (t"foo{bar}").encode("utf-8") diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap index ec78ba6e59..4ec45d3515 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP013.py.snap @@ -11,18 +11,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 7 | # dict call | help: Convert `MyType` to class syntax - -ℹ Safe fix -2 2 | import typing -3 3 | -4 4 | # dict literal -5 |-MyType = TypedDict("MyType", {"a": int, "b": str}) - 5 |+class MyType(TypedDict): - 6 |+ a: int - 7 |+ b: str -6 8 | -7 9 | # dict call -8 10 | MyType = TypedDict("MyType", dict(a=int, b=str)) +2 | import typing +3 | +4 | # dict literal + - MyType = TypedDict("MyType", {"a": int, "b": str}) +5 + class MyType(TypedDict): +6 + a: int +7 + b: str +8 | +9 | # dict call +10 | MyType = TypedDict("MyType", dict(a=int, b=str)) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:8:1 @@ -34,18 +32,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 10 | # kwargs | help: Convert `MyType` to class syntax - -ℹ Safe fix -5 5 | MyType = TypedDict("MyType", {"a": int, "b": str}) -6 6 | -7 7 | # dict call -8 |-MyType = TypedDict("MyType", dict(a=int, b=str)) - 8 |+class MyType(TypedDict): - 9 |+ a: int - 10 |+ b: str -9 11 | -10 12 | # kwargs -11 13 | MyType = TypedDict("MyType", a=int, b=str) +5 | MyType = TypedDict("MyType", {"a": int, "b": str}) +6 | +7 | # dict call + - MyType = TypedDict("MyType", dict(a=int, b=str)) +8 + class MyType(TypedDict): +9 + a: int +10 + b: str +11 | +12 | # kwargs +13 | MyType = TypedDict("MyType", a=int, b=str) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:11:1 @@ -57,18 +53,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 13 | # Empty TypedDict | help: Convert `MyType` to class syntax - -ℹ Safe fix -8 8 | MyType = TypedDict("MyType", dict(a=int, b=str)) -9 9 | -10 10 | # kwargs -11 |-MyType = TypedDict("MyType", a=int, b=str) - 11 |+class MyType(TypedDict): - 12 |+ a: int - 13 |+ b: str -12 14 | -13 15 | # Empty TypedDict -14 16 | MyType = TypedDict("MyType") +8 | MyType = TypedDict("MyType", dict(a=int, b=str)) +9 | +10 | # kwargs + - MyType = TypedDict("MyType", a=int, b=str) +11 + class MyType(TypedDict): +12 + a: int +13 + b: str +14 | +15 | # Empty TypedDict +16 | MyType = TypedDict("MyType") UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:14:1 @@ -80,17 +74,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 16 | # Literal values | help: Convert `MyType` to class syntax - -ℹ Safe fix -11 11 | MyType = TypedDict("MyType", a=int, b=str) -12 12 | -13 13 | # Empty TypedDict -14 |-MyType = TypedDict("MyType") - 14 |+class MyType(TypedDict): - 15 |+ pass -15 16 | -16 17 | # Literal values -17 18 | MyType = TypedDict("MyType", {"a": "hello"}) +11 | MyType = TypedDict("MyType", a=int, b=str) +12 | +13 | # Empty TypedDict + - MyType = TypedDict("MyType") +14 + class MyType(TypedDict): +15 + pass +16 | +17 | # Literal values +18 | MyType = TypedDict("MyType", {"a": "hello"}) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:17:1 @@ -101,17 +93,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 18 | MyType = TypedDict("MyType", a="hello") | help: Convert `MyType` to class syntax - -ℹ Safe fix -14 14 | MyType = TypedDict("MyType") -15 15 | -16 16 | # Literal values -17 |-MyType = TypedDict("MyType", {"a": "hello"}) - 17 |+class MyType(TypedDict): - 18 |+ a: "hello" -18 19 | MyType = TypedDict("MyType", a="hello") -19 20 | -20 21 | # NotRequired +14 | MyType = TypedDict("MyType") +15 | +16 | # Literal values + - MyType = TypedDict("MyType", {"a": "hello"}) +17 + class MyType(TypedDict): +18 + a: "hello" +19 | MyType = TypedDict("MyType", a="hello") +20 | +21 | # NotRequired UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:18:1 @@ -124,17 +114,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 20 | # NotRequired | help: Convert `MyType` to class syntax - -ℹ Safe fix -15 15 | -16 16 | # Literal values -17 17 | MyType = TypedDict("MyType", {"a": "hello"}) -18 |-MyType = TypedDict("MyType", a="hello") - 18 |+class MyType(TypedDict): - 19 |+ a: "hello" -19 20 | -20 21 | # NotRequired -21 22 | MyType = TypedDict("MyType", {"a": NotRequired[dict]}) +15 | +16 | # Literal values +17 | MyType = TypedDict("MyType", {"a": "hello"}) + - MyType = TypedDict("MyType", a="hello") +18 + class MyType(TypedDict): +19 + a: "hello" +20 | +21 | # NotRequired +22 | MyType = TypedDict("MyType", {"a": NotRequired[dict]}) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:21:1 @@ -146,17 +134,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 23 | # total | help: Convert `MyType` to class syntax - -ℹ Safe fix -18 18 | MyType = TypedDict("MyType", a="hello") -19 19 | -20 20 | # NotRequired -21 |-MyType = TypedDict("MyType", {"a": NotRequired[dict]}) - 21 |+class MyType(TypedDict): - 22 |+ a: NotRequired[dict] -22 23 | -23 24 | # total -24 25 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False) +18 | MyType = TypedDict("MyType", a="hello") +19 | +20 | # NotRequired + - MyType = TypedDict("MyType", {"a": NotRequired[dict]}) +21 + class MyType(TypedDict): +22 + a: NotRequired[dict] +23 | +24 | # total +25 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:24:1 @@ -168,18 +154,16 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 26 | # using Literal type | help: Convert `MyType` to class syntax - -ℹ Safe fix -21 21 | MyType = TypedDict("MyType", {"a": NotRequired[dict]}) -22 22 | -23 23 | # total -24 |-MyType = TypedDict("MyType", {"x": int, "y": int}, total=False) - 24 |+class MyType(TypedDict, total=False): - 25 |+ x: int - 26 |+ y: int -25 27 | -26 28 | # using Literal type -27 29 | MyType = TypedDict("MyType", {"key": Literal["value"]}) +21 | MyType = TypedDict("MyType", {"a": NotRequired[dict]}) +22 | +23 | # total + - MyType = TypedDict("MyType", {"x": int, "y": int}, total=False) +24 + class MyType(TypedDict, total=False): +25 + x: int +26 + y: int +27 | +28 | # using Literal type +29 | MyType = TypedDict("MyType", {"key": Literal["value"]}) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:27:1 @@ -191,17 +175,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 29 | # using namespace TypedDict | help: Convert `MyType` to class syntax - -ℹ Safe fix -24 24 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False) -25 25 | -26 26 | # using Literal type -27 |-MyType = TypedDict("MyType", {"key": Literal["value"]}) - 27 |+class MyType(TypedDict): - 28 |+ key: Literal["value"] -28 29 | -29 30 | # using namespace TypedDict -30 31 | MyType = typing.TypedDict("MyType", {"key": int}) +24 | MyType = TypedDict("MyType", {"x": int, "y": int}, total=False) +25 | +26 | # using Literal type + - MyType = TypedDict("MyType", {"key": Literal["value"]}) +27 + class MyType(TypedDict): +28 + key: Literal["value"] +29 | +30 | # using namespace TypedDict +31 | MyType = typing.TypedDict("MyType", {"key": int}) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:30:1 @@ -213,17 +195,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 32 | # invalid identifiers (OK) | help: Convert `MyType` to class syntax - -ℹ Safe fix -27 27 | MyType = TypedDict("MyType", {"key": Literal["value"]}) -28 28 | -29 29 | # using namespace TypedDict -30 |-MyType = typing.TypedDict("MyType", {"key": int}) - 30 |+class MyType(typing.TypedDict): - 31 |+ key: int -31 32 | -32 33 | # invalid identifiers (OK) -33 34 | MyType = TypedDict("MyType", {"in": int, "x-y": int}) +27 | MyType = TypedDict("MyType", {"key": Literal["value"]}) +28 | +29 | # using namespace TypedDict + - MyType = typing.TypedDict("MyType", {"key": int}) +30 + class MyType(typing.TypedDict): +31 + key: int +32 | +33 | # invalid identifiers (OK) +34 | MyType = TypedDict("MyType", {"in": int, "x-y": int}) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:40:1 @@ -235,17 +215,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 42 | # Empty dict call | help: Convert `MyType` to class syntax - -ℹ Safe fix -37 37 | MyType = TypedDict("MyType", {"a": int, "b": str, **c}) -38 38 | -39 39 | # Empty dict literal -40 |-MyType = TypedDict("MyType", {}) - 40 |+class MyType(TypedDict): - 41 |+ pass -41 42 | -42 43 | # Empty dict call -43 44 | MyType = TypedDict("MyType", dict()) +37 | MyType = TypedDict("MyType", {"a": int, "b": str, **c}) +38 | +39 | # Empty dict literal + - MyType = TypedDict("MyType", {}) +40 + class MyType(TypedDict): +41 + pass +42 | +43 | # Empty dict call +44 | MyType = TypedDict("MyType", dict()) UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax --> UP013.py:43:1 @@ -257,17 +235,15 @@ UP013 [*] Convert `MyType` from `TypedDict` functional to class syntax 45 | # Unsafe fix if comments are present | help: Convert `MyType` to class syntax - -ℹ Safe fix -40 40 | MyType = TypedDict("MyType", {}) -41 41 | -42 42 | # Empty dict call -43 |-MyType = TypedDict("MyType", dict()) - 43 |+class MyType(TypedDict): - 44 |+ pass -44 45 | -45 46 | # Unsafe fix if comments are present -46 47 | X = TypedDict("X", { +40 | MyType = TypedDict("MyType", {}) +41 | +42 | # Empty dict call + - MyType = TypedDict("MyType", dict()) +43 + class MyType(TypedDict): +44 + pass +45 | +46 | # Unsafe fix if comments are present +47 | X = TypedDict("X", { UP013 [*] Convert `X` from `TypedDict` functional to class syntax --> UP013.py:46:1 @@ -281,16 +257,15 @@ UP013 [*] Convert `X` from `TypedDict` functional to class syntax 50 | # Private names should not be reported (OK) | help: Convert `X` to class syntax - -ℹ Unsafe fix -43 43 | MyType = TypedDict("MyType", dict()) -44 44 | -45 45 | # Unsafe fix if comments are present -46 |-X = TypedDict("X", { -47 |- "some_config": int, # important -48 |-}) - 46 |+class X(TypedDict): - 47 |+ some_config: int -49 48 | -50 49 | # Private names should not be reported (OK) -51 50 | WithPrivate = TypedDict("WithPrivate", {"__x": int}) +43 | MyType = TypedDict("MyType", dict()) +44 | +45 | # Unsafe fix if comments are present + - X = TypedDict("X", { + - "some_config": int, # important + - }) +46 + class X(TypedDict): +47 + some_config: int +48 | +49 | # Private names should not be reported (OK) +50 | WithPrivate = TypedDict("WithPrivate", {"__x": int}) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap index f55d203b2f..17450e8fb5 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP014.py.snap @@ -11,18 +11,16 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax 7 | # with namespace | help: Convert `MyType` to class syntax - -ℹ Safe fix -2 2 | import typing -3 3 | -4 4 | # with complex annotations -5 |-MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])]) - 5 |+class MyType(NamedTuple): - 6 |+ a: int - 7 |+ b: tuple[str, ...] -6 8 | -7 9 | # with namespace -8 10 | MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)]) +2 | import typing +3 | +4 | # with complex annotations + - MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])]) +5 + class MyType(NamedTuple): +6 + a: int +7 + b: tuple[str, ...] +8 | +9 | # with namespace +10 | MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)]) UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax --> UP014.py:8:1 @@ -34,18 +32,16 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax 10 | # invalid identifiers (OK) | help: Convert `MyType` to class syntax - -ℹ Safe fix -5 5 | MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])]) -6 6 | -7 7 | # with namespace -8 |-MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)]) - 8 |+class MyType(typing.NamedTuple): - 9 |+ a: int - 10 |+ b: str -9 11 | -10 12 | # invalid identifiers (OK) -11 13 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])]) +5 | MyType = NamedTuple("MyType", [("a", int), ("b", tuple[str, ...])]) +6 | +7 | # with namespace + - MyType = typing.NamedTuple("MyType", [("a", int), ("b", str)]) +8 + class MyType(typing.NamedTuple): +9 + a: int +10 + b: str +11 | +12 | # invalid identifiers (OK) +13 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])]) UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax --> UP014.py:14:1 @@ -57,17 +53,15 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax 16 | # empty fields | help: Convert `MyType` to class syntax - -ℹ Safe fix -11 11 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])]) -12 12 | -13 13 | # no fields -14 |-MyType = typing.NamedTuple("MyType") - 14 |+class MyType(typing.NamedTuple): - 15 |+ pass -15 16 | -16 17 | # empty fields -17 18 | MyType = typing.NamedTuple("MyType", []) +11 | MyType = NamedTuple("MyType", [("x-y", int), ("b", tuple[str, ...])]) +12 | +13 | # no fields + - MyType = typing.NamedTuple("MyType") +14 + class MyType(typing.NamedTuple): +15 + pass +16 | +17 | # empty fields +18 | MyType = typing.NamedTuple("MyType", []) UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax --> UP014.py:17:1 @@ -79,17 +73,15 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax 19 | # keywords | help: Convert `MyType` to class syntax - -ℹ Safe fix -14 14 | MyType = typing.NamedTuple("MyType") -15 15 | -16 16 | # empty fields -17 |-MyType = typing.NamedTuple("MyType", []) - 17 |+class MyType(typing.NamedTuple): - 18 |+ pass -18 19 | -19 20 | # keywords -20 21 | MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...]) +14 | MyType = typing.NamedTuple("MyType") +15 | +16 | # empty fields + - MyType = typing.NamedTuple("MyType", []) +17 + class MyType(typing.NamedTuple): +18 + pass +19 | +20 | # keywords +21 | MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...]) UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax --> UP014.py:20:1 @@ -101,18 +93,16 @@ UP014 [*] Convert `MyType` from `NamedTuple` functional to class syntax 22 | # unfixable | help: Convert `MyType` to class syntax - -ℹ Safe fix -17 17 | MyType = typing.NamedTuple("MyType", []) -18 18 | -19 19 | # keywords -20 |-MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...]) - 20 |+class MyType(typing.NamedTuple): - 21 |+ a: int - 22 |+ b: tuple[str, ...] -21 23 | -22 24 | # unfixable -23 25 | MyType = typing.NamedTuple("MyType", [("a", int)], [("b", str)]) +17 | MyType = typing.NamedTuple("MyType", []) +18 | +19 | # keywords + - MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...]) +20 + class MyType(typing.NamedTuple): +21 + a: int +22 + b: tuple[str, ...] +23 | +24 | # unfixable +25 | MyType = typing.NamedTuple("MyType", [("a", int)], [("b", str)]) UP014 [*] Convert `X` from `NamedTuple` functional to class syntax --> UP014.py:36:1 @@ -124,14 +114,13 @@ UP014 [*] Convert `X` from `NamedTuple` functional to class syntax | |__^ | help: Convert `X` to class syntax - -ℹ Unsafe fix -33 33 | ) -34 34 | -35 35 | # Unsafe fix if comments are present -36 |-X = NamedTuple("X", [ -37 |- ("some_config", int), # important -38 |-]) - 36 |+class X(NamedTuple): - 37 |+ some_config: int -39 38 | +33 | ) +34 | +35 | # Unsafe fix if comments are present + - X = NamedTuple("X", [ + - ("some_config", int), # important + - ]) +36 + class X(NamedTuple): +37 + some_config: int +38 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap index 022846fbca..3776b03cde 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015.py.snap @@ -10,13 +10,11 @@ UP015 [*] Unnecessary mode argument 3 | open("foo", "Ub") | help: Remove mode argument - -ℹ Safe fix -1 |-open("foo", "U") - 1 |+open("foo") -2 2 | open("foo", "Ur") -3 3 | open("foo", "Ub") -4 4 | open("foo", "rUb") + - open("foo", "U") +1 + open("foo") +2 | open("foo", "Ur") +3 | open("foo", "Ub") +4 | open("foo", "rUb") UP015 [*] Unnecessary mode argument --> UP015.py:2:13 @@ -28,14 +26,12 @@ UP015 [*] Unnecessary mode argument 4 | open("foo", "rUb") | help: Remove mode argument - -ℹ Safe fix -1 1 | open("foo", "U") -2 |-open("foo", "Ur") - 2 |+open("foo") -3 3 | open("foo", "Ub") -4 4 | open("foo", "rUb") -5 5 | open("foo", "r") +1 | open("foo", "U") + - open("foo", "Ur") +2 + open("foo") +3 | open("foo", "Ub") +4 | open("foo", "rUb") +5 | open("foo", "r") UP015 [*] Unnecessary modes, use `rb` --> UP015.py:3:13 @@ -48,15 +44,13 @@ UP015 [*] Unnecessary modes, use `rb` 5 | open("foo", "r") | help: Replace with `rb` - -ℹ Safe fix -1 1 | open("foo", "U") -2 2 | open("foo", "Ur") -3 |-open("foo", "Ub") - 3 |+open("foo", "rb") -4 4 | open("foo", "rUb") -5 5 | open("foo", "r") -6 6 | open("foo", "rt") +1 | open("foo", "U") +2 | open("foo", "Ur") + - open("foo", "Ub") +3 + open("foo", "rb") +4 | open("foo", "rUb") +5 | open("foo", "r") +6 | open("foo", "rt") UP015 [*] Unnecessary modes, use `rb` --> UP015.py:4:13 @@ -69,16 +63,14 @@ UP015 [*] Unnecessary modes, use `rb` 6 | open("foo", "rt") | help: Replace with `rb` - -ℹ Safe fix -1 1 | open("foo", "U") -2 2 | open("foo", "Ur") -3 3 | open("foo", "Ub") -4 |-open("foo", "rUb") - 4 |+open("foo", "rb") -5 5 | open("foo", "r") -6 6 | open("foo", "rt") -7 7 | open("f", "r", encoding="UTF-8") +1 | open("foo", "U") +2 | open("foo", "Ur") +3 | open("foo", "Ub") + - open("foo", "rUb") +4 + open("foo", "rb") +5 | open("foo", "r") +6 | open("foo", "rt") +7 | open("f", "r", encoding="UTF-8") UP015 [*] Unnecessary mode argument --> UP015.py:5:13 @@ -91,16 +83,14 @@ UP015 [*] Unnecessary mode argument 7 | open("f", "r", encoding="UTF-8") | help: Remove mode argument - -ℹ Safe fix -2 2 | open("foo", "Ur") -3 3 | open("foo", "Ub") -4 4 | open("foo", "rUb") -5 |-open("foo", "r") - 5 |+open("foo") -6 6 | open("foo", "rt") -7 7 | open("f", "r", encoding="UTF-8") -8 8 | open("f", "wt") +2 | open("foo", "Ur") +3 | open("foo", "Ub") +4 | open("foo", "rUb") + - open("foo", "r") +5 + open("foo") +6 | open("foo", "rt") +7 | open("f", "r", encoding="UTF-8") +8 | open("f", "wt") UP015 [*] Unnecessary mode argument --> UP015.py:6:13 @@ -113,16 +103,14 @@ UP015 [*] Unnecessary mode argument 8 | open("f", "wt") | help: Remove mode argument - -ℹ Safe fix -3 3 | open("foo", "Ub") -4 4 | open("foo", "rUb") -5 5 | open("foo", "r") -6 |-open("foo", "rt") - 6 |+open("foo") -7 7 | open("f", "r", encoding="UTF-8") -8 8 | open("f", "wt") -9 9 | open("f", "tw") +3 | open("foo", "Ub") +4 | open("foo", "rUb") +5 | open("foo", "r") + - open("foo", "rt") +6 + open("foo") +7 | open("f", "r", encoding="UTF-8") +8 | open("f", "wt") +9 | open("f", "tw") UP015 [*] Unnecessary mode argument --> UP015.py:7:11 @@ -135,16 +123,14 @@ UP015 [*] Unnecessary mode argument 9 | open("f", "tw") | help: Remove mode argument - -ℹ Safe fix -4 4 | open("foo", "rUb") -5 5 | open("foo", "r") -6 6 | open("foo", "rt") -7 |-open("f", "r", encoding="UTF-8") - 7 |+open("f", encoding="UTF-8") -8 8 | open("f", "wt") -9 9 | open("f", "tw") -10 10 | +4 | open("foo", "rUb") +5 | open("foo", "r") +6 | open("foo", "rt") + - open("f", "r", encoding="UTF-8") +7 + open("f", encoding="UTF-8") +8 | open("f", "wt") +9 | open("f", "tw") +10 | UP015 [*] Unnecessary modes, use `w` --> UP015.py:8:11 @@ -156,16 +142,14 @@ UP015 [*] Unnecessary modes, use `w` 9 | open("f", "tw") | help: Replace with `w` - -ℹ Safe fix -5 5 | open("foo", "r") -6 6 | open("foo", "rt") -7 7 | open("f", "r", encoding="UTF-8") -8 |-open("f", "wt") - 8 |+open("f", "w") -9 9 | open("f", "tw") -10 10 | -11 11 | with open("foo", "U") as f: +5 | open("foo", "r") +6 | open("foo", "rt") +7 | open("f", "r", encoding="UTF-8") + - open("f", "wt") +8 + open("f", "w") +9 | open("f", "tw") +10 | +11 | with open("foo", "U") as f: UP015 [*] Unnecessary modes, use `w` --> UP015.py:9:11 @@ -178,16 +162,14 @@ UP015 [*] Unnecessary modes, use `w` 11 | with open("foo", "U") as f: | help: Replace with `w` - -ℹ Safe fix -6 6 | open("foo", "rt") -7 7 | open("f", "r", encoding="UTF-8") -8 8 | open("f", "wt") -9 |-open("f", "tw") - 9 |+open("f", "w") -10 10 | -11 11 | with open("foo", "U") as f: -12 12 | pass +6 | open("foo", "rt") +7 | open("f", "r", encoding="UTF-8") +8 | open("f", "wt") + - open("f", "tw") +9 + open("f", "w") +10 | +11 | with open("foo", "U") as f: +12 | pass UP015 [*] Unnecessary mode argument --> UP015.py:11:18 @@ -200,16 +182,14 @@ UP015 [*] Unnecessary mode argument 13 | with open("foo", "Ur") as f: | help: Remove mode argument - -ℹ Safe fix -8 8 | open("f", "wt") -9 9 | open("f", "tw") -10 10 | -11 |-with open("foo", "U") as f: - 11 |+with open("foo") as f: -12 12 | pass -13 13 | with open("foo", "Ur") as f: -14 14 | pass +8 | open("f", "wt") +9 | open("f", "tw") +10 | + - with open("foo", "U") as f: +11 + with open("foo") as f: +12 | pass +13 | with open("foo", "Ur") as f: +14 | pass UP015 [*] Unnecessary mode argument --> UP015.py:13:18 @@ -222,16 +202,14 @@ UP015 [*] Unnecessary mode argument 15 | with open("foo", "Ub") as f: | help: Remove mode argument - -ℹ Safe fix -10 10 | -11 11 | with open("foo", "U") as f: -12 12 | pass -13 |-with open("foo", "Ur") as f: - 13 |+with open("foo") as f: -14 14 | pass -15 15 | with open("foo", "Ub") as f: -16 16 | pass +10 | +11 | with open("foo", "U") as f: +12 | pass + - with open("foo", "Ur") as f: +13 + with open("foo") as f: +14 | pass +15 | with open("foo", "Ub") as f: +16 | pass UP015 [*] Unnecessary modes, use `rb` --> UP015.py:15:18 @@ -244,16 +222,14 @@ UP015 [*] Unnecessary modes, use `rb` 17 | with open("foo", "rUb") as f: | help: Replace with `rb` - -ℹ Safe fix -12 12 | pass -13 13 | with open("foo", "Ur") as f: -14 14 | pass -15 |-with open("foo", "Ub") as f: - 15 |+with open("foo", "rb") as f: -16 16 | pass -17 17 | with open("foo", "rUb") as f: -18 18 | pass +12 | pass +13 | with open("foo", "Ur") as f: +14 | pass + - with open("foo", "Ub") as f: +15 + with open("foo", "rb") as f: +16 | pass +17 | with open("foo", "rUb") as f: +18 | pass UP015 [*] Unnecessary modes, use `rb` --> UP015.py:17:18 @@ -266,16 +242,14 @@ UP015 [*] Unnecessary modes, use `rb` 19 | with open("foo", "r") as f: | help: Replace with `rb` - -ℹ Safe fix -14 14 | pass -15 15 | with open("foo", "Ub") as f: -16 16 | pass -17 |-with open("foo", "rUb") as f: - 17 |+with open("foo", "rb") as f: -18 18 | pass -19 19 | with open("foo", "r") as f: -20 20 | pass +14 | pass +15 | with open("foo", "Ub") as f: +16 | pass + - with open("foo", "rUb") as f: +17 + with open("foo", "rb") as f: +18 | pass +19 | with open("foo", "r") as f: +20 | pass UP015 [*] Unnecessary mode argument --> UP015.py:19:18 @@ -288,16 +262,14 @@ UP015 [*] Unnecessary mode argument 21 | with open("foo", "rt") as f: | help: Remove mode argument - -ℹ Safe fix -16 16 | pass -17 17 | with open("foo", "rUb") as f: -18 18 | pass -19 |-with open("foo", "r") as f: - 19 |+with open("foo") as f: -20 20 | pass -21 21 | with open("foo", "rt") as f: -22 22 | pass +16 | pass +17 | with open("foo", "rUb") as f: +18 | pass + - with open("foo", "r") as f: +19 + with open("foo") as f: +20 | pass +21 | with open("foo", "rt") as f: +22 | pass UP015 [*] Unnecessary mode argument --> UP015.py:21:18 @@ -310,16 +282,14 @@ UP015 [*] Unnecessary mode argument 23 | with open("foo", "r", encoding="UTF-8") as f: | help: Remove mode argument - -ℹ Safe fix -18 18 | pass -19 19 | with open("foo", "r") as f: -20 20 | pass -21 |-with open("foo", "rt") as f: - 21 |+with open("foo") as f: -22 22 | pass -23 23 | with open("foo", "r", encoding="UTF-8") as f: -24 24 | pass +18 | pass +19 | with open("foo", "r") as f: +20 | pass + - with open("foo", "rt") as f: +21 + with open("foo") as f: +22 | pass +23 | with open("foo", "r", encoding="UTF-8") as f: +24 | pass UP015 [*] Unnecessary mode argument --> UP015.py:23:18 @@ -332,16 +302,14 @@ UP015 [*] Unnecessary mode argument 25 | with open("foo", "wt") as f: | help: Remove mode argument - -ℹ Safe fix -20 20 | pass -21 21 | with open("foo", "rt") as f: -22 22 | pass -23 |-with open("foo", "r", encoding="UTF-8") as f: - 23 |+with open("foo", encoding="UTF-8") as f: -24 24 | pass -25 25 | with open("foo", "wt") as f: -26 26 | pass +20 | pass +21 | with open("foo", "rt") as f: +22 | pass + - with open("foo", "r", encoding="UTF-8") as f: +23 + with open("foo", encoding="UTF-8") as f: +24 | pass +25 | with open("foo", "wt") as f: +26 | pass UP015 [*] Unnecessary modes, use `w` --> UP015.py:25:18 @@ -353,16 +321,14 @@ UP015 [*] Unnecessary modes, use `w` 26 | pass | help: Replace with `w` - -ℹ Safe fix -22 22 | pass -23 23 | with open("foo", "r", encoding="UTF-8") as f: -24 24 | pass -25 |-with open("foo", "wt") as f: - 25 |+with open("foo", "w") as f: -26 26 | pass -27 27 | -28 28 | open(f("a", "b", "c"), "U") +22 | pass +23 | with open("foo", "r", encoding="UTF-8") as f: +24 | pass + - with open("foo", "wt") as f: +25 + with open("foo", "w") as f: +26 | pass +27 | +28 | open(f("a", "b", "c"), "U") UP015 [*] Unnecessary mode argument --> UP015.py:28:24 @@ -374,16 +340,14 @@ UP015 [*] Unnecessary mode argument 29 | open(f("a", "b", "c"), "Ub") | help: Remove mode argument - -ℹ Safe fix -25 25 | with open("foo", "wt") as f: -26 26 | pass -27 27 | -28 |-open(f("a", "b", "c"), "U") - 28 |+open(f("a", "b", "c")) -29 29 | open(f("a", "b", "c"), "Ub") -30 30 | -31 31 | with open(f("a", "b", "c"), "U") as f: +25 | with open("foo", "wt") as f: +26 | pass +27 | + - open(f("a", "b", "c"), "U") +28 + open(f("a", "b", "c")) +29 | open(f("a", "b", "c"), "Ub") +30 | +31 | with open(f("a", "b", "c"), "U") as f: UP015 [*] Unnecessary modes, use `rb` --> UP015.py:29:24 @@ -395,16 +359,14 @@ UP015 [*] Unnecessary modes, use `rb` 31 | with open(f("a", "b", "c"), "U") as f: | help: Replace with `rb` - -ℹ Safe fix -26 26 | pass -27 27 | -28 28 | open(f("a", "b", "c"), "U") -29 |-open(f("a", "b", "c"), "Ub") - 29 |+open(f("a", "b", "c"), "rb") -30 30 | -31 31 | with open(f("a", "b", "c"), "U") as f: -32 32 | pass +26 | pass +27 | +28 | open(f("a", "b", "c"), "U") + - open(f("a", "b", "c"), "Ub") +29 + open(f("a", "b", "c"), "rb") +30 | +31 | with open(f("a", "b", "c"), "U") as f: +32 | pass UP015 [*] Unnecessary mode argument --> UP015.py:31:29 @@ -417,16 +379,14 @@ UP015 [*] Unnecessary mode argument 33 | with open(f("a", "b", "c"), "Ub") as f: | help: Remove mode argument - -ℹ Safe fix -28 28 | open(f("a", "b", "c"), "U") -29 29 | open(f("a", "b", "c"), "Ub") -30 30 | -31 |-with open(f("a", "b", "c"), "U") as f: - 31 |+with open(f("a", "b", "c")) as f: -32 32 | pass -33 33 | with open(f("a", "b", "c"), "Ub") as f: -34 34 | pass +28 | open(f("a", "b", "c"), "U") +29 | open(f("a", "b", "c"), "Ub") +30 | + - with open(f("a", "b", "c"), "U") as f: +31 + with open(f("a", "b", "c")) as f: +32 | pass +33 | with open(f("a", "b", "c"), "Ub") as f: +34 | pass UP015 [*] Unnecessary modes, use `rb` --> UP015.py:33:29 @@ -438,16 +398,14 @@ UP015 [*] Unnecessary modes, use `rb` 34 | pass | help: Replace with `rb` - -ℹ Safe fix -30 30 | -31 31 | with open(f("a", "b", "c"), "U") as f: -32 32 | pass -33 |-with open(f("a", "b", "c"), "Ub") as f: - 33 |+with open(f("a", "b", "c"), "rb") as f: -34 34 | pass -35 35 | -36 36 | with open("foo", "U") as fa, open("bar", "U") as fb: +30 | +31 | with open(f("a", "b", "c"), "U") as f: +32 | pass + - with open(f("a", "b", "c"), "Ub") as f: +33 + with open(f("a", "b", "c"), "rb") as f: +34 | pass +35 | +36 | with open("foo", "U") as fa, open("bar", "U") as fb: UP015 [*] Unnecessary mode argument --> UP015.py:36:18 @@ -460,16 +418,14 @@ UP015 [*] Unnecessary mode argument 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: | help: Remove mode argument - -ℹ Safe fix -33 33 | with open(f("a", "b", "c"), "Ub") as f: -34 34 | pass -35 35 | -36 |-with open("foo", "U") as fa, open("bar", "U") as fb: - 36 |+with open("foo") as fa, open("bar", "U") as fb: -37 37 | pass -38 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: -39 39 | pass +33 | with open(f("a", "b", "c"), "Ub") as f: +34 | pass +35 | + - with open("foo", "U") as fa, open("bar", "U") as fb: +36 + with open("foo") as fa, open("bar", "U") as fb: +37 | pass +38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: +39 | pass UP015 [*] Unnecessary mode argument --> UP015.py:36:42 @@ -482,16 +438,14 @@ UP015 [*] Unnecessary mode argument 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: | help: Remove mode argument - -ℹ Safe fix -33 33 | with open(f("a", "b", "c"), "Ub") as f: -34 34 | pass -35 35 | -36 |-with open("foo", "U") as fa, open("bar", "U") as fb: - 36 |+with open("foo", "U") as fa, open("bar") as fb: -37 37 | pass -38 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: -39 39 | pass +33 | with open(f("a", "b", "c"), "Ub") as f: +34 | pass +35 | + - with open("foo", "U") as fa, open("bar", "U") as fb: +36 + with open("foo", "U") as fa, open("bar") as fb: +37 | pass +38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: +39 | pass UP015 [*] Unnecessary modes, use `rb` --> UP015.py:38:18 @@ -503,16 +457,14 @@ UP015 [*] Unnecessary modes, use `rb` 39 | pass | help: Replace with `rb` - -ℹ Safe fix -35 35 | -36 36 | with open("foo", "U") as fa, open("bar", "U") as fb: -37 37 | pass -38 |-with open("foo", "Ub") as fa, open("bar", "Ub") as fb: - 38 |+with open("foo", "rb") as fa, open("bar", "Ub") as fb: -39 39 | pass -40 40 | -41 41 | open("foo", mode="U") +35 | +36 | with open("foo", "U") as fa, open("bar", "U") as fb: +37 | pass + - with open("foo", "Ub") as fa, open("bar", "Ub") as fb: +38 + with open("foo", "rb") as fa, open("bar", "Ub") as fb: +39 | pass +40 | +41 | open("foo", mode="U") UP015 [*] Unnecessary modes, use `rb` --> UP015.py:38:43 @@ -524,16 +476,14 @@ UP015 [*] Unnecessary modes, use `rb` 39 | pass | help: Replace with `rb` - -ℹ Safe fix -35 35 | -36 36 | with open("foo", "U") as fa, open("bar", "U") as fb: -37 37 | pass -38 |-with open("foo", "Ub") as fa, open("bar", "Ub") as fb: - 38 |+with open("foo", "Ub") as fa, open("bar", "rb") as fb: -39 39 | pass -40 40 | -41 41 | open("foo", mode="U") +35 | +36 | with open("foo", "U") as fa, open("bar", "U") as fb: +37 | pass + - with open("foo", "Ub") as fa, open("bar", "Ub") as fb: +38 + with open("foo", "Ub") as fa, open("bar", "rb") as fb: +39 | pass +40 | +41 | open("foo", mode="U") UP015 [*] Unnecessary mode argument --> UP015.py:41:18 @@ -546,16 +496,14 @@ UP015 [*] Unnecessary mode argument 43 | open(mode="U", name="foo") | help: Remove mode argument - -ℹ Safe fix -38 38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: -39 39 | pass -40 40 | -41 |-open("foo", mode="U") - 41 |+open("foo") -42 42 | open(name="foo", mode="U") -43 43 | open(mode="U", name="foo") -44 44 | +38 | with open("foo", "Ub") as fa, open("bar", "Ub") as fb: +39 | pass +40 | + - open("foo", mode="U") +41 + open("foo") +42 | open(name="foo", mode="U") +43 | open(mode="U", name="foo") +44 | UP015 [*] Unnecessary mode argument --> UP015.py:42:23 @@ -566,16 +514,14 @@ UP015 [*] Unnecessary mode argument 43 | open(mode="U", name="foo") | help: Remove mode argument - -ℹ Safe fix -39 39 | pass -40 40 | -41 41 | open("foo", mode="U") -42 |-open(name="foo", mode="U") - 42 |+open(name="foo") -43 43 | open(mode="U", name="foo") -44 44 | -45 45 | with open("foo", mode="U") as f: +39 | pass +40 | +41 | open("foo", mode="U") + - open(name="foo", mode="U") +42 + open(name="foo") +43 | open(mode="U", name="foo") +44 | +45 | with open("foo", mode="U") as f: UP015 [*] Unnecessary mode argument --> UP015.py:43:11 @@ -588,16 +534,14 @@ UP015 [*] Unnecessary mode argument 45 | with open("foo", mode="U") as f: | help: Remove mode argument - -ℹ Safe fix -40 40 | -41 41 | open("foo", mode="U") -42 42 | open(name="foo", mode="U") -43 |-open(mode="U", name="foo") - 43 |+open(name="foo") -44 44 | -45 45 | with open("foo", mode="U") as f: -46 46 | pass +40 | +41 | open("foo", mode="U") +42 | open(name="foo", mode="U") + - open(mode="U", name="foo") +43 + open(name="foo") +44 | +45 | with open("foo", mode="U") as f: +46 | pass UP015 [*] Unnecessary mode argument --> UP015.py:45:23 @@ -610,16 +554,14 @@ UP015 [*] Unnecessary mode argument 47 | with open(name="foo", mode="U") as f: | help: Remove mode argument - -ℹ Safe fix -42 42 | open(name="foo", mode="U") -43 43 | open(mode="U", name="foo") -44 44 | -45 |-with open("foo", mode="U") as f: - 45 |+with open("foo") as f: -46 46 | pass -47 47 | with open(name="foo", mode="U") as f: -48 48 | pass +42 | open(name="foo", mode="U") +43 | open(mode="U", name="foo") +44 | + - with open("foo", mode="U") as f: +45 + with open("foo") as f: +46 | pass +47 | with open(name="foo", mode="U") as f: +48 | pass UP015 [*] Unnecessary mode argument --> UP015.py:47:28 @@ -632,16 +574,14 @@ UP015 [*] Unnecessary mode argument 49 | with open(mode="U", name="foo") as f: | help: Remove mode argument - -ℹ Safe fix -44 44 | -45 45 | with open("foo", mode="U") as f: -46 46 | pass -47 |-with open(name="foo", mode="U") as f: - 47 |+with open(name="foo") as f: -48 48 | pass -49 49 | with open(mode="U", name="foo") as f: -50 50 | pass +44 | +45 | with open("foo", mode="U") as f: +46 | pass + - with open(name="foo", mode="U") as f: +47 + with open(name="foo") as f: +48 | pass +49 | with open(mode="U", name="foo") as f: +50 | pass UP015 [*] Unnecessary mode argument --> UP015.py:49:16 @@ -653,16 +593,14 @@ UP015 [*] Unnecessary mode argument 50 | pass | help: Remove mode argument - -ℹ Safe fix -46 46 | pass -47 47 | with open(name="foo", mode="U") as f: -48 48 | pass -49 |-with open(mode="U", name="foo") as f: - 49 |+with open(name="foo") as f: -50 50 | pass -51 51 | -52 52 | open("foo", mode="Ub") +46 | pass +47 | with open(name="foo", mode="U") as f: +48 | pass + - with open(mode="U", name="foo") as f: +49 + with open(name="foo") as f: +50 | pass +51 | +52 | open("foo", mode="Ub") UP015 [*] Unnecessary modes, use `rb` --> UP015.py:52:18 @@ -675,16 +613,14 @@ UP015 [*] Unnecessary modes, use `rb` 54 | open(mode="Ub", name="foo") | help: Replace with `rb` - -ℹ Safe fix -49 49 | with open(mode="U", name="foo") as f: -50 50 | pass -51 51 | -52 |-open("foo", mode="Ub") - 52 |+open("foo", mode="rb") -53 53 | open(name="foo", mode="Ub") -54 54 | open(mode="Ub", name="foo") -55 55 | +49 | with open(mode="U", name="foo") as f: +50 | pass +51 | + - open("foo", mode="Ub") +52 + open("foo", mode="rb") +53 | open(name="foo", mode="Ub") +54 | open(mode="Ub", name="foo") +55 | UP015 [*] Unnecessary modes, use `rb` --> UP015.py:53:23 @@ -695,16 +631,14 @@ UP015 [*] Unnecessary modes, use `rb` 54 | open(mode="Ub", name="foo") | help: Replace with `rb` - -ℹ Safe fix -50 50 | pass -51 51 | -52 52 | open("foo", mode="Ub") -53 |-open(name="foo", mode="Ub") - 53 |+open(name="foo", mode="rb") -54 54 | open(mode="Ub", name="foo") -55 55 | -56 56 | with open("foo", mode="Ub") as f: +50 | pass +51 | +52 | open("foo", mode="Ub") + - open(name="foo", mode="Ub") +53 + open(name="foo", mode="rb") +54 | open(mode="Ub", name="foo") +55 | +56 | with open("foo", mode="Ub") as f: UP015 [*] Unnecessary modes, use `rb` --> UP015.py:54:11 @@ -717,16 +651,14 @@ UP015 [*] Unnecessary modes, use `rb` 56 | with open("foo", mode="Ub") as f: | help: Replace with `rb` - -ℹ Safe fix -51 51 | -52 52 | open("foo", mode="Ub") -53 53 | open(name="foo", mode="Ub") -54 |-open(mode="Ub", name="foo") - 54 |+open(mode="rb", name="foo") -55 55 | -56 56 | with open("foo", mode="Ub") as f: -57 57 | pass +51 | +52 | open("foo", mode="Ub") +53 | open(name="foo", mode="Ub") + - open(mode="Ub", name="foo") +54 + open(mode="rb", name="foo") +55 | +56 | with open("foo", mode="Ub") as f: +57 | pass UP015 [*] Unnecessary modes, use `rb` --> UP015.py:56:23 @@ -739,16 +671,14 @@ UP015 [*] Unnecessary modes, use `rb` 58 | with open(name="foo", mode="Ub") as f: | help: Replace with `rb` - -ℹ Safe fix -53 53 | open(name="foo", mode="Ub") -54 54 | open(mode="Ub", name="foo") -55 55 | -56 |-with open("foo", mode="Ub") as f: - 56 |+with open("foo", mode="rb") as f: -57 57 | pass -58 58 | with open(name="foo", mode="Ub") as f: -59 59 | pass +53 | open(name="foo", mode="Ub") +54 | open(mode="Ub", name="foo") +55 | + - with open("foo", mode="Ub") as f: +56 + with open("foo", mode="rb") as f: +57 | pass +58 | with open(name="foo", mode="Ub") as f: +59 | pass UP015 [*] Unnecessary modes, use `rb` --> UP015.py:58:28 @@ -761,16 +691,14 @@ UP015 [*] Unnecessary modes, use `rb` 60 | with open(mode="Ub", name="foo") as f: | help: Replace with `rb` - -ℹ Safe fix -55 55 | -56 56 | with open("foo", mode="Ub") as f: -57 57 | pass -58 |-with open(name="foo", mode="Ub") as f: - 58 |+with open(name="foo", mode="rb") as f: -59 59 | pass -60 60 | with open(mode="Ub", name="foo") as f: -61 61 | pass +55 | +56 | with open("foo", mode="Ub") as f: +57 | pass + - with open(name="foo", mode="Ub") as f: +58 + with open(name="foo", mode="rb") as f: +59 | pass +60 | with open(mode="Ub", name="foo") as f: +61 | pass UP015 [*] Unnecessary modes, use `rb` --> UP015.py:60:16 @@ -782,16 +710,14 @@ UP015 [*] Unnecessary modes, use `rb` 61 | pass | help: Replace with `rb` - -ℹ Safe fix -57 57 | pass -58 58 | with open(name="foo", mode="Ub") as f: -59 59 | pass -60 |-with open(mode="Ub", name="foo") as f: - 60 |+with open(mode="rb", name="foo") as f: -61 61 | pass -62 62 | -63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +57 | pass +58 | with open(name="foo", mode="Ub") as f: +59 | pass + - with open(mode="Ub", name="foo") as f: +60 + with open(mode="rb", name="foo") as f: +61 | pass +62 | +63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) UP015 [*] Unnecessary mode argument --> UP015.py:63:23 @@ -804,16 +730,14 @@ UP015 [*] Unnecessary mode argument 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) | help: Remove mode argument - -ℹ Safe fix -60 60 | with open(mode="Ub", name="foo") as f: -61 61 | pass -62 62 | -63 |-open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) - 63 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -64 64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') -65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) -66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +60 | with open(mode="Ub", name="foo") as f: +61 | pass +62 | + - open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +63 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') +65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) +66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) UP015 [*] Unnecessary mode argument --> UP015.py:64:106 @@ -825,16 +749,14 @@ UP015 [*] Unnecessary mode argument 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) | help: Remove mode argument - -ℹ Safe fix -61 61 | pass -62 62 | -63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -64 |-open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') - 64 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) -66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -67 67 | +61 | pass +62 | +63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) + - open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') +64 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) +66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +67 | UP015 [*] Unnecessary mode argument --> UP015.py:65:65 @@ -846,16 +768,14 @@ UP015 [*] Unnecessary mode argument 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) | help: Remove mode argument - -ℹ Safe fix -62 62 | -63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -64 64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') -65 |-open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) - 65 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -67 67 | -68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +62 | +63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') + - open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) +65 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +67 | +68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) UP015 [*] Unnecessary mode argument --> UP015.py:66:11 @@ -868,16 +788,14 @@ UP015 [*] Unnecessary mode argument 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) | help: Remove mode argument - -ℹ Safe fix -63 63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -64 64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') -65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) -66 |-open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) - 66 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -67 67 | -68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') +63 | open(file="foo", mode='U', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +64 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U') +65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) + - open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +66 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +67 | +68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') UP015 [*] Unnecessary modes, use `rb` --> UP015.py:68:23 @@ -890,16 +808,14 @@ UP015 [*] Unnecessary modes, use `rb` 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) | help: Replace with `rb` - -ℹ Safe fix -65 65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) -66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -67 67 | -68 |-open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) - 68 |+open(file="foo", mode="rb", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') -70 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) -71 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +65 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None) +66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +67 | + - open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +68 + open(file="foo", mode="rb", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') +70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) +71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) UP015 [*] Unnecessary modes, use `rb` --> UP015.py:69:106 @@ -911,16 +827,14 @@ UP015 [*] Unnecessary modes, use `rb` 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) | help: Replace with `rb` - -ℹ Safe fix -66 66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -67 67 | -68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -69 |-open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') - 69 |+open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode="rb") -70 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) -71 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -72 72 | +66 | open(mode='U', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +67 | +68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) + - open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') +69 + open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode="rb") +70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) +71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +72 | UP015 [*] Unnecessary modes, use `rb` --> UP015.py:70:65 @@ -932,16 +846,14 @@ UP015 [*] Unnecessary modes, use `rb` 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) | help: Replace with `rb` - -ℹ Safe fix -67 67 | -68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') -70 |-open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) - 70 |+open(file="foo", buffering=-1, encoding=None, errors=None, mode="rb", newline=None, closefd=True, opener=None) -71 71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -72 72 | -73 73 | import aiofiles +67 | +68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') + - open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) +70 + open(file="foo", buffering=-1, encoding=None, errors=None, mode="rb", newline=None, closefd=True, opener=None) +71 | open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +72 | +73 | import aiofiles UP015 [*] Unnecessary modes, use `rb` --> UP015.py:71:11 @@ -954,16 +866,14 @@ UP015 [*] Unnecessary modes, use `rb` 73 | import aiofiles | help: Replace with `rb` - -ℹ Safe fix -68 68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -69 69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') -70 70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) -71 |-open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) - 71 |+open(mode="rb", file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) -72 72 | -73 73 | import aiofiles -74 74 | +68 | open(file="foo", mode='Ub', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +69 | open(file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub') +70 | open(file="foo", buffering=-1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None) + - open(mode='Ub', file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +71 + open(mode="rb", file="foo", buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None) +72 | +73 | import aiofiles +74 | UP015 [*] Unnecessary mode argument --> UP015.py:75:22 @@ -976,16 +886,14 @@ UP015 [*] Unnecessary mode argument 77 | aiofiles.open("foo", mode="r") | help: Remove mode argument - -ℹ Safe fix -72 72 | -73 73 | import aiofiles -74 74 | -75 |-aiofiles.open("foo", "U") - 75 |+aiofiles.open("foo") -76 76 | aiofiles.open("foo", "r") -77 77 | aiofiles.open("foo", mode="r") -78 78 | +72 | +73 | import aiofiles +74 | + - aiofiles.open("foo", "U") +75 + aiofiles.open("foo") +76 | aiofiles.open("foo", "r") +77 | aiofiles.open("foo", mode="r") +78 | UP015 [*] Unnecessary mode argument --> UP015.py:76:22 @@ -996,16 +904,14 @@ UP015 [*] Unnecessary mode argument 77 | aiofiles.open("foo", mode="r") | help: Remove mode argument - -ℹ Safe fix -73 73 | import aiofiles -74 74 | -75 75 | aiofiles.open("foo", "U") -76 |-aiofiles.open("foo", "r") - 76 |+aiofiles.open("foo") -77 77 | aiofiles.open("foo", mode="r") -78 78 | -79 79 | open("foo", "r+") +73 | import aiofiles +74 | +75 | aiofiles.open("foo", "U") + - aiofiles.open("foo", "r") +76 + aiofiles.open("foo") +77 | aiofiles.open("foo", mode="r") +78 | +79 | open("foo", "r+") UP015 [*] Unnecessary mode argument --> UP015.py:77:27 @@ -1018,13 +924,11 @@ UP015 [*] Unnecessary mode argument 79 | open("foo", "r+") | help: Remove mode argument - -ℹ Safe fix -74 74 | -75 75 | aiofiles.open("foo", "U") -76 76 | aiofiles.open("foo", "r") -77 |-aiofiles.open("foo", mode="r") - 77 |+aiofiles.open("foo") -78 78 | -79 79 | open("foo", "r+") -80 80 | open("foo", "rb") +74 | +75 | aiofiles.open("foo", "U") +76 | aiofiles.open("foo", "r") + - aiofiles.open("foo", mode="r") +77 + aiofiles.open("foo") +78 | +79 | open("foo", "r+") +80 | open("foo", "rb") diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap index 27b02bad15..df526db240 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP015_1.py.snap @@ -10,10 +10,8 @@ UP015 [*] Unnecessary mode argument | ^^^ | help: Remove mode argument - -ℹ Safe fix -1 1 | # Not a valid type annotation but this test shouldn't result in a panic. -2 2 | # Refer: https://github.com/astral-sh/ruff/issues/11736 -3 |-x: 'open("foo", "r")' - 3 |+x: 'open("foo")' -4 4 | +1 | # Not a valid type annotation but this test shouldn't result in a panic. +2 | # Refer: https://github.com/astral-sh/ruff/issues/11736 + - x: 'open("foo", "r")' +3 + x: 'open("foo")' +4 | diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap index e30ca3fdbf..05c508ea6f 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018.py.snap @@ -11,16 +11,14 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal) 39 | str(""" | help: Replace with string literal - -ℹ Safe fix -34 34 | int().denominator -35 35 | -36 36 | # These become literals -37 |-str() - 37 |+"" -38 38 | str("foo") -39 39 | str(""" -40 40 | foo""") +34 | int().denominator +35 | +36 | # These become literals + - str() +37 + "" +38 | str("foo") +39 | str(""" +40 | foo""") UP018 [*] Unnecessary `str` call (rewrite as a literal) --> UP018.py:38:1 @@ -33,16 +31,14 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal) 40 | foo""") | help: Replace with string literal - -ℹ Safe fix -35 35 | -36 36 | # These become literals -37 37 | str() -38 |-str("foo") - 38 |+"foo" -39 39 | str(""" -40 40 | foo""") -41 41 | bytes() +35 | +36 | # These become literals +37 | str() + - str("foo") +38 + "foo" +39 | str(""" +40 | foo""") +41 | bytes() UP018 [*] Unnecessary `str` call (rewrite as a literal) --> UP018.py:39:1 @@ -56,18 +52,16 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal) 42 | bytes(b"foo") | help: Replace with string literal - -ℹ Safe fix -36 36 | # These become literals -37 37 | str() -38 38 | str("foo") -39 |-str(""" -40 |-foo""") - 39 |+""" - 40 |+foo""" -41 41 | bytes() -42 42 | bytes(b"foo") -43 43 | bytes(b""" +36 | # These become literals +37 | str() +38 | str("foo") + - str(""" + - foo""") +39 + """ +40 + foo""" +41 | bytes() +42 | bytes(b"foo") +43 | bytes(b""" UP018 [*] Unnecessary `bytes` call (rewrite as a literal) --> UP018.py:41:1 @@ -80,16 +74,14 @@ UP018 [*] Unnecessary `bytes` call (rewrite as a literal) 43 | bytes(b""" | help: Replace with bytes literal - -ℹ Safe fix -38 38 | str("foo") -39 39 | str(""" -40 40 | foo""") -41 |-bytes() - 41 |+b"" -42 42 | bytes(b"foo") -43 43 | bytes(b""" -44 44 | foo""") +38 | str("foo") +39 | str(""" +40 | foo""") + - bytes() +41 + b"" +42 | bytes(b"foo") +43 | bytes(b""" +44 | foo""") UP018 [*] Unnecessary `bytes` call (rewrite as a literal) --> UP018.py:42:1 @@ -102,16 +94,14 @@ UP018 [*] Unnecessary `bytes` call (rewrite as a literal) 44 | foo""") | help: Replace with bytes literal - -ℹ Safe fix -39 39 | str(""" -40 40 | foo""") -41 41 | bytes() -42 |-bytes(b"foo") - 42 |+b"foo" -43 43 | bytes(b""" -44 44 | foo""") -45 45 | f"{str()}" +39 | str(""" +40 | foo""") +41 | bytes() + - bytes(b"foo") +42 + b"foo" +43 | bytes(b""" +44 | foo""") +45 | f"{str()}" UP018 [*] Unnecessary `bytes` call (rewrite as a literal) --> UP018.py:43:1 @@ -125,18 +115,16 @@ UP018 [*] Unnecessary `bytes` call (rewrite as a literal) 46 | int() | help: Replace with bytes literal - -ℹ Safe fix -40 40 | foo""") -41 41 | bytes() -42 42 | bytes(b"foo") -43 |-bytes(b""" -44 |-foo""") - 43 |+b""" - 44 |+foo""" -45 45 | f"{str()}" -46 46 | int() -47 47 | int(1) +40 | foo""") +41 | bytes() +42 | bytes(b"foo") + - bytes(b""" + - foo""") +43 + b""" +44 + foo""" +45 | f"{str()}" +46 | int() +47 | int(1) UP018 [*] Unnecessary `str` call (rewrite as a literal) --> UP018.py:45:4 @@ -149,16 +137,14 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal) 47 | int(1) | help: Replace with string literal - -ℹ Safe fix -42 42 | bytes(b"foo") -43 43 | bytes(b""" -44 44 | foo""") -45 |-f"{str()}" - 45 |+f"{''}" -46 46 | int() -47 47 | int(1) -48 48 | float() +42 | bytes(b"foo") +43 | bytes(b""" +44 | foo""") + - f"{str()}" +45 + f"{''}" +46 | int() +47 | int(1) +48 | float() UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:46:1 @@ -171,16 +157,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 48 | float() | help: Replace with integer literal - -ℹ Safe fix -43 43 | bytes(b""" -44 44 | foo""") -45 45 | f"{str()}" -46 |-int() - 46 |+0 -47 47 | int(1) -48 48 | float() -49 49 | float(1.0) +43 | bytes(b""" +44 | foo""") +45 | f"{str()}" + - int() +46 + 0 +47 | int(1) +48 | float() +49 | float(1.0) UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:47:1 @@ -193,16 +177,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 49 | float(1.0) | help: Replace with integer literal - -ℹ Safe fix -44 44 | foo""") -45 45 | f"{str()}" -46 46 | int() -47 |-int(1) - 47 |+1 -48 48 | float() -49 49 | float(1.0) -50 50 | bool() +44 | foo""") +45 | f"{str()}" +46 | int() + - int(1) +47 + 1 +48 | float() +49 | float(1.0) +50 | bool() UP018 [*] Unnecessary `float` call (rewrite as a literal) --> UP018.py:48:1 @@ -215,16 +197,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal) 50 | bool() | help: Replace with float literal - -ℹ Safe fix -45 45 | f"{str()}" -46 46 | int() -47 47 | int(1) -48 |-float() - 48 |+0.0 -49 49 | float(1.0) -50 50 | bool() -51 51 | bool(True) +45 | f"{str()}" +46 | int() +47 | int(1) + - float() +48 + 0.0 +49 | float(1.0) +50 | bool() +51 | bool(True) UP018 [*] Unnecessary `float` call (rewrite as a literal) --> UP018.py:49:1 @@ -237,16 +217,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal) 51 | bool(True) | help: Replace with float literal - -ℹ Safe fix -46 46 | int() -47 47 | int(1) -48 48 | float() -49 |-float(1.0) - 49 |+1.0 -50 50 | bool() -51 51 | bool(True) -52 52 | bool(False) +46 | int() +47 | int(1) +48 | float() + - float(1.0) +49 + 1.0 +50 | bool() +51 | bool(True) +52 | bool(False) UP018 [*] Unnecessary `bool` call (rewrite as a literal) --> UP018.py:50:1 @@ -259,16 +237,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal) 52 | bool(False) | help: Replace with boolean literal - -ℹ Safe fix -47 47 | int(1) -48 48 | float() -49 49 | float(1.0) -50 |-bool() - 50 |+False -51 51 | bool(True) -52 52 | bool(False) -53 53 | +47 | int(1) +48 | float() +49 | float(1.0) + - bool() +50 + False +51 | bool(True) +52 | bool(False) +53 | UP018 [*] Unnecessary `bool` call (rewrite as a literal) --> UP018.py:51:1 @@ -280,16 +256,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal) 52 | bool(False) | help: Replace with boolean literal - -ℹ Safe fix -48 48 | float() -49 49 | float(1.0) -50 50 | bool() -51 |-bool(True) - 51 |+True -52 52 | bool(False) -53 53 | -54 54 | # These become a literal but retain parentheses +48 | float() +49 | float(1.0) +50 | bool() + - bool(True) +51 + True +52 | bool(False) +53 | +54 | # These become a literal but retain parentheses UP018 [*] Unnecessary `bool` call (rewrite as a literal) --> UP018.py:52:1 @@ -302,16 +276,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal) 54 | # These become a literal but retain parentheses | help: Replace with boolean literal - -ℹ Safe fix -49 49 | float(1.0) -50 50 | bool() -51 51 | bool(True) -52 |-bool(False) - 52 |+False -53 53 | -54 54 | # These become a literal but retain parentheses -55 55 | int(1).denominator +49 | float(1.0) +50 | bool() +51 | bool(True) + - bool(False) +52 + False +53 | +54 | # These become a literal but retain parentheses +55 | int(1).denominator UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:55:1 @@ -323,16 +295,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 57 | # These too are literals in spirit | help: Replace with integer literal - -ℹ Safe fix -52 52 | bool(False) -53 53 | -54 54 | # These become a literal but retain parentheses -55 |-int(1).denominator - 55 |+(1).denominator -56 56 | -57 57 | # These too are literals in spirit -58 58 | int(+1) +52 | bool(False) +53 | +54 | # These become a literal but retain parentheses + - int(1).denominator +55 + (1).denominator +56 | +57 | # These too are literals in spirit +58 | int(+1) UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:58:1 @@ -344,16 +314,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 60 | float(+1.0) | help: Replace with integer literal - -ℹ Safe fix -55 55 | int(1).denominator -56 56 | -57 57 | # These too are literals in spirit -58 |-int(+1) - 58 |++1 -59 59 | int(-1) -60 60 | float(+1.0) -61 61 | float(-1.0) +55 | int(1).denominator +56 | +57 | # These too are literals in spirit + - int(+1) +58 + +1 +59 | int(-1) +60 | float(+1.0) +61 | float(-1.0) UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:59:1 @@ -366,16 +334,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 61 | float(-1.0) | help: Replace with integer literal - -ℹ Safe fix -56 56 | -57 57 | # These too are literals in spirit -58 58 | int(+1) -59 |-int(-1) - 59 |+-1 -60 60 | float(+1.0) -61 61 | float(-1.0) -62 62 | +56 | +57 | # These too are literals in spirit +58 | int(+1) + - int(-1) +59 + -1 +60 | float(+1.0) +61 | float(-1.0) +62 | UP018 [*] Unnecessary `float` call (rewrite as a literal) --> UP018.py:60:1 @@ -387,16 +353,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal) 61 | float(-1.0) | help: Replace with float literal - -ℹ Safe fix -57 57 | # These too are literals in spirit -58 58 | int(+1) -59 59 | int(-1) -60 |-float(+1.0) - 60 |++1.0 -61 61 | float(-1.0) -62 62 | -63 63 | +57 | # These too are literals in spirit +58 | int(+1) +59 | int(-1) + - float(+1.0) +60 + +1.0 +61 | float(-1.0) +62 | +63 | UP018 [*] Unnecessary `float` call (rewrite as a literal) --> UP018.py:61:1 @@ -407,16 +371,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal) | ^^^^^^^^^^^ | help: Replace with float literal - -ℹ Safe fix -58 58 | int(+1) -59 59 | int(-1) -60 60 | float(+1.0) -61 |-float(-1.0) - 61 |+-1.0 -62 62 | -63 63 | -64 64 | # https://github.com/astral-sh/ruff/issues/15859 +58 | int(+1) +59 | int(-1) +60 | float(+1.0) + - float(-1.0) +61 + -1.0 +62 | +63 | +64 | # https://github.com/astral-sh/ruff/issues/15859 UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:65:1 @@ -427,16 +389,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 66 | 2 ** int(-1) # 2 ** -1 | help: Replace with integer literal - -ℹ Safe fix -62 62 | -63 63 | -64 64 | # https://github.com/astral-sh/ruff/issues/15859 -65 |-int(-1) ** 0 # (-1) ** 0 - 65 |+(-1) ** 0 # (-1) ** 0 -66 66 | 2 ** int(-1) # 2 ** -1 -67 67 | -68 68 | int(-1)[0] # (-1)[0] +62 | +63 | +64 | # https://github.com/astral-sh/ruff/issues/15859 + - int(-1) ** 0 # (-1) ** 0 +65 + (-1) ** 0 # (-1) ** 0 +66 | 2 ** int(-1) # 2 ** -1 +67 | +68 | int(-1)[0] # (-1)[0] UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:66:6 @@ -449,16 +409,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 68 | int(-1)[0] # (-1)[0] | help: Replace with integer literal - -ℹ Safe fix -63 63 | -64 64 | # https://github.com/astral-sh/ruff/issues/15859 -65 65 | int(-1) ** 0 # (-1) ** 0 -66 |-2 ** int(-1) # 2 ** -1 - 66 |+2 ** (-1) # 2 ** -1 -67 67 | -68 68 | int(-1)[0] # (-1)[0] -69 69 | 2[int(-1)] # 2[-1] +63 | +64 | # https://github.com/astral-sh/ruff/issues/15859 +65 | int(-1) ** 0 # (-1) ** 0 + - 2 ** int(-1) # 2 ** -1 +66 + 2 ** (-1) # 2 ** -1 +67 | +68 | int(-1)[0] # (-1)[0] +69 | 2[int(-1)] # 2[-1] UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:68:1 @@ -470,16 +428,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 69 | 2[int(-1)] # 2[-1] | help: Replace with integer literal - -ℹ Safe fix -65 65 | int(-1) ** 0 # (-1) ** 0 -66 66 | 2 ** int(-1) # 2 ** -1 -67 67 | -68 |-int(-1)[0] # (-1)[0] - 68 |+(-1)[0] # (-1)[0] -69 69 | 2[int(-1)] # 2[-1] -70 70 | -71 71 | int(-1)(0) # (-1)(0) +65 | int(-1) ** 0 # (-1) ** 0 +66 | 2 ** int(-1) # 2 ** -1 +67 | + - int(-1)[0] # (-1)[0] +68 + (-1)[0] # (-1)[0] +69 | 2[int(-1)] # 2[-1] +70 | +71 | int(-1)(0) # (-1)(0) UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:69:3 @@ -491,16 +447,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 71 | int(-1)(0) # (-1)(0) | help: Replace with integer literal - -ℹ Safe fix -66 66 | 2 ** int(-1) # 2 ** -1 -67 67 | -68 68 | int(-1)[0] # (-1)[0] -69 |-2[int(-1)] # 2[-1] - 69 |+2[(-1)] # 2[-1] -70 70 | -71 71 | int(-1)(0) # (-1)(0) -72 72 | 2(int(-1)) # 2(-1) +66 | 2 ** int(-1) # 2 ** -1 +67 | +68 | int(-1)[0] # (-1)[0] + - 2[int(-1)] # 2[-1] +69 + 2[(-1)] # 2[-1] +70 | +71 | int(-1)(0) # (-1)(0) +72 | 2(int(-1)) # 2(-1) UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:71:1 @@ -512,16 +466,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 72 | 2(int(-1)) # 2(-1) | help: Replace with integer literal - -ℹ Safe fix -68 68 | int(-1)[0] # (-1)[0] -69 69 | 2[int(-1)] # 2[-1] -70 70 | -71 |-int(-1)(0) # (-1)(0) - 71 |+(-1)(0) # (-1)(0) -72 72 | 2(int(-1)) # 2(-1) -73 73 | -74 74 | float(-1.0).foo # (-1.0).foo +68 | int(-1)[0] # (-1)[0] +69 | 2[int(-1)] # 2[-1] +70 | + - int(-1)(0) # (-1)(0) +71 + (-1)(0) # (-1)(0) +72 | 2(int(-1)) # 2(-1) +73 | +74 | float(-1.0).foo # (-1.0).foo UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:72:3 @@ -533,16 +485,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 74 | float(-1.0).foo # (-1.0).foo | help: Replace with integer literal - -ℹ Safe fix -69 69 | 2[int(-1)] # 2[-1] -70 70 | -71 71 | int(-1)(0) # (-1)(0) -72 |-2(int(-1)) # 2(-1) - 72 |+2((-1)) # 2(-1) -73 73 | -74 74 | float(-1.0).foo # (-1.0).foo -75 75 | +69 | 2[int(-1)] # 2[-1] +70 | +71 | int(-1)(0) # (-1)(0) + - 2(int(-1)) # 2(-1) +72 + 2((-1)) # 2(-1) +73 | +74 | float(-1.0).foo # (-1.0).foo +75 | UP018 [*] Unnecessary `float` call (rewrite as a literal) --> UP018.py:74:1 @@ -555,16 +505,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal) 76 | await int(-1) # await (-1) | help: Replace with float literal - -ℹ Safe fix -71 71 | int(-1)(0) # (-1)(0) -72 72 | 2(int(-1)) # 2(-1) -73 73 | -74 |-float(-1.0).foo # (-1.0).foo - 74 |+(-1.0).foo # (-1.0).foo -75 75 | -76 76 | await int(-1) # await (-1) -77 77 | +71 | int(-1)(0) # (-1)(0) +72 | 2(int(-1)) # 2(-1) +73 | + - float(-1.0).foo # (-1.0).foo +74 + (-1.0).foo # (-1.0).foo +75 | +76 | await int(-1) # await (-1) +77 | UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:76:7 @@ -575,16 +523,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) | ^^^^^^^ | help: Replace with integer literal - -ℹ Safe fix -73 73 | -74 74 | float(-1.0).foo # (-1.0).foo -75 75 | -76 |-await int(-1) # await (-1) - 76 |+await (-1) # await (-1) -77 77 | -78 78 | -79 79 | int(+1) ** 0 +73 | +74 | float(-1.0).foo # (-1.0).foo +75 | + - await int(-1) # await (-1) +76 + await (-1) # await (-1) +77 | +78 | +79 | int(+1) ** 0 UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:79:1 @@ -594,16 +540,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 80 | float(+1.0)() | help: Replace with integer literal - -ℹ Safe fix -76 76 | await int(-1) # await (-1) -77 77 | -78 78 | -79 |-int(+1) ** 0 - 79 |+(+1) ** 0 -80 80 | float(+1.0)() -81 81 | -82 82 | +76 | await int(-1) # await (-1) +77 | +78 | + - int(+1) ** 0 +79 + (+1) ** 0 +80 | float(+1.0)() +81 | +82 | UP018 [*] Unnecessary `float` call (rewrite as a literal) --> UP018.py:80:1 @@ -613,16 +557,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal) | ^^^^^^^^^^^ | help: Replace with float literal - -ℹ Safe fix -77 77 | -78 78 | -79 79 | int(+1) ** 0 -80 |-float(+1.0)() - 80 |+(+1.0)() -81 81 | -82 82 | -83 83 | str( +77 | +78 | +79 | int(+1) ** 0 + - float(+1.0)() +80 + (+1.0)() +81 | +82 | +83 | str( UP018 [*] Unnecessary `str` call (rewrite as a literal) --> UP018.py:83:1 @@ -636,20 +578,19 @@ UP018 [*] Unnecessary `str` call (rewrite as a literal) 88 | # https://github.com/astral-sh/ruff/issues/17606 | help: Replace with string literal - -ℹ Unsafe fix -80 80 | float(+1.0)() -81 81 | -82 82 | -83 |-str( -84 |- '''Lorem -85 |- ipsum''' # Comment -86 |-).foo - 83 |+'''Lorem - 84 |+ ipsum'''.foo -87 85 | -88 86 | # https://github.com/astral-sh/ruff/issues/17606 -89 87 | bool(True)and None +80 | float(+1.0)() +81 | +82 | + - str( + - '''Lorem + - ipsum''' # Comment + - ).foo +83 + '''Lorem +84 + ipsum'''.foo +85 | +86 | # https://github.com/astral-sh/ruff/issues/17606 +87 | bool(True)and None +note: This is an unsafe fix and may change runtime behavior UP018 [*] Unnecessary `bool` call (rewrite as a literal) --> UP018.py:89:1 @@ -661,16 +602,14 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal) 91 | float(1.)and None | help: Replace with boolean literal - -ℹ Safe fix -86 86 | ).foo -87 87 | -88 88 | # https://github.com/astral-sh/ruff/issues/17606 -89 |-bool(True)and None - 89 |+True and None -90 90 | int(1)and None -91 91 | float(1.)and None -92 92 | bool(True)and() +86 | ).foo +87 | +88 | # https://github.com/astral-sh/ruff/issues/17606 + - bool(True)and None +89 + True and None +90 | int(1)and None +91 | float(1.)and None +92 | bool(True)and() UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018.py:90:1 @@ -683,16 +622,14 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 92 | bool(True)and() | help: Replace with integer literal - -ℹ Safe fix -87 87 | -88 88 | # https://github.com/astral-sh/ruff/issues/17606 -89 89 | bool(True)and None -90 |-int(1)and None - 90 |+1 and None -91 91 | float(1.)and None -92 92 | bool(True)and() -93 93 | +87 | +88 | # https://github.com/astral-sh/ruff/issues/17606 +89 | bool(True)and None + - int(1)and None +90 + 1 and None +91 | float(1.)and None +92 | bool(True)and() +93 | UP018 [*] Unnecessary `float` call (rewrite as a literal) --> UP018.py:91:1 @@ -704,16 +641,14 @@ UP018 [*] Unnecessary `float` call (rewrite as a literal) 92 | bool(True)and() | help: Replace with float literal - -ℹ Safe fix -88 88 | # https://github.com/astral-sh/ruff/issues/17606 -89 89 | bool(True)and None -90 90 | int(1)and None -91 |-float(1.)and None - 91 |+1. and None -92 92 | bool(True)and() -93 93 | -94 94 | +88 | # https://github.com/astral-sh/ruff/issues/17606 +89 | bool(True)and None +90 | int(1)and None + - float(1.)and None +91 + 1. and None +92 | bool(True)and() +93 | +94 | UP018 [*] Unnecessary `bool` call (rewrite as a literal) --> UP018.py:92:1 @@ -724,13 +659,11 @@ UP018 [*] Unnecessary `bool` call (rewrite as a literal) | ^^^^^^^^^^ | help: Replace with boolean literal - -ℹ Safe fix -89 89 | bool(True)and None -90 90 | int(1)and None -91 91 | float(1.)and None -92 |-bool(True)and() - 92 |+True and() -93 93 | -94 94 | -95 95 | # t-strings are not native literals +89 | bool(True)and None +90 | int(1)and None +91 | float(1.)and None + - bool(True)and() +92 + True and() +93 | +94 | +95 | # t-strings are not native literals diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap index b5e11a0c87..6ac6e53b92 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_CR.py.snap @@ -12,9 +12,7 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 5 | 1) | help: Replace with integer literal - -ℹ Safe fix -1 1 | # Keep parenthesis around preserved CR 2 |-int(- 2 |+(- 3 3 | 1) 4 4 | int(+ 5 5 | 1) +1 | # Keep parenthesis around preserved CR - int(- 2 + (- 3 | 1) 4 | int(+ 5 | 1) UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018_CR.py:4:1 @@ -26,6 +24,4 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) | |______^ | help: Replace with integer literal - -ℹ Safe fix -1 1 | # Keep parenthesis around preserved CR 2 2 | int(- 3 3 | 1) 4 |-int(+ 4 |+(+ 5 5 | 1) +1 | # Keep parenthesis around preserved CR 2 | int(- 3 | 1) - int(+ 4 + (+ 5 | 1) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap index 243b5efaa7..2a6bd9c894 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP018_LF.py.snap @@ -13,15 +13,13 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) 6 | int(+ | help: Replace with integer literal - -ℹ Safe fix -1 1 | # Keep parentheses around preserved \n -2 2 | -3 |-int(- - 3 |+(- -4 4 | 1) -5 5 | -6 6 | int(+ +1 | # Keep parentheses around preserved \n +2 | + - int(- +3 + (- +4 | 1) +5 | +6 | int(+ UP018 [*] Unnecessary `int` call (rewrite as a literal) --> UP018_LF.py:6:1 @@ -33,11 +31,9 @@ UP018 [*] Unnecessary `int` call (rewrite as a literal) | |______^ | help: Replace with integer literal - -ℹ Safe fix -3 3 | int(- -4 4 | 1) -5 5 | -6 |-int(+ - 6 |+(+ -7 7 | 1) +3 | int(- +4 | 1) +5 | + - int(+ +6 + (+ +7 | 1) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap index 39152672a8..d0af23c520 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP019.py.snap @@ -9,16 +9,14 @@ UP019 [*] `typing.Text` is deprecated, use `str` 8 | print(word) | help: Replace with `str` - -ℹ Safe fix -4 4 | from typing import Text as Goodbye -5 5 | -6 6 | -7 |-def print_word(word: Text) -> None: - 7 |+def print_word(word: str) -> None: -8 8 | print(word) -9 9 | -10 10 | +4 | from typing import Text as Goodbye +5 | +6 | + - def print_word(word: Text) -> None: +7 + def print_word(word: str) -> None: +8 | print(word) +9 | +10 | UP019 [*] `typing.Text` is deprecated, use `str` --> UP019.py:11:29 @@ -28,16 +26,14 @@ UP019 [*] `typing.Text` is deprecated, use `str` 12 | print(word) | help: Replace with `str` - -ℹ Safe fix -8 8 | print(word) -9 9 | -10 10 | -11 |-def print_second_word(word: typing.Text) -> None: - 11 |+def print_second_word(word: str) -> None: -12 12 | print(word) -13 13 | -14 14 | +8 | print(word) +9 | +10 | + - def print_second_word(word: typing.Text) -> None: +11 + def print_second_word(word: str) -> None: +12 | print(word) +13 | +14 | UP019 [*] `typing.Text` is deprecated, use `str` --> UP019.py:15:28 @@ -47,16 +43,14 @@ UP019 [*] `typing.Text` is deprecated, use `str` 16 | print(word) | help: Replace with `str` - -ℹ Safe fix -12 12 | print(word) -13 13 | -14 14 | -15 |-def print_third_word(word: Hello.Text) -> None: - 15 |+def print_third_word(word: str) -> None: -16 16 | print(word) -17 17 | -18 18 | +12 | print(word) +13 | +14 | + - def print_third_word(word: Hello.Text) -> None: +15 + def print_third_word(word: str) -> None: +16 | print(word) +17 | +18 | UP019 [*] `typing.Text` is deprecated, use `str` --> UP019.py:19:29 @@ -66,11 +60,9 @@ UP019 [*] `typing.Text` is deprecated, use `str` 20 | print(word) | help: Replace with `str` - -ℹ Safe fix -16 16 | print(word) -17 17 | -18 18 | -19 |-def print_fourth_word(word: Goodbye) -> None: - 19 |+def print_fourth_word(word: str) -> None: -20 20 | print(word) +16 | print(word) +17 | +18 | + - def print_fourth_word(word: Goodbye) -> None: +19 + def print_fourth_word(word: str) -> None: +20 | print(word) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap index 6fe9612829..0d816f52ac 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP020.py.snap @@ -11,15 +11,13 @@ UP020 [*] Use builtin `open` 4 | print(f.read()) | help: Replace with builtin `open` - -ℹ Safe fix -1 1 | import io -2 2 | -3 |-with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f: - 3 |+with open("f.txt", mode="r", buffering=-1, **kwargs) as f: -4 4 | print(f.read()) -5 5 | -6 6 | from io import open +1 | import io +2 | + - with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f: +3 + with open("f.txt", mode="r", buffering=-1, **kwargs) as f: +4 | print(f.read()) +5 | +6 | from io import open UP020 [*] Use builtin `open` --> UP020.py:8:6 @@ -31,13 +29,11 @@ UP020 [*] Use builtin `open` 9 | print(f.read()) | help: Replace with builtin `open` - -ℹ Safe fix -4 4 | print(f.read()) -5 5 | -6 6 | from io import open - 7 |+import builtins -7 8 | -8 |-with open("f.txt") as f: - 9 |+with builtins.open("f.txt") as f: -9 10 | print(f.read()) +4 | print(f.read()) +5 | +6 | from io import open +7 + import builtins +8 | + - with open("f.txt") as f: +9 + with builtins.open("f.txt") as f: +10 | print(f.read()) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap index 967b409372..bc5091ab9c 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP021.py.snap @@ -11,16 +11,14 @@ UP021 [*] `universal_newlines` is deprecated, use `text` 7 | run(["foo"], universal_newlines=True, check=False) | help: Replace with `text` keyword argument - -ℹ Safe fix -2 2 | from subprocess import run -3 3 | -4 4 | # Errors -5 |-subprocess.run(["foo"], universal_newlines=True, check=True) - 5 |+subprocess.run(["foo"], text=True, check=True) -6 6 | subprocess.run(["foo"], universal_newlines=True, text=True) -7 7 | run(["foo"], universal_newlines=True, check=False) -8 8 | +2 | from subprocess import run +3 | +4 | # Errors + - subprocess.run(["foo"], universal_newlines=True, check=True) +5 + subprocess.run(["foo"], text=True, check=True) +6 | subprocess.run(["foo"], universal_newlines=True, text=True) +7 | run(["foo"], universal_newlines=True, check=False) +8 | UP021 [*] `universal_newlines` is deprecated, use `text` --> UP021.py:6:25 @@ -32,16 +30,14 @@ UP021 [*] `universal_newlines` is deprecated, use `text` 7 | run(["foo"], universal_newlines=True, check=False) | help: Replace with `text` keyword argument - -ℹ Safe fix -3 3 | -4 4 | # Errors -5 5 | subprocess.run(["foo"], universal_newlines=True, check=True) -6 |-subprocess.run(["foo"], universal_newlines=True, text=True) - 6 |+subprocess.run(["foo"], text=True) -7 7 | run(["foo"], universal_newlines=True, check=False) -8 8 | -9 9 | # OK +3 | +4 | # Errors +5 | subprocess.run(["foo"], universal_newlines=True, check=True) + - subprocess.run(["foo"], universal_newlines=True, text=True) +6 + subprocess.run(["foo"], text=True) +7 | run(["foo"], universal_newlines=True, check=False) +8 | +9 | # OK UP021 [*] `universal_newlines` is deprecated, use `text` --> UP021.py:7:14 @@ -54,13 +50,11 @@ UP021 [*] `universal_newlines` is deprecated, use `text` 9 | # OK | help: Replace with `text` keyword argument - -ℹ Safe fix -4 4 | # Errors -5 5 | subprocess.run(["foo"], universal_newlines=True, check=True) -6 6 | subprocess.run(["foo"], universal_newlines=True, text=True) -7 |-run(["foo"], universal_newlines=True, check=False) - 7 |+run(["foo"], text=True, check=False) -8 8 | -9 9 | # OK -10 10 | subprocess.run(["foo"], check=True) +4 | # Errors +5 | subprocess.run(["foo"], universal_newlines=True, check=True) +6 | subprocess.run(["foo"], universal_newlines=True, text=True) + - run(["foo"], universal_newlines=True, check=False) +7 + run(["foo"], text=True, check=False) +8 | +9 | # OK +10 | subprocess.run(["foo"], check=True) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap index 79582dbaee..60b3a958af 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP022.py.snap @@ -12,16 +12,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) | help: Replace with `capture_output` keyword argument - -ℹ Unsafe fix -1 1 | from subprocess import run -2 2 | import subprocess -3 3 | -4 |-output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - 4 |+output = run(["foo"], capture_output=True) -5 5 | -6 6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) -7 7 | +1 | from subprocess import run +2 | import subprocess +3 | + - output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +4 + output = run(["foo"], capture_output=True) +5 | +6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +7 | +note: This is an unsafe fix and may change runtime behavior UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` --> UP022.py:6:10 @@ -34,16 +33,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"], stderr=subprocess.PIPE) | help: Replace with `capture_output` keyword argument - -ℹ Unsafe fix -3 3 | -4 4 | output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) -5 5 | -6 |-output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - 6 |+output = subprocess.run(["foo"], capture_output=True) -7 7 | -8 8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"], stderr=subprocess.PIPE) -9 9 | +3 | +4 | output = run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +5 | + - output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +6 + output = subprocess.run(["foo"], capture_output=True) +7 | +8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"], stderr=subprocess.PIPE) +9 | +note: This is an unsafe fix and may change runtime behavior UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` --> UP022.py:8:10 @@ -56,16 +54,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 10 | output = subprocess.run( | help: Replace with `capture_output` keyword argument - -ℹ Unsafe fix -5 5 | -6 6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) -7 7 | -8 |-output = subprocess.run(stdout=subprocess.PIPE, args=["foo"], stderr=subprocess.PIPE) - 8 |+output = subprocess.run(capture_output=True, args=["foo"]) -9 9 | -10 10 | output = subprocess.run( -11 11 | ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE +5 | +6 | output = subprocess.run(["foo"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +7 | + - output = subprocess.run(stdout=subprocess.PIPE, args=["foo"], stderr=subprocess.PIPE) +8 + output = subprocess.run(capture_output=True, args=["foo"]) +9 | +10 | output = subprocess.run( +11 | ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE +note: This is an unsafe fix and may change runtime behavior UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` --> UP022.py:10:10 @@ -81,16 +78,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 14 | output = subprocess.run( | help: Replace with `capture_output` keyword argument - -ℹ Unsafe fix -8 8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"], stderr=subprocess.PIPE) -9 9 | -10 10 | output = subprocess.run( -11 |- ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE - 11 |+ ["foo"], capture_output=True, check=True -12 12 | ) -13 13 | -14 14 | output = subprocess.run( +8 | output = subprocess.run(stdout=subprocess.PIPE, args=["foo"], stderr=subprocess.PIPE) +9 | +10 | output = subprocess.run( + - ["foo"], stdout=subprocess.PIPE, check=True, stderr=subprocess.PIPE +11 + ["foo"], capture_output=True, check=True +12 | ) +13 | +14 | output = subprocess.run( +note: This is an unsafe fix and may change runtime behavior UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` --> UP022.py:14:10 @@ -106,16 +102,15 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 18 | output = subprocess.run( | help: Replace with `capture_output` keyword argument - -ℹ Unsafe fix -12 12 | ) -13 13 | -14 14 | output = subprocess.run( -15 |- ["foo"], stderr=subprocess.PIPE, check=True, stdout=subprocess.PIPE - 15 |+ ["foo"], capture_output=True, check=True -16 16 | ) -17 17 | -18 18 | output = subprocess.run( +12 | ) +13 | +14 | output = subprocess.run( + - ["foo"], stderr=subprocess.PIPE, check=True, stdout=subprocess.PIPE +15 + ["foo"], capture_output=True, check=True +16 | ) +17 | +18 | output = subprocess.run( +note: This is an unsafe fix and may change runtime behavior UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` --> UP022.py:18:10 @@ -137,18 +132,17 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 28 | if output: | help: Replace with `capture_output` keyword argument - -ℹ Unsafe fix -17 17 | -18 18 | output = subprocess.run( -19 19 | ["foo"], -20 |- stdout=subprocess.PIPE, - 20 |+ capture_output=True, -21 21 | check=True, -22 |- stderr=subprocess.PIPE, -23 22 | text=True, -24 23 | encoding="utf-8", -25 24 | close_fds=True, +17 | +18 | output = subprocess.run( +19 | ["foo"], + - stdout=subprocess.PIPE, +20 + capture_output=True, +21 | check=True, + - stderr=subprocess.PIPE, +22 | text=True, +23 | encoding="utf-8", +24 | close_fds=True, +note: This is an unsafe fix and may change runtime behavior UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` --> UP022.py:29:14 @@ -168,18 +162,17 @@ UP022 [*] Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` 38 | output = subprocess.run( | help: Replace with `capture_output` keyword argument - -ℹ Unsafe fix -28 28 | if output: -29 29 | output = subprocess.run( -30 30 | ["foo"], -31 |- stdout=subprocess.PIPE, - 31 |+ capture_output=True, -32 32 | check=True, -33 |- stderr=subprocess.PIPE, -34 33 | text=True, -35 34 | encoding="utf-8", -36 35 | ) +28 | if output: +29 | output = subprocess.run( +30 | ["foo"], + - stdout=subprocess.PIPE, +31 + capture_output=True, +32 | check=True, + - stderr=subprocess.PIPE, +33 | text=True, +34 | encoding="utf-8", +35 | ) +note: This is an unsafe fix and may change runtime behavior UP022 Prefer `capture_output` over sending `stdout` and `stderr` to `PIPE` --> UP022.py:38:10 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap index 5052273855..9ab8fd6492 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP023.py.snap @@ -10,14 +10,12 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 3 | import xml.etree.cElementTree as ET | help: Replace with `ElementTree` - -ℹ Safe fix -1 1 | # These two imports have something after cElementTree, so they should be fixed. -2 |-from xml.etree.cElementTree import XML, Element, SubElement - 2 |+from xml.etree.ElementTree import XML, Element, SubElement -3 3 | import xml.etree.cElementTree as ET -4 4 | -5 5 | # Weird spacing should not cause issues. +1 | # These two imports have something after cElementTree, so they should be fixed. + - from xml.etree.cElementTree import XML, Element, SubElement +2 + from xml.etree.ElementTree import XML, Element, SubElement +3 | import xml.etree.cElementTree as ET +4 | +5 | # Weird spacing should not cause issues. UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:3:8 @@ -30,15 +28,13 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 5 | # Weird spacing should not cause issues. | help: Replace with `ElementTree` - -ℹ Safe fix -1 1 | # These two imports have something after cElementTree, so they should be fixed. -2 2 | from xml.etree.cElementTree import XML, Element, SubElement -3 |-import xml.etree.cElementTree as ET - 3 |+import xml.etree.ElementTree as ET -4 4 | -5 5 | # Weird spacing should not cause issues. -6 6 | from xml.etree.cElementTree import XML +1 | # These two imports have something after cElementTree, so they should be fixed. +2 | from xml.etree.cElementTree import XML, Element, SubElement + - import xml.etree.cElementTree as ET +3 + import xml.etree.ElementTree as ET +4 | +5 | # Weird spacing should not cause issues. +6 | from xml.etree.cElementTree import XML UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:6:1 @@ -49,16 +45,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 7 | import xml.etree.cElementTree as ET | help: Replace with `ElementTree` - -ℹ Safe fix -3 3 | import xml.etree.cElementTree as ET -4 4 | -5 5 | # Weird spacing should not cause issues. -6 |-from xml.etree.cElementTree import XML - 6 |+from xml.etree.ElementTree import XML -7 7 | import xml.etree.cElementTree as ET -8 8 | -9 9 | # Multi line imports should also work fine. +3 | import xml.etree.cElementTree as ET +4 | +5 | # Weird spacing should not cause issues. + - from xml.etree.cElementTree import XML +6 + from xml.etree.ElementTree import XML +7 | import xml.etree.cElementTree as ET +8 | +9 | # Multi line imports should also work fine. UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:7:11 @@ -71,16 +65,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 9 | # Multi line imports should also work fine. | help: Replace with `ElementTree` - -ℹ Safe fix -4 4 | -5 5 | # Weird spacing should not cause issues. -6 6 | from xml.etree.cElementTree import XML -7 |-import xml.etree.cElementTree as ET - 7 |+import xml.etree.ElementTree as ET -8 8 | -9 9 | # Multi line imports should also work fine. -10 10 | from xml.etree.cElementTree import ( +4 | +5 | # Weird spacing should not cause issues. +6 | from xml.etree.cElementTree import XML + - import xml.etree.cElementTree as ET +7 + import xml.etree.ElementTree as ET +8 | +9 | # Multi line imports should also work fine. +10 | from xml.etree.cElementTree import ( UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:10:1 @@ -96,16 +88,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 16 | import xml.etree.cElementTree as ET | help: Replace with `ElementTree` - -ℹ Safe fix -7 7 | import xml.etree.cElementTree as ET -8 8 | -9 9 | # Multi line imports should also work fine. -10 |-from xml.etree.cElementTree import ( - 10 |+from xml.etree.ElementTree import ( -11 11 | XML, -12 12 | Element, -13 13 | SubElement, +7 | import xml.etree.cElementTree as ET +8 | +9 | # Multi line imports should also work fine. + - from xml.etree.cElementTree import ( +10 + from xml.etree.ElementTree import ( +11 | XML, +12 | Element, +13 | SubElement, UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:16:12 @@ -117,16 +107,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 17 | from xml.etree import cElementTree as CET | help: Replace with `ElementTree` - -ℹ Safe fix -13 13 | SubElement, -14 14 | ) -15 15 | if True: -16 |- import xml.etree.cElementTree as ET - 16 |+ import xml.etree.ElementTree as ET -17 17 | from xml.etree import cElementTree as CET -18 18 | -19 19 | from xml.etree import cElementTree as ET +13 | SubElement, +14 | ) +15 | if True: + - import xml.etree.cElementTree as ET +16 + import xml.etree.ElementTree as ET +17 | from xml.etree import cElementTree as CET +18 | +19 | from xml.etree import cElementTree as ET UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:17:27 @@ -139,16 +127,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 19 | from xml.etree import cElementTree as ET | help: Replace with `ElementTree` - -ℹ Safe fix -14 14 | ) -15 15 | if True: -16 16 | import xml.etree.cElementTree as ET -17 |- from xml.etree import cElementTree as CET - 17 |+ from xml.etree import ElementTree as CET -18 18 | -19 19 | from xml.etree import cElementTree as ET -20 20 | +14 | ) +15 | if True: +16 | import xml.etree.cElementTree as ET + - from xml.etree import cElementTree as CET +17 + from xml.etree import ElementTree as CET +18 | +19 | from xml.etree import cElementTree as ET +20 | UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:19:23 @@ -161,16 +147,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 21 | import contextlib, xml.etree.cElementTree as ET | help: Replace with `ElementTree` - -ℹ Safe fix -16 16 | import xml.etree.cElementTree as ET -17 17 | from xml.etree import cElementTree as CET -18 18 | -19 |-from xml.etree import cElementTree as ET - 19 |+from xml.etree import ElementTree as ET -20 20 | -21 21 | import contextlib, xml.etree.cElementTree as ET -22 22 | +16 | import xml.etree.cElementTree as ET +17 | from xml.etree import cElementTree as CET +18 | + - from xml.etree import cElementTree as ET +19 + from xml.etree import ElementTree as ET +20 | +21 | import contextlib, xml.etree.cElementTree as ET +22 | UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:21:20 @@ -183,16 +167,14 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 23 | # This should fix the second, but not the first invocation. | help: Replace with `ElementTree` - -ℹ Safe fix -18 18 | -19 19 | from xml.etree import cElementTree as ET -20 20 | -21 |-import contextlib, xml.etree.cElementTree as ET - 21 |+import contextlib, xml.etree.ElementTree as ET -22 22 | -23 23 | # This should fix the second, but not the first invocation. -24 24 | import xml.etree.cElementTree, xml.etree.cElementTree as ET +18 | +19 | from xml.etree import cElementTree as ET +20 | + - import contextlib, xml.etree.cElementTree as ET +21 + import contextlib, xml.etree.ElementTree as ET +22 | +23 | # This should fix the second, but not the first invocation. +24 | import xml.etree.cElementTree, xml.etree.cElementTree as ET UP023 [*] `cElementTree` is deprecated, use `ElementTree` --> UP023.py:24:32 @@ -204,13 +186,11 @@ UP023 [*] `cElementTree` is deprecated, use `ElementTree` 26 | # The below items should NOT be changed. | help: Replace with `ElementTree` - -ℹ Safe fix -21 21 | import contextlib, xml.etree.cElementTree as ET -22 22 | -23 23 | # This should fix the second, but not the first invocation. -24 |-import xml.etree.cElementTree, xml.etree.cElementTree as ET - 24 |+import xml.etree.cElementTree, xml.etree.ElementTree as ET -25 25 | -26 26 | # The below items should NOT be changed. -27 27 | import xml.etree.cElementTree +21 | import contextlib, xml.etree.cElementTree as ET +22 | +23 | # This should fix the second, but not the first invocation. + - import xml.etree.cElementTree, xml.etree.cElementTree as ET +24 + import xml.etree.cElementTree, xml.etree.ElementTree as ET +25 | +26 | # The below items should NOT be changed. +27 | import xml.etree.cElementTree diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap index 552413b64e..e9b6bab722 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap @@ -11,16 +11,14 @@ UP024 [*] Replace aliased errors with `OSError` 7 | pass | help: Replace `EnvironmentError` with builtin `OSError` - -ℹ Safe fix -3 3 | # These should be fixed -4 4 | try: -5 5 | pass -6 |-except EnvironmentError: - 6 |+except OSError: -7 7 | pass -8 8 | -9 9 | try: +3 | # These should be fixed +4 | try: +5 | pass + - except EnvironmentError: +6 + except OSError: +7 | pass +8 | +9 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:11:8 @@ -32,16 +30,14 @@ UP024 [*] Replace aliased errors with `OSError` 12 | pass | help: Replace `IOError` with builtin `OSError` - -ℹ Safe fix -8 8 | -9 9 | try: -10 10 | pass -11 |-except IOError: - 11 |+except OSError: -12 12 | pass -13 13 | -14 14 | try: +8 | +9 | try: +10 | pass + - except IOError: +11 + except OSError: +12 | pass +13 | +14 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:16:8 @@ -53,16 +49,14 @@ UP024 [*] Replace aliased errors with `OSError` 17 | pass | help: Replace `WindowsError` with builtin `OSError` - -ℹ Safe fix -13 13 | -14 14 | try: -15 15 | pass -16 |-except WindowsError: - 16 |+except OSError: -17 17 | pass -18 18 | -19 19 | try: +13 | +14 | try: +15 | pass + - except WindowsError: +16 + except OSError: +17 | pass +18 | +19 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:21:8 @@ -74,16 +68,14 @@ UP024 [*] Replace aliased errors with `OSError` 22 | pass | help: Replace `mmap.error` with builtin `OSError` - -ℹ Safe fix -18 18 | -19 19 | try: -20 20 | pass -21 |-except mmap.error: - 21 |+except OSError: -22 22 | pass -23 23 | -24 24 | try: +18 | +19 | try: +20 | pass + - except mmap.error: +21 + except OSError: +22 | pass +23 | +24 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:26:8 @@ -95,16 +87,14 @@ UP024 [*] Replace aliased errors with `OSError` 27 | pass | help: Replace `select.error` with builtin `OSError` - -ℹ Safe fix -23 23 | -24 24 | try: -25 25 | pass -26 |-except select.error: - 26 |+except OSError: -27 27 | pass -28 28 | -29 29 | try: +23 | +24 | try: +25 | pass + - except select.error: +26 + except OSError: +27 | pass +28 | +29 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:31:8 @@ -116,16 +106,14 @@ UP024 [*] Replace aliased errors with `OSError` 32 | pass | help: Replace `socket.error` with builtin `OSError` - -ℹ Safe fix -28 28 | -29 29 | try: -30 30 | pass -31 |-except socket.error: - 31 |+except OSError: -32 32 | pass -33 33 | -34 34 | try: +28 | +29 | try: +30 | pass + - except socket.error: +31 + except OSError: +32 | pass +33 | +34 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:36:8 @@ -137,16 +125,14 @@ UP024 [*] Replace aliased errors with `OSError` 37 | pass | help: Replace `error` with builtin `OSError` - -ℹ Safe fix -33 33 | -34 34 | try: -35 35 | pass -36 |-except error: - 36 |+except OSError: -37 37 | pass -38 38 | -39 39 | # Should NOT be in parentheses when replaced +33 | +34 | try: +35 | pass + - except error: +36 + except OSError: +37 | pass +38 | +39 | # Should NOT be in parentheses when replaced UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:43:8 @@ -159,16 +145,14 @@ UP024 [*] Replace aliased errors with `OSError` 45 | try: | help: Replace with builtin `OSError` - -ℹ Safe fix -40 40 | -41 41 | try: -42 42 | pass -43 |-except (IOError,): - 43 |+except OSError: -44 44 | pass -45 45 | try: -46 46 | pass +40 | +41 | try: +42 | pass + - except (IOError,): +43 + except OSError: +44 | pass +45 | try: +46 | pass UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:47:8 @@ -181,16 +165,14 @@ UP024 [*] Replace aliased errors with `OSError` 49 | try: | help: Replace with builtin `OSError` - -ℹ Safe fix -44 44 | pass -45 45 | try: -46 46 | pass -47 |-except (mmap.error,): - 47 |+except OSError: -48 48 | pass -49 49 | try: -50 50 | pass +44 | pass +45 | try: +46 | pass + - except (mmap.error,): +47 + except OSError: +48 | pass +49 | try: +50 | pass UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:51:8 @@ -202,16 +184,14 @@ UP024 [*] Replace aliased errors with `OSError` 52 | pass | help: Replace with builtin `OSError` - -ℹ Safe fix -48 48 | pass -49 49 | try: -50 50 | pass -51 |-except (EnvironmentError, IOError, OSError, select.error): - 51 |+except OSError: -52 52 | pass -53 53 | -54 54 | # Should be kept in parentheses (because multiple) +48 | pass +49 | try: +50 | pass + - except (EnvironmentError, IOError, OSError, select.error): +51 + except OSError: +52 | pass +53 | +54 | # Should be kept in parentheses (because multiple) UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:58:8 @@ -223,16 +203,14 @@ UP024 [*] Replace aliased errors with `OSError` 59 | pass | help: Replace with builtin `OSError` - -ℹ Safe fix -55 55 | -56 56 | try: -57 57 | pass -58 |-except (IOError, KeyError, OSError): - 58 |+except (KeyError, OSError): -59 59 | pass -60 60 | -61 61 | # First should change, second should not +55 | +56 | try: +57 | pass + - except (IOError, KeyError, OSError): +58 + except (KeyError, OSError): +59 | pass +60 | +61 | # First should change, second should not UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:65:8 @@ -245,16 +223,14 @@ UP024 [*] Replace aliased errors with `OSError` 67 | # These should not change | help: Replace with builtin `OSError` - -ℹ Safe fix -62 62 | from .mmap import error -63 63 | try: -64 64 | pass -65 |-except (IOError, error): - 65 |+except (OSError, error): -66 66 | pass -67 67 | # These should not change -68 68 | +62 | from .mmap import error +63 | try: +64 | pass + - except (IOError, error): +65 + except (OSError, error): +66 | pass +67 | # These should not change +68 | UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:87:8 @@ -266,16 +242,14 @@ UP024 [*] Replace aliased errors with `OSError` 88 | pass | help: Replace `mmap.error` with builtin `OSError` - -ℹ Safe fix -84 84 | pass -85 85 | try: -86 86 | pass -87 |-except (mmap).error: - 87 |+except OSError: -88 88 | pass -89 89 | -90 90 | try: +84 | pass +85 | try: +86 | pass + - except (mmap).error: +87 + except OSError: +88 | pass +89 | +90 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:105:11 @@ -287,16 +261,14 @@ UP024 [*] Replace aliased errors with `OSError` 106 | msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex) | help: Replace with builtin `OSError` - -ℹ Safe fix -102 102 | def get_owner_id_from_mac_address(): -103 103 | try: -104 104 | mac_address = get_primary_mac_address() -105 |- except(IOError, OSError) as ex: - 105 |+ except OSError as ex: -106 106 | msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex) -107 107 | -108 108 | +102 | def get_owner_id_from_mac_address(): +103 | try: +104 | mac_address = get_primary_mac_address() + - except(IOError, OSError) as ex: +105 + except OSError as ex: +106 | msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex) +107 | +108 | UP024 [*] Replace aliased errors with `OSError` --> UP024_0.py:114:8 @@ -308,11 +280,9 @@ UP024 [*] Replace aliased errors with `OSError` 115 | pass | help: Replace `os.error` with builtin `OSError` - -ℹ Safe fix -111 111 | -112 112 | try: -113 113 | pass -114 |-except os.error: - 114 |+except OSError: -115 115 | pass +111 | +112 | try: +113 | pass + - except os.error: +114 + except OSError: +115 | pass diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap index 0f79af245f..3315a98eef 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap @@ -12,16 +12,14 @@ UP024 [*] Replace aliased errors with `OSError` 7 | except (OSError, socket.error, KeyError): | help: Replace with builtin `OSError` - -ℹ Safe fix -2 2 | -3 3 | try: -4 4 | pass -5 |-except (OSError, mmap.error, IOError): - 5 |+except OSError: -6 6 | pass -7 7 | except (OSError, socket.error, KeyError): -8 8 | pass +2 | +3 | try: +4 | pass + - except (OSError, mmap.error, IOError): +5 + except OSError: +6 | pass +7 | except (OSError, socket.error, KeyError): +8 | pass UP024 [*] Replace aliased errors with `OSError` --> UP024_1.py:7:8 @@ -33,16 +31,14 @@ UP024 [*] Replace aliased errors with `OSError` 8 | pass | help: Replace with builtin `OSError` - -ℹ Safe fix -4 4 | pass -5 5 | except (OSError, mmap.error, IOError): -6 6 | pass -7 |-except (OSError, socket.error, KeyError): - 7 |+except (OSError, KeyError): -8 8 | pass -9 9 | -10 10 | try: +4 | pass +5 | except (OSError, mmap.error, IOError): +6 | pass + - except (OSError, socket.error, KeyError): +7 + except (OSError, KeyError): +8 | pass +9 | +10 | try: UP024 [*] Replace aliased errors with `OSError` --> UP024_1.py:12:8 @@ -59,15 +55,13 @@ UP024 [*] Replace aliased errors with `OSError` 17 | pass | help: Replace with builtin `OSError` - -ℹ Safe fix -9 9 | -10 10 | try: -11 11 | pass -12 |-except ( -13 |- OSError, -14 |- select.error, -15 |- IOError, -16 |-): - 12 |+except OSError: -17 13 | pass +9 | +10 | try: +11 | pass + - except ( + - OSError, + - select.error, + - IOError, + - ): +12 + except OSError: +13 | pass diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap index 6f60ec07fd..9c899f5fb3 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_2.py.snap @@ -12,16 +12,14 @@ UP024 [*] Replace aliased errors with `OSError` 12 | raise select.error | help: Replace `socket.error` with builtin `OSError` - -ℹ Safe fix -7 7 | -8 8 | # Testing the modules -9 9 | import socket, mmap, select, resource -10 |-raise socket.error - 10 |+raise OSError -11 11 | raise mmap.error -12 12 | raise select.error -13 13 | raise resource.error +7 | +8 | # Testing the modules +9 | import socket, mmap, select, resource + - raise socket.error +10 + raise OSError +11 | raise mmap.error +12 | raise select.error +13 | raise resource.error UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:11:7 @@ -34,16 +32,14 @@ UP024 [*] Replace aliased errors with `OSError` 13 | raise resource.error | help: Replace `mmap.error` with builtin `OSError` - -ℹ Safe fix -8 8 | # Testing the modules -9 9 | import socket, mmap, select, resource -10 10 | raise socket.error -11 |-raise mmap.error - 11 |+raise OSError -12 12 | raise select.error -13 13 | raise resource.error -14 14 | +8 | # Testing the modules +9 | import socket, mmap, select, resource +10 | raise socket.error + - raise mmap.error +11 + raise OSError +12 | raise select.error +13 | raise resource.error +14 | UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:12:7 @@ -55,16 +51,14 @@ UP024 [*] Replace aliased errors with `OSError` 13 | raise resource.error | help: Replace `select.error` with builtin `OSError` - -ℹ Safe fix -9 9 | import socket, mmap, select, resource -10 10 | raise socket.error -11 11 | raise mmap.error -12 |-raise select.error - 12 |+raise OSError -13 13 | raise resource.error -14 14 | -15 15 | raise socket.error() +9 | import socket, mmap, select, resource +10 | raise socket.error +11 | raise mmap.error + - raise select.error +12 + raise OSError +13 | raise resource.error +14 | +15 | raise socket.error() UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:13:7 @@ -77,16 +71,14 @@ UP024 [*] Replace aliased errors with `OSError` 15 | raise socket.error() | help: Replace `resource.error` with builtin `OSError` - -ℹ Safe fix -10 10 | raise socket.error -11 11 | raise mmap.error -12 12 | raise select.error -13 |-raise resource.error - 13 |+raise OSError -14 14 | -15 15 | raise socket.error() -16 16 | raise mmap.error(1) +10 | raise socket.error +11 | raise mmap.error +12 | raise select.error + - raise resource.error +13 + raise OSError +14 | +15 | raise socket.error() +16 | raise mmap.error(1) UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:15:7 @@ -99,16 +91,14 @@ UP024 [*] Replace aliased errors with `OSError` 17 | raise select.error(1, 2) | help: Replace `socket.error` with builtin `OSError` - -ℹ Safe fix -12 12 | raise select.error -13 13 | raise resource.error -14 14 | -15 |-raise socket.error() - 15 |+raise OSError() -16 16 | raise mmap.error(1) -17 17 | raise select.error(1, 2) -18 18 | raise resource.error(1, "strerror", "filename") +12 | raise select.error +13 | raise resource.error +14 | + - raise socket.error() +15 + raise OSError() +16 | raise mmap.error(1) +17 | raise select.error(1, 2) +18 | raise resource.error(1, "strerror", "filename") UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:16:7 @@ -120,16 +110,14 @@ UP024 [*] Replace aliased errors with `OSError` 18 | raise resource.error(1, "strerror", "filename") | help: Replace `mmap.error` with builtin `OSError` - -ℹ Safe fix -13 13 | raise resource.error -14 14 | -15 15 | raise socket.error() -16 |-raise mmap.error(1) - 16 |+raise OSError(1) -17 17 | raise select.error(1, 2) -18 18 | raise resource.error(1, "strerror", "filename") -19 19 | +13 | raise resource.error +14 | +15 | raise socket.error() + - raise mmap.error(1) +16 + raise OSError(1) +17 | raise select.error(1, 2) +18 | raise resource.error(1, "strerror", "filename") +19 | UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:17:7 @@ -141,16 +129,14 @@ UP024 [*] Replace aliased errors with `OSError` 18 | raise resource.error(1, "strerror", "filename") | help: Replace `select.error` with builtin `OSError` - -ℹ Safe fix -14 14 | -15 15 | raise socket.error() -16 16 | raise mmap.error(1) -17 |-raise select.error(1, 2) - 17 |+raise OSError(1, 2) -18 18 | raise resource.error(1, "strerror", "filename") -19 19 | -20 20 | raise socket.error( +14 | +15 | raise socket.error() +16 | raise mmap.error(1) + - raise select.error(1, 2) +17 + raise OSError(1, 2) +18 | raise resource.error(1, "strerror", "filename") +19 | +20 | raise socket.error( UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:18:7 @@ -163,16 +149,14 @@ UP024 [*] Replace aliased errors with `OSError` 20 | raise socket.error( | help: Replace `resource.error` with builtin `OSError` - -ℹ Safe fix -15 15 | raise socket.error() -16 16 | raise mmap.error(1) -17 17 | raise select.error(1, 2) -18 |-raise resource.error(1, "strerror", "filename") - 18 |+raise OSError(1, "strerror", "filename") -19 19 | -20 20 | raise socket.error( -21 21 | 1, +15 | raise socket.error() +16 | raise mmap.error(1) +17 | raise select.error(1, 2) + - raise resource.error(1, "strerror", "filename") +18 + raise OSError(1, "strerror", "filename") +19 | +20 | raise socket.error( +21 | 1, UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:20:7 @@ -185,16 +169,14 @@ UP024 [*] Replace aliased errors with `OSError` 22 | 2, | help: Replace `socket.error` with builtin `OSError` - -ℹ Safe fix -17 17 | raise select.error(1, 2) -18 18 | raise resource.error(1, "strerror", "filename") -19 19 | -20 |-raise socket.error( - 20 |+raise OSError( -21 21 | 1, -22 22 | 2, -23 23 | 3, +17 | raise select.error(1, 2) +18 | raise resource.error(1, "strerror", "filename") +19 | + - raise socket.error( +20 + raise OSError( +21 | 1, +22 | 2, +23 | 3, UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:27:7 @@ -206,16 +188,14 @@ UP024 [*] Replace aliased errors with `OSError` 29 | from socket import error | help: Replace `error` with builtin `OSError` - -ℹ Safe fix -24 24 | ) -25 25 | -26 26 | from mmap import error -27 |-raise error - 27 |+raise OSError -28 28 | -29 29 | from socket import error -30 30 | raise error(1) +24 | ) +25 | +26 | from mmap import error + - raise error +27 + raise OSError +28 | +29 | from socket import error +30 | raise error(1) UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:30:7 @@ -227,16 +207,14 @@ UP024 [*] Replace aliased errors with `OSError` 32 | from select import error | help: Replace `error` with builtin `OSError` - -ℹ Safe fix -27 27 | raise error -28 28 | -29 29 | from socket import error -30 |-raise error(1) - 30 |+raise OSError(1) -31 31 | -32 32 | from select import error -33 33 | raise error(1, 2) +27 | raise error +28 | +29 | from socket import error + - raise error(1) +30 + raise OSError(1) +31 | +32 | from select import error +33 | raise error(1, 2) UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:33:7 @@ -248,16 +226,14 @@ UP024 [*] Replace aliased errors with `OSError` 35 | from resource import error | help: Replace `error` with builtin `OSError` - -ℹ Safe fix -30 30 | raise error(1) -31 31 | -32 32 | from select import error -33 |-raise error(1, 2) - 33 |+raise OSError(1, 2) -34 34 | -35 35 | from resource import error -36 36 | raise error(1, "strerror", "filename") +30 | raise error(1) +31 | +32 | from select import error + - raise error(1, 2) +33 + raise OSError(1, 2) +34 | +35 | from resource import error +36 | raise error(1, "strerror", "filename") UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:36:7 @@ -269,16 +245,14 @@ UP024 [*] Replace aliased errors with `OSError` 38 | # Testing the names | help: Replace `error` with builtin `OSError` - -ℹ Safe fix -33 33 | raise error(1, 2) -34 34 | -35 35 | from resource import error -36 |-raise error(1, "strerror", "filename") - 36 |+raise OSError(1, "strerror", "filename") -37 37 | -38 38 | # Testing the names -39 39 | raise EnvironmentError +33 | raise error(1, 2) +34 | +35 | from resource import error + - raise error(1, "strerror", "filename") +36 + raise OSError(1, "strerror", "filename") +37 | +38 | # Testing the names +39 | raise EnvironmentError UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:39:7 @@ -290,16 +264,14 @@ UP024 [*] Replace aliased errors with `OSError` 41 | raise WindowsError | help: Replace `EnvironmentError` with builtin `OSError` - -ℹ Safe fix -36 36 | raise error(1, "strerror", "filename") -37 37 | -38 38 | # Testing the names -39 |-raise EnvironmentError - 39 |+raise OSError -40 40 | raise IOError -41 41 | raise WindowsError -42 42 | +36 | raise error(1, "strerror", "filename") +37 | +38 | # Testing the names + - raise EnvironmentError +39 + raise OSError +40 | raise IOError +41 | raise WindowsError +42 | UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:40:7 @@ -311,16 +283,14 @@ UP024 [*] Replace aliased errors with `OSError` 41 | raise WindowsError | help: Replace `IOError` with builtin `OSError` - -ℹ Safe fix -37 37 | -38 38 | # Testing the names -39 39 | raise EnvironmentError -40 |-raise IOError - 40 |+raise OSError -41 41 | raise WindowsError -42 42 | -43 43 | raise EnvironmentError() +37 | +38 | # Testing the names +39 | raise EnvironmentError + - raise IOError +40 + raise OSError +41 | raise WindowsError +42 | +43 | raise EnvironmentError() UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:41:7 @@ -333,16 +303,14 @@ UP024 [*] Replace aliased errors with `OSError` 43 | raise EnvironmentError() | help: Replace `WindowsError` with builtin `OSError` - -ℹ Safe fix -38 38 | # Testing the names -39 39 | raise EnvironmentError -40 40 | raise IOError -41 |-raise WindowsError - 41 |+raise OSError -42 42 | -43 43 | raise EnvironmentError() -44 44 | raise IOError(1) +38 | # Testing the names +39 | raise EnvironmentError +40 | raise IOError + - raise WindowsError +41 + raise OSError +42 | +43 | raise EnvironmentError() +44 | raise IOError(1) UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:43:7 @@ -355,16 +323,14 @@ UP024 [*] Replace aliased errors with `OSError` 45 | raise WindowsError(1, 2) | help: Replace `EnvironmentError` with builtin `OSError` - -ℹ Safe fix -40 40 | raise IOError -41 41 | raise WindowsError -42 42 | -43 |-raise EnvironmentError() - 43 |+raise OSError() -44 44 | raise IOError(1) -45 45 | raise WindowsError(1, 2) -46 46 | +40 | raise IOError +41 | raise WindowsError +42 | + - raise EnvironmentError() +43 + raise OSError() +44 | raise IOError(1) +45 | raise WindowsError(1, 2) +46 | UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:44:7 @@ -375,16 +341,14 @@ UP024 [*] Replace aliased errors with `OSError` 45 | raise WindowsError(1, 2) | help: Replace `IOError` with builtin `OSError` - -ℹ Safe fix -41 41 | raise WindowsError -42 42 | -43 43 | raise EnvironmentError() -44 |-raise IOError(1) - 44 |+raise OSError(1) -45 45 | raise WindowsError(1, 2) -46 46 | -47 47 | raise EnvironmentError( +41 | raise WindowsError +42 | +43 | raise EnvironmentError() + - raise IOError(1) +44 + raise OSError(1) +45 | raise WindowsError(1, 2) +46 | +47 | raise EnvironmentError( UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:45:7 @@ -397,16 +361,14 @@ UP024 [*] Replace aliased errors with `OSError` 47 | raise EnvironmentError( | help: Replace `WindowsError` with builtin `OSError` - -ℹ Safe fix -42 42 | -43 43 | raise EnvironmentError() -44 44 | raise IOError(1) -45 |-raise WindowsError(1, 2) - 45 |+raise OSError(1, 2) -46 46 | -47 47 | raise EnvironmentError( -48 48 | 1, +42 | +43 | raise EnvironmentError() +44 | raise IOError(1) + - raise WindowsError(1, 2) +45 + raise OSError(1, 2) +46 | +47 | raise EnvironmentError( +48 | 1, UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:47:7 @@ -419,16 +381,14 @@ UP024 [*] Replace aliased errors with `OSError` 49 | 2, | help: Replace `EnvironmentError` with builtin `OSError` - -ℹ Safe fix -44 44 | raise IOError(1) -45 45 | raise WindowsError(1, 2) -46 46 | -47 |-raise EnvironmentError( - 47 |+raise OSError( -48 48 | 1, -49 49 | 2, -50 50 | 3, +44 | raise IOError(1) +45 | raise WindowsError(1, 2) +46 | + - raise EnvironmentError( +47 + raise OSError( +48 | 1, +49 | 2, +50 | 3, UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:53:7 @@ -441,15 +401,13 @@ UP024 [*] Replace aliased errors with `OSError` 55 | raise IOError(1, 2) | help: Replace `WindowsError` with builtin `OSError` - -ℹ Safe fix -50 50 | 3, -51 51 | ) -52 52 | -53 |-raise WindowsError - 53 |+raise OSError -54 54 | raise EnvironmentError(1) -55 55 | raise IOError(1, 2) +50 | 3, +51 | ) +52 | + - raise WindowsError +53 + raise OSError +54 | raise EnvironmentError(1) +55 | raise IOError(1, 2) UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:54:7 @@ -460,14 +418,12 @@ UP024 [*] Replace aliased errors with `OSError` 55 | raise IOError(1, 2) | help: Replace `EnvironmentError` with builtin `OSError` - -ℹ Safe fix -51 51 | ) -52 52 | -53 53 | raise WindowsError -54 |-raise EnvironmentError(1) - 54 |+raise OSError(1) -55 55 | raise IOError(1, 2) +51 | ) +52 | +53 | raise WindowsError + - raise EnvironmentError(1) +54 + raise OSError(1) +55 | raise IOError(1, 2) UP024 [*] Replace aliased errors with `OSError` --> UP024_2.py:55:7 @@ -478,10 +434,8 @@ UP024 [*] Replace aliased errors with `OSError` | ^^^^^^^ | help: Replace `IOError` with builtin `OSError` - -ℹ Safe fix -52 52 | -53 53 | raise WindowsError -54 54 | raise EnvironmentError(1) -55 |-raise IOError(1, 2) - 55 |+raise OSError(1, 2) +52 | +53 | raise WindowsError +54 | raise EnvironmentError(1) + - raise IOError(1, 2) +55 + raise OSError(1, 2) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap index 010982c8f1..997357adab 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap @@ -11,11 +11,9 @@ UP024 [*] Replace aliased errors with `OSError` 10 | return HttpResponseServerError("cache: cannot connect to broker.") | help: Replace with builtin `OSError` - -ℹ Safe fix -6 6 | conn = Connection(settings.CELERY_BROKER_URL) -7 7 | conn.ensure_connection(max_retries=2) -8 8 | conn._close() -9 |-except (socket.error, exceptions.OperationalError): - 9 |+except (OSError, exceptions.OperationalError): -10 10 | return HttpResponseServerError("cache: cannot connect to broker.") +6 | conn = Connection(settings.CELERY_BROKER_URL) +7 | conn.ensure_connection(max_retries=2) +8 | conn._close() + - except (socket.error, exceptions.OperationalError): +9 + except (OSError, exceptions.OperationalError): +10 | return HttpResponseServerError("cache: cannot connect to broker.") diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap index 5fc2ff59e5..529aea1b2a 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP025.py.snap @@ -10,13 +10,11 @@ UP025 [*] Remove unicode literals from strings 3 | x = u"Hello" # UP025 | help: Remove unicode prefix - -ℹ Safe fix -1 |-u"Hello" - 1 |+"Hello" -2 2 | -3 3 | x = u"Hello" # UP025 -4 4 | + - u"Hello" +1 + "Hello" +2 | +3 | x = u"Hello" # UP025 +4 | UP025 [*] Remove unicode literals from strings --> UP025.py:3:5 @@ -29,15 +27,13 @@ UP025 [*] Remove unicode literals from strings 5 | u'world' # UP025 | help: Remove unicode prefix - -ℹ Safe fix -1 1 | u"Hello" -2 2 | -3 |-x = u"Hello" # UP025 - 3 |+x = "Hello" # UP025 -4 4 | -5 5 | u'world' # UP025 -6 6 | +1 | u"Hello" +2 | + - x = u"Hello" # UP025 +3 + x = "Hello" # UP025 +4 | +5 | u'world' # UP025 +6 | UP025 [*] Remove unicode literals from strings --> UP025.py:5:1 @@ -50,16 +46,14 @@ UP025 [*] Remove unicode literals from strings 7 | print(u"Hello") # UP025 | help: Remove unicode prefix - -ℹ Safe fix -2 2 | -3 3 | x = u"Hello" # UP025 -4 4 | -5 |-u'world' # UP025 - 5 |+'world' # UP025 -6 6 | -7 7 | print(u"Hello") # UP025 -8 8 | +2 | +3 | x = u"Hello" # UP025 +4 | + - u'world' # UP025 +5 + 'world' # UP025 +6 | +7 | print(u"Hello") # UP025 +8 | UP025 [*] Remove unicode literals from strings --> UP025.py:7:7 @@ -72,16 +66,14 @@ UP025 [*] Remove unicode literals from strings 9 | print(u'world') # UP025 | help: Remove unicode prefix - -ℹ Safe fix -4 4 | -5 5 | u'world' # UP025 -6 6 | -7 |-print(u"Hello") # UP025 - 7 |+print("Hello") # UP025 -8 8 | -9 9 | print(u'world') # UP025 -10 10 | +4 | +5 | u'world' # UP025 +6 | + - print(u"Hello") # UP025 +7 + print("Hello") # UP025 +8 | +9 | print(u'world') # UP025 +10 | UP025 [*] Remove unicode literals from strings --> UP025.py:9:7 @@ -94,16 +86,14 @@ UP025 [*] Remove unicode literals from strings 11 | import foo | help: Remove unicode prefix - -ℹ Safe fix -6 6 | -7 7 | print(u"Hello") # UP025 -8 8 | -9 |-print(u'world') # UP025 - 9 |+print('world') # UP025 -10 10 | -11 11 | import foo -12 12 | +6 | +7 | print(u"Hello") # UP025 +8 | + - print(u'world') # UP025 +9 + print('world') # UP025 +10 | +11 | import foo +12 | UP025 [*] Remove unicode literals from strings --> UP025.py:13:5 @@ -116,16 +106,14 @@ UP025 [*] Remove unicode literals from strings 15 | # Retain quotes when fixing. | help: Remove unicode prefix - -ℹ Safe fix -10 10 | -11 11 | import foo -12 12 | -13 |-foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 - 13 |+foo("Hello", U"world", a=u"Hello", b=u"world") # UP025 -14 14 | -15 15 | # Retain quotes when fixing. -16 16 | x = u'hello' # UP025 +10 | +11 | import foo +12 | + - foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 +13 + foo("Hello", U"world", a=u"Hello", b=u"world") # UP025 +14 | +15 | # Retain quotes when fixing. +16 | x = u'hello' # UP025 UP025 [*] Remove unicode literals from strings --> UP025.py:13:15 @@ -138,16 +126,14 @@ UP025 [*] Remove unicode literals from strings 15 | # Retain quotes when fixing. | help: Remove unicode prefix - -ℹ Safe fix -10 10 | -11 11 | import foo -12 12 | -13 |-foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 - 13 |+foo(u"Hello", "world", a=u"Hello", b=u"world") # UP025 -14 14 | -15 15 | # Retain quotes when fixing. -16 16 | x = u'hello' # UP025 +10 | +11 | import foo +12 | + - foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 +13 + foo(u"Hello", "world", a=u"Hello", b=u"world") # UP025 +14 | +15 | # Retain quotes when fixing. +16 | x = u'hello' # UP025 UP025 [*] Remove unicode literals from strings --> UP025.py:13:27 @@ -160,16 +146,14 @@ UP025 [*] Remove unicode literals from strings 15 | # Retain quotes when fixing. | help: Remove unicode prefix - -ℹ Safe fix -10 10 | -11 11 | import foo -12 12 | -13 |-foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 - 13 |+foo(u"Hello", U"world", a="Hello", b=u"world") # UP025 -14 14 | -15 15 | # Retain quotes when fixing. -16 16 | x = u'hello' # UP025 +10 | +11 | import foo +12 | + - foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 +13 + foo(u"Hello", U"world", a="Hello", b=u"world") # UP025 +14 | +15 | # Retain quotes when fixing. +16 | x = u'hello' # UP025 UP025 [*] Remove unicode literals from strings --> UP025.py:13:39 @@ -182,16 +166,14 @@ UP025 [*] Remove unicode literals from strings 15 | # Retain quotes when fixing. | help: Remove unicode prefix - -ℹ Safe fix -10 10 | -11 11 | import foo -12 12 | -13 |-foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 - 13 |+foo(u"Hello", U"world", a=u"Hello", b="world") # UP025 -14 14 | -15 15 | # Retain quotes when fixing. -16 16 | x = u'hello' # UP025 +10 | +11 | import foo +12 | + - foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 +13 + foo(u"Hello", U"world", a=u"Hello", b="world") # UP025 +14 | +15 | # Retain quotes when fixing. +16 | x = u'hello' # UP025 UP025 [*] Remove unicode literals from strings --> UP025.py:16:5 @@ -203,16 +185,14 @@ UP025 [*] Remove unicode literals from strings 18 | x = u'''hello''' # UP025 | help: Remove unicode prefix - -ℹ Safe fix -13 13 | foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 -14 14 | -15 15 | # Retain quotes when fixing. -16 |-x = u'hello' # UP025 - 16 |+x = 'hello' # UP025 -17 17 | x = u"""hello""" # UP025 -18 18 | x = u'''hello''' # UP025 -19 19 | x = u'Hello "World"' # UP025 +13 | foo(u"Hello", U"world", a=u"Hello", b=u"world") # UP025 +14 | +15 | # Retain quotes when fixing. + - x = u'hello' # UP025 +16 + x = 'hello' # UP025 +17 | x = u"""hello""" # UP025 +18 | x = u'''hello''' # UP025 +19 | x = u'Hello "World"' # UP025 UP025 [*] Remove unicode literals from strings --> UP025.py:17:5 @@ -225,16 +205,14 @@ UP025 [*] Remove unicode literals from strings 19 | x = u'Hello "World"' # UP025 | help: Remove unicode prefix - -ℹ Safe fix -14 14 | -15 15 | # Retain quotes when fixing. -16 16 | x = u'hello' # UP025 -17 |-x = u"""hello""" # UP025 - 17 |+x = """hello""" # UP025 -18 18 | x = u'''hello''' # UP025 -19 19 | x = u'Hello "World"' # UP025 -20 20 | +14 | +15 | # Retain quotes when fixing. +16 | x = u'hello' # UP025 + - x = u"""hello""" # UP025 +17 + x = """hello""" # UP025 +18 | x = u'''hello''' # UP025 +19 | x = u'Hello "World"' # UP025 +20 | UP025 [*] Remove unicode literals from strings --> UP025.py:18:5 @@ -246,16 +224,14 @@ UP025 [*] Remove unicode literals from strings 19 | x = u'Hello "World"' # UP025 | help: Remove unicode prefix - -ℹ Safe fix -15 15 | # Retain quotes when fixing. -16 16 | x = u'hello' # UP025 -17 17 | x = u"""hello""" # UP025 -18 |-x = u'''hello''' # UP025 - 18 |+x = '''hello''' # UP025 -19 19 | x = u'Hello "World"' # UP025 -20 20 | -21 21 | u = "Hello" # OK +15 | # Retain quotes when fixing. +16 | x = u'hello' # UP025 +17 | x = u"""hello""" # UP025 + - x = u'''hello''' # UP025 +18 + x = '''hello''' # UP025 +19 | x = u'Hello "World"' # UP025 +20 | +21 | u = "Hello" # OK UP025 [*] Remove unicode literals from strings --> UP025.py:19:5 @@ -268,16 +244,14 @@ UP025 [*] Remove unicode literals from strings 21 | u = "Hello" # OK | help: Remove unicode prefix - -ℹ Safe fix -16 16 | x = u'hello' # UP025 -17 17 | x = u"""hello""" # UP025 -18 18 | x = u'''hello''' # UP025 -19 |-x = u'Hello "World"' # UP025 - 19 |+x = 'Hello "World"' # UP025 -20 20 | -21 21 | u = "Hello" # OK -22 22 | u = u # OK +16 | x = u'hello' # UP025 +17 | x = u"""hello""" # UP025 +18 | x = u'''hello''' # UP025 + - x = u'Hello "World"' # UP025 +19 + x = 'Hello "World"' # UP025 +20 | +21 | u = "Hello" # OK +22 | u = u # OK UP025 [*] Remove unicode literals from strings --> UP025.py:27:7 @@ -289,16 +263,14 @@ UP025 [*] Remove unicode literals from strings 28 | f"foo" u"bar" # OK | help: Remove unicode prefix - -ℹ Safe fix -24 24 | def hello(): -25 25 | return"Hello" # OK -26 26 | -27 |-f"foo"u"bar" # OK - 27 |+f"foo" "bar" # OK -28 28 | f"foo" u"bar" # OK -29 29 | -30 30 | # https://github.com/astral-sh/ruff/issues/18895 +24 | def hello(): +25 | return"Hello" # OK +26 | + - f"foo"u"bar" # OK +27 + f"foo" "bar" # OK +28 | f"foo" u"bar" # OK +29 | +30 | # https://github.com/astral-sh/ruff/issues/18895 UP025 [*] Remove unicode literals from strings --> UP025.py:28:8 @@ -310,16 +282,14 @@ UP025 [*] Remove unicode literals from strings 30 | # https://github.com/astral-sh/ruff/issues/18895 | help: Remove unicode prefix - -ℹ Safe fix -25 25 | return"Hello" # OK -26 26 | -27 27 | f"foo"u"bar" # OK -28 |-f"foo" u"bar" # OK - 28 |+f"foo" "bar" # OK -29 29 | -30 30 | # https://github.com/astral-sh/ruff/issues/18895 -31 31 | ""u"" +25 | return"Hello" # OK +26 | +27 | f"foo"u"bar" # OK + - f"foo" u"bar" # OK +28 + f"foo" "bar" # OK +29 | +30 | # https://github.com/astral-sh/ruff/issues/18895 +31 | ""u"" UP025 [*] Remove unicode literals from strings --> UP025.py:31:3 @@ -331,16 +301,14 @@ UP025 [*] Remove unicode literals from strings 33 | """"""""""""""""""""u"hi" | help: Remove unicode prefix - -ℹ Safe fix -28 28 | f"foo" u"bar" # OK -29 29 | -30 30 | # https://github.com/astral-sh/ruff/issues/18895 -31 |-""u"" - 31 |+"" "" -32 32 | ""u"hi" -33 33 | """"""""""""""""""""u"hi" -34 34 | ""U"helloooo" +28 | f"foo" u"bar" # OK +29 | +30 | # https://github.com/astral-sh/ruff/issues/18895 + - ""u"" +31 + "" "" +32 | ""u"hi" +33 | """"""""""""""""""""u"hi" +34 | ""U"helloooo" UP025 [*] Remove unicode literals from strings --> UP025.py:32:3 @@ -353,15 +321,13 @@ UP025 [*] Remove unicode literals from strings 34 | ""U"helloooo" | help: Remove unicode prefix - -ℹ Safe fix -29 29 | -30 30 | # https://github.com/astral-sh/ruff/issues/18895 -31 31 | ""u"" -32 |-""u"hi" - 32 |+"" "hi" -33 33 | """"""""""""""""""""u"hi" -34 34 | ""U"helloooo" +29 | +30 | # https://github.com/astral-sh/ruff/issues/18895 +31 | ""u"" + - ""u"hi" +32 + "" "hi" +33 | """"""""""""""""""""u"hi" +34 | ""U"helloooo" UP025 [*] Remove unicode literals from strings --> UP025.py:33:21 @@ -373,14 +339,12 @@ UP025 [*] Remove unicode literals from strings 34 | ""U"helloooo" | help: Remove unicode prefix - -ℹ Safe fix -30 30 | # https://github.com/astral-sh/ruff/issues/18895 -31 31 | ""u"" -32 32 | ""u"hi" -33 |-""""""""""""""""""""u"hi" - 33 |+"""""""""""""""""""" "hi" -34 34 | ""U"helloooo" +30 | # https://github.com/astral-sh/ruff/issues/18895 +31 | ""u"" +32 | ""u"hi" + - """"""""""""""""""""u"hi" +33 + """""""""""""""""""" "hi" +34 | ""U"helloooo" UP025 [*] Remove unicode literals from strings --> UP025.py:34:3 @@ -391,10 +355,8 @@ UP025 [*] Remove unicode literals from strings | ^^^^^^^^^^^ | help: Remove unicode prefix - -ℹ Safe fix -31 31 | ""u"" -32 32 | ""u"hi" -33 33 | """"""""""""""""""""u"hi" -34 |-""U"helloooo" - 34 |+"" "helloooo" +31 | ""u"" +32 | ""u"hi" +33 | """"""""""""""""""""u"hi" + - ""U"helloooo" +34 + "" "helloooo" diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap index 33ff29dad7..b78d9cd51d 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP026.py.snap @@ -12,15 +12,13 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 5 | # Error (`from unittest import mock`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -1 1 | # Error (`from unittest import mock`) -2 2 | if True: -3 |- import mock - 3 |+ from unittest import mock -4 4 | -5 5 | # Error (`from unittest import mock`) -6 6 | if True: +1 | # Error (`from unittest import mock`) +2 | if True: + - import mock +3 + from unittest import mock +4 | +5 | # Error (`from unittest import mock`) +6 | if True: UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:7:12 @@ -33,17 +31,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 9 | # Error (`from unittest.mock import *`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -4 4 | -5 5 | # Error (`from unittest import mock`) -6 6 | if True: -7 |- import mock, sys - 7 |+ import sys - 8 |+ from unittest import mock -8 9 | -9 10 | # Error (`from unittest.mock import *`) -10 11 | if True: +4 | +5 | # Error (`from unittest import mock`) +6 | if True: + - import mock, sys +7 + import sys +8 + from unittest import mock +9 | +10 | # Error (`from unittest.mock import *`) +11 | if True: UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:11:5 @@ -56,16 +52,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 13 | # Error (`from unittest import mock`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -8 8 | -9 9 | # Error (`from unittest.mock import *`) -10 10 | if True: -11 |- from mock import * - 11 |+ from unittest.mock import * -12 12 | -13 13 | # Error (`from unittest import mock`) -14 14 | import mock.mock +8 | +9 | # Error (`from unittest.mock import *`) +10 | if True: + - from mock import * +11 + from unittest.mock import * +12 | +13 | # Error (`from unittest import mock`) +14 | import mock.mock UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:14:8 @@ -77,16 +71,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 16 | # Error (`from unittest import mock`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -11 11 | from mock import * -12 12 | -13 13 | # Error (`from unittest import mock`) -14 |-import mock.mock - 14 |+from unittest import mock -15 15 | -16 16 | # Error (`from unittest import mock`) -17 17 | import contextlib, mock, sys +11 | from mock import * +12 | +13 | # Error (`from unittest import mock`) + - import mock.mock +14 + from unittest import mock +15 | +16 | # Error (`from unittest import mock`) +17 | import contextlib, mock, sys UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:17:20 @@ -98,17 +90,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 19 | # Error (`from unittest import mock`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -14 14 | import mock.mock -15 15 | -16 16 | # Error (`from unittest import mock`) -17 |-import contextlib, mock, sys - 17 |+import contextlib, sys - 18 |+from unittest import mock -18 19 | -19 20 | # Error (`from unittest import mock`) -20 21 | import mock, sys +14 | import mock.mock +15 | +16 | # Error (`from unittest import mock`) + - import contextlib, mock, sys +17 + import contextlib, sys +18 + from unittest import mock +19 | +20 | # Error (`from unittest import mock`) +21 | import mock, sys UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:20:8 @@ -119,17 +109,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 21 | x = "This code should be preserved one line below the mock" | help: Import from `unittest.mock` instead - -ℹ Safe fix -17 17 | import contextlib, mock, sys -18 18 | -19 19 | # Error (`from unittest import mock`) -20 |-import mock, sys - 20 |+import sys - 21 |+from unittest import mock -21 22 | x = "This code should be preserved one line below the mock" -22 23 | -23 24 | # Error (`from unittest import mock`) +17 | import contextlib, mock, sys +18 | +19 | # Error (`from unittest import mock`) + - import mock, sys +20 + import sys +21 + from unittest import mock +22 | x = "This code should be preserved one line below the mock" +23 | +24 | # Error (`from unittest import mock`) UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:24:1 @@ -141,16 +129,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 26 | # Error (keep trailing comma) | help: Import from `unittest.mock` instead - -ℹ Safe fix -21 21 | x = "This code should be preserved one line below the mock" -22 22 | -23 23 | # Error (`from unittest import mock`) -24 |-from mock import mock - 24 |+from unittest import mock -25 25 | -26 26 | # Error (keep trailing comma) -27 27 | from mock import ( +21 | x = "This code should be preserved one line below the mock" +22 | +23 | # Error (`from unittest import mock`) + - from mock import mock +24 + from unittest import mock +25 | +26 | # Error (keep trailing comma) +27 | from mock import ( UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:27:1 @@ -167,22 +153,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 34 | a, | help: Import from `unittest.mock` instead - -ℹ Safe fix -24 24 | from mock import mock -25 25 | -26 26 | # Error (keep trailing comma) -27 |-from mock import ( -28 |- mock, - 27 |+from unittest.mock import ( -29 28 | a, -30 29 | b, -31 30 | c, -32 31 | ) - 32 |+from unittest import mock -33 33 | from mock import ( -34 34 | a, -35 35 | b, +24 | from mock import mock +25 | +26 | # Error (keep trailing comma) + - from mock import ( + - mock, +27 + from unittest.mock import ( +28 | a, +29 | b, +30 | c, +31 | ) +32 + from unittest import mock +33 | from mock import ( +34 | a, +35 | b, UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:33:1 @@ -200,22 +184,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 40 | # Error (avoid trailing comma) | help: Import from `unittest.mock` instead - -ℹ Safe fix -30 30 | b, -31 31 | c, -32 32 | ) -33 |-from mock import ( - 33 |+from unittest.mock import ( -34 34 | a, -35 35 | b, -36 36 | c, -37 |- mock, -38 37 | ) - 38 |+from unittest import mock -39 39 | -40 40 | # Error (avoid trailing comma) -41 41 | from mock import ( +30 | b, +31 | c, +32 | ) + - from mock import ( +33 + from unittest.mock import ( +34 | a, +35 | b, +36 | c, + - mock, +37 | ) +38 + from unittest import mock +39 | +40 | # Error (avoid trailing comma) +41 | from mock import ( UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:41:1 @@ -232,22 +214,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 48 | a, | help: Import from `unittest.mock` instead - -ℹ Safe fix -38 38 | ) -39 39 | -40 40 | # Error (avoid trailing comma) -41 |-from mock import ( -42 |- mock, - 41 |+from unittest.mock import ( -43 42 | a, -44 43 | b, -45 44 | c -46 45 | ) - 46 |+from unittest import mock -47 47 | from mock import ( -48 48 | a, -49 49 | b, +38 | ) +39 | +40 | # Error (avoid trailing comma) + - from mock import ( + - mock, +41 + from unittest.mock import ( +42 | a, +43 | b, +44 | c +45 | ) +46 + from unittest import mock +47 | from mock import ( +48 | a, +49 | b, UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:47:1 @@ -265,23 +245,21 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 54 | from mock import a, b, c, mock | help: Import from `unittest.mock` instead - -ℹ Safe fix -44 44 | b, -45 45 | c -46 46 | ) -47 |-from mock import ( - 47 |+from unittest.mock import ( -48 48 | a, -49 49 | b, -50 |- c, -51 |- mock - 50 |+ c -52 51 | ) - 52 |+from unittest import mock -53 53 | from mock import mock, a, b, c -54 54 | from mock import a, b, c, mock -55 55 | +44 | b, +45 | c +46 | ) + - from mock import ( +47 + from unittest.mock import ( +48 | a, +49 | b, + - c, + - mock +50 + c +51 | ) +52 + from unittest import mock +53 | from mock import mock, a, b, c +54 | from mock import a, b, c, mock +55 | UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:53:1 @@ -293,17 +271,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 54 | from mock import a, b, c, mock | help: Import from `unittest.mock` instead - -ℹ Safe fix -50 50 | c, -51 51 | mock -52 52 | ) -53 |-from mock import mock, a, b, c - 53 |+from unittest.mock import a, b, c - 54 |+from unittest import mock -54 55 | from mock import a, b, c, mock -55 56 | -56 57 | if True: +50 | c, +51 | mock +52 | ) + - from mock import mock, a, b, c +53 + from unittest.mock import a, b, c +54 + from unittest import mock +55 | from mock import a, b, c, mock +56 | +57 | if True: UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:54:1 @@ -316,17 +292,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 56 | if True: | help: Import from `unittest.mock` instead - -ℹ Safe fix -51 51 | mock -52 52 | ) -53 53 | from mock import mock, a, b, c -54 |-from mock import a, b, c, mock - 54 |+from unittest.mock import a, b, c - 55 |+from unittest import mock -55 56 | -56 57 | if True: -57 58 | if False: +51 | mock +52 | ) +53 | from mock import mock, a, b, c + - from mock import a, b, c, mock +54 + from unittest.mock import a, b, c +55 + from unittest import mock +56 | +57 | if True: +58 | if False: UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:58:9 @@ -344,22 +318,20 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 65 | # OK | help: Import from `unittest.mock` instead - -ℹ Safe fix -55 55 | -56 56 | if True: -57 57 | if False: -58 |- from mock import ( -59 |- mock, - 58 |+ from unittest.mock import ( -60 59 | a, -61 60 | b, -62 61 | c -63 62 | ) - 63 |+ from unittest import mock -64 64 | -65 65 | # OK -66 66 | import os, io +55 | +56 | if True: +57 | if False: + - from mock import ( + - mock, +58 + from unittest.mock import ( +59 | a, +60 | b, +61 | c +62 | ) +63 + from unittest import mock +64 | +65 | # OK +66 | import os, io UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:69:8 @@ -371,17 +343,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 71 | # Error (`from unittest import mock as foo`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -66 66 | import os, io -67 67 | -68 68 | # Error (`from unittest import mock`) -69 |-import mock, mock - 69 |+from unittest import mock - 70 |+from unittest import mock -70 71 | -71 72 | # Error (`from unittest import mock as foo`) -72 73 | import mock as foo +66 | import os, io +67 | +68 | # Error (`from unittest import mock`) + - import mock, mock +69 + from unittest import mock +70 + from unittest import mock +71 | +72 | # Error (`from unittest import mock as foo`) +73 | import mock as foo UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:69:14 @@ -393,17 +363,15 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 71 | # Error (`from unittest import mock as foo`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -66 66 | import os, io -67 67 | -68 68 | # Error (`from unittest import mock`) -69 |-import mock, mock - 69 |+from unittest import mock - 70 |+from unittest import mock -70 71 | -71 72 | # Error (`from unittest import mock as foo`) -72 73 | import mock as foo +66 | import os, io +67 | +68 | # Error (`from unittest import mock`) + - import mock, mock +69 + from unittest import mock +70 + from unittest import mock +71 | +72 | # Error (`from unittest import mock as foo`) +73 | import mock as foo UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:72:8 @@ -415,16 +383,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 74 | # Error (`from unittest import mock as foo`) | help: Import from `unittest.mock` instead - -ℹ Safe fix -69 69 | import mock, mock -70 70 | -71 71 | # Error (`from unittest import mock as foo`) -72 |-import mock as foo - 72 |+from unittest import mock as foo -73 73 | -74 74 | # Error (`from unittest import mock as foo`) -75 75 | from mock import mock as foo +69 | import mock, mock +70 | +71 | # Error (`from unittest import mock as foo`) + - import mock as foo +72 + from unittest import mock as foo +73 | +74 | # Error (`from unittest import mock as foo`) +75 | from mock import mock as foo UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:75:1 @@ -436,16 +402,14 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 77 | if True: | help: Import from `unittest.mock` instead - -ℹ Safe fix -72 72 | import mock as foo -73 73 | -74 74 | # Error (`from unittest import mock as foo`) -75 |-from mock import mock as foo - 75 |+from unittest import mock as foo -76 76 | -77 77 | if True: -78 78 | # This should yield multiple, aliased imports. +72 | import mock as foo +73 | +74 | # Error (`from unittest import mock as foo`) + - from mock import mock as foo +75 + from unittest import mock as foo +76 | +77 | if True: +78 | # This should yield multiple, aliased imports. UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:79:12 @@ -458,18 +422,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 81 | # This should yield multiple, aliased imports, and preserve `os`. | help: Import from `unittest.mock` instead - -ℹ Safe fix -76 76 | -77 77 | if True: -78 78 | # This should yield multiple, aliased imports. -79 |- import mock as foo, mock as bar, mock - 79 |+ from unittest import mock as foo - 80 |+ from unittest import mock as bar - 81 |+ from unittest import mock -80 82 | -81 83 | # This should yield multiple, aliased imports, and preserve `os`. -82 84 | import mock as foo, mock as bar, mock, os +76 | +77 | if True: +78 | # This should yield multiple, aliased imports. + - import mock as foo, mock as bar, mock +79 + from unittest import mock as foo +80 + from unittest import mock as bar +81 + from unittest import mock +82 | +83 | # This should yield multiple, aliased imports, and preserve `os`. +84 | import mock as foo, mock as bar, mock, os UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:79:25 @@ -482,18 +444,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 81 | # This should yield multiple, aliased imports, and preserve `os`. | help: Import from `unittest.mock` instead - -ℹ Safe fix -76 76 | -77 77 | if True: -78 78 | # This should yield multiple, aliased imports. -79 |- import mock as foo, mock as bar, mock - 79 |+ from unittest import mock as foo - 80 |+ from unittest import mock as bar - 81 |+ from unittest import mock -80 82 | -81 83 | # This should yield multiple, aliased imports, and preserve `os`. -82 84 | import mock as foo, mock as bar, mock, os +76 | +77 | if True: +78 | # This should yield multiple, aliased imports. + - import mock as foo, mock as bar, mock +79 + from unittest import mock as foo +80 + from unittest import mock as bar +81 + from unittest import mock +82 | +83 | # This should yield multiple, aliased imports, and preserve `os`. +84 | import mock as foo, mock as bar, mock, os UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:79:38 @@ -506,18 +466,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 81 | # This should yield multiple, aliased imports, and preserve `os`. | help: Import from `unittest.mock` instead - -ℹ Safe fix -76 76 | -77 77 | if True: -78 78 | # This should yield multiple, aliased imports. -79 |- import mock as foo, mock as bar, mock - 79 |+ from unittest import mock as foo - 80 |+ from unittest import mock as bar - 81 |+ from unittest import mock -80 82 | -81 83 | # This should yield multiple, aliased imports, and preserve `os`. -82 84 | import mock as foo, mock as bar, mock, os +76 | +77 | if True: +78 | # This should yield multiple, aliased imports. + - import mock as foo, mock as bar, mock +79 + from unittest import mock as foo +80 + from unittest import mock as bar +81 + from unittest import mock +82 | +83 | # This should yield multiple, aliased imports, and preserve `os`. +84 | import mock as foo, mock as bar, mock, os UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:82:12 @@ -529,19 +487,17 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 84 | if True: | help: Import from `unittest.mock` instead - -ℹ Safe fix -79 79 | import mock as foo, mock as bar, mock -80 80 | -81 81 | # This should yield multiple, aliased imports, and preserve `os`. -82 |- import mock as foo, mock as bar, mock, os - 82 |+ import os - 83 |+ from unittest import mock as foo - 84 |+ from unittest import mock as bar - 85 |+ from unittest import mock -83 86 | -84 87 | if True: -85 88 | # This should yield multiple, aliased imports. +79 | import mock as foo, mock as bar, mock +80 | +81 | # This should yield multiple, aliased imports, and preserve `os`. + - import mock as foo, mock as bar, mock, os +82 + import os +83 + from unittest import mock as foo +84 + from unittest import mock as bar +85 + from unittest import mock +86 | +87 | if True: +88 | # This should yield multiple, aliased imports. UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:82:25 @@ -553,19 +509,17 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 84 | if True: | help: Import from `unittest.mock` instead - -ℹ Safe fix -79 79 | import mock as foo, mock as bar, mock -80 80 | -81 81 | # This should yield multiple, aliased imports, and preserve `os`. -82 |- import mock as foo, mock as bar, mock, os - 82 |+ import os - 83 |+ from unittest import mock as foo - 84 |+ from unittest import mock as bar - 85 |+ from unittest import mock -83 86 | -84 87 | if True: -85 88 | # This should yield multiple, aliased imports. +79 | import mock as foo, mock as bar, mock +80 | +81 | # This should yield multiple, aliased imports, and preserve `os`. + - import mock as foo, mock as bar, mock, os +82 + import os +83 + from unittest import mock as foo +84 + from unittest import mock as bar +85 + from unittest import mock +86 | +87 | if True: +88 | # This should yield multiple, aliased imports. UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:82:38 @@ -577,19 +531,17 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` 84 | if True: | help: Import from `unittest.mock` instead - -ℹ Safe fix -79 79 | import mock as foo, mock as bar, mock -80 80 | -81 81 | # This should yield multiple, aliased imports, and preserve `os`. -82 |- import mock as foo, mock as bar, mock, os - 82 |+ import os - 83 |+ from unittest import mock as foo - 84 |+ from unittest import mock as bar - 85 |+ from unittest import mock -83 86 | -84 87 | if True: -85 88 | # This should yield multiple, aliased imports. +79 | import mock as foo, mock as bar, mock +80 | +81 | # This should yield multiple, aliased imports, and preserve `os`. + - import mock as foo, mock as bar, mock, os +82 + import os +83 + from unittest import mock as foo +84 + from unittest import mock as bar +85 + from unittest import mock +86 | +87 | if True: +88 | # This should yield multiple, aliased imports. UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:86:5 @@ -600,18 +552,16 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Import from `unittest.mock` instead - -ℹ Safe fix -83 83 | -84 84 | if True: -85 85 | # This should yield multiple, aliased imports. -86 |- from mock import mock as foo, mock as bar, mock - 86 |+ from unittest import mock as foo - 87 |+ from unittest import mock as bar - 88 |+ from unittest import mock -87 89 | -88 90 | -89 91 | # OK. +83 | +84 | if True: +85 | # This should yield multiple, aliased imports. + - from mock import mock as foo, mock as bar, mock +86 + from unittest import mock as foo +87 + from unittest import mock as bar +88 + from unittest import mock +89 | +90 | +91 | # OK. UP026 [*] `mock` is deprecated, use `unittest.mock` --> UP026.py:93:5 @@ -621,10 +571,8 @@ UP026 [*] `mock` is deprecated, use `unittest.mock` | ^^^^^^^^^ | help: Replace `mock.mock` with `mock` - -ℹ Safe fix -90 90 | x = mock.Mock() -91 91 | -92 92 | # Error (`mock.Mock()`). -93 |-x = mock.mock.Mock() - 93 |+x = mock.Mock() +90 | x = mock.Mock() +91 | +92 | # Error (`mock.Mock()`). + - x = mock.mock.Mock() +93 + x = mock.Mock() diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap index 9ff4a063a7..23621bf5a9 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP028_0.py.snap @@ -10,15 +10,14 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |_______________^ | help: Replace with `yield from` - -ℹ Unsafe fix -1 1 | def f(): -2 |- for x in y: -3 |- yield x - 2 |+ yield from y -4 3 | -5 4 | -6 5 | def g(): +1 | def f(): + - for x in y: + - yield x +2 + yield from y +3 | +4 | +5 | def g(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:7:5 @@ -29,17 +28,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |____________________^ | help: Replace with `yield from` - -ℹ Unsafe fix -4 4 | -5 5 | -6 6 | def g(): -7 |- for x, y in z: -8 |- yield (x, y) - 7 |+ yield from z -9 8 | -10 9 | -11 10 | def h(): +4 | +5 | +6 | def g(): + - for x, y in z: + - yield (x, y) +7 + yield from z +8 | +9 | +10 | def h(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:12:5 @@ -50,17 +48,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |_______________^ | help: Replace with `yield from` - -ℹ Unsafe fix -9 9 | -10 10 | -11 11 | def h(): -12 |- for x in [1, 2, 3]: -13 |- yield x - 12 |+ yield from [1, 2, 3] -14 13 | -15 14 | -16 15 | def i(): +9 | +10 | +11 | def h(): + - for x in [1, 2, 3]: + - yield x +12 + yield from [1, 2, 3] +13 | +14 | +15 | def i(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:17:5 @@ -71,17 +68,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |_______________^ | help: Replace with `yield from` - -ℹ Unsafe fix -14 14 | -15 15 | -16 16 | def i(): -17 |- for x in {x for x in y}: -18 |- yield x - 17 |+ yield from {x for x in y} -19 18 | -20 19 | -21 20 | def j(): +14 | +15 | +16 | def i(): + - for x in {x for x in y}: + - yield x +17 + yield from {x for x in y} +18 | +19 | +20 | def j(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:22:5 @@ -92,17 +88,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |_______________^ | help: Replace with `yield from` - -ℹ Unsafe fix -19 19 | -20 20 | -21 21 | def j(): -22 |- for x in (1, 2, 3): -23 |- yield x - 22 |+ yield from (1, 2, 3) -24 23 | -25 24 | -26 25 | def k(): +19 | +20 | +21 | def j(): + - for x in (1, 2, 3): + - yield x +22 + yield from (1, 2, 3) +23 | +24 | +25 | def k(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:27:5 @@ -113,17 +108,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |__________________^ | help: Replace with `yield from` - -ℹ Unsafe fix -24 24 | -25 25 | -26 26 | def k(): -27 |- for x, y in {3: "x", 6: "y"}: -28 |- yield x, y - 27 |+ yield from {3: "x", 6: "y"} -29 28 | -30 29 | -31 30 | def f(): # Comment one\n' +24 | +25 | +26 | def k(): + - for x, y in {3: "x", 6: "y"}: + - yield x, y +27 + yield from {3: "x", 6: "y"} +28 | +29 | +30 | def f(): # Comment one\n' +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:33:5 @@ -141,23 +135,22 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 40 | # Comment ten', | help: Replace with `yield from` - -ℹ Unsafe fix -30 30 | -31 31 | def f(): # Comment one\n' -32 32 | # Comment two\n' -33 |- for x, y in { # Comment three\n' - 33 |+ yield from { # Comment three\n' -34 34 | 3: "x", # Comment four\n' -35 35 | # Comment five\n' -36 36 | 6: "y", # Comment six\n' -37 |- }: # Comment seven\n' -38 |- # Comment eight\n' -39 |- yield x, y # Comment nine\n' - 37 |+ } # Comment nine\n' -40 38 | # Comment ten', -41 39 | -42 40 | +30 | +31 | def f(): # Comment one\n' +32 | # Comment two\n' + - for x, y in { # Comment three\n' +33 + yield from { # Comment three\n' +34 | 3: "x", # Comment four\n' +35 | # Comment five\n' +36 | 6: "y", # Comment six\n' + - }: # Comment seven\n' + - # Comment eight\n' + - yield x, y # Comment nine\n' +37 + } # Comment nine\n' +38 | # Comment ten', +39 | +40 | +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:44:5 @@ -168,17 +161,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |__________________^ | help: Replace with `yield from` - -ℹ Unsafe fix -41 41 | -42 42 | -43 43 | def f(): -44 |- for x, y in [{3: (3, [44, "long ss"]), 6: "y"}]: -45 |- yield x, y - 44 |+ yield from [{3: (3, [44, "long ss"]), 6: "y"}] -46 45 | -47 46 | -48 47 | def f(): +41 | +42 | +43 | def f(): + - for x, y in [{3: (3, [44, "long ss"]), 6: "y"}]: + - yield x, y +44 + yield from [{3: (3, [44, "long ss"]), 6: "y"}] +45 | +46 | +47 | def f(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:49:5 @@ -191,17 +183,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 52 | def f(): | help: Replace with `yield from` - -ℹ Unsafe fix -46 46 | -47 47 | -48 48 | def f(): -49 |- for x, y in z(): -50 |- yield x, y - 49 |+ yield from z() -51 50 | -52 51 | def f(): -53 52 | def func(): +46 | +47 | +48 | def f(): + - for x, y in z(): + - yield x, y +49 + yield from z() +50 | +51 | def f(): +52 | def func(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:55:9 @@ -216,18 +207,17 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 59 | # Comment\n' | help: Replace with `yield from` - -ℹ Unsafe fix -52 52 | def f(): -53 53 | def func(): -54 54 | # This comment is preserved\n' -55 |- for x, y in z(): # Comment one\n' -56 |- # Comment two\n' -57 |- yield x, y # Comment three\n' - 55 |+ yield from z() # Comment three\n' -58 56 | # Comment four\n' -59 57 | # Comment\n' -60 58 | def g(): +52 | def f(): +53 | def func(): +54 | # This comment is preserved\n' + - for x, y in z(): # Comment one\n' + - # Comment two\n' + - yield x, y # Comment three\n' +55 + yield from z() # Comment three\n' +56 | # Comment four\n' +57 | # Comment\n' +58 | def g(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:67:5 @@ -239,17 +229,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |_______________^ | help: Replace with `yield from` - -ℹ Unsafe fix -64 64 | def f(): -65 65 | for x in y: -66 66 | yield x -67 |- for z in x: -68 |- yield z - 67 |+ yield from x -69 68 | -70 69 | -71 70 | def f(): +64 | def f(): +65 | for x in y: +66 | yield x + - for z in x: + - yield z +67 + yield from x +68 | +69 | +70 | def f(): +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:72:5 @@ -261,17 +250,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 74 | x = 1 | help: Replace with `yield from` - -ℹ Unsafe fix -69 69 | -70 70 | -71 71 | def f(): -72 |- for x, y in z(): -73 |- yield x, y - 72 |+ yield from z() -74 73 | x = 1 -75 74 | -76 75 | +69 | +70 | +71 | def f(): + - for x, y in z(): + - yield x, y +72 + yield from z() +73 | x = 1 +74 | +75 | +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:79:5 @@ -286,21 +274,20 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |_______________^ | help: Replace with `yield from` - -ℹ Unsafe fix -76 76 | -77 77 | # Regression test for: https://github.com/astral-sh/ruff/issues/7103 -78 78 | def _serve_method(fn): -79 |- for h in ( - 79 |+ yield from ( -80 80 | TaggedText.from_file(args.input) -81 81 | .markup(highlight=args.region) -82 |- ): -83 |- yield h - 82 |+ ) -84 83 | -85 84 | -86 85 | # UP028: The later loop variable is not a reference to the earlier loop variable +76 | +77 | # Regression test for: https://github.com/astral-sh/ruff/issues/7103 +78 | def _serve_method(fn): + - for h in ( +79 + yield from ( +80 | TaggedText.from_file(args.input) +81 | .markup(highlight=args.region) + - ): + - yield h +82 + ) +83 | +84 | +85 | # UP028: The later loop variable is not a reference to the earlier loop variable +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:97:5 @@ -314,17 +301,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 100 | try: | help: Replace with `yield from` - -ℹ Unsafe fix -94 94 | -95 95 | # UP028: The exception binding is not a reference to the loop variable -96 96 | def f(): -97 |- for x in (1, 2, 3): -98 |- yield x - 97 |+ yield from (1, 2, 3) -99 98 | # Shadowing with an `except` -100 99 | try: -101 100 | pass +94 | +95 | # UP028: The exception binding is not a reference to the loop variable +96 | def f(): + - for x in (1, 2, 3): + - yield x +97 + yield from (1, 2, 3) +98 | # Shadowing with an `except` +99 | try: +100 | pass +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:108:5 @@ -338,17 +324,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 111 | with contextlib.nullcontext() as x: | help: Replace with `yield from` - -ℹ Unsafe fix -105 105 | -106 106 | # UP028: The context binding is not a reference to the loop variable -107 107 | def f(): -108 |- for x in (1, 2, 3): -109 |- yield x - 108 |+ yield from (1, 2, 3) -110 109 | # Shadowing with `with` -111 110 | with contextlib.nullcontext() as x: -112 111 | pass +105 | +106 | # UP028: The context binding is not a reference to the loop variable +107 | def f(): + - for x in (1, 2, 3): + - yield x +108 + yield from (1, 2, 3) +109 | # Shadowing with `with` +110 | with contextlib.nullcontext() as x: +111 | pass +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:118:5 @@ -362,17 +347,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 121 | x: int | help: Replace with `yield from` - -ℹ Unsafe fix -115 115 | -116 116 | # UP028: The type annotation binding is not a reference to the loop variable -117 117 | def f(): -118 |- for x in (1, 2, 3): -119 |- yield x - 118 |+ yield from (1, 2, 3) -120 119 | # Shadowing with a type annotation -121 120 | x: int -122 121 | +115 | +116 | # UP028: The type annotation binding is not a reference to the loop variable +117 | def f(): + - for x in (1, 2, 3): + - yield x +118 + yield from (1, 2, 3) +119 | # Shadowing with a type annotation +120 | x: int +121 | +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:134:5 @@ -386,17 +370,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` 137 | try: | help: Replace with `yield from` - -ℹ Unsafe fix -131 131 | -132 132 | # UP028: The exception bindings are not a reference to the loop variable -133 133 | def f(): -134 |- for x in (1, 2, 3): -135 |- yield x - 134 |+ yield from (1, 2, 3) -136 135 | # Shadowing with multiple `except` blocks -137 136 | try: -138 137 | pass +131 | +132 | # UP028: The exception bindings are not a reference to the loop variable +133 | def f(): + - for x in (1, 2, 3): + - yield x +134 + yield from (1, 2, 3) +135 | # Shadowing with multiple `except` blocks +136 | try: +137 | pass +note: This is an unsafe fix and may change runtime behavior UP028 [*] Replace `yield` over `for` loop with `yield from` --> UP028_0.py:170:5 @@ -408,17 +391,16 @@ UP028 [*] Replace `yield` over `for` loop with `yield from` | |_______________^ | help: Replace with `yield from` - -ℹ Unsafe fix -167 167 | -168 168 | # https://github.com/astral-sh/ruff/issues/15540 -169 169 | def f(): -170 |- for a in 1,: -171 |- yield a - 170 |+ yield from (1,) -172 171 | -173 172 | -174 173 | SOME_GLOBAL = None +167 | +168 | # https://github.com/astral-sh/ruff/issues/15540 +169 | def f(): + - for a in 1,: + - yield a +170 + yield from (1,) +171 | +172 | +173 | SOME_GLOBAL = None +note: This is an unsafe fix and may change runtime behavior UP028 Replace `yield` over `for` loop with `yield from` --> UP028_0.py:179:5 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029.py.snap index 09c5ad548c..8016f13af0 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP029.py.snap @@ -10,12 +10,11 @@ UP029 [*] Unnecessary builtin import: `*` 3 | from builtins import str as _str | help: Remove unnecessary builtin import - -ℹ Unsafe fix -1 |-from builtins import * -2 1 | from builtins import ascii, bytes, compile -3 2 | from builtins import str as _str -4 3 | from six.moves import filter, zip, zip_longest + - from builtins import * +1 | from builtins import ascii, bytes, compile +2 | from builtins import str as _str +3 | from six.moves import filter, zip, zip_longest +note: This is an unsafe fix and may change runtime behavior UP029 [*] Unnecessary builtin imports: `ascii`, `bytes` --> UP029.py:2:1 @@ -27,14 +26,13 @@ UP029 [*] Unnecessary builtin imports: `ascii`, `bytes` 4 | from six.moves import filter, zip, zip_longest | help: Remove unnecessary builtin import - -ℹ Unsafe fix -1 1 | from builtins import * -2 |-from builtins import ascii, bytes, compile - 2 |+from builtins import compile -3 3 | from builtins import str as _str -4 4 | from six.moves import filter, zip, zip_longest -5 5 | from io import open +1 | from builtins import * + - from builtins import ascii, bytes, compile +2 + from builtins import compile +3 | from builtins import str as _str +4 | from six.moves import filter, zip, zip_longest +5 | from io import open +note: This is an unsafe fix and may change runtime behavior UP029 [*] Unnecessary builtin imports: `filter`, `zip` --> UP029.py:4:1 @@ -47,16 +45,15 @@ UP029 [*] Unnecessary builtin imports: `filter`, `zip` 6 | import io | help: Remove unnecessary builtin import - -ℹ Unsafe fix -1 1 | from builtins import * -2 2 | from builtins import ascii, bytes, compile -3 3 | from builtins import str as _str -4 |-from six.moves import filter, zip, zip_longest - 4 |+from six.moves import zip_longest -5 5 | from io import open -6 6 | import io -7 7 | import six +1 | from builtins import * +2 | from builtins import ascii, bytes, compile +3 | from builtins import str as _str + - from six.moves import filter, zip, zip_longest +4 + from six.moves import zip_longest +5 | from io import open +6 | import io +7 | import six +note: This is an unsafe fix and may change runtime behavior UP029 [*] Unnecessary builtin import: `open` --> UP029.py:5:1 @@ -69,12 +66,11 @@ UP029 [*] Unnecessary builtin import: `open` 7 | import six | help: Remove unnecessary builtin import - -ℹ Unsafe fix -2 2 | from builtins import ascii, bytes, compile -3 3 | from builtins import str as _str -4 4 | from six.moves import filter, zip, zip_longest -5 |-from io import open -6 5 | import io -7 6 | import six -8 7 | import six.moves +2 | from builtins import ascii, bytes, compile +3 | from builtins import str as _str +4 | from six.moves import filter, zip, zip_longest + - from io import open +5 | import io +6 | import six +7 | import six.moves +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap index f24c483f25..101fb07ce7 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP030_0.py.snap @@ -12,15 +12,14 @@ UP030 [*] Use implicit references for positional format fields 5 | "a {3} complicated {1} string with {0} {2}".format( | help: Remove explicit positional indices - -ℹ Unsafe fix -1 1 | # Invalid calls; errors expected. -2 2 | -3 |-"{0}" "{1}" "{2}".format(1, 2, 3) - 3 |+"{}" "{}" "{}".format(1, 2, 3) -4 4 | -5 5 | "a {3} complicated {1} string with {0} {2}".format( -6 6 | "first", "second", "third", "fourth" +1 | # Invalid calls; errors expected. +2 | + - "{0}" "{1}" "{2}".format(1, 2, 3) +3 + "{}" "{}" "{}".format(1, 2, 3) +4 | +5 | "a {3} complicated {1} string with {0} {2}".format( +6 | "first", "second", "third", "fourth" +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:5:1 @@ -35,18 +34,17 @@ UP030 [*] Use implicit references for positional format fields 9 | '{0}'.format(1) | help: Remove explicit positional indices - -ℹ Unsafe fix -2 2 | -3 3 | "{0}" "{1}" "{2}".format(1, 2, 3) -4 4 | -5 |-"a {3} complicated {1} string with {0} {2}".format( -6 |- "first", "second", "third", "fourth" - 5 |+"a {} complicated {} string with {} {}".format( - 6 |+ "fourth", "second", "first", "third" -7 7 | ) -8 8 | -9 9 | '{0}'.format(1) +2 | +3 | "{0}" "{1}" "{2}".format(1, 2, 3) +4 | + - "a {3} complicated {1} string with {0} {2}".format( + - "first", "second", "third", "fourth" +5 + "a {} complicated {} string with {} {}".format( +6 + "fourth", "second", "first", "third" +7 | ) +8 | +9 | '{0}'.format(1) +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:9:1 @@ -59,16 +57,15 @@ UP030 [*] Use implicit references for positional format fields 11 | '{0:x}'.format(30) | help: Remove explicit positional indices - -ℹ Unsafe fix -6 6 | "first", "second", "third", "fourth" -7 7 | ) -8 8 | -9 |-'{0}'.format(1) - 9 |+'{}'.format(1) -10 10 | -11 11 | '{0:x}'.format(30) -12 12 | +6 | "first", "second", "third", "fourth" +7 | ) +8 | + - '{0}'.format(1) +9 + '{}'.format(1) +10 | +11 | '{0:x}'.format(30) +12 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:11:1 @@ -81,16 +78,15 @@ UP030 [*] Use implicit references for positional format fields 13 | x = '{0}'.format(1) | help: Remove explicit positional indices - -ℹ Unsafe fix -8 8 | -9 9 | '{0}'.format(1) -10 10 | -11 |-'{0:x}'.format(30) - 11 |+'{:x}'.format(30) -12 12 | -13 13 | x = '{0}'.format(1) -14 14 | +8 | +9 | '{0}'.format(1) +10 | + - '{0:x}'.format(30) +11 + '{:x}'.format(30) +12 | +13 | x = '{0}'.format(1) +14 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:13:5 @@ -103,16 +99,15 @@ UP030 [*] Use implicit references for positional format fields 15 | '''{0}\n{1}\n'''.format(1, 2) | help: Remove explicit positional indices - -ℹ Unsafe fix -10 10 | -11 11 | '{0:x}'.format(30) -12 12 | -13 |-x = '{0}'.format(1) - 13 |+x = '{}'.format(1) -14 14 | -15 15 | '''{0}\n{1}\n'''.format(1, 2) -16 16 | +10 | +11 | '{0:x}'.format(30) +12 | + - x = '{0}'.format(1) +13 + x = '{}'.format(1) +14 | +15 | '''{0}\n{1}\n'''.format(1, 2) +16 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:15:1 @@ -125,16 +120,15 @@ UP030 [*] Use implicit references for positional format fields 17 | x = "foo {0}" \ | help: Remove explicit positional indices - -ℹ Unsafe fix -12 12 | -13 13 | x = '{0}'.format(1) -14 14 | -15 |-'''{0}\n{1}\n'''.format(1, 2) - 15 |+'''{}\n{}\n'''.format(1, 2) -16 16 | -17 17 | x = "foo {0}" \ -18 18 | "bar {1}".format(1, 2) +12 | +13 | x = '{0}'.format(1) +14 | + - '''{0}\n{1}\n'''.format(1, 2) +15 + '''{}\n{}\n'''.format(1, 2) +16 | +17 | x = "foo {0}" \ +18 | "bar {1}".format(1, 2) +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:17:5 @@ -149,18 +143,17 @@ UP030 [*] Use implicit references for positional format fields 20 | ("{0}").format(1) | help: Remove explicit positional indices - -ℹ Unsafe fix -14 14 | -15 15 | '''{0}\n{1}\n'''.format(1, 2) -16 16 | -17 |-x = "foo {0}" \ -18 |- "bar {1}".format(1, 2) - 17 |+x = "foo {}" \ - 18 |+ "bar {}".format(1, 2) -19 19 | -20 20 | ("{0}").format(1) -21 21 | +14 | +15 | '''{0}\n{1}\n'''.format(1, 2) +16 | + - x = "foo {0}" \ + - "bar {1}".format(1, 2) +17 + x = "foo {}" \ +18 + "bar {}".format(1, 2) +19 | +20 | ("{0}").format(1) +21 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:20:1 @@ -173,16 +166,15 @@ UP030 [*] Use implicit references for positional format fields 22 | "\N{snowman} {0}".format(1) | help: Remove explicit positional indices - -ℹ Unsafe fix -17 17 | x = "foo {0}" \ -18 18 | "bar {1}".format(1, 2) -19 19 | -20 |-("{0}").format(1) - 20 |+("{}").format(1) -21 21 | -22 22 | "\N{snowman} {0}".format(1) -23 23 | +17 | x = "foo {0}" \ +18 | "bar {1}".format(1, 2) +19 | + - ("{0}").format(1) +20 + ("{}").format(1) +21 | +22 | "\N{snowman} {0}".format(1) +23 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:22:1 @@ -195,16 +187,15 @@ UP030 [*] Use implicit references for positional format fields 24 | print( | help: Remove explicit positional indices - -ℹ Unsafe fix -19 19 | -20 20 | ("{0}").format(1) -21 21 | -22 |-"\N{snowman} {0}".format(1) - 22 |+"\N{snowman} {}".format(1) -23 23 | -24 24 | print( -25 25 | 'foo{0}' +19 | +20 | ("{0}").format(1) +21 | + - "\N{snowman} {0}".format(1) +22 + "\N{snowman} {}".format(1) +23 | +24 | print( +25 | 'foo{0}' +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:25:5 @@ -216,18 +207,17 @@ UP030 [*] Use implicit references for positional format fields 27 | ) | help: Remove explicit positional indices - -ℹ Unsafe fix -22 22 | "\N{snowman} {0}".format(1) -23 23 | -24 24 | print( -25 |- 'foo{0}' -26 |- 'bar{1}'.format(1, 2) - 25 |+ 'foo{}' - 26 |+ 'bar{}'.format(1, 2) -27 27 | ) -28 28 | -29 29 | print( +22 | "\N{snowman} {0}".format(1) +23 | +24 | print( + - 'foo{0}' + - 'bar{1}'.format(1, 2) +25 + 'foo{}' +26 + 'bar{}'.format(1, 2) +27 | ) +28 | +29 | print( +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:30:5 @@ -239,18 +229,17 @@ UP030 [*] Use implicit references for positional format fields 32 | ) | help: Remove explicit positional indices - -ℹ Unsafe fix -27 27 | ) -28 28 | -29 29 | print( -30 |- 'foo{0}' # ohai\n" -31 |- 'bar{1}'.format(1, 2) - 30 |+ 'foo{}' # ohai\n" - 31 |+ 'bar{}'.format(1, 2) -32 32 | ) -33 33 | -34 34 | '{' '0}'.format(1) +27 | ) +28 | +29 | print( + - 'foo{0}' # ohai\n" + - 'bar{1}'.format(1, 2) +30 + 'foo{}' # ohai\n" +31 + 'bar{}'.format(1, 2) +32 | ) +33 | +34 | '{' '0}'.format(1) +note: This is an unsafe fix and may change runtime behavior UP030 Use implicit references for positional format fields --> UP030_0.py:34:1 @@ -275,16 +264,15 @@ UP030 [*] Use implicit references for positional format fields 41 | "{0}".format(**kwargs) | help: Remove explicit positional indices - -ℹ Unsafe fix -36 36 | args = list(range(10)) -37 37 | kwargs = {x: x for x in range(10)} -38 38 | -39 |-"{0}".format(*args) - 39 |+"{}".format(*args) -40 40 | -41 41 | "{0}".format(**kwargs) -42 42 | +36 | args = list(range(10)) +37 | kwargs = {x: x for x in range(10)} +38 | + - "{0}".format(*args) +39 + "{}".format(*args) +40 | +41 | "{0}".format(**kwargs) +42 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:41:1 @@ -297,16 +285,15 @@ UP030 [*] Use implicit references for positional format fields 43 | "{0}_{1}".format(*args) | help: Remove explicit positional indices - -ℹ Unsafe fix -38 38 | -39 39 | "{0}".format(*args) -40 40 | -41 |-"{0}".format(**kwargs) - 41 |+"{}".format(**kwargs) -42 42 | -43 43 | "{0}_{1}".format(*args) -44 44 | +38 | +39 | "{0}".format(*args) +40 | + - "{0}".format(**kwargs) +41 + "{}".format(**kwargs) +42 | +43 | "{0}_{1}".format(*args) +44 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:43:1 @@ -319,16 +306,15 @@ UP030 [*] Use implicit references for positional format fields 45 | "{0}_{1}".format(1, *args) | help: Remove explicit positional indices - -ℹ Unsafe fix -40 40 | -41 41 | "{0}".format(**kwargs) -42 42 | -43 |-"{0}_{1}".format(*args) - 43 |+"{}_{}".format(*args) -44 44 | -45 45 | "{0}_{1}".format(1, *args) -46 46 | +40 | +41 | "{0}".format(**kwargs) +42 | + - "{0}_{1}".format(*args) +43 + "{}_{}".format(*args) +44 | +45 | "{0}_{1}".format(1, *args) +46 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:45:1 @@ -341,16 +327,15 @@ UP030 [*] Use implicit references for positional format fields 47 | "{0}_{1}".format(1, 2, *args) | help: Remove explicit positional indices - -ℹ Unsafe fix -42 42 | -43 43 | "{0}_{1}".format(*args) -44 44 | -45 |-"{0}_{1}".format(1, *args) - 45 |+"{}_{}".format(1, *args) -46 46 | -47 47 | "{0}_{1}".format(1, 2, *args) -48 48 | +42 | +43 | "{0}_{1}".format(*args) +44 | + - "{0}_{1}".format(1, *args) +45 + "{}_{}".format(1, *args) +46 | +47 | "{0}_{1}".format(1, 2, *args) +48 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:47:1 @@ -363,16 +348,15 @@ UP030 [*] Use implicit references for positional format fields 49 | "{0}_{1}".format(*args, 1, 2) | help: Remove explicit positional indices - -ℹ Unsafe fix -44 44 | -45 45 | "{0}_{1}".format(1, *args) -46 46 | -47 |-"{0}_{1}".format(1, 2, *args) - 47 |+"{}_{}".format(1, 2, *args) -48 48 | -49 49 | "{0}_{1}".format(*args, 1, 2) -50 50 | +44 | +45 | "{0}_{1}".format(1, *args) +46 | + - "{0}_{1}".format(1, 2, *args) +47 + "{}_{}".format(1, 2, *args) +48 | +49 | "{0}_{1}".format(*args, 1, 2) +50 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:49:1 @@ -385,16 +369,15 @@ UP030 [*] Use implicit references for positional format fields 51 | "{0}_{1}_{2}".format(1, **kwargs) | help: Remove explicit positional indices - -ℹ Unsafe fix -46 46 | -47 47 | "{0}_{1}".format(1, 2, *args) -48 48 | -49 |-"{0}_{1}".format(*args, 1, 2) - 49 |+"{}_{}".format(*args, 1, 2) -50 50 | -51 51 | "{0}_{1}_{2}".format(1, **kwargs) -52 52 | +46 | +47 | "{0}_{1}".format(1, 2, *args) +48 | + - "{0}_{1}".format(*args, 1, 2) +49 + "{}_{}".format(*args, 1, 2) +50 | +51 | "{0}_{1}_{2}".format(1, **kwargs) +52 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:51:1 @@ -407,16 +390,15 @@ UP030 [*] Use implicit references for positional format fields 53 | "{0}_{1}_{2}".format(1, 2, **kwargs) | help: Remove explicit positional indices - -ℹ Unsafe fix -48 48 | -49 49 | "{0}_{1}".format(*args, 1, 2) -50 50 | -51 |-"{0}_{1}_{2}".format(1, **kwargs) - 51 |+"{}_{}_{}".format(1, **kwargs) -52 52 | -53 53 | "{0}_{1}_{2}".format(1, 2, **kwargs) -54 54 | +48 | +49 | "{0}_{1}".format(*args, 1, 2) +50 | + - "{0}_{1}_{2}".format(1, **kwargs) +51 + "{}_{}_{}".format(1, **kwargs) +52 | +53 | "{0}_{1}_{2}".format(1, 2, **kwargs) +54 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:53:1 @@ -429,16 +411,15 @@ UP030 [*] Use implicit references for positional format fields 55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs) | help: Remove explicit positional indices - -ℹ Unsafe fix -50 50 | -51 51 | "{0}_{1}_{2}".format(1, **kwargs) -52 52 | -53 |-"{0}_{1}_{2}".format(1, 2, **kwargs) - 53 |+"{}_{}_{}".format(1, 2, **kwargs) -54 54 | -55 55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs) -56 56 | +50 | +51 | "{0}_{1}_{2}".format(1, **kwargs) +52 | + - "{0}_{1}_{2}".format(1, 2, **kwargs) +53 + "{}_{}_{}".format(1, 2, **kwargs) +54 | +55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs) +56 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:55:1 @@ -451,16 +432,15 @@ UP030 [*] Use implicit references for positional format fields 57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs) | help: Remove explicit positional indices - -ℹ Unsafe fix -52 52 | -53 53 | "{0}_{1}_{2}".format(1, 2, **kwargs) -54 54 | -55 |-"{0}_{1}_{2}".format(1, 2, 3, **kwargs) - 55 |+"{}_{}_{}".format(1, 2, 3, **kwargs) -56 56 | -57 57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs) -58 58 | +52 | +53 | "{0}_{1}_{2}".format(1, 2, **kwargs) +54 | + - "{0}_{1}_{2}".format(1, 2, 3, **kwargs) +55 + "{}_{}_{}".format(1, 2, 3, **kwargs) +56 | +57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs) +58 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:57:1 @@ -473,16 +453,15 @@ UP030 [*] Use implicit references for positional format fields 59 | "{1}_{0}".format(1, 2, *args) | help: Remove explicit positional indices - -ℹ Unsafe fix -54 54 | -55 55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs) -56 56 | -57 |-"{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs) - 57 |+"{}_{}_{}".format(1, 2, 3, *args, **kwargs) -58 58 | -59 59 | "{1}_{0}".format(1, 2, *args) -60 60 | +54 | +55 | "{0}_{1}_{2}".format(1, 2, 3, **kwargs) +56 | + - "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs) +57 + "{}_{}_{}".format(1, 2, 3, *args, **kwargs) +58 | +59 | "{1}_{0}".format(1, 2, *args) +60 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:59:1 @@ -495,16 +474,15 @@ UP030 [*] Use implicit references for positional format fields 61 | "{1}_{0}".format(1, 2) | help: Remove explicit positional indices - -ℹ Unsafe fix -56 56 | -57 57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs) -58 58 | -59 |-"{1}_{0}".format(1, 2, *args) - 59 |+"{}_{}".format(2, 1, ) -60 60 | -61 61 | "{1}_{0}".format(1, 2) -62 62 | +56 | +57 | "{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs) +58 | + - "{1}_{0}".format(1, 2, *args) +59 + "{}_{}".format(2, 1, ) +60 | +61 | "{1}_{0}".format(1, 2) +62 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:61:1 @@ -517,16 +495,15 @@ UP030 [*] Use implicit references for positional format fields 63 | r"\d{{1,2}} {0}".format(42) | help: Remove explicit positional indices - -ℹ Unsafe fix -58 58 | -59 59 | "{1}_{0}".format(1, 2, *args) -60 60 | -61 |-"{1}_{0}".format(1, 2) - 61 |+"{}_{}".format(2, 1) -62 62 | -63 63 | r"\d{{1,2}} {0}".format(42) -64 64 | +58 | +59 | "{1}_{0}".format(1, 2, *args) +60 | + - "{1}_{0}".format(1, 2) +61 + "{}_{}".format(2, 1) +62 | +63 | r"\d{{1,2}} {0}".format(42) +64 | +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:63:1 @@ -539,15 +516,14 @@ UP030 [*] Use implicit references for positional format fields 65 | "{{{0}}}".format(123) | help: Remove explicit positional indices - -ℹ Unsafe fix -60 60 | -61 61 | "{1}_{0}".format(1, 2) -62 62 | -63 |-r"\d{{1,2}} {0}".format(42) - 63 |+r"\d{{1,2}} {}".format(42) -64 64 | -65 65 | "{{{0}}}".format(123) +60 | +61 | "{1}_{0}".format(1, 2) +62 | + - r"\d{{1,2}} {0}".format(42) +63 + r"\d{{1,2}} {}".format(42) +64 | +65 | "{{{0}}}".format(123) +note: This is an unsafe fix and may change runtime behavior UP030 [*] Use implicit references for positional format fields --> UP030_0.py:65:1 @@ -558,10 +534,9 @@ UP030 [*] Use implicit references for positional format fields | ^^^^^^^^^^^^^^^^^^^^^ | help: Remove explicit positional indices - -ℹ Unsafe fix -62 62 | -63 63 | r"\d{{1,2}} {0}".format(42) -64 64 | -65 |-"{{{0}}}".format(123) - 65 |+"{{{}}}".format(123) +62 | +63 | r"\d{{1,2}} {0}".format(42) +64 | + - "{{{0}}}".format(123) +65 + "{{{}}}".format(123) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap index f298074e37..4dc65c4808 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP031_0.py.snap @@ -11,16 +11,15 @@ UP031 [*] Use format specifiers instead of percent format 6 | print('%s%s' % (a, b)) | help: Replace with format specifiers - -ℹ Unsafe fix -1 1 | a, b, x, y = 1, 2, 3, 4 -2 2 | -3 3 | # UP031 -4 |-print('%s %s' % (a, b)) - 4 |+print('{} {}'.format(a, b)) -5 5 | -6 6 | print('%s%s' % (a, b)) -7 7 | +1 | a, b, x, y = 1, 2, 3, 4 +2 | +3 | # UP031 + - print('%s %s' % (a, b)) +4 + print('{} {}'.format(a, b)) +5 | +6 | print('%s%s' % (a, b)) +7 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:6:7 @@ -33,16 +32,15 @@ UP031 [*] Use format specifiers instead of percent format 8 | print("trivial" % ()) | help: Replace with format specifiers - -ℹ Unsafe fix -3 3 | # UP031 -4 4 | print('%s %s' % (a, b)) -5 5 | -6 |-print('%s%s' % (a, b)) - 6 |+print('{}{}'.format(a, b)) -7 7 | -8 8 | print("trivial" % ()) -9 9 | +3 | # UP031 +4 | print('%s %s' % (a, b)) +5 | + - print('%s%s' % (a, b)) +6 + print('{}{}'.format(a, b)) +7 | +8 | print("trivial" % ()) +9 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:8:7 @@ -55,16 +53,15 @@ UP031 [*] Use format specifiers instead of percent format 10 | print("%s" % ("simple",)) | help: Replace with format specifiers - -ℹ Unsafe fix -5 5 | -6 6 | print('%s%s' % (a, b)) -7 7 | -8 |-print("trivial" % ()) - 8 |+print("trivial".format()) -9 9 | -10 10 | print("%s" % ("simple",)) -11 11 | +5 | +6 | print('%s%s' % (a, b)) +7 | + - print("trivial" % ()) +8 + print("trivial".format()) +9 | +10 | print("%s" % ("simple",)) +11 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:10:7 @@ -77,16 +74,15 @@ UP031 [*] Use format specifiers instead of percent format 12 | print("%s" % ("%s" % ("nested",),)) | help: Replace with format specifiers - -ℹ Unsafe fix -7 7 | -8 8 | print("trivial" % ()) -9 9 | -10 |-print("%s" % ("simple",)) - 10 |+print("{}".format("simple")) -11 11 | -12 12 | print("%s" % ("%s" % ("nested",),)) -13 13 | +7 | +8 | print("trivial" % ()) +9 | + - print("%s" % ("simple",)) +10 + print("{}".format("simple")) +11 | +12 | print("%s" % ("%s" % ("nested",),)) +13 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:12:7 @@ -99,16 +95,15 @@ UP031 [*] Use format specifiers instead of percent format 14 | print("%s%% percent" % (15,)) | help: Replace with format specifiers - -ℹ Unsafe fix -9 9 | -10 10 | print("%s" % ("simple",)) -11 11 | -12 |-print("%s" % ("%s" % ("nested",),)) - 12 |+print("{}".format("%s" % ("nested",))) -13 13 | -14 14 | print("%s%% percent" % (15,)) -15 15 | +9 | +10 | print("%s" % ("simple",)) +11 | + - print("%s" % ("%s" % ("nested",),)) +12 + print("{}".format("%s" % ("nested",))) +13 | +14 | print("%s%% percent" % (15,)) +15 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:12:15 @@ -121,16 +116,15 @@ UP031 [*] Use format specifiers instead of percent format 14 | print("%s%% percent" % (15,)) | help: Replace with format specifiers - -ℹ Unsafe fix -9 9 | -10 10 | print("%s" % ("simple",)) -11 11 | -12 |-print("%s" % ("%s" % ("nested",),)) - 12 |+print("%s" % ("{}".format("nested"),)) -13 13 | -14 14 | print("%s%% percent" % (15,)) -15 15 | +9 | +10 | print("%s" % ("simple",)) +11 | + - print("%s" % ("%s" % ("nested",),)) +12 + print("%s" % ("{}".format("nested"),)) +13 | +14 | print("%s%% percent" % (15,)) +15 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:14:7 @@ -143,16 +137,15 @@ UP031 [*] Use format specifiers instead of percent format 16 | print("%f" % (15,)) | help: Replace with format specifiers - -ℹ Unsafe fix -11 11 | -12 12 | print("%s" % ("%s" % ("nested",),)) -13 13 | -14 |-print("%s%% percent" % (15,)) - 14 |+print("{}% percent".format(15)) -15 15 | -16 16 | print("%f" % (15,)) -17 17 | +11 | +12 | print("%s" % ("%s" % ("nested",),)) +13 | + - print("%s%% percent" % (15,)) +14 + print("{}% percent".format(15)) +15 | +16 | print("%f" % (15,)) +17 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:16:7 @@ -165,16 +158,15 @@ UP031 [*] Use format specifiers instead of percent format 18 | print("%.f" % (15,)) | help: Replace with format specifiers - -ℹ Unsafe fix -13 13 | -14 14 | print("%s%% percent" % (15,)) -15 15 | -16 |-print("%f" % (15,)) - 16 |+print("{:f}".format(15)) -17 17 | -18 18 | print("%.f" % (15,)) -19 19 | +13 | +14 | print("%s%% percent" % (15,)) +15 | + - print("%f" % (15,)) +16 + print("{:f}".format(15)) +17 | +18 | print("%.f" % (15,)) +19 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:18:7 @@ -187,16 +179,15 @@ UP031 [*] Use format specifiers instead of percent format 20 | print("%.3f" % (15,)) | help: Replace with format specifiers - -ℹ Unsafe fix -15 15 | -16 16 | print("%f" % (15,)) -17 17 | -18 |-print("%.f" % (15,)) - 18 |+print("{:.0f}".format(15)) -19 19 | -20 20 | print("%.3f" % (15,)) -21 21 | +15 | +16 | print("%f" % (15,)) +17 | + - print("%.f" % (15,)) +18 + print("{:.0f}".format(15)) +19 | +20 | print("%.3f" % (15,)) +21 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:20:7 @@ -209,16 +200,15 @@ UP031 [*] Use format specifiers instead of percent format 22 | print("%3f" % (15,)) | help: Replace with format specifiers - -ℹ Unsafe fix -17 17 | -18 18 | print("%.f" % (15,)) -19 19 | -20 |-print("%.3f" % (15,)) - 20 |+print("{:.3f}".format(15)) -21 21 | -22 22 | print("%3f" % (15,)) -23 23 | +17 | +18 | print("%.f" % (15,)) +19 | + - print("%.3f" % (15,)) +20 + print("{:.3f}".format(15)) +21 | +22 | print("%3f" % (15,)) +23 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:22:7 @@ -231,16 +221,15 @@ UP031 [*] Use format specifiers instead of percent format 24 | print("%-5f" % (5,)) | help: Replace with format specifiers - -ℹ Unsafe fix -19 19 | -20 20 | print("%.3f" % (15,)) -21 21 | -22 |-print("%3f" % (15,)) - 22 |+print("{:3f}".format(15)) -23 23 | -24 24 | print("%-5f" % (5,)) -25 25 | +19 | +20 | print("%.3f" % (15,)) +21 | + - print("%3f" % (15,)) +22 + print("{:3f}".format(15)) +23 | +24 | print("%-5f" % (5,)) +25 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:24:7 @@ -253,16 +242,15 @@ UP031 [*] Use format specifiers instead of percent format 26 | print("%9f" % (5,)) | help: Replace with format specifiers - -ℹ Unsafe fix -21 21 | -22 22 | print("%3f" % (15,)) -23 23 | -24 |-print("%-5f" % (5,)) - 24 |+print("{:<5f}".format(5)) -25 25 | -26 26 | print("%9f" % (5,)) -27 27 | +21 | +22 | print("%3f" % (15,)) +23 | + - print("%-5f" % (5,)) +24 + print("{:<5f}".format(5)) +25 | +26 | print("%9f" % (5,)) +27 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:26:7 @@ -275,16 +263,15 @@ UP031 [*] Use format specifiers instead of percent format 28 | print("%#o" % (123,)) | help: Replace with format specifiers - -ℹ Unsafe fix -23 23 | -24 24 | print("%-5f" % (5,)) -25 25 | -26 |-print("%9f" % (5,)) - 26 |+print("{:9f}".format(5)) -27 27 | -28 28 | print("%#o" % (123,)) -29 29 | +23 | +24 | print("%-5f" % (5,)) +25 | + - print("%9f" % (5,)) +26 + print("{:9f}".format(5)) +27 | +28 | print("%#o" % (123,)) +29 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:28:7 @@ -297,16 +284,15 @@ UP031 [*] Use format specifiers instead of percent format 30 | print("brace {} %s" % (1,)) | help: Replace with format specifiers - -ℹ Unsafe fix -25 25 | -26 26 | print("%9f" % (5,)) -27 27 | -28 |-print("%#o" % (123,)) - 28 |+print("{:#o}".format(123)) -29 29 | -30 30 | print("brace {} %s" % (1,)) -31 31 | +25 | +26 | print("%9f" % (5,)) +27 | + - print("%#o" % (123,)) +28 + print("{:#o}".format(123)) +29 | +30 | print("brace {} %s" % (1,)) +31 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:30:7 @@ -319,16 +305,15 @@ UP031 [*] Use format specifiers instead of percent format 32 | print(( | help: Replace with format specifiers - -ℹ Unsafe fix -27 27 | -28 28 | print("%#o" % (123,)) -29 29 | -30 |-print("brace {} %s" % (1,)) - 30 |+print("brace {{}} {}".format(1)) -31 31 | -32 32 | print(( -33 33 | "foo %s " +27 | +28 | print("%#o" % (123,)) +29 | + - print("brace {} %s" % (1,)) +30 + print("brace {{}} {}".format(1)) +31 | +32 | print(( +33 | "foo %s " +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:33:5 @@ -340,18 +325,17 @@ UP031 [*] Use format specifiers instead of percent format 35 | )) | help: Replace with format specifiers - -ℹ Unsafe fix -30 30 | print("brace {} %s" % (1,)) -31 31 | -32 32 | print(( -33 |- "foo %s " -34 |- "bar %s" % (x, y) - 33 |+ "foo {} " - 34 |+ "bar {}".format(x, y) -35 35 | )) -36 36 | -37 37 | print( +30 | print("brace {} %s" % (1,)) +31 | +32 | print(( + - "foo %s " + - "bar %s" % (x, y) +33 + "foo {} " +34 + "bar {}".format(x, y) +35 | )) +36 | +37 | print( +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:38:3 @@ -364,16 +348,15 @@ UP031 [*] Use format specifiers instead of percent format 41 | ) | help: Replace with format specifiers - -ℹ Unsafe fix -35 35 | )) -36 36 | -37 37 | print( -38 |- "%s" % ( - 38 |+ "{}".format( -39 39 | "trailing comma", -40 40 | ) -41 41 | ) +35 | )) +36 | +37 | print( + - "%s" % ( +38 + "{}".format( +39 | "trailing comma", +40 | ) +41 | ) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:43:7 @@ -386,16 +369,15 @@ UP031 [*] Use format specifiers instead of percent format 45 | print("%(k)s" % {"k": "v"}) | help: Replace with format specifiers - -ℹ Unsafe fix -40 40 | ) -41 41 | ) -42 42 | -43 |-print("foo %s " % (x,)) - 43 |+print("foo {} ".format(x)) -44 44 | -45 45 | print("%(k)s" % {"k": "v"}) -46 46 | +40 | ) +41 | ) +42 | + - print("foo %s " % (x,)) +43 + print("foo {} ".format(x)) +44 | +45 | print("%(k)s" % {"k": "v"}) +46 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:45:7 @@ -408,16 +390,15 @@ UP031 [*] Use format specifiers instead of percent format 47 | print("%(k)s" % { | help: Replace with format specifiers - -ℹ Unsafe fix -42 42 | -43 43 | print("foo %s " % (x,)) -44 44 | -45 |-print("%(k)s" % {"k": "v"}) - 45 |+print("{k}".format(k="v")) -46 46 | -47 47 | print("%(k)s" % { -48 48 | "k": "v", +42 | +43 | print("foo %s " % (x,)) +44 | + - print("%(k)s" % {"k": "v"}) +45 + print("{k}".format(k="v")) +46 | +47 | print("%(k)s" % { +48 | "k": "v", +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:47:7 @@ -434,22 +415,21 @@ UP031 [*] Use format specifiers instead of percent format 52 | print("%(to_list)s" % {"to_list": []}) | help: Replace with format specifiers - -ℹ Unsafe fix -44 44 | -45 45 | print("%(k)s" % {"k": "v"}) -46 46 | -47 |-print("%(k)s" % { -48 |- "k": "v", -49 |- "i": "j" -50 |-}) - 47 |+print("{k}".format( - 48 |+ k="v", - 49 |+ i="j", - 50 |+)) -51 51 | -52 52 | print("%(to_list)s" % {"to_list": []}) -53 53 | +44 | +45 | print("%(k)s" % {"k": "v"}) +46 | + - print("%(k)s" % { + - "k": "v", + - "i": "j" + - }) +47 + print("{k}".format( +48 + k="v", +49 + i="j", +50 + )) +51 | +52 | print("%(to_list)s" % {"to_list": []}) +53 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:52:7 @@ -462,16 +442,15 @@ UP031 [*] Use format specifiers instead of percent format 54 | print("%(k)s" % {"k": "v", "i": 1, "j": []}) | help: Replace with format specifiers - -ℹ Unsafe fix -49 49 | "i": "j" -50 50 | }) -51 51 | -52 |-print("%(to_list)s" % {"to_list": []}) - 52 |+print("{to_list}".format(to_list=[])) -53 53 | -54 54 | print("%(k)s" % {"k": "v", "i": 1, "j": []}) -55 55 | +49 | "i": "j" +50 | }) +51 | + - print("%(to_list)s" % {"to_list": []}) +52 + print("{to_list}".format(to_list=[])) +53 | +54 | print("%(k)s" % {"k": "v", "i": 1, "j": []}) +55 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:54:7 @@ -484,16 +463,15 @@ UP031 [*] Use format specifiers instead of percent format 56 | print("%(ab)s" % {"a" "b": 1}) | help: Replace with format specifiers - -ℹ Unsafe fix -51 51 | -52 52 | print("%(to_list)s" % {"to_list": []}) -53 53 | -54 |-print("%(k)s" % {"k": "v", "i": 1, "j": []}) - 54 |+print("{k}".format(k="v", i=1, j=[])) -55 55 | -56 56 | print("%(ab)s" % {"a" "b": 1}) -57 57 | +51 | +52 | print("%(to_list)s" % {"to_list": []}) +53 | + - print("%(k)s" % {"k": "v", "i": 1, "j": []}) +54 + print("{k}".format(k="v", i=1, j=[])) +55 | +56 | print("%(ab)s" % {"a" "b": 1}) +57 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:56:7 @@ -506,16 +484,15 @@ UP031 [*] Use format specifiers instead of percent format 58 | print("%(a)s" % {"a" : 1}) | help: Replace with format specifiers - -ℹ Unsafe fix -53 53 | -54 54 | print("%(k)s" % {"k": "v", "i": 1, "j": []}) -55 55 | -56 |-print("%(ab)s" % {"a" "b": 1}) - 56 |+print("{ab}".format(ab=1)) -57 57 | -58 58 | print("%(a)s" % {"a" : 1}) -59 59 | +53 | +54 | print("%(k)s" % {"k": "v", "i": 1, "j": []}) +55 | + - print("%(ab)s" % {"a" "b": 1}) +56 + print("{ab}".format(ab=1)) +57 | +58 | print("%(a)s" % {"a" : 1}) +59 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:58:7 @@ -526,16 +503,15 @@ UP031 [*] Use format specifiers instead of percent format | ^^^^^^^^^^^^^^^^^^^^^ | help: Replace with format specifiers - -ℹ Unsafe fix -55 55 | -56 56 | print("%(ab)s" % {"a" "b": 1}) -57 57 | -58 |-print("%(a)s" % {"a" : 1}) - 58 |+print("{a}".format(a=1)) -59 59 | -60 60 | -61 61 | print( +55 | +56 | print("%(ab)s" % {"a" "b": 1}) +57 | + - print("%(a)s" % {"a" : 1}) +58 + print("{a}".format(a=1)) +59 | +60 | +61 | print( +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:62:5 @@ -547,18 +523,17 @@ UP031 [*] Use format specifiers instead of percent format 64 | ) | help: Replace with format specifiers - -ℹ Unsafe fix -59 59 | -60 60 | -61 61 | print( -62 |- "foo %(foo)s " -63 |- "bar %(bar)s" % {"foo": x, "bar": y} - 62 |+ "foo {foo} " - 63 |+ "bar {bar}".format(foo=x, bar=y) -64 64 | ) -65 65 | -66 66 | bar = {"bar": y} +59 | +60 | +61 | print( + - "foo %(foo)s " + - "bar %(bar)s" % {"foo": x, "bar": y} +62 + "foo {foo} " +63 + "bar {bar}".format(foo=x, bar=y) +64 | ) +65 | +66 | bar = {"bar": y} +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:68:5 @@ -571,18 +546,17 @@ UP031 [*] Use format specifiers instead of percent format 70 | ) | help: Replace with format specifiers - -ℹ Unsafe fix -65 65 | -66 66 | bar = {"bar": y} -67 67 | print( -68 |- "foo %(foo)s " -69 |- "bar %(bar)s" % {"foo": x, **bar} - 68 |+ "foo {foo} " - 69 |+ "bar {bar}".format(foo=x, **bar) -70 70 | ) -71 71 | -72 72 | print("%s \N{snowman}" % (a,)) +65 | +66 | bar = {"bar": y} +67 | print( + - "foo %(foo)s " + - "bar %(bar)s" % {"foo": x, **bar} +68 + "foo {foo} " +69 + "bar {bar}".format(foo=x, **bar) +70 | ) +71 | +72 | print("%s \N{snowman}" % (a,)) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:72:7 @@ -595,16 +569,15 @@ UP031 [*] Use format specifiers instead of percent format 74 | print("%(foo)s \N{snowman}" % {"foo": 1}) | help: Replace with format specifiers - -ℹ Unsafe fix -69 69 | "bar %(bar)s" % {"foo": x, **bar} -70 70 | ) -71 71 | -72 |-print("%s \N{snowman}" % (a,)) - 72 |+print("{} \N{snowman}".format(a)) -73 73 | -74 74 | print("%(foo)s \N{snowman}" % {"foo": 1}) -75 75 | +69 | "bar %(bar)s" % {"foo": x, **bar} +70 | ) +71 | + - print("%s \N{snowman}" % (a,)) +72 + print("{} \N{snowman}".format(a)) +73 | +74 | print("%(foo)s \N{snowman}" % {"foo": 1}) +75 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:74:7 @@ -617,16 +590,15 @@ UP031 [*] Use format specifiers instead of percent format 76 | print(("foo %s " "bar %s") % (x, y)) | help: Replace with format specifiers - -ℹ Unsafe fix -71 71 | -72 72 | print("%s \N{snowman}" % (a,)) -73 73 | -74 |-print("%(foo)s \N{snowman}" % {"foo": 1}) - 74 |+print("{foo} \N{snowman}".format(foo=1)) -75 75 | -76 76 | print(("foo %s " "bar %s") % (x, y)) -77 77 | +71 | +72 | print("%s \N{snowman}" % (a,)) +73 | + - print("%(foo)s \N{snowman}" % {"foo": 1}) +74 + print("{foo} \N{snowman}".format(foo=1)) +75 | +76 | print(("foo %s " "bar %s") % (x, y)) +77 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:76:7 @@ -639,16 +611,15 @@ UP031 [*] Use format specifiers instead of percent format 78 | # Single-value expressions | help: Replace with format specifiers - -ℹ Unsafe fix -73 73 | -74 74 | print("%(foo)s \N{snowman}" % {"foo": 1}) -75 75 | -76 |-print(("foo %s " "bar %s") % (x, y)) - 76 |+print(("foo {} " "bar {}").format(x, y)) -77 77 | -78 78 | # Single-value expressions -79 79 | print('Hello %s' % "World") +73 | +74 | print("%(foo)s \N{snowman}" % {"foo": 1}) +75 | + - print(("foo %s " "bar %s") % (x, y)) +76 + print(("foo {} " "bar {}").format(x, y)) +77 | +78 | # Single-value expressions +79 | print('Hello %s' % "World") +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:79:7 @@ -660,16 +631,15 @@ UP031 [*] Use format specifiers instead of percent format 81 | print('Hello %s (%s)' % bar) | help: Replace with format specifiers - -ℹ Unsafe fix -76 76 | print(("foo %s " "bar %s") % (x, y)) -77 77 | -78 78 | # Single-value expressions -79 |-print('Hello %s' % "World") - 79 |+print('Hello {}'.format("World")) -80 80 | print('Hello %s' % f"World") -81 81 | print('Hello %s (%s)' % bar) -82 82 | print('Hello %s (%s)' % bar.baz) +76 | print(("foo %s " "bar %s") % (x, y)) +77 | +78 | # Single-value expressions + - print('Hello %s' % "World") +79 + print('Hello {}'.format("World")) +80 | print('Hello %s' % f"World") +81 | print('Hello %s (%s)' % bar) +82 | print('Hello %s (%s)' % bar.baz) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:80:7 @@ -682,16 +652,15 @@ UP031 [*] Use format specifiers instead of percent format 82 | print('Hello %s (%s)' % bar.baz) | help: Replace with format specifiers - -ℹ Unsafe fix -77 77 | -78 78 | # Single-value expressions -79 79 | print('Hello %s' % "World") -80 |-print('Hello %s' % f"World") - 80 |+print('Hello {}'.format(f"World")) -81 81 | print('Hello %s (%s)' % bar) -82 82 | print('Hello %s (%s)' % bar.baz) -83 83 | print('Hello %s (%s)' % bar['bop']) +77 | +78 | # Single-value expressions +79 | print('Hello %s' % "World") + - print('Hello %s' % f"World") +80 + print('Hello {}'.format(f"World")) +81 | print('Hello %s (%s)' % bar) +82 | print('Hello %s (%s)' % bar.baz) +83 | print('Hello %s (%s)' % bar['bop']) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:81:7 @@ -704,16 +673,15 @@ UP031 [*] Use format specifiers instead of percent format 83 | print('Hello %s (%s)' % bar['bop']) | help: Replace with format specifiers - -ℹ Unsafe fix -78 78 | # Single-value expressions -79 79 | print('Hello %s' % "World") -80 80 | print('Hello %s' % f"World") -81 |-print('Hello %s (%s)' % bar) - 81 |+print('Hello {} ({})'.format(*bar)) -82 82 | print('Hello %s (%s)' % bar.baz) -83 83 | print('Hello %s (%s)' % bar['bop']) -84 84 | print('Hello %(arg)s' % bar) +78 | # Single-value expressions +79 | print('Hello %s' % "World") +80 | print('Hello %s' % f"World") + - print('Hello %s (%s)' % bar) +81 + print('Hello {} ({})'.format(*bar)) +82 | print('Hello %s (%s)' % bar.baz) +83 | print('Hello %s (%s)' % bar['bop']) +84 | print('Hello %(arg)s' % bar) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:82:7 @@ -726,16 +694,15 @@ UP031 [*] Use format specifiers instead of percent format 84 | print('Hello %(arg)s' % bar) | help: Replace with format specifiers - -ℹ Unsafe fix -79 79 | print('Hello %s' % "World") -80 80 | print('Hello %s' % f"World") -81 81 | print('Hello %s (%s)' % bar) -82 |-print('Hello %s (%s)' % bar.baz) - 82 |+print('Hello {} ({})'.format(*bar.baz)) -83 83 | print('Hello %s (%s)' % bar['bop']) -84 84 | print('Hello %(arg)s' % bar) -85 85 | print('Hello %(arg)s' % bar.baz) +79 | print('Hello %s' % "World") +80 | print('Hello %s' % f"World") +81 | print('Hello %s (%s)' % bar) + - print('Hello %s (%s)' % bar.baz) +82 + print('Hello {} ({})'.format(*bar.baz)) +83 | print('Hello %s (%s)' % bar['bop']) +84 | print('Hello %(arg)s' % bar) +85 | print('Hello %(arg)s' % bar.baz) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:83:7 @@ -748,16 +715,15 @@ UP031 [*] Use format specifiers instead of percent format 85 | print('Hello %(arg)s' % bar.baz) | help: Replace with format specifiers - -ℹ Unsafe fix -80 80 | print('Hello %s' % f"World") -81 81 | print('Hello %s (%s)' % bar) -82 82 | print('Hello %s (%s)' % bar.baz) -83 |-print('Hello %s (%s)' % bar['bop']) - 83 |+print('Hello {} ({})'.format(*bar['bop'])) -84 84 | print('Hello %(arg)s' % bar) -85 85 | print('Hello %(arg)s' % bar.baz) -86 86 | print('Hello %(arg)s' % bar['bop']) +80 | print('Hello %s' % f"World") +81 | print('Hello %s (%s)' % bar) +82 | print('Hello %s (%s)' % bar.baz) + - print('Hello %s (%s)' % bar['bop']) +83 + print('Hello {} ({})'.format(*bar['bop'])) +84 | print('Hello %(arg)s' % bar) +85 | print('Hello %(arg)s' % bar.baz) +86 | print('Hello %(arg)s' % bar['bop']) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:84:7 @@ -770,16 +736,15 @@ UP031 [*] Use format specifiers instead of percent format 86 | print('Hello %(arg)s' % bar['bop']) | help: Replace with format specifiers - -ℹ Unsafe fix -81 81 | print('Hello %s (%s)' % bar) -82 82 | print('Hello %s (%s)' % bar.baz) -83 83 | print('Hello %s (%s)' % bar['bop']) -84 |-print('Hello %(arg)s' % bar) - 84 |+print('Hello {arg}'.format(**bar)) -85 85 | print('Hello %(arg)s' % bar.baz) -86 86 | print('Hello %(arg)s' % bar['bop']) -87 87 | +81 | print('Hello %s (%s)' % bar) +82 | print('Hello %s (%s)' % bar.baz) +83 | print('Hello %s (%s)' % bar['bop']) + - print('Hello %(arg)s' % bar) +84 + print('Hello {arg}'.format(**bar)) +85 | print('Hello %(arg)s' % bar.baz) +86 | print('Hello %(arg)s' % bar['bop']) +87 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:85:7 @@ -791,16 +756,15 @@ UP031 [*] Use format specifiers instead of percent format 86 | print('Hello %(arg)s' % bar['bop']) | help: Replace with format specifiers - -ℹ Unsafe fix -82 82 | print('Hello %s (%s)' % bar.baz) -83 83 | print('Hello %s (%s)' % bar['bop']) -84 84 | print('Hello %(arg)s' % bar) -85 |-print('Hello %(arg)s' % bar.baz) - 85 |+print('Hello {arg}'.format(**bar.baz)) -86 86 | print('Hello %(arg)s' % bar['bop']) -87 87 | -88 88 | # Hanging modulos +82 | print('Hello %s (%s)' % bar.baz) +83 | print('Hello %s (%s)' % bar['bop']) +84 | print('Hello %(arg)s' % bar) + - print('Hello %(arg)s' % bar.baz) +85 + print('Hello {arg}'.format(**bar.baz)) +86 | print('Hello %(arg)s' % bar['bop']) +87 | +88 | # Hanging modulos +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:86:7 @@ -813,16 +777,15 @@ UP031 [*] Use format specifiers instead of percent format 88 | # Hanging modulos | help: Replace with format specifiers - -ℹ Unsafe fix -83 83 | print('Hello %s (%s)' % bar['bop']) -84 84 | print('Hello %(arg)s' % bar) -85 85 | print('Hello %(arg)s' % bar.baz) -86 |-print('Hello %(arg)s' % bar['bop']) - 86 |+print('Hello {arg}'.format(**bar['bop'])) -87 87 | -88 88 | # Hanging modulos -89 89 | ( +83 | print('Hello %s (%s)' % bar['bop']) +84 | print('Hello %(arg)s' % bar) +85 | print('Hello %(arg)s' % bar.baz) + - print('Hello %(arg)s' % bar['bop']) +86 + print('Hello {arg}'.format(**bar['bop'])) +87 | +88 | # Hanging modulos +89 | ( +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:89:1 @@ -837,20 +800,19 @@ UP031 [*] Use format specifiers instead of percent format 94 | ( | help: Replace with format specifiers - -ℹ Unsafe fix -87 87 | -88 88 | # Hanging modulos -89 89 | ( -90 |- "foo %s " -91 |- "bar %s" -92 |-) % (x, y) - 90 |+ "foo {} " - 91 |+ "bar {}" - 92 |+).format(x, y) -93 93 | -94 94 | ( -95 95 | "foo %(foo)s " +87 | +88 | # Hanging modulos +89 | ( + - "foo %s " + - "bar %s" + - ) % (x, y) +90 + "foo {} " +91 + "bar {}" +92 + ).format(x, y) +93 | +94 | ( +95 | "foo %(foo)s " +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:94:1 @@ -866,20 +828,19 @@ UP031 [*] Use format specifiers instead of percent format 99 | ( | help: Replace with format specifiers - -ℹ Unsafe fix -92 92 | ) % (x, y) -93 93 | -94 94 | ( -95 |- "foo %(foo)s " -96 |- "bar %(bar)s" -97 |-) % {"foo": x, "bar": y} - 95 |+ "foo {foo} " - 96 |+ "bar {bar}" - 97 |+).format(foo=x, bar=y) -98 98 | -99 99 | ( -100 100 | """foo %s""" +92 | ) % (x, y) +93 | +94 | ( + - "foo %(foo)s " + - "bar %(bar)s" + - ) % {"foo": x, "bar": y} +95 + "foo {foo} " +96 + "bar {bar}" +97 + ).format(foo=x, bar=y) +98 | +99 | ( +100 | """foo %s""" +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:100:5 @@ -891,17 +852,16 @@ UP031 [*] Use format specifiers instead of percent format 102 | ) | help: Replace with format specifiers - -ℹ Unsafe fix -97 97 | ) % {"foo": x, "bar": y} -98 98 | -99 99 | ( -100 |- """foo %s""" -101 |- % (x,) - 100 |+ """foo {}""".format(x) -102 101 | ) -103 102 | -104 103 | ( +97 | ) % {"foo": x, "bar": y} +98 | +99 | ( + - """foo %s""" + - % (x,) +100 + """foo {}""".format(x) +101 | ) +102 | +103 | ( +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:105:5 @@ -915,19 +875,18 @@ UP031 [*] Use format specifiers instead of percent format 109 | ) | help: Replace with format specifiers - -ℹ Unsafe fix -103 103 | -104 104 | ( -105 105 | """ -106 |- foo %s -107 |- """ -108 |- % (x,) - 106 |+ foo {} - 107 |+ """.format(x) -109 108 | ) -110 109 | -111 110 | "%s" % ( +103 | +104 | ( +105 | """ + - foo %s + - """ + - % (x,) +106 + foo {} +107 + """.format(x) +108 | ) +109 | +110 | "%s" % ( +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:111:1 @@ -940,16 +899,15 @@ UP031 [*] Use format specifiers instead of percent format | |_^ | help: Replace with format specifiers - -ℹ Unsafe fix -108 108 | % (x,) -109 109 | ) -110 110 | -111 |-"%s" % ( - 111 |+"{}".format( -112 112 | x, # comment -113 113 | ) -114 114 | +108 | % (x,) +109 | ) +110 | + - "%s" % ( +111 + "{}".format( +112 | x, # comment +113 | ) +114 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:116:8 @@ -965,16 +923,15 @@ UP031 [*] Use format specifiers instead of percent format 122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes) | help: Replace with format specifiers - -ℹ Unsafe fix -113 113 | ) -114 114 | -115 115 | -116 |-path = "%s-%s-%s.pem" % ( - 116 |+path = "{}-{}-{}.pem".format( -117 117 | safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename -118 118 | cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date -119 119 | hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix +113 | ) +114 | +115 | + - path = "%s-%s-%s.pem" % ( +116 + path = "{}-{}-{}.pem".format( +117 | safe_domain_name(cn), # common name, which should be filename safe because it is IDNA-encoded, but in case of a malformed cert make sure it's ok to use as a filename +118 | cert.not_valid_after.date().isoformat().replace("-", ""), # expiration date +119 | hexlify(cert.fingerprint(hashes.SHA256())).decode("ascii")[0:8], # fingerprint prefix +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:123:1 @@ -986,16 +943,15 @@ UP031 [*] Use format specifiers instead of percent format 125 | 'Hello %s' % bar.baz | help: Replace with format specifiers - -ℹ Unsafe fix -120 120 | ) -121 121 | -122 122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes) -123 |-'Hello %s' % bar - 123 |+'Hello {}'.format(bar) -124 124 | -125 125 | 'Hello %s' % bar.baz -126 126 | +120 | ) +121 | +122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes) + - 'Hello %s' % bar +123 + 'Hello {}'.format(bar) +124 | +125 | 'Hello %s' % bar.baz +126 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:125:1 @@ -1008,16 +964,15 @@ UP031 [*] Use format specifiers instead of percent format 127 | 'Hello %s' % bar['bop'] | help: Replace with format specifiers - -ℹ Unsafe fix -122 122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes) -123 123 | 'Hello %s' % bar -124 124 | -125 |-'Hello %s' % bar.baz - 125 |+'Hello {}'.format(bar.baz) -126 126 | -127 127 | 'Hello %s' % bar['bop'] -128 128 | +122 | # UP031 (no longer false negatives; now offer potentially unsafe fixes) +123 | 'Hello %s' % bar +124 | + - 'Hello %s' % bar.baz +125 + 'Hello {}'.format(bar.baz) +126 | +127 | 'Hello %s' % bar['bop'] +128 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:127:1 @@ -1030,16 +985,15 @@ UP031 [*] Use format specifiers instead of percent format 129 | # Not a valid type annotation but this test shouldn't result in a panic. | help: Replace with format specifiers - -ℹ Unsafe fix -124 124 | -125 125 | 'Hello %s' % bar.baz -126 126 | -127 |-'Hello %s' % bar['bop'] - 127 |+'Hello {}'.format(bar['bop']) -128 128 | -129 129 | # Not a valid type annotation but this test shouldn't result in a panic. -130 130 | # Refer: https://github.com/astral-sh/ruff/issues/11736 +124 | +125 | 'Hello %s' % bar.baz +126 | + - 'Hello %s' % bar['bop'] +127 + 'Hello {}'.format(bar['bop']) +128 | +129 | # Not a valid type annotation but this test shouldn't result in a panic. +130 | # Refer: https://github.com/astral-sh/ruff/issues/11736 +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:131:5 @@ -1052,16 +1006,15 @@ UP031 [*] Use format specifiers instead of percent format 133 | # See: https://github.com/astral-sh/ruff/issues/12421 | help: Replace with format specifiers - -ℹ Unsafe fix -128 128 | -129 129 | # Not a valid type annotation but this test shouldn't result in a panic. -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) +128 | +129 | # Not a valid type annotation but this test shouldn't result in a panic. +130 | # Refer: https://github.com/astral-sh/ruff/issues/11736 + - x: "'%s + %s' % (1, 2)" +131 + x: "'{} + {}'.format(1, 2)" +132 | +133 | # See: https://github.com/astral-sh/ruff/issues/12421 +134 | print("%.2X" % 1) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:134:7 @@ -1073,16 +1026,15 @@ UP031 [*] Use format specifiers instead of percent format 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) +131 | x: "'%s + %s' % (1, 2)" +132 | +133 | # See: https://github.com/astral-sh/ruff/issues/12421 + - print("%.2X" % 1) +134 + print("{:02X}".format(1)) +135 | print("%.02X" % 1) +136 | print("%02X" % 1) +137 | print("%.00002X" % 1) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:135:7 @@ -1095,16 +1047,15 @@ UP031 [*] Use format specifiers instead of percent format 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) +132 | +133 | # See: https://github.com/astral-sh/ruff/issues/12421 +134 | print("%.2X" % 1) + - print("%.02X" % 1) +135 + print("{:02X}".format(1)) +136 | print("%02X" % 1) +137 | print("%.00002X" % 1) +138 | print("%.20X" % 1) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:136:7 @@ -1117,16 +1068,15 @@ UP031 [*] Use format specifiers instead of percent format 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 | +133 | # See: https://github.com/astral-sh/ruff/issues/12421 +134 | print("%.2X" % 1) +135 | print("%.02X" % 1) + - print("%02X" % 1) +136 + print("{:02X}".format(1)) +137 | print("%.00002X" % 1) +138 | print("%.20X" % 1) +139 | +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:137:7 @@ -1138,16 +1088,15 @@ UP031 [*] Use format specifiers instead of percent format 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) +134 | print("%.2X" % 1) +135 | print("%.02X" % 1) +136 | print("%02X" % 1) + - print("%.00002X" % 1) +137 + print("{:02X}".format(1)) +138 | print("%.20X" % 1) +139 | +140 | print("%2X" % 1) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:138:7 @@ -1160,16 +1109,15 @@ UP031 [*] Use format specifiers instead of percent format 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) +135 | print("%.02X" % 1) +136 | print("%02X" % 1) +137 | print("%.00002X" % 1) + - print("%.20X" % 1) +138 + print("{:020X}".format(1)) +139 | +140 | print("%2X" % 1) +141 | print("%02X" % 1) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:140:7 @@ -1181,16 +1129,15 @@ UP031 [*] Use format specifiers instead of percent format 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) -142 142 | -143 143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax) +137 | print("%.00002X" % 1) +138 | print("%.20X" % 1) +139 | + - print("%2X" % 1) +140 + print("{:2X}".format(1)) +141 | print("%02X" % 1) +142 | +143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax) +note: This is an unsafe fix and may change runtime behavior UP031 [*] Use format specifiers instead of percent format --> UP031_0.py:141:7 @@ -1202,16 +1149,15 @@ UP031 [*] Use format specifiers instead of percent format 143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax) | 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)) -142 142 | -143 143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax) -144 144 | +138 | print("%.20X" % 1) +139 | +140 | print("%2X" % 1) + - print("%02X" % 1) +141 + print("{:02X}".format(1)) +142 | +143 | # UP031 (no longer false negatives, but offer no fix because of more complex syntax) +144 | +note: This is an unsafe fix and may change runtime behavior UP031 Use format specifiers instead of percent format --> UP031_0.py:145:1 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap index 19c78a643d..1efc909fb3 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_0.py.snap @@ -12,16 +12,14 @@ UP032 [*] Use f-string instead of `format` call 7 | "{1} {0}".format(a, b) | help: Convert to f-string - -ℹ Safe fix -2 2 | # Errors -3 3 | ### -4 4 | -5 |-"{} {}".format(a, b) - 5 |+f"{a} {b}" -6 6 | -7 7 | "{1} {0}".format(a, b) -8 8 | +2 | # Errors +3 | ### +4 | + - "{} {}".format(a, b) +5 + f"{a} {b}" +6 | +7 | "{1} {0}".format(a, b) +8 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:7:1 @@ -34,16 +32,14 @@ UP032 [*] Use f-string instead of `format` call 9 | "{0} {1} {0}".format(a, b) | help: Convert to f-string - -ℹ Safe fix -4 4 | -5 5 | "{} {}".format(a, b) -6 6 | -7 |-"{1} {0}".format(a, b) - 7 |+f"{b} {a}" -8 8 | -9 9 | "{0} {1} {0}".format(a, b) -10 10 | +4 | +5 | "{} {}".format(a, b) +6 | + - "{1} {0}".format(a, b) +7 + f"{b} {a}" +8 | +9 | "{0} {1} {0}".format(a, b) +10 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:9:1 @@ -56,16 +52,14 @@ UP032 [*] Use f-string instead of `format` call 11 | "{x.y}".format(x=z) | help: Convert to f-string - -ℹ Safe fix -6 6 | -7 7 | "{1} {0}".format(a, b) -8 8 | -9 |-"{0} {1} {0}".format(a, b) - 9 |+f"{a} {b} {a}" -10 10 | -11 11 | "{x.y}".format(x=z) -12 12 | +6 | +7 | "{1} {0}".format(a, b) +8 | + - "{0} {1} {0}".format(a, b) +9 + f"{a} {b} {a}" +10 | +11 | "{x.y}".format(x=z) +12 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:11:1 @@ -78,16 +72,14 @@ UP032 [*] Use f-string instead of `format` call 13 | "{x} {y} {x}".format(x=a, y=b) | help: Convert to f-string - -ℹ Safe fix -8 8 | -9 9 | "{0} {1} {0}".format(a, b) -10 10 | -11 |-"{x.y}".format(x=z) - 11 |+f"{z.y}" -12 12 | -13 13 | "{x} {y} {x}".format(x=a, y=b) -14 14 | +8 | +9 | "{0} {1} {0}".format(a, b) +10 | + - "{x.y}".format(x=z) +11 + f"{z.y}" +12 | +13 | "{x} {y} {x}".format(x=a, y=b) +14 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:13:1 @@ -100,16 +92,14 @@ UP032 [*] Use f-string instead of `format` call 15 | "{.x} {.y}".format(a, b) | help: Convert to f-string - -ℹ Safe fix -10 10 | -11 11 | "{x.y}".format(x=z) -12 12 | -13 |-"{x} {y} {x}".format(x=a, y=b) - 13 |+f"{a} {b} {a}" -14 14 | -15 15 | "{.x} {.y}".format(a, b) -16 16 | +10 | +11 | "{x.y}".format(x=z) +12 | + - "{x} {y} {x}".format(x=a, y=b) +13 + f"{a} {b} {a}" +14 | +15 | "{.x} {.y}".format(a, b) +16 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:15:1 @@ -122,16 +112,14 @@ UP032 [*] Use f-string instead of `format` call 17 | "{} {}".format(a.b, c.d) | help: Convert to f-string - -ℹ Safe fix -12 12 | -13 13 | "{x} {y} {x}".format(x=a, y=b) -14 14 | -15 |-"{.x} {.y}".format(a, b) - 15 |+f"{a.x} {b.y}" -16 16 | -17 17 | "{} {}".format(a.b, c.d) -18 18 | +12 | +13 | "{x} {y} {x}".format(x=a, y=b) +14 | + - "{.x} {.y}".format(a, b) +15 + f"{a.x} {b.y}" +16 | +17 | "{} {}".format(a.b, c.d) +18 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:17:1 @@ -144,16 +132,14 @@ UP032 [*] Use f-string instead of `format` call 19 | "{}".format(a()) | help: Convert to f-string - -ℹ Safe fix -14 14 | -15 15 | "{.x} {.y}".format(a, b) -16 16 | -17 |-"{} {}".format(a.b, c.d) - 17 |+f"{a.b} {c.d}" -18 18 | -19 19 | "{}".format(a()) -20 20 | +14 | +15 | "{.x} {.y}".format(a, b) +16 | + - "{} {}".format(a.b, c.d) +17 + f"{a.b} {c.d}" +18 | +19 | "{}".format(a()) +20 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:19:1 @@ -166,16 +152,14 @@ UP032 [*] Use f-string instead of `format` call 21 | "{}".format(a.b()) | help: Convert to f-string - -ℹ Safe fix -16 16 | -17 17 | "{} {}".format(a.b, c.d) -18 18 | -19 |-"{}".format(a()) - 19 |+f"{a()}" -20 20 | -21 21 | "{}".format(a.b()) -22 22 | +16 | +17 | "{} {}".format(a.b, c.d) +18 | + - "{}".format(a()) +19 + f"{a()}" +20 | +21 | "{}".format(a.b()) +22 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:21:1 @@ -188,16 +172,14 @@ UP032 [*] Use f-string instead of `format` call 23 | "{}".format(a.b().c()) | help: Convert to f-string - -ℹ Safe fix -18 18 | -19 19 | "{}".format(a()) -20 20 | -21 |-"{}".format(a.b()) - 21 |+f"{a.b()}" -22 22 | -23 23 | "{}".format(a.b().c()) -24 24 | +18 | +19 | "{}".format(a()) +20 | + - "{}".format(a.b()) +21 + f"{a.b()}" +22 | +23 | "{}".format(a.b().c()) +24 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:23:1 @@ -210,16 +192,14 @@ UP032 [*] Use f-string instead of `format` call 25 | "hello {}!".format(name) | help: Convert to f-string - -ℹ Safe fix -20 20 | -21 21 | "{}".format(a.b()) -22 22 | -23 |-"{}".format(a.b().c()) - 23 |+f"{a.b().c()}" -24 24 | -25 25 | "hello {}!".format(name) -26 26 | +20 | +21 | "{}".format(a.b()) +22 | + - "{}".format(a.b().c()) +23 + f"{a.b().c()}" +24 | +25 | "hello {}!".format(name) +26 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:25:1 @@ -232,16 +212,14 @@ UP032 [*] Use f-string instead of `format` call 27 | "{}{b}{}".format(a, c, b=b) | help: Convert to f-string - -ℹ Safe fix -22 22 | -23 23 | "{}".format(a.b().c()) -24 24 | -25 |-"hello {}!".format(name) - 25 |+f"hello {name}!" -26 26 | -27 27 | "{}{b}{}".format(a, c, b=b) -28 28 | +22 | +23 | "{}".format(a.b().c()) +24 | + - "hello {}!".format(name) +25 + f"hello {name}!" +26 | +27 | "{}{b}{}".format(a, c, b=b) +28 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:27:1 @@ -254,16 +232,14 @@ UP032 [*] Use f-string instead of `format` call 29 | "{}".format(0x0) | help: Convert to f-string - -ℹ Safe fix -24 24 | -25 25 | "hello {}!".format(name) -26 26 | -27 |-"{}{b}{}".format(a, c, b=b) - 27 |+f"{a}{b}{c}" -28 28 | -29 29 | "{}".format(0x0) -30 30 | +24 | +25 | "hello {}!".format(name) +26 | + - "{}{b}{}".format(a, c, b=b) +27 + f"{a}{b}{c}" +28 | +29 | "{}".format(0x0) +30 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:29:1 @@ -276,16 +252,14 @@ UP032 [*] Use f-string instead of `format` call 31 | "{} {}".format(a, b) | help: Convert to f-string - -ℹ Safe fix -26 26 | -27 27 | "{}{b}{}".format(a, c, b=b) -28 28 | -29 |-"{}".format(0x0) - 29 |+f"{0x0}" -30 30 | -31 31 | "{} {}".format(a, b) -32 32 | +26 | +27 | "{}{b}{}".format(a, c, b=b) +28 | + - "{}".format(0x0) +29 + f"{0x0}" +30 | +31 | "{} {}".format(a, b) +32 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:31:1 @@ -298,16 +272,14 @@ UP032 [*] Use f-string instead of `format` call 33 | """{} {}""".format(a, b) | help: Convert to f-string - -ℹ Safe fix -28 28 | -29 29 | "{}".format(0x0) -30 30 | -31 |-"{} {}".format(a, b) - 31 |+f"{a} {b}" -32 32 | -33 33 | """{} {}""".format(a, b) -34 34 | +28 | +29 | "{}".format(0x0) +30 | + - "{} {}".format(a, b) +31 + f"{a} {b}" +32 | +33 | """{} {}""".format(a, b) +34 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:33:1 @@ -320,16 +292,14 @@ UP032 [*] Use f-string instead of `format` call 35 | "foo{}".format(1) | help: Convert to f-string - -ℹ Safe fix -30 30 | -31 31 | "{} {}".format(a, b) -32 32 | -33 |-"""{} {}""".format(a, b) - 33 |+f"""{a} {b}""" -34 34 | -35 35 | "foo{}".format(1) -36 36 | +30 | +31 | "{} {}".format(a, b) +32 | + - """{} {}""".format(a, b) +33 + f"""{a} {b}""" +34 | +35 | "foo{}".format(1) +36 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:35:1 @@ -342,16 +312,14 @@ UP032 [*] Use f-string instead of `format` call 37 | r"foo{}".format(1) | help: Convert to f-string - -ℹ Safe fix -32 32 | -33 33 | """{} {}""".format(a, b) -34 34 | -35 |-"foo{}".format(1) - 35 |+f"foo{1}" -36 36 | -37 37 | r"foo{}".format(1) -38 38 | +32 | +33 | """{} {}""".format(a, b) +34 | + - "foo{}".format(1) +35 + f"foo{1}" +36 | +37 | r"foo{}".format(1) +38 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:37:1 @@ -364,16 +332,14 @@ UP032 [*] Use f-string instead of `format` call 39 | x = "{a}".format(a=1) | help: Convert to f-string - -ℹ Safe fix -34 34 | -35 35 | "foo{}".format(1) -36 36 | -37 |-r"foo{}".format(1) - 37 |+rf"foo{1}" -38 38 | -39 39 | x = "{a}".format(a=1) -40 40 | +34 | +35 | "foo{}".format(1) +36 | + - r"foo{}".format(1) +37 + rf"foo{1}" +38 | +39 | x = "{a}".format(a=1) +40 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:39:5 @@ -386,16 +352,14 @@ UP032 [*] Use f-string instead of `format` call 41 | print("foo {} ".format(x)) | help: Convert to f-string - -ℹ Safe fix -36 36 | -37 37 | r"foo{}".format(1) -38 38 | -39 |-x = "{a}".format(a=1) - 39 |+x = f"{1}" -40 40 | -41 41 | print("foo {} ".format(x)) -42 42 | +36 | +37 | r"foo{}".format(1) +38 | + - x = "{a}".format(a=1) +39 + x = f"{1}" +40 | +41 | print("foo {} ".format(x)) +42 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:41:7 @@ -408,16 +372,14 @@ UP032 [*] Use f-string instead of `format` call 43 | "{a[b]}".format(a=a) | help: Convert to f-string - -ℹ Safe fix -38 38 | -39 39 | x = "{a}".format(a=1) -40 40 | -41 |-print("foo {} ".format(x)) - 41 |+print(f"foo {x} ") -42 42 | -43 43 | "{a[b]}".format(a=a) -44 44 | +38 | +39 | x = "{a}".format(a=1) +40 | + - print("foo {} ".format(x)) +41 + print(f"foo {x} ") +42 | +43 | "{a[b]}".format(a=a) +44 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:43:1 @@ -430,16 +392,14 @@ UP032 [*] Use f-string instead of `format` call 45 | "{a.a[b]}".format(a=a) | help: Convert to f-string - -ℹ Safe fix -40 40 | -41 41 | print("foo {} ".format(x)) -42 42 | -43 |-"{a[b]}".format(a=a) - 43 |+f"{a['b']}" -44 44 | -45 45 | "{a.a[b]}".format(a=a) -46 46 | +40 | +41 | print("foo {} ".format(x)) +42 | + - "{a[b]}".format(a=a) +43 + f"{a['b']}" +44 | +45 | "{a.a[b]}".format(a=a) +46 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:45:1 @@ -452,16 +412,14 @@ UP032 [*] Use f-string instead of `format` call 47 | "{}{{}}{}".format(escaped, y) | help: Convert to f-string - -ℹ Safe fix -42 42 | -43 43 | "{a[b]}".format(a=a) -44 44 | -45 |-"{a.a[b]}".format(a=a) - 45 |+f"{a.a['b']}" -46 46 | -47 47 | "{}{{}}{}".format(escaped, y) -48 48 | +42 | +43 | "{a[b]}".format(a=a) +44 | + - "{a.a[b]}".format(a=a) +45 + f"{a.a['b']}" +46 | +47 | "{}{{}}{}".format(escaped, y) +48 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:47:1 @@ -474,16 +432,14 @@ UP032 [*] Use f-string instead of `format` call 49 | "{}".format(a) | help: Convert to f-string - -ℹ Safe fix -44 44 | -45 45 | "{a.a[b]}".format(a=a) -46 46 | -47 |-"{}{{}}{}".format(escaped, y) - 47 |+f"{escaped}{{}}{y}" -48 48 | -49 49 | "{}".format(a) -50 50 | +44 | +45 | "{a.a[b]}".format(a=a) +46 | + - "{}{{}}{}".format(escaped, y) +47 + f"{escaped}{{}}{y}" +48 | +49 | "{}".format(a) +50 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:49:1 @@ -496,16 +452,14 @@ UP032 [*] Use f-string instead of `format` call 51 | '({}={{0!e}})'.format(a) | help: Convert to f-string - -ℹ Safe fix -46 46 | -47 47 | "{}{{}}{}".format(escaped, y) -48 48 | -49 |-"{}".format(a) - 49 |+f"{a}" -50 50 | -51 51 | '({}={{0!e}})'.format(a) -52 52 | +46 | +47 | "{}{{}}{}".format(escaped, y) +48 | + - "{}".format(a) +49 + f"{a}" +50 | +51 | '({}={{0!e}})'.format(a) +52 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:51:1 @@ -518,16 +472,14 @@ UP032 [*] Use f-string instead of `format` call 53 | "{[b]}".format(a) | help: Convert to f-string - -ℹ Safe fix -48 48 | -49 49 | "{}".format(a) -50 50 | -51 |-'({}={{0!e}})'.format(a) - 51 |+f'({a}={{0!e}})' -52 52 | -53 53 | "{[b]}".format(a) -54 54 | +48 | +49 | "{}".format(a) +50 | + - '({}={{0!e}})'.format(a) +51 + f'({a}={{0!e}})' +52 | +53 | "{[b]}".format(a) +54 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:53:1 @@ -540,16 +492,14 @@ UP032 [*] Use f-string instead of `format` call 55 | '{[b]}'.format(a) | help: Convert to f-string - -ℹ Safe fix -50 50 | -51 51 | '({}={{0!e}})'.format(a) -52 52 | -53 |-"{[b]}".format(a) - 53 |+f"{a['b']}" -54 54 | -55 55 | '{[b]}'.format(a) -56 56 | +50 | +51 | '({}={{0!e}})'.format(a) +52 | + - "{[b]}".format(a) +53 + f"{a['b']}" +54 | +55 | '{[b]}'.format(a) +56 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:55:1 @@ -562,16 +512,14 @@ UP032 [*] Use f-string instead of `format` call 57 | """{[b]}""".format(a) | help: Convert to f-string - -ℹ Safe fix -52 52 | -53 53 | "{[b]}".format(a) -54 54 | -55 |-'{[b]}'.format(a) - 55 |+f'{a["b"]}' -56 56 | -57 57 | """{[b]}""".format(a) -58 58 | +52 | +53 | "{[b]}".format(a) +54 | + - '{[b]}'.format(a) +55 + f'{a["b"]}' +56 | +57 | """{[b]}""".format(a) +58 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:57:1 @@ -584,16 +532,14 @@ UP032 [*] Use f-string instead of `format` call 59 | '''{[b]}'''.format(a) | help: Convert to f-string - -ℹ Safe fix -54 54 | -55 55 | '{[b]}'.format(a) -56 56 | -57 |-"""{[b]}""".format(a) - 57 |+f"""{a["b"]}""" -58 58 | -59 59 | '''{[b]}'''.format(a) -60 60 | +54 | +55 | '{[b]}'.format(a) +56 | + - """{[b]}""".format(a) +57 + f"""{a["b"]}""" +58 | +59 | '''{[b]}'''.format(a) +60 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:59:1 @@ -606,16 +552,14 @@ UP032 [*] Use f-string instead of `format` call 61 | "{}".format( | help: Convert to f-string - -ℹ Safe fix -56 56 | -57 57 | """{[b]}""".format(a) -58 58 | -59 |-'''{[b]}'''.format(a) - 59 |+f'''{a["b"]}''' -60 60 | -61 61 | "{}".format( -62 62 | 1 +56 | +57 | """{[b]}""".format(a) +58 | + - '''{[b]}'''.format(a) +59 + f'''{a["b"]}''' +60 | +61 | "{}".format( +62 | 1 UP032 [*] Use f-string instead of `format` call --> UP032_0.py:61:1 @@ -630,18 +574,16 @@ UP032 [*] Use f-string instead of `format` call 65 | "123456789 {}".format( | help: Convert to f-string - -ℹ Safe fix -58 58 | -59 59 | '''{[b]}'''.format(a) -60 60 | -61 |-"{}".format( -62 |- 1 -63 |-) - 61 |+f"{1}" -64 62 | -65 63 | "123456789 {}".format( -66 64 | 1111111111111111111111111111111111111111111111111111111111111111111111111, +58 | +59 | '''{[b]}'''.format(a) +60 | + - "{}".format( + - 1 + - ) +61 + f"{1}" +62 | +63 | "123456789 {}".format( +64 | 1111111111111111111111111111111111111111111111111111111111111111111111111, UP032 [*] Use f-string instead of `format` call --> UP032_0.py:65:1 @@ -656,18 +598,16 @@ UP032 [*] Use f-string instead of `format` call 69 | """ | help: Convert to f-string - -ℹ Safe fix -62 62 | 1 -63 63 | ) -64 64 | -65 |-"123456789 {}".format( -66 |- 1111111111111111111111111111111111111111111111111111111111111111111111111, -67 |-) - 65 |+f"123456789 {1111111111111111111111111111111111111111111111111111111111111111111111111}" -68 66 | -69 67 | """ -70 68 | {} +62 | 1 +63 | ) +64 | + - "123456789 {}".format( + - 1111111111111111111111111111111111111111111111111111111111111111111111111, + - ) +65 + f"123456789 {1111111111111111111111111111111111111111111111111111111111111111111111111}" +66 | +67 | """ +68 | {} UP032 [*] Use f-string instead of `format` call --> UP032_0.py:69:1 @@ -682,19 +622,17 @@ UP032 [*] Use f-string instead of `format` call 73 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """ | help: Convert to f-string - -ℹ Safe fix -66 66 | 1111111111111111111111111111111111111111111111111111111111111111111111111, -67 67 | ) -68 68 | - 69 |+f""" - 70 |+{1} -69 71 | """ -70 |-{} -71 |-""".format(1) -72 72 | -73 73 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """ -74 74 | {} +66 | 1111111111111111111111111111111111111111111111111111111111111111111111111, +67 | ) +68 | +69 + f""" +70 + {1} +71 | """ + - {} + - """.format(1) +72 | +73 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """ +74 | {} UP032 [*] Use f-string instead of `format` call --> UP032_0.py:73:85 @@ -712,22 +650,20 @@ UP032 [*] Use f-string instead of `format` call 79 | "{a}" "{b}".format(a=1, b=1) | help: Convert to f-string - -ℹ Safe fix -70 70 | {} -71 71 | """.format(1) -72 72 | -73 |-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """ -74 |-{} -75 |-""".format( -76 |- 111111 -77 |-) - 73 |+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f""" - 74 |+{111111} - 75 |+""" -78 76 | -79 77 | "{a}" "{b}".format(a=1, b=1) -80 78 | +70 | {} +71 | """.format(1) +72 | + - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """ + - {} + - """.format( + - 111111 + - ) +73 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f""" +74 + {111111} +75 + """ +76 | +77 | "{a}" "{b}".format(a=1, b=1) +78 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:79:1 @@ -740,16 +676,14 @@ UP032 [*] Use f-string instead of `format` call 81 | ( | help: Convert to f-string - -ℹ Safe fix -76 76 | 111111 -77 77 | ) -78 78 | -79 |-"{a}" "{b}".format(a=1, b=1) - 79 |+f"{1}" f"{1}" -80 80 | -81 81 | ( -82 82 | "{a}" +76 | 111111 +77 | ) +78 | + - "{a}" "{b}".format(a=1, b=1) +79 + f"{1}" f"{1}" +80 | +81 | ( +82 | "{a}" UP032 [*] Use f-string instead of `format` call --> UP032_0.py:81:1 @@ -765,20 +699,18 @@ UP032 [*] Use f-string instead of `format` call 86 | ( | help: Convert to f-string - -ℹ Safe fix -79 79 | "{a}" "{b}".format(a=1, b=1) -80 80 | -81 81 | ( -82 |- "{a}" -83 |- "{b}" -84 |-).format(a=1, b=1) - 82 |+ f"{1}" - 83 |+ f"{1}" - 84 |+) -85 85 | -86 86 | ( -87 87 | "{a}" +79 | "{a}" "{b}".format(a=1, b=1) +80 | +81 | ( + - "{a}" + - "{b}" + - ).format(a=1, b=1) +82 + f"{1}" +83 + f"{1}" +84 + ) +85 | +86 | ( +87 | "{a}" UP032 [*] Use f-string instead of `format` call --> UP032_0.py:86:1 @@ -796,22 +728,20 @@ UP032 [*] Use f-string instead of `format` call 93 | ( | help: Convert to f-string - -ℹ Safe fix -84 84 | ).format(a=1, b=1) -85 85 | -86 86 | ( -87 |- "{a}" -88 |- "" -89 |- "{b}" -90 |- "" -91 |-).format(a=1, b=1) - 87 |+ f"{1}" - 88 |+ f"{1}" - 89 |+) -92 90 | -93 91 | ( -94 92 | ( +84 | ).format(a=1, b=1) +85 | +86 | ( + - "{a}" + - "" + - "{b}" + - "" + - ).format(a=1, b=1) +87 + f"{1}" +88 + f"{1}" +89 + ) +90 | +91 | ( +92 | ( UP032 [*] Use f-string instead of `format` call --> UP032_0.py:94:5 @@ -829,23 +759,21 @@ UP032 [*] Use f-string instead of `format` call 102 | ) | help: Convert to f-string - -ℹ Safe fix -93 93 | ( -94 94 | ( -95 95 | # comment -96 |- "{a}" - 96 |+ f"{1}" -97 97 | # comment -98 |- "{b}" - 98 |+ f"{1}" -99 99 | ) -100 100 | # comment -101 |- .format(a=1, b=1) - 101 |+ -102 102 | ) -103 103 | -104 104 | ( +93 | ( +94 | ( +95 | # comment + - "{a}" +96 + f"{1}" +97 | # comment + - "{b}" +98 + f"{1}" +99 | ) +100 | # comment + - .format(a=1, b=1) +101 + +102 | ) +103 | +104 | ( UP032 [*] Use f-string instead of `format` call --> UP032_0.py:104:1 @@ -859,19 +787,17 @@ UP032 [*] Use f-string instead of `format` call | |_____________^ | help: Convert to f-string - -ℹ Safe fix -102 102 | ) -103 103 | -104 104 | ( -105 |- "{a}" - 105 |+ f"{1}" -106 106 | "b" -107 |-).format(a=1) - 107 |+) -108 108 | -109 109 | -110 110 | def d(osname, version, release): +102 | ) +103 | +104 | ( + - "{a}" +105 + f"{1}" +106 | "b" + - ).format(a=1) +107 + ) +108 | +109 | +110 | def d(osname, version, release): UP032 [*] Use f-string instead of `format` call --> UP032_0.py:111:11 @@ -881,16 +807,14 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -108 108 | -109 109 | -110 110 | def d(osname, version, release): -111 |- return"{}-{}.{}".format(osname, version, release) - 111 |+ return f"{osname}-{version}.{release}" -112 112 | -113 113 | -114 114 | def e(): +108 | +109 | +110 | def d(osname, version, release): + - return"{}-{}.{}".format(osname, version, release) +111 + return f"{osname}-{version}.{release}" +112 | +113 | +114 | def e(): UP032 [*] Use f-string instead of `format` call --> UP032_0.py:115:10 @@ -900,16 +824,14 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -112 112 | -113 113 | -114 114 | def e(): -115 |- yield"{}".format(1) - 115 |+ yield f"{1}" -116 116 | -117 117 | -118 118 | assert"{}".format(1) +112 | +113 | +114 | def e(): + - yield"{}".format(1) +115 + yield f"{1}" +116 | +117 | +118 | assert"{}".format(1) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:118:7 @@ -918,16 +840,14 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -115 115 | yield"{}".format(1) -116 116 | -117 117 | -118 |-assert"{}".format(1) - 118 |+assert f"{1}" -119 119 | -120 120 | -121 121 | async def c(): +115 | yield"{}".format(1) +116 | +117 | + - assert"{}".format(1) +118 + assert f"{1}" +119 | +120 | +121 | async def c(): UP032 [*] Use f-string instead of `format` call --> UP032_0.py:122:12 @@ -937,16 +857,14 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -119 119 | -120 120 | -121 121 | async def c(): -122 |- return "{}".format(await 3) - 122 |+ return f"{await 3}" -123 123 | -124 124 | -125 125 | async def c(): +119 | +120 | +121 | async def c(): + - return "{}".format(await 3) +122 + return f"{await 3}" +123 | +124 | +125 | async def c(): UP032 [*] Use f-string instead of `format` call --> UP032_0.py:126:12 @@ -956,16 +874,14 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -123 123 | -124 124 | -125 125 | async def c(): -126 |- return "{}".format(1 + await 3) - 126 |+ return f"{1 + await 3}" -127 127 | -128 128 | -129 129 | "{}".format(1 * 2) +123 | +124 | +125 | async def c(): + - return "{}".format(1 + await 3) +126 + return f"{1 + await 3}" +127 | +128 | +129 | "{}".format(1 * 2) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:129:1 @@ -976,16 +892,14 @@ UP032 [*] Use f-string instead of `format` call 131 | ### | help: Convert to f-string - -ℹ Safe fix -126 126 | return "{}".format(1 + await 3) -127 127 | -128 128 | -129 |-"{}".format(1 * 2) - 129 |+f"{1 * 2}" -130 130 | -131 131 | ### -132 132 | # Non-errors +126 | return "{}".format(1 + await 3) +127 | +128 | + - "{}".format(1 * 2) +129 + f"{1 * 2}" +130 | +131 | ### +132 | # Non-errors UP032 [*] Use f-string instead of `format` call --> UP032_0.py:160:1 @@ -1000,18 +914,16 @@ UP032 [*] Use f-string instead of `format` call 164 | """ | help: Convert to f-string - -ℹ Safe fix -157 157 | -158 158 | r'"\N{snowman} {}".format(a)' -159 159 | -160 |-"123456789 {}".format( -161 |- 11111111111111111111111111111111111111111111111111111111111111111111111111, -162 |-) - 160 |+f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}" -163 161 | -164 162 | """ -165 163 | {} +157 | +158 | r'"\N{snowman} {}".format(a)' +159 | + - "123456789 {}".format( + - 11111111111111111111111111111111111111111111111111111111111111111111111111, + - ) +160 + f"123456789 {11111111111111111111111111111111111111111111111111111111111111111111111111}" +161 | +162 | """ +163 | {} UP032 [*] Use f-string instead of `format` call --> UP032_0.py:164:1 @@ -1032,27 +944,25 @@ UP032 [*] Use f-string instead of `format` call 174 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{} | help: Convert to f-string - -ℹ Safe fix -161 161 | 11111111111111111111111111111111111111111111111111111111111111111111111111, -162 162 | ) -163 163 | - 164 |+f""" - 165 |+{1} - 166 |+{2} - 167 |+{111111111111111111111111111111111111111111111111111111111111111111111111111111111111111} -164 168 | """ -165 |-{} -166 |-{} -167 |-{} -168 |-""".format( -169 |-1, -170 |-2, -171 |-111111111111111111111111111111111111111111111111111111111111111111111111111111111111111, -172 |-) -173 169 | -174 170 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{} -175 171 | """.format( +161 | 11111111111111111111111111111111111111111111111111111111111111111111111111, +162 | ) +163 | +164 + f""" +165 + {1} +166 + {2} +167 + {111111111111111111111111111111111111111111111111111111111111111111111111111111111111111} +168 | """ + - {} + - {} + - {} + - """.format( + - 1, + - 2, + - 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111, + - ) +169 | +170 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{} +171 | """.format( UP032 [*] Use f-string instead of `format` call --> UP032_0.py:174:84 @@ -1069,20 +979,18 @@ UP032 [*] Use f-string instead of `format` call 179 | "{}".format( | help: Convert to f-string - -ℹ Safe fix -171 171 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111, -172 172 | ) -173 173 | -174 |-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{} -175 |-""".format( -176 |- 111111 -177 |-) - 174 |+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111} - 175 |+""" -178 176 | -179 177 | "{}".format( -180 178 | [ +171 | 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111, +172 | ) +173 | + - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = """{} + - """.format( + - 111111 + - ) +174 + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = f"""{111111} +175 + """ +176 | +177 | "{}".format( +178 | [ UP032 Use f-string instead of `format` call --> UP032_0.py:202:1 @@ -1107,16 +1015,14 @@ UP032 [*] Use f-string instead of `format` call 211 | # When fixing, trim the trailing empty string. | help: Convert to f-string - -ℹ Safe fix -206 206 | -207 207 | # The fixed string will exceed the line length, but it's still smaller than the -208 208 | # existing line length, so it's fine. -209 |-"".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others) - 209 |+f"" -210 210 | -211 211 | # When fixing, trim the trailing empty string. -212 212 | raise ValueError("Conflicting configuration dicts: {!r} {!r}" +206 | +207 | # The fixed string will exceed the line length, but it's still smaller than the +208 | # existing line length, so it's fine. + - "".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others) +209 + f"" +210 | +211 | # When fixing, trim the trailing empty string. +212 | raise ValueError("Conflicting configuration dicts: {!r} {!r}" UP032 [*] Use f-string instead of `format` call --> UP032_0.py:212:18 @@ -1130,17 +1036,15 @@ UP032 [*] Use f-string instead of `format` call 215 | # When fixing, trim the trailing empty string. | help: Convert to f-string - -ℹ Safe fix -209 209 | "".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others) -210 210 | -211 211 | # When fixing, trim the trailing empty string. -212 |-raise ValueError("Conflicting configuration dicts: {!r} {!r}" -213 |- "".format(new_dict, d)) - 212 |+raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}") -214 213 | -215 214 | # When fixing, trim the trailing empty string. -216 215 | raise ValueError("Conflicting configuration dicts: {!r} {!r}" +209 | "".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others) +210 | +211 | # When fixing, trim the trailing empty string. + - raise ValueError("Conflicting configuration dicts: {!r} {!r}" + - "".format(new_dict, d)) +212 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}") +213 | +214 | # When fixing, trim the trailing empty string. +215 | raise ValueError("Conflicting configuration dicts: {!r} {!r}" UP032 [*] Use f-string instead of `format` call --> UP032_0.py:216:18 @@ -1154,18 +1058,16 @@ UP032 [*] Use f-string instead of `format` call 219 | raise ValueError( | help: Convert to f-string - -ℹ Safe fix -213 213 | "".format(new_dict, d)) -214 214 | -215 215 | # When fixing, trim the trailing empty string. -216 |-raise ValueError("Conflicting configuration dicts: {!r} {!r}" -217 |- .format(new_dict, d)) - 216 |+raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}" - 217 |+ ) -218 218 | -219 219 | raise ValueError( -220 220 | "Conflicting configuration dicts: {!r} {!r}" +213 | "".format(new_dict, d)) +214 | +215 | # When fixing, trim the trailing empty string. + - raise ValueError("Conflicting configuration dicts: {!r} {!r}" + - .format(new_dict, d)) +216 + raise ValueError(f"Conflicting configuration dicts: {new_dict!r} {d!r}" +217 + ) +218 | +219 | raise ValueError( +220 | "Conflicting configuration dicts: {!r} {!r}" UP032 [*] Use f-string instead of `format` call --> UP032_0.py:220:5 @@ -1177,17 +1079,15 @@ UP032 [*] Use f-string instead of `format` call 222 | ) | help: Convert to f-string - -ℹ Safe fix -217 217 | .format(new_dict, d)) -218 218 | -219 219 | raise ValueError( -220 |- "Conflicting configuration dicts: {!r} {!r}" -221 |- "".format(new_dict, d) - 220 |+ f"Conflicting configuration dicts: {new_dict!r} {d!r}" -222 221 | ) -223 222 | -224 223 | raise ValueError( +217 | .format(new_dict, d)) +218 | +219 | raise ValueError( + - "Conflicting configuration dicts: {!r} {!r}" + - "".format(new_dict, d) +220 + f"Conflicting configuration dicts: {new_dict!r} {d!r}" +221 | ) +222 | +223 | raise ValueError( UP032 [*] Use f-string instead of `format` call --> UP032_0.py:225:5 @@ -1200,17 +1100,15 @@ UP032 [*] Use f-string instead of `format` call 228 | ) | help: Convert to f-string - -ℹ Safe fix -222 222 | ) -223 223 | -224 224 | raise ValueError( -225 |- "Conflicting configuration dicts: {!r} {!r}" -226 |- "".format(new_dict, d) - 225 |+ f"Conflicting configuration dicts: {new_dict!r} {d!r}" -227 226 | -228 227 | ) -229 228 | +222 | ) +223 | +224 | raise ValueError( + - "Conflicting configuration dicts: {!r} {!r}" + - "".format(new_dict, d) +225 + f"Conflicting configuration dicts: {new_dict!r} {d!r}" +226 | +227 | ) +228 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:231:1 @@ -1225,19 +1123,17 @@ UP032 [*] Use f-string instead of `format` call 236 | ("{}" "{{}}").format(a) | help: Convert to f-string - -ℹ Safe fix -229 229 | -230 230 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped -231 231 | ( - 232 |+ f"{a}" -232 233 | "{}" -233 |- "{{}}" -234 |-).format(a) - 234 |+) -235 235 | -236 236 | ("{}" "{{}}").format(a) -237 237 | +229 | +230 | # The first string will be converted to an f-string and the curly braces in the second should be converted to be unescaped +231 | ( +232 + f"{a}" +233 | "{}" + - "{{}}" + - ).format(a) +234 + ) +235 | +236 | ("{}" "{{}}").format(a) +237 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:236:1 @@ -1248,16 +1144,14 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -233 233 | "{{}}" -234 234 | ).format(a) -235 235 | -236 |-("{}" "{{}}").format(a) - 236 |+(f"{a}" "{}") -237 237 | -238 238 | -239 239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped +233 | "{{}}" +234 | ).format(a) +235 | + - ("{}" "{{}}").format(a) +236 + (f"{a}" "{}") +237 | +238 | +239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped UP032 [*] Use f-string instead of `format` call --> UP032_0.py:240:1 @@ -1272,20 +1166,18 @@ UP032 [*] Use f-string instead of `format` call 245 | ("{}" "{{{}}}").format(a, b) | help: Convert to f-string - -ℹ Safe fix -238 238 | -239 239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped -240 240 | ( -241 |- "{}" -242 |- "{{{}}}" -243 |-).format(a, b) - 241 |+ f"{a}" - 242 |+ f"{{{b}}}" - 243 |+) -244 244 | -245 245 | ("{}" "{{{}}}").format(a, b) -246 246 | +238 | +239 | # Both strings will be converted to an f-string and the curly braces in the second should left escaped +240 | ( + - "{}" + - "{{{}}}" + - ).format(a, b) +241 + f"{a}" +242 + f"{{{b}}}" +243 + ) +244 | +245 | ("{}" "{{{}}}").format(a, b) +246 | UP032 [*] Use f-string instead of `format` call --> UP032_0.py:245:1 @@ -1298,16 +1190,14 @@ UP032 [*] Use f-string instead of `format` call 247 | # The dictionary should be parenthesized. | help: Convert to f-string - -ℹ Safe fix -242 242 | "{{{}}}" -243 243 | ).format(a, b) -244 244 | -245 |-("{}" "{{{}}}").format(a, b) - 245 |+(f"{a}" f"{{{b}}}") -246 246 | -247 247 | # The dictionary should be parenthesized. -248 248 | "{}".format({0: 1}[0]) +242 | "{{{}}}" +243 | ).format(a, b) +244 | + - ("{}" "{{{}}}").format(a, b) +245 + (f"{a}" f"{{{b}}}") +246 | +247 | # The dictionary should be parenthesized. +248 | "{}".format({0: 1}[0]) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:248:1 @@ -1319,16 +1209,14 @@ UP032 [*] Use f-string instead of `format` call 250 | # The dictionary should be parenthesized. | help: Convert to f-string - -ℹ Safe fix -245 245 | ("{}" "{{{}}}").format(a, b) -246 246 | -247 247 | # The dictionary should be parenthesized. -248 |-"{}".format({0: 1}[0]) - 248 |+f"{({0: 1}[0])}" -249 249 | -250 250 | # The dictionary should be parenthesized. -251 251 | "{}".format({0: 1}.bar) +245 | ("{}" "{{{}}}").format(a, b) +246 | +247 | # The dictionary should be parenthesized. + - "{}".format({0: 1}[0]) +248 + f"{({0: 1}[0])}" +249 | +250 | # The dictionary should be parenthesized. +251 | "{}".format({0: 1}.bar) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:251:1 @@ -1340,16 +1228,14 @@ UP032 [*] Use f-string instead of `format` call 253 | # The dictionary should be parenthesized. | help: Convert to f-string - -ℹ Safe fix -248 248 | "{}".format({0: 1}[0]) -249 249 | -250 250 | # The dictionary should be parenthesized. -251 |-"{}".format({0: 1}.bar) - 251 |+f"{({0: 1}.bar)}" -252 252 | -253 253 | # The dictionary should be parenthesized. -254 254 | "{}".format({0: 1}()) +248 | "{}".format({0: 1}[0]) +249 | +250 | # The dictionary should be parenthesized. + - "{}".format({0: 1}.bar) +251 + f"{({0: 1}.bar)}" +252 | +253 | # The dictionary should be parenthesized. +254 | "{}".format({0: 1}()) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:254:1 @@ -1361,16 +1247,14 @@ UP032 [*] Use f-string instead of `format` call 256 | # The string shouldn't be converted, since it would require repeating the function call. | help: Convert to f-string - -ℹ Safe fix -251 251 | "{}".format({0: 1}.bar) -252 252 | -253 253 | # The dictionary should be parenthesized. -254 |-"{}".format({0: 1}()) - 254 |+f"{({0: 1}())}" -255 255 | -256 256 | # The string shouldn't be converted, since it would require repeating the function call. -257 257 | "{x} {x}".format(x=foo()) +251 | "{}".format({0: 1}.bar) +252 | +253 | # The dictionary should be parenthesized. + - "{}".format({0: 1}()) +254 + f"{({0: 1}())}" +255 | +256 | # The string shouldn't be converted, since it would require repeating the function call. +257 | "{x} {x}".format(x=foo()) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:261:1 @@ -1382,16 +1266,14 @@ UP032 [*] Use f-string instead of `format` call 263 | # The call should be removed, but the string itself should remain. | help: Convert to f-string - -ℹ Safe fix -258 258 | "{0} {0}".format(foo()) -259 259 | -260 260 | # The string _should_ be converted, since the function call is repeated in the arguments. -261 |-"{0} {1}".format(foo(), foo()) - 261 |+f"{foo()} {foo()}" -262 262 | -263 263 | # The call should be removed, but the string itself should remain. -264 264 | ''.format(self.project) +258 | "{0} {0}".format(foo()) +259 | +260 | # The string _should_ be converted, since the function call is repeated in the arguments. + - "{0} {1}".format(foo(), foo()) +261 + f"{foo()} {foo()}" +262 | +263 | # The call should be removed, but the string itself should remain. +264 | ''.format(self.project) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:264:1 @@ -1403,16 +1285,14 @@ UP032 [*] Use f-string instead of `format` call 266 | # The call should be removed, but the string itself should remain. | help: Convert to f-string - -ℹ Safe fix -261 261 | "{0} {1}".format(foo(), foo()) -262 262 | -263 263 | # The call should be removed, but the string itself should remain. -264 |-''.format(self.project) - 264 |+'' -265 265 | -266 266 | # The call should be removed, but the string itself should remain. -267 267 | "".format(self.project) +261 | "{0} {1}".format(foo(), foo()) +262 | +263 | # The call should be removed, but the string itself should remain. + - ''.format(self.project) +264 + '' +265 | +266 | # The call should be removed, but the string itself should remain. +267 | "".format(self.project) UP032 [*] Use f-string instead of `format` call --> UP032_0.py:267:1 @@ -1424,16 +1304,14 @@ UP032 [*] Use f-string instead of `format` call 269 | # Not a valid type annotation but this test shouldn't result in a panic. | help: Convert to f-string - -ℹ Safe fix -264 264 | ''.format(self.project) -265 265 | -266 266 | # The call should be removed, but the string itself should remain. -267 |-"".format(self.project) - 267 |+"" -268 268 | -269 269 | # Not a valid type annotation but this test shouldn't result in a panic. -270 270 | # Refer: https://github.com/astral-sh/ruff/issues/11736 +264 | ''.format(self.project) +265 | +266 | # The call should be removed, but the string itself should remain. + - "".format(self.project) +267 + "" +268 | +269 | # Not a valid type annotation but this test shouldn't result in a panic. +270 | # Refer: https://github.com/astral-sh/ruff/issues/11736 UP032 [*] Use f-string instead of `format` call --> UP032_0.py:271:5 @@ -1444,10 +1322,8 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -268 268 | -269 269 | # Not a valid type annotation but this test shouldn't result in a panic. -270 270 | # Refer: https://github.com/astral-sh/ruff/issues/11736 -271 |-x: "'{} + {}'.format(x, y)" - 271 |+x: "f'{x} + {y}'" +268 | +269 | # Not a valid type annotation but this test shouldn't result in a panic. +270 | # Refer: https://github.com/astral-sh/ruff/issues/11736 + - x: "'{} + {}'.format(x, y)" +271 + x: "f'{x} + {y}'" diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap index 705d8d2492..20370bdb62 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_1.py.snap @@ -8,7 +8,5 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -1 |-"{} {}".format(a, b) # Intentionally at start-of-file, to ensure graceful handling. - 1 |+f"{a} {b}" # Intentionally at start-of-file, to ensure graceful handling. + - "{} {}".format(a, b) # Intentionally at start-of-file, to ensure graceful handling. +1 + f"{a} {b}" # Intentionally at start-of-file, to ensure graceful handling. diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap index b104d2bb3f..f3324ea02b 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP032_2.py.snap @@ -11,14 +11,12 @@ UP032 [*] Use f-string instead of `format` call 4 | "{a.real}".format(a=1) | help: Convert to f-string - -ℹ Safe fix -1 1 | # Errors -2 |-"{.real}".format(1) - 2 |+f"{(1).real}" -3 3 | "{0.real}".format(1) -4 4 | "{a.real}".format(a=1) -5 5 | +1 | # Errors + - "{.real}".format(1) +2 + f"{(1).real}" +3 | "{0.real}".format(1) +4 | "{a.real}".format(a=1) +5 | UP032 [*] Use f-string instead of `format` call --> UP032_2.py:3:1 @@ -30,15 +28,13 @@ UP032 [*] Use f-string instead of `format` call 4 | "{a.real}".format(a=1) | help: Convert to f-string - -ℹ Safe fix -1 1 | # Errors -2 2 | "{.real}".format(1) -3 |-"{0.real}".format(1) - 3 |+f"{(1).real}" -4 4 | "{a.real}".format(a=1) -5 5 | -6 6 | "{.real}".format(1.0) +1 | # Errors +2 | "{.real}".format(1) + - "{0.real}".format(1) +3 + f"{(1).real}" +4 | "{a.real}".format(a=1) +5 | +6 | "{.real}".format(1.0) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:4:1 @@ -51,16 +47,14 @@ UP032 [*] Use f-string instead of `format` call 6 | "{.real}".format(1.0) | help: Convert to f-string - -ℹ Safe fix -1 1 | # Errors -2 2 | "{.real}".format(1) -3 3 | "{0.real}".format(1) -4 |-"{a.real}".format(a=1) - 4 |+f"{(1).real}" -5 5 | -6 6 | "{.real}".format(1.0) -7 7 | "{0.real}".format(1.0) +1 | # Errors +2 | "{.real}".format(1) +3 | "{0.real}".format(1) + - "{a.real}".format(a=1) +4 + f"{(1).real}" +5 | +6 | "{.real}".format(1.0) +7 | "{0.real}".format(1.0) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:6:1 @@ -73,16 +67,14 @@ UP032 [*] Use f-string instead of `format` call 8 | "{a.real}".format(a=1.0) | help: Convert to f-string - -ℹ Safe fix -3 3 | "{0.real}".format(1) -4 4 | "{a.real}".format(a=1) -5 5 | -6 |-"{.real}".format(1.0) - 6 |+f"{1.0.real}" -7 7 | "{0.real}".format(1.0) -8 8 | "{a.real}".format(a=1.0) -9 9 | +3 | "{0.real}".format(1) +4 | "{a.real}".format(a=1) +5 | + - "{.real}".format(1.0) +6 + f"{1.0.real}" +7 | "{0.real}".format(1.0) +8 | "{a.real}".format(a=1.0) +9 | UP032 [*] Use f-string instead of `format` call --> UP032_2.py:7:1 @@ -93,16 +85,14 @@ UP032 [*] Use f-string instead of `format` call 8 | "{a.real}".format(a=1.0) | help: Convert to f-string - -ℹ Safe fix -4 4 | "{a.real}".format(a=1) -5 5 | -6 6 | "{.real}".format(1.0) -7 |-"{0.real}".format(1.0) - 7 |+f"{1.0.real}" -8 8 | "{a.real}".format(a=1.0) -9 9 | -10 10 | "{.real}".format(1j) +4 | "{a.real}".format(a=1) +5 | +6 | "{.real}".format(1.0) + - "{0.real}".format(1.0) +7 + f"{1.0.real}" +8 | "{a.real}".format(a=1.0) +9 | +10 | "{.real}".format(1j) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:8:1 @@ -115,16 +105,14 @@ UP032 [*] Use f-string instead of `format` call 10 | "{.real}".format(1j) | help: Convert to f-string - -ℹ Safe fix -5 5 | -6 6 | "{.real}".format(1.0) -7 7 | "{0.real}".format(1.0) -8 |-"{a.real}".format(a=1.0) - 8 |+f"{1.0.real}" -9 9 | -10 10 | "{.real}".format(1j) -11 11 | "{0.real}".format(1j) +5 | +6 | "{.real}".format(1.0) +7 | "{0.real}".format(1.0) + - "{a.real}".format(a=1.0) +8 + f"{1.0.real}" +9 | +10 | "{.real}".format(1j) +11 | "{0.real}".format(1j) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:10:1 @@ -137,16 +125,14 @@ UP032 [*] Use f-string instead of `format` call 12 | "{a.real}".format(a=1j) | help: Convert to f-string - -ℹ Safe fix -7 7 | "{0.real}".format(1.0) -8 8 | "{a.real}".format(a=1.0) -9 9 | -10 |-"{.real}".format(1j) - 10 |+f"{1j.real}" -11 11 | "{0.real}".format(1j) -12 12 | "{a.real}".format(a=1j) -13 13 | +7 | "{0.real}".format(1.0) +8 | "{a.real}".format(a=1.0) +9 | + - "{.real}".format(1j) +10 + f"{1j.real}" +11 | "{0.real}".format(1j) +12 | "{a.real}".format(a=1j) +13 | UP032 [*] Use f-string instead of `format` call --> UP032_2.py:11:1 @@ -157,16 +143,14 @@ UP032 [*] Use f-string instead of `format` call 12 | "{a.real}".format(a=1j) | help: Convert to f-string - -ℹ Safe fix -8 8 | "{a.real}".format(a=1.0) -9 9 | -10 10 | "{.real}".format(1j) -11 |-"{0.real}".format(1j) - 11 |+f"{1j.real}" -12 12 | "{a.real}".format(a=1j) -13 13 | -14 14 | "{.real}".format(0b01) +8 | "{a.real}".format(a=1.0) +9 | +10 | "{.real}".format(1j) + - "{0.real}".format(1j) +11 + f"{1j.real}" +12 | "{a.real}".format(a=1j) +13 | +14 | "{.real}".format(0b01) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:12:1 @@ -179,16 +163,14 @@ UP032 [*] Use f-string instead of `format` call 14 | "{.real}".format(0b01) | help: Convert to f-string - -ℹ Safe fix -9 9 | -10 10 | "{.real}".format(1j) -11 11 | "{0.real}".format(1j) -12 |-"{a.real}".format(a=1j) - 12 |+f"{1j.real}" -13 13 | -14 14 | "{.real}".format(0b01) -15 15 | "{0.real}".format(0b01) +9 | +10 | "{.real}".format(1j) +11 | "{0.real}".format(1j) + - "{a.real}".format(a=1j) +12 + f"{1j.real}" +13 | +14 | "{.real}".format(0b01) +15 | "{0.real}".format(0b01) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:14:1 @@ -201,16 +183,14 @@ UP032 [*] Use f-string instead of `format` call 16 | "{a.real}".format(a=0b01) | help: Convert to f-string - -ℹ Safe fix -11 11 | "{0.real}".format(1j) -12 12 | "{a.real}".format(a=1j) -13 13 | -14 |-"{.real}".format(0b01) - 14 |+f"{0b01.real}" -15 15 | "{0.real}".format(0b01) -16 16 | "{a.real}".format(a=0b01) -17 17 | +11 | "{0.real}".format(1j) +12 | "{a.real}".format(a=1j) +13 | + - "{.real}".format(0b01) +14 + f"{0b01.real}" +15 | "{0.real}".format(0b01) +16 | "{a.real}".format(a=0b01) +17 | UP032 [*] Use f-string instead of `format` call --> UP032_2.py:15:1 @@ -221,16 +201,14 @@ UP032 [*] Use f-string instead of `format` call 16 | "{a.real}".format(a=0b01) | help: Convert to f-string - -ℹ Safe fix -12 12 | "{a.real}".format(a=1j) -13 13 | -14 14 | "{.real}".format(0b01) -15 |-"{0.real}".format(0b01) - 15 |+f"{0b01.real}" -16 16 | "{a.real}".format(a=0b01) -17 17 | -18 18 | "{}".format(1 + 2) +12 | "{a.real}".format(a=1j) +13 | +14 | "{.real}".format(0b01) + - "{0.real}".format(0b01) +15 + f"{0b01.real}" +16 | "{a.real}".format(a=0b01) +17 | +18 | "{}".format(1 + 2) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:16:1 @@ -243,16 +221,14 @@ UP032 [*] Use f-string instead of `format` call 18 | "{}".format(1 + 2) | help: Convert to f-string - -ℹ Safe fix -13 13 | -14 14 | "{.real}".format(0b01) -15 15 | "{0.real}".format(0b01) -16 |-"{a.real}".format(a=0b01) - 16 |+f"{0b01.real}" -17 17 | -18 18 | "{}".format(1 + 2) -19 19 | "{}".format([1, 2]) +13 | +14 | "{.real}".format(0b01) +15 | "{0.real}".format(0b01) + - "{a.real}".format(a=0b01) +16 + f"{0b01.real}" +17 | +18 | "{}".format(1 + 2) +19 | "{}".format([1, 2]) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:18:1 @@ -265,16 +241,14 @@ UP032 [*] Use f-string instead of `format` call 20 | "{}".format({1, 2}) | help: Convert to f-string - -ℹ Safe fix -15 15 | "{0.real}".format(0b01) -16 16 | "{a.real}".format(a=0b01) -17 17 | -18 |-"{}".format(1 + 2) - 18 |+f"{1 + 2}" -19 19 | "{}".format([1, 2]) -20 20 | "{}".format({1, 2}) -21 21 | "{}".format({1: 2, 3: 4}) +15 | "{0.real}".format(0b01) +16 | "{a.real}".format(a=0b01) +17 | + - "{}".format(1 + 2) +18 + f"{1 + 2}" +19 | "{}".format([1, 2]) +20 | "{}".format({1, 2}) +21 | "{}".format({1: 2, 3: 4}) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:19:1 @@ -286,16 +260,14 @@ UP032 [*] Use f-string instead of `format` call 21 | "{}".format({1: 2, 3: 4}) | help: Convert to f-string - -ℹ Safe fix -16 16 | "{a.real}".format(a=0b01) -17 17 | -18 18 | "{}".format(1 + 2) -19 |-"{}".format([1, 2]) - 19 |+f"{[1, 2]}" -20 20 | "{}".format({1, 2}) -21 21 | "{}".format({1: 2, 3: 4}) -22 22 | "{}".format((i for i in range(2))) +16 | "{a.real}".format(a=0b01) +17 | +18 | "{}".format(1 + 2) + - "{}".format([1, 2]) +19 + f"{[1, 2]}" +20 | "{}".format({1, 2}) +21 | "{}".format({1: 2, 3: 4}) +22 | "{}".format((i for i in range(2))) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:20:1 @@ -308,16 +280,14 @@ UP032 [*] Use f-string instead of `format` call 22 | "{}".format((i for i in range(2))) | help: Convert to f-string - -ℹ Safe fix -17 17 | -18 18 | "{}".format(1 + 2) -19 19 | "{}".format([1, 2]) -20 |-"{}".format({1, 2}) - 20 |+f"{({1, 2})}" -21 21 | "{}".format({1: 2, 3: 4}) -22 22 | "{}".format((i for i in range(2))) -23 23 | +17 | +18 | "{}".format(1 + 2) +19 | "{}".format([1, 2]) + - "{}".format({1, 2}) +20 + f"{({1, 2})}" +21 | "{}".format({1: 2, 3: 4}) +22 | "{}".format((i for i in range(2))) +23 | UP032 [*] Use f-string instead of `format` call --> UP032_2.py:21:1 @@ -329,16 +299,14 @@ UP032 [*] Use f-string instead of `format` call 22 | "{}".format((i for i in range(2))) | help: Convert to f-string - -ℹ Safe fix -18 18 | "{}".format(1 + 2) -19 19 | "{}".format([1, 2]) -20 20 | "{}".format({1, 2}) -21 |-"{}".format({1: 2, 3: 4}) - 21 |+f"{({1: 2, 3: 4})}" -22 22 | "{}".format((i for i in range(2))) -23 23 | -24 24 | "{.real}".format(1 + 2) +18 | "{}".format(1 + 2) +19 | "{}".format([1, 2]) +20 | "{}".format({1, 2}) + - "{}".format({1: 2, 3: 4}) +21 + f"{({1: 2, 3: 4})}" +22 | "{}".format((i for i in range(2))) +23 | +24 | "{.real}".format(1 + 2) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:22:1 @@ -351,16 +319,14 @@ UP032 [*] Use f-string instead of `format` call 24 | "{.real}".format(1 + 2) | help: Convert to f-string - -ℹ Safe fix -19 19 | "{}".format([1, 2]) -20 20 | "{}".format({1, 2}) -21 21 | "{}".format({1: 2, 3: 4}) -22 |-"{}".format((i for i in range(2))) - 22 |+f"{(i for i in range(2))}" -23 23 | -24 24 | "{.real}".format(1 + 2) -25 25 | "{.real}".format([1, 2]) +19 | "{}".format([1, 2]) +20 | "{}".format({1, 2}) +21 | "{}".format({1: 2, 3: 4}) + - "{}".format((i for i in range(2))) +22 + f"{(i for i in range(2))}" +23 | +24 | "{.real}".format(1 + 2) +25 | "{.real}".format([1, 2]) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:24:1 @@ -373,16 +339,14 @@ UP032 [*] Use f-string instead of `format` call 26 | "{.real}".format({1, 2}) | help: Convert to f-string - -ℹ Safe fix -21 21 | "{}".format({1: 2, 3: 4}) -22 22 | "{}".format((i for i in range(2))) -23 23 | -24 |-"{.real}".format(1 + 2) - 24 |+f"{(1 + 2).real}" -25 25 | "{.real}".format([1, 2]) -26 26 | "{.real}".format({1, 2}) -27 27 | "{.real}".format({1: 2, 3: 4}) +21 | "{}".format({1: 2, 3: 4}) +22 | "{}".format((i for i in range(2))) +23 | + - "{.real}".format(1 + 2) +24 + f"{(1 + 2).real}" +25 | "{.real}".format([1, 2]) +26 | "{.real}".format({1, 2}) +27 | "{.real}".format({1: 2, 3: 4}) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:25:1 @@ -394,16 +358,14 @@ UP032 [*] Use f-string instead of `format` call 27 | "{.real}".format({1: 2, 3: 4}) | help: Convert to f-string - -ℹ Safe fix -22 22 | "{}".format((i for i in range(2))) -23 23 | -24 24 | "{.real}".format(1 + 2) -25 |-"{.real}".format([1, 2]) - 25 |+f"{[1, 2].real}" -26 26 | "{.real}".format({1, 2}) -27 27 | "{.real}".format({1: 2, 3: 4}) -28 28 | "{}".format((i for i in range(2))) +22 | "{}".format((i for i in range(2))) +23 | +24 | "{.real}".format(1 + 2) + - "{.real}".format([1, 2]) +25 + f"{[1, 2].real}" +26 | "{.real}".format({1, 2}) +27 | "{.real}".format({1: 2, 3: 4}) +28 | "{}".format((i for i in range(2))) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:26:1 @@ -416,15 +378,13 @@ UP032 [*] Use f-string instead of `format` call 28 | "{}".format((i for i in range(2))) | help: Convert to f-string - -ℹ Safe fix -23 23 | -24 24 | "{.real}".format(1 + 2) -25 25 | "{.real}".format([1, 2]) -26 |-"{.real}".format({1, 2}) - 26 |+f"{({1, 2}).real}" -27 27 | "{.real}".format({1: 2, 3: 4}) -28 28 | "{}".format((i for i in range(2))) +23 | +24 | "{.real}".format(1 + 2) +25 | "{.real}".format([1, 2]) + - "{.real}".format({1, 2}) +26 + f"{({1, 2}).real}" +27 | "{.real}".format({1: 2, 3: 4}) +28 | "{}".format((i for i in range(2))) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:27:1 @@ -436,14 +396,12 @@ UP032 [*] Use f-string instead of `format` call 28 | "{}".format((i for i in range(2))) | help: Convert to f-string - -ℹ Safe fix -24 24 | "{.real}".format(1 + 2) -25 25 | "{.real}".format([1, 2]) -26 26 | "{.real}".format({1, 2}) -27 |-"{.real}".format({1: 2, 3: 4}) - 27 |+f"{({1: 2, 3: 4}).real}" -28 28 | "{}".format((i for i in range(2))) +24 | "{.real}".format(1 + 2) +25 | "{.real}".format([1, 2]) +26 | "{.real}".format({1, 2}) + - "{.real}".format({1: 2, 3: 4}) +27 + f"{({1: 2, 3: 4}).real}" +28 | "{}".format((i for i in range(2))) UP032 [*] Use f-string instead of `format` call --> UP032_2.py:28:1 @@ -454,10 +412,8 @@ UP032 [*] Use f-string instead of `format` call | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to f-string - -ℹ Safe fix -25 25 | "{.real}".format([1, 2]) -26 26 | "{.real}".format({1, 2}) -27 27 | "{.real}".format({1: 2, 3: 4}) -28 |-"{}".format((i for i in range(2))) - 28 |+f"{(i for i in range(2))}" +25 | "{.real}".format([1, 2]) +26 | "{.real}".format({1, 2}) +27 | "{.real}".format({1: 2, 3: 4}) + - "{}".format((i for i in range(2))) +28 + f"{(i for i in range(2))}" diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap index 360f79668a..ea4fbd79e2 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_0.py.snap @@ -10,16 +10,14 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` 6 | pass | help: Rewrite with `@functools.cache - -ℹ Safe fix -1 1 | import functools -2 2 | -3 3 | -4 |-@functools.lru_cache(maxsize=None) - 4 |+@functools.cache -5 5 | def fixme(): -6 6 | pass -7 7 | +1 | import functools +2 | +3 | + - @functools.lru_cache(maxsize=None) +4 + @functools.cache +5 | def fixme(): +6 | pass +7 | UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` --> UP033_0.py:10:21 @@ -31,16 +29,14 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` 12 | pass | help: Rewrite with `@functools.cache - -ℹ Safe fix -7 7 | -8 8 | -9 9 | @other_decorator -10 |-@functools.lru_cache(maxsize=None) - 10 |+@functools.cache -11 11 | def fixme(): -12 12 | pass -13 13 | +7 | +8 | +9 | @other_decorator + - @functools.lru_cache(maxsize=None) +10 + @functools.cache +11 | def fixme(): +12 | pass +13 | UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` --> UP033_0.py:15:21 @@ -51,13 +47,11 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` 17 | def fixme(): | help: Rewrite with `@functools.cache - -ℹ Safe fix -12 12 | pass -13 13 | -14 14 | -15 |-@functools.lru_cache(maxsize=None) - 15 |+@functools.cache -16 16 | @other_decorator -17 17 | def fixme(): -18 18 | pass +12 | pass +13 | +14 | + - @functools.lru_cache(maxsize=None) +15 + @functools.cache +16 | @other_decorator +17 | def fixme(): +18 | pass diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap index cb370b0f83..8bc7dc837b 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP033_1.py.snap @@ -10,17 +10,15 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` 6 | pass | help: Rewrite with `@functools.cache - -ℹ Safe fix -1 |-from functools import lru_cache - 1 |+from functools import lru_cache, cache -2 2 | -3 3 | -4 |-@lru_cache(maxsize=None) - 4 |+@cache -5 5 | def fixme(): -6 6 | pass -7 7 | + - from functools import lru_cache +1 + from functools import lru_cache, cache +2 | +3 | + - @lru_cache(maxsize=None) +4 + @cache +5 | def fixme(): +6 | pass +7 | UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` --> UP033_1.py:10:11 @@ -32,22 +30,20 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` 12 | pass | help: Rewrite with `@functools.cache - -ℹ Safe fix -1 |-from functools import lru_cache - 1 |+from functools import lru_cache, cache -2 2 | -3 3 | -4 4 | @lru_cache(maxsize=None) + - from functools import lru_cache +1 + from functools import lru_cache, cache +2 | +3 | +4 | @lru_cache(maxsize=None) -------------------------------------------------------------------------------- -7 7 | -8 8 | -9 9 | @other_decorator -10 |-@lru_cache(maxsize=None) - 10 |+@cache -11 11 | def fixme(): -12 12 | pass -13 13 | +7 | +8 | +9 | @other_decorator + - @lru_cache(maxsize=None) +10 + @cache +11 | def fixme(): +12 | pass +13 | UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` --> UP033_1.py:15:11 @@ -58,19 +54,17 @@ UP033 [*] Use `@functools.cache` instead of `@functools.lru_cache(maxsize=None)` 17 | def fixme(): | help: Rewrite with `@functools.cache - -ℹ Safe fix -1 |-from functools import lru_cache - 1 |+from functools import lru_cache, cache -2 2 | -3 3 | -4 4 | @lru_cache(maxsize=None) + - from functools import lru_cache +1 + from functools import lru_cache, cache +2 | +3 | +4 | @lru_cache(maxsize=None) -------------------------------------------------------------------------------- -12 12 | pass -13 13 | -14 14 | -15 |-@lru_cache(maxsize=None) - 15 |+@cache -16 16 | @other_decorator -17 17 | def fixme(): -18 18 | pass +12 | pass +13 | +14 | + - @lru_cache(maxsize=None) +15 + @cache +16 | @other_decorator +17 | def fixme(): +18 | pass diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap index 99c070b031..0bbe51fad7 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP034.py.snap @@ -11,14 +11,12 @@ UP034 [*] Avoid extraneous parentheses 4 | # UP034 | help: Remove extraneous parentheses - -ℹ Safe fix -1 1 | # UP034 -2 |-print(("foo")) - 2 |+print("foo") -3 3 | -4 4 | # UP034 -5 5 | print(("hell((goodybe))o")) +1 | # UP034 + - print(("foo")) +2 + print("foo") +3 | +4 | # UP034 +5 | print(("hell((goodybe))o")) UP034 [*] Avoid extraneous parentheses --> UP034.py:5:7 @@ -30,16 +28,14 @@ UP034 [*] Avoid extraneous parentheses 7 | # UP034 | help: Remove extraneous parentheses - -ℹ Safe fix -2 2 | print(("foo")) -3 3 | -4 4 | # UP034 -5 |-print(("hell((goodybe))o")) - 5 |+print("hell((goodybe))o") -6 6 | -7 7 | # UP034 -8 8 | print((("foo"))) +2 | print(("foo")) +3 | +4 | # UP034 + - print(("hell((goodybe))o")) +5 + print("hell((goodybe))o") +6 | +7 | # UP034 +8 | print((("foo"))) UP034 [*] Avoid extraneous parentheses --> UP034.py:8:7 @@ -51,16 +47,14 @@ UP034 [*] Avoid extraneous parentheses 10 | # UP034 | help: Remove extraneous parentheses - -ℹ Safe fix -5 5 | print(("hell((goodybe))o")) -6 6 | -7 7 | # UP034 -8 |-print((("foo"))) - 8 |+print(("foo")) -9 9 | -10 10 | # UP034 -11 11 | print((((1)))) +5 | print(("hell((goodybe))o")) +6 | +7 | # UP034 + - print((("foo"))) +8 + print(("foo")) +9 | +10 | # UP034 +11 | print((((1)))) UP034 [*] Avoid extraneous parentheses --> UP034.py:11:7 @@ -72,16 +66,14 @@ UP034 [*] Avoid extraneous parentheses 13 | # UP034 | help: Remove extraneous parentheses - -ℹ Safe fix -8 8 | print((("foo"))) -9 9 | -10 10 | # UP034 -11 |-print((((1)))) - 11 |+print(((1))) -12 12 | -13 13 | # UP034 -14 14 | print(("foo{}".format(1))) +8 | print((("foo"))) +9 | +10 | # UP034 + - print((((1)))) +11 + print(((1))) +12 | +13 | # UP034 +14 | print(("foo{}".format(1))) UP034 [*] Avoid extraneous parentheses --> UP034.py:14:7 @@ -93,16 +85,14 @@ UP034 [*] Avoid extraneous parentheses 16 | # UP034 | help: Remove extraneous parentheses - -ℹ Safe fix -11 11 | print((((1)))) -12 12 | -13 13 | # UP034 -14 |-print(("foo{}".format(1))) - 14 |+print("foo{}".format(1)) -15 15 | -16 16 | # UP034 -17 17 | print( +11 | print((((1)))) +12 | +13 | # UP034 + - print(("foo{}".format(1))) +14 + print("foo{}".format(1)) +15 | +16 | # UP034 +17 | print( UP034 [*] Avoid extraneous parentheses --> UP034.py:18:5 @@ -114,16 +104,14 @@ UP034 [*] Avoid extraneous parentheses 19 | ) | help: Remove extraneous parentheses - -ℹ Safe fix -15 15 | -16 16 | # UP034 -17 17 | print( -18 |- ("foo{}".format(1)) - 18 |+ "foo{}".format(1) -19 19 | ) -20 20 | -21 21 | # UP034 +15 | +16 | # UP034 +17 | print( + - ("foo{}".format(1)) +18 + "foo{}".format(1) +19 | ) +20 | +21 | # UP034 UP034 [*] Avoid extraneous parentheses --> UP034.py:23:5 @@ -137,19 +125,17 @@ UP034 [*] Avoid extraneous parentheses 26 | ) | help: Remove extraneous parentheses - -ℹ Safe fix -20 20 | -21 21 | # UP034 -22 22 | print( -23 |- ( - 23 |+ -24 24 | "foo" -25 |- ) - 25 |+ -26 26 | ) -27 27 | -28 28 | # UP034 +20 | +21 | # UP034 +22 | print( + - ( +23 + +24 | "foo" + - ) +25 + +26 | ) +27 | +28 | # UP034 UP034 [*] Avoid extraneous parentheses --> UP034.py:30:13 @@ -162,16 +148,14 @@ UP034 [*] Avoid extraneous parentheses 32 | # UP034 | help: Remove extraneous parentheses - -ℹ Safe fix -27 27 | -28 28 | # UP034 -29 29 | def f(): -30 |- x = int(((yield 1))) - 30 |+ x = int((yield 1)) -31 31 | -32 32 | # UP034 -33 33 | if True: +27 | +28 | # UP034 +29 | def f(): + - x = int(((yield 1))) +30 + x = int((yield 1)) +31 | +32 | # UP034 +33 | if True: UP034 [*] Avoid extraneous parentheses --> UP034.py:35:9 @@ -183,16 +167,14 @@ UP034 [*] Avoid extraneous parentheses 36 | ) | help: Remove extraneous parentheses - -ℹ Safe fix -32 32 | # UP034 -33 33 | if True: -34 34 | print( -35 |- ("foo{}".format(1)) - 35 |+ "foo{}".format(1) -36 36 | ) -37 37 | -38 38 | # UP034 +32 | # UP034 +33 | if True: +34 | print( + - ("foo{}".format(1)) +35 + "foo{}".format(1) +36 | ) +37 | +38 | # UP034 UP034 [*] Avoid extraneous parentheses --> UP034.py:39:7 @@ -204,13 +186,11 @@ UP034 [*] Avoid extraneous parentheses 41 | # OK | help: Remove extraneous parentheses - -ℹ Safe fix -36 36 | ) -37 37 | -38 38 | # UP034 -39 |-print((x for x in range(3))) - 39 |+print(x for x in range(3)) -40 40 | -41 41 | # OK -42 42 | print("foo") +36 | ) +37 | +38 | # UP034 + - print((x for x in range(3))) +39 + print(x for x in range(3)) +40 | +41 | # OK +42 | print("foo") diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap index 8b0669e054..ac901b5d66 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP035.py.snap @@ -11,14 +11,12 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 4 | from collections import Mapping as MAP | help: Import from `collections.abc` - -ℹ Safe fix -1 1 | # UP035 -2 |-from collections import Mapping - 2 |+from collections.abc import Mapping -3 3 | -4 4 | from collections import Mapping as MAP -5 5 | +1 | # UP035 + - from collections import Mapping +2 + from collections.abc import Mapping +3 | +4 | from collections import Mapping as MAP +5 | UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:4:1 @@ -31,16 +29,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 6 | from collections import Mapping, Sequence | help: Import from `collections.abc` - -ℹ Safe fix -1 1 | # UP035 -2 2 | from collections import Mapping -3 3 | -4 |-from collections import Mapping as MAP - 4 |+from collections.abc import Mapping as MAP -5 5 | -6 6 | from collections import Mapping, Sequence -7 7 | +1 | # UP035 +2 | from collections import Mapping +3 | + - from collections import Mapping as MAP +4 + from collections.abc import Mapping as MAP +5 | +6 | from collections import Mapping, Sequence +7 | UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence` --> UP035.py:6:1 @@ -53,16 +49,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence` 8 | from collections import Counter, Mapping | help: Import from `collections.abc` - -ℹ Safe fix -3 3 | -4 4 | from collections import Mapping as MAP -5 5 | -6 |-from collections import Mapping, Sequence - 6 |+from collections.abc import Mapping, Sequence -7 7 | -8 8 | from collections import Counter, Mapping -9 9 | +3 | +4 | from collections import Mapping as MAP +5 | + - from collections import Mapping, Sequence +6 + from collections.abc import Mapping, Sequence +7 | +8 | from collections import Counter, Mapping +9 | UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:8:1 @@ -75,17 +69,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 10 | from collections import (Counter, Mapping) | help: Import from `collections.abc` - -ℹ Safe fix -5 5 | -6 6 | from collections import Mapping, Sequence -7 7 | -8 |-from collections import Counter, Mapping - 8 |+from collections import Counter - 9 |+from collections.abc import Mapping -9 10 | -10 11 | from collections import (Counter, Mapping) -11 12 | +5 | +6 | from collections import Mapping, Sequence +7 | + - from collections import Counter, Mapping +8 + from collections import Counter +9 + from collections.abc import Mapping +10 | +11 | from collections import (Counter, Mapping) +12 | UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:10:1 @@ -98,17 +90,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 12 | from collections import (Counter, | help: Import from `collections.abc` - -ℹ Safe fix -7 7 | -8 8 | from collections import Counter, Mapping -9 9 | -10 |-from collections import (Counter, Mapping) - 10 |+from collections import (Counter) - 11 |+from collections.abc import Mapping -11 12 | -12 13 | from collections import (Counter, -13 14 | Mapping) +7 | +8 | from collections import Counter, Mapping +9 | + - from collections import (Counter, Mapping) +10 + from collections import (Counter) +11 + from collections.abc import Mapping +12 | +13 | from collections import (Counter, +14 | Mapping) UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:12:1 @@ -122,18 +112,16 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 15 | from collections import Counter, \ | help: Import from `collections.abc` - -ℹ Safe fix -9 9 | -10 10 | from collections import (Counter, Mapping) -11 11 | -12 |-from collections import (Counter, -13 |- Mapping) - 12 |+from collections import (Counter) - 13 |+from collections.abc import Mapping -14 14 | -15 15 | from collections import Counter, \ -16 16 | Mapping +9 | +10 | from collections import (Counter, Mapping) +11 | + - from collections import (Counter, + - Mapping) +12 + from collections import (Counter) +13 + from collections.abc import Mapping +14 | +15 | from collections import Counter, \ +16 | Mapping UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:15:1 @@ -147,18 +135,16 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 18 | from collections import Counter, Mapping, Sequence | help: Import from `collections.abc` - -ℹ Safe fix -12 12 | from collections import (Counter, -13 13 | Mapping) -14 14 | -15 |-from collections import Counter, \ -16 |- Mapping - 15 |+from collections import Counter - 16 |+from collections.abc import Mapping -17 17 | -18 18 | from collections import Counter, Mapping, Sequence -19 19 | +12 | from collections import (Counter, +13 | Mapping) +14 | + - from collections import Counter, \ + - Mapping +15 + from collections import Counter +16 + from collections.abc import Mapping +17 | +18 | from collections import Counter, Mapping, Sequence +19 | UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence` --> UP035.py:18:1 @@ -171,17 +157,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`, `Sequence` 20 | from collections import Mapping as mapping, Counter | help: Import from `collections.abc` - -ℹ Safe fix -15 15 | from collections import Counter, \ -16 16 | Mapping -17 17 | -18 |-from collections import Counter, Mapping, Sequence - 18 |+from collections import Counter - 19 |+from collections.abc import Mapping, Sequence -19 20 | -20 21 | from collections import Mapping as mapping, Counter -21 22 | +15 | from collections import Counter, \ +16 | Mapping +17 | + - from collections import Counter, Mapping, Sequence +18 + from collections import Counter +19 + from collections.abc import Mapping, Sequence +20 | +21 | from collections import Mapping as mapping, Counter +22 | UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:20:1 @@ -194,17 +178,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 22 | if True: | help: Import from `collections.abc` - -ℹ Safe fix -17 17 | -18 18 | from collections import Counter, Mapping, Sequence -19 19 | -20 |-from collections import Mapping as mapping, Counter - 20 |+from collections import Counter - 21 |+from collections.abc import Mapping as mapping -21 22 | -22 23 | if True: -23 24 | from collections import Mapping, Counter +17 | +18 | from collections import Counter, Mapping, Sequence +19 | + - from collections import Mapping as mapping, Counter +20 + from collections import Counter +21 + from collections.abc import Mapping as mapping +22 | +23 | if True: +24 | from collections import Mapping, Counter UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:23:5 @@ -216,17 +198,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 25 | if True: | help: Import from `collections.abc` - -ℹ Safe fix -20 20 | from collections import Mapping as mapping, Counter -21 21 | -22 22 | if True: -23 |- from collections import Mapping, Counter - 23 |+ from collections import Counter - 24 |+ from collections.abc import Mapping -24 25 | -25 26 | if True: -26 27 | if True: +20 | from collections import Mapping as mapping, Counter +21 | +22 | if True: + - from collections import Mapping, Counter +23 + from collections import Counter +24 + from collections.abc import Mapping +25 | +26 | if True: +27 | if True: UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:28:5 @@ -239,17 +219,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 30 | if True: from collections import Mapping | help: Import from `collections.abc` - -ℹ Safe fix -25 25 | if True: -26 26 | if True: -27 27 | pass -28 |- from collections import Mapping, Counter - 28 |+ from collections import Counter - 29 |+ from collections.abc import Mapping -29 30 | -30 31 | if True: from collections import Mapping -31 32 | +25 | if True: +26 | if True: +27 | pass + - from collections import Mapping, Counter +28 + from collections import Counter +29 + from collections.abc import Mapping +30 | +31 | if True: from collections import Mapping +32 | UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:30:10 @@ -262,16 +240,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 32 | import os | help: Import from `collections.abc` - -ℹ Safe fix -27 27 | pass -28 28 | from collections import Mapping, Counter -29 29 | -30 |-if True: from collections import Mapping - 30 |+if True: from collections.abc import Mapping -31 31 | -32 32 | import os -33 33 | from collections import Counter, Mapping +27 | pass +28 | from collections import Mapping, Counter +29 | + - if True: from collections import Mapping +30 + if True: from collections.abc import Mapping +31 | +32 | import os +33 | from collections import Counter, Mapping UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:33:1 @@ -282,17 +258,15 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 34 | import sys | help: Import from `collections.abc` - -ℹ Safe fix -30 30 | if True: from collections import Mapping -31 31 | -32 32 | import os -33 |-from collections import Counter, Mapping - 33 |+from collections import Counter - 34 |+from collections.abc import Mapping -34 35 | import sys -35 36 | -36 37 | if True: +30 | if True: from collections import Mapping +31 | +32 | import os + - from collections import Counter, Mapping +33 + from collections import Counter +34 + from collections.abc import Mapping +35 | import sys +36 | +37 | if True: UP035 [*] Import from `collections.abc` instead: `Mapping`, `Callable` --> UP035.py:37:5 @@ -309,20 +283,18 @@ UP035 [*] Import from `collections.abc` instead: `Mapping`, `Callable` 44 | from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager | help: Import from `collections.abc` - -ℹ Safe fix -35 35 | -36 36 | if True: -37 37 | from collections import ( -38 |- Mapping, -39 |- Callable, -40 38 | Bad, -41 39 | Good, -42 40 | ) - 41 |+ from collections.abc import Mapping, Callable -43 42 | -44 43 | from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager -45 44 | +35 | +36 | if True: +37 | from collections import ( + - Mapping, + - Callable, +38 | Bad, +39 | Good, +40 | ) +41 + from collections.abc import Mapping, Callable +42 | +43 | from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager +44 | UP035 [*] Import from `collections.abc` instead: `Callable` --> UP035.py:44:1 @@ -335,17 +307,15 @@ UP035 [*] Import from `collections.abc` instead: `Callable` 46 | if True: from collections import ( | help: Import from `collections.abc` - -ℹ Safe fix -41 41 | Good, -42 42 | ) -43 43 | -44 |-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager - 44 |+from typing import Match, Pattern, List, OrderedDict, AbstractSet, ContextManager - 45 |+from collections.abc import Callable -45 46 | -46 47 | if True: from collections import ( -47 48 | Mapping, Counter) +41 | Good, +42 | ) +43 | + - from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager +44 + from typing import Match, Pattern, List, OrderedDict, AbstractSet, ContextManager +45 + from collections.abc import Callable +46 | +47 | if True: from collections import ( +48 | Mapping, Counter) UP035 [*] Import from `collections` instead: `OrderedDict` --> UP035.py:44:1 @@ -358,17 +328,15 @@ UP035 [*] Import from `collections` instead: `OrderedDict` 46 | if True: from collections import ( | help: Import from `collections` - -ℹ Safe fix -41 41 | Good, -42 42 | ) -43 43 | -44 |-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager - 44 |+from typing import Callable, Match, Pattern, List, AbstractSet, ContextManager - 45 |+from collections import OrderedDict -45 46 | -46 47 | if True: from collections import ( -47 48 | Mapping, Counter) +41 | Good, +42 | ) +43 | + - from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager +44 + from typing import Callable, Match, Pattern, List, AbstractSet, ContextManager +45 + from collections import OrderedDict +46 | +47 | if True: from collections import ( +48 | Mapping, Counter) UP035 [*] Import from `re` instead: `Match`, `Pattern` --> UP035.py:44:1 @@ -381,17 +349,15 @@ UP035 [*] Import from `re` instead: `Match`, `Pattern` 46 | if True: from collections import ( | help: Import from `re` - -ℹ Safe fix -41 41 | Good, -42 42 | ) -43 43 | -44 |-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager - 44 |+from typing import Callable, List, OrderedDict, AbstractSet, ContextManager - 45 |+from re import Match, Pattern -45 46 | -46 47 | if True: from collections import ( -47 48 | Mapping, Counter) +41 | Good, +42 | ) +43 | + - from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager +44 + from typing import Callable, List, OrderedDict, AbstractSet, ContextManager +45 + from re import Match, Pattern +46 | +47 | if True: from collections import ( +48 | Mapping, Counter) UP035 `typing.List` is deprecated, use `list` instead --> UP035.py:44:1 @@ -461,16 +427,14 @@ UP035 [*] Import from `collections` instead: `OrderedDict` 53 | from typing import Callable | help: Import from `collections` - -ℹ Safe fix -48 48 | -49 49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035) -50 50 | from typing import ContextManager -51 |-from typing import OrderedDict - 51 |+from collections import OrderedDict -52 52 | from typing_extensions import OrderedDict -53 53 | from typing import Callable -54 54 | from typing import ByteString +48 | +49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035) +50 | from typing import ContextManager + - from typing import OrderedDict +51 + from collections import OrderedDict +52 | from typing_extensions import OrderedDict +53 | from typing import Callable +54 | from typing import ByteString UP035 [*] Import from `typing` instead: `OrderedDict` --> UP035.py:52:1 @@ -483,16 +447,14 @@ UP035 [*] Import from `typing` instead: `OrderedDict` 54 | from typing import ByteString | help: Import from `typing` - -ℹ Safe fix -49 49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035) -50 50 | from typing import ContextManager -51 51 | from typing import OrderedDict -52 |-from typing_extensions import OrderedDict - 52 |+from typing import OrderedDict -53 53 | from typing import Callable -54 54 | from typing import ByteString -55 55 | from typing import Container +49 | # Bad imports from PYI027 that are now handled by PYI022 (UP035) +50 | from typing import ContextManager +51 | from typing import OrderedDict + - from typing_extensions import OrderedDict +52 + from typing import OrderedDict +53 | from typing import Callable +54 | from typing import ByteString +55 | from typing import Container UP035 [*] Import from `collections.abc` instead: `Callable` --> UP035.py:53:1 @@ -505,16 +467,14 @@ UP035 [*] Import from `collections.abc` instead: `Callable` 55 | from typing import Container | help: Import from `collections.abc` - -ℹ Safe fix -50 50 | from typing import ContextManager -51 51 | from typing import OrderedDict -52 52 | from typing_extensions import OrderedDict -53 |-from typing import Callable - 53 |+from collections.abc import Callable -54 54 | from typing import ByteString -55 55 | from typing import Container -56 56 | from typing import Hashable +50 | from typing import ContextManager +51 | from typing import OrderedDict +52 | from typing_extensions import OrderedDict + - from typing import Callable +53 + from collections.abc import Callable +54 | from typing import ByteString +55 | from typing import Container +56 | from typing import Hashable UP035 [*] Import from `collections.abc` instead: `ByteString` --> UP035.py:54:1 @@ -527,16 +487,14 @@ UP035 [*] Import from `collections.abc` instead: `ByteString` 56 | from typing import Hashable | help: Import from `collections.abc` - -ℹ Safe fix -51 51 | from typing import OrderedDict -52 52 | from typing_extensions import OrderedDict -53 53 | from typing import Callable -54 |-from typing import ByteString - 54 |+from collections.abc import ByteString -55 55 | from typing import Container -56 56 | from typing import Hashable -57 57 | from typing import ItemsView +51 | from typing import OrderedDict +52 | from typing_extensions import OrderedDict +53 | from typing import Callable + - from typing import ByteString +54 + from collections.abc import ByteString +55 | from typing import Container +56 | from typing import Hashable +57 | from typing import ItemsView UP035 [*] Import from `collections.abc` instead: `Container` --> UP035.py:55:1 @@ -549,16 +507,14 @@ UP035 [*] Import from `collections.abc` instead: `Container` 57 | from typing import ItemsView | help: Import from `collections.abc` - -ℹ Safe fix -52 52 | from typing_extensions import OrderedDict -53 53 | from typing import Callable -54 54 | from typing import ByteString -55 |-from typing import Container - 55 |+from collections.abc import Container -56 56 | from typing import Hashable -57 57 | from typing import ItemsView -58 58 | from typing import Iterable +52 | from typing_extensions import OrderedDict +53 | from typing import Callable +54 | from typing import ByteString + - from typing import Container +55 + from collections.abc import Container +56 | from typing import Hashable +57 | from typing import ItemsView +58 | from typing import Iterable UP035 [*] Import from `collections.abc` instead: `Hashable` --> UP035.py:56:1 @@ -571,16 +527,14 @@ UP035 [*] Import from `collections.abc` instead: `Hashable` 58 | from typing import Iterable | help: Import from `collections.abc` - -ℹ Safe fix -53 53 | from typing import Callable -54 54 | from typing import ByteString -55 55 | from typing import Container -56 |-from typing import Hashable - 56 |+from collections.abc import Hashable -57 57 | from typing import ItemsView -58 58 | from typing import Iterable -59 59 | from typing import Iterator +53 | from typing import Callable +54 | from typing import ByteString +55 | from typing import Container + - from typing import Hashable +56 + from collections.abc import Hashable +57 | from typing import ItemsView +58 | from typing import Iterable +59 | from typing import Iterator UP035 [*] Import from `collections.abc` instead: `ItemsView` --> UP035.py:57:1 @@ -593,16 +547,14 @@ UP035 [*] Import from `collections.abc` instead: `ItemsView` 59 | from typing import Iterator | help: Import from `collections.abc` - -ℹ Safe fix -54 54 | from typing import ByteString -55 55 | from typing import Container -56 56 | from typing import Hashable -57 |-from typing import ItemsView - 57 |+from collections.abc import ItemsView -58 58 | from typing import Iterable -59 59 | from typing import Iterator -60 60 | from typing import KeysView +54 | from typing import ByteString +55 | from typing import Container +56 | from typing import Hashable + - from typing import ItemsView +57 + from collections.abc import ItemsView +58 | from typing import Iterable +59 | from typing import Iterator +60 | from typing import KeysView UP035 [*] Import from `collections.abc` instead: `Iterable` --> UP035.py:58:1 @@ -615,16 +567,14 @@ UP035 [*] Import from `collections.abc` instead: `Iterable` 60 | from typing import KeysView | help: Import from `collections.abc` - -ℹ Safe fix -55 55 | from typing import Container -56 56 | from typing import Hashable -57 57 | from typing import ItemsView -58 |-from typing import Iterable - 58 |+from collections.abc import Iterable -59 59 | from typing import Iterator -60 60 | from typing import KeysView -61 61 | from typing import Mapping +55 | from typing import Container +56 | from typing import Hashable +57 | from typing import ItemsView + - from typing import Iterable +58 + from collections.abc import Iterable +59 | from typing import Iterator +60 | from typing import KeysView +61 | from typing import Mapping UP035 [*] Import from `collections.abc` instead: `Iterator` --> UP035.py:59:1 @@ -637,16 +587,14 @@ UP035 [*] Import from `collections.abc` instead: `Iterator` 61 | from typing import Mapping | help: Import from `collections.abc` - -ℹ Safe fix -56 56 | from typing import Hashable -57 57 | from typing import ItemsView -58 58 | from typing import Iterable -59 |-from typing import Iterator - 59 |+from collections.abc import Iterator -60 60 | from typing import KeysView -61 61 | from typing import Mapping -62 62 | from typing import MappingView +56 | from typing import Hashable +57 | from typing import ItemsView +58 | from typing import Iterable + - from typing import Iterator +59 + from collections.abc import Iterator +60 | from typing import KeysView +61 | from typing import Mapping +62 | from typing import MappingView UP035 [*] Import from `collections.abc` instead: `KeysView` --> UP035.py:60:1 @@ -659,16 +607,14 @@ UP035 [*] Import from `collections.abc` instead: `KeysView` 62 | from typing import MappingView | help: Import from `collections.abc` - -ℹ Safe fix -57 57 | from typing import ItemsView -58 58 | from typing import Iterable -59 59 | from typing import Iterator -60 |-from typing import KeysView - 60 |+from collections.abc import KeysView -61 61 | from typing import Mapping -62 62 | from typing import MappingView -63 63 | from typing import MutableMapping +57 | from typing import ItemsView +58 | from typing import Iterable +59 | from typing import Iterator + - from typing import KeysView +60 + from collections.abc import KeysView +61 | from typing import Mapping +62 | from typing import MappingView +63 | from typing import MutableMapping UP035 [*] Import from `collections.abc` instead: `Mapping` --> UP035.py:61:1 @@ -681,16 +627,14 @@ UP035 [*] Import from `collections.abc` instead: `Mapping` 63 | from typing import MutableMapping | help: Import from `collections.abc` - -ℹ Safe fix -58 58 | from typing import Iterable -59 59 | from typing import Iterator -60 60 | from typing import KeysView -61 |-from typing import Mapping - 61 |+from collections.abc import Mapping -62 62 | from typing import MappingView -63 63 | from typing import MutableMapping -64 64 | from typing import MutableSequence +58 | from typing import Iterable +59 | from typing import Iterator +60 | from typing import KeysView + - from typing import Mapping +61 + from collections.abc import Mapping +62 | from typing import MappingView +63 | from typing import MutableMapping +64 | from typing import MutableSequence UP035 [*] Import from `collections.abc` instead: `MappingView` --> UP035.py:62:1 @@ -703,16 +647,14 @@ UP035 [*] Import from `collections.abc` instead: `MappingView` 64 | from typing import MutableSequence | help: Import from `collections.abc` - -ℹ Safe fix -59 59 | from typing import Iterator -60 60 | from typing import KeysView -61 61 | from typing import Mapping -62 |-from typing import MappingView - 62 |+from collections.abc import MappingView -63 63 | from typing import MutableMapping -64 64 | from typing import MutableSequence -65 65 | from typing import MutableSet +59 | from typing import Iterator +60 | from typing import KeysView +61 | from typing import Mapping + - from typing import MappingView +62 + from collections.abc import MappingView +63 | from typing import MutableMapping +64 | from typing import MutableSequence +65 | from typing import MutableSet UP035 [*] Import from `collections.abc` instead: `MutableMapping` --> UP035.py:63:1 @@ -725,16 +667,14 @@ UP035 [*] Import from `collections.abc` instead: `MutableMapping` 65 | from typing import MutableSet | help: Import from `collections.abc` - -ℹ Safe fix -60 60 | from typing import KeysView -61 61 | from typing import Mapping -62 62 | from typing import MappingView -63 |-from typing import MutableMapping - 63 |+from collections.abc import MutableMapping -64 64 | from typing import MutableSequence -65 65 | from typing import MutableSet -66 66 | from typing import Sequence +60 | from typing import KeysView +61 | from typing import Mapping +62 | from typing import MappingView + - from typing import MutableMapping +63 + from collections.abc import MutableMapping +64 | from typing import MutableSequence +65 | from typing import MutableSet +66 | from typing import Sequence UP035 [*] Import from `collections.abc` instead: `MutableSequence` --> UP035.py:64:1 @@ -747,16 +687,14 @@ UP035 [*] Import from `collections.abc` instead: `MutableSequence` 66 | from typing import Sequence | help: Import from `collections.abc` - -ℹ Safe fix -61 61 | from typing import Mapping -62 62 | from typing import MappingView -63 63 | from typing import MutableMapping -64 |-from typing import MutableSequence - 64 |+from collections.abc import MutableSequence -65 65 | from typing import MutableSet -66 66 | from typing import Sequence -67 67 | from typing import Sized +61 | from typing import Mapping +62 | from typing import MappingView +63 | from typing import MutableMapping + - from typing import MutableSequence +64 + from collections.abc import MutableSequence +65 | from typing import MutableSet +66 | from typing import Sequence +67 | from typing import Sized UP035 [*] Import from `collections.abc` instead: `MutableSet` --> UP035.py:65:1 @@ -769,16 +707,14 @@ UP035 [*] Import from `collections.abc` instead: `MutableSet` 67 | from typing import Sized | help: Import from `collections.abc` - -ℹ Safe fix -62 62 | from typing import MappingView -63 63 | from typing import MutableMapping -64 64 | from typing import MutableSequence -65 |-from typing import MutableSet - 65 |+from collections.abc import MutableSet -66 66 | from typing import Sequence -67 67 | from typing import Sized -68 68 | from typing import ValuesView +62 | from typing import MappingView +63 | from typing import MutableMapping +64 | from typing import MutableSequence + - from typing import MutableSet +65 + from collections.abc import MutableSet +66 | from typing import Sequence +67 | from typing import Sized +68 | from typing import ValuesView UP035 [*] Import from `collections.abc` instead: `Sequence` --> UP035.py:66:1 @@ -791,16 +727,14 @@ UP035 [*] Import from `collections.abc` instead: `Sequence` 68 | from typing import ValuesView | help: Import from `collections.abc` - -ℹ Safe fix -63 63 | from typing import MutableMapping -64 64 | from typing import MutableSequence -65 65 | from typing import MutableSet -66 |-from typing import Sequence - 66 |+from collections.abc import Sequence -67 67 | from typing import Sized -68 68 | from typing import ValuesView -69 69 | from typing import Awaitable +63 | from typing import MutableMapping +64 | from typing import MutableSequence +65 | from typing import MutableSet + - from typing import Sequence +66 + from collections.abc import Sequence +67 | from typing import Sized +68 | from typing import ValuesView +69 | from typing import Awaitable UP035 [*] Import from `collections.abc` instead: `Sized` --> UP035.py:67:1 @@ -813,16 +747,14 @@ UP035 [*] Import from `collections.abc` instead: `Sized` 69 | from typing import Awaitable | help: Import from `collections.abc` - -ℹ Safe fix -64 64 | from typing import MutableSequence -65 65 | from typing import MutableSet -66 66 | from typing import Sequence -67 |-from typing import Sized - 67 |+from collections.abc import Sized -68 68 | from typing import ValuesView -69 69 | from typing import Awaitable -70 70 | from typing import AsyncIterator +64 | from typing import MutableSequence +65 | from typing import MutableSet +66 | from typing import Sequence + - from typing import Sized +67 + from collections.abc import Sized +68 | from typing import ValuesView +69 | from typing import Awaitable +70 | from typing import AsyncIterator UP035 [*] Import from `collections.abc` instead: `ValuesView` --> UP035.py:68:1 @@ -835,16 +767,14 @@ UP035 [*] Import from `collections.abc` instead: `ValuesView` 70 | from typing import AsyncIterator | help: Import from `collections.abc` - -ℹ Safe fix -65 65 | from typing import MutableSet -66 66 | from typing import Sequence -67 67 | from typing import Sized -68 |-from typing import ValuesView - 68 |+from collections.abc import ValuesView -69 69 | from typing import Awaitable -70 70 | from typing import AsyncIterator -71 71 | from typing import AsyncIterable +65 | from typing import MutableSet +66 | from typing import Sequence +67 | from typing import Sized + - from typing import ValuesView +68 + from collections.abc import ValuesView +69 | from typing import Awaitable +70 | from typing import AsyncIterator +71 | from typing import AsyncIterable UP035 [*] Import from `collections.abc` instead: `Awaitable` --> UP035.py:69:1 @@ -857,16 +787,14 @@ UP035 [*] Import from `collections.abc` instead: `Awaitable` 71 | from typing import AsyncIterable | help: Import from `collections.abc` - -ℹ Safe fix -66 66 | from typing import Sequence -67 67 | from typing import Sized -68 68 | from typing import ValuesView -69 |-from typing import Awaitable - 69 |+from collections.abc import Awaitable -70 70 | from typing import AsyncIterator -71 71 | from typing import AsyncIterable -72 72 | from typing import Coroutine +66 | from typing import Sequence +67 | from typing import Sized +68 | from typing import ValuesView + - from typing import Awaitable +69 + from collections.abc import Awaitable +70 | from typing import AsyncIterator +71 | from typing import AsyncIterable +72 | from typing import Coroutine UP035 [*] Import from `collections.abc` instead: `AsyncIterator` --> UP035.py:70:1 @@ -879,16 +807,14 @@ UP035 [*] Import from `collections.abc` instead: `AsyncIterator` 72 | from typing import Coroutine | help: Import from `collections.abc` - -ℹ Safe fix -67 67 | from typing import Sized -68 68 | from typing import ValuesView -69 69 | from typing import Awaitable -70 |-from typing import AsyncIterator - 70 |+from collections.abc import AsyncIterator -71 71 | from typing import AsyncIterable -72 72 | from typing import Coroutine -73 73 | from typing import Collection +67 | from typing import Sized +68 | from typing import ValuesView +69 | from typing import Awaitable + - from typing import AsyncIterator +70 + from collections.abc import AsyncIterator +71 | from typing import AsyncIterable +72 | from typing import Coroutine +73 | from typing import Collection UP035 [*] Import from `collections.abc` instead: `AsyncIterable` --> UP035.py:71:1 @@ -901,16 +827,14 @@ UP035 [*] Import from `collections.abc` instead: `AsyncIterable` 73 | from typing import Collection | help: Import from `collections.abc` - -ℹ Safe fix -68 68 | from typing import ValuesView -69 69 | from typing import Awaitable -70 70 | from typing import AsyncIterator -71 |-from typing import AsyncIterable - 71 |+from collections.abc import AsyncIterable -72 72 | from typing import Coroutine -73 73 | from typing import Collection -74 74 | from typing import AsyncGenerator +68 | from typing import ValuesView +69 | from typing import Awaitable +70 | from typing import AsyncIterator + - from typing import AsyncIterable +71 + from collections.abc import AsyncIterable +72 | from typing import Coroutine +73 | from typing import Collection +74 | from typing import AsyncGenerator UP035 [*] Import from `collections.abc` instead: `Coroutine` --> UP035.py:72:1 @@ -923,16 +847,14 @@ UP035 [*] Import from `collections.abc` instead: `Coroutine` 74 | from typing import AsyncGenerator | help: Import from `collections.abc` - -ℹ Safe fix -69 69 | from typing import Awaitable -70 70 | from typing import AsyncIterator -71 71 | from typing import AsyncIterable -72 |-from typing import Coroutine - 72 |+from collections.abc import Coroutine -73 73 | from typing import Collection -74 74 | from typing import AsyncGenerator -75 75 | from typing import Reversible +69 | from typing import Awaitable +70 | from typing import AsyncIterator +71 | from typing import AsyncIterable + - from typing import Coroutine +72 + from collections.abc import Coroutine +73 | from typing import Collection +74 | from typing import AsyncGenerator +75 | from typing import Reversible UP035 [*] Import from `collections.abc` instead: `Collection` --> UP035.py:73:1 @@ -945,16 +867,14 @@ UP035 [*] Import from `collections.abc` instead: `Collection` 75 | from typing import Reversible | help: Import from `collections.abc` - -ℹ Safe fix -70 70 | from typing import AsyncIterator -71 71 | from typing import AsyncIterable -72 72 | from typing import Coroutine -73 |-from typing import Collection - 73 |+from collections.abc import Collection -74 74 | from typing import AsyncGenerator -75 75 | from typing import Reversible -76 76 | from typing import Generator +70 | from typing import AsyncIterator +71 | from typing import AsyncIterable +72 | from typing import Coroutine + - from typing import Collection +73 + from collections.abc import Collection +74 | from typing import AsyncGenerator +75 | from typing import Reversible +76 | from typing import Generator UP035 [*] Import from `collections.abc` instead: `AsyncGenerator` --> UP035.py:74:1 @@ -967,16 +887,14 @@ UP035 [*] Import from `collections.abc` instead: `AsyncGenerator` 76 | from typing import Generator | help: Import from `collections.abc` - -ℹ Safe fix -71 71 | from typing import AsyncIterable -72 72 | from typing import Coroutine -73 73 | from typing import Collection -74 |-from typing import AsyncGenerator - 74 |+from collections.abc import AsyncGenerator -75 75 | from typing import Reversible -76 76 | from typing import Generator -77 77 | from typing import Callable +71 | from typing import AsyncIterable +72 | from typing import Coroutine +73 | from typing import Collection + - from typing import AsyncGenerator +74 + from collections.abc import AsyncGenerator +75 | from typing import Reversible +76 | from typing import Generator +77 | from typing import Callable UP035 [*] Import from `collections.abc` instead: `Reversible` --> UP035.py:75:1 @@ -989,16 +907,14 @@ UP035 [*] Import from `collections.abc` instead: `Reversible` 77 | from typing import Callable | help: Import from `collections.abc` - -ℹ Safe fix -72 72 | from typing import Coroutine -73 73 | from typing import Collection -74 74 | from typing import AsyncGenerator -75 |-from typing import Reversible - 75 |+from collections.abc import Reversible -76 76 | from typing import Generator -77 77 | from typing import Callable -78 78 | from typing import cast +72 | from typing import Coroutine +73 | from typing import Collection +74 | from typing import AsyncGenerator + - from typing import Reversible +75 + from collections.abc import Reversible +76 | from typing import Generator +77 | from typing import Callable +78 | from typing import cast UP035 [*] Import from `collections.abc` instead: `Generator` --> UP035.py:76:1 @@ -1011,16 +927,14 @@ UP035 [*] Import from `collections.abc` instead: `Generator` 78 | from typing import cast | help: Import from `collections.abc` - -ℹ Safe fix -73 73 | from typing import Collection -74 74 | from typing import AsyncGenerator -75 75 | from typing import Reversible -76 |-from typing import Generator - 76 |+from collections.abc import Generator -77 77 | from typing import Callable -78 78 | from typing import cast -79 79 | +73 | from typing import Collection +74 | from typing import AsyncGenerator +75 | from typing import Reversible + - from typing import Generator +76 + from collections.abc import Generator +77 | from typing import Callable +78 | from typing import cast +79 | UP035 [*] Import from `collections.abc` instead: `Callable` --> UP035.py:77:1 @@ -1032,16 +946,14 @@ UP035 [*] Import from `collections.abc` instead: `Callable` 78 | from typing import cast | help: Import from `collections.abc` - -ℹ Safe fix -74 74 | from typing import AsyncGenerator -75 75 | from typing import Reversible -76 76 | from typing import Generator -77 |-from typing import Callable - 77 |+from collections.abc import Callable -78 78 | from typing import cast -79 79 | -80 80 | # OK +74 | from typing import AsyncGenerator +75 | from typing import Reversible +76 | from typing import Generator + - from typing import Callable +77 + from collections.abc import Callable +78 | from typing import cast +79 | +80 | # OK UP035 [*] Import from `typing` instead: `SupportsIndex` --> UP035.py:84:1 @@ -1053,16 +965,14 @@ UP035 [*] Import from `typing` instead: `SupportsIndex` 86 | # UP035 on py312+ only | help: Import from `typing` - -ℹ Safe fix -81 81 | from a import b -82 82 | -83 83 | # UP035 on py312+ only -84 |-from typing_extensions import SupportsIndex - 84 |+from typing import SupportsIndex -85 85 | -86 86 | # UP035 on py312+ only -87 87 | from typing_extensions import NamedTuple +81 | from a import b +82 | +83 | # UP035 on py312+ only + - from typing_extensions import SupportsIndex +84 + from typing import SupportsIndex +85 | +86 | # UP035 on py312+ only +87 | from typing_extensions import NamedTuple UP035 [*] Import from `typing` instead: `NamedTuple` --> UP035.py:87:1 @@ -1074,16 +984,14 @@ UP035 [*] Import from `typing` instead: `NamedTuple` 89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12). | help: Import from `typing` - -ℹ Safe fix -84 84 | from typing_extensions import SupportsIndex -85 85 | -86 86 | # UP035 on py312+ only -87 |-from typing_extensions import NamedTuple - 87 |+from typing import NamedTuple -88 88 | -89 89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12). -90 90 | from typing_extensions import dataclass_transform +84 | from typing_extensions import SupportsIndex +85 | +86 | # UP035 on py312+ only + - from typing_extensions import NamedTuple +87 + from typing import NamedTuple +88 | +89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12). +90 | from typing_extensions import dataclass_transform UP035 [*] Import from `typing` instead: `dataclass_transform` --> UP035.py:90:1 @@ -1095,16 +1003,14 @@ UP035 [*] Import from `typing` instead: `dataclass_transform` 92 | # UP035 | help: Import from `typing` - -ℹ Safe fix -87 87 | from typing_extensions import NamedTuple -88 88 | -89 89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12). -90 |-from typing_extensions import dataclass_transform - 90 |+from typing import dataclass_transform -91 91 | -92 92 | # UP035 -93 93 | from backports.strenum import StrEnum +87 | from typing_extensions import NamedTuple +88 | +89 | # UP035 on py312+ only: `typing_extensions` supports `frozen_default` (backported from 3.12). + - from typing_extensions import dataclass_transform +90 + from typing import dataclass_transform +91 | +92 | # UP035 +93 | from backports.strenum import StrEnum UP035 [*] Import from `enum` instead: `StrEnum` --> UP035.py:93:1 @@ -1116,16 +1022,14 @@ UP035 [*] Import from `enum` instead: `StrEnum` 95 | # UP035 | help: Import from `enum` - -ℹ Safe fix -90 90 | from typing_extensions import dataclass_transform -91 91 | -92 92 | # UP035 -93 |-from backports.strenum import StrEnum - 93 |+from enum import StrEnum -94 94 | -95 95 | # UP035 -96 96 | from typing_extensions import override +90 | from typing_extensions import dataclass_transform +91 | +92 | # UP035 + - from backports.strenum import StrEnum +93 + from enum import StrEnum +94 | +95 | # UP035 +96 | from typing_extensions import override UP035 [*] Import from `typing` instead: `override` --> UP035.py:96:1 @@ -1137,16 +1041,14 @@ UP035 [*] Import from `typing` instead: `override` 98 | # UP035 | help: Import from `typing` - -ℹ Safe fix -93 93 | from backports.strenum import StrEnum -94 94 | -95 95 | # UP035 -96 |-from typing_extensions import override - 96 |+from typing import override -97 97 | -98 98 | # UP035 -99 99 | from typing_extensions import Buffer +93 | from backports.strenum import StrEnum +94 | +95 | # UP035 + - from typing_extensions import override +96 + from typing import override +97 | +98 | # UP035 +99 | from typing_extensions import Buffer UP035 [*] Import from `collections.abc` instead: `Buffer` --> UP035.py:99:1 @@ -1158,16 +1060,14 @@ UP035 [*] Import from `collections.abc` instead: `Buffer` 101 | # UP035 | help: Import from `collections.abc` - -ℹ Safe fix -96 96 | from typing_extensions import override -97 97 | -98 98 | # UP035 -99 |-from typing_extensions import Buffer - 99 |+from collections.abc import Buffer -100 100 | -101 101 | # UP035 -102 102 | from typing_extensions import get_original_bases +96 | from typing_extensions import override +97 | +98 | # UP035 + - from typing_extensions import Buffer +99 + from collections.abc import Buffer +100 | +101 | # UP035 +102 | from typing_extensions import get_original_bases UP035 [*] Import from `types` instead: `get_original_bases` --> UP035.py:102:1 @@ -1179,16 +1079,14 @@ UP035 [*] Import from `types` instead: `get_original_bases` 104 | # UP035 on py313+ only | help: Import from `types` - -ℹ Safe fix -99 99 | from typing_extensions import Buffer -100 100 | -101 101 | # UP035 -102 |-from typing_extensions import get_original_bases - 102 |+from types import get_original_bases -103 103 | -104 104 | # UP035 on py313+ only -105 105 | from typing_extensions import TypeVar +99 | from typing_extensions import Buffer +100 | +101 | # UP035 + - from typing_extensions import get_original_bases +102 + from types import get_original_bases +103 | +104 | # UP035 on py313+ only +105 | from typing_extensions import TypeVar UP035 [*] Import from `typing` instead: `TypeVar` --> UP035.py:105:1 @@ -1200,16 +1098,14 @@ UP035 [*] Import from `typing` instead: `TypeVar` 107 | # UP035 on py313+ only | help: Import from `typing` - -ℹ Safe fix -102 102 | from typing_extensions import get_original_bases -103 103 | -104 104 | # UP035 on py313+ only -105 |-from typing_extensions import TypeVar - 105 |+from typing import TypeVar -106 106 | -107 107 | # UP035 on py313+ only -108 108 | from typing_extensions import CapsuleType +102 | from typing_extensions import get_original_bases +103 | +104 | # UP035 on py313+ only + - from typing_extensions import TypeVar +105 + from typing import TypeVar +106 | +107 | # UP035 on py313+ only +108 | from typing_extensions import CapsuleType UP035 [*] Import from `types` instead: `CapsuleType` --> UP035.py:108:1 @@ -1221,16 +1117,14 @@ UP035 [*] Import from `types` instead: `CapsuleType` 110 | # UP035 on py313+ only | help: Import from `types` - -ℹ Safe fix -105 105 | from typing_extensions import TypeVar -106 106 | -107 107 | # UP035 on py313+ only -108 |-from typing_extensions import CapsuleType - 108 |+from types import CapsuleType -109 109 | -110 110 | # UP035 on py313+ only -111 111 | from typing_extensions import deprecated +105 | from typing_extensions import TypeVar +106 | +107 | # UP035 on py313+ only + - from typing_extensions import CapsuleType +108 + from types import CapsuleType +109 | +110 | # UP035 on py313+ only +111 | from typing_extensions import deprecated UP035 [*] Import from `warnings` instead: `deprecated` --> UP035.py:111:1 @@ -1242,16 +1136,14 @@ UP035 [*] Import from `warnings` instead: `deprecated` 113 | # UP035 on py313+ only | help: Import from `warnings` - -ℹ Safe fix -108 108 | from typing_extensions import CapsuleType -109 109 | -110 110 | # UP035 on py313+ only -111 |-from typing_extensions import deprecated - 111 |+from warnings import deprecated -112 112 | -113 113 | # UP035 on py313+ only -114 114 | from typing_extensions import get_type_hints +108 | from typing_extensions import CapsuleType +109 | +110 | # UP035 on py313+ only + - from typing_extensions import deprecated +111 + from warnings import deprecated +112 | +113 | # UP035 on py313+ only +114 | from typing_extensions import get_type_hints UP035 [*] Import from `typing` instead: `get_type_hints` --> UP035.py:114:1 @@ -1263,13 +1155,11 @@ UP035 [*] Import from `typing` instead: `get_type_hints` 116 | # https://github.com/astral-sh/ruff/issues/15780 | help: Import from `typing` - -ℹ Safe fix -111 111 | from typing_extensions import deprecated -112 112 | -113 113 | # UP035 on py313+ only -114 |-from typing_extensions import get_type_hints - 114 |+from typing import get_type_hints -115 115 | -116 116 | # https://github.com/astral-sh/ruff/issues/15780 -117 117 | from typing_extensions import is_typeddict +111 | from typing_extensions import deprecated +112 | +113 | # UP035 on py313+ only + - from typing_extensions import get_type_hints +114 + from typing import get_type_hints +115 | +116 | # https://github.com/astral-sh/ruff/issues/15780 +117 | from typing_extensions import is_typeddict diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap index b3df965476..82253977ca 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_0.py.snap @@ -12,18 +12,17 @@ UP036 [*] Version block is outdated for minimum Python version 5 | else: | help: Remove outdated version block - -ℹ Unsafe fix -1 1 | import sys -2 2 | -3 |-if sys.version_info < (3,0): -4 |- print("py2") -5 |-else: -6 |- print("py3") - 3 |+print("py3") -7 4 | -8 5 | if sys.version_info < (3,0): -9 6 | if True: +1 | import sys +2 | + - if sys.version_info < (3,0): + - print("py2") + - else: + - print("py3") +3 + print("py3") +4 | +5 | if sys.version_info < (3,0): +6 | if True: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:8:4 @@ -36,22 +35,21 @@ UP036 [*] Version block is outdated for minimum Python version 10 | print("py2!") | help: Remove outdated version block - -ℹ Unsafe fix -5 5 | else: -6 6 | print("py3") -7 7 | -8 |-if sys.version_info < (3,0): -9 |- if True: -10 |- print("py2!") -11 |- else: -12 |- print("???") -13 |-else: -14 |- print("py3") - 8 |+print("py3") -15 9 | -16 10 | if sys.version_info < (3,0): print("PY2!") -17 11 | else: print("PY3!") +5 | else: +6 | print("py3") +7 | + - if sys.version_info < (3,0): + - if True: + - print("py2!") + - else: + - print("???") + - else: + - print("py3") +8 + print("py3") +9 | +10 | if sys.version_info < (3,0): print("PY2!") +11 | else: print("PY3!") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:16:4 @@ -63,17 +61,16 @@ UP036 [*] Version block is outdated for minimum Python version 17 | else: print("PY3!") | help: Remove outdated version block - -ℹ Unsafe fix -13 13 | else: -14 14 | print("py3") -15 15 | -16 |-if sys.version_info < (3,0): print("PY2!") -17 |-else: print("PY3!") - 16 |+print("PY3!") -18 17 | -19 18 | if True: -20 19 | if sys.version_info < (3,0): +13 | else: +14 | print("py3") +15 | + - if sys.version_info < (3,0): print("PY2!") + - else: print("PY3!") +16 + print("PY3!") +17 | +18 | if True: +19 | if sys.version_info < (3,0): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:20:8 @@ -85,19 +82,18 @@ UP036 [*] Version block is outdated for minimum Python version 22 | else: | help: Remove outdated version block - -ℹ Unsafe fix -17 17 | else: print("PY3!") -18 18 | -19 19 | if True: -20 |- if sys.version_info < (3,0): -21 |- print("PY2") -22 |- else: -23 |- print("PY3") - 20 |+ print("PY3") -24 21 | -25 22 | if sys.version_info < (3,0): print(1 if True else 3) -26 23 | else: +17 | else: print("PY3!") +18 | +19 | if True: + - if sys.version_info < (3,0): + - print("PY2") + - else: + - print("PY3") +20 + print("PY3") +21 | +22 | if sys.version_info < (3,0): print(1 if True else 3) +23 | else: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:25:4 @@ -110,18 +106,17 @@ UP036 [*] Version block is outdated for minimum Python version 27 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -22 22 | else: -23 23 | print("PY3") -24 24 | -25 |-if sys.version_info < (3,0): print(1 if True else 3) -26 |-else: -27 |- print("py3") - 25 |+print("py3") -28 26 | -29 27 | if sys.version_info < (3,0): -30 28 | def f(): +22 | else: +23 | print("PY3") +24 | + - if sys.version_info < (3,0): print(1 if True else 3) + - else: + - print("py3") +25 + print("py3") +26 | +27 | if sys.version_info < (3,0): +28 | def f(): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:29:4 @@ -134,24 +129,23 @@ UP036 [*] Version block is outdated for minimum Python version 31 | print("py2") | help: Remove outdated version block - -ℹ Unsafe fix -26 26 | else: -27 27 | print("py3") -28 28 | -29 |-if sys.version_info < (3,0): -30 |- def f(): -31 |- print("py2") -32 |-else: -33 |- def f(): -34 |- print("py3") -35 |- print("This the next") - 29 |+def f(): - 30 |+ print("py3") - 31 |+ print("This the next") -36 32 | -37 33 | if sys.version_info > (3,0): -38 34 | print("py3") +26 | else: +27 | print("py3") +28 | + - if sys.version_info < (3,0): + - def f(): + - print("py2") + - else: + - def f(): + - print("py3") + - print("This the next") +29 + def f(): +30 + print("py3") +31 + print("This the next") +32 | +33 | if sys.version_info > (3,0): +34 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:37:4 @@ -164,19 +158,18 @@ UP036 [*] Version block is outdated for minimum Python version 39 | else: | help: Remove outdated version block - -ℹ Unsafe fix -34 34 | print("py3") -35 35 | print("This the next") -36 36 | -37 |-if sys.version_info > (3,0): -38 |- print("py3") -39 |-else: -40 |- print("py2") - 37 |+print("py3") -41 38 | -42 39 | -43 40 | x = 1 +34 | print("py3") +35 | print("This the next") +36 | + - if sys.version_info > (3,0): + - print("py3") + - else: + - print("py2") +37 + print("py3") +38 | +39 | +40 | x = 1 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:45:4 @@ -189,19 +182,18 @@ UP036 [*] Version block is outdated for minimum Python version 47 | else: | help: Remove outdated version block - -ℹ Unsafe fix -42 42 | -43 43 | x = 1 -44 44 | -45 |-if sys.version_info > (3,0): -46 |- print("py3") -47 |-else: -48 |- print("py2") - 45 |+print("py3") -49 46 | # ohai -50 47 | -51 48 | x = 1 +42 | +43 | x = 1 +44 | + - if sys.version_info > (3,0): + - print("py3") + - else: + - print("py2") +45 + print("py3") +46 | # ohai +47 | +48 | x = 1 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:53:4 @@ -213,17 +205,16 @@ UP036 [*] Version block is outdated for minimum Python version 54 | else: print("py2") | help: Remove outdated version block - -ℹ Unsafe fix -50 50 | -51 51 | x = 1 -52 52 | -53 |-if sys.version_info > (3,0): print("py3") -54 |-else: print("py2") - 53 |+print("py3") -55 54 | -56 55 | if sys.version_info > (3,): -57 56 | print("py3") +50 | +51 | x = 1 +52 | + - if sys.version_info > (3,0): print("py3") + - else: print("py2") +53 + print("py3") +54 | +55 | if sys.version_info > (3,): +56 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:56:4 @@ -236,19 +227,18 @@ UP036 [*] Version block is outdated for minimum Python version 58 | else: | help: Remove outdated version block - -ℹ Unsafe fix -53 53 | if sys.version_info > (3,0): print("py3") -54 54 | else: print("py2") -55 55 | -56 |-if sys.version_info > (3,): -57 |- print("py3") -58 |-else: -59 |- print("py2") - 56 |+print("py3") -60 57 | -61 58 | if True: -62 59 | if sys.version_info > (3,): +53 | if sys.version_info > (3,0): print("py3") +54 | else: print("py2") +55 | + - if sys.version_info > (3,): + - print("py3") + - else: + - print("py2") +56 + print("py3") +57 | +58 | if True: +59 | if sys.version_info > (3,): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:62:8 @@ -260,19 +250,18 @@ UP036 [*] Version block is outdated for minimum Python version 64 | else: | help: Remove outdated version block - -ℹ Unsafe fix -59 59 | print("py2") -60 60 | -61 61 | if True: -62 |- if sys.version_info > (3,): -63 |- print("py3") -64 |- else: -65 |- print("py2") - 62 |+ print("py3") -66 63 | -67 64 | if sys.version_info < (3,): -68 65 | print("py2") +59 | print("py2") +60 | +61 | if True: + - if sys.version_info > (3,): + - print("py3") + - else: + - print("py2") +62 + print("py3") +63 | +64 | if sys.version_info < (3,): +65 | print("py2") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:67:4 @@ -285,19 +274,18 @@ UP036 [*] Version block is outdated for minimum Python version 69 | else: | help: Remove outdated version block - -ℹ Unsafe fix -64 64 | else: -65 65 | print("py2") -66 66 | -67 |-if sys.version_info < (3,): -68 |- print("py2") -69 |-else: -70 |- print("py3") - 67 |+print("py3") -71 68 | -72 69 | def f(): -73 70 | if sys.version_info < (3,0): +64 | else: +65 | print("py2") +66 | + - if sys.version_info < (3,): + - print("py2") + - else: + - print("py3") +67 + print("py3") +68 | +69 | def f(): +70 | if sys.version_info < (3,0): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:73:8 @@ -309,22 +297,21 @@ UP036 [*] Version block is outdated for minimum Python version 75 | yield | help: Remove outdated version block - -ℹ Unsafe fix -70 70 | print("py3") -71 71 | -72 72 | def f(): -73 |- if sys.version_info < (3,0): -74 |- try: -75 |- yield -76 |- finally: -77 |- pass -78 |- else: -79 |- yield - 73 |+ yield -80 74 | -81 75 | -82 76 | class C: +70 | print("py3") +71 | +72 | def f(): + - if sys.version_info < (3,0): + - try: + - yield + - finally: + - pass + - else: + - yield +73 + yield +74 | +75 | +76 | class C: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:86:8 @@ -337,22 +324,21 @@ UP036 [*] Version block is outdated for minimum Python version 88 | pass | help: Remove outdated version block - -ℹ Unsafe fix -83 83 | def g(): -84 84 | pass -85 85 | -86 |- if sys.version_info < (3,0): -87 |- def f(py2): -88 |- pass -89 |- else: -90 |- def f(py3): -91 |- pass - 86 |+ def f(py3): - 87 |+ pass -92 88 | -93 89 | def h(): -94 90 | pass +83 | def g(): +84 | pass +85 | + - if sys.version_info < (3,0): + - def f(py2): + - pass + - else: + - def f(py3): + - pass +86 + def f(py3): +87 + pass +88 | +89 | def h(): +90 | pass +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:97:8 @@ -364,19 +350,18 @@ UP036 [*] Version block is outdated for minimum Python version 99 | else: | help: Remove outdated version block - -ℹ Unsafe fix -94 94 | pass -95 95 | -96 96 | if True: -97 |- if sys.version_info < (3,0): -98 |- 2 -99 |- else: -100 |- 3 - 97 |+ 3 -101 98 | -102 99 | # comment -103 100 | +94 | pass +95 | +96 | if True: + - if sys.version_info < (3,0): + - 2 + - else: + - 3 +97 + 3 +98 | +99 | # comment +100 | +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:104:4 @@ -389,28 +374,27 @@ UP036 [*] Version block is outdated for minimum Python version 106 | print("py2") | help: Remove outdated version block - -ℹ Unsafe fix -101 101 | -102 102 | # comment -103 103 | -104 |-if sys.version_info < (3,0): -105 |- def f(): -106 |- print("py2") -107 |- def g(): -108 |- print("py2") -109 |-else: -110 |- def f(): -111 |- print("py3") -112 |- def g(): -113 |- print("py3") - 104 |+def f(): - 105 |+ print("py3") - 106 |+def g(): - 107 |+ print("py3") -114 108 | -115 109 | if True: -116 110 | if sys.version_info > (3,): +101 | +102 | # comment +103 | + - if sys.version_info < (3,0): + - def f(): + - print("py2") + - def g(): + - print("py2") + - else: + - def f(): + - print("py3") + - def g(): + - print("py3") +104 + def f(): +105 + print("py3") +106 + def g(): +107 + print("py3") +108 | +109 | if True: +110 | if sys.version_info > (3,): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:116:8 @@ -422,17 +406,16 @@ UP036 [*] Version block is outdated for minimum Python version 118 | # comment | help: Remove outdated version block - -ℹ Unsafe fix -113 113 | print("py3") -114 114 | -115 115 | if True: -116 |- if sys.version_info > (3,): -117 |- print(3) - 116 |+ print(3) -118 117 | # comment -119 118 | print(2+3) -120 119 | +113 | print("py3") +114 | +115 | if True: + - if sys.version_info > (3,): + - print(3) +116 + print(3) +117 | # comment +118 | print(2+3) +119 | +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:122:8 @@ -444,16 +427,15 @@ UP036 [*] Version block is outdated for minimum Python version 124 | if True: | help: Remove outdated version block - -ℹ Unsafe fix -119 119 | print(2+3) -120 120 | -121 121 | if True: -122 |- if sys.version_info > (3,): print(3) - 122 |+ print(3) -123 123 | -124 124 | if True: -125 125 | if sys.version_info > (3,): +119 | print(2+3) +120 | +121 | if True: + - if sys.version_info > (3,): print(3) +122 + print(3) +123 | +124 | if True: +125 | if sys.version_info > (3,): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:125:8 @@ -464,17 +446,16 @@ UP036 [*] Version block is outdated for minimum Python version 126 | print(3) | help: Remove outdated version block - -ℹ Unsafe fix -122 122 | if sys.version_info > (3,): print(3) -123 123 | -124 124 | if True: -125 |- if sys.version_info > (3,): -126 |- print(3) - 125 |+ print(3) -127 126 | -128 127 | -129 128 | if True: +122 | if sys.version_info > (3,): print(3) +123 | +124 | if True: + - if sys.version_info > (3,): + - print(3) +125 + print(3) +126 | +127 | +128 | if True: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:130:8 @@ -486,24 +467,23 @@ UP036 [*] Version block is outdated for minimum Python version 132 | else: | help: Remove outdated version block - -ℹ Unsafe fix -127 127 | -128 128 | -129 129 | if True: -130 |- if sys.version_info <= (3, 0): -131 |- expected_error = [] -132 |- else: -133 |- expected_error = [ - 130 |+ expected_error = [ -134 131 | ":1:5: Generator expression must be parenthesized", -135 132 | "max(1 for i in range(10), key=lambda x: x+1)", -136 133 | " ^", -137 |- ] - 134 |+ ] -138 135 | -139 136 | -140 137 | if sys.version_info <= (3, 0): +127 | +128 | +129 | if True: + - if sys.version_info <= (3, 0): + - expected_error = [] + - else: + - expected_error = [ +130 + expected_error = [ +131 | ":1:5: Generator expression must be parenthesized", +132 | "max(1 for i in range(10), key=lambda x: x+1)", +133 | " ^", + - ] +134 + ] +135 | +136 | +137 | if sys.version_info <= (3, 0): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:140:4 @@ -514,24 +494,23 @@ UP036 [*] Version block is outdated for minimum Python version 142 | else: | help: Remove outdated version block - -ℹ Unsafe fix -137 137 | ] -138 138 | -139 139 | -140 |-if sys.version_info <= (3, 0): -141 |- expected_error = [] -142 |-else: -143 |- expected_error = [ - 140 |+expected_error = [ -144 141 | ":1:5: Generator expression must be parenthesized", -145 142 | "max(1 for i in range(10), key=lambda x: x+1)", -146 143 | " ^", -147 |- ] - 144 |+] -148 145 | -149 146 | -150 147 | if sys.version_info > (3,0): +137 | ] +138 | +139 | + - if sys.version_info <= (3, 0): + - expected_error = [] + - else: + - expected_error = [ +140 + expected_error = [ +141 | ":1:5: Generator expression must be parenthesized", +142 | "max(1 for i in range(10), key=lambda x: x+1)", +143 | " ^", + - ] +144 + ] +145 | +146 | +147 | if sys.version_info > (3,0): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:150:4 @@ -542,31 +521,30 @@ UP036 [*] Version block is outdated for minimum Python version 152 | is valid""" | help: Remove outdated version block - -ℹ Unsafe fix -147 147 | ] -148 148 | -149 149 | -150 |-if sys.version_info > (3,0): -151 |- """this - 150 |+"""this -152 151 | is valid""" -153 152 | -154 |- """the indentation on - 153 |+"""the indentation on -155 154 | this line is significant""" -156 155 | -157 |- "this is" \ - 156 |+"this is" \ -158 157 | "allowed too" -159 158 | -160 |- ("so is" -161 |- "this for some reason") - 159 |+("so is" - 160 |+ "this for some reason") -162 161 | -163 162 | if sys.version_info > (3, 0): expected_error = \ -164 163 | [] +147 | ] +148 | +149 | + - if sys.version_info > (3,0): + - """this +150 + """this +151 | is valid""" +152 | + - """the indentation on +153 + """the indentation on +154 | this line is significant""" +155 | + - "this is" \ +156 + "this is" \ +157 | "allowed too" +158 | + - ("so is" + - "this for some reason") +159 + ("so is" +160 + "this for some reason") +161 | +162 | if sys.version_info > (3, 0): expected_error = \ +163 | [] +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:163:4 @@ -578,16 +556,15 @@ UP036 [*] Version block is outdated for minimum Python version 164 | [] | help: Remove outdated version block - -ℹ Unsafe fix -160 160 | ("so is" -161 161 | "this for some reason") -162 162 | -163 |-if sys.version_info > (3, 0): expected_error = \ - 163 |+expected_error = \ -164 164 | [] -165 165 | -166 166 | if sys.version_info > (3, 0): expected_error = [] +160 | ("so is" +161 | "this for some reason") +162 | + - if sys.version_info > (3, 0): expected_error = \ +163 + expected_error = \ +164 | [] +165 | +166 | if sys.version_info > (3, 0): expected_error = [] +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:166:4 @@ -600,16 +577,15 @@ UP036 [*] Version block is outdated for minimum Python version 168 | if sys.version_info > (3, 0): \ | help: Remove outdated version block - -ℹ Unsafe fix -163 163 | if sys.version_info > (3, 0): expected_error = \ -164 164 | [] -165 165 | -166 |-if sys.version_info > (3, 0): expected_error = [] - 166 |+expected_error = [] -167 167 | -168 168 | if sys.version_info > (3, 0): \ -169 169 | expected_error = [] +163 | if sys.version_info > (3, 0): expected_error = \ +164 | [] +165 | + - if sys.version_info > (3, 0): expected_error = [] +166 + expected_error = [] +167 | +168 | if sys.version_info > (3, 0): \ +169 | expected_error = [] +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:168:4 @@ -621,17 +597,16 @@ UP036 [*] Version block is outdated for minimum Python version 169 | expected_error = [] | help: Remove outdated version block - -ℹ Unsafe fix -165 165 | -166 166 | if sys.version_info > (3, 0): expected_error = [] -167 167 | -168 |-if sys.version_info > (3, 0): \ -169 |- expected_error = [] - 168 |+expected_error = [] -170 169 | -171 170 | if True: -172 171 | if sys.version_info > (3, 0): expected_error = \ +165 | +166 | if sys.version_info > (3, 0): expected_error = [] +167 | + - if sys.version_info > (3, 0): \ + - expected_error = [] +168 + expected_error = [] +169 | +170 | if True: +171 | if sys.version_info > (3, 0): expected_error = \ +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:172:8 @@ -642,16 +617,15 @@ UP036 [*] Version block is outdated for minimum Python version 173 | [] | help: Remove outdated version block - -ℹ Unsafe fix -169 169 | expected_error = [] -170 170 | -171 171 | if True: -172 |- if sys.version_info > (3, 0): expected_error = \ - 172 |+ expected_error = \ -173 173 | [] -174 174 | -175 175 | if True: +169 | expected_error = [] +170 | +171 | if True: + - if sys.version_info > (3, 0): expected_error = \ +172 + expected_error = \ +173 | [] +174 | +175 | if True: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:176:8 @@ -663,16 +637,15 @@ UP036 [*] Version block is outdated for minimum Python version 178 | if True: | help: Remove outdated version block - -ℹ Unsafe fix -173 173 | [] -174 174 | -175 175 | if True: -176 |- if sys.version_info > (3, 0): expected_error = [] - 176 |+ expected_error = [] -177 177 | -178 178 | if True: -179 179 | if sys.version_info > (3, 0): \ +173 | [] +174 | +175 | if True: + - if sys.version_info > (3, 0): expected_error = [] +176 + expected_error = [] +177 | +178 | if True: +179 | if sys.version_info > (3, 0): \ +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:179:8 @@ -683,15 +656,14 @@ UP036 [*] Version block is outdated for minimum Python version 180 | expected_error = [] | help: Remove outdated version block - -ℹ Unsafe fix -176 176 | if sys.version_info > (3, 0): expected_error = [] -177 177 | -178 178 | if True: -179 |- if sys.version_info > (3, 0): \ -180 179 | expected_error = [] -181 180 | -182 181 | if sys.version_info < (3,13): +176 | if sys.version_info > (3, 0): expected_error = [] +177 | +178 | if True: + - if sys.version_info > (3, 0): \ +179 | expected_error = [] +180 | +181 | if sys.version_info < (3,13): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:182:4 @@ -703,16 +675,15 @@ UP036 [*] Version block is outdated for minimum Python version 183 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -179 179 | if sys.version_info > (3, 0): \ -180 180 | expected_error = [] -181 181 | -182 |-if sys.version_info < (3,13): -183 |- print("py3") -184 182 | -185 183 | if sys.version_info <= (3,13): -186 184 | print("py3") +179 | if sys.version_info > (3, 0): \ +180 | expected_error = [] +181 | + - if sys.version_info < (3,13): + - print("py3") +182 | +183 | if sys.version_info <= (3,13): +184 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 Version specifier is invalid --> UP036_0.py:191:24 @@ -754,17 +725,16 @@ UP036 [*] Version block is outdated for minimum Python version 204 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -200 200 | if sys.version_info > (3,13): -201 201 | print("py3") -202 202 | -203 |-if sys.version_info >= (3,13): -204 |- print("py3") - 203 |+print("py3") -205 204 | -206 205 | # Slices on `sys.version_info` should be treated equivalently. -207 206 | if sys.version_info[:2] >= (3,0): +200 | if sys.version_info > (3,13): +201 | print("py3") +202 | + - if sys.version_info >= (3,13): + - print("py3") +203 + print("py3") +204 | +205 | # Slices on `sys.version_info` should be treated equivalently. +206 | if sys.version_info[:2] >= (3,0): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:207:4 @@ -775,17 +745,16 @@ UP036 [*] Version block is outdated for minimum Python version 208 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -204 204 | print("py3") -205 205 | -206 206 | # Slices on `sys.version_info` should be treated equivalently. -207 |-if sys.version_info[:2] >= (3,0): -208 |- print("py3") - 207 |+print("py3") -209 208 | -210 209 | if sys.version_info[:3] >= (3,0): -211 210 | print("py3") +204 | print("py3") +205 | +206 | # Slices on `sys.version_info` should be treated equivalently. + - if sys.version_info[:2] >= (3,0): + - print("py3") +207 + print("py3") +208 | +209 | if sys.version_info[:3] >= (3,0): +210 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:210:4 @@ -797,17 +766,16 @@ UP036 [*] Version block is outdated for minimum Python version 211 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -207 207 | if sys.version_info[:2] >= (3,0): -208 208 | print("py3") -209 209 | -210 |-if sys.version_info[:3] >= (3,0): -211 |- print("py3") - 210 |+print("py3") -212 211 | -213 212 | if sys.version_info[:2] > (3,14): -214 213 | print("py3") +207 | if sys.version_info[:2] >= (3,0): +208 | print("py3") +209 | + - if sys.version_info[:3] >= (3,0): + - print("py3") +210 + print("py3") +211 | +212 | if sys.version_info[:2] > (3,14): +213 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:219:4 @@ -820,25 +788,24 @@ UP036 [*] Version block is outdated for minimum Python version 221 | allowed too" | help: Remove outdated version block - -ℹ Unsafe fix -216 216 | if sys.version_info[:3] > (3,14): -217 217 | print("py3") -218 218 | -219 |-if sys.version_info > (3,0): -220 |- f"this is\ - 219 |+f"this is\ -221 220 | allowed too" -222 221 | -223 |- f"""the indentation on - 222 |+f"""the indentation on -224 223 | this line is significant""" -225 224 | -226 |- "this is\ - 225 |+"this is\ -227 226 | allowed too" -228 227 | -229 228 | if sys.version_info[0] == 3: +216 | if sys.version_info[:3] > (3,14): +217 | print("py3") +218 | + - if sys.version_info > (3,0): + - f"this is\ +219 + f"this is\ +220 | allowed too" +221 | + - f"""the indentation on +222 + f"""the indentation on +223 | this line is significant""" +224 | + - "this is\ +225 + "this is\ +226 | allowed too" +227 | +228 | if sys.version_info[0] == 3: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:229:4 @@ -850,17 +817,16 @@ UP036 [*] Version block is outdated for minimum Python version 230 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -226 226 | "this is\ -227 227 | allowed too" -228 228 | -229 |-if sys.version_info[0] == 3: -230 |- print("py3") - 229 |+print("py3") -231 230 | -232 231 | if sys.version_info[0] <= 3: -233 232 | print("py3") +226 | "this is\ +227 | allowed too" +228 | + - if sys.version_info[0] == 3: + - print("py3") +229 + print("py3") +230 | +231 | if sys.version_info[0] <= 3: +232 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:232:4 @@ -872,17 +838,16 @@ UP036 [*] Version block is outdated for minimum Python version 233 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -229 229 | if sys.version_info[0] == 3: -230 230 | print("py3") -231 231 | -232 |-if sys.version_info[0] <= 3: -233 |- print("py3") - 232 |+print("py3") -234 233 | -235 234 | if sys.version_info[0] < 3: -236 235 | print("py3") +229 | if sys.version_info[0] == 3: +230 | print("py3") +231 | + - if sys.version_info[0] <= 3: + - print("py3") +232 + print("py3") +233 | +234 | if sys.version_info[0] < 3: +235 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:235:4 @@ -894,16 +859,15 @@ UP036 [*] Version block is outdated for minimum Python version 236 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -232 232 | if sys.version_info[0] <= 3: -233 233 | print("py3") -234 234 | -235 |-if sys.version_info[0] < 3: -236 |- print("py3") -237 235 | -238 236 | if sys.version_info[0] >= 3: -239 237 | print("py3") +232 | if sys.version_info[0] <= 3: +233 | print("py3") +234 | + - if sys.version_info[0] < 3: + - print("py3") +235 | +236 | if sys.version_info[0] >= 3: +237 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:238:4 @@ -915,17 +879,16 @@ UP036 [*] Version block is outdated for minimum Python version 239 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -235 235 | if sys.version_info[0] < 3: -236 236 | print("py3") -237 237 | -238 |-if sys.version_info[0] >= 3: -239 |- print("py3") - 238 |+print("py3") -240 239 | -241 240 | if sys.version_info[0] > 3: -242 241 | print("py3") +235 | if sys.version_info[0] < 3: +236 | print("py3") +237 | + - if sys.version_info[0] >= 3: + - print("py3") +238 + print("py3") +239 | +240 | if sys.version_info[0] > 3: +241 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:241:4 @@ -937,16 +900,15 @@ UP036 [*] Version block is outdated for minimum Python version 242 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -238 238 | if sys.version_info[0] >= 3: -239 239 | print("py3") -240 240 | -241 |-if sys.version_info[0] > 3: -242 |- print("py3") -243 241 | -244 242 | if sys.version_info[0] == 2: -245 243 | print("py3") +238 | if sys.version_info[0] >= 3: +239 | print("py3") +240 | + - if sys.version_info[0] > 3: + - print("py3") +241 | +242 | if sys.version_info[0] == 2: +243 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:244:4 @@ -958,16 +920,15 @@ UP036 [*] Version block is outdated for minimum Python version 245 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -241 241 | if sys.version_info[0] > 3: -242 242 | print("py3") -243 243 | -244 |-if sys.version_info[0] == 2: -245 |- print("py3") -246 244 | -247 245 | if sys.version_info[0] <= 2: -248 246 | print("py3") +241 | if sys.version_info[0] > 3: +242 | print("py3") +243 | + - if sys.version_info[0] == 2: + - print("py3") +244 | +245 | if sys.version_info[0] <= 2: +246 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:247:4 @@ -979,16 +940,15 @@ UP036 [*] Version block is outdated for minimum Python version 248 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -244 244 | if sys.version_info[0] == 2: -245 245 | print("py3") -246 246 | -247 |-if sys.version_info[0] <= 2: -248 |- print("py3") -249 247 | -250 248 | if sys.version_info[0] < 2: -251 249 | print("py3") +244 | if sys.version_info[0] == 2: +245 | print("py3") +246 | + - if sys.version_info[0] <= 2: + - print("py3") +247 | +248 | if sys.version_info[0] < 2: +249 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:250:4 @@ -1000,16 +960,15 @@ UP036 [*] Version block is outdated for minimum Python version 251 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -247 247 | if sys.version_info[0] <= 2: -248 248 | print("py3") -249 249 | -250 |-if sys.version_info[0] < 2: -251 |- print("py3") -252 250 | -253 251 | if sys.version_info[0] >= 2: -254 252 | print("py3") +247 | if sys.version_info[0] <= 2: +248 | print("py3") +249 | + - if sys.version_info[0] < 2: + - print("py3") +250 | +251 | if sys.version_info[0] >= 2: +252 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:253:4 @@ -1021,17 +980,16 @@ UP036 [*] Version block is outdated for minimum Python version 254 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -250 250 | if sys.version_info[0] < 2: -251 251 | print("py3") -252 252 | -253 |-if sys.version_info[0] >= 2: -254 |- print("py3") - 253 |+print("py3") -255 254 | -256 255 | if sys.version_info[0] > 2: -257 256 | print("py3") +250 | if sys.version_info[0] < 2: +251 | print("py3") +252 | + - if sys.version_info[0] >= 2: + - print("py3") +253 + print("py3") +254 | +255 | if sys.version_info[0] > 2: +256 | print("py3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_0.py:256:4 @@ -1043,11 +1001,10 @@ UP036 [*] Version block is outdated for minimum Python version 257 | print("py3") | help: Remove outdated version block - -ℹ Unsafe fix -253 253 | if sys.version_info[0] >= 2: -254 254 | print("py3") -255 255 | -256 |-if sys.version_info[0] > 2: -257 |- print("py3") - 256 |+print("py3") +253 | if sys.version_info[0] >= 2: +254 | print("py3") +255 | + - if sys.version_info[0] > 2: + - print("py3") +256 + print("py3") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap index 312669b328..0290d392fc 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_1.py.snap @@ -12,18 +12,17 @@ UP036 [*] Version block is outdated for minimum Python version 5 | else: | help: Remove outdated version block - -ℹ Unsafe fix -1 1 | import sys -2 2 | -3 |-if sys.version_info == 2: -4 |- 2 -5 |-else: -6 |- 3 - 3 |+3 -7 4 | -8 5 | if sys.version_info < (3,): -9 6 | 2 +1 | import sys +2 | + - if sys.version_info == 2: + - 2 + - else: + - 3 +3 + 3 +4 | +5 | if sys.version_info < (3,): +6 | 2 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:8:4 @@ -36,19 +35,18 @@ UP036 [*] Version block is outdated for minimum Python version 10 | else: | help: Remove outdated version block - -ℹ Unsafe fix -5 5 | else: -6 6 | 3 -7 7 | -8 |-if sys.version_info < (3,): -9 |- 2 -10 |-else: -11 |- 3 - 8 |+3 -12 9 | -13 10 | if sys.version_info < (3,0): -14 11 | 2 +5 | else: +6 | 3 +7 | + - if sys.version_info < (3,): + - 2 + - else: + - 3 +8 + 3 +9 | +10 | if sys.version_info < (3,0): +11 | 2 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:13:4 @@ -61,19 +59,18 @@ UP036 [*] Version block is outdated for minimum Python version 15 | else: | help: Remove outdated version block - -ℹ Unsafe fix -10 10 | else: -11 11 | 3 -12 12 | -13 |-if sys.version_info < (3,0): -14 |- 2 -15 |-else: -16 |- 3 - 13 |+3 -17 14 | -18 15 | if sys.version_info == 3: -19 16 | 3 +10 | else: +11 | 3 +12 | + - if sys.version_info < (3,0): + - 2 + - else: + - 3 +13 + 3 +14 | +15 | if sys.version_info == 3: +16 | 3 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:18:4 @@ -86,19 +83,18 @@ UP036 [*] Version block is outdated for minimum Python version 20 | else: | help: Remove outdated version block - -ℹ Unsafe fix -15 15 | else: -16 16 | 3 -17 17 | -18 |-if sys.version_info == 3: -19 |- 3 -20 |-else: -21 |- 2 - 18 |+3 -22 19 | -23 20 | if sys.version_info > (3,): -24 21 | 3 +15 | else: +16 | 3 +17 | + - if sys.version_info == 3: + - 3 + - else: + - 2 +18 + 3 +19 | +20 | if sys.version_info > (3,): +21 | 3 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:23:4 @@ -111,19 +107,18 @@ UP036 [*] Version block is outdated for minimum Python version 25 | else: | help: Remove outdated version block - -ℹ Unsafe fix -20 20 | else: -21 21 | 2 -22 22 | -23 |-if sys.version_info > (3,): -24 |- 3 -25 |-else: -26 |- 2 - 23 |+3 -27 24 | -28 25 | if sys.version_info >= (3,): -29 26 | 3 +20 | else: +21 | 2 +22 | + - if sys.version_info > (3,): + - 3 + - else: + - 2 +23 + 3 +24 | +25 | if sys.version_info >= (3,): +26 | 3 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:28:4 @@ -136,19 +131,18 @@ UP036 [*] Version block is outdated for minimum Python version 30 | else: | help: Remove outdated version block - -ℹ Unsafe fix -25 25 | else: -26 26 | 2 -27 27 | -28 |-if sys.version_info >= (3,): -29 |- 3 -30 |-else: -31 |- 2 - 28 |+3 -32 29 | -33 30 | from sys import version_info -34 31 | +25 | else: +26 | 2 +27 | + - if sys.version_info >= (3,): + - 3 + - else: + - 2 +28 + 3 +29 | +30 | from sys import version_info +31 | +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:35:4 @@ -161,19 +155,18 @@ UP036 [*] Version block is outdated for minimum Python version 37 | else: | help: Remove outdated version block - -ℹ Unsafe fix -32 32 | -33 33 | from sys import version_info -34 34 | -35 |-if version_info > (3,): -36 |- 3 -37 |-else: -38 |- 2 - 35 |+3 -39 36 | -40 37 | if True: -41 38 | print(1) +32 | +33 | from sys import version_info +34 | + - if version_info > (3,): + - 3 + - else: + - 2 +35 + 3 +36 | +37 | if True: +38 | print(1) +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:42:6 @@ -186,16 +179,15 @@ UP036 [*] Version block is outdated for minimum Python version 44 | else: | help: Remove outdated version block - -ℹ Unsafe fix -39 39 | -40 40 | if True: -41 41 | print(1) -42 |-elif sys.version_info < (3,0): -43 |- print(2) -44 42 | else: -45 43 | print(3) -46 44 | +39 | +40 | if True: +41 | print(1) + - elif sys.version_info < (3,0): + - print(2) +42 | else: +43 | print(3) +44 | +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:49:6 @@ -208,19 +200,18 @@ UP036 [*] Version block is outdated for minimum Python version 51 | else: | help: Remove outdated version block - -ℹ Unsafe fix -46 46 | -47 47 | if True: -48 48 | print(1) -49 |-elif sys.version_info > (3,): - 49 |+else: -50 50 | print(3) -51 |-else: -52 |- print(2) -53 51 | -54 52 | if True: -55 53 | print(1) +46 | +47 | if True: +48 | print(1) + - elif sys.version_info > (3,): +49 + else: +50 | print(3) + - else: + - print(2) +51 | +52 | if True: +53 | print(1) +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:56:6 @@ -232,16 +223,15 @@ UP036 [*] Version block is outdated for minimum Python version 57 | print(3) | help: Remove outdated version block - -ℹ Unsafe fix -53 53 | -54 54 | if True: -55 55 | print(1) -56 |-elif sys.version_info > (3,): - 56 |+else: -57 57 | print(3) -58 58 | -59 59 | def f(): +53 | +54 | if True: +55 | print(1) + - elif sys.version_info > (3,): +56 + else: +57 | print(3) +58 | +59 | def f(): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:62:10 @@ -253,16 +243,15 @@ UP036 [*] Version block is outdated for minimum Python version 63 | print(3) | help: Remove outdated version block - -ℹ Unsafe fix -59 59 | def f(): -60 60 | if True: -61 61 | print(1) -62 |- elif sys.version_info > (3,): - 62 |+ else: -63 63 | print(3) -64 64 | -65 65 | if True: +59 | def f(): +60 | if True: +61 | print(1) + - elif sys.version_info > (3,): +62 + else: +63 | print(3) +64 | +65 | if True: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:67:6 @@ -275,16 +264,15 @@ UP036 [*] Version block is outdated for minimum Python version 69 | else: | help: Remove outdated version block - -ℹ Unsafe fix -64 64 | -65 65 | if True: -66 66 | print(1) -67 |-elif sys.version_info < (3,0): -68 |- print(2) -69 67 | else: -70 68 | print(3) -71 69 | +64 | +65 | if True: +66 | print(1) + - elif sys.version_info < (3,0): + - print(2) +67 | else: +68 | print(3) +69 | +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_1.py:75:10 @@ -296,11 +284,10 @@ UP036 [*] Version block is outdated for minimum Python version 76 | print(3) | help: Remove outdated version block - -ℹ Unsafe fix -72 72 | def f(): -73 73 | if True: -74 74 | print(1) -75 |- elif sys.version_info > (3,): - 75 |+ else: -76 76 | print(3) +72 | def f(): +73 | if True: +74 | print(1) + - elif sys.version_info > (3,): +75 + else: +76 | print(3) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap index 32373c23a6..5b22b6e77b 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_2.py.snap @@ -12,19 +12,18 @@ UP036 [*] Version block is outdated for minimum Python version 6 | else: | help: Remove outdated version block - -ℹ Unsafe fix -1 1 | import sys -2 2 | from sys import version_info -3 3 | -4 |-if sys.version_info > (3, 5): -5 |- 3+6 -6 |-else: -7 |- 3-5 - 4 |+3+6 -8 5 | -9 6 | if version_info > (3, 5): -10 7 | 3+6 +1 | import sys +2 | from sys import version_info +3 | + - if sys.version_info > (3, 5): + - 3+6 + - else: + - 3-5 +4 + 3+6 +5 | +6 | if version_info > (3, 5): +7 | 3+6 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:9:4 @@ -37,19 +36,18 @@ UP036 [*] Version block is outdated for minimum Python version 11 | else: | help: Remove outdated version block - -ℹ Unsafe fix -6 6 | else: -7 7 | 3-5 -8 8 | -9 |-if version_info > (3, 5): -10 |- 3+6 -11 |-else: -12 |- 3-5 - 9 |+3+6 -13 10 | -14 11 | if sys.version_info >= (3,6): -15 12 | 3+6 +6 | else: +7 | 3-5 +8 | + - if version_info > (3, 5): + - 3+6 + - else: + - 3-5 +9 + 3+6 +10 | +11 | if sys.version_info >= (3,6): +12 | 3+6 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:14:4 @@ -62,19 +60,18 @@ UP036 [*] Version block is outdated for minimum Python version 16 | else: | help: Remove outdated version block - -ℹ Unsafe fix -11 11 | else: -12 12 | 3-5 -13 13 | -14 |-if sys.version_info >= (3,6): -15 |- 3+6 -16 |-else: -17 |- 3-5 - 14 |+3+6 -18 15 | -19 16 | if version_info >= (3,6): -20 17 | 3+6 +11 | else: +12 | 3-5 +13 | + - if sys.version_info >= (3,6): + - 3+6 + - else: + - 3-5 +14 + 3+6 +15 | +16 | if version_info >= (3,6): +17 | 3+6 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:19:4 @@ -87,19 +84,18 @@ UP036 [*] Version block is outdated for minimum Python version 21 | else: | help: Remove outdated version block - -ℹ Unsafe fix -16 16 | else: -17 17 | 3-5 -18 18 | -19 |-if version_info >= (3,6): -20 |- 3+6 -21 |-else: -22 |- 3-5 - 19 |+3+6 -23 20 | -24 21 | if sys.version_info < (3,6): -25 22 | 3-5 +16 | else: +17 | 3-5 +18 | + - if version_info >= (3,6): + - 3+6 + - else: + - 3-5 +19 + 3+6 +20 | +21 | if sys.version_info < (3,6): +22 | 3-5 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:24:4 @@ -112,19 +108,18 @@ UP036 [*] Version block is outdated for minimum Python version 26 | else: | help: Remove outdated version block - -ℹ Unsafe fix -21 21 | else: -22 22 | 3-5 -23 23 | -24 |-if sys.version_info < (3,6): -25 |- 3-5 -26 |-else: -27 |- 3+6 - 24 |+3+6 -28 25 | -29 26 | if sys.version_info <= (3,5): -30 27 | 3-5 +21 | else: +22 | 3-5 +23 | + - if sys.version_info < (3,6): + - 3-5 + - else: + - 3+6 +24 + 3+6 +25 | +26 | if sys.version_info <= (3,5): +27 | 3-5 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:29:4 @@ -137,19 +132,18 @@ UP036 [*] Version block is outdated for minimum Python version 31 | else: | help: Remove outdated version block - -ℹ Unsafe fix -26 26 | else: -27 27 | 3+6 -28 28 | -29 |-if sys.version_info <= (3,5): -30 |- 3-5 -31 |-else: -32 |- 3+6 - 29 |+3+6 -33 30 | -34 31 | if sys.version_info <= (3, 5): -35 32 | 3-5 +26 | else: +27 | 3+6 +28 | + - if sys.version_info <= (3,5): + - 3-5 + - else: + - 3+6 +29 + 3+6 +30 | +31 | if sys.version_info <= (3, 5): +32 | 3-5 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:34:4 @@ -162,19 +156,18 @@ UP036 [*] Version block is outdated for minimum Python version 36 | else: | help: Remove outdated version block - -ℹ Unsafe fix -31 31 | else: -32 32 | 3+6 -33 33 | -34 |-if sys.version_info <= (3, 5): -35 |- 3-5 -36 |-else: -37 |- 3+6 - 34 |+3+6 -38 35 | -39 36 | if sys.version_info >= (3, 5): -40 37 | pass +31 | else: +32 | 3+6 +33 | + - if sys.version_info <= (3, 5): + - 3-5 + - else: + - 3+6 +34 + 3+6 +35 | +36 | if sys.version_info >= (3, 5): +37 | pass +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:39:4 @@ -186,17 +179,16 @@ UP036 [*] Version block is outdated for minimum Python version 40 | pass | help: Remove outdated version block - -ℹ Unsafe fix -36 36 | else: -37 37 | 3+6 -38 38 | -39 |-if sys.version_info >= (3, 5): -40 |- pass - 39 |+pass -41 40 | -42 41 | if sys.version_info < (3,0): -43 42 | pass +36 | else: +37 | 3+6 +38 | + - if sys.version_info >= (3, 5): + - pass +39 + pass +40 | +41 | if sys.version_info < (3,0): +42 | pass +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:42:4 @@ -208,16 +200,15 @@ UP036 [*] Version block is outdated for minimum Python version 43 | pass | help: Remove outdated version block - -ℹ Unsafe fix -39 39 | if sys.version_info >= (3, 5): -40 40 | pass -41 41 | -42 |-if sys.version_info < (3,0): -43 |- pass -44 42 | -45 43 | if True: -46 44 | if sys.version_info < (3,0): +39 | if sys.version_info >= (3, 5): +40 | pass +41 | + - if sys.version_info < (3,0): + - pass +42 | +43 | if True: +44 | if sys.version_info < (3,0): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:46:8 @@ -228,17 +219,16 @@ UP036 [*] Version block is outdated for minimum Python version 47 | pass | help: Remove outdated version block - -ℹ Unsafe fix -43 43 | pass -44 44 | -45 45 | if True: -46 |- if sys.version_info < (3,0): -47 |- pass - 46 |+ pass -48 47 | -49 48 | if sys.version_info < (3,0): -50 49 | pass +43 | pass +44 | +45 | if True: + - if sys.version_info < (3,0): + - pass +46 + pass +47 | +48 | if sys.version_info < (3,0): +49 | pass +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:49:4 @@ -251,18 +241,17 @@ UP036 [*] Version block is outdated for minimum Python version 51 | elif False: | help: Remove outdated version block - -ℹ Unsafe fix -46 46 | if sys.version_info < (3,0): -47 47 | pass -48 48 | -49 |-if sys.version_info < (3,0): -50 |- pass -51 |-elif False: - 49 |+if False: -52 50 | pass -53 51 | -54 52 | if sys.version_info > (3,): +46 | if sys.version_info < (3,0): +47 | pass +48 | + - if sys.version_info < (3,0): + - pass + - elif False: +49 + if False: +50 | pass +51 | +52 | if sys.version_info > (3,): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_2.py:54:4 @@ -275,16 +264,15 @@ UP036 [*] Version block is outdated for minimum Python version 56 | elif False: | help: Remove outdated version block - -ℹ Unsafe fix -51 51 | elif False: -52 52 | pass -53 53 | -54 |-if sys.version_info > (3,): -55 |- pass -56 |-elif False: -57 |- pass - 54 |+pass -58 55 | -59 56 | if sys.version_info[0] > "2": -60 57 | 3 +51 | elif False: +52 | pass +53 | + - if sys.version_info > (3,): + - pass + - elif False: + - pass +54 + pass +55 | +56 | if sys.version_info[0] > "2": +57 | 3 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap index 82ac0fd9ce..300b9e32b9 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_3.py.snap @@ -12,24 +12,23 @@ UP036 [*] Version block is outdated for minimum Python version 5 | for item in range(10): | help: Remove outdated version block - -ℹ Unsafe fix -1 1 | import sys -2 2 | -3 |-if sys.version_info < (3,0): -4 |- print("py2") -5 |- for item in range(10): -6 |- print(f"PY2-{item}") -7 |-else : -8 |- print("py3") -9 |- for item in range(10): -10 |- print(f"PY3-{item}") - 3 |+print("py3") - 4 |+for item in range(10): - 5 |+ print(f"PY3-{item}") -11 6 | -12 7 | if False: -13 8 | if sys.version_info < (3,0): +1 | import sys +2 | + - if sys.version_info < (3,0): + - print("py2") + - for item in range(10): + - print(f"PY2-{item}") + - else : + - print("py3") + - for item in range(10): + - print(f"PY3-{item}") +3 + print("py3") +4 + for item in range(10): +5 + print(f"PY3-{item}") +6 | +7 | if False: +8 | if sys.version_info < (3,0): +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_3.py:13:19 @@ -41,25 +40,24 @@ UP036 [*] Version block is outdated for minimum Python version 15 | for item in range(10): | help: Remove outdated version block - -ℹ Unsafe fix -10 10 | print(f"PY3-{item}") -11 11 | -12 12 | if False: -13 |- if sys.version_info < (3,0): -14 |- print("py2") -15 |- for item in range(10): -16 |- print(f"PY2-{item}") -17 |- else : -18 |- print("py3") -19 |- for item in range(10): -20 |- print(f"PY3-{item}") - 13 |+ print("py3") - 14 |+ for item in range(10): - 15 |+ print(f"PY3-{item}") -21 16 | -22 17 | -23 18 | if sys.version_info < (3,0): print("PY2!") +10 | print(f"PY3-{item}") +11 | +12 | if False: + - if sys.version_info < (3,0): + - print("py2") + - for item in range(10): + - print(f"PY2-{item}") + - else : + - print("py3") + - for item in range(10): + - print(f"PY3-{item}") +13 + print("py3") +14 + for item in range(10): +15 + print(f"PY3-{item}") +16 | +17 | +18 | if sys.version_info < (3,0): print("PY2!") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_3.py:23:15 @@ -69,11 +67,10 @@ UP036 [*] Version block is outdated for minimum Python version 24 | else : print("PY3!") | help: Remove outdated version block - -ℹ Unsafe fix -20 20 | print(f"PY3-{item}") -21 21 | -22 22 | -23 |-if sys.version_info < (3,0): print("PY2!") -24 |-else : print("PY3!") - 23 |+print("PY3!") +20 | print(f"PY3-{item}") +21 | +22 | + - if sys.version_info < (3,0): print("PY2!") + - else : print("PY3!") +23 + print("PY3!") +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap index 37041671bc..d6ca76d218 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_4.py.snap @@ -10,17 +10,16 @@ UP036 [*] Version block is outdated for minimum Python version 5 | cmd = [sys.executable, "-m", "test.regrtest"] | help: Remove outdated version block - -ℹ Unsafe fix -1 1 | import sys -2 2 | -3 3 | if True: -4 |- if sys.version_info < (3, 3): -5 |- cmd = [sys.executable, "-m", "test.regrtest"] - 4 |+ pass -6 5 | -7 6 | -8 7 | if True: +1 | import sys +2 | +3 | if True: + - if sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] +4 + pass +5 | +6 | +7 | if True: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_4.py:11:10 @@ -32,17 +31,16 @@ UP036 [*] Version block is outdated for minimum Python version 12 | cmd = [sys.executable, "-m", "test.regrtest"] | help: Remove outdated version block - -ℹ Unsafe fix -8 8 | if True: -9 9 | if foo: -10 10 | print() -11 |- elif sys.version_info < (3, 3): -12 |- cmd = [sys.executable, "-m", "test.regrtest"] - 11 |+ -13 12 | -14 13 | if True: -15 14 | if foo: +8 | if True: +9 | if foo: +10 | print() + - elif sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] +11 + +12 | +13 | if True: +14 | if foo: +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_4.py:17:10 @@ -55,16 +53,15 @@ UP036 [*] Version block is outdated for minimum Python version 19 | elif foo: | help: Remove outdated version block - -ℹ Unsafe fix -14 14 | if True: -15 15 | if foo: -16 16 | print() -17 |- elif sys.version_info < (3, 3): -18 |- cmd = [sys.executable, "-m", "test.regrtest"] -19 17 | elif foo: -20 18 | cmd = [sys.executable, "-m", "test", "-j0"] -21 19 | +14 | if True: +15 | if foo: +16 | print() + - elif sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] +17 | elif foo: +18 | cmd = [sys.executable, "-m", "test", "-j0"] +19 | +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_4.py:24:10 @@ -76,17 +73,16 @@ UP036 [*] Version block is outdated for minimum Python version 25 | cmd = [sys.executable, "-m", "test.regrtest"] | help: Remove outdated version block - -ℹ Unsafe fix -21 21 | -22 22 | if foo: -23 23 | print() -24 |- elif sys.version_info < (3, 3): -25 |- cmd = [sys.executable, "-m", "test.regrtest"] - 24 |+ -26 25 | -27 26 | if sys.version_info < (3, 3): -28 27 | cmd = [sys.executable, "-m", "test.regrtest"] +21 | +22 | if foo: +23 | print() + - elif sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] +24 + +25 | +26 | if sys.version_info < (3, 3): +27 | cmd = [sys.executable, "-m", "test.regrtest"] +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_4.py:27:8 @@ -98,16 +94,15 @@ UP036 [*] Version block is outdated for minimum Python version 28 | cmd = [sys.executable, "-m", "test.regrtest"] | help: Remove outdated version block - -ℹ Unsafe fix -24 24 | elif sys.version_info < (3, 3): -25 25 | cmd = [sys.executable, "-m", "test.regrtest"] -26 26 | -27 |- if sys.version_info < (3, 3): -28 |- cmd = [sys.executable, "-m", "test.regrtest"] -29 27 | -30 28 | if foo: -31 29 | print() +24 | elif sys.version_info < (3, 3): +25 | cmd = [sys.executable, "-m", "test.regrtest"] +26 | + - if sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] +27 | +28 | if foo: +29 | print() +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_4.py:32:10 @@ -120,16 +115,15 @@ UP036 [*] Version block is outdated for minimum Python version 34 | else: | help: Remove outdated version block - -ℹ Unsafe fix -29 29 | -30 30 | if foo: -31 31 | print() -32 |- elif sys.version_info < (3, 3): -33 |- cmd = [sys.executable, "-m", "test.regrtest"] -34 32 | else: -35 33 | cmd = [sys.executable, "-m", "test", "-j0"] -36 34 | +29 | +30 | if foo: +31 | print() + - elif sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] +32 | else: +33 | cmd = [sys.executable, "-m", "test", "-j0"] +34 | +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_4.py:37:8 @@ -142,19 +136,18 @@ UP036 [*] Version block is outdated for minimum Python version 39 | else: | help: Remove outdated version block - -ℹ Unsafe fix -34 34 | else: -35 35 | cmd = [sys.executable, "-m", "test", "-j0"] -36 36 | -37 |- if sys.version_info < (3, 3): -38 |- cmd = [sys.executable, "-m", "test.regrtest"] -39 |- else: -40 |- cmd = [sys.executable, "-m", "test", "-j0"] - 37 |+ cmd = [sys.executable, "-m", "test", "-j0"] -41 38 | -42 39 | if sys.version_info < (3, 3): -43 40 | cmd = [sys.executable, "-m", "test.regrtest"] +34 | else: +35 | cmd = [sys.executable, "-m", "test", "-j0"] +36 | + - if sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] + - else: + - cmd = [sys.executable, "-m", "test", "-j0"] +37 + cmd = [sys.executable, "-m", "test", "-j0"] +38 | +39 | if sys.version_info < (3, 3): +40 | cmd = [sys.executable, "-m", "test.regrtest"] +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_4.py:42:8 @@ -167,13 +160,12 @@ UP036 [*] Version block is outdated for minimum Python version 44 | elif foo: | help: Remove outdated version block - -ℹ Unsafe fix -39 39 | else: -40 40 | cmd = [sys.executable, "-m", "test", "-j0"] -41 41 | -42 |- if sys.version_info < (3, 3): -43 |- cmd = [sys.executable, "-m", "test.regrtest"] -44 |- elif foo: - 42 |+ if foo: -45 43 | cmd = [sys.executable, "-m", "test", "-j0"] +39 | else: +40 | cmd = [sys.executable, "-m", "test", "-j0"] +41 | + - if sys.version_info < (3, 3): + - cmd = [sys.executable, "-m", "test.regrtest"] + - elif foo: +42 + if foo: +43 | cmd = [sys.executable, "-m", "test", "-j0"] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap index 5e9addf542..ea5a1b487a 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP036_5.py.snap @@ -12,25 +12,24 @@ UP036 [*] Version block is outdated for minimum Python version 5 | def a(): | help: Remove outdated version block - -ℹ Unsafe fix -1 1 | import sys -2 2 | -3 |-if sys.version_info < (3, 8): -4 |- -5 |- def a(): -6 |- if b: -7 |- print(1) -8 |- elif c: -9 |- print(2) -10 |- return None -11 |- -12 |-else: -13 |- pass - 3 |+pass -14 4 | -15 5 | -16 6 | import sys +1 | import sys +2 | + - if sys.version_info < (3, 8): + - + - def a(): + - if b: + - print(1) + - elif c: + - print(2) + - return None + - + - else: + - pass +3 + pass +4 | +5 | +6 | import sys +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:18:4 @@ -42,35 +41,34 @@ UP036 [*] Version block is outdated for minimum Python version 19 | pass | help: Remove outdated version block - -ℹ Unsafe fix -15 15 | -16 16 | import sys -17 17 | -18 |-if sys.version_info < (3, 8): -19 |- pass -20 |- -21 |-else: -22 |- -23 |- def a(): -24 |- if b: -25 |- print(1) -26 |- elif c: -27 |- print(2) -28 |- else: -29 |- print(3) -30 |- return None - 18 |+def a(): - 19 |+ if b: - 20 |+ print(1) - 21 |+ elif c: - 22 |+ print(2) - 23 |+ else: - 24 |+ print(3) - 25 |+ return None -31 26 | -32 27 | -33 28 | # https://github.com/astral-sh/ruff/issues/16082 +15 | +16 | import sys +17 | + - if sys.version_info < (3, 8): + - pass + - + - else: + - + - def a(): + - if b: + - print(1) + - elif c: + - print(2) + - else: + - print(3) + - return None +18 + def a(): +19 + if b: +20 + print(1) +21 + elif c: +22 + print(2) +23 + else: +24 + print(3) +25 + return None +26 | +27 | +28 | # https://github.com/astral-sh/ruff/issues/16082 +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:36:4 @@ -81,16 +79,15 @@ UP036 [*] Version block is outdated for minimum Python version 37 | print() | help: Remove outdated version block - -ℹ Unsafe fix -33 33 | # https://github.com/astral-sh/ruff/issues/16082 -34 34 | -35 35 | ## Errors -36 |-if sys.version_info < (3, 12, 0): -37 |- print() -38 36 | -39 37 | if sys.version_info <= (3, 12, 0): -40 38 | print() +33 | # https://github.com/astral-sh/ruff/issues/16082 +34 | +35 | ## Errors + - if sys.version_info < (3, 12, 0): + - print() +36 | +37 | if sys.version_info <= (3, 12, 0): +38 | print() +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:39:4 @@ -102,16 +99,15 @@ UP036 [*] Version block is outdated for minimum Python version 40 | print() | help: Remove outdated version block - -ℹ Unsafe fix -36 36 | if sys.version_info < (3, 12, 0): -37 37 | print() -38 38 | -39 |-if sys.version_info <= (3, 12, 0): -40 |- print() -41 39 | -42 40 | if sys.version_info < (3, 12, 11): -43 41 | print() +36 | if sys.version_info < (3, 12, 0): +37 | print() +38 | + - if sys.version_info <= (3, 12, 0): + - print() +39 | +40 | if sys.version_info < (3, 12, 11): +41 | print() +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:42:4 @@ -123,16 +119,15 @@ UP036 [*] Version block is outdated for minimum Python version 43 | print() | help: Remove outdated version block - -ℹ Unsafe fix -39 39 | if sys.version_info <= (3, 12, 0): -40 40 | print() -41 41 | -42 |-if sys.version_info < (3, 12, 11): -43 |- print() -44 42 | -45 43 | if sys.version_info < (3, 13, 0): -46 44 | print() +39 | if sys.version_info <= (3, 12, 0): +40 | print() +41 | + - if sys.version_info < (3, 12, 11): + - print() +42 | +43 | if sys.version_info < (3, 13, 0): +44 | print() +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:45:4 @@ -144,16 +139,15 @@ UP036 [*] Version block is outdated for minimum Python version 46 | print() | help: Remove outdated version block - -ℹ Unsafe fix -42 42 | if sys.version_info < (3, 12, 11): -43 43 | print() -44 44 | -45 |-if sys.version_info < (3, 13, 0): -46 |- print() -47 45 | -48 46 | if sys.version_info <= (3, 13, 100000): -49 47 | print() +42 | if sys.version_info < (3, 12, 11): +43 | print() +44 | + - if sys.version_info < (3, 13, 0): + - print() +45 | +46 | if sys.version_info <= (3, 13, 100000): +47 | print() +note: This is an unsafe fix and may change runtime behavior UP036 Version specifier is invalid --> UP036_5.py:48:24 @@ -176,19 +170,18 @@ UP036 [*] Version block is outdated for minimum Python version 79 | else: | help: Remove outdated version block - -ℹ Unsafe fix -74 74 | -75 75 | # https://github.com/astral-sh/ruff/issues/18165 -76 76 | -77 |-if sys.version_info.major >= 3: -78 |- print("3") -79 |-else: -80 |- print("2") - 77 |+print("3") -81 78 | -82 79 | if sys.version_info.major > 3: -83 80 | print("3") +74 | +75 | # https://github.com/astral-sh/ruff/issues/18165 +76 | + - if sys.version_info.major >= 3: + - print("3") + - else: + - print("2") +77 + print("3") +78 | +79 | if sys.version_info.major > 3: +80 | print("3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:82:4 @@ -201,19 +194,18 @@ UP036 [*] Version block is outdated for minimum Python version 84 | else: | help: Remove outdated version block - -ℹ Unsafe fix -79 79 | else: -80 80 | print("2") -81 81 | -82 |-if sys.version_info.major > 3: -83 |- print("3") -84 |-else: -85 |- print("2") - 82 |+print("2") -86 83 | -87 84 | if sys.version_info.major <= 3: -88 85 | print("3") +79 | else: +80 | print("2") +81 | + - if sys.version_info.major > 3: + - print("3") + - else: + - print("2") +82 + print("2") +83 | +84 | if sys.version_info.major <= 3: +85 | print("3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:87:4 @@ -226,19 +218,18 @@ UP036 [*] Version block is outdated for minimum Python version 89 | else: | help: Remove outdated version block - -ℹ Unsafe fix -84 84 | else: -85 85 | print("2") -86 86 | -87 |-if sys.version_info.major <= 3: -88 |- print("3") -89 |-else: -90 |- print("2") - 87 |+print("3") -91 88 | -92 89 | if sys.version_info.major < 3: -93 90 | print("3") +84 | else: +85 | print("2") +86 | + - if sys.version_info.major <= 3: + - print("3") + - else: + - print("2") +87 + print("3") +88 | +89 | if sys.version_info.major < 3: +90 | print("3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:92:4 @@ -251,19 +242,18 @@ UP036 [*] Version block is outdated for minimum Python version 94 | else: | help: Remove outdated version block - -ℹ Unsafe fix -89 89 | else: -90 90 | print("2") -91 91 | -92 |-if sys.version_info.major < 3: -93 |- print("3") -94 |-else: -95 |- print("2") - 92 |+print("2") -96 93 | -97 94 | if sys.version_info.major == 3: -98 95 | print("3") +89 | else: +90 | print("2") +91 | + - if sys.version_info.major < 3: + - print("3") + - else: + - print("2") +92 + print("2") +93 | +94 | if sys.version_info.major == 3: +95 | print("3") +note: This is an unsafe fix and may change runtime behavior UP036 [*] Version block is outdated for minimum Python version --> UP036_5.py:97:4 @@ -276,16 +266,15 @@ UP036 [*] Version block is outdated for minimum Python version 99 | else: | help: Remove outdated version block - -ℹ Unsafe fix -94 94 | else: -95 95 | print("2") -96 96 | -97 |-if sys.version_info.major == 3: -98 |- print("3") -99 |-else: -100 |- print("2") - 97 |+print("3") -101 98 | -102 99 | # Semantically incorrect, skip fixing -103 100 | +94 | else: +95 | print("2") +96 | + - if sys.version_info.major == 3: + - print("3") + - else: + - print("2") +97 + print("3") +98 | +99 | # Semantically incorrect, skip fixing +100 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap index 2c67e9da5a..3040870f87 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_0.py.snap @@ -9,16 +9,14 @@ UP037 [*] Remove quotes from type annotation 19 | x: "MyClass" | help: Remove quotes - -ℹ Safe fix -15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg -16 16 | -17 17 | -18 |-def foo(var: "MyClass") -> "MyClass": - 18 |+def foo(var: MyClass) -> "MyClass": -19 19 | x: "MyClass" -20 20 | -21 21 | +15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg +16 | +17 | + - def foo(var: "MyClass") -> "MyClass": +18 + def foo(var: MyClass) -> "MyClass": +19 | x: "MyClass" +20 | +21 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:18:28 @@ -28,16 +26,14 @@ UP037 [*] Remove quotes from type annotation 19 | x: "MyClass" | help: Remove quotes - -ℹ Safe fix -15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg -16 16 | -17 17 | -18 |-def foo(var: "MyClass") -> "MyClass": - 18 |+def foo(var: "MyClass") -> MyClass: -19 19 | x: "MyClass" -20 20 | -21 21 | +15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg +16 | +17 | + - def foo(var: "MyClass") -> "MyClass": +18 + def foo(var: "MyClass") -> MyClass: +19 | x: "MyClass" +20 | +21 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:19:8 @@ -47,16 +43,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -16 16 | -17 17 | -18 18 | def foo(var: "MyClass") -> "MyClass": -19 |- x: "MyClass" - 19 |+ x: MyClass -20 20 | -21 21 | -22 22 | def foo(*, inplace: "bool"): +16 | +17 | +18 | def foo(var: "MyClass") -> "MyClass": + - x: "MyClass" +19 + x: MyClass +20 | +21 | +22 | def foo(*, inplace: "bool"): UP037 [*] Remove quotes from type annotation --> UP037_0.py:22:21 @@ -66,16 +60,14 @@ UP037 [*] Remove quotes from type annotation 23 | pass | help: Remove quotes - -ℹ Safe fix -19 19 | x: "MyClass" -20 20 | -21 21 | -22 |-def foo(*, inplace: "bool"): - 22 |+def foo(*, inplace: bool): -23 23 | pass -24 24 | -25 25 | +19 | x: "MyClass" +20 | +21 | + - def foo(*, inplace: "bool"): +22 + def foo(*, inplace: bool): +23 | pass +24 | +25 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:26:16 @@ -85,16 +77,14 @@ UP037 [*] Remove quotes from type annotation 27 | pass | help: Remove quotes - -ℹ Safe fix -23 23 | pass -24 24 | -25 25 | -26 |-def foo(*args: "str", **kwargs: "int"): - 26 |+def foo(*args: str, **kwargs: "int"): -27 27 | pass -28 28 | -29 29 | +23 | pass +24 | +25 | + - def foo(*args: "str", **kwargs: "int"): +26 + def foo(*args: str, **kwargs: "int"): +27 | pass +28 | +29 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:26:33 @@ -104,16 +94,14 @@ UP037 [*] Remove quotes from type annotation 27 | pass | help: Remove quotes - -ℹ Safe fix -23 23 | pass -24 24 | -25 25 | -26 |-def foo(*args: "str", **kwargs: "int"): - 26 |+def foo(*args: "str", **kwargs: int): -27 27 | pass -28 28 | -29 29 | +23 | pass +24 | +25 | + - def foo(*args: "str", **kwargs: "int"): +26 + def foo(*args: "str", **kwargs: int): +27 | pass +28 | +29 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:30:10 @@ -124,16 +112,14 @@ UP037 [*] Remove quotes from type annotation 32 | x: Callable[["MyClass"], None] | help: Remove quotes - -ℹ Safe fix -27 27 | pass -28 28 | -29 29 | -30 |-x: Tuple["MyClass"] - 30 |+x: Tuple[MyClass] -31 31 | -32 32 | x: Callable[["MyClass"], None] -33 33 | +27 | pass +28 | +29 | + - x: Tuple["MyClass"] +30 + x: Tuple[MyClass] +31 | +32 | x: Callable[["MyClass"], None] +33 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:32:14 @@ -144,16 +130,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -29 29 | -30 30 | x: Tuple["MyClass"] -31 31 | -32 |-x: Callable[["MyClass"], None] - 32 |+x: Callable[[MyClass], None] -33 33 | -34 34 | -35 35 | class Foo(NamedTuple): +29 | +30 | x: Tuple["MyClass"] +31 | + - x: Callable[["MyClass"], None] +32 + x: Callable[[MyClass], None] +33 | +34 | +35 | class Foo(NamedTuple): UP037 [*] Remove quotes from type annotation --> UP037_0.py:36:8 @@ -163,16 +147,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -33 33 | -34 34 | -35 35 | class Foo(NamedTuple): -36 |- x: "MyClass" - 36 |+ x: MyClass -37 37 | -38 38 | -39 39 | class D(TypedDict): +33 | +34 | +35 | class Foo(NamedTuple): + - x: "MyClass" +36 + x: MyClass +37 | +38 | +39 | class D(TypedDict): UP037 [*] Remove quotes from type annotation --> UP037_0.py:40:27 @@ -182,16 +164,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^ | help: Remove quotes - -ℹ Safe fix -37 37 | -38 38 | -39 39 | class D(TypedDict): -40 |- E: TypedDict("E", foo="int", total=False) - 40 |+ E: TypedDict("E", foo=int, total=False) -41 41 | -42 42 | -43 43 | class D(TypedDict): +37 | +38 | +39 | class D(TypedDict): + - E: TypedDict("E", foo="int", total=False) +40 + E: TypedDict("E", foo=int, total=False) +41 | +42 | +43 | class D(TypedDict): UP037 [*] Remove quotes from type annotation --> UP037_0.py:44:31 @@ -201,16 +181,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^ | help: Remove quotes - -ℹ Safe fix -41 41 | -42 42 | -43 43 | class D(TypedDict): -44 |- E: TypedDict("E", {"foo": "int"}) - 44 |+ E: TypedDict("E", {"foo": int}) -45 45 | -46 46 | -47 47 | x: Annotated["str", "metadata"] +41 | +42 | +43 | class D(TypedDict): + - E: TypedDict("E", {"foo": "int"}) +44 + E: TypedDict("E", {"foo": int}) +45 | +46 | +47 | x: Annotated["str", "metadata"] UP037 [*] Remove quotes from type annotation --> UP037_0.py:47:14 @@ -221,16 +199,14 @@ UP037 [*] Remove quotes from type annotation 49 | x: Arg("str", "name") | help: Remove quotes - -ℹ Safe fix -44 44 | E: TypedDict("E", {"foo": "int"}) -45 45 | -46 46 | -47 |-x: Annotated["str", "metadata"] - 47 |+x: Annotated[str, "metadata"] -48 48 | -49 49 | x: Arg("str", "name") -50 50 | +44 | E: TypedDict("E", {"foo": "int"}) +45 | +46 | + - x: Annotated["str", "metadata"] +47 + x: Annotated[str, "metadata"] +48 | +49 | x: Arg("str", "name") +50 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:49:8 @@ -243,16 +219,14 @@ UP037 [*] Remove quotes from type annotation 51 | x: DefaultArg("str", "name") | help: Remove quotes - -ℹ Safe fix -46 46 | -47 47 | x: Annotated["str", "metadata"] -48 48 | -49 |-x: Arg("str", "name") - 49 |+x: Arg(str, "name") -50 50 | -51 51 | x: DefaultArg("str", "name") -52 52 | +46 | +47 | x: Annotated["str", "metadata"] +48 | + - x: Arg("str", "name") +49 + x: Arg(str, "name") +50 | +51 | x: DefaultArg("str", "name") +52 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:51:15 @@ -265,16 +239,14 @@ UP037 [*] Remove quotes from type annotation 53 | x: NamedArg("str", "name") | help: Remove quotes - -ℹ Safe fix -48 48 | -49 49 | x: Arg("str", "name") -50 50 | -51 |-x: DefaultArg("str", "name") - 51 |+x: DefaultArg(str, "name") -52 52 | -53 53 | x: NamedArg("str", "name") -54 54 | +48 | +49 | x: Arg("str", "name") +50 | + - x: DefaultArg("str", "name") +51 + x: DefaultArg(str, "name") +52 | +53 | x: NamedArg("str", "name") +54 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:53:13 @@ -287,16 +259,14 @@ UP037 [*] Remove quotes from type annotation 55 | x: DefaultNamedArg("str", "name") | help: Remove quotes - -ℹ Safe fix -50 50 | -51 51 | x: DefaultArg("str", "name") -52 52 | -53 |-x: NamedArg("str", "name") - 53 |+x: NamedArg(str, "name") -54 54 | -55 55 | x: DefaultNamedArg("str", "name") -56 56 | +50 | +51 | x: DefaultArg("str", "name") +52 | + - x: NamedArg("str", "name") +53 + x: NamedArg(str, "name") +54 | +55 | x: DefaultNamedArg("str", "name") +56 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:55:20 @@ -309,16 +279,14 @@ UP037 [*] Remove quotes from type annotation 57 | x: DefaultNamedArg("str", name="name") | help: Remove quotes - -ℹ Safe fix -52 52 | -53 53 | x: NamedArg("str", "name") -54 54 | -55 |-x: DefaultNamedArg("str", "name") - 55 |+x: DefaultNamedArg(str, "name") -56 56 | -57 57 | x: DefaultNamedArg("str", name="name") -58 58 | +52 | +53 | x: NamedArg("str", "name") +54 | + - x: DefaultNamedArg("str", "name") +55 + x: DefaultNamedArg(str, "name") +56 | +57 | x: DefaultNamedArg("str", name="name") +58 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:57:20 @@ -331,16 +299,14 @@ UP037 [*] Remove quotes from type annotation 59 | x: VarArg("str") | help: Remove quotes - -ℹ Safe fix -54 54 | -55 55 | x: DefaultNamedArg("str", "name") -56 56 | -57 |-x: DefaultNamedArg("str", name="name") - 57 |+x: DefaultNamedArg(str, name="name") -58 58 | -59 59 | x: VarArg("str") -60 60 | +54 | +55 | x: DefaultNamedArg("str", "name") +56 | + - x: DefaultNamedArg("str", name="name") +57 + x: DefaultNamedArg(str, name="name") +58 | +59 | x: VarArg("str") +60 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:59:11 @@ -353,16 +319,14 @@ UP037 [*] Remove quotes from type annotation 61 | x: List[List[List["MyClass"]]] | help: Remove quotes - -ℹ Safe fix -56 56 | -57 57 | x: DefaultNamedArg("str", name="name") -58 58 | -59 |-x: VarArg("str") - 59 |+x: VarArg(str) -60 60 | -61 61 | x: List[List[List["MyClass"]]] -62 62 | +56 | +57 | x: DefaultNamedArg("str", name="name") +58 | + - x: VarArg("str") +59 + x: VarArg(str) +60 | +61 | x: List[List[List["MyClass"]]] +62 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:61:19 @@ -375,16 +339,14 @@ UP037 [*] Remove quotes from type annotation 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) | help: Remove quotes - -ℹ Safe fix -58 58 | -59 59 | x: VarArg("str") -60 60 | -61 |-x: List[List[List["MyClass"]]] - 61 |+x: List[List[List[MyClass]]] -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | +58 | +59 | x: VarArg("str") +60 | + - x: List[List[List["MyClass"]]] +61 + x: List[List[List[MyClass]]] +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:63:29 @@ -397,16 +359,14 @@ UP037 [*] Remove quotes from type annotation 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) | help: Remove quotes - -ℹ Safe fix -60 60 | -61 61 | x: List[List[List["MyClass"]]] -62 62 | -63 |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) - 63 |+x: NamedTuple("X", [("foo", int), ("bar", "str")]) -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | +60 | +61 | x: List[List[List["MyClass"]]] +62 | + - x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +63 + x: NamedTuple("X", [("foo", int), ("bar", "str")]) +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:63:45 @@ -419,16 +379,14 @@ UP037 [*] Remove quotes from type annotation 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) | help: Remove quotes - -ℹ Safe fix -60 60 | -61 61 | x: List[List[List["MyClass"]]] -62 62 | -63 |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) - 63 |+x: NamedTuple("X", [("foo", "int"), ("bar", str)]) -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | +60 | +61 | x: List[List[List["MyClass"]]] +62 | + - x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +63 + x: NamedTuple("X", [("foo", "int"), ("bar", str)]) +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:29 @@ -441,16 +399,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:36 @@ -463,16 +419,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[("foo", int), ("bar", "str")]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[("foo", int), ("bar", "str")]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:45 @@ -485,16 +439,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:52 @@ -507,16 +459,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:67:24 @@ -529,16 +479,14 @@ UP037 [*] Remove quotes from type annotation 69 | X: MyCallable("X") | help: Remove quotes - -ℹ Safe fix -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | -67 |-x: NamedTuple(typename="X", fields=[("foo", "int")]) - 67 |+x: NamedTuple(typename=X, fields=[("foo", "int")]) -68 68 | -69 69 | X: MyCallable("X") -70 70 | +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | + - x: NamedTuple(typename="X", fields=[("foo", "int")]) +67 + x: NamedTuple(typename=X, fields=[("foo", "int")]) +68 | +69 | X: MyCallable("X") +70 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:67:38 @@ -551,16 +499,14 @@ UP037 [*] Remove quotes from type annotation 69 | X: MyCallable("X") | help: Remove quotes - -ℹ Safe fix -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | -67 |-x: NamedTuple(typename="X", fields=[("foo", "int")]) - 67 |+x: NamedTuple(typename="X", fields=[(foo, "int")]) -68 68 | -69 69 | X: MyCallable("X") -70 70 | +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | + - x: NamedTuple(typename="X", fields=[("foo", "int")]) +67 + x: NamedTuple(typename="X", fields=[(foo, "int")]) +68 | +69 | X: MyCallable("X") +70 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:67:45 @@ -573,16 +519,14 @@ UP037 [*] Remove quotes from type annotation 69 | X: MyCallable("X") | help: Remove quotes - -ℹ Safe fix -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | -67 |-x: NamedTuple(typename="X", fields=[("foo", "int")]) - 67 |+x: NamedTuple(typename="X", fields=[("foo", int)]) -68 68 | -69 69 | X: MyCallable("X") -70 70 | +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | + - x: NamedTuple(typename="X", fields=[("foo", "int")]) +67 + x: NamedTuple(typename="X", fields=[("foo", int)]) +68 | +69 | X: MyCallable("X") +70 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:112:12 @@ -594,17 +538,15 @@ UP037 [*] Remove quotes from type annotation 113 | return 0 | help: Remove quotes - -ℹ Safe fix -109 109 | -110 110 | # Handle end of line comment in string annotation -111 111 | # See https://github.com/astral-sh/ruff/issues/15816 -112 |-def f() -> "Literal[0]#": - 112 |+def f() -> (Literal[0]# - 113 |+): -113 114 | return 0 -114 115 | -115 116 | def g(x: "Literal['abc']#") -> None: +109 | +110 | # Handle end of line comment in string annotation +111 | # See https://github.com/astral-sh/ruff/issues/15816 + - def f() -> "Literal[0]#": +112 + def f() -> (Literal[0]# +113 + ): +114 | return 0 +115 | +116 | def g(x: "Literal['abc']#") -> None: UP037 [*] Remove quotes from type annotation --> UP037_0.py:115:10 @@ -616,17 +558,15 @@ UP037 [*] Remove quotes from type annotation 116 | return | help: Remove quotes - -ℹ Safe fix -112 112 | def f() -> "Literal[0]#": -113 113 | return 0 -114 114 | -115 |-def g(x: "Literal['abc']#") -> None: - 115 |+def g(x: (Literal['abc']# - 116 |+)) -> None: -116 117 | return -117 118 | -118 119 | def f() -> """Literal[0] +112 | def f() -> "Literal[0]#": +113 | return 0 +114 | + - def g(x: "Literal['abc']#") -> None: +115 + def g(x: (Literal['abc']# +116 + )) -> None: +117 | return +118 | +119 | def f() -> """Literal[0] UP037 [*] Remove quotes from type annotation --> UP037_0.py:118:12 @@ -642,15 +582,13 @@ UP037 [*] Remove quotes from type annotation 122 | return 0 | help: Remove quotes - -ℹ Safe fix -115 115 | def g(x: "Literal['abc']#") -> None: -116 116 | return -117 117 | -118 |-def f() -> """Literal[0] - 118 |+def f() -> (Literal[0] -119 119 | # -120 120 | -121 |- """: - 121 |+ ): -122 122 | return 0 +115 | def g(x: "Literal['abc']#") -> None: +116 | return +117 | + - def f() -> """Literal[0] +118 + def f() -> (Literal[0] +119 | # +120 | + - """: +121 + ): +122 | return 0 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap index ce3ac81a13..26631a2904 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_1.py.snap @@ -11,13 +11,11 @@ UP037 [*] Remove quotes from type annotation 10 | print(x) | help: Remove quotes - -ℹ Safe fix -6 6 | -7 7 | def foo(): -8 8 | # UP037 -9 |- x: "Tuple[int, int]" = (0, 0) - 9 |+ x: Tuple[int, int] = (0, 0) -10 10 | print(x) -11 11 | -12 12 | +6 | +7 | def foo(): +8 | # UP037 + - x: "Tuple[int, int]" = (0, 0) +9 + x: Tuple[int, int] = (0, 0) +10 | print(x) +11 | +12 | diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap index e10f3761d3..93fe2fa475 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP037_2.pyi.snap @@ -10,16 +10,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -1 1 | # https://github.com/astral-sh/ruff/issues/7102 -2 2 | -3 |-def f(a: Foo['SingleLine # Comment']): ... - 3 |+def f(a: Foo[(SingleLine # Comment - 4 |+)]): ... -4 5 | -5 6 | -6 7 | def f(a: Foo['''Bar[ +1 | # https://github.com/astral-sh/ruff/issues/7102 +2 | + - def f(a: Foo['SingleLine # Comment']): ... +3 + def f(a: Foo[(SingleLine # Comment +4 + )]): ... +5 | +6 | +7 | def f(a: Foo['''Bar[ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:6:14 @@ -31,19 +29,17 @@ UP037 [*] Remove quotes from type annotation | |____________^ | help: Remove quotes - -ℹ Safe fix -3 3 | def f(a: Foo['SingleLine # Comment']): ... -4 4 | -5 5 | -6 |-def f(a: Foo['''Bar[ - 6 |+def f(a: Foo[Bar[ -7 7 | Multi | -8 |- Line]''']): ... - 8 |+ Line]]): ... -9 9 | -10 10 | -11 11 | def f(a: Foo['''Bar[ +3 | def f(a: Foo['SingleLine # Comment']): ... +4 | +5 | + - def f(a: Foo['''Bar[ +6 + def f(a: Foo[Bar[ +7 | Multi | + - Line]''']): ... +8 + Line]]): ... +9 | +10 | +11 | def f(a: Foo['''Bar[ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:11:14 @@ -56,20 +52,18 @@ UP037 [*] Remove quotes from type annotation | |____^ | help: Remove quotes - -ℹ Safe fix -8 8 | Line]''']): ... -9 9 | -10 10 | -11 |-def f(a: Foo['''Bar[ - 11 |+def f(a: Foo[Bar[ -12 12 | Multi | -13 13 | Line # Comment -14 |-]''']): ... - 14 |+]]): ... -15 15 | -16 16 | -17 17 | def f(a: Foo['''Bar[ +8 | Line]''']): ... +9 | +10 | + - def f(a: Foo['''Bar[ +11 + def f(a: Foo[Bar[ +12 | Multi | +13 | Line # Comment + - ]''']): ... +14 + ]]): ... +15 | +16 | +17 | def f(a: Foo['''Bar[ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:17:14 @@ -81,20 +75,18 @@ UP037 [*] Remove quotes from type annotation | |_______________________^ | help: Remove quotes - -ℹ Safe fix -14 14 | ]''']): ... -15 15 | -16 16 | -17 |-def f(a: Foo['''Bar[ - 17 |+def f(a: Foo[(Bar[ -18 18 | Multi | -19 |- Line] # Comment''']): ... - 19 |+ Line] # Comment - 20 |+)]): ... -20 21 | -21 22 | -22 23 | def f(a: Foo[''' +14 | ]''']): ... +15 | +16 | + - def f(a: Foo['''Bar[ +17 + def f(a: Foo[(Bar[ +18 | Multi | + - Line] # Comment''']): ... +19 + Line] # Comment +20 + )]): ... +21 | +22 | +23 | def f(a: Foo[''' UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:22:14 @@ -107,21 +99,19 @@ UP037 [*] Remove quotes from type annotation | |_______________________^ | help: Remove quotes - -ℹ Safe fix -19 19 | Line] # Comment''']): ... -20 20 | -21 21 | -22 |-def f(a: Foo[''' - 22 |+def f(a: Foo[( -23 23 | Bar[ -24 24 | Multi | -25 |- Line] # Comment''']): ... - 25 |+ Line] # Comment - 26 |+)]): ... -26 27 | -27 28 | -28 29 | def f(a: '''list[int] +19 | Line] # Comment''']): ... +20 | +21 | + - def f(a: Foo[''' +22 + def f(a: Foo[( +23 | Bar[ +24 | Multi | + - Line] # Comment''']): ... +25 + Line] # Comment +26 + )]): ... +27 | +28 | +29 | def f(a: '''list[int] UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:28:10 @@ -132,18 +122,16 @@ UP037 [*] Remove quotes from type annotation | |_______^ | help: Remove quotes - -ℹ Safe fix -25 25 | Line] # Comment''']): ... -26 26 | -27 27 | -28 |-def f(a: '''list[int] -29 |- ''' = []): ... - 28 |+def f(a: list[int] - 29 |+ = []): ... -30 30 | -31 31 | -32 32 | a: '''\\ +25 | Line] # Comment''']): ... +26 | +27 | + - def f(a: '''list[int] + - ''' = []): ... +28 + def f(a: list[int] +29 + = []): ... +30 | +31 | +32 | a: '''\\ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:32:4 @@ -154,18 +142,16 @@ UP037 [*] Remove quotes from type annotation | |____________^ | help: Remove quotes - -ℹ Safe fix -29 29 | ''' = []): ... -30 30 | -31 31 | -32 |-a: '''\\ -33 |-list[int]''' = [42] - 32 |+a: (\ - 33 |+list[int]) = [42] -34 34 | -35 35 | -36 36 | def f(a: ''' +29 | ''' = []): ... +30 | +31 | + - a: '''\\ + - list[int]''' = [42] +32 + a: (\ +33 + list[int]) = [42] +34 | +35 | +36 | def f(a: ''' UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:36:10 @@ -177,19 +163,17 @@ UP037 [*] Remove quotes from type annotation | |_______^ | help: Remove quotes - -ℹ Safe fix -33 33 | list[int]''' = [42] -34 34 | -35 35 | -36 |-def f(a: ''' - 36 |+def f(a: -37 37 | list[int] -38 |- ''' = []): ... - 38 |+ = []): ... -39 39 | -40 40 | -41 41 | def f(a: Foo[''' +33 | list[int]''' = [42] +34 | +35 | + - def f(a: ''' +36 + def f(a: +37 | list[int] + - ''' = []): ... +38 + = []): ... +39 | +40 | +41 | def f(a: Foo[''' UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:41:14 @@ -204,23 +188,21 @@ UP037 [*] Remove quotes from type annotation | |___________________^ | help: Remove quotes - -ℹ Safe fix -38 38 | ''' = []): ... -39 39 | -40 40 | -41 |-def f(a: Foo[''' - 41 |+def f(a: Foo[( -42 42 | Bar -43 43 | [ -44 44 | Multi | -45 45 | Line -46 |- ] # Comment''']): ... - 46 |+ ] # Comment - 47 |+)]): ... -47 48 | -48 49 | -49 50 | a: '''list +38 | ''' = []): ... +39 | +40 | + - def f(a: Foo[''' +41 + def f(a: Foo[( +42 | Bar +43 | [ +44 | Multi | +45 | Line + - ] # Comment''']): ... +46 + ] # Comment +47 + )]): ... +48 | +49 | +50 | a: '''list UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:49:4 @@ -231,12 +213,10 @@ UP037 [*] Remove quotes from type annotation | |________^ | help: Remove quotes - -ℹ Safe fix -46 46 | ] # Comment''']): ... -47 47 | -48 48 | -49 |-a: '''list -50 |-[int]''' = [42] - 49 |+a: (list - 50 |+[int]) = [42] +46 | ] # Comment''']): ... +47 | +48 | + - a: '''list + - [int]''' = [42] +49 + a: (list +50 + [int]) = [42] diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap index 35ad47f599..68fe020bdc 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP038.py.snap @@ -9,13 +9,12 @@ UP038 [*] Use `X | Y` in `isinstance` call instead of `(X, Y)` 2 | issubclass("yes", (int, float, str)) # UP038 | help: Convert to `X | Y` - -ℹ Unsafe fix -1 |-isinstance(1, (int, float)) # UP038 - 1 |+isinstance(1, int | float) # UP038 -2 2 | issubclass("yes", (int, float, str)) # UP038 -3 3 | -4 4 | isinstance(1, int) # OK + - isinstance(1, (int, float)) # UP038 +1 + isinstance(1, int | float) # UP038 +2 | issubclass("yes", (int, float, str)) # UP038 +3 | +4 | isinstance(1, int) # OK +note: This is an unsafe fix and may change runtime behavior UP038 [*] Use `X | Y` in `issubclass` call instead of `(X, Y)` --> UP038.py:2:1 @@ -27,11 +26,10 @@ UP038 [*] Use `X | Y` in `issubclass` call instead of `(X, Y)` 4 | isinstance(1, int) # OK | help: Convert to `X | Y` - -ℹ Unsafe fix -1 1 | isinstance(1, (int, float)) # UP038 -2 |-issubclass("yes", (int, float, str)) # UP038 - 2 |+issubclass("yes", int | float | str) # UP038 -3 3 | -4 4 | isinstance(1, int) # OK -5 5 | issubclass("yes", int) # OK +1 | isinstance(1, (int, float)) # UP038 + - issubclass("yes", (int, float, str)) # UP038 +2 + issubclass("yes", int | float | str) # UP038 +3 | +4 | isinstance(1, int) # OK +5 | issubclass("yes", int) # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap index 0d83d4c92b..8af4ba1348 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP039.py.snap @@ -10,14 +10,12 @@ UP039 [*] Unnecessary parentheses after class definition 3 | pass | help: Remove parentheses - -ℹ Safe fix -1 1 | # Errors -2 |-class A(): - 2 |+class A: -3 3 | pass -4 4 | -5 5 | +1 | # Errors + - class A(): +2 + class A: +3 | pass +4 | +5 | UP039 [*] Unnecessary parentheses after class definition --> UP039.py:6:8 @@ -28,16 +26,14 @@ UP039 [*] Unnecessary parentheses after class definition 8 | pass | help: Remove parentheses - -ℹ Safe fix -3 3 | pass -4 4 | -5 5 | -6 |-class A() \ - 6 |+class A \ -7 7 | : -8 8 | pass -9 9 | +3 | pass +4 | +5 | + - class A() \ +6 + class A \ +7 | : +8 | pass +9 | UP039 [*] Unnecessary parentheses after class definition --> UP039.py:12:9 @@ -48,16 +44,14 @@ UP039 [*] Unnecessary parentheses after class definition 13 | pass | help: Remove parentheses - -ℹ Safe fix -9 9 | -10 10 | -11 11 | class A \ -12 |- (): - 12 |+ : -13 13 | pass -14 14 | -15 15 | +9 | +10 | +11 | class A \ + - (): +12 + : +13 | pass +14 | +15 | UP039 [*] Unnecessary parentheses after class definition --> UP039.py:17:8 @@ -68,16 +62,14 @@ UP039 [*] Unnecessary parentheses after class definition 18 | pass | help: Remove parentheses - -ℹ Safe fix -14 14 | -15 15 | -16 16 | @decorator() -17 |-class A(): - 17 |+class A: -18 18 | pass -19 19 | -20 20 | @decorator +14 | +15 | +16 | @decorator() + - class A(): +17 + class A: +18 | pass +19 | +20 | @decorator UP039 [*] Unnecessary parentheses after class definition --> UP039.py:21:8 @@ -88,13 +80,11 @@ UP039 [*] Unnecessary parentheses after class definition 22 | pass | help: Remove parentheses - -ℹ Safe fix -18 18 | pass -19 19 | -20 20 | @decorator -21 |-class A(): - 21 |+class A: -22 22 | pass -23 23 | -24 24 | # OK +18 | pass +19 | +20 | @decorator + - class A(): +21 + class A: +22 | pass +23 | +24 | # OK diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap index 55601e0651..2ea0df676d 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.py.snap @@ -10,16 +10,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 6 | x: TypeAlias = int | help: Use the `type` keyword - -ℹ Unsafe fix -2 2 | from typing import Any, TypeAlias -3 3 | -4 4 | # UP040 -5 |-x: typing.TypeAlias = int - 5 |+type x = int -6 6 | x: TypeAlias = int -7 7 | -8 8 | # UP040 simple generic +2 | from typing import Any, TypeAlias +3 | +4 | # UP040 + - x: typing.TypeAlias = int +5 + type x = int +6 | x: TypeAlias = int +7 | +8 | # UP040 simple generic +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:6:1 @@ -32,16 +31,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 8 | # UP040 simple generic | help: Use the `type` keyword - -ℹ Unsafe fix -3 3 | -4 4 | # UP040 -5 5 | x: typing.TypeAlias = int -6 |-x: TypeAlias = int - 6 |+type x = int -7 7 | -8 8 | # UP040 simple generic -9 9 | T = typing.TypeVar["T"] +3 | +4 | # UP040 +5 | x: typing.TypeAlias = int + - x: TypeAlias = int +6 + type x = int +7 | +8 | # UP040 simple generic +9 | T = typing.TypeVar["T"] +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:10:1 @@ -54,16 +52,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 12 | # UP040 call style generic | help: Use the `type` keyword - -ℹ Unsafe fix -7 7 | -8 8 | # UP040 simple generic -9 9 | T = typing.TypeVar["T"] -10 |-x: typing.TypeAlias = list[T] - 10 |+type x[T] = list[T] -11 11 | -12 12 | # UP040 call style generic -13 13 | T = typing.TypeVar("T") +7 | +8 | # UP040 simple generic +9 | T = typing.TypeVar["T"] + - x: typing.TypeAlias = list[T] +10 + type x[T] = list[T] +11 | +12 | # UP040 call style generic +13 | T = typing.TypeVar("T") +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:14:1 @@ -76,16 +73,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 16 | # UP040 bounded generic | help: Use the `type` keyword - -ℹ Unsafe fix -11 11 | -12 12 | # UP040 call style generic -13 13 | T = typing.TypeVar("T") -14 |-x: typing.TypeAlias = list[T] - 14 |+type x[T] = list[T] -15 15 | -16 16 | # UP040 bounded generic -17 17 | T = typing.TypeVar("T", bound=int) +11 | +12 | # UP040 call style generic +13 | T = typing.TypeVar("T") + - x: typing.TypeAlias = list[T] +14 + type x[T] = list[T] +15 | +16 | # UP040 bounded generic +17 | T = typing.TypeVar("T", bound=int) +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:18:1 @@ -98,16 +94,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 20 | # UP040 constrained generic | help: Use the `type` keyword - -ℹ Unsafe fix -15 15 | -16 16 | # UP040 bounded generic -17 17 | T = typing.TypeVar("T", bound=int) -18 |-x: typing.TypeAlias = list[T] - 18 |+type x[T: int] = list[T] -19 19 | -20 20 | # UP040 constrained generic -21 21 | T = typing.TypeVar("T", int, str) +15 | +16 | # UP040 bounded generic +17 | T = typing.TypeVar("T", bound=int) + - x: typing.TypeAlias = list[T] +18 + type x[T: int] = list[T] +19 | +20 | # UP040 constrained generic +21 | T = typing.TypeVar("T", int, str) +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:22:1 @@ -120,16 +115,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 24 | # UP040 contravariant generic | help: Use the `type` keyword - -ℹ Unsafe fix -19 19 | -20 20 | # UP040 constrained generic -21 21 | T = typing.TypeVar("T", int, str) -22 |-x: typing.TypeAlias = list[T] - 22 |+type x[T: (int, str)] = list[T] -23 23 | -24 24 | # UP040 contravariant generic -25 25 | T = typing.TypeVar("T", contravariant=True) +19 | +20 | # UP040 constrained generic +21 | T = typing.TypeVar("T", int, str) + - x: typing.TypeAlias = list[T] +22 + type x[T: (int, str)] = list[T] +23 | +24 | # UP040 contravariant generic +25 | T = typing.TypeVar("T", contravariant=True) +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:26:1 @@ -142,16 +136,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 28 | # UP040 covariant generic | help: Use the `type` keyword - -ℹ Unsafe fix -23 23 | -24 24 | # UP040 contravariant generic -25 25 | T = typing.TypeVar("T", contravariant=True) -26 |-x: typing.TypeAlias = list[T] - 26 |+type x[T] = list[T] -27 27 | -28 28 | # UP040 covariant generic -29 29 | T = typing.TypeVar("T", covariant=True) +23 | +24 | # UP040 contravariant generic +25 | T = typing.TypeVar("T", contravariant=True) + - x: typing.TypeAlias = list[T] +26 + type x[T] = list[T] +27 | +28 | # UP040 covariant generic +29 | T = typing.TypeVar("T", covariant=True) +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:30:1 @@ -164,16 +157,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 32 | # UP040 in class scope | help: Use the `type` keyword - -ℹ Unsafe fix -27 27 | -28 28 | # UP040 covariant generic -29 29 | T = typing.TypeVar("T", covariant=True) -30 |-x: typing.TypeAlias = list[T] - 30 |+type x[T] = list[T] -31 31 | -32 32 | # UP040 in class scope -33 33 | T = typing.TypeVar["T"] +27 | +28 | # UP040 covariant generic +29 | T = typing.TypeVar("T", covariant=True) + - x: typing.TypeAlias = list[T] +30 + type x[T] = list[T] +31 | +32 | # UP040 in class scope +33 | T = typing.TypeVar["T"] +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:36:5 @@ -186,16 +178,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 38 | # reference to class variable | help: Use the `type` keyword - -ℹ Unsafe fix -33 33 | T = typing.TypeVar["T"] -34 34 | class Foo: -35 35 | # reference to global variable -36 |- x: typing.TypeAlias = list[T] - 36 |+ type x[T] = list[T] -37 37 | -38 38 | # reference to class variable -39 39 | TCLS = typing.TypeVar["TCLS"] +33 | T = typing.TypeVar["T"] +34 | class Foo: +35 | # reference to global variable + - x: typing.TypeAlias = list[T] +36 + type x[T] = list[T] +37 | +38 | # reference to class variable +39 | TCLS = typing.TypeVar["TCLS"] +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `y` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:40:5 @@ -208,16 +199,15 @@ UP040 [*] Type alias `y` uses `TypeAlias` annotation instead of the `type` keywo 42 | # UP040 won't add generics in fix | help: Use the `type` keyword - -ℹ Unsafe fix -37 37 | -38 38 | # reference to class variable -39 39 | TCLS = typing.TypeVar["TCLS"] -40 |- y: typing.TypeAlias = list[TCLS] - 40 |+ type y[TCLS] = list[TCLS] -41 41 | -42 42 | # UP040 won't add generics in fix -43 43 | T = typing.TypeVar(*args) +37 | +38 | # reference to class variable +39 | TCLS = typing.TypeVar["TCLS"] + - y: typing.TypeAlias = list[TCLS] +40 + type y[TCLS] = list[TCLS] +41 | +42 | # UP040 won't add generics in fix +43 | T = typing.TypeVar(*args) +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:44:1 @@ -230,16 +220,15 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 46 | # `default` should be skipped for now, added in Python 3.13 | help: Use the `type` keyword - -ℹ Unsafe fix -41 41 | -42 42 | # UP040 won't add generics in fix -43 43 | T = typing.TypeVar(*args) -44 |-x: typing.TypeAlias = list[T] - 44 |+type x = list[T] -45 45 | -46 46 | # `default` should be skipped for now, added in Python 3.13 -47 47 | T = typing.TypeVar("T", default=Any) +41 | +42 | # UP040 won't add generics in fix +43 | T = typing.TypeVar(*args) + - x: typing.TypeAlias = list[T] +44 + type x = list[T] +45 | +46 | # `default` should be skipped for now, added in Python 3.13 +47 | T = typing.TypeVar("T", default=Any) +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `Decorator` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:57:1 @@ -250,16 +239,15 @@ UP040 [*] Type alias `Decorator` uses `TypeAlias` annotation instead of the `typ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use the `type` keyword - -ℹ Unsafe fix -54 54 | # Ensure that "T" appears only once in the type parameters for the modernized -55 55 | # type alias. -56 56 | T = typing.TypeVar["T"] -57 |-Decorator: TypeAlias = typing.Callable[[T], T] - 57 |+type Decorator[T] = typing.Callable[[T], T] -58 58 | -59 59 | -60 60 | from typing import TypeVar, Annotated, TypeAliasType +54 | # Ensure that "T" appears only once in the type parameters for the modernized +55 | # type alias. +56 | T = typing.TypeVar["T"] + - Decorator: TypeAlias = typing.Callable[[T], T] +57 + type Decorator[T] = typing.Callable[[T], T] +58 | +59 | +60 | from typing import TypeVar, Annotated, TypeAliasType +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:67:1 @@ -274,18 +262,16 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t 71 | # Bound | help: Use the `type` keyword - -ℹ Safe fix -64 64 | -65 65 | # https://github.com/astral-sh/ruff/issues/11422 -66 66 | T = TypeVar("T") -67 |-PositiveList = TypeAliasType( -68 |- "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) -69 |-) - 67 |+type PositiveList[T] = list[Annotated[T, Gt(0)]] -70 68 | -71 69 | # Bound -72 70 | T = TypeVar("T", bound=SupportGt) +64 | +65 | # https://github.com/astral-sh/ruff/issues/11422 +66 | T = TypeVar("T") + - PositiveList = TypeAliasType( + - "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) + - ) +67 + type PositiveList[T] = list[Annotated[T, Gt(0)]] +68 | +69 | # Bound +70 | T = TypeVar("T", bound=SupportGt) UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:73:1 @@ -300,18 +286,16 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t 77 | # Multiple bounds | help: Use the `type` keyword - -ℹ Safe fix -70 70 | -71 71 | # Bound -72 72 | T = TypeVar("T", bound=SupportGt) -73 |-PositiveList = TypeAliasType( -74 |- "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) -75 |-) - 73 |+type PositiveList[T: SupportGt] = list[Annotated[T, Gt(0)]] -76 74 | -77 75 | # Multiple bounds -78 76 | T1 = TypeVar("T1", bound=SupportGt) +70 | +71 | # Bound +72 | T = TypeVar("T", bound=SupportGt) + - PositiveList = TypeAliasType( + - "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) + - ) +73 + type PositiveList[T: SupportGt] = list[Annotated[T, Gt(0)]] +74 | +75 | # Multiple bounds +76 | T1 = TypeVar("T1", bound=SupportGt) UP040 [*] Type alias `Tuple3` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:81:1 @@ -324,16 +308,14 @@ UP040 [*] Type alias `Tuple3` uses `TypeAliasType` assignment instead of the `ty 83 | # No type_params | help: Use the `type` keyword - -ℹ Safe fix -78 78 | T1 = TypeVar("T1", bound=SupportGt) -79 79 | T2 = TypeVar("T2") -80 80 | T3 = TypeVar("T3") -81 |-Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3)) - 81 |+type Tuple3[T1: SupportGt, T2, T3] = tuple[T1, T2, T3] -82 82 | -83 83 | # No type_params -84 84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)]) +78 | T1 = TypeVar("T1", bound=SupportGt) +79 | T2 = TypeVar("T2") +80 | T3 = TypeVar("T3") + - Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3)) +81 + type Tuple3[T1: SupportGt, T2, T3] = tuple[T1, T2, T3] +82 | +83 | # No type_params +84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)]) UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:84:1 @@ -344,16 +326,14 @@ UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of th 85 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=()) | help: Use the `type` keyword - -ℹ Safe fix -81 81 | Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3)) -82 82 | -83 83 | # No type_params -84 |-PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)]) - 84 |+type PositiveInt = Annotated[int, Gt(0)] -85 85 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=()) -86 86 | -87 87 | # OK: Other name +81 | Tuple3 = TypeAliasType("Tuple3", tuple[T1, T2, T3], type_params=(T1, T2, T3)) +82 | +83 | # No type_params + - PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)]) +84 + type PositiveInt = Annotated[int, Gt(0)] +85 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=()) +86 | +87 | # OK: Other name UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:85:1 @@ -366,16 +346,14 @@ UP040 [*] Type alias `PositiveInt` uses `TypeAliasType` assignment instead of th 87 | # OK: Other name | help: Use the `type` keyword - -ℹ Safe fix -82 82 | -83 83 | # No type_params -84 84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)]) -85 |-PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=()) - 85 |+type PositiveInt = Annotated[int, Gt(0)] -86 86 | -87 87 | # OK: Other name -88 88 | T = TypeVar("T", bound=SupportGt) +82 | +83 | # No type_params +84 | PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)]) + - PositiveInt = TypeAliasType("PositiveInt", Annotated[int, Gt(0)], type_params=()) +85 + type PositiveInt = Annotated[int, Gt(0)] +86 | +87 | # OK: Other name +88 | T = TypeVar("T", bound=SupportGt) UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:99:1 @@ -390,18 +368,17 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t 103 | T = TypeVar("T") | help: Use the `type` keyword - -ℹ Unsafe fix -96 96 | -97 97 | # unsafe fix if comments within the fix -98 98 | T = TypeVar("T") -99 |-PositiveList = TypeAliasType( # eaten comment -100 |- "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) -101 |-) - 99 |+type PositiveList[T] = list[Annotated[T, Gt(0)]] -102 100 | -103 101 | T = TypeVar("T") -104 102 | PositiveList = TypeAliasType( +96 | +97 | # unsafe fix if comments within the fix +98 | T = TypeVar("T") + - PositiveList = TypeAliasType( # eaten comment + - "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) + - ) +99 + type PositiveList[T] = list[Annotated[T, Gt(0)]] +100 | +101 | T = TypeVar("T") +102 | PositiveList = TypeAliasType( +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:104:1 @@ -413,18 +390,16 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t | |_^ | help: Use the `type` keyword - -ℹ Safe fix -101 101 | ) -102 102 | -103 103 | T = TypeVar("T") -104 |-PositiveList = TypeAliasType( -105 |- "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) -106 |-) # this comment should be okay - 104 |+type PositiveList[T] = list[Annotated[T, Gt(0)]] # this comment should be okay -107 105 | -108 106 | -109 107 | # this comment will actually be preserved because it's inside the "value" part +101 | ) +102 | +103 | T = TypeVar("T") + - PositiveList = TypeAliasType( + - "PositiveList", list[Annotated[T, Gt(0)]], type_params=(T,) + - ) # this comment should be okay +104 + type PositiveList[T] = list[Annotated[T, Gt(0)]] # this comment should be okay +105 | +106 | +107 | # this comment will actually be preserved because it's inside the "value" part UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of the `type` keyword --> UP040.py:111:1 @@ -441,21 +416,19 @@ UP040 [*] Type alias `PositiveList` uses `TypeAliasType` assignment instead of t 117 | T: TypeAlias = ( | help: Use the `type` keyword - -ℹ Safe fix -108 108 | -109 109 | # this comment will actually be preserved because it's inside the "value" part -110 110 | T = TypeVar("T") -111 |-PositiveList = TypeAliasType( -112 |- "PositiveList", list[ - 111 |+type PositiveList[T] = list[ -113 112 | Annotated[T, Gt(0)], # preserved comment -114 |- ], type_params=(T,) -115 |-) - 113 |+ ] -116 114 | -117 115 | T: TypeAlias = ( -118 116 | int +108 | +109 | # this comment will actually be preserved because it's inside the "value" part +110 | T = TypeVar("T") + - PositiveList = TypeAliasType( + - "PositiveList", list[ +111 + type PositiveList[T] = list[ +112 | Annotated[T, Gt(0)], # preserved comment + - ], type_params=(T,) + - ) +113 + ] +114 | +115 | T: TypeAlias = ( +116 | int UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:117:1 @@ -471,16 +444,15 @@ UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keywo 122 | T: TypeAlias = ( # comment0 | help: Use the `type` keyword - -ℹ Unsafe fix -114 114 | ], type_params=(T,) -115 115 | ) -116 116 | -117 |-T: TypeAlias = ( - 117 |+type T = ( -118 118 | int -119 119 | | str -120 120 | ) +114 | ], type_params=(T,) +115 | ) +116 | + - T: TypeAlias = ( +117 + type T = ( +118 | int +119 | | str +120 | ) +note: This is an unsafe fix and may change runtime behavior UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.py:122:1 @@ -499,13 +471,12 @@ UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keywo | |_^ | help: Use the `type` keyword - -ℹ Unsafe fix -119 119 | | str -120 120 | ) -121 121 | -122 |-T: TypeAlias = ( # comment0 - 122 |+type T = ( # comment0 -123 123 | # comment1 -124 124 | int # comment2 -125 125 | # comment3 +119 | | str +120 | ) +121 | + - T: TypeAlias = ( # comment0 +122 + type T = ( # comment0 +123 | # comment1 +124 | int # comment2 +125 | # comment3 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap index 0ee653e917..472905e606 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP040.pyi.snap @@ -11,16 +11,14 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 7 | x: TypeAlias = int | help: Use the `type` keyword - -ℹ Safe fix -3 3 | -4 4 | # UP040 -5 5 | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change -6 |-x: typing.TypeAlias = int - 6 |+type x = int -7 7 | x: TypeAlias = int -8 8 | -9 9 | +3 | +4 | # UP040 +5 | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change + - x: typing.TypeAlias = int +6 + type x = int +7 | x: TypeAlias = int +8 | +9 | UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.pyi:7:1 @@ -31,16 +29,14 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo | ^^^^^^^^^^^^^^^^^^ | help: Use the `type` keyword - -ℹ Safe fix -4 4 | # UP040 -5 5 | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change -6 6 | x: typing.TypeAlias = int -7 |-x: TypeAlias = int - 7 |+type x = int -8 8 | -9 9 | -10 10 | # comments in the value are preserved +4 | # UP040 +5 | # Fixes in type stub files should be safe to apply unlike in regular code where runtime behavior could change +6 | x: typing.TypeAlias = int + - x: TypeAlias = int +7 + type x = int +8 | +9 | +10 | # comments in the value are preserved UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.pyi:11:1 @@ -55,16 +51,14 @@ UP040 [*] Type alias `x` uses `TypeAlias` annotation instead of the `type` keywo 16 | T: TypeAlias = ( # comment0 | help: Use the `type` keyword - -ℹ Safe fix -8 8 | -9 9 | -10 10 | # comments in the value are preserved -11 |-x: TypeAlias = tuple[ - 11 |+type x = tuple[ -12 12 | int, # preserved -13 13 | float, -14 14 | ] +8 | +9 | +10 | # comments in the value are preserved + - x: TypeAlias = tuple[ +11 + type x = tuple[ +12 | int, # preserved +13 | float, +14 | ] UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keyword --> UP040.pyi:16:1 @@ -83,13 +77,11 @@ UP040 [*] Type alias `T` uses `TypeAlias` annotation instead of the `type` keywo | |_^ | help: Use the `type` keyword - -ℹ Safe fix -13 13 | float, -14 14 | ] -15 15 | -16 |-T: TypeAlias = ( # comment0 - 16 |+type T = ( # comment0 -17 17 | # comment1 -18 18 | int # comment2 -19 19 | # comment3 +13 | float, +14 | ] +15 | + - T: TypeAlias = ( # comment0 +16 + type T = ( # comment0 +17 | # comment1 +18 | int # comment2 +19 | # comment3 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap index a2bbdb30d4..b737ce4b6d 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP041.py.snap @@ -11,16 +11,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 6 | pass | help: Replace `asyncio.TimeoutError` with builtin `TimeoutError` - -ℹ Safe fix -2 2 | # These should be fixed -3 3 | try: -4 4 | pass -5 |-except asyncio.TimeoutError: - 5 |+except TimeoutError: -6 6 | pass -7 7 | -8 8 | try: +2 | # These should be fixed +3 | try: +4 | pass + - except asyncio.TimeoutError: +5 + except TimeoutError: +6 | pass +7 | +8 | try: UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:10:8 @@ -32,16 +30,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 11 | pass | help: Replace `socket.timeout` with builtin `TimeoutError` - -ℹ Safe fix -7 7 | -8 8 | try: -9 9 | pass -10 |-except socket.timeout: - 10 |+except TimeoutError: -11 11 | pass -12 12 | -13 13 | # Should NOT be in parentheses when replaced +7 | +8 | try: +9 | pass + - except socket.timeout: +10 + except TimeoutError: +11 | pass +12 | +13 | # Should NOT be in parentheses when replaced UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:17:8 @@ -53,16 +49,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 18 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -14 14 | -15 15 | try: -16 16 | pass -17 |-except (asyncio.TimeoutError,): - 17 |+except TimeoutError: -18 18 | pass -19 19 | -20 20 | try: +14 | +15 | try: +16 | pass + - except (asyncio.TimeoutError,): +17 + except TimeoutError: +18 | pass +19 | +20 | try: UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:22:8 @@ -74,16 +68,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 23 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -19 19 | -20 20 | try: -21 21 | pass -22 |-except (socket.timeout,): - 22 |+except TimeoutError: -23 23 | pass -24 24 | -25 25 | try: +19 | +20 | try: +21 | pass + - except (socket.timeout,): +22 + except TimeoutError: +23 | pass +24 | +25 | try: UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:27:8 @@ -95,16 +87,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 28 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -24 24 | -25 25 | try: -26 26 | pass -27 |-except (asyncio.TimeoutError, socket.timeout,): - 27 |+except TimeoutError: -28 28 | pass -29 29 | -30 30 | # Should be kept in parentheses (because multiple) +24 | +25 | try: +26 | pass + - except (asyncio.TimeoutError, socket.timeout,): +27 + except TimeoutError: +28 | pass +29 | +30 | # Should be kept in parentheses (because multiple) UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:34:8 @@ -116,16 +106,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 35 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -31 31 | -32 32 | try: -33 33 | pass -34 |-except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError): - 34 |+except (KeyError, TimeoutError): -35 35 | pass -36 36 | -37 37 | # First should change, second should not +31 | +32 | try: +33 | pass + - except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError): +34 + except (KeyError, TimeoutError): +35 | pass +36 | +37 | # First should change, second should not UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:42:8 @@ -137,13 +125,11 @@ UP041 [*] Replace aliased errors with `TimeoutError` 43 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -39 39 | from .mmap import error -40 40 | try: -41 41 | pass -42 |-except (asyncio.TimeoutError, error): - 42 |+except (TimeoutError, error): -43 43 | pass -44 44 | -45 45 | # These should not change +39 | from .mmap import error +40 | try: +41 | pass + - except (asyncio.TimeoutError, error): +42 + except (TimeoutError, error): +43 | pass +44 | +45 | # These should not change diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap index 60d8df42da..92a17dcfd5 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP042.py.snap @@ -8,17 +8,16 @@ UP042 [*] Class A inherits from both `str` and `enum.Enum` | ^ | help: Inherit from `enum.StrEnum` - -ℹ Unsafe fix -1 |-from enum import Enum - 1 |+from enum import Enum, StrEnum -2 2 | -3 3 | -4 |-class A(str, Enum): ... - 4 |+class A(StrEnum): ... -5 5 | -6 6 | -7 7 | class B(Enum, str): ... + - from enum import Enum +1 + from enum import Enum, StrEnum +2 | +3 | + - class A(str, Enum): ... +4 + class A(StrEnum): ... +5 | +6 | +7 | class B(Enum, str): ... +note: This is an unsafe fix and may change runtime behavior UP042 [*] Class B inherits from both `str` and `enum.Enum` --> UP042.py:7:7 @@ -27,20 +26,19 @@ UP042 [*] Class B inherits from both `str` and `enum.Enum` | ^ | help: Inherit from `enum.StrEnum` - -ℹ Unsafe fix -1 |-from enum import Enum - 1 |+from enum import Enum, StrEnum -2 2 | -3 3 | -4 4 | class A(str, Enum): ... -5 5 | -6 6 | -7 |-class B(Enum, str): ... - 7 |+class B(StrEnum): ... -8 8 | -9 9 | -10 10 | class D(int, str, Enum): ... + - from enum import Enum +1 + from enum import Enum, StrEnum +2 | +3 | +4 | class A(str, Enum): ... +5 | +6 | + - class B(Enum, str): ... +7 + class B(StrEnum): ... +8 | +9 | +10 | class D(int, str, Enum): ... +note: This is an unsafe fix and may change runtime behavior UP042 Class D inherits from both `str` and `enum.Enum` --> UP042.py:10:7 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap index 18fb1a0b72..a58aaec987 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP043.py.snap @@ -9,16 +9,14 @@ UP043 [*] Unnecessary default type arguments 5 | yield 42 | help: Remove default type arguments - -ℹ Safe fix -1 1 | from collections.abc import Generator, AsyncGenerator -2 2 | -3 3 | -4 |-def func() -> Generator[int, None, None]: - 4 |+def func() -> Generator[int]: -5 5 | yield 42 -6 6 | -7 7 | +1 | from collections.abc import Generator, AsyncGenerator +2 | +3 | + - def func() -> Generator[int, None, None]: +4 + def func() -> Generator[int]: +5 | yield 42 +6 | +7 | UP043 [*] Unnecessary default type arguments --> UP043.py:8:15 @@ -28,16 +26,14 @@ UP043 [*] Unnecessary default type arguments 9 | yield 42 | help: Remove default type arguments - -ℹ Safe fix -5 5 | yield 42 -6 6 | -7 7 | -8 |-def func() -> Generator[int, None]: - 8 |+def func() -> Generator[int]: -9 9 | yield 42 -10 10 | -11 11 | +5 | yield 42 +6 | +7 | + - def func() -> Generator[int, None]: +8 + def func() -> Generator[int]: +9 | yield 42 +10 | +11 | UP043 [*] Unnecessary default type arguments --> UP043.py:21:15 @@ -48,16 +44,14 @@ UP043 [*] Unnecessary default type arguments 23 | return None | help: Remove default type arguments - -ℹ Safe fix -18 18 | return foo -19 19 | -20 20 | -21 |-def func() -> Generator[int, int, None]: - 21 |+def func() -> Generator[int, int]: -22 22 | _ = yield 42 -23 23 | return None -24 24 | +18 | return foo +19 | +20 | + - def func() -> Generator[int, int, None]: +21 + def func() -> Generator[int, int]: +22 | _ = yield 42 +23 | return None +24 | UP043 [*] Unnecessary default type arguments --> UP043.py:31:21 @@ -67,16 +61,14 @@ UP043 [*] Unnecessary default type arguments 32 | yield 42 | help: Remove default type arguments - -ℹ Safe fix -28 28 | return 42 -29 29 | -30 30 | -31 |-async def func() -> AsyncGenerator[int, None]: - 31 |+async def func() -> AsyncGenerator[int]: -32 32 | yield 42 -33 33 | -34 34 | +28 | return 42 +29 | +30 | + - async def func() -> AsyncGenerator[int, None]: +31 + async def func() -> AsyncGenerator[int]: +32 | yield 42 +33 | +34 | UP043 [*] Unnecessary default type arguments --> UP043.py:47:15 @@ -86,16 +78,14 @@ UP043 [*] Unnecessary default type arguments 48 | yield "hello" | help: Remove default type arguments - -ℹ Safe fix -44 44 | from typing import Generator, AsyncGenerator -45 45 | -46 46 | -47 |-def func() -> Generator[str, None, None]: - 47 |+def func() -> Generator[str]: -48 48 | yield "hello" -49 49 | -50 50 | +44 | from typing import Generator, AsyncGenerator +45 | +46 | + - def func() -> Generator[str, None, None]: +47 + def func() -> Generator[str]: +48 | yield "hello" +49 | +50 | UP043 [*] Unnecessary default type arguments --> UP043.py:51:21 @@ -105,16 +95,14 @@ UP043 [*] Unnecessary default type arguments 52 | yield "hello" | help: Remove default type arguments - -ℹ Safe fix -48 48 | yield "hello" -49 49 | -50 50 | -51 |-async def func() -> AsyncGenerator[str, None]: - 51 |+async def func() -> AsyncGenerator[str]: -52 52 | yield "hello" -53 53 | -54 54 | +48 | yield "hello" +49 | +50 | + - async def func() -> AsyncGenerator[str, None]: +51 + async def func() -> AsyncGenerator[str]: +52 | yield "hello" +53 | +54 | UP043 [*] Unnecessary default type arguments --> UP043.py:55:21 @@ -128,14 +116,13 @@ UP043 [*] Unnecessary default type arguments 59 | yield "hello" | help: Remove default type arguments - -ℹ Unsafe fix -52 52 | yield "hello" -53 53 | -54 54 | -55 |-async def func() -> AsyncGenerator[ # type: ignore -56 |- str, -57 |- None -58 |-]: - 55 |+async def func() -> AsyncGenerator[str]: -59 56 | yield "hello" +52 | yield "hello" +53 | +54 | + - async def func() -> AsyncGenerator[ # type: ignore + - str, + - None + - ]: +55 + async def func() -> AsyncGenerator[str]: +56 | yield "hello" +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap index e753f42872..77da4b9b21 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP045.py.snap @@ -9,16 +9,14 @@ UP045 [*] Use `X | None` for type annotations 6 | ... | help: Convert to `X | None` - -ℹ Safe fix -2 2 | from typing import Optional -3 3 | -4 4 | -5 |-def f(x: Optional[str]) -> None: - 5 |+def f(x: str | None) -> None: -6 6 | ... -7 7 | -8 8 | +2 | from typing import Optional +3 | +4 | + - def f(x: Optional[str]) -> None: +5 + def f(x: str | None) -> None: +6 | ... +7 | +8 | UP045 [*] Use `X | None` for type annotations --> UP045.py:9:10 @@ -28,16 +26,14 @@ UP045 [*] Use `X | None` for type annotations 10 | ... | help: Convert to `X | None` - -ℹ Safe fix -6 6 | ... -7 7 | -8 8 | -9 |-def f(x: typing.Optional[str]) -> None: - 9 |+def f(x: str | None) -> None: -10 10 | ... -11 11 | -12 12 | +6 | ... +7 | +8 | + - def f(x: typing.Optional[str]) -> None: +9 + def f(x: str | None) -> None: +10 | ... +11 | +12 | UP045 [*] Use `X | None` for type annotations --> UP045.py:14:8 @@ -48,16 +44,14 @@ UP045 [*] Use `X | None` for type annotations 15 | x = Optional[str] | help: Convert to `X | None` - -ℹ Safe fix -11 11 | -12 12 | -13 13 | def f() -> None: -14 |- x: Optional[str] - 14 |+ x: str | None -15 15 | x = Optional[str] -16 16 | -17 17 | +11 | +12 | +13 | def f() -> None: + - x: Optional[str] +14 + x: str | None +15 | x = Optional[str] +16 | +17 | UP045 Use `X | None` for type annotations --> UP045.py:15:9 @@ -77,16 +71,14 @@ UP045 [*] Use `X | None` for type annotations 19 | ... | help: Convert to `X | None` - -ℹ Safe fix -15 15 | x = Optional[str] -16 16 | -17 17 | -18 |-def f(x: list[Optional[int]]) -> None: - 18 |+def f(x: list[int | None]) -> None: -19 19 | ... -20 20 | -21 21 | +15 | x = Optional[str] +16 | +17 | + - def f(x: list[Optional[int]]) -> None: +18 + def f(x: list[int | None]) -> None: +19 | ... +20 | +21 | UP045 Use `X | None` for type annotations --> UP045.py:22:10 @@ -128,19 +120,17 @@ UP045 [*] Use `X | None` for type annotations | |_____^ | help: Convert to `X | None` - -ℹ Safe fix -33 33 | -34 34 | # Regression test for: https://github.com/astral-sh/ruff/issues/7131 -35 35 | class ServiceRefOrValue: -36 |- service_specification: Optional[ -37 |- list[ServiceSpecificationRef] -38 |- | list[ServiceSpecification] -39 |- ] = None - 36 |+ service_specification: list[ServiceSpecificationRef] | list[ServiceSpecification] | None = None -40 37 | -41 38 | -42 39 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201 +33 | +34 | # Regression test for: https://github.com/astral-sh/ruff/issues/7131 +35 | class ServiceRefOrValue: + - service_specification: Optional[ + - list[ServiceSpecificationRef] + - | list[ServiceSpecification] + - ] = None +36 + service_specification: list[ServiceSpecificationRef] | list[ServiceSpecification] | None = None +37 | +38 | +39 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201 UP045 [*] Use `X | None` for type annotations --> UP045.py:44:28 @@ -151,16 +141,14 @@ UP045 [*] Use `X | None` for type annotations | ^^^^^^^^^^^^^ | help: Convert to `X | None` - -ℹ Safe fix -41 41 | -42 42 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201 -43 43 | class ServiceRefOrValue: -44 |- service_specification: Optional[str]is not True = None - 44 |+ service_specification: str | None is not True = None -45 45 | -46 46 | -47 47 | # Test for: https://github.com/astral-sh/ruff/issues/18508 +41 | +42 | # Regression test for: https://github.com/astral-sh/ruff/issues/7201 +43 | class ServiceRefOrValue: + - service_specification: Optional[str]is not True = None +44 + service_specification: str | None is not True = None +45 | +46 | +47 | # Test for: https://github.com/astral-sh/ruff/issues/18508 UP045 Use `X | None` for type annotations --> UP045.py:49:6 @@ -183,15 +171,13 @@ UP045 [*] Use `X | None` for type annotations 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None | help: Convert to `X | None` - -ℹ Safe fix -73 73 | -74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 -75 75 | # Nested Optional types should be flattened -76 |-nested_optional: Optional[Optional[str]] = None - 76 |+nested_optional: str | None = None -77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None -78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None +73 | +74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 +75 | # Nested Optional types should be flattened + - nested_optional: Optional[Optional[str]] = None +76 + nested_optional: str | None = None +77 | nested_optional_typing: typing.Optional[Optional[int]] = None +78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None UP045 [*] Use `X | None` for type annotations --> UP045.py:76:27 @@ -204,15 +190,13 @@ UP045 [*] Use `X | None` for type annotations 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None | help: Convert to `X | None` - -ℹ Safe fix -73 73 | -74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 -75 75 | # Nested Optional types should be flattened -76 |-nested_optional: Optional[Optional[str]] = None - 76 |+nested_optional: Optional[str | None] = None -77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None -78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None +73 | +74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 +75 | # Nested Optional types should be flattened + - nested_optional: Optional[Optional[str]] = None +76 + nested_optional: Optional[str | None] = None +77 | nested_optional_typing: typing.Optional[Optional[int]] = None +78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None UP045 [*] Use `X | None` for type annotations --> UP045.py:77:25 @@ -224,14 +208,12 @@ UP045 [*] Use `X | None` for type annotations 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None | help: Convert to `X | None` - -ℹ Safe fix -74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 -75 75 | # Nested Optional types should be flattened -76 76 | nested_optional: Optional[Optional[str]] = None -77 |-nested_optional_typing: typing.Optional[Optional[int]] = None - 77 |+nested_optional_typing: int | None = None -78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None +74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 +75 | # Nested Optional types should be flattened +76 | nested_optional: Optional[Optional[str]] = None + - nested_optional_typing: typing.Optional[Optional[int]] = None +77 + nested_optional_typing: int | None = None +78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None UP045 [*] Use `X | None` for type annotations --> UP045.py:77:41 @@ -243,14 +225,12 @@ UP045 [*] Use `X | None` for type annotations 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None | help: Convert to `X | None` - -ℹ Safe fix -74 74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 -75 75 | # Nested Optional types should be flattened -76 76 | nested_optional: Optional[Optional[str]] = None -77 |-nested_optional_typing: typing.Optional[Optional[int]] = None - 77 |+nested_optional_typing: typing.Optional[int | None] = None -78 78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None +74 | # Test for: https://github.com/astral-sh/ruff/issues/19746 +75 | # Nested Optional types should be flattened +76 | nested_optional: Optional[Optional[str]] = None + - nested_optional_typing: typing.Optional[Optional[int]] = None +77 + nested_optional_typing: typing.Optional[int | None] = None +78 | triple_nested_optional: Optional[Optional[Optional[str]]] = None UP045 [*] Use `X | None` for type annotations --> UP045.py:78:25 @@ -261,13 +241,11 @@ UP045 [*] Use `X | None` for type annotations | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to `X | None` - -ℹ Safe fix -75 75 | # Nested Optional types should be flattened -76 76 | nested_optional: Optional[Optional[str]] = None -77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None -78 |-triple_nested_optional: Optional[Optional[Optional[str]]] = None - 78 |+triple_nested_optional: str | None = None +75 | # Nested Optional types should be flattened +76 | nested_optional: Optional[Optional[str]] = None +77 | nested_optional_typing: typing.Optional[Optional[int]] = None + - triple_nested_optional: Optional[Optional[Optional[str]]] = None +78 + triple_nested_optional: str | None = None UP045 [*] Use `X | None` for type annotations --> UP045.py:78:34 @@ -278,13 +256,11 @@ UP045 [*] Use `X | None` for type annotations | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to `X | None` - -ℹ Safe fix -75 75 | # Nested Optional types should be flattened -76 76 | nested_optional: Optional[Optional[str]] = None -77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None -78 |-triple_nested_optional: Optional[Optional[Optional[str]]] = None - 78 |+triple_nested_optional: Optional[str | None] = None +75 | # Nested Optional types should be flattened +76 | nested_optional: Optional[Optional[str]] = None +77 | nested_optional_typing: typing.Optional[Optional[int]] = None + - triple_nested_optional: Optional[Optional[Optional[str]]] = None +78 + triple_nested_optional: Optional[str | None] = None UP045 [*] Use `X | None` for type annotations --> UP045.py:78:43 @@ -295,10 +271,8 @@ UP045 [*] Use `X | None` for type annotations | ^^^^^^^^^^^^^ | help: Convert to `X | None` - -ℹ Safe fix -75 75 | # Nested Optional types should be flattened -76 76 | nested_optional: Optional[Optional[str]] = None -77 77 | nested_optional_typing: typing.Optional[Optional[int]] = None -78 |-triple_nested_optional: Optional[Optional[Optional[str]]] = None - 78 |+triple_nested_optional: Optional[Optional[str | None]] = None +75 | # Nested Optional types should be flattened +76 | nested_optional: Optional[Optional[str]] = None +77 | nested_optional_typing: typing.Optional[Optional[int]] = None + - triple_nested_optional: Optional[Optional[Optional[str]]] = None +78 + triple_nested_optional: Optional[Optional[str | None]] = None diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap index 9707a08e07..3fbee88926 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP046_0.py.snap @@ -10,16 +10,15 @@ UP046 [*] Generic class `A` uses `Generic` subclass instead of type parameters 13 | var: T | help: Use type parameters - -ℹ Unsafe fix -8 8 | P = ParamSpec("P") -9 9 | -10 10 | -11 |-class A(Generic[T]): - 11 |+class A[T: float]: -12 12 | # Comments in a class body are preserved -13 13 | var: T -14 14 | +8 | P = ParamSpec("P") +9 | +10 | + - class A(Generic[T]): +11 + class A[T: float]: +12 | # Comments in a class body are preserved +13 | var: T +14 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters --> UP046_0.py:16:9 @@ -29,16 +28,15 @@ UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters 17 | var: tuple[*Ts] | help: Use type parameters - -ℹ Unsafe fix -13 13 | var: T -14 14 | -15 15 | -16 |-class B(Generic[*Ts]): - 16 |+class B[*Ts]: -17 17 | var: tuple[*Ts] -18 18 | -19 19 | +13 | var: T +14 | +15 | + - class B(Generic[*Ts]): +16 + class B[*Ts]: +17 | var: tuple[*Ts] +18 | +19 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters --> UP046_0.py:20:9 @@ -48,16 +46,15 @@ UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters 21 | var: P | help: Use type parameters - -ℹ Unsafe fix -17 17 | var: tuple[*Ts] -18 18 | -19 19 | -20 |-class C(Generic[P]): - 20 |+class C[**P]: -21 21 | var: P -22 22 | -23 23 | +17 | var: tuple[*Ts] +18 | +19 | + - class C(Generic[P]): +20 + class C[**P]: +21 | var: P +22 | +23 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `Constrained` uses `Generic` subclass instead of type parameters --> UP046_0.py:24:19 @@ -67,16 +64,15 @@ UP046 [*] Generic class `Constrained` uses `Generic` subclass instead of type pa 25 | var: S | help: Use type parameters - -ℹ Unsafe fix -21 21 | var: P -22 22 | -23 23 | -24 |-class Constrained(Generic[S]): - 24 |+class Constrained[S: (str, bytes)]: -25 25 | var: S -26 26 | -27 27 | +21 | var: P +22 | +23 | + - class Constrained(Generic[S]): +24 + class Constrained[S: (str, bytes)]: +25 | var: S +26 | +27 | +note: This is an unsafe fix and may change runtime behavior UP046 Generic class `ExternalType` uses `Generic` subclass instead of type parameters --> UP046_0.py:30:20 @@ -100,16 +96,15 @@ UP046 [*] Generic class `MyStr` uses `Generic` subclass instead of type paramete 38 | s: AnyStr | help: Use type parameters - -ℹ Unsafe fix -34 34 | -35 35 | # typing.AnyStr is a common external type variable, so treat it specially as a -36 36 | # known TypeVar -37 |-class MyStr(Generic[AnyStr]): - 37 |+class MyStr[AnyStr: (bytes, str)]: -38 38 | s: AnyStr -39 39 | -40 40 | +34 | +35 | # typing.AnyStr is a common external type variable, so treat it specially as a +36 | # known TypeVar + - class MyStr(Generic[AnyStr]): +37 + class MyStr[AnyStr: (bytes, str)]: +38 | s: AnyStr +39 | +40 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `MultipleGenerics` uses `Generic` subclass instead of type parameters --> UP046_0.py:41:24 @@ -120,16 +115,15 @@ UP046 [*] Generic class `MultipleGenerics` uses `Generic` subclass instead of ty 43 | typ: T | help: Use type parameters - -ℹ Unsafe fix -38 38 | s: AnyStr -39 39 | -40 40 | -41 |-class MultipleGenerics(Generic[S, T, *Ts, P]): - 41 |+class MultipleGenerics[S: (str, bytes), T: float, *Ts, **P]: -42 42 | var: S -43 43 | typ: T -44 44 | tup: tuple[*Ts] +38 | s: AnyStr +39 | +40 | + - class MultipleGenerics(Generic[S, T, *Ts, P]): +41 + class MultipleGenerics[S: (str, bytes), T: float, *Ts, **P]: +42 | var: S +43 | typ: T +44 | tup: tuple[*Ts] +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `MultipleBaseClasses` uses `Generic` subclass instead of type parameters --> UP046_0.py:48:33 @@ -139,16 +133,15 @@ UP046 [*] Generic class `MultipleBaseClasses` uses `Generic` subclass instead of 49 | var: T | help: Use type parameters - -ℹ Unsafe fix -45 45 | pep: P -46 46 | -47 47 | -48 |-class MultipleBaseClasses(list, Generic[T]): - 48 |+class MultipleBaseClasses[T: float](list): -49 49 | var: T -50 50 | -51 51 | +45 | pep: P +46 | +47 | + - class MultipleBaseClasses(list, Generic[T]): +48 + class MultipleBaseClasses[T: float](list): +49 | var: T +50 | +51 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `MoreBaseClasses` uses `Generic` subclass instead of type parameters --> UP046_0.py:62:44 @@ -158,16 +151,15 @@ UP046 [*] Generic class `MoreBaseClasses` uses `Generic` subclass instead of typ 63 | var: T | help: Use type parameters - -ℹ Unsafe fix -59 59 | class Base3: ... -60 60 | -61 61 | -62 |-class MoreBaseClasses(Base1, Base2, Base3, Generic[T]): - 62 |+class MoreBaseClasses[T: float](Base1, Base2, Base3): -63 63 | var: T -64 64 | -65 65 | +59 | class Base3: ... +60 | +61 | + - class MoreBaseClasses(Base1, Base2, Base3, Generic[T]): +62 + class MoreBaseClasses[T: float](Base1, Base2, Base3): +63 | var: T +64 | +65 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `MultipleBaseAndGenerics` uses `Generic` subclass instead of type parameters --> UP046_0.py:66:52 @@ -178,16 +170,15 @@ UP046 [*] Generic class `MultipleBaseAndGenerics` uses `Generic` subclass instea 68 | typ: T | help: Use type parameters - -ℹ Unsafe fix -63 63 | var: T -64 64 | -65 65 | -66 |-class MultipleBaseAndGenerics(Base1, Base2, Base3, Generic[S, T, *Ts, P]): - 66 |+class MultipleBaseAndGenerics[S: (str, bytes), T: float, *Ts, **P](Base1, Base2, Base3): -67 67 | var: S -68 68 | typ: T -69 69 | tup: tuple[*Ts] +63 | var: T +64 | +65 | + - class MultipleBaseAndGenerics(Base1, Base2, Base3, Generic[S, T, *Ts, P]): +66 + class MultipleBaseAndGenerics[S: (str, bytes), T: float, *Ts, **P](Base1, Base2, Base3): +67 | var: S +68 | typ: T +69 | tup: tuple[*Ts] +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `A` uses `Generic` subclass instead of type parameters --> UP046_0.py:73:9 @@ -196,16 +187,15 @@ UP046 [*] Generic class `A` uses `Generic` subclass instead of type parameters | ^^^^^^^^^^ | help: Use type parameters - -ℹ Unsafe fix -70 70 | pep: P -71 71 | -72 72 | -73 |-class A(Generic[T]): ... - 73 |+class A[T: float]: ... -74 74 | -75 75 | -76 76 | class B(A[S], Generic[S]): +70 | pep: P +71 | +72 | + - class A(Generic[T]): ... +73 + class A[T: float]: ... +74 | +75 | +76 | class B(A[S], Generic[S]): +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters --> UP046_0.py:76:15 @@ -215,16 +205,15 @@ UP046 [*] Generic class `B` uses `Generic` subclass instead of type parameters 77 | var: S | help: Use type parameters - -ℹ Unsafe fix -73 73 | class A(Generic[T]): ... -74 74 | -75 75 | -76 |-class B(A[S], Generic[S]): - 76 |+class B[S: (str, bytes)](A[S]): -77 77 | var: S -78 78 | -79 79 | +73 | class A(Generic[T]): ... +74 | +75 | + - class B(A[S], Generic[S]): +76 + class B[S: (str, bytes)](A[S]): +77 | var: S +78 | +79 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters --> UP046_0.py:80:15 @@ -234,16 +223,15 @@ UP046 [*] Generic class `C` uses `Generic` subclass instead of type parameters 81 | var: tuple[S, T] | help: Use type parameters - -ℹ Unsafe fix -77 77 | var: S -78 78 | -79 79 | -80 |-class C(A[S], Generic[S, T]): - 80 |+class C[S: (str, bytes), T: float](A[S]): -81 81 | var: tuple[S, T] -82 82 | -83 83 | +77 | var: S +78 | +79 | + - class C(A[S], Generic[S, T]): +80 + class C[S: (str, bytes), T: float](A[S]): +81 | var: tuple[S, T] +82 | +83 | +note: This is an unsafe fix and may change runtime behavior UP046 [*] Generic class `D` uses `Generic` subclass instead of type parameters --> UP046_0.py:84:17 @@ -253,16 +241,15 @@ UP046 [*] Generic class `D` uses `Generic` subclass instead of type parameters 85 | var: T | help: Use type parameters - -ℹ Unsafe fix -81 81 | var: tuple[S, T] -82 82 | -83 83 | -84 |-class D(A[int], Generic[T]): - 84 |+class D[T: float](A[int]): -85 85 | var: T -86 86 | -87 87 | +81 | var: tuple[S, T] +82 | +83 | + - class D(A[int], Generic[T]): +84 + class D[T: float](A[int]): +85 | var: T +86 | +87 | +note: This is an unsafe fix and may change runtime behavior UP046 Generic class `NotLast` uses `Generic` subclass instead of type parameters --> UP046_0.py:88:15 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap index 6fdca3167f..9cbe736a7a 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP047.py.snap @@ -9,16 +9,15 @@ UP047 [*] Generic function `f` should use type parameters 13 | return t | help: Use type parameters - -ℹ Unsafe fix -9 9 | P = ParamSpec("P") -10 10 | -11 11 | -12 |-def f(t: T) -> T: - 12 |+def f[T: float](t: T) -> T: -13 13 | return t -14 14 | -15 15 | +9 | P = ParamSpec("P") +10 | +11 | + - def f(t: T) -> T: +12 + def f[T: float](t: T) -> T: +13 | return t +14 | +15 | +note: This is an unsafe fix and may change runtime behavior UP047 [*] Generic function `g` should use type parameters --> UP047.py:16:5 @@ -28,16 +27,15 @@ UP047 [*] Generic function `g` should use type parameters 17 | return ts | help: Use type parameters - -ℹ Unsafe fix -13 13 | return t -14 14 | -15 15 | -16 |-def g(ts: tuple[*Ts]) -> tuple[*Ts]: - 16 |+def g[*Ts](ts: tuple[*Ts]) -> tuple[*Ts]: -17 17 | return ts -18 18 | -19 19 | +13 | return t +14 | +15 | + - def g(ts: tuple[*Ts]) -> tuple[*Ts]: +16 + def g[*Ts](ts: tuple[*Ts]) -> tuple[*Ts]: +17 | return ts +18 | +19 | +note: This is an unsafe fix and may change runtime behavior UP047 [*] Generic function `h` should use type parameters --> UP047.py:20:5 @@ -53,16 +51,15 @@ UP047 [*] Generic function `h` should use type parameters 26 | return p | help: Use type parameters - -ℹ Unsafe fix -17 17 | return ts -18 18 | -19 19 | -20 |-def h( - 20 |+def h[**P, T: float]( -21 21 | p: Callable[P, T], -22 22 | # Comment in the middle of a parameter list should be preserved -23 23 | another_param, +17 | return ts +18 | +19 | + - def h( +20 + def h[**P, T: float]( +21 | p: Callable[P, T], +22 | # Comment in the middle of a parameter list should be preserved +23 | another_param, +note: This is an unsafe fix and may change runtime behavior UP047 [*] Generic function `i` should use type parameters --> UP047.py:29:5 @@ -72,16 +69,15 @@ UP047 [*] Generic function `i` should use type parameters 30 | return s | help: Use type parameters - -ℹ Unsafe fix -26 26 | return p -27 27 | -28 28 | -29 |-def i(s: S) -> S: - 29 |+def i[S: (str, bytes)](s: S) -> S: -30 30 | return s -31 31 | -32 32 | +26 | return p +27 | +28 | + - def i(s: S) -> S: +29 + def i[S: (str, bytes)](s: S) -> S: +30 | return s +31 | +32 | +note: This is an unsafe fix and may change runtime behavior UP047 [*] Generic function `broken_fix` should use type parameters --> UP047.py:39:5 @@ -93,16 +89,15 @@ UP047 [*] Generic function `broken_fix` should use type parameters 40 | return (okay, bad) | help: Use type parameters - -ℹ Unsafe fix -36 36 | # generic type parameter. This leads to code that mixes old-style standalone -37 37 | # TypeVars with the new-style generic syntax and will be rejected by type -38 38 | # checkers -39 |-def broken_fix(okay: T, bad: Something) -> tuple[T, Something]: - 39 |+def broken_fix[T: float](okay: T, bad: Something) -> tuple[T, Something]: -40 40 | return (okay, bad) -41 41 | -42 42 | +36 | # generic type parameter. This leads to code that mixes old-style standalone +37 | # TypeVars with the new-style generic syntax and will be rejected by type +38 | # checkers + - def broken_fix(okay: T, bad: Something) -> tuple[T, Something]: +39 + def broken_fix[T: float](okay: T, bad: Something) -> tuple[T, Something]: +40 | return (okay, bad) +41 | +42 | +note: This is an unsafe fix and may change runtime behavior UP047 [*] Generic function `any_str_param` should use type parameters --> UP047.py:43:5 @@ -112,13 +107,12 @@ UP047 [*] Generic function `any_str_param` should use type parameters 44 | return s | help: Use type parameters - -ℹ Unsafe fix -40 40 | return (okay, bad) -41 41 | -42 42 | -43 |-def any_str_param(s: AnyStr) -> AnyStr: - 43 |+def any_str_param[AnyStr: (bytes, str)](s: AnyStr) -> AnyStr: -44 44 | return s -45 45 | -46 46 | +40 | return (okay, bad) +41 | +42 | + - def any_str_param(s: AnyStr) -> AnyStr: +43 + def any_str_param[AnyStr: (bytes, str)](s: AnyStr) -> AnyStr: +44 | return s +45 | +46 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap index 99eed28edc..6175b73921 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_0.py.snap @@ -10,19 +10,17 @@ UP049 [*] Generic class uses private type parameters 3 | buf: list[_T] | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -1 1 | # simple case, replace _T in signature and body -2 |-class Generic[_T]: -3 |- buf: list[_T] - 2 |+class Generic[T]: - 3 |+ buf: list[T] -4 4 | -5 |- def append(self, t: _T): - 5 |+ def append(self, t: T): -6 6 | self.buf.append(t) -7 7 | -8 8 | +1 | # simple case, replace _T in signature and body + - class Generic[_T]: + - buf: list[_T] +2 + class Generic[T]: +3 + buf: list[T] +4 | + - def append(self, t: _T): +5 + def append(self, t: T): +6 | self.buf.append(t) +7 | +8 | UP049 [*] Generic function uses private type parameters --> UP049_0.py:10:12 @@ -34,18 +32,16 @@ UP049 [*] Generic function uses private type parameters 12 | return y | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -7 7 | -8 8 | -9 9 | # simple case, replace _T in signature and body -10 |-def second[_T](var: tuple[_T]) -> _T: -11 |- y: _T = var[1] - 10 |+def second[T](var: tuple[T]) -> T: - 11 |+ y: T = var[1] -12 12 | return y -13 13 | -14 14 | +7 | +8 | +9 | # simple case, replace _T in signature and body + - def second[_T](var: tuple[_T]) -> _T: + - y: _T = var[1] +10 + def second[T](var: tuple[T]) -> T: +11 + y: T = var[1] +12 | return y +13 | +14 | UP049 [*] Generic function uses private type parameters --> UP049_0.py:17:5 @@ -58,16 +54,14 @@ UP049 [*] Generic function uses private type parameters 19 | ](args): | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -14 14 | -15 15 | # one diagnostic for each variable, comments are preserved -16 16 | def many_generics[ -17 |- _T, # first generic - 17 |+ T, # first generic -18 18 | _U, # second generic -19 19 | ](args): -20 20 | return args +14 | +15 | # one diagnostic for each variable, comments are preserved +16 | def many_generics[ + - _T, # first generic +17 + T, # first generic +18 | _U, # second generic +19 | ](args): +20 | return args UP049 [*] Generic function uses private type parameters --> UP049_0.py:18:5 @@ -80,16 +74,14 @@ UP049 [*] Generic function uses private type parameters 20 | return args | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -15 15 | # one diagnostic for each variable, comments are preserved -16 16 | def many_generics[ -17 17 | _T, # first generic -18 |- _U, # second generic - 18 |+ U, # second generic -19 19 | ](args): -20 20 | return args -21 21 | +15 | # one diagnostic for each variable, comments are preserved +16 | def many_generics[ +17 | _T, # first generic + - _U, # second generic +18 + U, # second generic +19 | ](args): +20 | return args +21 | UP049 [*] Generic function uses private type parameters --> UP049_0.py:27:7 @@ -100,15 +92,13 @@ UP049 [*] Generic function uses private type parameters 29 | cast("Literal['_T']") | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -24 24 | from typing import Literal, cast -25 25 | -26 26 | -27 |-def f[_T](v): -28 |- cast("_T", v) - 27 |+def f[T](v): - 28 |+ cast("T", v) -29 29 | cast("Literal['_T']") -30 |- cast("list[_T]", v) - 30 |+ cast("list[T]", v) +24 | from typing import Literal, cast +25 | +26 | + - def f[_T](v): + - cast("_T", v) +27 + def f[T](v): +28 + cast("T", v) +29 | cast("Literal['_T']") + - cast("list[_T]", v) +30 + cast("list[T]", v) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap index 4c94954139..e018e1445a 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP049_1.py.snap @@ -10,16 +10,14 @@ UP049 [*] Generic class uses private type parameters 3 | var: _T | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -1 1 | # bound -2 |-class Foo[_T: str]: -3 |- var: _T - 2 |+class Foo[T: str]: - 3 |+ var: T -4 4 | -5 5 | -6 6 | # constraint +1 | # bound + - class Foo[_T: str]: + - var: _T +2 + class Foo[T: str]: +3 + var: T +4 | +5 | +6 | # constraint UP049 [*] Generic class uses private type parameters --> UP049_1.py:7:11 @@ -30,18 +28,16 @@ UP049 [*] Generic class uses private type parameters 8 | var: _T | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -4 4 | -5 5 | -6 6 | # constraint -7 |-class Foo[_T: (str, bytes)]: -8 |- var: _T - 7 |+class Foo[T: (str, bytes)]: - 8 |+ var: T -9 9 | -10 10 | -11 11 | # python 3.13+ default +4 | +5 | +6 | # constraint + - class Foo[_T: (str, bytes)]: + - var: _T +7 + class Foo[T: (str, bytes)]: +8 + var: T +9 | +10 | +11 | # python 3.13+ default UP049 [*] Generic class uses private type parameters --> UP049_1.py:12:11 @@ -52,18 +48,16 @@ UP049 [*] Generic class uses private type parameters 13 | var: _T | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -9 9 | -10 10 | -11 11 | # python 3.13+ default -12 |-class Foo[_T = int]: -13 |- var: _T - 12 |+class Foo[T = int]: - 13 |+ var: T -14 14 | -15 15 | -16 16 | # tuple +9 | +10 | +11 | # python 3.13+ default + - class Foo[_T = int]: + - var: _T +12 + class Foo[T = int]: +13 + var: T +14 | +15 | +16 | # tuple UP049 [*] Generic class uses private type parameters --> UP049_1.py:17:12 @@ -74,18 +68,16 @@ UP049 [*] Generic class uses private type parameters 18 | var: tuple[*_Ts] | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -14 14 | -15 15 | -16 16 | # tuple -17 |-class Foo[*_Ts]: -18 |- var: tuple[*_Ts] - 17 |+class Foo[*Ts]: - 18 |+ var: tuple[*Ts] -19 19 | -20 20 | -21 21 | # paramspec +14 | +15 | +16 | # tuple + - class Foo[*_Ts]: + - var: tuple[*_Ts] +17 + class Foo[*Ts]: +18 + var: tuple[*Ts] +19 | +20 | +21 | # paramspec UP049 [*] Generic class uses private type parameters --> UP049_1.py:22:11 @@ -96,18 +88,16 @@ UP049 [*] Generic class uses private type parameters 23 | var: _P | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -19 19 | -20 20 | -21 21 | # paramspec -22 |-class C[**_P]: -23 |- var: _P - 22 |+class C[**P]: - 23 |+ var: P -24 24 | -25 25 | -26 26 | from typing import Callable +19 | +20 | +21 | # paramspec + - class C[**_P]: + - var: _P +22 + class C[**P]: +23 + var: P +24 | +25 | +26 | from typing import Callable UP049 [*] Generic class uses private type parameters --> UP049_1.py:31:18 @@ -120,19 +110,17 @@ UP049 [*] Generic class uses private type parameters 33 | def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -28 28 | -29 29 | # each of these will get a separate diagnostic, but at least they'll all get -30 30 | # fixed -31 |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: - 31 |+class Everything[T, _U: str, _V: (int, float), *_W, **_X]: -32 32 | @staticmethod -33 |- def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: - 33 |+ def transform(t: T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, T] | None: -34 34 | return None -35 35 | -36 36 | +28 | +29 | # each of these will get a separate diagnostic, but at least they'll all get +30 | # fixed + - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: +31 + class Everything[T, _U: str, _V: (int, float), *_W, **_X]: +32 | @staticmethod + - def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: +33 + def transform(t: T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, T] | None: +34 | return None +35 | +36 | UP049 [*] Generic class uses private type parameters --> UP049_1.py:31:22 @@ -145,19 +133,17 @@ UP049 [*] Generic class uses private type parameters 33 | def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -28 28 | -29 29 | # each of these will get a separate diagnostic, but at least they'll all get -30 30 | # fixed -31 |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: - 31 |+class Everything[_T, U: str, _V: (int, float), *_W, **_X]: -32 32 | @staticmethod -33 |- def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: - 33 |+ def transform(t: _T, u: U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: -34 34 | return None -35 35 | -36 36 | +28 | +29 | # each of these will get a separate diagnostic, but at least they'll all get +30 | # fixed + - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: +31 + class Everything[_T, U: str, _V: (int, float), *_W, **_X]: +32 | @staticmethod + - def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: +33 + def transform(t: _T, u: U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: +34 | return None +35 | +36 | UP049 [*] Generic class uses private type parameters --> UP049_1.py:31:31 @@ -170,19 +156,17 @@ UP049 [*] Generic class uses private type parameters 33 | def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -28 28 | -29 29 | # each of these will get a separate diagnostic, but at least they'll all get -30 30 | # fixed -31 |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: - 31 |+class Everything[_T, _U: str, V: (int, float), *_W, **_X]: -32 32 | @staticmethod -33 |- def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: - 33 |+ def transform(t: _T, u: _U, v: V) -> tuple[*_W] | Callable[_X, _T] | None: -34 34 | return None -35 35 | -36 36 | +28 | +29 | # each of these will get a separate diagnostic, but at least they'll all get +30 | # fixed + - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: +31 + class Everything[_T, _U: str, V: (int, float), *_W, **_X]: +32 | @staticmethod + - def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: +33 + def transform(t: _T, u: _U, v: V) -> tuple[*_W] | Callable[_X, _T] | None: +34 | return None +35 | +36 | UP049 [*] Generic class uses private type parameters --> UP049_1.py:31:50 @@ -195,19 +179,17 @@ UP049 [*] Generic class uses private type parameters 33 | def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -28 28 | -29 29 | # each of these will get a separate diagnostic, but at least they'll all get -30 30 | # fixed -31 |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: - 31 |+class Everything[_T, _U: str, _V: (int, float), *W, **_X]: -32 32 | @staticmethod -33 |- def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: - 33 |+ def transform(t: _T, u: _U, v: _V) -> tuple[*W] | Callable[_X, _T] | None: -34 34 | return None -35 35 | -36 36 | +28 | +29 | # each of these will get a separate diagnostic, but at least they'll all get +30 | # fixed + - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: +31 + class Everything[_T, _U: str, _V: (int, float), *W, **_X]: +32 | @staticmethod + - def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: +33 + def transform(t: _T, u: _U, v: _V) -> tuple[*W] | Callable[_X, _T] | None: +34 | return None +35 | +36 | UP049 [*] Generic class uses private type parameters --> UP049_1.py:31:56 @@ -220,19 +202,17 @@ UP049 [*] Generic class uses private type parameters 33 | def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: | help: Rename type parameter to remove leading underscores - -ℹ Safe fix -28 28 | -29 29 | # each of these will get a separate diagnostic, but at least they'll all get -30 30 | # fixed -31 |-class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: - 31 |+class Everything[_T, _U: str, _V: (int, float), *_W, **X]: -32 32 | @staticmethod -33 |- def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: - 33 |+ def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[X, _T] | None: -34 34 | return None -35 35 | -36 36 | +28 | +29 | # each of these will get a separate diagnostic, but at least they'll all get +30 | # fixed + - class Everything[_T, _U: str, _V: (int, float), *_W, **_X]: +31 + class Everything[_T, _U: str, _V: (int, float), *_W, **X]: +32 | @staticmethod + - def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[_X, _T] | None: +33 + def transform(t: _T, u: _U, v: _V) -> tuple[*_W] | Callable[X, _T] | None: +34 | return None +35 | +36 | UP049 Generic class uses private type parameters --> UP049_1.py:39:9 @@ -291,30 +271,29 @@ UP049 Generic class uses private type parameters 73 | v2 = cast('_T', ...) | help: Rename type parameter to remove leading underscores - -ℹ Display-only fix -68 68 | class C[_T, T]: ... -69 69 | -70 70 | -71 |-class C[_T]: -72 |- v1 = cast(_T, ...) -73 |- v2 = cast('_T', ...) -74 |- v3 = cast("\u005fT", ...) - 71 |+class C[T]: - 72 |+ v1 = cast(T, ...) - 73 |+ v2 = cast('T', ...) - 74 |+ v3 = cast(T, ...) -75 75 | -76 76 | def _(self): -77 |- v1 = cast(_T, ...) -78 |- v2 = cast('_T', ...) -79 |- v3 = cast("\u005fT", ...) - 77 |+ v1 = cast(T, ...) - 78 |+ v2 = cast('T', ...) - 79 |+ v3 = cast(T, ...) -80 80 | -81 81 | -82 82 | class C[_T]: +68 | class C[_T, T]: ... +69 | +70 | + - class C[_T]: + - v1 = cast(_T, ...) + - v2 = cast('_T', ...) + - v3 = cast("\u005fT", ...) +71 + class C[T]: +72 + v1 = cast(T, ...) +73 + v2 = cast('T', ...) +74 + v3 = cast(T, ...) +75 | +76 | def _(self): + - v1 = cast(_T, ...) + - v2 = cast('_T', ...) + - v3 = cast("\u005fT", ...) +77 + v1 = cast(T, ...) +78 + v2 = cast('T', ...) +79 + v3 = cast(T, ...) +80 | +81 | +82 | class C[_T]: +note: This is a display-only fix and is likely to be incorrect UP049 Generic class uses private type parameters --> UP049_1.py:82:9 @@ -324,18 +303,17 @@ UP049 Generic class uses private type parameters 83 | v = cast('Literal[\'foo\'] | _T', ...) | help: Rename type parameter to remove leading underscores - -ℹ Display-only fix -79 79 | v3 = cast("\u005fT", ...) -80 80 | -81 81 | -82 |-class C[_T]: -83 |- v = cast('Literal[\'foo\'] | _T', ...) - 82 |+class C[T]: - 83 |+ v = cast(T, ...) -84 84 | -85 85 | -86 86 | ## Name collision +79 | v3 = cast("\u005fT", ...) +80 | +81 | + - class C[_T]: + - v = cast('Literal[\'foo\'] | _T', ...) +82 + class C[T]: +83 + v = cast(T, ...) +84 | +85 | +86 | ## Name collision +note: This is a display-only fix and is likely to be incorrect UP049 Generic function uses private type parameters --> UP049_1.py:88:11 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap index 904d235e79..63449018ae 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP050.py.snap @@ -9,16 +9,14 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 6 | ... | help: Remove `metaclass=type` - -ℹ Safe fix -2 2 | ... -3 3 | -4 4 | -5 |-class A(metaclass=type): - 5 |+class A: -6 6 | ... -7 7 | -8 8 | +2 | ... +3 | +4 | + - class A(metaclass=type): +5 + class A: +6 | ... +7 | +8 | UP050 [*] Class `A` uses `metaclass=type`, which is redundant --> UP050.py:10:5 @@ -30,18 +28,16 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 12 | ... | help: Remove `metaclass=type` - -ℹ Safe fix -6 6 | ... -7 7 | -8 8 | -9 |-class A( -10 |- metaclass=type -11 |-): - 9 |+class A: -12 10 | ... -13 11 | -14 12 | +6 | ... +7 | +8 | + - class A( + - metaclass=type + - ): +9 + class A: +10 | ... +11 | +12 | UP050 [*] Class `A` uses `metaclass=type`, which is redundant --> UP050.py:16:5 @@ -53,19 +49,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 18 | ): | help: Remove `metaclass=type` - -ℹ Unsafe fix -12 12 | ... -13 13 | -14 14 | -15 |-class A( -16 |- metaclass=type -17 |- # -18 |-): - 15 |+class A: -19 16 | ... -20 17 | -21 18 | +12 | ... +13 | +14 | + - class A( + - metaclass=type + - # + - ): +15 + class A: +16 | ... +17 | +18 | +note: This is an unsafe fix and may change runtime behavior UP050 [*] Class `A` uses `metaclass=type`, which is redundant --> UP050.py:24:5 @@ -78,19 +73,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 26 | ... | help: Remove `metaclass=type` - -ℹ Unsafe fix -19 19 | ... -20 20 | -21 21 | -22 |-class A( -23 |- # -24 |- metaclass=type -25 |-): - 22 |+class A: -26 23 | ... -27 24 | -28 25 | +19 | ... +20 | +21 | + - class A( + - # + - metaclass=type + - ): +22 + class A: +23 | ... +24 | +25 | +note: This is an unsafe fix and may change runtime behavior UP050 [*] Class `A` uses `metaclass=type`, which is redundant --> UP050.py:30:5 @@ -102,19 +96,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 32 | ): | help: Remove `metaclass=type` - -ℹ Unsafe fix -26 26 | ... -27 27 | -28 28 | -29 |-class A( -30 |- metaclass=type, -31 |- # -32 |-): - 29 |+class A: -33 30 | ... -34 31 | -35 32 | +26 | ... +27 | +28 | + - class A( + - metaclass=type, + - # + - ): +29 + class A: +30 | ... +31 | +32 | +note: This is an unsafe fix and may change runtime behavior UP050 [*] Class `A` uses `metaclass=type`, which is redundant --> UP050.py:38:5 @@ -127,20 +120,19 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 40 | ): | help: Remove `metaclass=type` - -ℹ Unsafe fix -33 33 | ... -34 34 | -35 35 | -36 |-class A( -37 |- # -38 |- metaclass=type, -39 |- # -40 |-): - 36 |+class A: -41 37 | ... -42 38 | -43 39 | +33 | ... +34 | +35 | + - class A( + - # + - metaclass=type, + - # + - ): +36 + class A: +37 | ... +38 | +39 | +note: This is an unsafe fix and may change runtime behavior UP050 [*] Class `B` uses `metaclass=type`, which is redundant --> UP050.py:44:12 @@ -150,16 +142,14 @@ UP050 [*] Class `B` uses `metaclass=type`, which is redundant 45 | ... | help: Remove `metaclass=type` - -ℹ Safe fix -41 41 | ... -42 42 | -43 43 | -44 |-class B(A, metaclass=type): - 44 |+class B(A): -45 45 | ... -46 46 | -47 47 | +41 | ... +42 | +43 | + - class B(A, metaclass=type): +44 + class B(A): +45 | ... +46 | +47 | UP050 [*] Class `B` uses `metaclass=type`, which is redundant --> UP050.py:50:5 @@ -172,15 +162,13 @@ UP050 [*] Class `B` uses `metaclass=type`, which is redundant 52 | ... | help: Remove `metaclass=type` - -ℹ Safe fix -47 47 | -48 48 | class B( -49 49 | A, -50 |- metaclass=type, -51 50 | ): -52 51 | ... -53 52 | +47 | +48 | class B( +49 | A, + - metaclass=type, +50 | ): +51 | ... +52 | UP050 [*] Class `B` uses `metaclass=type`, which is redundant --> UP050.py:58:5 @@ -193,16 +181,15 @@ UP050 [*] Class `B` uses `metaclass=type`, which is redundant 60 | ... | help: Remove `metaclass=type` - -ℹ Unsafe fix -54 54 | -55 55 | class B( -56 56 | A, -57 |- # comment -58 |- metaclass=type, -59 57 | ): -60 58 | ... -61 59 | +54 | +55 | class B( +56 | A, + - # comment + - metaclass=type, +57 | ): +58 | ... +59 | +note: This is an unsafe fix and may change runtime behavior UP050 [*] Class `A` uses `metaclass=type`, which is redundant --> UP050.py:69:5 @@ -214,19 +201,18 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 71 | ): | help: Remove `metaclass=type` - -ℹ Unsafe fix -65 65 | ... -66 66 | -67 67 | -68 |-class A( -69 |- metaclass=type # comment -70 |- , -71 |-): - 68 |+class A: -72 69 | ... -73 70 | -74 71 | +65 | ... +66 | +67 | + - class A( + - metaclass=type # comment + - , + - ): +68 + class A: +69 | ... +70 | +71 | +note: This is an unsafe fix and may change runtime behavior UP050 [*] Class `A` uses `metaclass=type`, which is redundant --> UP050.py:83:9 @@ -238,11 +224,9 @@ UP050 [*] Class `A` uses `metaclass=type`, which is redundant 84 | ... | help: Remove `metaclass=type` - -ℹ Safe fix -80 80 | -81 81 | import builtins -82 82 | -83 |-class A(metaclass=builtins.type): - 83 |+class A: -84 84 | ... +80 | +81 | import builtins +82 | + - class A(metaclass=builtins.type): +83 + class A: +84 | ... diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap index 2c67e9da5a..3040870f87 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_0.py.snap @@ -9,16 +9,14 @@ UP037 [*] Remove quotes from type annotation 19 | x: "MyClass" | help: Remove quotes - -ℹ Safe fix -15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg -16 16 | -17 17 | -18 |-def foo(var: "MyClass") -> "MyClass": - 18 |+def foo(var: MyClass) -> "MyClass": -19 19 | x: "MyClass" -20 20 | -21 21 | +15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg +16 | +17 | + - def foo(var: "MyClass") -> "MyClass": +18 + def foo(var: MyClass) -> "MyClass": +19 | x: "MyClass" +20 | +21 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:18:28 @@ -28,16 +26,14 @@ UP037 [*] Remove quotes from type annotation 19 | x: "MyClass" | help: Remove quotes - -ℹ Safe fix -15 15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg -16 16 | -17 17 | -18 |-def foo(var: "MyClass") -> "MyClass": - 18 |+def foo(var: "MyClass") -> MyClass: -19 19 | x: "MyClass" -20 20 | -21 21 | +15 | from mypy_extensions import Arg, DefaultArg, DefaultNamedArg, NamedArg, VarArg +16 | +17 | + - def foo(var: "MyClass") -> "MyClass": +18 + def foo(var: "MyClass") -> MyClass: +19 | x: "MyClass" +20 | +21 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:19:8 @@ -47,16 +43,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -16 16 | -17 17 | -18 18 | def foo(var: "MyClass") -> "MyClass": -19 |- x: "MyClass" - 19 |+ x: MyClass -20 20 | -21 21 | -22 22 | def foo(*, inplace: "bool"): +16 | +17 | +18 | def foo(var: "MyClass") -> "MyClass": + - x: "MyClass" +19 + x: MyClass +20 | +21 | +22 | def foo(*, inplace: "bool"): UP037 [*] Remove quotes from type annotation --> UP037_0.py:22:21 @@ -66,16 +60,14 @@ UP037 [*] Remove quotes from type annotation 23 | pass | help: Remove quotes - -ℹ Safe fix -19 19 | x: "MyClass" -20 20 | -21 21 | -22 |-def foo(*, inplace: "bool"): - 22 |+def foo(*, inplace: bool): -23 23 | pass -24 24 | -25 25 | +19 | x: "MyClass" +20 | +21 | + - def foo(*, inplace: "bool"): +22 + def foo(*, inplace: bool): +23 | pass +24 | +25 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:26:16 @@ -85,16 +77,14 @@ UP037 [*] Remove quotes from type annotation 27 | pass | help: Remove quotes - -ℹ Safe fix -23 23 | pass -24 24 | -25 25 | -26 |-def foo(*args: "str", **kwargs: "int"): - 26 |+def foo(*args: str, **kwargs: "int"): -27 27 | pass -28 28 | -29 29 | +23 | pass +24 | +25 | + - def foo(*args: "str", **kwargs: "int"): +26 + def foo(*args: str, **kwargs: "int"): +27 | pass +28 | +29 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:26:33 @@ -104,16 +94,14 @@ UP037 [*] Remove quotes from type annotation 27 | pass | help: Remove quotes - -ℹ Safe fix -23 23 | pass -24 24 | -25 25 | -26 |-def foo(*args: "str", **kwargs: "int"): - 26 |+def foo(*args: "str", **kwargs: int): -27 27 | pass -28 28 | -29 29 | +23 | pass +24 | +25 | + - def foo(*args: "str", **kwargs: "int"): +26 + def foo(*args: "str", **kwargs: int): +27 | pass +28 | +29 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:30:10 @@ -124,16 +112,14 @@ UP037 [*] Remove quotes from type annotation 32 | x: Callable[["MyClass"], None] | help: Remove quotes - -ℹ Safe fix -27 27 | pass -28 28 | -29 29 | -30 |-x: Tuple["MyClass"] - 30 |+x: Tuple[MyClass] -31 31 | -32 32 | x: Callable[["MyClass"], None] -33 33 | +27 | pass +28 | +29 | + - x: Tuple["MyClass"] +30 + x: Tuple[MyClass] +31 | +32 | x: Callable[["MyClass"], None] +33 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:32:14 @@ -144,16 +130,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -29 29 | -30 30 | x: Tuple["MyClass"] -31 31 | -32 |-x: Callable[["MyClass"], None] - 32 |+x: Callable[[MyClass], None] -33 33 | -34 34 | -35 35 | class Foo(NamedTuple): +29 | +30 | x: Tuple["MyClass"] +31 | + - x: Callable[["MyClass"], None] +32 + x: Callable[[MyClass], None] +33 | +34 | +35 | class Foo(NamedTuple): UP037 [*] Remove quotes from type annotation --> UP037_0.py:36:8 @@ -163,16 +147,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -33 33 | -34 34 | -35 35 | class Foo(NamedTuple): -36 |- x: "MyClass" - 36 |+ x: MyClass -37 37 | -38 38 | -39 39 | class D(TypedDict): +33 | +34 | +35 | class Foo(NamedTuple): + - x: "MyClass" +36 + x: MyClass +37 | +38 | +39 | class D(TypedDict): UP037 [*] Remove quotes from type annotation --> UP037_0.py:40:27 @@ -182,16 +164,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^ | help: Remove quotes - -ℹ Safe fix -37 37 | -38 38 | -39 39 | class D(TypedDict): -40 |- E: TypedDict("E", foo="int", total=False) - 40 |+ E: TypedDict("E", foo=int, total=False) -41 41 | -42 42 | -43 43 | class D(TypedDict): +37 | +38 | +39 | class D(TypedDict): + - E: TypedDict("E", foo="int", total=False) +40 + E: TypedDict("E", foo=int, total=False) +41 | +42 | +43 | class D(TypedDict): UP037 [*] Remove quotes from type annotation --> UP037_0.py:44:31 @@ -201,16 +181,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^ | help: Remove quotes - -ℹ Safe fix -41 41 | -42 42 | -43 43 | class D(TypedDict): -44 |- E: TypedDict("E", {"foo": "int"}) - 44 |+ E: TypedDict("E", {"foo": int}) -45 45 | -46 46 | -47 47 | x: Annotated["str", "metadata"] +41 | +42 | +43 | class D(TypedDict): + - E: TypedDict("E", {"foo": "int"}) +44 + E: TypedDict("E", {"foo": int}) +45 | +46 | +47 | x: Annotated["str", "metadata"] UP037 [*] Remove quotes from type annotation --> UP037_0.py:47:14 @@ -221,16 +199,14 @@ UP037 [*] Remove quotes from type annotation 49 | x: Arg("str", "name") | help: Remove quotes - -ℹ Safe fix -44 44 | E: TypedDict("E", {"foo": "int"}) -45 45 | -46 46 | -47 |-x: Annotated["str", "metadata"] - 47 |+x: Annotated[str, "metadata"] -48 48 | -49 49 | x: Arg("str", "name") -50 50 | +44 | E: TypedDict("E", {"foo": "int"}) +45 | +46 | + - x: Annotated["str", "metadata"] +47 + x: Annotated[str, "metadata"] +48 | +49 | x: Arg("str", "name") +50 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:49:8 @@ -243,16 +219,14 @@ UP037 [*] Remove quotes from type annotation 51 | x: DefaultArg("str", "name") | help: Remove quotes - -ℹ Safe fix -46 46 | -47 47 | x: Annotated["str", "metadata"] -48 48 | -49 |-x: Arg("str", "name") - 49 |+x: Arg(str, "name") -50 50 | -51 51 | x: DefaultArg("str", "name") -52 52 | +46 | +47 | x: Annotated["str", "metadata"] +48 | + - x: Arg("str", "name") +49 + x: Arg(str, "name") +50 | +51 | x: DefaultArg("str", "name") +52 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:51:15 @@ -265,16 +239,14 @@ UP037 [*] Remove quotes from type annotation 53 | x: NamedArg("str", "name") | help: Remove quotes - -ℹ Safe fix -48 48 | -49 49 | x: Arg("str", "name") -50 50 | -51 |-x: DefaultArg("str", "name") - 51 |+x: DefaultArg(str, "name") -52 52 | -53 53 | x: NamedArg("str", "name") -54 54 | +48 | +49 | x: Arg("str", "name") +50 | + - x: DefaultArg("str", "name") +51 + x: DefaultArg(str, "name") +52 | +53 | x: NamedArg("str", "name") +54 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:53:13 @@ -287,16 +259,14 @@ UP037 [*] Remove quotes from type annotation 55 | x: DefaultNamedArg("str", "name") | help: Remove quotes - -ℹ Safe fix -50 50 | -51 51 | x: DefaultArg("str", "name") -52 52 | -53 |-x: NamedArg("str", "name") - 53 |+x: NamedArg(str, "name") -54 54 | -55 55 | x: DefaultNamedArg("str", "name") -56 56 | +50 | +51 | x: DefaultArg("str", "name") +52 | + - x: NamedArg("str", "name") +53 + x: NamedArg(str, "name") +54 | +55 | x: DefaultNamedArg("str", "name") +56 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:55:20 @@ -309,16 +279,14 @@ UP037 [*] Remove quotes from type annotation 57 | x: DefaultNamedArg("str", name="name") | help: Remove quotes - -ℹ Safe fix -52 52 | -53 53 | x: NamedArg("str", "name") -54 54 | -55 |-x: DefaultNamedArg("str", "name") - 55 |+x: DefaultNamedArg(str, "name") -56 56 | -57 57 | x: DefaultNamedArg("str", name="name") -58 58 | +52 | +53 | x: NamedArg("str", "name") +54 | + - x: DefaultNamedArg("str", "name") +55 + x: DefaultNamedArg(str, "name") +56 | +57 | x: DefaultNamedArg("str", name="name") +58 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:57:20 @@ -331,16 +299,14 @@ UP037 [*] Remove quotes from type annotation 59 | x: VarArg("str") | help: Remove quotes - -ℹ Safe fix -54 54 | -55 55 | x: DefaultNamedArg("str", "name") -56 56 | -57 |-x: DefaultNamedArg("str", name="name") - 57 |+x: DefaultNamedArg(str, name="name") -58 58 | -59 59 | x: VarArg("str") -60 60 | +54 | +55 | x: DefaultNamedArg("str", "name") +56 | + - x: DefaultNamedArg("str", name="name") +57 + x: DefaultNamedArg(str, name="name") +58 | +59 | x: VarArg("str") +60 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:59:11 @@ -353,16 +319,14 @@ UP037 [*] Remove quotes from type annotation 61 | x: List[List[List["MyClass"]]] | help: Remove quotes - -ℹ Safe fix -56 56 | -57 57 | x: DefaultNamedArg("str", name="name") -58 58 | -59 |-x: VarArg("str") - 59 |+x: VarArg(str) -60 60 | -61 61 | x: List[List[List["MyClass"]]] -62 62 | +56 | +57 | x: DefaultNamedArg("str", name="name") +58 | + - x: VarArg("str") +59 + x: VarArg(str) +60 | +61 | x: List[List[List["MyClass"]]] +62 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:61:19 @@ -375,16 +339,14 @@ UP037 [*] Remove quotes from type annotation 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) | help: Remove quotes - -ℹ Safe fix -58 58 | -59 59 | x: VarArg("str") -60 60 | -61 |-x: List[List[List["MyClass"]]] - 61 |+x: List[List[List[MyClass]]] -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | +58 | +59 | x: VarArg("str") +60 | + - x: List[List[List["MyClass"]]] +61 + x: List[List[List[MyClass]]] +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:63:29 @@ -397,16 +359,14 @@ UP037 [*] Remove quotes from type annotation 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) | help: Remove quotes - -ℹ Safe fix -60 60 | -61 61 | x: List[List[List["MyClass"]]] -62 62 | -63 |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) - 63 |+x: NamedTuple("X", [("foo", int), ("bar", "str")]) -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | +60 | +61 | x: List[List[List["MyClass"]]] +62 | + - x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +63 + x: NamedTuple("X", [("foo", int), ("bar", "str")]) +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:63:45 @@ -419,16 +379,14 @@ UP037 [*] Remove quotes from type annotation 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) | help: Remove quotes - -ℹ Safe fix -60 60 | -61 61 | x: List[List[List["MyClass"]]] -62 62 | -63 |-x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) - 63 |+x: NamedTuple("X", [("foo", "int"), ("bar", str)]) -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | +60 | +61 | x: List[List[List["MyClass"]]] +62 | + - x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +63 + x: NamedTuple("X", [("foo", "int"), ("bar", str)]) +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:29 @@ -441,16 +399,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[(foo, "int"), ("bar", "str")]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:36 @@ -463,16 +419,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[("foo", int), ("bar", "str")]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[("foo", int), ("bar", "str")]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:45 @@ -485,16 +439,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[("foo", "int"), (bar, "str")]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:65:52 @@ -507,16 +459,14 @@ UP037 [*] Remove quotes from type annotation 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) | help: Remove quotes - -ℹ Safe fix -62 62 | -63 63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) -64 64 | -65 |-x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) - 65 |+x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)]) -66 66 | -67 67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) -68 68 | +62 | +63 | x: NamedTuple("X", [("foo", "int"), ("bar", "str")]) +64 | + - x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +65 + x: NamedTuple("X", fields=[("foo", "int"), ("bar", str)]) +66 | +67 | x: NamedTuple(typename="X", fields=[("foo", "int")]) +68 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:67:24 @@ -529,16 +479,14 @@ UP037 [*] Remove quotes from type annotation 69 | X: MyCallable("X") | help: Remove quotes - -ℹ Safe fix -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | -67 |-x: NamedTuple(typename="X", fields=[("foo", "int")]) - 67 |+x: NamedTuple(typename=X, fields=[("foo", "int")]) -68 68 | -69 69 | X: MyCallable("X") -70 70 | +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | + - x: NamedTuple(typename="X", fields=[("foo", "int")]) +67 + x: NamedTuple(typename=X, fields=[("foo", "int")]) +68 | +69 | X: MyCallable("X") +70 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:67:38 @@ -551,16 +499,14 @@ UP037 [*] Remove quotes from type annotation 69 | X: MyCallable("X") | help: Remove quotes - -ℹ Safe fix -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | -67 |-x: NamedTuple(typename="X", fields=[("foo", "int")]) - 67 |+x: NamedTuple(typename="X", fields=[(foo, "int")]) -68 68 | -69 69 | X: MyCallable("X") -70 70 | +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | + - x: NamedTuple(typename="X", fields=[("foo", "int")]) +67 + x: NamedTuple(typename="X", fields=[(foo, "int")]) +68 | +69 | X: MyCallable("X") +70 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:67:45 @@ -573,16 +519,14 @@ UP037 [*] Remove quotes from type annotation 69 | X: MyCallable("X") | help: Remove quotes - -ℹ Safe fix -64 64 | -65 65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) -66 66 | -67 |-x: NamedTuple(typename="X", fields=[("foo", "int")]) - 67 |+x: NamedTuple(typename="X", fields=[("foo", int)]) -68 68 | -69 69 | X: MyCallable("X") -70 70 | +64 | +65 | x: NamedTuple("X", fields=[("foo", "int"), ("bar", "str")]) +66 | + - x: NamedTuple(typename="X", fields=[("foo", "int")]) +67 + x: NamedTuple(typename="X", fields=[("foo", int)]) +68 | +69 | X: MyCallable("X") +70 | UP037 [*] Remove quotes from type annotation --> UP037_0.py:112:12 @@ -594,17 +538,15 @@ UP037 [*] Remove quotes from type annotation 113 | return 0 | help: Remove quotes - -ℹ Safe fix -109 109 | -110 110 | # Handle end of line comment in string annotation -111 111 | # See https://github.com/astral-sh/ruff/issues/15816 -112 |-def f() -> "Literal[0]#": - 112 |+def f() -> (Literal[0]# - 113 |+): -113 114 | return 0 -114 115 | -115 116 | def g(x: "Literal['abc']#") -> None: +109 | +110 | # Handle end of line comment in string annotation +111 | # See https://github.com/astral-sh/ruff/issues/15816 + - def f() -> "Literal[0]#": +112 + def f() -> (Literal[0]# +113 + ): +114 | return 0 +115 | +116 | def g(x: "Literal['abc']#") -> None: UP037 [*] Remove quotes from type annotation --> UP037_0.py:115:10 @@ -616,17 +558,15 @@ UP037 [*] Remove quotes from type annotation 116 | return | help: Remove quotes - -ℹ Safe fix -112 112 | def f() -> "Literal[0]#": -113 113 | return 0 -114 114 | -115 |-def g(x: "Literal['abc']#") -> None: - 115 |+def g(x: (Literal['abc']# - 116 |+)) -> None: -116 117 | return -117 118 | -118 119 | def f() -> """Literal[0] +112 | def f() -> "Literal[0]#": +113 | return 0 +114 | + - def g(x: "Literal['abc']#") -> None: +115 + def g(x: (Literal['abc']# +116 + )) -> None: +117 | return +118 | +119 | def f() -> """Literal[0] UP037 [*] Remove quotes from type annotation --> UP037_0.py:118:12 @@ -642,15 +582,13 @@ UP037 [*] Remove quotes from type annotation 122 | return 0 | help: Remove quotes - -ℹ Safe fix -115 115 | def g(x: "Literal['abc']#") -> None: -116 116 | return -117 117 | -118 |-def f() -> """Literal[0] - 118 |+def f() -> (Literal[0] -119 119 | # -120 120 | -121 |- """: - 121 |+ ): -122 122 | return 0 +115 | def g(x: "Literal['abc']#") -> None: +116 | return +117 | + - def f() -> """Literal[0] +118 + def f() -> (Literal[0] +119 | # +120 | + - """: +121 + ): +122 | return 0 diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap index c6844b63cf..fa2af22e0c 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_1.py.snap @@ -11,16 +11,14 @@ UP037 [*] Remove quotes from type annotation 10 | print(x) | help: Remove quotes - -ℹ Safe fix -6 6 | -7 7 | def foo(): -8 8 | # UP037 -9 |- x: "Tuple[int, int]" = (0, 0) - 9 |+ x: Tuple[int, int] = (0, 0) -10 10 | print(x) -11 11 | -12 12 | +6 | +7 | def foo(): +8 | # UP037 + - x: "Tuple[int, int]" = (0, 0) +9 + x: Tuple[int, int] = (0, 0) +10 | print(x) +11 | +12 | UP037 [*] Remove quotes from type annotation --> UP037_1.py:14:4 @@ -30,15 +28,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^^^^^^^^^ | help: Remove quotes - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import TYPE_CHECKING -2 3 | -3 4 | if TYPE_CHECKING: +1 + from __future__ import annotations +2 | from typing import TYPE_CHECKING +3 | +4 | if TYPE_CHECKING: -------------------------------------------------------------------------------- -11 12 | -12 13 | -13 14 | # OK -14 |-X: "Tuple[int, int]" = (0, 0) - 15 |+X: Tuple[int, int] = (0, 0) +12 | +13 | +14 | # OK + - X: "Tuple[int, int]" = (0, 0) +15 + X: Tuple[int, int] = (0, 0) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap index e10f3761d3..93fe2fa475 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__add_future_annotation_UP037_2.pyi.snap @@ -10,16 +10,14 @@ UP037 [*] Remove quotes from type annotation | ^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove quotes - -ℹ Safe fix -1 1 | # https://github.com/astral-sh/ruff/issues/7102 -2 2 | -3 |-def f(a: Foo['SingleLine # Comment']): ... - 3 |+def f(a: Foo[(SingleLine # Comment - 4 |+)]): ... -4 5 | -5 6 | -6 7 | def f(a: Foo['''Bar[ +1 | # https://github.com/astral-sh/ruff/issues/7102 +2 | + - def f(a: Foo['SingleLine # Comment']): ... +3 + def f(a: Foo[(SingleLine # Comment +4 + )]): ... +5 | +6 | +7 | def f(a: Foo['''Bar[ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:6:14 @@ -31,19 +29,17 @@ UP037 [*] Remove quotes from type annotation | |____________^ | help: Remove quotes - -ℹ Safe fix -3 3 | def f(a: Foo['SingleLine # Comment']): ... -4 4 | -5 5 | -6 |-def f(a: Foo['''Bar[ - 6 |+def f(a: Foo[Bar[ -7 7 | Multi | -8 |- Line]''']): ... - 8 |+ Line]]): ... -9 9 | -10 10 | -11 11 | def f(a: Foo['''Bar[ +3 | def f(a: Foo['SingleLine # Comment']): ... +4 | +5 | + - def f(a: Foo['''Bar[ +6 + def f(a: Foo[Bar[ +7 | Multi | + - Line]''']): ... +8 + Line]]): ... +9 | +10 | +11 | def f(a: Foo['''Bar[ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:11:14 @@ -56,20 +52,18 @@ UP037 [*] Remove quotes from type annotation | |____^ | help: Remove quotes - -ℹ Safe fix -8 8 | Line]''']): ... -9 9 | -10 10 | -11 |-def f(a: Foo['''Bar[ - 11 |+def f(a: Foo[Bar[ -12 12 | Multi | -13 13 | Line # Comment -14 |-]''']): ... - 14 |+]]): ... -15 15 | -16 16 | -17 17 | def f(a: Foo['''Bar[ +8 | Line]''']): ... +9 | +10 | + - def f(a: Foo['''Bar[ +11 + def f(a: Foo[Bar[ +12 | Multi | +13 | Line # Comment + - ]''']): ... +14 + ]]): ... +15 | +16 | +17 | def f(a: Foo['''Bar[ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:17:14 @@ -81,20 +75,18 @@ UP037 [*] Remove quotes from type annotation | |_______________________^ | help: Remove quotes - -ℹ Safe fix -14 14 | ]''']): ... -15 15 | -16 16 | -17 |-def f(a: Foo['''Bar[ - 17 |+def f(a: Foo[(Bar[ -18 18 | Multi | -19 |- Line] # Comment''']): ... - 19 |+ Line] # Comment - 20 |+)]): ... -20 21 | -21 22 | -22 23 | def f(a: Foo[''' +14 | ]''']): ... +15 | +16 | + - def f(a: Foo['''Bar[ +17 + def f(a: Foo[(Bar[ +18 | Multi | + - Line] # Comment''']): ... +19 + Line] # Comment +20 + )]): ... +21 | +22 | +23 | def f(a: Foo[''' UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:22:14 @@ -107,21 +99,19 @@ UP037 [*] Remove quotes from type annotation | |_______________________^ | help: Remove quotes - -ℹ Safe fix -19 19 | Line] # Comment''']): ... -20 20 | -21 21 | -22 |-def f(a: Foo[''' - 22 |+def f(a: Foo[( -23 23 | Bar[ -24 24 | Multi | -25 |- Line] # Comment''']): ... - 25 |+ Line] # Comment - 26 |+)]): ... -26 27 | -27 28 | -28 29 | def f(a: '''list[int] +19 | Line] # Comment''']): ... +20 | +21 | + - def f(a: Foo[''' +22 + def f(a: Foo[( +23 | Bar[ +24 | Multi | + - Line] # Comment''']): ... +25 + Line] # Comment +26 + )]): ... +27 | +28 | +29 | def f(a: '''list[int] UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:28:10 @@ -132,18 +122,16 @@ UP037 [*] Remove quotes from type annotation | |_______^ | help: Remove quotes - -ℹ Safe fix -25 25 | Line] # Comment''']): ... -26 26 | -27 27 | -28 |-def f(a: '''list[int] -29 |- ''' = []): ... - 28 |+def f(a: list[int] - 29 |+ = []): ... -30 30 | -31 31 | -32 32 | a: '''\\ +25 | Line] # Comment''']): ... +26 | +27 | + - def f(a: '''list[int] + - ''' = []): ... +28 + def f(a: list[int] +29 + = []): ... +30 | +31 | +32 | a: '''\\ UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:32:4 @@ -154,18 +142,16 @@ UP037 [*] Remove quotes from type annotation | |____________^ | help: Remove quotes - -ℹ Safe fix -29 29 | ''' = []): ... -30 30 | -31 31 | -32 |-a: '''\\ -33 |-list[int]''' = [42] - 32 |+a: (\ - 33 |+list[int]) = [42] -34 34 | -35 35 | -36 36 | def f(a: ''' +29 | ''' = []): ... +30 | +31 | + - a: '''\\ + - list[int]''' = [42] +32 + a: (\ +33 + list[int]) = [42] +34 | +35 | +36 | def f(a: ''' UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:36:10 @@ -177,19 +163,17 @@ UP037 [*] Remove quotes from type annotation | |_______^ | help: Remove quotes - -ℹ Safe fix -33 33 | list[int]''' = [42] -34 34 | -35 35 | -36 |-def f(a: ''' - 36 |+def f(a: -37 37 | list[int] -38 |- ''' = []): ... - 38 |+ = []): ... -39 39 | -40 40 | -41 41 | def f(a: Foo[''' +33 | list[int]''' = [42] +34 | +35 | + - def f(a: ''' +36 + def f(a: +37 | list[int] + - ''' = []): ... +38 + = []): ... +39 | +40 | +41 | def f(a: Foo[''' UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:41:14 @@ -204,23 +188,21 @@ UP037 [*] Remove quotes from type annotation | |___________________^ | help: Remove quotes - -ℹ Safe fix -38 38 | ''' = []): ... -39 39 | -40 40 | -41 |-def f(a: Foo[''' - 41 |+def f(a: Foo[( -42 42 | Bar -43 43 | [ -44 44 | Multi | -45 45 | Line -46 |- ] # Comment''']): ... - 46 |+ ] # Comment - 47 |+)]): ... -47 48 | -48 49 | -49 50 | a: '''list +38 | ''' = []): ... +39 | +40 | + - def f(a: Foo[''' +41 + def f(a: Foo[( +42 | Bar +43 | [ +44 | Multi | +45 | Line + - ] # Comment''']): ... +46 + ] # Comment +47 + )]): ... +48 | +49 | +50 | a: '''list UP037 [*] Remove quotes from type annotation --> UP037_2.pyi:49:4 @@ -231,12 +213,10 @@ UP037 [*] Remove quotes from type annotation | |________^ | help: Remove quotes - -ℹ Safe fix -46 46 | ] # Comment''']): ... -47 47 | -48 48 | -49 |-a: '''list -50 |-[int]''' = [42] - 49 |+a: (list - 50 |+[int]) = [42] +46 | ] # Comment''']): ... +47 | +48 | + - a: '''list + - [int]''' = [42] +49 + a: (list +50 + [int]) = [42] diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap index be9313bc3f..4f4d2ab057 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__async_timeout_error_alias_not_applied_py310.snap @@ -11,16 +11,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 11 | pass | help: Replace `socket.timeout` with builtin `TimeoutError` - -ℹ Safe fix -7 7 | -8 8 | try: -9 9 | pass -10 |-except socket.timeout: - 10 |+except TimeoutError: -11 11 | pass -12 12 | -13 13 | # Should NOT be in parentheses when replaced +7 | +8 | try: +9 | pass + - except socket.timeout: +10 + except TimeoutError: +11 | pass +12 | +13 | # Should NOT be in parentheses when replaced UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:22:8 @@ -32,16 +30,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 23 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -19 19 | -20 20 | try: -21 21 | pass -22 |-except (socket.timeout,): - 22 |+except TimeoutError: -23 23 | pass -24 24 | -25 25 | try: +19 | +20 | try: +21 | pass + - except (socket.timeout,): +22 + except TimeoutError: +23 | pass +24 | +25 | try: UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:27:8 @@ -53,16 +49,14 @@ UP041 [*] Replace aliased errors with `TimeoutError` 28 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -24 24 | -25 25 | try: -26 26 | pass -27 |-except (asyncio.TimeoutError, socket.timeout,): - 27 |+except (TimeoutError, asyncio.TimeoutError): -28 28 | pass -29 29 | -30 30 | # Should be kept in parentheses (because multiple) +24 | +25 | try: +26 | pass + - except (asyncio.TimeoutError, socket.timeout,): +27 + except (TimeoutError, asyncio.TimeoutError): +28 | pass +29 | +30 | # Should be kept in parentheses (because multiple) UP041 [*] Replace aliased errors with `TimeoutError` --> UP041.py:34:8 @@ -74,13 +68,11 @@ UP041 [*] Replace aliased errors with `TimeoutError` 35 | pass | help: Replace with builtin `TimeoutError` - -ℹ Safe fix -31 31 | -32 32 | try: -33 33 | pass -34 |-except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError): - 34 |+except (asyncio.TimeoutError, KeyError, TimeoutError): -35 35 | pass -36 36 | -37 37 | # First should change, second should not +31 | +32 | try: +33 | pass + - except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError): +34 + except (asyncio.TimeoutError, KeyError, TimeoutError): +35 | pass +36 | +37 | # First should change, second should not diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap index d3293b6ea9..1f92bdb01b 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__datetime_utc_alias_py311.snap @@ -10,21 +10,19 @@ UP017 [*] Use `datetime.UTC` alias | ^^^^^^^^^^^^ | help: Convert to `datetime.UTC` alias - -ℹ Safe fix - 1 |+from datetime import UTC -1 2 | def func(): -2 3 | import datetime -3 4 | +1 + from datetime import UTC +2 | def func(): +3 | import datetime +4 | -------------------------------------------------------------------------------- -7 8 | def func(): -8 9 | from datetime import timezone -9 10 | -10 |- print(timezone.utc) - 11 |+ print(UTC) -11 12 | -12 13 | -13 14 | def func(): +8 | def func(): +9 | from datetime import timezone +10 | + - print(timezone.utc) +11 + print(UTC) +12 | +13 | +14 | def func(): UP017 [*] Use `datetime.UTC` alias --> UP017.py:16:11 @@ -35,21 +33,19 @@ UP017 [*] Use `datetime.UTC` alias | ^^^^^^ | help: Convert to `datetime.UTC` alias - -ℹ Safe fix - 1 |+from datetime import UTC -1 2 | def func(): -2 3 | import datetime -3 4 | +1 + from datetime import UTC +2 | def func(): +3 | import datetime +4 | -------------------------------------------------------------------------------- -13 14 | def func(): -14 15 | from datetime import timezone as tz -15 16 | -16 |- print(tz.utc) - 17 |+ print(UTC) -17 18 | -18 19 | -19 20 | def func(): +14 | def func(): +15 | from datetime import timezone as tz +16 | + - print(tz.utc) +17 + print(UTC) +18 | +19 | +20 | def func(): UP017 [*] Use `datetime.UTC` alias --> UP017.py:22:11 @@ -60,16 +56,14 @@ UP017 [*] Use `datetime.UTC` alias | ^^^^^^^^^^^^^^^^^^^^^ | help: Convert to `datetime.UTC` alias - -ℹ Safe fix -19 19 | def func(): -20 20 | import datetime -21 21 | -22 |- print(datetime.timezone.utc) - 22 |+ print(datetime.UTC) -23 23 | -24 24 | -25 25 | def func(): +19 | def func(): +20 | import datetime +21 | + - print(datetime.timezone.utc) +22 + print(datetime.UTC) +23 | +24 | +25 | def func(): UP017 [*] Use `datetime.UTC` alias --> UP017.py:28:11 @@ -80,10 +74,8 @@ UP017 [*] Use `datetime.UTC` alias | ^^^^^^^^^^^^^^^ | help: Convert to `datetime.UTC` alias - -ℹ Safe fix -25 25 | def func(): -26 26 | import datetime as dt -27 27 | -28 |- print(dt.timezone.utc) - 28 |+ print(dt.UTC) +25 | def func(): +26 | import datetime as dt +27 | + - print(dt.timezone.utc) +28 + print(dt.UTC) diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap index 6721f49726..6841e62ff9 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_keep_runtime_typing_p310.snap @@ -10,16 +10,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 36 | y.append(x) | help: Replace with `list` - -ℹ Safe fix -31 31 | return cls(x=0, y=0) -32 32 | -33 33 | -34 |-def f(x: int) -> List[int]: - 34 |+def f(x: int) -> list[int]: -35 35 | y = List[int]() -36 36 | y.append(x) -37 37 | return y +31 | return cls(x=0, y=0) +32 | +33 | + - def f(x: int) -> List[int]: +34 + def f(x: int) -> list[int]: +35 | y = List[int]() +36 | y.append(x) +37 | return y UP006 [*] Use `list` instead of `List` for type annotation --> future_annotations.py:35:9 @@ -31,16 +29,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 37 | return y | help: Replace with `list` - -ℹ Safe fix -32 32 | -33 33 | -34 34 | def f(x: int) -> List[int]: -35 |- y = List[int]() - 35 |+ y = list[int]() -36 36 | y.append(x) -37 37 | return y -38 38 | +32 | +33 | +34 | def f(x: int) -> List[int]: + - y = List[int]() +35 + y = list[int]() +36 | y.append(x) +37 | return y +38 | UP006 [*] Use `list` instead of `List` for type annotation --> future_annotations.py:42:27 @@ -51,13 +47,11 @@ UP006 [*] Use `list` instead of `List` for type annotation | ^^^^ | help: Replace with `list` - -ℹ Safe fix -39 39 | -40 40 | x: Optional[int] = None -41 41 | -42 |-MyList: TypeAlias = Union[List[int], List[str]] - 42 |+MyList: TypeAlias = Union[list[int], List[str]] +39 | +40 | x: Optional[int] = None +41 | + - MyList: TypeAlias = Union[List[int], List[str]] +42 + MyList: TypeAlias = Union[list[int], List[str]] UP006 [*] Use `list` instead of `List` for type annotation --> future_annotations.py:42:38 @@ -68,10 +62,8 @@ UP006 [*] Use `list` instead of `List` for type annotation | ^^^^ | help: Replace with `list` - -ℹ Safe fix -39 39 | -40 40 | x: Optional[int] = None -41 41 | -42 |-MyList: TypeAlias = Union[List[int], List[str]] - 42 |+MyList: TypeAlias = Union[List[int], list[str]] +39 | +40 | x: Optional[int] = None +41 | + - MyList: TypeAlias = Union[List[int], List[str]] +42 + MyList: TypeAlias = Union[List[int], list[str]] diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap index 0958d4f9ed..45d9d11dab 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_p37.snap @@ -10,13 +10,12 @@ UP006 [*] Use `list` instead of `List` for type annotation 36 | y.append(x) | help: Replace with `list` - -ℹ Unsafe fix -31 31 | return cls(x=0, y=0) -32 32 | -33 33 | -34 |-def f(x: int) -> List[int]: - 34 |+def f(x: int) -> list[int]: -35 35 | y = List[int]() -36 36 | y.append(x) -37 37 | return y +31 | return cls(x=0, y=0) +32 | +33 | + - def f(x: int) -> List[int]: +34 + def f(x: int) -> list[int]: +35 | y = List[int]() +36 | y.append(x) +37 | return y +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap index 6721f49726..6841e62ff9 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_585_py310.snap @@ -10,16 +10,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 36 | y.append(x) | help: Replace with `list` - -ℹ Safe fix -31 31 | return cls(x=0, y=0) -32 32 | -33 33 | -34 |-def f(x: int) -> List[int]: - 34 |+def f(x: int) -> list[int]: -35 35 | y = List[int]() -36 36 | y.append(x) -37 37 | return y +31 | return cls(x=0, y=0) +32 | +33 | + - def f(x: int) -> List[int]: +34 + def f(x: int) -> list[int]: +35 | y = List[int]() +36 | y.append(x) +37 | return y UP006 [*] Use `list` instead of `List` for type annotation --> future_annotations.py:35:9 @@ -31,16 +29,14 @@ UP006 [*] Use `list` instead of `List` for type annotation 37 | return y | help: Replace with `list` - -ℹ Safe fix -32 32 | -33 33 | -34 34 | def f(x: int) -> List[int]: -35 |- y = List[int]() - 35 |+ y = list[int]() -36 36 | y.append(x) -37 37 | return y -38 38 | +32 | +33 | +34 | def f(x: int) -> List[int]: + - y = List[int]() +35 + y = list[int]() +36 | y.append(x) +37 | return y +38 | UP006 [*] Use `list` instead of `List` for type annotation --> future_annotations.py:42:27 @@ -51,13 +47,11 @@ UP006 [*] Use `list` instead of `List` for type annotation | ^^^^ | help: Replace with `list` - -ℹ Safe fix -39 39 | -40 40 | x: Optional[int] = None -41 41 | -42 |-MyList: TypeAlias = Union[List[int], List[str]] - 42 |+MyList: TypeAlias = Union[list[int], List[str]] +39 | +40 | x: Optional[int] = None +41 | + - MyList: TypeAlias = Union[List[int], List[str]] +42 + MyList: TypeAlias = Union[list[int], List[str]] UP006 [*] Use `list` instead of `List` for type annotation --> future_annotations.py:42:38 @@ -68,10 +62,8 @@ UP006 [*] Use `list` instead of `List` for type annotation | ^^^^ | help: Replace with `list` - -ℹ Safe fix -39 39 | -40 40 | x: Optional[int] = None -41 41 | -42 |-MyList: TypeAlias = Union[List[int], List[str]] - 42 |+MyList: TypeAlias = Union[List[int], list[str]] +39 | +40 | x: Optional[int] = None +41 | + - MyList: TypeAlias = Union[List[int], List[str]] +42 + MyList: TypeAlias = Union[List[int], list[str]] diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap index 51b92eec81..006f551cf3 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_p37.snap @@ -10,12 +10,11 @@ UP045 [*] Use `X | None` for type annotations 42 | MyList: TypeAlias = Union[List[int], List[str]] | help: Convert to `X | None` - -ℹ Unsafe fix -37 37 | return y -38 38 | -39 39 | -40 |-x: Optional[int] = None - 40 |+x: int | None = None -41 41 | -42 42 | MyList: TypeAlias = Union[List[int], List[str]] +37 | return y +38 | +39 | + - x: Optional[int] = None +40 + x: int | None = None +41 | +42 | MyList: TypeAlias = Union[List[int], List[str]] +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap index dffe011bc4..459cd642a6 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__future_annotations_pep_604_py310.snap @@ -10,15 +10,13 @@ UP045 [*] Use `X | None` for type annotations 42 | MyList: TypeAlias = Union[List[int], List[str]] | help: Convert to `X | None` - -ℹ Safe fix -37 37 | return y -38 38 | -39 39 | -40 |-x: Optional[int] = None - 40 |+x: int | None = None -41 41 | -42 42 | MyList: TypeAlias = Union[List[int], List[str]] +37 | return y +38 | +39 | + - x: Optional[int] = None +40 + x: int | None = None +41 | +42 | MyList: TypeAlias = Union[List[int], List[str]] UP007 [*] Use `X | Y` for type annotations --> future_annotations.py:42:21 @@ -29,10 +27,8 @@ UP007 [*] Use `X | Y` for type annotations | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to `X | Y` - -ℹ Safe fix -39 39 | -40 40 | x: Optional[int] = None -41 41 | -42 |-MyList: TypeAlias = Union[List[int], List[str]] - 42 |+MyList: TypeAlias = List[int] | List[str] +39 | +40 | x: Optional[int] = None +41 | + - MyList: TypeAlias = Union[List[int], List[str]] +42 + MyList: TypeAlias = List[int] | List[str] diff --git a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap index d87e952262..c9a6b5d388 100644 --- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap +++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__unpack_pep_646_py311.snap @@ -9,16 +9,15 @@ UP044 [*] Use `*` for unpacking 7 | pass | help: Convert to `*` for unpacking - -ℹ Unsafe fix -3 3 | Shape = TypeVarTuple("Shape") -4 4 | -5 5 | -6 |-class C(Generic[Unpack[Shape]]): - 6 |+class C(Generic[*Shape]): -7 7 | pass -8 8 | -9 9 | +3 | Shape = TypeVarTuple("Shape") +4 | +5 | + - class C(Generic[Unpack[Shape]]): +6 + class C(Generic[*Shape]): +7 | pass +8 | +9 | +note: This is an unsafe fix and may change runtime behavior UP044 [*] Use `*` for unpacking --> UP044.py:10:17 @@ -28,16 +27,15 @@ UP044 [*] Use `*` for unpacking 11 | pass | help: Convert to `*` for unpacking - -ℹ Unsafe fix -7 7 | pass -8 8 | -9 9 | -10 |-class D(Generic[Unpack[Shape]]): - 10 |+class D(Generic[*Shape]): -11 11 | pass -12 12 | -13 13 | +7 | pass +8 | +9 | + - class D(Generic[Unpack[Shape]]): +10 + class D(Generic[*Shape]): +11 | pass +12 | +13 | +note: This is an unsafe fix and may change runtime behavior UP044 [*] Use `*` for unpacking --> UP044.py:14:14 @@ -47,16 +45,15 @@ UP044 [*] Use `*` for unpacking 15 | pass | help: Convert to `*` for unpacking - -ℹ Unsafe fix -11 11 | pass -12 12 | -13 13 | -14 |-def f(*args: Unpack[tuple[int, ...]]): - 14 |+def f(*args: *tuple[int, ...]): -15 15 | pass -16 16 | -17 17 | +11 | pass +12 | +13 | + - def f(*args: Unpack[tuple[int, ...]]): +14 + def f(*args: *tuple[int, ...]): +15 | pass +16 | +17 | +note: This is an unsafe fix and may change runtime behavior UP044 [*] Use `*` for unpacking --> UP044.py:18:14 @@ -66,16 +63,15 @@ UP044 [*] Use `*` for unpacking 19 | pass | help: Convert to `*` for unpacking - -ℹ Unsafe fix -15 15 | pass -16 16 | -17 17 | -18 |-def f(*args: Unpack[other.Type]): - 18 |+def f(*args: *other.Type): -19 19 | pass -20 20 | -21 21 | +15 | pass +16 | +17 | + - def f(*args: Unpack[other.Type]): +18 + def f(*args: *other.Type): +19 | pass +20 | +21 | +note: This is an unsafe fix and may change runtime behavior UP044 [*] Use `*` for unpacking --> UP044.py:22:27 @@ -85,13 +81,12 @@ UP044 [*] Use `*` for unpacking 23 | pass | help: Convert to `*` for unpacking - -ℹ Unsafe fix -19 19 | pass -20 20 | -21 21 | -22 |-def f(*args: Generic[int, Unpack[int]]): - 22 |+def f(*args: Generic[int, *int]): -23 23 | pass -24 24 | -25 25 | +19 | pass +20 | +21 | + - def f(*args: Generic[int, Unpack[int]]): +22 + def f(*args: Generic[int, *int]): +23 | pass +24 | +25 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap index 7896595ffa..e258e208cb 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB105_FURB105.py.snap @@ -12,15 +12,13 @@ FURB105 [*] Unnecessary empty string passed to `print` 5 | print("", end="bar") | help: Remove empty string - -ℹ Safe fix -1 1 | # Errors. -2 2 | -3 |-print("") - 3 |+print() -4 4 | print("", sep=",") -5 5 | print("", end="bar") -6 6 | print("", sep=",", end="bar") +1 | # Errors. +2 | + - print("") +3 + print() +4 | print("", sep=",") +5 | print("", end="bar") +6 | print("", sep=",", end="bar") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:4:1 @@ -32,16 +30,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 6 | print("", sep=",", end="bar") | help: Remove empty string and separator - -ℹ Safe fix -1 1 | # Errors. -2 2 | -3 3 | print("") -4 |-print("", sep=",") - 4 |+print() -5 5 | print("", end="bar") -6 6 | print("", sep=",", end="bar") -7 7 | print(sep="") +1 | # Errors. +2 | +3 | print("") + - print("", sep=",") +4 + print() +5 | print("", end="bar") +6 | print("", sep=",", end="bar") +7 | print(sep="") FURB105 [*] Unnecessary empty string passed to `print` --> FURB105.py:5:1 @@ -54,16 +50,14 @@ FURB105 [*] Unnecessary empty string passed to `print` 7 | print(sep="") | help: Remove empty string - -ℹ Safe fix -2 2 | -3 3 | print("") -4 4 | print("", sep=",") -5 |-print("", end="bar") - 5 |+print(end="bar") -6 6 | print("", sep=",", end="bar") -7 7 | print(sep="") -8 8 | print("", sep="") +2 | +3 | print("") +4 | print("", sep=",") + - print("", end="bar") +5 + print(end="bar") +6 | print("", sep=",", end="bar") +7 | print(sep="") +8 | print("", sep="") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:6:1 @@ -76,16 +70,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 8 | print("", sep="") | help: Remove empty string and separator - -ℹ Safe fix -3 3 | print("") -4 4 | print("", sep=",") -5 5 | print("", end="bar") -6 |-print("", sep=",", end="bar") - 6 |+print(end="bar") -7 7 | print(sep="") -8 8 | print("", sep="") -9 9 | print("", "", sep="") +3 | print("") +4 | print("", sep=",") +5 | print("", end="bar") + - print("", sep=",", end="bar") +6 + print(end="bar") +7 | print(sep="") +8 | print("", sep="") +9 | print("", "", sep="") FURB105 [*] Unnecessary separator passed to `print` --> FURB105.py:7:1 @@ -98,16 +90,14 @@ FURB105 [*] Unnecessary separator passed to `print` 9 | print("", "", sep="") | help: Remove separator - -ℹ Safe fix -4 4 | print("", sep=",") -5 5 | print("", end="bar") -6 6 | print("", sep=",", end="bar") -7 |-print(sep="") - 7 |+print() -8 8 | print("", sep="") -9 9 | print("", "", sep="") -10 10 | print("", "", sep="", end="") +4 | print("", sep=",") +5 | print("", end="bar") +6 | print("", sep=",", end="bar") + - print(sep="") +7 + print() +8 | print("", sep="") +9 | print("", "", sep="") +10 | print("", "", sep="", end="") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:8:1 @@ -120,16 +110,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 10 | print("", "", sep="", end="") | help: Remove empty string and separator - -ℹ Safe fix -5 5 | print("", end="bar") -6 6 | print("", sep=",", end="bar") -7 7 | print(sep="") -8 |-print("", sep="") - 8 |+print() -9 9 | print("", "", sep="") -10 10 | print("", "", sep="", end="") -11 11 | print("", "", sep="", end="bar") +5 | print("", end="bar") +6 | print("", sep=",", end="bar") +7 | print(sep="") + - print("", sep="") +8 + print() +9 | print("", "", sep="") +10 | print("", "", sep="", end="") +11 | print("", "", sep="", end="bar") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:9:1 @@ -142,16 +130,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 11 | print("", "", sep="", end="bar") | help: Remove empty string and separator - -ℹ Safe fix -6 6 | print("", sep=",", end="bar") -7 7 | print(sep="") -8 8 | print("", sep="") -9 |-print("", "", sep="") - 9 |+print() -10 10 | print("", "", sep="", end="") -11 11 | print("", "", sep="", end="bar") -12 12 | print("", sep="", end="bar") +6 | print("", sep=",", end="bar") +7 | print(sep="") +8 | print("", sep="") + - print("", "", sep="") +9 + print() +10 | print("", "", sep="", end="") +11 | print("", "", sep="", end="bar") +12 | print("", sep="", end="bar") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:10:1 @@ -164,16 +150,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 12 | print("", sep="", end="bar") | help: Remove empty string and separator - -ℹ Safe fix -7 7 | print(sep="") -8 8 | print("", sep="") -9 9 | print("", "", sep="") -10 |-print("", "", sep="", end="") - 10 |+print(end="") -11 11 | print("", "", sep="", end="bar") -12 12 | print("", sep="", end="bar") -13 13 | print(sep="", end="bar") +7 | print(sep="") +8 | print("", sep="") +9 | print("", "", sep="") + - print("", "", sep="", end="") +10 + print(end="") +11 | print("", "", sep="", end="bar") +12 | print("", sep="", end="bar") +13 | print(sep="", end="bar") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:11:1 @@ -186,16 +170,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 13 | print(sep="", end="bar") | help: Remove empty string and separator - -ℹ Safe fix -8 8 | print("", sep="") -9 9 | print("", "", sep="") -10 10 | print("", "", sep="", end="") -11 |-print("", "", sep="", end="bar") - 11 |+print(end="bar") -12 12 | print("", sep="", end="bar") -13 13 | print(sep="", end="bar") -14 14 | print("", "foo", sep="") +8 | print("", sep="") +9 | print("", "", sep="") +10 | print("", "", sep="", end="") + - print("", "", sep="", end="bar") +11 + print(end="bar") +12 | print("", sep="", end="bar") +13 | print(sep="", end="bar") +14 | print("", "foo", sep="") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:12:1 @@ -208,16 +190,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 14 | print("", "foo", sep="") | help: Remove empty string and separator - -ℹ Safe fix -9 9 | print("", "", sep="") -10 10 | print("", "", sep="", end="") -11 11 | print("", "", sep="", end="bar") -12 |-print("", sep="", end="bar") - 12 |+print(end="bar") -13 13 | print(sep="", end="bar") -14 14 | print("", "foo", sep="") -15 15 | print("foo", "", sep="") +9 | print("", "", sep="") +10 | print("", "", sep="", end="") +11 | print("", "", sep="", end="bar") + - print("", sep="", end="bar") +12 + print(end="bar") +13 | print(sep="", end="bar") +14 | print("", "foo", sep="") +15 | print("foo", "", sep="") FURB105 [*] Unnecessary separator passed to `print` --> FURB105.py:13:1 @@ -230,16 +210,14 @@ FURB105 [*] Unnecessary separator passed to `print` 15 | print("foo", "", sep="") | help: Remove separator - -ℹ Safe fix -10 10 | print("", "", sep="", end="") -11 11 | print("", "", sep="", end="bar") -12 12 | print("", sep="", end="bar") -13 |-print(sep="", end="bar") - 13 |+print(end="bar") -14 14 | print("", "foo", sep="") -15 15 | print("foo", "", sep="") -16 16 | print("foo", "", "bar", sep="") +10 | print("", "", sep="", end="") +11 | print("", "", sep="", end="bar") +12 | print("", sep="", end="bar") + - print(sep="", end="bar") +13 + print(end="bar") +14 | print("", "foo", sep="") +15 | print("foo", "", sep="") +16 | print("foo", "", "bar", sep="") FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:14:1 @@ -252,16 +230,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 16 | print("foo", "", "bar", sep="") | help: Remove empty string and separator - -ℹ Safe fix -11 11 | print("", "", sep="", end="bar") -12 12 | print("", sep="", end="bar") -13 13 | print(sep="", end="bar") -14 |-print("", "foo", sep="") - 14 |+print("foo") -15 15 | print("foo", "", sep="") -16 16 | print("foo", "", "bar", sep="") -17 17 | print("", *args) +11 | print("", "", sep="", end="bar") +12 | print("", sep="", end="bar") +13 | print(sep="", end="bar") + - print("", "foo", sep="") +14 + print("foo") +15 | print("foo", "", sep="") +16 | print("foo", "", "bar", sep="") +17 | print("", *args) FURB105 [*] Unnecessary empty string and separator passed to `print` --> FURB105.py:15:1 @@ -274,16 +250,14 @@ FURB105 [*] Unnecessary empty string and separator passed to `print` 17 | print("", *args) | help: Remove empty string and separator - -ℹ Safe fix -12 12 | print("", sep="", end="bar") -13 13 | print(sep="", end="bar") -14 14 | print("", "foo", sep="") -15 |-print("foo", "", sep="") - 15 |+print("foo") -16 16 | print("foo", "", "bar", sep="") -17 17 | print("", *args) -18 18 | print("", *args, sep="") +12 | print("", sep="", end="bar") +13 | print(sep="", end="bar") +14 | print("", "foo", sep="") + - print("foo", "", sep="") +15 + print("foo") +16 | print("foo", "", "bar", sep="") +17 | print("", *args) +18 | print("", *args, sep="") FURB105 [*] Unnecessary empty string passed to `print` --> FURB105.py:16:1 @@ -296,16 +270,14 @@ FURB105 [*] Unnecessary empty string passed to `print` 18 | print("", *args, sep="") | help: Remove empty string - -ℹ Safe fix -13 13 | print(sep="", end="bar") -14 14 | print("", "foo", sep="") -15 15 | print("foo", "", sep="") -16 |-print("foo", "", "bar", sep="") - 16 |+print("foo", "bar", sep="") -17 17 | print("", *args) -18 18 | print("", *args, sep="") -19 19 | print("", **kwargs) +13 | print(sep="", end="bar") +14 | print("", "foo", sep="") +15 | print("foo", "", sep="") + - print("foo", "", "bar", sep="") +16 + print("foo", "bar", sep="") +17 | print("", *args) +18 | print("", *args, sep="") +19 | print("", **kwargs) FURB105 [*] Unnecessary empty string passed to `print` --> FURB105.py:18:1 @@ -318,16 +290,14 @@ FURB105 [*] Unnecessary empty string passed to `print` 20 | print(sep="\t") | help: Remove empty string - -ℹ Safe fix -15 15 | print("foo", "", sep="") -16 16 | print("foo", "", "bar", sep="") -17 17 | print("", *args) -18 |-print("", *args, sep="") - 18 |+print(*args, sep="") -19 19 | print("", **kwargs) -20 20 | print(sep="\t") -21 21 | print(sep=print(1)) +15 | print("foo", "", sep="") +16 | print("foo", "", "bar", sep="") +17 | print("", *args) + - print("", *args, sep="") +18 + print(*args, sep="") +19 | print("", **kwargs) +20 | print(sep="\t") +21 | print(sep=print(1)) FURB105 [*] Unnecessary empty string passed to `print` --> FURB105.py:19:1 @@ -340,16 +310,14 @@ FURB105 [*] Unnecessary empty string passed to `print` 21 | print(sep=print(1)) | help: Remove empty string - -ℹ Safe fix -16 16 | print("foo", "", "bar", sep="") -17 17 | print("", *args) -18 18 | print("", *args, sep="") -19 |-print("", **kwargs) - 19 |+print(**kwargs) -20 20 | print(sep="\t") -21 21 | print(sep=print(1)) -22 22 | +16 | print("foo", "", "bar", sep="") +17 | print("", *args) +18 | print("", *args, sep="") + - print("", **kwargs) +19 + print(**kwargs) +20 | print(sep="\t") +21 | print(sep=print(1)) +22 | FURB105 [*] Unnecessary separator passed to `print` --> FURB105.py:20:1 @@ -361,16 +329,14 @@ FURB105 [*] Unnecessary separator passed to `print` 21 | print(sep=print(1)) | help: Remove separator - -ℹ Safe fix -17 17 | print("", *args) -18 18 | print("", *args, sep="") -19 19 | print("", **kwargs) -20 |-print(sep="\t") - 20 |+print() -21 21 | print(sep=print(1)) -22 22 | -23 23 | # OK. +17 | print("", *args) +18 | print("", *args, sep="") +19 | print("", **kwargs) + - print(sep="\t") +20 + print() +21 | print(sep=print(1)) +22 | +23 | # OK. FURB105 [*] Unnecessary separator passed to `print` --> FURB105.py:21:1 @@ -383,13 +349,12 @@ FURB105 [*] Unnecessary separator passed to `print` 23 | # OK. | help: Remove separator - -ℹ Unsafe fix -18 18 | print("", *args, sep="") -19 19 | print("", **kwargs) -20 20 | print(sep="\t") -21 |-print(sep=print(1)) - 21 |+print() -22 22 | -23 23 | # OK. -24 24 | +18 | print("", *args, sep="") +19 | print("", **kwargs) +20 | print(sep="\t") + - print(sep=print(1)) +21 + print() +22 | +23 | # OK. +24 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap index 5ef02ebcf2..44eef8b8ff 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB110_FURB110.py.snap @@ -10,13 +10,11 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 3 | z = x \ | help: Replace with `or` operator - -ℹ Safe fix -1 |-z = x if x else y # FURB110 - 1 |+z = x or y # FURB110 -2 2 | -3 3 | z = x \ -4 4 | if x else y # FURB110 + - z = x if x else y # FURB110 +1 + z = x or y # FURB110 +2 | +3 | z = x \ +4 | if x else y # FURB110 FURB110 [*] Replace ternary `if` expression with `or` operator --> FURB110.py:3:5 @@ -31,16 +29,14 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 6 | z = x if x \ | help: Replace with `or` operator - -ℹ Safe fix -1 1 | z = x if x else y # FURB110 -2 2 | -3 |-z = x \ -4 |- if x else y # FURB110 - 3 |+z = x or y # FURB110 -5 4 | -6 5 | z = x if x \ -7 6 | else \ +1 | z = x if x else y # FURB110 +2 | + - z = x \ + - if x else y # FURB110 +3 + z = x or y # FURB110 +4 | +5 | z = x if x \ +6 | else \ FURB110 [*] Replace ternary `if` expression with `or` operator --> FURB110.py:6:5 @@ -56,18 +52,16 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 10 | z = x() if x() else y() # FURB110 | help: Replace with `or` operator - -ℹ Safe fix -3 3 | z = x \ -4 4 | if x else y # FURB110 -5 5 | -6 |-z = x if x \ -7 |- else \ -8 |- y # FURB110 - 6 |+z = x or y # FURB110 -9 7 | -10 8 | z = x() if x() else y() # FURB110 -11 9 | +3 | z = x \ +4 | if x else y # FURB110 +5 | + - z = x if x \ + - else \ + - y # FURB110 +6 + z = x or y # FURB110 +7 | +8 | z = x() if x() else y() # FURB110 +9 | FURB110 [*] Replace ternary `if` expression with `or` operator --> FURB110.py:10:5 @@ -80,16 +74,15 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 12 | # FURB110 | help: Replace with `or` operator - -ℹ Unsafe fix -7 7 | else \ -8 8 | y # FURB110 -9 9 | -10 |-z = x() if x() else y() # FURB110 - 10 |+z = x() or y() # FURB110 -11 11 | -12 12 | # FURB110 -13 13 | z = x if ( +7 | else \ +8 | y # FURB110 +9 | + - z = x() if x() else y() # FURB110 +10 + z = x() or y() # FURB110 +11 | +12 | # FURB110 +13 | z = x if ( +note: This is an unsafe fix and may change runtime behavior FURB110 [*] Replace ternary `if` expression with `or` operator --> FURB110.py:13:5 @@ -108,20 +101,18 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 21 | # FURB110 | help: Replace with `or` operator - -ℹ Safe fix -10 10 | z = x() if x() else y() # FURB110 -11 11 | -12 12 | # FURB110 -13 |-z = x if ( - 13 |+z = ( -14 14 | # Test for x. -15 15 | x -16 |-) else ( - 16 |+) or ( -17 17 | # Test for y. -18 18 | y -19 19 | ) +10 | z = x() if x() else y() # FURB110 +11 | +12 | # FURB110 + - z = x if ( +13 + z = ( +14 | # Test for x. +15 | x + - ) else ( +16 + ) or ( +17 | # Test for y. +18 | y +19 | ) FURB110 [*] Replace ternary `if` expression with `or` operator --> FURB110.py:23:5 @@ -139,20 +130,18 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 30 | ) | help: Replace with `or` operator - -ℹ Safe fix -20 20 | -21 21 | # FURB110 -22 22 | z = ( -23 |- x if ( - 23 |+ ( -24 24 | # Test for x. -25 25 | x -26 |- ) else ( - 26 |+ ) or ( -27 27 | # Test for y. -28 28 | y -29 29 | ) +20 | +21 | # FURB110 +22 | z = ( + - x if ( +23 + ( +24 | # Test for x. +25 | x + - ) else ( +26 + ) or ( +27 | # Test for y. +28 | y +29 | ) FURB110 [*] Replace ternary `if` expression with `or` operator --> FURB110.py:34:5 @@ -169,21 +158,19 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 40 | ) | help: Replace with `or` operator - -ℹ Safe fix -31 31 | -32 32 | # FURB110 -33 33 | z = ( -34 |- x if -35 |- # If true, use x. -36 |- x -37 |- # Otherwise, use y. -38 |- else -39 |- y - 34 |+ x or y -40 35 | ) -41 36 | -42 37 | # FURB110 +31 | +32 | # FURB110 +33 | z = ( + - x if + - # If true, use x. + - x + - # Otherwise, use y. + - else + - y +34 + x or y +35 | ) +36 | +37 | # FURB110 FURB110 [*] Replace ternary `if` expression with `or` operator --> FURB110.py:44:5 @@ -199,16 +186,14 @@ FURB110 [*] Replace ternary `if` expression with `or` operator 49 | ) | help: Replace with `or` operator - -ℹ Safe fix -41 41 | -42 42 | # FURB110 -43 43 | z = ( -44 |- x -45 |- if x -46 |- else y - 44 |+ x or (y -47 45 | if y > 0 -48 |- else None - 46 |+ else None) -49 47 | ) +41 | +42 | # FURB110 +43 | z = ( + - x + - if x + - else y +44 + x or (y +45 | if y > 0 + - else None +46 + else None) +47 | ) diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap index dae98919ee..e44c5ec453 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB113_FURB113.py.snap @@ -11,17 +11,16 @@ FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append 25 | pass | help: Replace with `nums.extend((1, 2))` - -ℹ Unsafe fix -20 20 | -21 21 | -22 22 | # FURB113 -23 |-nums.append(1) -24 |-nums.append(2) - 23 |+nums.extend((1, 2)) -25 24 | pass -26 25 | -27 26 | +20 | +21 | +22 | # FURB113 + - nums.append(1) + - nums.append(2) +23 + nums.extend((1, 2)) +24 | pass +25 | +26 | +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `nums3.extend((1, 2))` instead of repeatedly calling `nums3.append()` --> FURB113.py:29:1 @@ -33,17 +32,16 @@ FURB113 [*] Use `nums3.extend((1, 2))` instead of repeatedly calling `nums3.appe 31 | pass | help: Replace with `nums3.extend((1, 2))` - -ℹ Unsafe fix -26 26 | -27 27 | -28 28 | # FURB113 -29 |-nums3.append(1) -30 |-nums3.append(2) - 29 |+nums3.extend((1, 2)) -31 30 | pass -32 31 | -33 32 | +26 | +27 | +28 | # FURB113 + - nums3.append(1) + - nums3.append(2) +29 + nums3.extend((1, 2)) +30 | pass +31 | +32 | +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `nums4.extend((1, 2))` instead of repeatedly calling `nums4.append()` --> FURB113.py:35:1 @@ -55,17 +53,16 @@ FURB113 [*] Use `nums4.extend((1, 2))` instead of repeatedly calling `nums4.appe 37 | pass | help: Replace with `nums4.extend((1, 2))` - -ℹ Unsafe fix -32 32 | -33 33 | -34 34 | # FURB113 -35 |-nums4.append(1) -36 |-nums4.append(2) - 35 |+nums4.extend((1, 2)) -37 36 | pass -38 37 | -39 38 | +32 | +33 | +34 | # FURB113 + - nums4.append(1) + - nums4.append(2) +35 + nums4.extend((1, 2)) +36 | pass +37 | +38 | +note: This is an unsafe fix and may change runtime behavior FURB113 Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()` --> FURB113.py:41:1 @@ -124,17 +121,16 @@ FURB113 [*] Use `nums4.extend((1, 2))` instead of repeatedly calling `nums4.appe 59 | pass | help: Replace with `nums4.extend((1, 2))` - -ℹ Unsafe fix -53 53 | nums3.append(1) -54 54 | nums.append(3) -55 55 | # FURB113 -56 |-nums4.append(1) -57 |-nums4.append(2) - 56 |+nums4.extend((1, 2)) -58 57 | nums3.append(2) -59 58 | pass -60 59 | +53 | nums3.append(1) +54 | nums.append(3) +55 | # FURB113 + - nums4.append(1) + - nums4.append(2) +56 + nums4.extend((1, 2)) +57 | nums3.append(2) +58 | pass +59 | +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()` --> FURB113.py:62:1 @@ -146,18 +142,17 @@ FURB113 [*] Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.app | |______________^ | help: Replace with `nums.extend((1, 2, 3))` - -ℹ Unsafe fix -59 59 | pass -60 60 | -61 61 | # FURB113 -62 |-nums.append(1) -63 |-nums.append(2) -64 |-nums.append(3) - 62 |+nums.extend((1, 2, 3)) -65 63 | -66 64 | -67 65 | if True: +59 | pass +60 | +61 | # FURB113 + - nums.append(1) + - nums.append(2) + - nums.append(3) +62 + nums.extend((1, 2, 3)) +63 | +64 | +65 | if True: +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append()` --> FURB113.py:69:5 @@ -169,17 +164,16 @@ FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append | |__________________^ | help: Replace with `nums.extend((1, 2))` - -ℹ Unsafe fix -66 66 | -67 67 | if True: -68 68 | # FURB113 -69 |- nums.append(1) -70 |- nums.append(2) - 69 |+ nums.extend((1, 2)) -71 70 | -72 71 | -73 72 | if True: +66 | +67 | if True: +68 | # FURB113 + - nums.append(1) + - nums.append(2) +69 + nums.extend((1, 2)) +70 | +71 | +72 | if True: +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append()` --> FURB113.py:75:5 @@ -192,17 +186,16 @@ FURB113 [*] Use `nums.extend((1, 2))` instead of repeatedly calling `nums.append 77 | pass | help: Replace with `nums.extend((1, 2))` - -ℹ Unsafe fix -72 72 | -73 73 | if True: -74 74 | # FURB113 -75 |- nums.append(1) -76 |- nums.append(2) - 75 |+ nums.extend((1, 2)) -77 76 | pass -78 77 | -79 78 | +72 | +73 | if True: +74 | # FURB113 + - nums.append(1) + - nums.append(2) +75 + nums.extend((1, 2)) +76 | pass +77 | +78 | +note: This is an unsafe fix and may change runtime behavior FURB113 Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()` --> FURB113.py:82:5 @@ -227,17 +220,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` | |_______________^ | help: Replace with `x.extend((1, 2))` - -ℹ Unsafe fix -87 87 | -88 88 | def yes_one(x: list[int]): -89 89 | # FURB113 -90 |- x.append(1) -91 |- x.append(2) - 90 |+ x.extend((1, 2)) -92 91 | -93 92 | -94 93 | def yes_two(x: List[int]): +87 | +88 | def yes_one(x: list[int]): +89 | # FURB113 + - x.append(1) + - x.append(2) +90 + x.extend((1, 2)) +91 | +92 | +93 | def yes_two(x: List[int]): +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` --> FURB113.py:96:5 @@ -249,17 +241,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` | |_______________^ | help: Replace with `x.extend((1, 2))` - -ℹ Unsafe fix -93 93 | -94 94 | def yes_two(x: List[int]): -95 95 | # FURB113 -96 |- x.append(1) -97 |- x.append(2) - 96 |+ x.extend((1, 2)) -98 97 | -99 98 | -100 99 | def yes_three(*, x: list[int]): +93 | +94 | def yes_two(x: List[int]): +95 | # FURB113 + - x.append(1) + - x.append(2) +96 + x.extend((1, 2)) +97 | +98 | +99 | def yes_three(*, x: list[int]): +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` --> FURB113.py:102:5 @@ -271,17 +262,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` | |_______________^ | help: Replace with `x.extend((1, 2))` - -ℹ Unsafe fix -99 99 | -100 100 | def yes_three(*, x: list[int]): -101 101 | # FURB113 -102 |- x.append(1) -103 |- x.append(2) - 102 |+ x.extend((1, 2)) -104 103 | -105 104 | -106 105 | def yes_four(x: list[int], /): +99 | +100 | def yes_three(*, x: list[int]): +101 | # FURB113 + - x.append(1) + - x.append(2) +102 + x.extend((1, 2)) +103 | +104 | +105 | def yes_four(x: list[int], /): +note: This is an unsafe fix and may change runtime behavior FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` --> FURB113.py:108:5 @@ -293,17 +283,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` | |_______________^ | help: Replace with `x.extend((1, 2))` - -ℹ Unsafe fix -105 105 | -106 106 | def yes_four(x: list[int], /): -107 107 | # FURB113 -108 |- x.append(1) -109 |- x.append(2) - 108 |+ x.extend((1, 2)) -110 109 | -111 110 | -112 111 | def yes_five(x: list[int], y: list[int]): +105 | +106 | def yes_four(x: list[int], /): +107 | # FURB113 + - x.append(1) + - x.append(2) +108 + x.extend((1, 2)) +109 | +110 | +111 | def yes_five(x: list[int], y: list[int]): +note: This is an unsafe fix and may change runtime behavior FURB113 Use `x.extend((1, 2, 3))` instead of repeatedly calling `x.append()` --> FURB113.py:114:5 @@ -328,17 +317,16 @@ FURB113 [*] Use `x.extend((1, 2))` instead of repeatedly calling `x.append()` | |_______________^ | help: Replace with `x.extend((1, 2))` - -ℹ Unsafe fix -119 119 | -120 120 | def yes_six(x: list): -121 121 | # FURB113 -122 |- x.append(1) -123 |- x.append(2) - 122 |+ x.extend((1, 2)) -124 123 | -125 124 | -126 125 | if True: +119 | +120 | def yes_six(x: list): +121 | # FURB113 + - x.append(1) + - x.append(2) +122 + x.extend((1, 2)) +123 | +124 | +125 | if True: +note: This is an unsafe fix and may change runtime behavior FURB113 Use `nums.extend((1, 2, 3))` instead of repeatedly calling `nums.append()` --> FURB113.py:128:5 diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap index 803fd4aec3..83cab7c6ad 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB116_FURB116.py.snap @@ -12,16 +12,15 @@ FURB116 Replace `oct` call with `f"{num:o}"` 11 | print(bin(num)[2:]) # FURB116 | help: Replace with `f"{num:o}"` - -ℹ Display-only fix -6 6 | def return_num() -> int: -7 7 | return num -8 8 | -9 |-print(oct(num)[2:]) # FURB116 - 9 |+print(f"{num:o}") # FURB116 -10 10 | print(hex(num)[2:]) # FURB116 -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | +6 | def return_num() -> int: +7 | return num +8 | + - print(oct(num)[2:]) # FURB116 +9 + print(f"{num:o}") # FURB116 +10 | print(hex(num)[2:]) # FURB116 +11 | print(bin(num)[2:]) # FURB116 +12 | +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `hex` call with `f"{num:x}"` --> FURB116.py:10:7 @@ -32,16 +31,15 @@ FURB116 Replace `hex` call with `f"{num:x}"` 11 | print(bin(num)[2:]) # FURB116 | help: Replace with `f"{num:x}"` - -ℹ Display-only fix -7 7 | return num -8 8 | -9 9 | print(oct(num)[2:]) # FURB116 -10 |-print(hex(num)[2:]) # FURB116 - 10 |+print(f"{num:x}") # FURB116 -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 +7 | return num +8 | +9 | print(oct(num)[2:]) # FURB116 + - print(hex(num)[2:]) # FURB116 +10 + print(f"{num:x}") # FURB116 +11 | print(bin(num)[2:]) # FURB116 +12 | +13 | print(oct(1337)[2:]) # FURB116 +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with `f"{num:b}"` --> FURB116.py:11:7 @@ -54,16 +52,15 @@ FURB116 Replace `bin` call with `f"{num:b}"` 13 | print(oct(1337)[2:]) # FURB116 | help: Replace with `f"{num:b}"` - -ℹ Display-only fix -8 8 | -9 9 | print(oct(num)[2:]) # FURB116 -10 10 | print(hex(num)[2:]) # FURB116 -11 |-print(bin(num)[2:]) # FURB116 - 11 |+print(f"{num:b}") # FURB116 -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 +8 | +9 | print(oct(num)[2:]) # FURB116 +10 | print(hex(num)[2:]) # FURB116 + - print(bin(num)[2:]) # FURB116 +11 + print(f"{num:b}") # FURB116 +12 | +13 | print(oct(1337)[2:]) # FURB116 +14 | print(hex(1337)[2:]) # FURB116 +note: This is a display-only fix and is likely to be incorrect FURB116 [*] Replace `oct` call with `f"{1337:o}"` --> FURB116.py:13:7 @@ -76,16 +73,14 @@ FURB116 [*] Replace `oct` call with `f"{1337:o}"` 15 | print(bin(1337)[2:]) # FURB116 | help: Replace with `f"{1337:o}"` - -ℹ Safe fix -10 10 | print(hex(num)[2:]) # FURB116 -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | -13 |-print(oct(1337)[2:]) # FURB116 - 13 |+print(f"{1337:o}") # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 -15 15 | print(bin(1337)[2:]) # FURB116 -16 16 | print(bin(+1337)[2:]) # FURB116 +10 | print(hex(num)[2:]) # FURB116 +11 | print(bin(num)[2:]) # FURB116 +12 | + - print(oct(1337)[2:]) # FURB116 +13 + print(f"{1337:o}") # FURB116 +14 | print(hex(1337)[2:]) # FURB116 +15 | print(bin(1337)[2:]) # FURB116 +16 | print(bin(+1337)[2:]) # FURB116 FURB116 [*] Replace `hex` call with `f"{1337:x}"` --> FURB116.py:14:7 @@ -97,16 +92,14 @@ FURB116 [*] Replace `hex` call with `f"{1337:x}"` 16 | print(bin(+1337)[2:]) # FURB116 | help: Replace with `f"{1337:x}"` - -ℹ Safe fix -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 -14 |-print(hex(1337)[2:]) # FURB116 - 14 |+print(f"{1337:x}") # FURB116 -15 15 | print(bin(1337)[2:]) # FURB116 -16 16 | print(bin(+1337)[2:]) # FURB116 -17 17 | +11 | print(bin(num)[2:]) # FURB116 +12 | +13 | print(oct(1337)[2:]) # FURB116 + - print(hex(1337)[2:]) # FURB116 +14 + print(f"{1337:x}") # FURB116 +15 | print(bin(1337)[2:]) # FURB116 +16 | print(bin(+1337)[2:]) # FURB116 +17 | FURB116 [*] Replace `bin` call with `f"{1337:b}"` --> FURB116.py:15:7 @@ -118,16 +111,14 @@ FURB116 [*] Replace `bin` call with `f"{1337:b}"` 16 | print(bin(+1337)[2:]) # FURB116 | help: Replace with `f"{1337:b}"` - -ℹ Safe fix -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 -15 |-print(bin(1337)[2:]) # FURB116 - 15 |+print(f"{1337:b}") # FURB116 -16 16 | print(bin(+1337)[2:]) # FURB116 -17 17 | -18 18 | print(bin(return_num())[2:]) # FURB116 (no autofix) +12 | +13 | print(oct(1337)[2:]) # FURB116 +14 | print(hex(1337)[2:]) # FURB116 + - print(bin(1337)[2:]) # FURB116 +15 + print(f"{1337:b}") # FURB116 +16 | print(bin(+1337)[2:]) # FURB116 +17 | +18 | print(bin(return_num())[2:]) # FURB116 (no autofix) FURB116 [*] Replace `bin` call with `f"{+1337:b}"` --> FURB116.py:16:7 @@ -140,16 +131,14 @@ FURB116 [*] Replace `bin` call with `f"{+1337:b}"` 18 | print(bin(return_num())[2:]) # FURB116 (no autofix) | help: Replace with `f"{+1337:b}"` - -ℹ Safe fix -13 13 | print(oct(1337)[2:]) # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 -15 15 | print(bin(1337)[2:]) # FURB116 -16 |-print(bin(+1337)[2:]) # FURB116 - 16 |+print(f"{+1337:b}") # FURB116 -17 17 | -18 18 | print(bin(return_num())[2:]) # FURB116 (no autofix) -19 19 | print(bin(int(f"{num}"))[2:]) # FURB116 (no autofix) +13 | print(oct(1337)[2:]) # FURB116 +14 | print(hex(1337)[2:]) # FURB116 +15 | print(bin(1337)[2:]) # FURB116 + - print(bin(+1337)[2:]) # FURB116 +16 + print(f"{+1337:b}") # FURB116 +17 | +18 | print(bin(return_num())[2:]) # FURB116 (no autofix) +19 | print(bin(int(f"{num}"))[2:]) # FURB116 (no autofix) FURB116 Replace `bin` call with f-string --> FURB116.py:18:7 @@ -184,16 +173,15 @@ FURB116 Replace `bin` call with `f"{d:b}"` 34 | print(bin(len("xyz").numerator)[2:]) | help: Replace with `f"{d:b}"` - -ℹ Display-only fix -29 29 | -30 30 | d = datetime.datetime.now(tz=datetime.UTC) -31 31 | # autofix is display-only -32 |-print(bin(d)[2:]) - 32 |+print(f"{d:b}") -33 33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error -34 34 | print(bin(len("xyz").numerator)[2:]) -35 35 | +29 | +30 | d = datetime.datetime.now(tz=datetime.UTC) +31 | # autofix is display-only + - print(bin(d)[2:]) +32 + print(f"{d:b}") +33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error +34 | print(bin(len("xyz").numerator)[2:]) +35 | +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with `f"{len("xyz").numerator:b}"` --> FURB116.py:34:7 @@ -206,16 +194,15 @@ FURB116 Replace `bin` call with `f"{len("xyz").numerator:b}"` 36 | # autofix is display-only | help: Replace with `f"{len("xyz").numerator:b}"` - -ℹ Display-only fix -31 31 | # autofix is display-only -32 32 | print(bin(d)[2:]) -33 33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error -34 |-print(bin(len("xyz").numerator)[2:]) - 34 |+print(f"{len("xyz").numerator:b}") -35 35 | -36 36 | # autofix is display-only -37 37 | print(bin({0: 1}[0].numerator)[2:]) +31 | # autofix is display-only +32 | print(bin(d)[2:]) +33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error + - print(bin(len("xyz").numerator)[2:]) +34 + print(f"{len("xyz").numerator:b}") +35 | +36 | # autofix is display-only +37 | print(bin({0: 1}[0].numerator)[2:]) +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"` --> FURB116.py:37:7 @@ -227,16 +214,15 @@ FURB116 Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"` 39 | print(bin(ord("\\").numerator)[2:]) | help: Replace with `f"{ {0: 1}[0].numerator:b}"` - -ℹ Display-only fix -34 34 | print(bin(len("xyz").numerator)[2:]) -35 35 | -36 36 | # autofix is display-only -37 |-print(bin({0: 1}[0].numerator)[2:]) - 37 |+print(f"{ {0: 1}[0].numerator:b}") -38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error -39 39 | print(bin(ord("\\").numerator)[2:]) -40 40 | print(hex(sys +34 | print(bin(len("xyz").numerator)[2:]) +35 | +36 | # autofix is display-only + - print(bin({0: 1}[0].numerator)[2:]) +37 + print(f"{ {0: 1}[0].numerator:b}") +38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error +39 | print(bin(ord("\\").numerator)[2:]) +40 | print(hex(sys +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with `f"{ord("\\").numerator:b}"` --> FURB116.py:39:7 @@ -249,16 +235,15 @@ FURB116 Replace `bin` call with `f"{ord("\\").numerator:b}"` 41 | .maxunicode)[2:]) | help: Replace with `f"{ord("\\").numerator:b}"` - -ℹ Display-only fix -36 36 | # autofix is display-only -37 37 | print(bin({0: 1}[0].numerator)[2:]) -38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error -39 |-print(bin(ord("\\").numerator)[2:]) - 39 |+print(f"{ord("\\").numerator:b}") -40 40 | print(hex(sys -41 41 | .maxunicode)[2:]) -42 42 | +36 | # autofix is display-only +37 | print(bin({0: 1}[0].numerator)[2:]) +38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error + - print(bin(ord("\\").numerator)[2:]) +39 + print(f"{ord("\\").numerator:b}") +40 | print(hex(sys +41 | .maxunicode)[2:]) +42 | +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `hex` call with f-string --> FURB116.py:40:7 @@ -273,18 +258,17 @@ FURB116 Replace `hex` call with f-string 43 | # for negatives numbers autofix is display-only | help: Replace with f-string - -ℹ Display-only fix -37 37 | print(bin({0: 1}[0].numerator)[2:]) -38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error -39 39 | print(bin(ord("\\").numerator)[2:]) -40 |-print(hex(sys -41 |-.maxunicode)[2:]) - 40 |+print(f"{sys - 41 |+.maxunicode:x}") -42 42 | -43 43 | # for negatives numbers autofix is display-only -44 44 | print(bin(-1)[2:]) +37 | print(bin({0: 1}[0].numerator)[2:]) +38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error +39 | print(bin(ord("\\").numerator)[2:]) + - print(hex(sys + - .maxunicode)[2:]) +40 + print(f"{sys +41 + .maxunicode:x}") +42 | +43 | # for negatives numbers autofix is display-only +44 | print(bin(-1)[2:]) +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with `f"{-1:b}"` --> FURB116.py:44:7 @@ -294,10 +278,9 @@ FURB116 Replace `bin` call with `f"{-1:b}"` | ^^^^^^^^^^^ | help: Replace with `f"{-1:b}"` - -ℹ Display-only fix -41 41 | .maxunicode)[2:]) -42 42 | -43 43 | # for negatives numbers autofix is display-only -44 |-print(bin(-1)[2:]) - 44 |+print(f"{-1:b}") +41 | .maxunicode)[2:]) +42 | +43 | # for negatives numbers autofix is display-only + - print(bin(-1)[2:]) +44 + print(f"{-1:b}") +note: This is a display-only fix and is likely to be incorrect diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap index 175879f35c..c4118d4bba 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB118_FURB118.py.snap @@ -11,15 +11,14 @@ FURB118 [*] Use `operator.invert` instead of defining a lambda 4 | op_pos = lambda x: +x | help: Replace with `operator.invert` - -ℹ Unsafe fix -1 1 | # Errors. -2 |-op_bitnot = lambda x: ~x - 2 |+import operator - 3 |+op_bitnot = operator.invert -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x -5 6 | op_neg = lambda x: -x +1 | # Errors. + - op_bitnot = lambda x: ~x +2 + import operator +3 + op_bitnot = operator.invert +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x +6 | op_neg = lambda x: -x +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.not_` instead of defining a lambda --> FURB118.py:3:10 @@ -32,16 +31,15 @@ FURB118 [*] Use `operator.not_` instead of defining a lambda 5 | op_neg = lambda x: -x | help: Replace with `operator.not_` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 |-op_not = lambda x: not x - 4 |+op_not = operator.not_ -4 5 | op_pos = lambda x: +x -5 6 | op_neg = lambda x: -x -6 7 | +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x + - op_not = lambda x: not x +4 + op_not = operator.not_ +5 | op_pos = lambda x: +x +6 | op_neg = lambda x: -x +7 | +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.pos` instead of defining a lambda --> FURB118.py:4:10 @@ -53,17 +51,16 @@ FURB118 [*] Use `operator.pos` instead of defining a lambda 5 | op_neg = lambda x: -x | help: Replace with `operator.pos` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 |-op_pos = lambda x: +x - 5 |+op_pos = operator.pos -5 6 | op_neg = lambda x: -x -6 7 | -7 8 | op_add = lambda x, y: x + y +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x + - op_pos = lambda x: +x +5 + op_pos = operator.pos +6 | op_neg = lambda x: -x +7 | +8 | op_add = lambda x, y: x + y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.neg` instead of defining a lambda --> FURB118.py:5:10 @@ -76,18 +73,17 @@ FURB118 [*] Use `operator.neg` instead of defining a lambda 7 | op_add = lambda x, y: x + y | help: Replace with `operator.neg` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x -5 |-op_neg = lambda x: -x - 6 |+op_neg = operator.neg -6 7 | -7 8 | op_add = lambda x, y: x + y -8 9 | op_sub = lambda x, y: x - y +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x + - op_neg = lambda x: -x +6 + op_neg = operator.neg +7 | +8 | op_add = lambda x, y: x + y +9 | op_sub = lambda x, y: x - y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.add` instead of defining a lambda --> FURB118.py:7:10 @@ -100,20 +96,19 @@ FURB118 [*] Use `operator.add` instead of defining a lambda 9 | op_mult = lambda x, y: x * y | help: Replace with `operator.add` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x -5 6 | op_neg = lambda x: -x -6 7 | -7 |-op_add = lambda x, y: x + y - 8 |+op_add = operator.add -8 9 | op_sub = lambda x, y: x - y -9 10 | op_mult = lambda x, y: x * y -10 11 | op_matmutl = lambda x, y: x @ y +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x +6 | op_neg = lambda x: -x +7 | + - op_add = lambda x, y: x + y +8 + op_add = operator.add +9 | op_sub = lambda x, y: x - y +10 | op_mult = lambda x, y: x * y +11 | op_matmutl = lambda x, y: x @ y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.sub` instead of defining a lambda --> FURB118.py:8:10 @@ -125,21 +120,20 @@ FURB118 [*] Use `operator.sub` instead of defining a lambda 10 | op_matmutl = lambda x, y: x @ y | help: Replace with `operator.sub` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x -5 6 | op_neg = lambda x: -x -6 7 | -7 8 | op_add = lambda x, y: x + y -8 |-op_sub = lambda x, y: x - y - 9 |+op_sub = operator.sub -9 10 | op_mult = lambda x, y: x * y -10 11 | op_matmutl = lambda x, y: x @ y -11 12 | op_truediv = lambda x, y: x / y +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x +6 | op_neg = lambda x: -x +7 | +8 | op_add = lambda x, y: x + y + - op_sub = lambda x, y: x - y +9 + op_sub = operator.sub +10 | op_mult = lambda x, y: x * y +11 | op_matmutl = lambda x, y: x @ y +12 | op_truediv = lambda x, y: x / y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.mul` instead of defining a lambda --> FURB118.py:9:11 @@ -152,22 +146,21 @@ FURB118 [*] Use `operator.mul` instead of defining a lambda 11 | op_truediv = lambda x, y: x / y | help: Replace with `operator.mul` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -6 7 | -7 8 | op_add = lambda x, y: x + y -8 9 | op_sub = lambda x, y: x - y -9 |-op_mult = lambda x, y: x * y - 10 |+op_mult = operator.mul -10 11 | op_matmutl = lambda x, y: x @ y -11 12 | op_truediv = lambda x, y: x / y -12 13 | op_mod = lambda x, y: x % y +7 | +8 | op_add = lambda x, y: x + y +9 | op_sub = lambda x, y: x - y + - op_mult = lambda x, y: x * y +10 + op_mult = operator.mul +11 | op_matmutl = lambda x, y: x @ y +12 | op_truediv = lambda x, y: x / y +13 | op_mod = lambda x, y: x % y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.matmul` instead of defining a lambda --> FURB118.py:10:14 @@ -180,22 +173,21 @@ FURB118 [*] Use `operator.matmul` instead of defining a lambda 12 | op_mod = lambda x, y: x % y | help: Replace with `operator.matmul` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -7 8 | op_add = lambda x, y: x + y -8 9 | op_sub = lambda x, y: x - y -9 10 | op_mult = lambda x, y: x * y -10 |-op_matmutl = lambda x, y: x @ y - 11 |+op_matmutl = operator.matmul -11 12 | op_truediv = lambda x, y: x / y -12 13 | op_mod = lambda x, y: x % y -13 14 | op_pow = lambda x, y: x ** y +8 | op_add = lambda x, y: x + y +9 | op_sub = lambda x, y: x - y +10 | op_mult = lambda x, y: x * y + - op_matmutl = lambda x, y: x @ y +11 + op_matmutl = operator.matmul +12 | op_truediv = lambda x, y: x / y +13 | op_mod = lambda x, y: x % y +14 | op_pow = lambda x, y: x ** y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.truediv` instead of defining a lambda --> FURB118.py:11:14 @@ -208,22 +200,21 @@ FURB118 [*] Use `operator.truediv` instead of defining a lambda 13 | op_pow = lambda x, y: x ** y | help: Replace with `operator.truediv` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -8 9 | op_sub = lambda x, y: x - y -9 10 | op_mult = lambda x, y: x * y -10 11 | op_matmutl = lambda x, y: x @ y -11 |-op_truediv = lambda x, y: x / y - 12 |+op_truediv = operator.truediv -12 13 | op_mod = lambda x, y: x % y -13 14 | op_pow = lambda x, y: x ** y -14 15 | op_lshift = lambda x, y: x << y +9 | op_sub = lambda x, y: x - y +10 | op_mult = lambda x, y: x * y +11 | op_matmutl = lambda x, y: x @ y + - op_truediv = lambda x, y: x / y +12 + op_truediv = operator.truediv +13 | op_mod = lambda x, y: x % y +14 | op_pow = lambda x, y: x ** y +15 | op_lshift = lambda x, y: x << y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.mod` instead of defining a lambda --> FURB118.py:12:10 @@ -236,22 +227,21 @@ FURB118 [*] Use `operator.mod` instead of defining a lambda 14 | op_lshift = lambda x, y: x << y | help: Replace with `operator.mod` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -9 10 | op_mult = lambda x, y: x * y -10 11 | op_matmutl = lambda x, y: x @ y -11 12 | op_truediv = lambda x, y: x / y -12 |-op_mod = lambda x, y: x % y - 13 |+op_mod = operator.mod -13 14 | op_pow = lambda x, y: x ** y -14 15 | op_lshift = lambda x, y: x << y -15 16 | op_rshift = lambda x, y: x >> y +10 | op_mult = lambda x, y: x * y +11 | op_matmutl = lambda x, y: x @ y +12 | op_truediv = lambda x, y: x / y + - op_mod = lambda x, y: x % y +13 + op_mod = operator.mod +14 | op_pow = lambda x, y: x ** y +15 | op_lshift = lambda x, y: x << y +16 | op_rshift = lambda x, y: x >> y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.pow` instead of defining a lambda --> FURB118.py:13:10 @@ -264,22 +254,21 @@ FURB118 [*] Use `operator.pow` instead of defining a lambda 15 | op_rshift = lambda x, y: x >> y | help: Replace with `operator.pow` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -10 11 | op_matmutl = lambda x, y: x @ y -11 12 | op_truediv = lambda x, y: x / y -12 13 | op_mod = lambda x, y: x % y -13 |-op_pow = lambda x, y: x ** y - 14 |+op_pow = operator.pow -14 15 | op_lshift = lambda x, y: x << y -15 16 | op_rshift = lambda x, y: x >> y -16 17 | op_bitor = lambda x, y: x | y +11 | op_matmutl = lambda x, y: x @ y +12 | op_truediv = lambda x, y: x / y +13 | op_mod = lambda x, y: x % y + - op_pow = lambda x, y: x ** y +14 + op_pow = operator.pow +15 | op_lshift = lambda x, y: x << y +16 | op_rshift = lambda x, y: x >> y +17 | op_bitor = lambda x, y: x | y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.lshift` instead of defining a lambda --> FURB118.py:14:13 @@ -292,22 +281,21 @@ FURB118 [*] Use `operator.lshift` instead of defining a lambda 16 | op_bitor = lambda x, y: x | y | help: Replace with `operator.lshift` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -11 12 | op_truediv = lambda x, y: x / y -12 13 | op_mod = lambda x, y: x % y -13 14 | op_pow = lambda x, y: x ** y -14 |-op_lshift = lambda x, y: x << y - 15 |+op_lshift = operator.lshift -15 16 | op_rshift = lambda x, y: x >> y -16 17 | op_bitor = lambda x, y: x | y -17 18 | op_xor = lambda x, y: x ^ y +12 | op_truediv = lambda x, y: x / y +13 | op_mod = lambda x, y: x % y +14 | op_pow = lambda x, y: x ** y + - op_lshift = lambda x, y: x << y +15 + op_lshift = operator.lshift +16 | op_rshift = lambda x, y: x >> y +17 | op_bitor = lambda x, y: x | y +18 | op_xor = lambda x, y: x ^ y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.rshift` instead of defining a lambda --> FURB118.py:15:13 @@ -320,22 +308,21 @@ FURB118 [*] Use `operator.rshift` instead of defining a lambda 17 | op_xor = lambda x, y: x ^ y | help: Replace with `operator.rshift` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -12 13 | op_mod = lambda x, y: x % y -13 14 | op_pow = lambda x, y: x ** y -14 15 | op_lshift = lambda x, y: x << y -15 |-op_rshift = lambda x, y: x >> y - 16 |+op_rshift = operator.rshift -16 17 | op_bitor = lambda x, y: x | y -17 18 | op_xor = lambda x, y: x ^ y -18 19 | op_bitand = lambda x, y: x & y +13 | op_mod = lambda x, y: x % y +14 | op_pow = lambda x, y: x ** y +15 | op_lshift = lambda x, y: x << y + - op_rshift = lambda x, y: x >> y +16 + op_rshift = operator.rshift +17 | op_bitor = lambda x, y: x | y +18 | op_xor = lambda x, y: x ^ y +19 | op_bitand = lambda x, y: x & y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.or_` instead of defining a lambda --> FURB118.py:16:12 @@ -348,22 +335,21 @@ FURB118 [*] Use `operator.or_` instead of defining a lambda 18 | op_bitand = lambda x, y: x & y | help: Replace with `operator.or_` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -13 14 | op_pow = lambda x, y: x ** y -14 15 | op_lshift = lambda x, y: x << y -15 16 | op_rshift = lambda x, y: x >> y -16 |-op_bitor = lambda x, y: x | y - 17 |+op_bitor = operator.or_ -17 18 | op_xor = lambda x, y: x ^ y -18 19 | op_bitand = lambda x, y: x & y -19 20 | op_floordiv = lambda x, y: x // y +14 | op_pow = lambda x, y: x ** y +15 | op_lshift = lambda x, y: x << y +16 | op_rshift = lambda x, y: x >> y + - op_bitor = lambda x, y: x | y +17 + op_bitor = operator.or_ +18 | op_xor = lambda x, y: x ^ y +19 | op_bitand = lambda x, y: x & y +20 | op_floordiv = lambda x, y: x // y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.xor` instead of defining a lambda --> FURB118.py:17:10 @@ -376,22 +362,21 @@ FURB118 [*] Use `operator.xor` instead of defining a lambda 19 | op_floordiv = lambda x, y: x // y | help: Replace with `operator.xor` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -14 15 | op_lshift = lambda x, y: x << y -15 16 | op_rshift = lambda x, y: x >> y -16 17 | op_bitor = lambda x, y: x | y -17 |-op_xor = lambda x, y: x ^ y - 18 |+op_xor = operator.xor -18 19 | op_bitand = lambda x, y: x & y -19 20 | op_floordiv = lambda x, y: x // y -20 21 | +15 | op_lshift = lambda x, y: x << y +16 | op_rshift = lambda x, y: x >> y +17 | op_bitor = lambda x, y: x | y + - op_xor = lambda x, y: x ^ y +18 + op_xor = operator.xor +19 | op_bitand = lambda x, y: x & y +20 | op_floordiv = lambda x, y: x // y +21 | +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.and_` instead of defining a lambda --> FURB118.py:18:13 @@ -403,22 +388,21 @@ FURB118 [*] Use `operator.and_` instead of defining a lambda 19 | op_floordiv = lambda x, y: x // y | help: Replace with `operator.and_` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -15 16 | op_rshift = lambda x, y: x >> y -16 17 | op_bitor = lambda x, y: x | y -17 18 | op_xor = lambda x, y: x ^ y -18 |-op_bitand = lambda x, y: x & y - 19 |+op_bitand = operator.and_ -19 20 | op_floordiv = lambda x, y: x // y -20 21 | -21 22 | op_eq = lambda x, y: x == y +16 | op_rshift = lambda x, y: x >> y +17 | op_bitor = lambda x, y: x | y +18 | op_xor = lambda x, y: x ^ y + - op_bitand = lambda x, y: x & y +19 + op_bitand = operator.and_ +20 | op_floordiv = lambda x, y: x // y +21 | +22 | op_eq = lambda x, y: x == y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.floordiv` instead of defining a lambda --> FURB118.py:19:15 @@ -431,22 +415,21 @@ FURB118 [*] Use `operator.floordiv` instead of defining a lambda 21 | op_eq = lambda x, y: x == y | help: Replace with `operator.floordiv` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -16 17 | op_bitor = lambda x, y: x | y -17 18 | op_xor = lambda x, y: x ^ y -18 19 | op_bitand = lambda x, y: x & y -19 |-op_floordiv = lambda x, y: x // y - 20 |+op_floordiv = operator.floordiv -20 21 | -21 22 | op_eq = lambda x, y: x == y -22 23 | op_ne = lambda x, y: x != y +17 | op_bitor = lambda x, y: x | y +18 | op_xor = lambda x, y: x ^ y +19 | op_bitand = lambda x, y: x & y + - op_floordiv = lambda x, y: x // y +20 + op_floordiv = operator.floordiv +21 | +22 | op_eq = lambda x, y: x == y +23 | op_ne = lambda x, y: x != y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.eq` instead of defining a lambda --> FURB118.py:21:9 @@ -459,22 +442,21 @@ FURB118 [*] Use `operator.eq` instead of defining a lambda 23 | op_lt = lambda x, y: x < y | help: Replace with `operator.eq` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -18 19 | op_bitand = lambda x, y: x & y -19 20 | op_floordiv = lambda x, y: x // y -20 21 | -21 |-op_eq = lambda x, y: x == y - 22 |+op_eq = operator.eq -22 23 | op_ne = lambda x, y: x != y -23 24 | op_lt = lambda x, y: x < y -24 25 | op_lte = lambda x, y: x <= y +19 | op_bitand = lambda x, y: x & y +20 | op_floordiv = lambda x, y: x // y +21 | + - op_eq = lambda x, y: x == y +22 + op_eq = operator.eq +23 | op_ne = lambda x, y: x != y +24 | op_lt = lambda x, y: x < y +25 | op_lte = lambda x, y: x <= y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.ne` instead of defining a lambda --> FURB118.py:22:9 @@ -486,22 +468,21 @@ FURB118 [*] Use `operator.ne` instead of defining a lambda 24 | op_lte = lambda x, y: x <= y | help: Replace with `operator.ne` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -19 20 | op_floordiv = lambda x, y: x // y -20 21 | -21 22 | op_eq = lambda x, y: x == y -22 |-op_ne = lambda x, y: x != y - 23 |+op_ne = operator.ne -23 24 | op_lt = lambda x, y: x < y -24 25 | op_lte = lambda x, y: x <= y -25 26 | op_gt = lambda x, y: x > y +20 | op_floordiv = lambda x, y: x // y +21 | +22 | op_eq = lambda x, y: x == y + - op_ne = lambda x, y: x != y +23 + op_ne = operator.ne +24 | op_lt = lambda x, y: x < y +25 | op_lte = lambda x, y: x <= y +26 | op_gt = lambda x, y: x > y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.lt` instead of defining a lambda --> FURB118.py:23:9 @@ -514,22 +495,21 @@ FURB118 [*] Use `operator.lt` instead of defining a lambda 25 | op_gt = lambda x, y: x > y | help: Replace with `operator.lt` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -20 21 | -21 22 | op_eq = lambda x, y: x == y -22 23 | op_ne = lambda x, y: x != y -23 |-op_lt = lambda x, y: x < y - 24 |+op_lt = operator.lt -24 25 | op_lte = lambda x, y: x <= y -25 26 | op_gt = lambda x, y: x > y -26 27 | op_gte = lambda x, y: x >= y +21 | +22 | op_eq = lambda x, y: x == y +23 | op_ne = lambda x, y: x != y + - op_lt = lambda x, y: x < y +24 + op_lt = operator.lt +25 | op_lte = lambda x, y: x <= y +26 | op_gt = lambda x, y: x > y +27 | op_gte = lambda x, y: x >= y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.le` instead of defining a lambda --> FURB118.py:24:10 @@ -542,22 +522,21 @@ FURB118 [*] Use `operator.le` instead of defining a lambda 26 | op_gte = lambda x, y: x >= y | help: Replace with `operator.le` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -21 22 | op_eq = lambda x, y: x == y -22 23 | op_ne = lambda x, y: x != y -23 24 | op_lt = lambda x, y: x < y -24 |-op_lte = lambda x, y: x <= y - 25 |+op_lte = operator.le -25 26 | op_gt = lambda x, y: x > y -26 27 | op_gte = lambda x, y: x >= y -27 28 | op_is = lambda x, y: x is y +22 | op_eq = lambda x, y: x == y +23 | op_ne = lambda x, y: x != y +24 | op_lt = lambda x, y: x < y + - op_lte = lambda x, y: x <= y +25 + op_lte = operator.le +26 | op_gt = lambda x, y: x > y +27 | op_gte = lambda x, y: x >= y +28 | op_is = lambda x, y: x is y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.gt` instead of defining a lambda --> FURB118.py:25:9 @@ -570,22 +549,21 @@ FURB118 [*] Use `operator.gt` instead of defining a lambda 27 | op_is = lambda x, y: x is y | help: Replace with `operator.gt` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -22 23 | op_ne = lambda x, y: x != y -23 24 | op_lt = lambda x, y: x < y -24 25 | op_lte = lambda x, y: x <= y -25 |-op_gt = lambda x, y: x > y - 26 |+op_gt = operator.gt -26 27 | op_gte = lambda x, y: x >= y -27 28 | op_is = lambda x, y: x is y -28 29 | op_isnot = lambda x, y: x is not y +23 | op_ne = lambda x, y: x != y +24 | op_lt = lambda x, y: x < y +25 | op_lte = lambda x, y: x <= y + - op_gt = lambda x, y: x > y +26 + op_gt = operator.gt +27 | op_gte = lambda x, y: x >= y +28 | op_is = lambda x, y: x is y +29 | op_isnot = lambda x, y: x is not y +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.ge` instead of defining a lambda --> FURB118.py:26:10 @@ -598,22 +576,21 @@ FURB118 [*] Use `operator.ge` instead of defining a lambda 28 | op_isnot = lambda x, y: x is not y | help: Replace with `operator.ge` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -23 24 | op_lt = lambda x, y: x < y -24 25 | op_lte = lambda x, y: x <= y -25 26 | op_gt = lambda x, y: x > y -26 |-op_gte = lambda x, y: x >= y - 27 |+op_gte = operator.ge -27 28 | op_is = lambda x, y: x is y -28 29 | op_isnot = lambda x, y: x is not y -29 30 | op_in = lambda x, y: y in x +24 | op_lt = lambda x, y: x < y +25 | op_lte = lambda x, y: x <= y +26 | op_gt = lambda x, y: x > y + - op_gte = lambda x, y: x >= y +27 + op_gte = operator.ge +28 | op_is = lambda x, y: x is y +29 | op_isnot = lambda x, y: x is not y +30 | op_in = lambda x, y: y in x +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.is_` instead of defining a lambda --> FURB118.py:27:9 @@ -626,22 +603,21 @@ FURB118 [*] Use `operator.is_` instead of defining a lambda 29 | op_in = lambda x, y: y in x | help: Replace with `operator.is_` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -24 25 | op_lte = lambda x, y: x <= y -25 26 | op_gt = lambda x, y: x > y -26 27 | op_gte = lambda x, y: x >= y -27 |-op_is = lambda x, y: x is y - 28 |+op_is = operator.is_ -28 29 | op_isnot = lambda x, y: x is not y -29 30 | op_in = lambda x, y: y in x -30 31 | op_itemgetter = lambda x: x[0] +25 | op_lte = lambda x, y: x <= y +26 | op_gt = lambda x, y: x > y +27 | op_gte = lambda x, y: x >= y + - op_is = lambda x, y: x is y +28 + op_is = operator.is_ +29 | op_isnot = lambda x, y: x is not y +30 | op_in = lambda x, y: y in x +31 | op_itemgetter = lambda x: x[0] +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.is_not` instead of defining a lambda --> FURB118.py:28:12 @@ -654,22 +630,21 @@ FURB118 [*] Use `operator.is_not` instead of defining a lambda 30 | op_itemgetter = lambda x: x[0] | help: Replace with `operator.is_not` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -25 26 | op_gt = lambda x, y: x > y -26 27 | op_gte = lambda x, y: x >= y -27 28 | op_is = lambda x, y: x is y -28 |-op_isnot = lambda x, y: x is not y - 29 |+op_isnot = operator.is_not -29 30 | op_in = lambda x, y: y in x -30 31 | op_itemgetter = lambda x: x[0] -31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) +26 | op_gt = lambda x, y: x > y +27 | op_gte = lambda x, y: x >= y +28 | op_is = lambda x, y: x is y + - op_isnot = lambda x, y: x is not y +29 + op_isnot = operator.is_not +30 | op_in = lambda x, y: y in x +31 | op_itemgetter = lambda x: x[0] +32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.contains` instead of defining a lambda --> FURB118.py:29:9 @@ -682,22 +657,21 @@ FURB118 [*] Use `operator.contains` instead of defining a lambda 31 | op_itemgetter = lambda x: (x[0], x[1], x[2]) | help: Replace with `operator.contains` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -26 27 | op_gte = lambda x, y: x >= y -27 28 | op_is = lambda x, y: x is y -28 29 | op_isnot = lambda x, y: x is not y -29 |-op_in = lambda x, y: y in x - 30 |+op_in = operator.contains -30 31 | op_itemgetter = lambda x: x[0] -31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) -32 33 | op_itemgetter = lambda x: (x[1:], x[2]) +27 | op_gte = lambda x, y: x >= y +28 | op_is = lambda x, y: x is y +29 | op_isnot = lambda x, y: x is not y + - op_in = lambda x, y: y in x +30 + op_in = operator.contains +31 | op_itemgetter = lambda x: x[0] +32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) +33 | op_itemgetter = lambda x: (x[1:], x[2]) +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter(0)` instead of defining a lambda --> FURB118.py:30:17 @@ -710,22 +684,21 @@ FURB118 [*] Use `operator.itemgetter(0)` instead of defining a lambda 32 | op_itemgetter = lambda x: (x[1:], x[2]) | help: Replace with `operator.itemgetter(0)` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -27 28 | op_is = lambda x, y: x is y -28 29 | op_isnot = lambda x, y: x is not y -29 30 | op_in = lambda x, y: y in x -30 |-op_itemgetter = lambda x: x[0] - 31 |+op_itemgetter = operator.itemgetter(0) -31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) -32 33 | op_itemgetter = lambda x: (x[1:], x[2]) -33 34 | op_itemgetter = lambda x: x[:] +28 | op_is = lambda x, y: x is y +29 | op_isnot = lambda x, y: x is not y +30 | op_in = lambda x, y: y in x + - op_itemgetter = lambda x: x[0] +31 + op_itemgetter = operator.itemgetter(0) +32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) +33 | op_itemgetter = lambda x: (x[1:], x[2]) +34 | op_itemgetter = lambda x: x[:] +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter(0, 1, 2)` instead of defining a lambda --> FURB118.py:31:17 @@ -738,22 +711,21 @@ FURB118 [*] Use `operator.itemgetter(0, 1, 2)` instead of defining a lambda 33 | op_itemgetter = lambda x: x[:] | help: Replace with `operator.itemgetter(0, 1, 2)` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -28 29 | op_isnot = lambda x, y: x is not y -29 30 | op_in = lambda x, y: y in x -30 31 | op_itemgetter = lambda x: x[0] -31 |-op_itemgetter = lambda x: (x[0], x[1], x[2]) - 32 |+op_itemgetter = operator.itemgetter(0, 1, 2) -32 33 | op_itemgetter = lambda x: (x[1:], x[2]) -33 34 | op_itemgetter = lambda x: x[:] -34 35 | op_itemgetter = lambda x: x[0, 1] +29 | op_isnot = lambda x, y: x is not y +30 | op_in = lambda x, y: y in x +31 | op_itemgetter = lambda x: x[0] + - op_itemgetter = lambda x: (x[0], x[1], x[2]) +32 + op_itemgetter = operator.itemgetter(0, 1, 2) +33 | op_itemgetter = lambda x: (x[1:], x[2]) +34 | op_itemgetter = lambda x: x[:] +35 | op_itemgetter = lambda x: x[0, 1] +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter(slice(1, None), 2)` instead of defining a lambda --> FURB118.py:32:17 @@ -766,22 +738,21 @@ FURB118 [*] Use `operator.itemgetter(slice(1, None), 2)` instead of defining a l 34 | op_itemgetter = lambda x: x[0, 1] | help: Replace with `operator.itemgetter(slice(1, None), 2)` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -29 30 | op_in = lambda x, y: y in x -30 31 | op_itemgetter = lambda x: x[0] -31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) -32 |-op_itemgetter = lambda x: (x[1:], x[2]) - 33 |+op_itemgetter = operator.itemgetter(slice(1, None), 2) -33 34 | op_itemgetter = lambda x: x[:] -34 35 | op_itemgetter = lambda x: x[0, 1] -35 36 | op_itemgetter = lambda x: x[(0, 1)] +30 | op_in = lambda x, y: y in x +31 | op_itemgetter = lambda x: x[0] +32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) + - op_itemgetter = lambda x: (x[1:], x[2]) +33 + op_itemgetter = operator.itemgetter(slice(1, None), 2) +34 | op_itemgetter = lambda x: x[:] +35 | op_itemgetter = lambda x: x[0, 1] +36 | op_itemgetter = lambda x: x[(0, 1)] +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter(slice(None))` instead of defining a lambda --> FURB118.py:33:17 @@ -794,22 +765,21 @@ FURB118 [*] Use `operator.itemgetter(slice(None))` instead of defining a lambda 35 | op_itemgetter = lambda x: x[(0, 1)] | help: Replace with `operator.itemgetter(slice(None))` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -30 31 | op_itemgetter = lambda x: x[0] -31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) -32 33 | op_itemgetter = lambda x: (x[1:], x[2]) -33 |-op_itemgetter = lambda x: x[:] - 34 |+op_itemgetter = operator.itemgetter(slice(None)) -34 35 | op_itemgetter = lambda x: x[0, 1] -35 36 | op_itemgetter = lambda x: x[(0, 1)] -36 37 | +31 | op_itemgetter = lambda x: x[0] +32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) +33 | op_itemgetter = lambda x: (x[1:], x[2]) + - op_itemgetter = lambda x: x[:] +34 + op_itemgetter = operator.itemgetter(slice(None)) +35 | op_itemgetter = lambda x: x[0, 1] +36 | op_itemgetter = lambda x: x[(0, 1)] +37 | +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda --> FURB118.py:34:17 @@ -821,22 +791,21 @@ FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda 35 | op_itemgetter = lambda x: x[(0, 1)] | help: Replace with `operator.itemgetter((0, 1))` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -31 32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) -32 33 | op_itemgetter = lambda x: (x[1:], x[2]) -33 34 | op_itemgetter = lambda x: x[:] -34 |-op_itemgetter = lambda x: x[0, 1] - 35 |+op_itemgetter = operator.itemgetter((0, 1)) -35 36 | op_itemgetter = lambda x: x[(0, 1)] -36 37 | -37 38 | +32 | op_itemgetter = lambda x: (x[0], x[1], x[2]) +33 | op_itemgetter = lambda x: (x[1:], x[2]) +34 | op_itemgetter = lambda x: x[:] + - op_itemgetter = lambda x: x[0, 1] +35 + op_itemgetter = operator.itemgetter((0, 1)) +36 | op_itemgetter = lambda x: x[(0, 1)] +37 | +38 | +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda --> FURB118.py:35:17 @@ -847,22 +816,21 @@ FURB118 [*] Use `operator.itemgetter((0, 1))` instead of defining a lambda | ^^^^^^^^^^^^^^^^^^^ | help: Replace with `operator.itemgetter((0, 1))` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -32 33 | op_itemgetter = lambda x: (x[1:], x[2]) -33 34 | op_itemgetter = lambda x: x[:] -34 35 | op_itemgetter = lambda x: x[0, 1] -35 |-op_itemgetter = lambda x: x[(0, 1)] - 36 |+op_itemgetter = operator.itemgetter((0, 1)) -36 37 | -37 38 | -38 39 | def op_not2(x): +33 | op_itemgetter = lambda x: (x[1:], x[2]) +34 | op_itemgetter = lambda x: x[:] +35 | op_itemgetter = lambda x: x[0, 1] + - op_itemgetter = lambda x: x[(0, 1)] +36 + op_itemgetter = operator.itemgetter((0, 1)) +37 | +38 | +39 | def op_not2(x): +note: This is an unsafe fix and may change runtime behavior FURB118 Use `operator.not_` instead of defining a function --> FURB118.py:38:5 @@ -891,22 +859,21 @@ FURB118 [*] Use `operator.itemgetter((slice(None), 1))` instead of defining a la 89 | op_itemgetter = lambda x: x[1, :] | help: Replace with `operator.itemgetter((slice(None), 1))` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -85 86 | return x + y -86 87 | -87 88 | # See https://github.com/astral-sh/ruff/issues/13508 -88 |-op_itemgetter = lambda x: x[:, 1] - 89 |+op_itemgetter = operator.itemgetter((slice(None), 1)) -89 90 | op_itemgetter = lambda x: x[1, :] -90 91 | -91 92 | # With a slice, trivia is dropped +86 | return x + y +87 | +88 | # See https://github.com/astral-sh/ruff/issues/13508 + - op_itemgetter = lambda x: x[:, 1] +89 + op_itemgetter = operator.itemgetter((slice(None), 1)) +90 | op_itemgetter = lambda x: x[1, :] +91 | +92 | # With a slice, trivia is dropped +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a lambda --> FURB118.py:89:17 @@ -919,22 +886,21 @@ FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a la 91 | # With a slice, trivia is dropped | help: Replace with `operator.itemgetter((1, slice(None)))` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -86 87 | -87 88 | # See https://github.com/astral-sh/ruff/issues/13508 -88 89 | op_itemgetter = lambda x: x[:, 1] -89 |-op_itemgetter = lambda x: x[1, :] - 90 |+op_itemgetter = operator.itemgetter((1, slice(None))) -90 91 | -91 92 | # With a slice, trivia is dropped -92 93 | op_itemgetter = lambda x: x[1, :] +87 | +88 | # See https://github.com/astral-sh/ruff/issues/13508 +89 | op_itemgetter = lambda x: x[:, 1] + - op_itemgetter = lambda x: x[1, :] +90 + op_itemgetter = operator.itemgetter((1, slice(None))) +91 | +92 | # With a slice, trivia is dropped +93 | op_itemgetter = lambda x: x[1, :] +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a lambda --> FURB118.py:92:17 @@ -946,22 +912,21 @@ FURB118 [*] Use `operator.itemgetter((1, slice(None)))` instead of defining a la 94 | # Without a slice, trivia is retained | help: Replace with `operator.itemgetter((1, slice(None)))` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -89 90 | op_itemgetter = lambda x: x[1, :] -90 91 | -91 92 | # With a slice, trivia is dropped -92 |-op_itemgetter = lambda x: x[1, :] - 93 |+op_itemgetter = operator.itemgetter((1, slice(None))) -93 94 | -94 95 | # Without a slice, trivia is retained -95 96 | op_itemgetter = lambda x: x[1, 2] +90 | op_itemgetter = lambda x: x[1, :] +91 | +92 | # With a slice, trivia is dropped + - op_itemgetter = lambda x: x[1, :] +93 + op_itemgetter = operator.itemgetter((1, slice(None))) +94 | +95 | # Without a slice, trivia is retained +96 | op_itemgetter = lambda x: x[1, 2] +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter((1, 2))` instead of defining a lambda --> FURB118.py:95:17 @@ -971,22 +936,21 @@ FURB118 [*] Use `operator.itemgetter((1, 2))` instead of defining a lam | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `operator.itemgetter((1, 2))` - -ℹ Unsafe fix -1 1 | # Errors. - 2 |+import operator -2 3 | op_bitnot = lambda x: ~x -3 4 | op_not = lambda x: not x -4 5 | op_pos = lambda x: +x +1 | # Errors. +2 + import operator +3 | op_bitnot = lambda x: ~x +4 | op_not = lambda x: not x +5 | op_pos = lambda x: +x -------------------------------------------------------------------------------- -92 93 | op_itemgetter = lambda x: x[1, :] -93 94 | -94 95 | # Without a slice, trivia is retained -95 |-op_itemgetter = lambda x: x[1, 2] - 96 |+op_itemgetter = operator.itemgetter((1, 2)) -96 97 | -97 98 | -98 99 | # All methods in classes are ignored, even those defined using lambdas: +93 | op_itemgetter = lambda x: x[1, :] +94 | +95 | # Without a slice, trivia is retained + - op_itemgetter = lambda x: x[1, 2] +96 + op_itemgetter = operator.itemgetter((1, 2)) +97 | +98 | +99 | # All methods in classes are ignored, even those defined using lambdas: +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter(slice(-2, None))` instead of defining a lambda --> FURB118.py:129:14 @@ -999,24 +963,23 @@ FURB118 [*] Use `operator.itemgetter(slice(-2, None))` instead of defining a lam 131 | ], | help: Replace with `operator.itemgetter(slice(-2, None))` - -ℹ Unsafe fix -111 111 | # Lambdas wrapped in function calls could also still be method definitions! -112 112 | # To avoid false positives, we shouldn't flag any of these either: -113 113 | from typing import final, override, no_type_check - 114 |+import operator -114 115 | -115 116 | -116 117 | class Foo: +111 | # Lambdas wrapped in function calls could also still be method definitions! +112 | # To avoid false positives, we shouldn't flag any of these either: +113 | from typing import final, override, no_type_check +114 + import operator +115 | +116 | +117 | class Foo: -------------------------------------------------------------------------------- -126 127 | @pytest.mark.parametrize( -127 128 | "slicer, expected", -128 129 | [ -129 |- (lambda x: x[-2:], "foo"), - 130 |+ (operator.itemgetter(slice(-2, None)), "foo"), -130 131 | (lambda x: x[-5:-3], "bar"), -131 132 | ], -132 133 | ) +127 | @pytest.mark.parametrize( +128 | "slicer, expected", +129 | [ + - (lambda x: x[-2:], "foo"), +130 + (operator.itemgetter(slice(-2, None)), "foo"), +131 | (lambda x: x[-5:-3], "bar"), +132 | ], +133 | ) +note: This is an unsafe fix and may change runtime behavior FURB118 [*] Use `operator.itemgetter(slice(-5, -3))` instead of defining a lambda --> FURB118.py:130:14 @@ -1029,21 +992,20 @@ FURB118 [*] Use `operator.itemgetter(slice(-5, -3))` instead of defining a lambd 132 | ) | help: Replace with `operator.itemgetter(slice(-5, -3))` - -ℹ Unsafe fix -111 111 | # Lambdas wrapped in function calls could also still be method definitions! -112 112 | # To avoid false positives, we shouldn't flag any of these either: -113 113 | from typing import final, override, no_type_check - 114 |+import operator -114 115 | -115 116 | -116 117 | class Foo: +111 | # Lambdas wrapped in function calls could also still be method definitions! +112 | # To avoid false positives, we shouldn't flag any of these either: +113 | from typing import final, override, no_type_check +114 + import operator +115 | +116 | +117 | class Foo: -------------------------------------------------------------------------------- -127 128 | "slicer, expected", -128 129 | [ -129 130 | (lambda x: x[-2:], "foo"), -130 |- (lambda x: x[-5:-3], "bar"), - 131 |+ (operator.itemgetter(slice(-5, -3)), "bar"), -131 132 | ], -132 133 | ) -133 134 | def test_inlet_asset_alias_extra_slice(self, slicer, expected): +128 | "slicer, expected", +129 | [ +130 | (lambda x: x[-2:], "foo"), + - (lambda x: x[-5:-3], "bar"), +131 + (operator.itemgetter(slice(-5, -3)), "bar"), +132 | ], +133 | ) +134 | def test_inlet_asset_alias_extra_slice(self, slicer, expected): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap index a80f7a6764..1673b1924c 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB122_FURB122.py.snap @@ -11,17 +11,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -7 7 | -8 8 | def _(): -9 9 | with open("file", "w") as f: -10 |- for line in lines: -11 |- f.write(line) - 10 |+ f.writelines(lines) -12 11 | -13 12 | -14 13 | def _(): +7 | +8 | def _(): +9 | with open("file", "w") as f: + - for line in lines: + - f.write(line) +10 + f.writelines(lines) +11 | +12 | +13 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:17:9 @@ -33,17 +31,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_______________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -14 14 | def _(): -15 15 | other_line = "other line" -16 16 | with Path("file").open("w") as f: -17 |- for line in lines: -18 |- f.write(other_line) - 17 |+ f.writelines(other_line for line in lines) -19 18 | -20 19 | -21 20 | def _(): +14 | def _(): +15 | other_line = "other line" +16 | with Path("file").open("w") as f: + - for line in lines: + - f.write(other_line) +17 + f.writelines(other_line for line in lines) +18 | +19 | +20 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:23:9 @@ -55,17 +51,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -20 20 | -21 21 | def _(): -22 22 | with Path("file").open("w") as f: -23 |- for line in lines: -24 |- f.write(line) - 23 |+ f.writelines(lines) -25 24 | -26 25 | -27 26 | def _(): +20 | +21 | def _(): +22 | with Path("file").open("w") as f: + - for line in lines: + - f.write(line) +23 + f.writelines(lines) +24 | +25 | +26 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:29:9 @@ -77,17 +71,15 @@ FURB122 [*] Use of `f.write` in a for loop | |__________________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -26 26 | -27 27 | def _(): -28 28 | with Path("file").open("wb") as f: -29 |- for line in lines: -30 |- f.write(line.encode()) - 29 |+ f.writelines(line.encode() for line in lines) -31 30 | -32 31 | -33 32 | def _(): +26 | +27 | def _(): +28 | with Path("file").open("wb") as f: + - for line in lines: + - f.write(line.encode()) +29 + f.writelines(line.encode() for line in lines) +30 | +31 | +32 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:35:9 @@ -99,17 +91,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_________________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -32 32 | -33 33 | def _(): -34 34 | with Path("file").open("w") as f: -35 |- for line in lines: -36 |- f.write(line.upper()) - 35 |+ f.writelines(line.upper() for line in lines) -37 36 | -38 37 | -39 38 | def _(): +32 | +33 | def _(): +34 | with Path("file").open("w") as f: + - for line in lines: + - f.write(line.upper()) +35 + f.writelines(line.upper() for line in lines) +36 | +37 | +38 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:43:9 @@ -121,17 +111,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -40 40 | with Path("file").open("w") as f: -41 41 | pass -42 42 | -43 |- for line in lines: -44 |- f.write(line) - 43 |+ f.writelines(lines) -45 44 | -46 45 | -47 46 | def _(): +40 | with Path("file").open("w") as f: +41 | pass +42 | + - for line in lines: + - f.write(line) +43 + f.writelines(lines) +44 | +45 | +46 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:50:9 @@ -144,18 +132,17 @@ FURB122 [*] Use of `f.write` in a for loop | |_________________________^ | help: Replace with `f.writelines` - -ℹ Unsafe fix -47 47 | def _(): -48 48 | # Offer unsafe fix if it would delete comments -49 49 | with open("file","w") as f: -50 |- for line in lines: -51 |- # a really important comment -52 |- f.write(line) - 50 |+ f.writelines(lines) -53 51 | -54 52 | -55 53 | def _(): +47 | def _(): +48 | # Offer unsafe fix if it would delete comments +49 | with open("file","w") as f: + - for line in lines: + - # a really important comment + - f.write(line) +50 + f.writelines(lines) +51 | +52 | +53 | def _(): +note: This is an unsafe fix and may change runtime behavior FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:57:9 @@ -167,17 +154,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_______________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -54 54 | -55 55 | def _(): -56 56 | with open("file", "w") as f: -57 |- for () in a: -58 |- f.write(()) - 57 |+ f.writelines(() for () in a) -59 58 | -60 59 | -61 60 | def _(): +54 | +55 | def _(): +56 | with open("file", "w") as f: + - for () in a: + - f.write(()) +57 + f.writelines(() for () in a) +58 | +59 | +60 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:63:9 @@ -189,17 +174,15 @@ FURB122 [*] Use of `f.write` in a for loop | |___________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -60 60 | -61 61 | def _(): -62 62 | with open("file", "w") as f: -63 |- for a, b, c in d: -64 |- f.write((a, b)) - 63 |+ f.writelines((a, b) for a, b, c in d) -65 64 | -66 65 | -67 66 | def _(): +60 | +61 | def _(): +62 | with open("file", "w") as f: + - for a, b, c in d: + - f.write((a, b)) +63 + f.writelines((a, b) for a, b, c in d) +64 | +65 | +66 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:69:9 @@ -211,17 +194,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_______________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -66 66 | -67 67 | def _(): -68 68 | with open("file", "w") as f: -69 |- for [(), [a.b], (c,)] in d: -70 |- f.write(()) - 69 |+ f.writelines(() for [(), [a.b], (c,)] in d) -71 70 | -72 71 | -73 72 | def _(): +66 | +67 | def _(): +68 | with open("file", "w") as f: + - for [(), [a.b], (c,)] in d: + - f.write(()) +69 + f.writelines(() for [(), [a.b], (c,)] in d) +70 | +71 | +72 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:75:9 @@ -233,17 +214,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_______________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -72 72 | -73 73 | def _(): -74 74 | with open("file", "w") as f: -75 |- for [([([a[b]],)],), [], (c[d],)] in e: -76 |- f.write(()) - 75 |+ f.writelines(() for [([([a[b]],)],), [], (c[d],)] in e) -77 76 | -78 77 | -79 78 | def _(): +72 | +73 | def _(): +74 | with open("file", "w") as f: + - for [([([a[b]],)],), [], (c[d],)] in e: + - f.write(()) +75 + f.writelines(() for [([([a[b]],)],), [], (c[d],)] in e) +76 | +77 | +78 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:82:9 @@ -257,17 +236,15 @@ FURB122 [*] Use of `f.write` in a for loop 85 | def _(): | help: Replace with `f.writelines` - -ℹ Safe fix -79 79 | def _(): -80 80 | # https://github.com/astral-sh/ruff/issues/15936 -81 81 | with open("file", "w") as f: -82 |- for char in "a", "b": -83 |- f.write(char) - 82 |+ f.writelines(("a", "b")) -84 83 | -85 84 | def _(): -86 85 | # https://github.com/astral-sh/ruff/issues/15936 +79 | def _(): +80 | # https://github.com/astral-sh/ruff/issues/15936 +81 | with open("file", "w") as f: + - for char in "a", "b": + - f.write(char) +82 + f.writelines(("a", "b")) +83 | +84 | def _(): +85 | # https://github.com/astral-sh/ruff/issues/15936 FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:88:9 @@ -281,17 +258,15 @@ FURB122 [*] Use of `f.write` in a for loop 91 | def _(): | help: Replace with `f.writelines` - -ℹ Safe fix -85 85 | def _(): -86 86 | # https://github.com/astral-sh/ruff/issues/15936 -87 87 | with open("file", "w") as f: -88 |- for char in "a", "b": -89 |- f.write(f"{char}") - 88 |+ f.writelines(f"{char}" for char in ("a", "b")) -90 89 | -91 90 | def _(): -92 91 | with open("file", "w") as f: +85 | def _(): +86 | # https://github.com/astral-sh/ruff/issues/15936 +87 | with open("file", "w") as f: + - for char in "a", "b": + - f.write(f"{char}") +88 + f.writelines(f"{char}" for char in ("a", "b")) +89 | +90 | def _(): +91 | with open("file", "w") as f: FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:93:9 @@ -306,21 +281,20 @@ FURB122 [*] Use of `f.write` in a for loop | |______________________________^ | help: Replace with `f.writelines` - -ℹ Unsafe fix -90 90 | -91 91 | def _(): -92 92 | with open("file", "w") as f: -93 |- for char in ( - 93 |+ f.writelines(f"{char}" for char in ( -94 94 | "a", # Comment -95 95 | "b" -96 |- ): -97 |- f.write(f"{char}") - 96 |+ )) -98 97 | -99 98 | -100 99 | # OK +90 | +91 | def _(): +92 | with open("file", "w") as f: + - for char in ( +93 + f.writelines(f"{char}" for char in ( +94 | "a", # Comment +95 | "b" + - ): + - f.write(f"{char}") +96 + )) +97 | +98 | +99 | # OK +note: This is an unsafe fix and may change runtime behavior FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:183:9 @@ -332,17 +306,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_____________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -180 180 | -181 181 | def _(): -182 182 | with Path("file.txt").open("w", encoding="utf-8") as f: -183 |- for l in lambda: 0: -184 |- f.write(f"[{l}]") - 183 |+ f.writelines(f"[{l}]" for l in (lambda: 0)) -185 184 | -186 185 | -187 186 | def _(): +180 | +181 | def _(): +182 | with Path("file.txt").open("w", encoding="utf-8") as f: + - for l in lambda: 0: + - f.write(f"[{l}]") +183 + f.writelines(f"[{l}]" for l in (lambda: 0)) +184 | +185 | +186 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:189:9 @@ -354,17 +326,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_____________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -186 186 | -187 187 | def _(): -188 188 | with Path("file.txt").open("w", encoding="utf-8") as f: -189 |- for l in (1,) if True else (2,): -190 |- f.write(f"[{l}]") - 189 |+ f.writelines(f"[{l}]" for l in ((1,) if True else (2,))) -191 190 | -192 191 | -193 192 | # don't need to add parentheses when making a function argument +186 | +187 | def _(): +188 | with Path("file.txt").open("w", encoding="utf-8") as f: + - for l in (1,) if True else (2,): + - f.write(f"[{l}]") +189 + f.writelines(f"[{l}]" for l in ((1,) if True else (2,))) +190 | +191 | +192 | # don't need to add parentheses when making a function argument FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:196:9 @@ -376,17 +346,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -193 193 | # don't need to add parentheses when making a function argument -194 194 | def _(): -195 195 | with open("file", "w") as f: -196 |- for line in lambda: 0: -197 |- f.write(line) - 196 |+ f.writelines(lambda: 0) -198 197 | -199 198 | -200 199 | def _(): +193 | # don't need to add parentheses when making a function argument +194 | def _(): +195 | with open("file", "w") as f: + - for line in lambda: 0: + - f.write(line) +196 + f.writelines(lambda: 0) +197 | +198 | +199 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:202:9 @@ -398,17 +366,15 @@ FURB122 [*] Use of `f.write` in a for loop | |_________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -199 199 | -200 200 | def _(): -201 201 | with open("file", "w") as f: -202 |- for line in (1,) if True else (2,): -203 |- f.write(line) - 202 |+ f.writelines((1,) if True else (2,)) -204 203 | -205 204 | -206 205 | # don't add extra parentheses if they're already parenthesized +199 | +200 | def _(): +201 | with open("file", "w") as f: + - for line in (1,) if True else (2,): + - f.write(line) +202 + f.writelines((1,) if True else (2,)) +203 | +204 | +205 | # don't add extra parentheses if they're already parenthesized FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:209:9 @@ -420,17 +386,15 @@ FURB122 [*] Use of `f.write` in a for loop | |______________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -206 206 | # don't add extra parentheses if they're already parenthesized -207 207 | def _(): -208 208 | with open("file", "w") as f: -209 |- for line in (lambda: 0): -210 |- f.write(f"{line}") - 209 |+ f.writelines(f"{line}" for line in (lambda: 0)) -211 210 | -212 211 | -213 212 | def _(): +206 | # don't add extra parentheses if they're already parenthesized +207 | def _(): +208 | with open("file", "w") as f: + - for line in (lambda: 0): + - f.write(f"{line}") +209 + f.writelines(f"{line}" for line in (lambda: 0)) +210 | +211 | +212 | def _(): FURB122 [*] Use of `f.write` in a for loop --> FURB122.py:215:9 @@ -442,11 +406,9 @@ FURB122 [*] Use of `f.write` in a for loop | |______________________________^ | help: Replace with `f.writelines` - -ℹ Safe fix -212 212 | -213 213 | def _(): -214 214 | with open("file", "w") as f: -215 |- for line in ((1,) if True else (2,)): -216 |- f.write(f"{line}") - 215 |+ f.writelines(f"{line}" for line in ((1,) if True else (2,))) +212 | +213 | def _(): +214 | with open("file", "w") as f: + - for line in ((1,) if True else (2,)): + - f.write(f"{line}") +215 + f.writelines(f"{line}" for line in ((1,) if True else (2,))) diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap index 5a7985327d..2daffe28c1 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB129_FURB129.py.snap @@ -12,16 +12,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 9 | a = [line.lower() for line in f.readlines()] | help: Remove `readlines()` - -ℹ Safe fix -4 4 | -5 5 | # Errors -6 6 | with open("FURB129.py") as f: -7 |- for _line in f.readlines(): - 7 |+ for _line in f: -8 8 | pass -9 9 | a = [line.lower() for line in f.readlines()] -10 10 | b = {line.upper() for line in f.readlines()} +4 | +5 | # Errors +6 | with open("FURB129.py") as f: + - for _line in f.readlines(): +7 + for _line in f: +8 | pass +9 | a = [line.lower() for line in f.readlines()] +10 | b = {line.upper() for line in f.readlines()} FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:9:35 @@ -34,16 +32,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 11 | c = {line.lower(): line.upper() for line in f.readlines()} | help: Remove `readlines()` - -ℹ Safe fix -6 6 | with open("FURB129.py") as f: -7 7 | for _line in f.readlines(): -8 8 | pass -9 |- a = [line.lower() for line in f.readlines()] - 9 |+ a = [line.lower() for line in f] -10 10 | b = {line.upper() for line in f.readlines()} -11 11 | c = {line.lower(): line.upper() for line in f.readlines()} -12 12 | +6 | with open("FURB129.py") as f: +7 | for _line in f.readlines(): +8 | pass + - a = [line.lower() for line in f.readlines()] +9 + a = [line.lower() for line in f] +10 | b = {line.upper() for line in f.readlines()} +11 | c = {line.lower(): line.upper() for line in f.readlines()} +12 | FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:10:35 @@ -55,16 +51,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 11 | c = {line.lower(): line.upper() for line in f.readlines()} | help: Remove `readlines()` - -ℹ Safe fix -7 7 | for _line in f.readlines(): -8 8 | pass -9 9 | a = [line.lower() for line in f.readlines()] -10 |- b = {line.upper() for line in f.readlines()} - 10 |+ b = {line.upper() for line in f} -11 11 | c = {line.lower(): line.upper() for line in f.readlines()} -12 12 | -13 13 | with Path("FURB129.py").open() as f: +7 | for _line in f.readlines(): +8 | pass +9 | a = [line.lower() for line in f.readlines()] + - b = {line.upper() for line in f.readlines()} +10 + b = {line.upper() for line in f} +11 | c = {line.lower(): line.upper() for line in f.readlines()} +12 | +13 | with Path("FURB129.py").open() as f: FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:11:49 @@ -77,16 +71,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 13 | with Path("FURB129.py").open() as f: | help: Remove `readlines()` - -ℹ Safe fix -8 8 | pass -9 9 | a = [line.lower() for line in f.readlines()] -10 10 | b = {line.upper() for line in f.readlines()} -11 |- c = {line.lower(): line.upper() for line in f.readlines()} - 11 |+ c = {line.lower(): line.upper() for line in f} -12 12 | -13 13 | with Path("FURB129.py").open() as f: -14 14 | for _line in f.readlines(): +8 | pass +9 | a = [line.lower() for line in f.readlines()] +10 | b = {line.upper() for line in f.readlines()} + - c = {line.lower(): line.upper() for line in f.readlines()} +11 + c = {line.lower(): line.upper() for line in f} +12 | +13 | with Path("FURB129.py").open() as f: +14 | for _line in f.readlines(): FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:14:18 @@ -97,16 +89,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 15 | pass | help: Remove `readlines()` - -ℹ Safe fix -11 11 | c = {line.lower(): line.upper() for line in f.readlines()} -12 12 | -13 13 | with Path("FURB129.py").open() as f: -14 |- for _line in f.readlines(): - 14 |+ for _line in f: -15 15 | pass -16 16 | -17 17 | for _line in open("FURB129.py").readlines(): +11 | c = {line.lower(): line.upper() for line in f.readlines()} +12 | +13 | with Path("FURB129.py").open() as f: + - for _line in f.readlines(): +14 + for _line in f: +15 | pass +16 | +17 | for _line in open("FURB129.py").readlines(): FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:17:14 @@ -118,16 +108,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 18 | pass | help: Remove `readlines()` - -ℹ Safe fix -14 14 | for _line in f.readlines(): -15 15 | pass -16 16 | -17 |-for _line in open("FURB129.py").readlines(): - 17 |+for _line in open("FURB129.py"): -18 18 | pass -19 19 | -20 20 | for _line in Path("FURB129.py").open().readlines(): +14 | for _line in f.readlines(): +15 | pass +16 | + - for _line in open("FURB129.py").readlines(): +17 + for _line in open("FURB129.py"): +18 | pass +19 | +20 | for _line in Path("FURB129.py").open().readlines(): FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:20:14 @@ -139,16 +127,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 21 | pass | help: Remove `readlines()` - -ℹ Safe fix -17 17 | for _line in open("FURB129.py").readlines(): -18 18 | pass -19 19 | -20 |-for _line in Path("FURB129.py").open().readlines(): - 20 |+for _line in Path("FURB129.py").open(): -21 21 | pass -22 22 | -23 23 | +17 | for _line in open("FURB129.py").readlines(): +18 | pass +19 | + - for _line in Path("FURB129.py").open().readlines(): +20 + for _line in Path("FURB129.py").open(): +21 | pass +22 | +23 | FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:26:18 @@ -161,16 +147,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 28 | f.close() | help: Remove `readlines()` - -ℹ Safe fix -23 23 | -24 24 | def func(): -25 25 | f = Path("FURB129.py").open() -26 |- for _line in f.readlines(): - 26 |+ for _line in f: -27 27 | pass -28 28 | f.close() -29 29 | +23 | +24 | def func(): +25 | f = Path("FURB129.py").open() + - for _line in f.readlines(): +26 + for _line in f: +27 | pass +28 | f.close() +29 | FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:32:18 @@ -181,16 +165,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 33 | pass | help: Remove `readlines()` - -ℹ Safe fix -29 29 | -30 30 | -31 31 | def func(f: io.BytesIO): -32 |- for _line in f.readlines(): - 32 |+ for _line in f: -33 33 | pass -34 34 | -35 35 | +29 | +30 | +31 | def func(f: io.BytesIO): + - for _line in f.readlines(): +32 + for _line in f: +33 | pass +34 | +35 | FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:38:22 @@ -203,16 +185,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 40 | for _line in bar.readlines(): | help: Remove `readlines()` - -ℹ Safe fix -35 35 | -36 36 | def func(): -37 37 | with (open("FURB129.py") as f, foo as bar): -38 |- for _line in f.readlines(): - 38 |+ for _line in f: -39 39 | pass -40 40 | for _line in bar.readlines(): -41 41 | pass +35 | +36 | def func(): +37 | with (open("FURB129.py") as f, foo as bar): + - for _line in f.readlines(): +38 + for _line in f: +39 | pass +40 | for _line in bar.readlines(): +41 | pass FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:47:17 @@ -223,16 +203,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 48 | pass | help: Remove `readlines()` - -ℹ Safe fix -44 44 | import builtins -45 45 | -46 46 | with builtins.open("FURB129.py") as f: -47 |- for line in f.readlines(): - 47 |+ for line in f: -48 48 | pass -49 49 | -50 50 | +44 | import builtins +45 | +46 | with builtins.open("FURB129.py") as f: + - for line in f.readlines(): +47 + for line in f: +48 | pass +49 | +50 | FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:54:17 @@ -243,16 +221,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 55 | pass | help: Remove `readlines()` - -ℹ Safe fix -51 51 | from builtins import open as o -52 52 | -53 53 | with o("FURB129.py") as f: -54 |- for line in f.readlines(): - 54 |+ for line in f: -55 55 | pass -56 56 | -57 57 | +51 | from builtins import open as o +52 | +53 | with o("FURB129.py") as f: + - for line in f.readlines(): +54 + for line in f: +55 | pass +56 | +57 | FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:93:17 @@ -264,16 +240,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 94 | pass | help: Remove `readlines()` - -ℹ Safe fix -90 90 | -91 91 | # https://github.com/astral-sh/ruff/issues/18231 -92 92 | with open("furb129.py") as f: -93 |- for line in (f).readlines(): - 93 |+ for line in (f): -94 94 | pass -95 95 | -96 96 | with open("furb129.py") as f: +90 | +91 | # https://github.com/astral-sh/ruff/issues/18231 +92 | with open("furb129.py") as f: + - for line in (f).readlines(): +93 + for line in (f): +94 | pass +95 | +96 | with open("furb129.py") as f: FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:97:23 @@ -283,16 +257,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly | ^^^^^^^^^^^^^^^ | help: Remove `readlines()` - -ℹ Safe fix -94 94 | pass -95 95 | -96 96 | with open("furb129.py") as f: -97 |- [line for line in (f).readlines()] - 97 |+ [line for line in (f)] -98 98 | -99 99 | -100 100 | with open("furb129.py") as f: +94 | pass +95 | +96 | with open("furb129.py") as f: + - [line for line in (f).readlines()] +97 + [line for line in (f)] +98 | +99 | +100 | with open("furb129.py") as f: FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:101:17 @@ -304,16 +276,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 103 | for line in(f).readlines(): | help: Remove `readlines()` - -ℹ Safe fix -98 98 | -99 99 | -100 100 | with open("furb129.py") as f: -101 |- for line in (((f))).readlines(): - 101 |+ for line in (((f))): -102 102 | pass -103 103 | for line in(f).readlines(): -104 104 | pass +98 | +99 | +100 | with open("furb129.py") as f: + - for line in (((f))).readlines(): +101 + for line in (((f))): +102 | pass +103 | for line in(f).readlines(): +104 | pass FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:103:16 @@ -325,16 +295,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 104 | pass | help: Remove `readlines()` - -ℹ Safe fix -100 100 | with open("furb129.py") as f: -101 101 | for line in (((f))).readlines(): -102 102 | pass -103 |- for line in(f).readlines(): - 103 |+ for line in(f): -104 104 | pass -105 105 | -106 106 | # Test case for issue #17683 (missing space before keyword) +100 | with open("furb129.py") as f: +101 | for line in (((f))).readlines(): +102 | pass + - for line in(f).readlines(): +103 + for line in(f): +104 | pass +105 | +106 | # Test case for issue #17683 (missing space before keyword) FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:107:29 @@ -346,16 +314,14 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 109 | # https://github.com/astral-sh/ruff/issues/18843 | help: Remove `readlines()` - -ℹ Safe fix -104 104 | pass -105 105 | -106 106 | # Test case for issue #17683 (missing space before keyword) -107 |- print([line for line in f.readlines()if True]) - 107 |+ print([line for line in f if True]) -108 108 | -109 109 | # https://github.com/astral-sh/ruff/issues/18843 -110 110 | with open("file.txt") as fp: +104 | pass +105 | +106 | # Test case for issue #17683 (missing space before keyword) + - print([line for line in f.readlines()if True]) +107 + print([line for line in f if True]) +108 | +109 | # https://github.com/astral-sh/ruff/issues/18843 +110 | with open("file.txt") as fp: FURB129 [*] Instead of calling `readlines()`, iterate over file object directly --> FURB129.py:112:9 @@ -370,14 +336,13 @@ FURB129 [*] Instead of calling `readlines()`, iterate over file object directly 116 | ... | help: Remove `readlines()` - -ℹ Unsafe fix -109 109 | # https://github.com/astral-sh/ruff/issues/18843 -110 110 | with open("file.txt") as fp: -111 111 | for line in ( # 1 -112 |- fp. # 3 # 2 -113 |- readlines( # 4 -114 |- ) # 5 - 112 |+ fp # 5 -115 113 | ): -116 114 | ... +109 | # https://github.com/astral-sh/ruff/issues/18843 +110 | with open("file.txt") as fp: +111 | for line in ( # 1 + - fp. # 3 # 2 + - readlines( # 4 + - ) # 5 +112 + fp # 5 +113 | ): +114 | ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap index ad12904da8..a6c6729426 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB131_FURB131.py.snap @@ -9,16 +9,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice | ^^^^^^^^^^^ | help: Replace with `clear()` - -ℹ Unsafe fix -8 8 | # these should match -9 9 | -10 10 | # FURB131 -11 |-del nums[:] - 11 |+nums.clear() -12 12 | -13 13 | -14 14 | # FURB131 +8 | # these should match +9 | +10 | # FURB131 + - del nums[:] +11 + nums.clear() +12 | +13 | +14 | # FURB131 +note: This is an unsafe fix and may change runtime behavior FURB131 [*] Prefer `clear` over deleting a full slice --> FURB131.py:15:1 @@ -28,16 +27,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice | ^^^^^^^^^^^^ | help: Replace with `clear()` - -ℹ Unsafe fix -12 12 | -13 13 | -14 14 | # FURB131 -15 |-del names[:] - 15 |+names.clear() -16 16 | -17 17 | -18 18 | # FURB131 +12 | +13 | +14 | # FURB131 + - del names[:] +15 + names.clear() +16 | +17 | +18 | # FURB131 +note: This is an unsafe fix and may change runtime behavior FURB131 Prefer `clear` over deleting a full slice --> FURB131.py:19:1 @@ -66,16 +64,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice | ^^^^^^^^ | help: Replace with `clear()` - -ℹ Unsafe fix -25 25 | -26 26 | def yes_one(x: list[int]): -27 27 | # FURB131 -28 |- del x[:] - 28 |+ x.clear() -29 29 | -30 30 | -31 31 | def yes_two(x: dict[int, str]): +25 | +26 | def yes_one(x: list[int]): +27 | # FURB131 + - del x[:] +28 + x.clear() +29 | +30 | +31 | def yes_two(x: dict[int, str]): +note: This is an unsafe fix and may change runtime behavior FURB131 [*] Prefer `clear` over deleting a full slice --> FURB131.py:33:5 @@ -86,16 +83,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice | ^^^^^^^^ | help: Replace with `clear()` - -ℹ Unsafe fix -30 30 | -31 31 | def yes_two(x: dict[int, str]): -32 32 | # FURB131 -33 |- del x[:] - 33 |+ x.clear() -34 34 | -35 35 | -36 36 | def yes_three(x: List[int]): +30 | +31 | def yes_two(x: dict[int, str]): +32 | # FURB131 + - del x[:] +33 + x.clear() +34 | +35 | +36 | def yes_three(x: List[int]): +note: This is an unsafe fix and may change runtime behavior FURB131 [*] Prefer `clear` over deleting a full slice --> FURB131.py:38:5 @@ -106,16 +102,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice | ^^^^^^^^ | help: Replace with `clear()` - -ℹ Unsafe fix -35 35 | -36 36 | def yes_three(x: List[int]): -37 37 | # FURB131 -38 |- del x[:] - 38 |+ x.clear() -39 39 | -40 40 | -41 41 | def yes_four(x: Dict[int, str]): +35 | +36 | def yes_three(x: List[int]): +37 | # FURB131 + - del x[:] +38 + x.clear() +39 | +40 | +41 | def yes_four(x: Dict[int, str]): +note: This is an unsafe fix and may change runtime behavior FURB131 [*] Prefer `clear` over deleting a full slice --> FURB131.py:43:5 @@ -126,16 +121,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice | ^^^^^^^^ | help: Replace with `clear()` - -ℹ Unsafe fix -40 40 | -41 41 | def yes_four(x: Dict[int, str]): -42 42 | # FURB131 -43 |- del x[:] - 43 |+ x.clear() -44 44 | -45 45 | -46 46 | def yes_five(x: Dict[int, str]): +40 | +41 | def yes_four(x: Dict[int, str]): +42 | # FURB131 + - del x[:] +43 + x.clear() +44 | +45 | +46 | def yes_five(x: Dict[int, str]): +note: This is an unsafe fix and may change runtime behavior FURB131 [*] Prefer `clear` over deleting a full slice --> FURB131.py:48:5 @@ -148,16 +142,15 @@ FURB131 [*] Prefer `clear` over deleting a full slice 50 | x = 1 | help: Replace with `clear()` - -ℹ Unsafe fix -45 45 | -46 46 | def yes_five(x: Dict[int, str]): -47 47 | # FURB131 -48 |- del x[:] - 48 |+ x.clear() -49 49 | -50 50 | x = 1 -51 51 | +45 | +46 | def yes_five(x: Dict[int, str]): +47 | # FURB131 + - del x[:] +48 + x.clear() +49 | +50 | x = 1 +51 | +note: This is an unsafe fix and may change runtime behavior FURB131 [*] Prefer `clear` over deleting a full slice --> FURB131.py:58:1 @@ -170,13 +163,12 @@ FURB131 [*] Prefer `clear` over deleting a full slice 60 | # these should not | help: Replace with `clear()` - -ℹ Unsafe fix -55 55 | -56 56 | sneaky = SneakyList() -57 57 | # FURB131 -58 |-del sneaky[:] - 58 |+sneaky.clear() -59 59 | -60 60 | # these should not -61 61 | +55 | +56 | sneaky = SneakyList() +57 | # FURB131 + - del sneaky[:] +58 + sneaky.clear() +59 | +60 | # these should not +61 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap index 33f04dcf7c..96036e508d 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB132_FURB132.py.snap @@ -10,17 +10,16 @@ FURB132 [*] Use `s.discard("x")` instead of check and `remove` | |_________________^ | help: Replace with `s.discard("x")` - -ℹ Unsafe fix -9 9 | # these should match -10 10 | -11 11 | # FURB132 -12 |-if "x" in s: -13 |- s.remove("x") - 12 |+s.discard("x") -14 13 | -15 14 | -16 15 | # FURB132 +9 | # these should match +10 | +11 | # FURB132 + - if "x" in s: + - s.remove("x") +12 + s.discard("x") +13 | +14 | +15 | # FURB132 +note: This is an unsafe fix and may change runtime behavior FURB132 [*] Use `s3.discard("x")` instead of check and `remove` --> FURB132.py:22:1 @@ -31,17 +30,16 @@ FURB132 [*] Use `s3.discard("x")` instead of check and `remove` | |__________________^ | help: Replace with `s3.discard("x")` - -ℹ Unsafe fix -19 19 | -20 20 | -21 21 | # FURB132 -22 |-if "x" in s3: -23 |- s3.remove("x") - 22 |+s3.discard("x") -24 23 | -25 24 | -26 25 | var = "y" +19 | +20 | +21 | # FURB132 + - if "x" in s3: + - s3.remove("x") +22 + s3.discard("x") +23 | +24 | +25 | var = "y" +note: This is an unsafe fix and may change runtime behavior FURB132 [*] Use `s.discard(var)` instead of check and `remove` --> FURB132.py:28:1 @@ -53,17 +51,16 @@ FURB132 [*] Use `s.discard(var)` instead of check and `remove` | |_________________^ | help: Replace with `s.discard(var)` - -ℹ Unsafe fix -25 25 | -26 26 | var = "y" -27 27 | # FURB132 -28 |-if var in s: -29 |- s.remove(var) - 28 |+s.discard(var) -30 29 | -31 30 | -32 31 | if f"{var}:{var}" in s: +25 | +26 | var = "y" +27 | # FURB132 + - if var in s: + - s.remove(var) +28 + s.discard(var) +29 | +30 | +31 | if f"{var}:{var}" in s: +note: This is an unsafe fix and may change runtime behavior FURB132 [*] Use `s.discard(f"{var}:{var}")` instead of check and `remove` --> FURB132.py:32:1 @@ -73,14 +70,13 @@ FURB132 [*] Use `s.discard(f"{var}:{var}")` instead of check and `remove` | |____________________________^ | help: Replace with `s.discard(f"{var}:{var}")` - -ℹ Unsafe fix -29 29 | s.remove(var) -30 30 | -31 31 | -32 |-if f"{var}:{var}" in s: -33 |- s.remove(f"{var}:{var}") - 32 |+s.discard(f"{var}:{var}") -34 33 | -35 34 | -36 35 | def identity(x): +29 | s.remove(var) +30 | +31 | + - if f"{var}:{var}" in s: + - s.remove(f"{var}:{var}") +32 + s.discard(f"{var}:{var}") +33 | +34 | +35 | def identity(x): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap index 6cb09b7785..f5b0efd703 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB136_FURB136.py.snap @@ -12,16 +12,14 @@ FURB136 [*] Replace `x if x > y else y` with `max(y, x)` 6 | x if x >= y else y # FURB136 | help: Replace with `max(y, x)` - -ℹ Safe fix -1 1 | x = 1 -2 2 | y = 2 -3 3 | -4 |-x if x > y else y # FURB136 - 4 |+max(y, x) # FURB136 -5 5 | -6 6 | x if x >= y else y # FURB136 -7 7 | +1 | x = 1 +2 | y = 2 +3 | + - x if x > y else y # FURB136 +4 + max(y, x) # FURB136 +5 | +6 | x if x >= y else y # FURB136 +7 | FURB136 [*] Replace `x if x >= y else y` with `max(x, y)` --> FURB136.py:6:1 @@ -34,16 +32,14 @@ FURB136 [*] Replace `x if x >= y else y` with `max(x, y)` 8 | x if x < y else y # FURB136 | help: Replace with `max(x, y)` - -ℹ Safe fix -3 3 | -4 4 | x if x > y else y # FURB136 -5 5 | -6 |-x if x >= y else y # FURB136 - 6 |+max(x, y) # FURB136 -7 7 | -8 8 | x if x < y else y # FURB136 -9 9 | +3 | +4 | x if x > y else y # FURB136 +5 | + - x if x >= y else y # FURB136 +6 + max(x, y) # FURB136 +7 | +8 | x if x < y else y # FURB136 +9 | FURB136 [*] Replace `x if x < y else y` with `min(y, x)` --> FURB136.py:8:1 @@ -56,16 +52,14 @@ FURB136 [*] Replace `x if x < y else y` with `min(y, x)` 10 | x if x <= y else y # FURB136 | help: Replace with `min(y, x)` - -ℹ Safe fix -5 5 | -6 6 | x if x >= y else y # FURB136 -7 7 | -8 |-x if x < y else y # FURB136 - 8 |+min(y, x) # FURB136 -9 9 | -10 10 | x if x <= y else y # FURB136 -11 11 | +5 | +6 | x if x >= y else y # FURB136 +7 | + - x if x < y else y # FURB136 +8 + min(y, x) # FURB136 +9 | +10 | x if x <= y else y # FURB136 +11 | FURB136 [*] Replace `x if x <= y else y` with `min(x, y)` --> FURB136.py:10:1 @@ -78,16 +72,14 @@ FURB136 [*] Replace `x if x <= y else y` with `min(x, y)` 12 | y if x > y else x # FURB136 | help: Replace with `min(x, y)` - -ℹ Safe fix -7 7 | -8 8 | x if x < y else y # FURB136 -9 9 | -10 |-x if x <= y else y # FURB136 - 10 |+min(x, y) # FURB136 -11 11 | -12 12 | y if x > y else x # FURB136 -13 13 | +7 | +8 | x if x < y else y # FURB136 +9 | + - x if x <= y else y # FURB136 +10 + min(x, y) # FURB136 +11 | +12 | y if x > y else x # FURB136 +13 | FURB136 [*] Replace `y if x > y else x` with `min(x, y)` --> FURB136.py:12:1 @@ -100,16 +92,14 @@ FURB136 [*] Replace `y if x > y else x` with `min(x, y)` 14 | y if x >= y else x # FURB136 | help: Replace with `min(x, y)` - -ℹ Safe fix -9 9 | -10 10 | x if x <= y else y # FURB136 -11 11 | -12 |-y if x > y else x # FURB136 - 12 |+min(x, y) # FURB136 -13 13 | -14 14 | y if x >= y else x # FURB136 -15 15 | +9 | +10 | x if x <= y else y # FURB136 +11 | + - y if x > y else x # FURB136 +12 + min(x, y) # FURB136 +13 | +14 | y if x >= y else x # FURB136 +15 | FURB136 [*] Replace `y if x >= y else x` with `min(y, x)` --> FURB136.py:14:1 @@ -122,16 +112,14 @@ FURB136 [*] Replace `y if x >= y else x` with `min(y, x)` 16 | y if x < y else x # FURB136 | help: Replace with `min(y, x)` - -ℹ Safe fix -11 11 | -12 12 | y if x > y else x # FURB136 -13 13 | -14 |-y if x >= y else x # FURB136 - 14 |+min(y, x) # FURB136 -15 15 | -16 16 | y if x < y else x # FURB136 -17 17 | +11 | +12 | y if x > y else x # FURB136 +13 | + - y if x >= y else x # FURB136 +14 + min(y, x) # FURB136 +15 | +16 | y if x < y else x # FURB136 +17 | FURB136 [*] Replace `y if x < y else x` with `max(x, y)` --> FURB136.py:16:1 @@ -144,16 +132,14 @@ FURB136 [*] Replace `y if x < y else x` with `max(x, y)` 18 | y if x <= y else x # FURB136 | help: Replace with `max(x, y)` - -ℹ Safe fix -13 13 | -14 14 | y if x >= y else x # FURB136 -15 15 | -16 |-y if x < y else x # FURB136 - 16 |+max(x, y) # FURB136 -17 17 | -18 18 | y if x <= y else x # FURB136 -19 19 | +13 | +14 | y if x >= y else x # FURB136 +15 | + - y if x < y else x # FURB136 +16 + max(x, y) # FURB136 +17 | +18 | y if x <= y else x # FURB136 +19 | FURB136 [*] Replace `y if x <= y else x` with `max(y, x)` --> FURB136.py:18:1 @@ -166,16 +152,14 @@ FURB136 [*] Replace `y if x <= y else x` with `max(y, x)` 20 | x + y if x > y else y # OK | help: Replace with `max(y, x)` - -ℹ Safe fix -15 15 | -16 16 | y if x < y else x # FURB136 -17 17 | -18 |-y if x <= y else x # FURB136 - 18 |+max(y, x) # FURB136 -19 19 | -20 20 | x + y if x > y else y # OK -21 21 | +15 | +16 | y if x < y else x # FURB136 +17 | + - y if x <= y else x # FURB136 +18 + max(y, x) # FURB136 +19 | +20 | x + y if x > y else y # OK +21 | FURB136 [*] Replace `if` expression with `max(y, x)` --> FURB136.py:22:1 @@ -189,13 +173,11 @@ FURB136 [*] Replace `if` expression with `max(y, x)` | |________^ | help: Replace with `max(y, x)` - -ℹ Safe fix -19 19 | -20 20 | x + y if x > y else y # OK -21 21 | -22 |-x if ( -23 |- x -24 |- > y -25 |-) else y # FURB136 - 22 |+max(y, x) # FURB136 +19 | +20 | x + y if x > y else y # OK +21 | + - x if ( + - x + - > y + - ) else y # FURB136 +22 + max(y, x) # FURB136 diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap index 28058f73ce..515d7764bb 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB140_FURB140.py.snap @@ -11,20 +11,18 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 9 | # FURB140 | help: Replace with `itertools.starmap` - -ℹ Safe fix - 1 |+from itertools import starmap -1 2 | def zipped(): -2 3 | return zip([1, 2, 3], "ABC") -3 4 | -4 5 | # Errors. -5 6 | -6 7 | # FURB140 -7 |-[print(x, y) for x, y in zipped()] - 8 |+list(starmap(print, zipped())) -8 9 | -9 10 | # FURB140 -10 11 | (print(x, y) for x, y in zipped()) +1 + from itertools import starmap +2 | def zipped(): +3 | return zip([1, 2, 3], "ABC") +4 | +5 | # Errors. +6 | +7 | # FURB140 + - [print(x, y) for x, y in zipped()] +8 + list(starmap(print, zipped())) +9 | +10 | # FURB140 +11 | (print(x, y) for x, y in zipped()) FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:10:1 @@ -36,21 +34,19 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 12 | # FURB140 | help: Replace with `itertools.starmap` - -ℹ Safe fix - 1 |+from itertools import starmap -1 2 | def zipped(): -2 3 | return zip([1, 2, 3], "ABC") -3 4 | +1 + from itertools import starmap +2 | def zipped(): +3 | return zip([1, 2, 3], "ABC") +4 | -------------------------------------------------------------------------------- -7 8 | [print(x, y) for x, y in zipped()] -8 9 | -9 10 | # FURB140 -10 |-(print(x, y) for x, y in zipped()) - 11 |+starmap(print, zipped()) -11 12 | -12 13 | # FURB140 -13 14 | {print(x, y) for x, y in zipped()} +8 | [print(x, y) for x, y in zipped()] +9 | +10 | # FURB140 + - (print(x, y) for x, y in zipped()) +11 + starmap(print, zipped()) +12 | +13 | # FURB140 +14 | {print(x, y) for x, y in zipped()} FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:13:1 @@ -60,21 +56,19 @@ FURB140 [*] Use `itertools.starmap` instead of the generator | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `itertools.starmap` - -ℹ Safe fix - 1 |+from itertools import starmap -1 2 | def zipped(): -2 3 | return zip([1, 2, 3], "ABC") -3 4 | +1 + from itertools import starmap +2 | def zipped(): +3 | return zip([1, 2, 3], "ABC") +4 | -------------------------------------------------------------------------------- -10 11 | (print(x, y) for x, y in zipped()) -11 12 | -12 13 | # FURB140 -13 |-{print(x, y) for x, y in zipped()} - 14 |+set(starmap(print, zipped())) -14 15 | -15 16 | -16 17 | from itertools import starmap as sm +11 | (print(x, y) for x, y in zipped()) +12 | +13 | # FURB140 + - {print(x, y) for x, y in zipped()} +14 + set(starmap(print, zipped())) +15 | +16 | +17 | from itertools import starmap as sm FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:19:1 @@ -86,16 +80,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 21 | # FURB140 | help: Replace with `itertools.starmap` - -ℹ Safe fix -16 16 | from itertools import starmap as sm -17 17 | -18 18 | # FURB140 -19 |-[print(x, y) for x, y in zipped()] - 19 |+list(sm(print, zipped())) -20 20 | -21 21 | # FURB140 -22 22 | (print(x, y) for x, y in zipped()) +16 | from itertools import starmap as sm +17 | +18 | # FURB140 + - [print(x, y) for x, y in zipped()] +19 + list(sm(print, zipped())) +20 | +21 | # FURB140 +22 | (print(x, y) for x, y in zipped()) FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:22:1 @@ -107,16 +99,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 24 | # FURB140 | help: Replace with `itertools.starmap` - -ℹ Safe fix -19 19 | [print(x, y) for x, y in zipped()] -20 20 | -21 21 | # FURB140 -22 |-(print(x, y) for x, y in zipped()) - 22 |+sm(print, zipped()) -23 23 | -24 24 | # FURB140 -25 25 | {print(x, y) for x, y in zipped()} +19 | [print(x, y) for x, y in zipped()] +20 | +21 | # FURB140 + - (print(x, y) for x, y in zipped()) +22 + sm(print, zipped()) +23 | +24 | # FURB140 +25 | {print(x, y) for x, y in zipped()} FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:25:1 @@ -128,16 +118,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 27 | # FURB140 (check it still flags starred arguments). | help: Replace with `itertools.starmap` - -ℹ Safe fix -22 22 | (print(x, y) for x, y in zipped()) -23 23 | -24 24 | # FURB140 -25 |-{print(x, y) for x, y in zipped()} - 25 |+set(sm(print, zipped())) -26 26 | -27 27 | # FURB140 (check it still flags starred arguments). -28 28 | # See https://github.com/astral-sh/ruff/issues/7636 +22 | (print(x, y) for x, y in zipped()) +23 | +24 | # FURB140 + - {print(x, y) for x, y in zipped()} +25 + set(sm(print, zipped())) +26 | +27 | # FURB140 (check it still flags starred arguments). +28 | # See https://github.com/astral-sh/ruff/issues/7636 FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:29:1 @@ -150,16 +138,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 31 | {foo(*t) for t in [(85, 60), (100, 80)]} | help: Replace with `itertools.starmap` - -ℹ Safe fix -26 26 | -27 27 | # FURB140 (check it still flags starred arguments). -28 28 | # See https://github.com/astral-sh/ruff/issues/7636 -29 |-[foo(*t) for t in [(85, 60), (100, 80)]] - 29 |+list(sm(foo, [(85, 60), (100, 80)])) -30 30 | (foo(*t) for t in [(85, 60), (100, 80)]) -31 31 | {foo(*t) for t in [(85, 60), (100, 80)]} -32 32 | +26 | +27 | # FURB140 (check it still flags starred arguments). +28 | # See https://github.com/astral-sh/ruff/issues/7636 + - [foo(*t) for t in [(85, 60), (100, 80)]] +29 + list(sm(foo, [(85, 60), (100, 80)])) +30 | (foo(*t) for t in [(85, 60), (100, 80)]) +31 | {foo(*t) for t in [(85, 60), (100, 80)]} +32 | FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:30:1 @@ -171,16 +157,14 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 31 | {foo(*t) for t in [(85, 60), (100, 80)]} | help: Replace with `itertools.starmap` - -ℹ Safe fix -27 27 | # FURB140 (check it still flags starred arguments). -28 28 | # See https://github.com/astral-sh/ruff/issues/7636 -29 29 | [foo(*t) for t in [(85, 60), (100, 80)]] -30 |-(foo(*t) for t in [(85, 60), (100, 80)]) - 30 |+sm(foo, [(85, 60), (100, 80)]) -31 31 | {foo(*t) for t in [(85, 60), (100, 80)]} -32 32 | -33 33 | # Non-errors. +27 | # FURB140 (check it still flags starred arguments). +28 | # See https://github.com/astral-sh/ruff/issues/7636 +29 | [foo(*t) for t in [(85, 60), (100, 80)]] + - (foo(*t) for t in [(85, 60), (100, 80)]) +30 + sm(foo, [(85, 60), (100, 80)]) +31 | {foo(*t) for t in [(85, 60), (100, 80)]} +32 | +33 | # Non-errors. FURB140 [*] Use `itertools.starmap` instead of the generator --> FURB140.py:31:1 @@ -193,13 +177,11 @@ FURB140 [*] Use `itertools.starmap` instead of the generator 33 | # Non-errors. | help: Replace with `itertools.starmap` - -ℹ Safe fix -28 28 | # See https://github.com/astral-sh/ruff/issues/7636 -29 29 | [foo(*t) for t in [(85, 60), (100, 80)]] -30 30 | (foo(*t) for t in [(85, 60), (100, 80)]) -31 |-{foo(*t) for t in [(85, 60), (100, 80)]} - 31 |+set(sm(foo, [(85, 60), (100, 80)])) -32 32 | -33 33 | # Non-errors. -34 34 | +28 | # See https://github.com/astral-sh/ruff/issues/7636 +29 | [foo(*t) for t in [(85, 60), (100, 80)]] +30 | (foo(*t) for t in [(85, 60), (100, 80)]) + - {foo(*t) for t in [(85, 60), (100, 80)]} +31 + set(sm(foo, [(85, 60), (100, 80)])) +32 | +33 | # Non-errors. +34 | diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap index b37a7c2d17..4133f63c72 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB142_FURB142.py.snap @@ -13,17 +13,15 @@ FURB142 [*] Use of `set.add()` in a for loop 8 | for x in {1, 2, 3}: | help: Replace with `.update()` - -ℹ Safe fix -2 2 | -3 3 | s = set() -4 4 | -5 |-for x in [1, 2, 3]: -6 |- s.add(x) - 5 |+s.update([1, 2, 3]) -7 6 | -8 7 | for x in {1, 2, 3}: -9 8 | s.add(x) +2 | +3 | s = set() +4 | + - for x in [1, 2, 3]: + - s.add(x) +5 + s.update([1, 2, 3]) +6 | +7 | for x in {1, 2, 3}: +8 | s.add(x) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:8:1 @@ -37,17 +35,15 @@ FURB142 [*] Use of `set.add()` in a for loop 11 | for x in (1, 2, 3): | help: Replace with `.update()` - -ℹ Safe fix -5 5 | for x in [1, 2, 3]: -6 6 | s.add(x) -7 7 | -8 |-for x in {1, 2, 3}: -9 |- s.add(x) - 8 |+s.update({1, 2, 3}) -10 9 | -11 10 | for x in (1, 2, 3): -12 11 | s.add(x) +5 | for x in [1, 2, 3]: +6 | s.add(x) +7 | + - for x in {1, 2, 3}: + - s.add(x) +8 + s.update({1, 2, 3}) +9 | +10 | for x in (1, 2, 3): +11 | s.add(x) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:11:1 @@ -61,17 +57,15 @@ FURB142 [*] Use of `set.add()` in a for loop 14 | for x in (1, 2, 3): | help: Replace with `.update()` - -ℹ Safe fix -8 8 | for x in {1, 2, 3}: -9 9 | s.add(x) -10 10 | -11 |-for x in (1, 2, 3): -12 |- s.add(x) - 11 |+s.update((1, 2, 3)) -13 12 | -14 13 | for x in (1, 2, 3): -15 14 | s.discard(x) +8 | for x in {1, 2, 3}: +9 | s.add(x) +10 | + - for x in (1, 2, 3): + - s.add(x) +11 + s.update((1, 2, 3)) +12 | +13 | for x in (1, 2, 3): +14 | s.discard(x) FURB142 [*] Use of `set.discard()` in a for loop --> FURB142.py:14:1 @@ -85,17 +79,15 @@ FURB142 [*] Use of `set.discard()` in a for loop 17 | for x in (1, 2, 3): | help: Replace with `.difference_update()` - -ℹ Safe fix -11 11 | for x in (1, 2, 3): -12 12 | s.add(x) -13 13 | -14 |-for x in (1, 2, 3): -15 |- s.discard(x) - 14 |+s.difference_update((1, 2, 3)) -16 15 | -17 16 | for x in (1, 2, 3): -18 17 | s.add(x + 1) +11 | for x in (1, 2, 3): +12 | s.add(x) +13 | + - for x in (1, 2, 3): + - s.discard(x) +14 + s.difference_update((1, 2, 3)) +15 | +16 | for x in (1, 2, 3): +17 | s.add(x + 1) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:17:1 @@ -109,17 +101,15 @@ FURB142 [*] Use of `set.add()` in a for loop 20 | for x, y in ((1, 2), (3, 4)): | help: Replace with `.update()` - -ℹ Safe fix -14 14 | for x in (1, 2, 3): -15 15 | s.discard(x) -16 16 | -17 |-for x in (1, 2, 3): -18 |- s.add(x + 1) - 17 |+s.update(x + 1 for x in (1, 2, 3)) -19 18 | -20 19 | for x, y in ((1, 2), (3, 4)): -21 20 | s.add((x, y)) +14 | for x in (1, 2, 3): +15 | s.discard(x) +16 | + - for x in (1, 2, 3): + - s.add(x + 1) +17 + s.update(x + 1 for x in (1, 2, 3)) +18 | +19 | for x, y in ((1, 2), (3, 4)): +20 | s.add((x, y)) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:20:1 @@ -133,17 +123,15 @@ FURB142 [*] Use of `set.add()` in a for loop 23 | num = 123 | help: Replace with `.update()` - -ℹ Safe fix -17 17 | for x in (1, 2, 3): -18 18 | s.add(x + 1) -19 19 | -20 |-for x, y in ((1, 2), (3, 4)): -21 |- s.add((x, y)) - 20 |+s.update((x, y) for x, y in ((1, 2), (3, 4))) -22 21 | -23 22 | num = 123 -24 23 | +17 | for x in (1, 2, 3): +18 | s.add(x + 1) +19 | + - for x, y in ((1, 2), (3, 4)): + - s.add((x, y)) +20 + s.update((x, y) for x, y in ((1, 2), (3, 4))) +21 | +22 | num = 123 +23 | FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:25:1 @@ -157,17 +145,15 @@ FURB142 [*] Use of `set.add()` in a for loop 28 | for x in (1, 2, 3): | help: Replace with `.update()` - -ℹ Safe fix -22 22 | -23 23 | num = 123 -24 24 | -25 |-for x in (1, 2, 3): -26 |- s.add(num) - 25 |+s.update(num for x in (1, 2, 3)) -27 26 | -28 27 | for x in (1, 2, 3): -29 28 | s.add((num, x)) +22 | +23 | num = 123 +24 | + - for x in (1, 2, 3): + - s.add(num) +25 + s.update(num for x in (1, 2, 3)) +26 | +27 | for x in (1, 2, 3): +28 | s.add((num, x)) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:28:1 @@ -181,17 +167,15 @@ FURB142 [*] Use of `set.add()` in a for loop 31 | for x in (1, 2, 3): | help: Replace with `.update()` - -ℹ Safe fix -25 25 | for x in (1, 2, 3): -26 26 | s.add(num) -27 27 | -28 |-for x in (1, 2, 3): -29 |- s.add((num, x)) - 28 |+s.update((num, x) for x in (1, 2, 3)) -30 29 | -31 30 | for x in (1, 2, 3): -32 31 | s.add(x + num) +25 | for x in (1, 2, 3): +26 | s.add(num) +27 | + - for x in (1, 2, 3): + - s.add((num, x)) +28 + s.update((num, x) for x in (1, 2, 3)) +29 | +30 | for x in (1, 2, 3): +31 | s.add(x + num) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:31:1 @@ -205,17 +189,15 @@ FURB142 [*] Use of `set.add()` in a for loop 34 | # https://github.com/astral-sh/ruff/issues/15936 | help: Replace with `.update()` - -ℹ Safe fix -28 28 | for x in (1, 2, 3): -29 29 | s.add((num, x)) -30 30 | -31 |-for x in (1, 2, 3): -32 |- s.add(x + num) - 31 |+s.update(x + num for x in (1, 2, 3)) -33 32 | -34 33 | # https://github.com/astral-sh/ruff/issues/15936 -35 34 | for x in 1, 2, 3: +28 | for x in (1, 2, 3): +29 | s.add((num, x)) +30 | + - for x in (1, 2, 3): + - s.add(x + num) +31 + s.update(x + num for x in (1, 2, 3)) +32 | +33 | # https://github.com/astral-sh/ruff/issues/15936 +34 | for x in 1, 2, 3: FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:35:1 @@ -228,17 +210,15 @@ FURB142 [*] Use of `set.add()` in a for loop 38 | for x in 1, 2, 3: | help: Replace with `.update()` - -ℹ Safe fix -32 32 | s.add(x + num) -33 33 | -34 34 | # https://github.com/astral-sh/ruff/issues/15936 -35 |-for x in 1, 2, 3: -36 |- s.add(x) - 35 |+s.update((1, 2, 3)) -37 36 | -38 37 | for x in 1, 2, 3: -39 38 | s.add(f"{x}") +32 | s.add(x + num) +33 | +34 | # https://github.com/astral-sh/ruff/issues/15936 + - for x in 1, 2, 3: + - s.add(x) +35 + s.update((1, 2, 3)) +36 | +37 | for x in 1, 2, 3: +38 | s.add(f"{x}") FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:38:1 @@ -252,17 +232,15 @@ FURB142 [*] Use of `set.add()` in a for loop 41 | for x in ( | help: Replace with `.update()` - -ℹ Safe fix -35 35 | for x in 1, 2, 3: -36 36 | s.add(x) -37 37 | -38 |-for x in 1, 2, 3: -39 |- s.add(f"{x}") - 38 |+s.update(f"{x}" for x in (1, 2, 3)) -40 39 | -41 40 | for x in ( -42 41 | 1, # Comment +35 | for x in 1, 2, 3: +36 | s.add(x) +37 | + - for x in 1, 2, 3: + - s.add(f"{x}") +38 + s.update(f"{x}" for x in (1, 2, 3)) +39 | +40 | for x in ( +41 | 1, # Comment FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:41:1 @@ -277,21 +255,20 @@ FURB142 [*] Use of `set.add()` in a for loop | |_________________^ | help: Replace with `.update()` - -ℹ Unsafe fix -38 38 | for x in 1, 2, 3: -39 39 | s.add(f"{x}") -40 40 | -41 |-for x in ( - 41 |+s.update(f"{x}" for x in ( -42 42 | 1, # Comment -43 43 | 2, 3 -44 |-): -45 |- s.add(f"{x}") - 44 |+)) -46 45 | -47 46 | -48 47 | # False negative +38 | for x in 1, 2, 3: +39 | s.add(f"{x}") +40 | + - for x in ( +41 + s.update(f"{x}" for x in ( +42 | 1, # Comment +43 | 2, 3 + - ): + - s.add(f"{x}") +44 + )) +45 | +46 | +47 | # False negative +note: This is an unsafe fix and may change runtime behavior FURB142 [*] Use of `set.discard()` in a for loop --> FURB142.py:83:1 @@ -305,17 +282,15 @@ FURB142 [*] Use of `set.discard()` in a for loop 86 | for x in (1,) if True else (2,): | help: Replace with `.difference_update()` - -ℹ Safe fix -80 80 | -81 81 | s = set() -82 82 | -83 |-for x in lambda: 0: -84 |- s.discard(-x) - 83 |+s.difference_update(-x for x in (lambda: 0)) -85 84 | -86 85 | for x in (1,) if True else (2,): -87 86 | s.add(-x) +80 | +81 | s = set() +82 | + - for x in lambda: 0: + - s.discard(-x) +83 + s.difference_update(-x for x in (lambda: 0)) +84 | +85 | for x in (1,) if True else (2,): +86 | s.add(-x) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:86:1 @@ -329,17 +304,15 @@ FURB142 [*] Use of `set.add()` in a for loop 89 | # don't add extra parens | help: Replace with `.update()` - -ℹ Safe fix -83 83 | for x in lambda: 0: -84 84 | s.discard(-x) -85 85 | -86 |-for x in (1,) if True else (2,): -87 |- s.add(-x) - 86 |+s.update(-x for x in ((1,) if True else (2,))) -88 87 | -89 88 | # don't add extra parens -90 89 | for x in (lambda: 0): +83 | for x in lambda: 0: +84 | s.discard(-x) +85 | + - for x in (1,) if True else (2,): + - s.add(-x) +86 + s.update(-x for x in ((1,) if True else (2,))) +87 | +88 | # don't add extra parens +89 | for x in (lambda: 0): FURB142 [*] Use of `set.discard()` in a for loop --> FURB142.py:90:1 @@ -352,17 +325,15 @@ FURB142 [*] Use of `set.discard()` in a for loop 93 | for x in ((1,) if True else (2,)): | help: Replace with `.difference_update()` - -ℹ Safe fix -87 87 | s.add(-x) -88 88 | -89 89 | # don't add extra parens -90 |-for x in (lambda: 0): -91 |- s.discard(-x) - 90 |+s.difference_update(-x for x in (lambda: 0)) -92 91 | -93 92 | for x in ((1,) if True else (2,)): -94 93 | s.add(-x) +87 | s.add(-x) +88 | +89 | # don't add extra parens + - for x in (lambda: 0): + - s.discard(-x) +90 + s.difference_update(-x for x in (lambda: 0)) +91 | +92 | for x in ((1,) if True else (2,)): +93 | s.add(-x) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:93:1 @@ -376,17 +347,15 @@ FURB142 [*] Use of `set.add()` in a for loop 96 | # don't add parens directly in function call | help: Replace with `.update()` - -ℹ Safe fix -90 90 | for x in (lambda: 0): -91 91 | s.discard(-x) -92 92 | -93 |-for x in ((1,) if True else (2,)): -94 |- s.add(-x) - 93 |+s.update(-x for x in ((1,) if True else (2,))) -95 94 | -96 95 | # don't add parens directly in function call -97 96 | for x in lambda: 0: +90 | for x in (lambda: 0): +91 | s.discard(-x) +92 | + - for x in ((1,) if True else (2,)): + - s.add(-x) +93 + s.update(-x for x in ((1,) if True else (2,))) +94 | +95 | # don't add parens directly in function call +96 | for x in lambda: 0: FURB142 [*] Use of `set.discard()` in a for loop --> FURB142.py:97:1 @@ -399,17 +368,15 @@ FURB142 [*] Use of `set.discard()` in a for loop 100 | for x in (1,) if True else (2,): | help: Replace with `.difference_update()` - -ℹ Safe fix -94 94 | s.add(-x) -95 95 | -96 96 | # don't add parens directly in function call -97 |-for x in lambda: 0: -98 |- s.discard(x) - 97 |+s.difference_update(lambda: 0) -99 98 | -100 99 | for x in (1,) if True else (2,): -101 100 | s.add(x) +94 | s.add(-x) +95 | +96 | # don't add parens directly in function call + - for x in lambda: 0: + - s.discard(x) +97 + s.difference_update(lambda: 0) +98 | +99 | for x in (1,) if True else (2,): +100 | s.add(x) FURB142 [*] Use of `set.add()` in a for loop --> FURB142.py:100:1 @@ -421,11 +388,9 @@ FURB142 [*] Use of `set.add()` in a for loop | |____________^ | help: Replace with `.update()` - -ℹ Safe fix -97 97 | for x in lambda: 0: -98 98 | s.discard(x) -99 99 | -100 |-for x in (1,) if True else (2,): -101 |- s.add(x) - 100 |+s.update((1,) if True else (2,)) +97 | for x in lambda: 0: +98 | s.discard(x) +99 | + - for x in (1,) if True else (2,): + - s.add(x) +100 + s.update((1,) if True else (2,)) diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap index 1c83a4a236..6fa1035217 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB145_FURB145.py.snap @@ -11,16 +11,14 @@ FURB145 [*] Prefer `copy` method over slicing 6 | d, e = l[:], 1 | help: Replace with `copy()` - -ℹ Safe fix -1 1 | l = [1, 2, 3, 4, 5] -2 2 | -3 3 | # Errors. -4 |-a = l[:] - 4 |+a = l.copy() -5 5 | b, c = 1, l[:] -6 6 | d, e = l[:], 1 -7 7 | m = l[::] +1 | l = [1, 2, 3, 4, 5] +2 | +3 | # Errors. + - a = l[:] +4 + a = l.copy() +5 | b, c = 1, l[:] +6 | d, e = l[:], 1 +7 | m = l[::] FURB145 [*] Prefer `copy` method over slicing --> FURB145.py:5:11 @@ -33,16 +31,14 @@ FURB145 [*] Prefer `copy` method over slicing 7 | m = l[::] | help: Replace with `copy()` - -ℹ Safe fix -2 2 | -3 3 | # Errors. -4 4 | a = l[:] -5 |-b, c = 1, l[:] - 5 |+b, c = 1, l.copy() -6 6 | d, e = l[:], 1 -7 7 | m = l[::] -8 8 | l[:] +2 | +3 | # Errors. +4 | a = l[:] + - b, c = 1, l[:] +5 + b, c = 1, l.copy() +6 | d, e = l[:], 1 +7 | m = l[::] +8 | l[:] FURB145 [*] Prefer `copy` method over slicing --> FURB145.py:6:8 @@ -55,16 +51,14 @@ FURB145 [*] Prefer `copy` method over slicing 8 | l[:] | help: Replace with `copy()` - -ℹ Safe fix -3 3 | # Errors. -4 4 | a = l[:] -5 5 | b, c = 1, l[:] -6 |-d, e = l[:], 1 - 6 |+d, e = l.copy(), 1 -7 7 | m = l[::] -8 8 | l[:] -9 9 | print(l[:]) +3 | # Errors. +4 | a = l[:] +5 | b, c = 1, l[:] + - d, e = l[:], 1 +6 + d, e = l.copy(), 1 +7 | m = l[::] +8 | l[:] +9 | print(l[:]) FURB145 [*] Prefer `copy` method over slicing --> FURB145.py:7:5 @@ -77,16 +71,14 @@ FURB145 [*] Prefer `copy` method over slicing 9 | print(l[:]) | help: Replace with `copy()` - -ℹ Safe fix -4 4 | a = l[:] -5 5 | b, c = 1, l[:] -6 6 | d, e = l[:], 1 -7 |-m = l[::] - 7 |+m = l.copy() -8 8 | l[:] -9 9 | print(l[:]) -10 10 | +4 | a = l[:] +5 | b, c = 1, l[:] +6 | d, e = l[:], 1 + - m = l[::] +7 + m = l.copy() +8 | l[:] +9 | print(l[:]) +10 | FURB145 [*] Prefer `copy` method over slicing --> FURB145.py:8:1 @@ -98,16 +90,14 @@ FURB145 [*] Prefer `copy` method over slicing 9 | print(l[:]) | help: Replace with `copy()` - -ℹ Safe fix -5 5 | b, c = 1, l[:] -6 6 | d, e = l[:], 1 -7 7 | m = l[::] -8 |-l[:] - 8 |+l.copy() -9 9 | print(l[:]) -10 10 | -11 11 | # False negatives. +5 | b, c = 1, l[:] +6 | d, e = l[:], 1 +7 | m = l[::] + - l[:] +8 + l.copy() +9 | print(l[:]) +10 | +11 | # False negatives. FURB145 [*] Prefer `copy` method over slicing --> FURB145.py:9:7 @@ -120,13 +110,11 @@ FURB145 [*] Prefer `copy` method over slicing 11 | # False negatives. | help: Replace with `copy()` - -ℹ Safe fix -6 6 | d, e = l[:], 1 -7 7 | m = l[::] -8 8 | l[:] -9 |-print(l[:]) - 9 |+print(l.copy()) -10 10 | -11 11 | # False negatives. -12 12 | aa = a[:] # Type inference. +6 | d, e = l[:], 1 +7 | m = l[::] +8 | l[:] + - print(l[:]) +9 + print(l.copy()) +10 | +11 | # False negatives. +12 | aa = a[:] # Type inference. diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap index bc19dd98ab..0297e6c65d 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB148_FURB148.py.snap @@ -10,16 +10,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 15 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -11 11 | books_tuple = ("Dune", "Foundation", "Neuromancer") -12 12 | -13 13 | # Errors -14 |-for index, _ in enumerate(books): - 14 |+for index in range(len(books)): -15 15 | print(index) -16 16 | -17 17 | for index, _ in enumerate(books, start=0): +11 | books_tuple = ("Dune", "Foundation", "Neuromancer") +12 | +13 | # Errors + - for index, _ in enumerate(books): +14 + for index in range(len(books)): +15 | print(index) +16 | +17 | for index, _ in enumerate(books, start=0): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:17:17 @@ -31,16 +30,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 18 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -14 14 | for index, _ in enumerate(books): -15 15 | print(index) -16 16 | -17 |-for index, _ in enumerate(books, start=0): - 17 |+for index in range(len(books)): -18 18 | print(index) -19 19 | -20 20 | for index, _ in enumerate(books, 0): +14 | for index, _ in enumerate(books): +15 | print(index) +16 | + - for index, _ in enumerate(books, start=0): +17 + for index in range(len(books)): +18 | print(index) +19 | +20 | for index, _ in enumerate(books, 0): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:20:17 @@ -52,16 +50,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 21 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -17 17 | for index, _ in enumerate(books, start=0): -18 18 | print(index) -19 19 | -20 |-for index, _ in enumerate(books, 0): - 20 |+for index in range(len(books)): -21 21 | print(index) -22 22 | -23 23 | for index, _ in enumerate(books, start=1): +17 | for index, _ in enumerate(books, start=0): +18 | print(index) +19 | + - for index, _ in enumerate(books, 0): +20 + for index in range(len(books)): +21 | print(index) +22 | +23 | for index, _ in enumerate(books, start=1): +note: This is an unsafe fix and may change runtime behavior FURB148 `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:23:17 @@ -117,16 +114,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 36 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -32 32 | for index, _ in enumerate(books, x): -33 33 | print(book) -34 34 | -35 |-for _, book in enumerate(books): - 35 |+for book in books: -36 36 | print(book) -37 37 | -38 38 | for _, book in enumerate(books, start=0): +32 | for index, _ in enumerate(books, x): +33 | print(book) +34 | + - for _, book in enumerate(books): +35 + for book in books: +36 | print(book) +37 | +38 | for _, book in enumerate(books, start=0): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:38:16 @@ -138,16 +134,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 39 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -35 35 | for _, book in enumerate(books): -36 36 | print(book) -37 37 | -38 |-for _, book in enumerate(books, start=0): - 38 |+for book in books: -39 39 | print(book) -40 40 | -41 41 | for _, book in enumerate(books, 0): +35 | for _, book in enumerate(books): +36 | print(book) +37 | + - for _, book in enumerate(books, start=0): +38 + for book in books: +39 | print(book) +40 | +41 | for _, book in enumerate(books, 0): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:41:16 @@ -159,16 +154,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 42 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -38 38 | for _, book in enumerate(books, start=0): -39 39 | print(book) -40 40 | -41 |-for _, book in enumerate(books, 0): - 41 |+for book in books: -42 42 | print(book) -43 43 | -44 44 | for _, book in enumerate(books, start=1): +38 | for _, book in enumerate(books, start=0): +39 | print(book) +40 | + - for _, book in enumerate(books, 0): +41 + for book in books: +42 | print(book) +43 | +44 | for _, book in enumerate(books, start=1): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:44:16 @@ -180,16 +174,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 45 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -41 41 | for _, book in enumerate(books, 0): -42 42 | print(book) -43 43 | -44 |-for _, book in enumerate(books, start=1): - 44 |+for book in books: -45 45 | print(book) -46 46 | -47 47 | for _, book in enumerate(books, 1): +41 | for _, book in enumerate(books, 0): +42 | print(book) +43 | + - for _, book in enumerate(books, start=1): +44 + for book in books: +45 | print(book) +46 | +47 | for _, book in enumerate(books, 1): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:47:16 @@ -201,16 +194,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 48 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -44 44 | for _, book in enumerate(books, start=1): -45 45 | print(book) -46 46 | -47 |-for _, book in enumerate(books, 1): - 47 |+for book in books: -48 48 | print(book) -49 49 | -50 50 | for _, book in enumerate(books, start=x): +44 | for _, book in enumerate(books, start=1): +45 | print(book) +46 | + - for _, book in enumerate(books, 1): +47 + for book in books: +48 | print(book) +49 | +50 | for _, book in enumerate(books, start=x): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:50:16 @@ -222,16 +214,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 51 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -47 47 | for _, book in enumerate(books, 1): -48 48 | print(book) -49 49 | -50 |-for _, book in enumerate(books, start=x): - 50 |+for book in books: -51 51 | print(book) -52 52 | -53 53 | for _, book in enumerate(books, x): +47 | for _, book in enumerate(books, 1): +48 | print(book) +49 | + - for _, book in enumerate(books, start=x): +50 + for book in books: +51 | print(book) +52 | +53 | for _, book in enumerate(books, x): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:53:16 @@ -243,16 +234,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 54 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -50 50 | for _, book in enumerate(books, start=x): -51 51 | print(book) -52 52 | -53 |-for _, book in enumerate(books, x): - 53 |+for book in books: -54 54 | print(book) -55 55 | -56 56 | for index, (_, _) in enumerate(books): +50 | for _, book in enumerate(books, start=x): +51 | print(book) +52 | + - for _, book in enumerate(books, x): +53 + for book in books: +54 | print(book) +55 | +56 | for index, (_, _) in enumerate(books): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:56:22 @@ -264,16 +254,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 57 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -53 53 | for _, book in enumerate(books, x): -54 54 | print(book) -55 55 | -56 |-for index, (_, _) in enumerate(books): - 56 |+for index in range(len(books)): -57 57 | print(index) -58 58 | -59 59 | for (_, _), book in enumerate(books): +53 | for _, book in enumerate(books, x): +54 | print(book) +55 | + - for index, (_, _) in enumerate(books): +56 + for index in range(len(books)): +57 | print(index) +58 | +59 | for (_, _), book in enumerate(books): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:59:21 @@ -285,16 +274,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 60 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -56 56 | for index, (_, _) in enumerate(books): -57 57 | print(index) -58 58 | -59 |-for (_, _), book in enumerate(books): - 59 |+for book in books: -60 60 | print(book) -61 61 | -62 62 | for(index, _)in enumerate(books): +56 | for index, (_, _) in enumerate(books): +57 | print(index) +58 | + - for (_, _), book in enumerate(books): +59 + for book in books: +60 | print(book) +61 | +62 | for(index, _)in enumerate(books): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:62:17 @@ -306,16 +294,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 63 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -59 59 | for (_, _), book in enumerate(books): -60 60 | print(book) -61 61 | -62 |-for(index, _)in enumerate(books): - 62 |+for index in range(len(books)): -63 63 | print(index) -64 64 | -65 65 | for(index), _ in enumerate(books): +59 | for (_, _), book in enumerate(books): +60 | print(book) +61 | + - for(index, _)in enumerate(books): +62 + for index in range(len(books)): +63 | print(index) +64 | +65 | for(index), _ in enumerate(books): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:65:18 @@ -327,16 +314,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 66 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -62 62 | for(index, _)in enumerate(books): -63 63 | print(index) -64 64 | -65 |-for(index), _ in enumerate(books): - 65 |+for index in range(len(books)): -66 66 | print(index) -67 67 | -68 68 | for index, _ in enumerate(books_and_authors): +62 | for(index, _)in enumerate(books): +63 | print(index) +64 | + - for(index), _ in enumerate(books): +65 + for index in range(len(books)): +66 | print(index) +67 | +68 | for index, _ in enumerate(books_and_authors): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:68:17 @@ -348,16 +334,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 69 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -65 65 | for(index), _ in enumerate(books): -66 66 | print(index) -67 67 | -68 |-for index, _ in enumerate(books_and_authors): - 68 |+for index in range(len(books_and_authors)): -69 69 | print(index) -70 70 | -71 71 | for _, book in enumerate(books_and_authors): +65 | for(index), _ in enumerate(books): +66 | print(index) +67 | + - for index, _ in enumerate(books_and_authors): +68 + for index in range(len(books_and_authors)): +69 | print(index) +70 | +71 | for _, book in enumerate(books_and_authors): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:71:16 @@ -369,16 +354,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 72 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -68 68 | for index, _ in enumerate(books_and_authors): -69 69 | print(index) -70 70 | -71 |-for _, book in enumerate(books_and_authors): - 71 |+for book in books_and_authors: -72 72 | print(book) -73 73 | -74 74 | for index, _ in enumerate(books_set): +68 | for index, _ in enumerate(books_and_authors): +69 | print(index) +70 | + - for _, book in enumerate(books_and_authors): +71 + for book in books_and_authors: +72 | print(book) +73 | +74 | for index, _ in enumerate(books_set): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:74:17 @@ -390,16 +374,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 75 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -71 71 | for _, book in enumerate(books_and_authors): -72 72 | print(book) -73 73 | -74 |-for index, _ in enumerate(books_set): - 74 |+for index in range(len(books_set)): -75 75 | print(index) -76 76 | -77 77 | for _, book in enumerate(books_set): +71 | for _, book in enumerate(books_and_authors): +72 | print(book) +73 | + - for index, _ in enumerate(books_set): +74 + for index in range(len(books_set)): +75 | print(index) +76 | +77 | for _, book in enumerate(books_set): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:77:16 @@ -411,16 +394,15 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 78 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -74 74 | for index, _ in enumerate(books_set): -75 75 | print(index) -76 76 | -77 |-for _, book in enumerate(books_set): - 77 |+for book in books_set: -78 78 | print(book) -79 79 | -80 80 | for index, _ in enumerate(books_tuple): +74 | for index, _ in enumerate(books_set): +75 | print(index) +76 | + - for _, book in enumerate(books_set): +77 + for book in books_set: +78 | print(book) +79 | +80 | for index, _ in enumerate(books_tuple): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead --> FURB148.py:80:17 @@ -432,16 +414,15 @@ FURB148 [*] `enumerate` value is unused, use `for x in range(len(y))` instead 81 | print(index) | help: Replace with `range(len(...))` - -ℹ Unsafe fix -77 77 | for _, book in enumerate(books_set): -78 78 | print(book) -79 79 | -80 |-for index, _ in enumerate(books_tuple): - 80 |+for index in range(len(books_tuple)): -81 81 | print(index) -82 82 | -83 83 | for _, book in enumerate(books_tuple): +77 | for _, book in enumerate(books_set): +78 | print(book) +79 | + - for index, _ in enumerate(books_tuple): +80 + for index in range(len(books_tuple)): +81 | print(index) +82 | +83 | for _, book in enumerate(books_tuple): +note: This is an unsafe fix and may change runtime behavior FURB148 [*] `enumerate` index is unused, use `for x in y` instead --> FURB148.py:83:16 @@ -453,13 +434,12 @@ FURB148 [*] `enumerate` index is unused, use `for x in y` instead 84 | print(book) | help: Remove `enumerate` - -ℹ Unsafe fix -80 80 | for index, _ in enumerate(books_tuple): -81 81 | print(index) -82 82 | -83 |-for _, book in enumerate(books_tuple): - 83 |+for book in books_tuple: -84 84 | print(book) -85 85 | -86 86 | # OK +80 | for index, _ in enumerate(books_tuple): +81 | print(index) +82 | + - for _, book in enumerate(books_tuple): +83 + for book in books_tuple: +84 | print(book) +85 | +86 | # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap index 160659757e..2dda6eb163 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB152_FURB152.py.snap @@ -12,16 +12,14 @@ FURB152 [*] Replace `3.14` with `math.pi` 5 | C = 6.28 * r # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 |-A = 3.14 * r ** 2 # FURB152 - 4 |+A = math.pi * r ** 2 # FURB152 -4 5 | -5 6 | C = 6.28 * r # FURB152 -6 7 | +1 + import math +2 | r = 3.1 # OK +3 | + - A = 3.14 * r ** 2 # FURB152 +4 + A = math.pi * r ** 2 # FURB152 +5 | +6 | C = 6.28 * r # FURB152 +7 | FURB152 [*] Replace `6.28` with `math.tau` --> FURB152.py:5:5 @@ -34,18 +32,16 @@ FURB152 [*] Replace `6.28` with `math.tau` 7 | e = 2.71 # FURB152 | help: Use `math.tau` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 -4 5 | -5 |-C = 6.28 * r # FURB152 - 6 |+C = math.tau * r # FURB152 -6 7 | -7 8 | e = 2.71 # FURB152 -8 9 | +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 +5 | + - C = 6.28 * r # FURB152 +6 + C = math.tau * r # FURB152 +7 | +8 | e = 2.71 # FURB152 +9 | FURB152 [*] Replace `2.71` with `math.e` --> FURB152.py:7:5 @@ -58,20 +54,18 @@ FURB152 [*] Replace `2.71` with `math.e` 9 | r = 3.15 # OK | help: Use `math.e` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 -4 5 | -5 6 | C = 6.28 * r # FURB152 -6 7 | -7 |-e = 2.71 # FURB152 - 8 |+e = math.e # FURB152 -8 9 | -9 10 | r = 3.15 # OK -10 11 | +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 +5 | +6 | C = 6.28 * r # FURB152 +7 | + - e = 2.71 # FURB152 +8 + e = math.e # FURB152 +9 | +10 | r = 3.15 # OK +11 | FURB152 [*] Replace `3.141` with `math.pi` --> FURB152.py:11:5 @@ -84,21 +78,19 @@ FURB152 [*] Replace `3.141` with `math.pi` 13 | r = 3.142 # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -8 9 | -9 10 | r = 3.15 # OK -10 11 | -11 |-r = 3.141 # FURB152 - 12 |+r = math.pi # FURB152 -12 13 | -13 14 | r = 3.142 # FURB152 -14 15 | +9 | +10 | r = 3.15 # OK +11 | + - r = 3.141 # FURB152 +12 + r = math.pi # FURB152 +13 | +14 | r = 3.142 # FURB152 +15 | FURB152 [*] Replace `3.142` with `math.pi` --> FURB152.py:13:5 @@ -111,21 +103,19 @@ FURB152 [*] Replace `3.142` with `math.pi` 15 | r = 3.1415 # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -10 11 | -11 12 | r = 3.141 # FURB152 -12 13 | -13 |-r = 3.142 # FURB152 - 14 |+r = math.pi # FURB152 -14 15 | -15 16 | r = 3.1415 # FURB152 -16 17 | +11 | +12 | r = 3.141 # FURB152 +13 | + - r = 3.142 # FURB152 +14 + r = math.pi # FURB152 +15 | +16 | r = 3.1415 # FURB152 +17 | FURB152 [*] Replace `3.1415` with `math.pi` --> FURB152.py:15:5 @@ -138,21 +128,19 @@ FURB152 [*] Replace `3.1415` with `math.pi` 17 | r = 3.1416 # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -12 13 | -13 14 | r = 3.142 # FURB152 -14 15 | -15 |-r = 3.1415 # FURB152 - 16 |+r = math.pi # FURB152 -16 17 | -17 18 | r = 3.1416 # FURB152 -18 19 | +13 | +14 | r = 3.142 # FURB152 +15 | + - r = 3.1415 # FURB152 +16 + r = math.pi # FURB152 +17 | +18 | r = 3.1416 # FURB152 +19 | FURB152 [*] Replace `3.1416` with `math.pi` --> FURB152.py:17:5 @@ -165,21 +153,19 @@ FURB152 [*] Replace `3.1416` with `math.pi` 19 | r = 3.141592 # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -14 15 | -15 16 | r = 3.1415 # FURB152 -16 17 | -17 |-r = 3.1416 # FURB152 - 18 |+r = math.pi # FURB152 -18 19 | -19 20 | r = 3.141592 # FURB152 -20 21 | +15 | +16 | r = 3.1415 # FURB152 +17 | + - r = 3.1416 # FURB152 +18 + r = math.pi # FURB152 +19 | +20 | r = 3.141592 # FURB152 +21 | FURB152 [*] Replace `3.141592` with `math.pi` --> FURB152.py:19:5 @@ -192,21 +178,19 @@ FURB152 [*] Replace `3.141592` with `math.pi` 21 | r = 3.141593 # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -16 17 | -17 18 | r = 3.1416 # FURB152 -18 19 | -19 |-r = 3.141592 # FURB152 - 20 |+r = math.pi # FURB152 -20 21 | -21 22 | r = 3.141593 # FURB152 -22 23 | +17 | +18 | r = 3.1416 # FURB152 +19 | + - r = 3.141592 # FURB152 +20 + r = math.pi # FURB152 +21 | +22 | r = 3.141593 # FURB152 +23 | FURB152 [*] Replace `3.141593` with `math.pi` --> FURB152.py:21:5 @@ -219,21 +203,19 @@ FURB152 [*] Replace `3.141593` with `math.pi` 23 | r = 3.14159265 # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -18 19 | -19 20 | r = 3.141592 # FURB152 -20 21 | -21 |-r = 3.141593 # FURB152 - 22 |+r = math.pi # FURB152 -22 23 | -23 24 | r = 3.14159265 # FURB152 -24 25 | +19 | +20 | r = 3.141592 # FURB152 +21 | + - r = 3.141593 # FURB152 +22 + r = math.pi # FURB152 +23 | +24 | r = 3.14159265 # FURB152 +25 | FURB152 [*] Replace `3.14159265` with `math.pi` --> FURB152.py:23:5 @@ -246,21 +228,19 @@ FURB152 [*] Replace `3.14159265` with `math.pi` 25 | r = 3.141592653589793238462643383279 # FURB152 | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -20 21 | -21 22 | r = 3.141593 # FURB152 -22 23 | -23 |-r = 3.14159265 # FURB152 - 24 |+r = math.pi # FURB152 -24 25 | -25 26 | r = 3.141592653589793238462643383279 # FURB152 -26 27 | +21 | +22 | r = 3.141593 # FURB152 +23 | + - r = 3.14159265 # FURB152 +24 + r = math.pi # FURB152 +25 | +26 | r = 3.141592653589793238462643383279 # FURB152 +27 | FURB152 [*] Replace `3.141592653589793238462643383279` with `math.pi` --> FURB152.py:25:5 @@ -273,21 +253,19 @@ FURB152 [*] Replace `3.141592653589793238462643383279` with `math.pi` 27 | r = 3.14159266 # OK | help: Use `math.pi` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -22 23 | -23 24 | r = 3.14159265 # FURB152 -24 25 | -25 |-r = 3.141592653589793238462643383279 # FURB152 - 26 |+r = math.pi # FURB152 -26 27 | -27 28 | r = 3.14159266 # OK -28 29 | +23 | +24 | r = 3.14159265 # FURB152 +25 | + - r = 3.141592653589793238462643383279 # FURB152 +26 + r = math.pi # FURB152 +27 | +28 | r = 3.14159266 # OK +29 | FURB152 [*] Replace `2.718` with `math.e` --> FURB152.py:31:5 @@ -300,21 +278,19 @@ FURB152 [*] Replace `2.718` with `math.e` 33 | e = 2.7182 # FURB152 | help: Use `math.e` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -28 29 | -29 30 | e = 2.7 # OK -30 31 | -31 |-e = 2.718 # FURB152 - 32 |+e = math.e # FURB152 -32 33 | -33 34 | e = 2.7182 # FURB152 -34 35 | +29 | +30 | e = 2.7 # OK +31 | + - e = 2.718 # FURB152 +32 + e = math.e # FURB152 +33 | +34 | e = 2.7182 # FURB152 +35 | FURB152 [*] Replace `2.7182` with `math.e` --> FURB152.py:33:5 @@ -327,21 +303,19 @@ FURB152 [*] Replace `2.7182` with `math.e` 35 | e = 2.7183 # FURB152 | help: Use `math.e` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -30 31 | -31 32 | e = 2.718 # FURB152 -32 33 | -33 |-e = 2.7182 # FURB152 - 34 |+e = math.e # FURB152 -34 35 | -35 36 | e = 2.7183 # FURB152 -36 37 | +31 | +32 | e = 2.718 # FURB152 +33 | + - e = 2.7182 # FURB152 +34 + e = math.e # FURB152 +35 | +36 | e = 2.7183 # FURB152 +37 | FURB152 [*] Replace `2.7183` with `math.e` --> FURB152.py:35:5 @@ -354,21 +328,19 @@ FURB152 [*] Replace `2.7183` with `math.e` 37 | e = 2.719 # OK | help: Use `math.e` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -32 33 | -33 34 | e = 2.7182 # FURB152 -34 35 | -35 |-e = 2.7183 # FURB152 - 36 |+e = math.e # FURB152 -36 37 | -37 38 | e = 2.719 # OK -38 39 | +33 | +34 | e = 2.7182 # FURB152 +35 | + - e = 2.7183 # FURB152 +36 + e = math.e # FURB152 +37 | +38 | e = 2.719 # OK +39 | FURB152 [*] Replace `2.7182000000000001` with `math.e` --> FURB152.py:45:5 @@ -379,15 +351,13 @@ FURB152 [*] Replace `2.7182000000000001` with `math.e` | ^^^^^^^^^^^^^^^^^^ | help: Use `math.e` - -ℹ Safe fix - 1 |+import math -1 2 | r = 3.1 # OK -2 3 | -3 4 | A = 3.14 * r ** 2 # FURB152 +1 + import math +2 | r = 3.1 # OK +3 | +4 | A = 3.14 * r ** 2 # FURB152 -------------------------------------------------------------------------------- -42 43 | -43 44 | e = 2.718200000000001 # OK -44 45 | -45 |-e = 2.7182000000000001 # FURB152 - 46 |+e = math.e # FURB152 +43 | +44 | e = 2.718200000000001 # OK +45 | + - e = 2.7182000000000001 # FURB152 +46 + e = math.e # FURB152 diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap index 31a980d84d..28f6c6a842 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB154_FURB154.py.snap @@ -10,17 +10,15 @@ FURB154 [*] Use of repeated consecutive `global` | |____________^ | help: Merge `global` statements - -ℹ Safe fix -1 1 | # Errors -2 2 | -3 3 | def f1(): -4 |- global x -5 |- global y - 4 |+ global x, y -6 5 | -7 6 | -8 7 | def f3(): +1 | # Errors +2 | +3 | def f1(): + - global x + - global y +4 + global x, y +5 | +6 | +7 | def f3(): FURB154 [*] Use of repeated consecutive `global` --> FURB154.py:9:5 @@ -32,18 +30,16 @@ FURB154 [*] Use of repeated consecutive `global` | |____________^ | help: Merge `global` statements - -ℹ Safe fix -6 6 | -7 7 | -8 8 | def f3(): -9 |- global x -10 |- global y -11 |- global z - 9 |+ global x, y, z -12 10 | -13 11 | -14 12 | def f4(): +6 | +7 | +8 | def f3(): + - global x + - global y + - global z +9 + global x, y, z +10 | +11 | +12 | def f4(): FURB154 [*] Use of repeated consecutive `global` --> FURB154.py:15:5 @@ -56,17 +52,15 @@ FURB154 [*] Use of repeated consecutive `global` 18 | global x | help: Merge `global` statements - -ℹ Safe fix -12 12 | -13 13 | -14 14 | def f4(): -15 |- global x -16 |- global y - 15 |+ global x, y -17 16 | pass -18 17 | global x -19 18 | global y +12 | +13 | +14 | def f4(): + - global x + - global y +15 + global x, y +16 | pass +17 | global x +18 | global y FURB154 [*] Use of repeated consecutive `global` --> FURB154.py:18:5 @@ -78,17 +72,15 @@ FURB154 [*] Use of repeated consecutive `global` | |____________^ | help: Merge `global` statements - -ℹ Safe fix -15 15 | global x -16 16 | global y -17 17 | pass -18 |- global x -19 |- global y - 18 |+ global x, y -20 19 | -21 20 | -22 21 | def f2(): +15 | global x +16 | global y +17 | pass + - global x + - global y +18 + global x, y +19 | +20 | +21 | def f2(): FURB154 [*] Use of repeated consecutive `nonlocal` --> FURB154.py:26:9 @@ -101,17 +93,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal` 29 | def inner2(): | help: Merge `nonlocal` statements - -ℹ Safe fix -23 23 | x = y = z = 1 -24 24 | -25 25 | def inner(): -26 |- nonlocal x -27 |- nonlocal y - 26 |+ nonlocal x, y -28 27 | -29 28 | def inner2(): -30 29 | nonlocal x +23 | x = y = z = 1 +24 | +25 | def inner(): + - nonlocal x + - nonlocal y +26 + nonlocal x, y +27 | +28 | def inner2(): +29 | nonlocal x FURB154 [*] Use of repeated consecutive `nonlocal` --> FURB154.py:30:9 @@ -125,18 +115,16 @@ FURB154 [*] Use of repeated consecutive `nonlocal` 34 | def inner3(): | help: Merge `nonlocal` statements - -ℹ Safe fix -27 27 | nonlocal y -28 28 | -29 29 | def inner2(): -30 |- nonlocal x -31 |- nonlocal y -32 |- nonlocal z - 30 |+ nonlocal x, y, z -33 31 | -34 32 | def inner3(): -35 33 | nonlocal x +27 | nonlocal y +28 | +29 | def inner2(): + - nonlocal x + - nonlocal y + - nonlocal z +30 + nonlocal x, y, z +31 | +32 | def inner3(): +33 | nonlocal x FURB154 [*] Use of repeated consecutive `nonlocal` --> FURB154.py:35:9 @@ -149,17 +137,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal` 38 | nonlocal x | help: Merge `nonlocal` statements - -ℹ Safe fix -32 32 | nonlocal z -33 33 | -34 34 | def inner3(): -35 |- nonlocal x -36 |- nonlocal y - 35 |+ nonlocal x, y -37 36 | pass -38 37 | nonlocal x -39 38 | nonlocal y +32 | nonlocal z +33 | +34 | def inner3(): + - nonlocal x + - nonlocal y +35 + nonlocal x, y +36 | pass +37 | nonlocal x +38 | nonlocal y FURB154 [*] Use of repeated consecutive `nonlocal` --> FURB154.py:38:9 @@ -171,17 +157,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal` | |__________________^ | help: Merge `nonlocal` statements - -ℹ Safe fix -35 35 | nonlocal x -36 36 | nonlocal y -37 37 | pass -38 |- nonlocal x -39 |- nonlocal y - 38 |+ nonlocal x, y -40 39 | -41 40 | -42 41 | def f5(): +35 | nonlocal x +36 | nonlocal y +37 | pass + - nonlocal x + - nonlocal y +38 + nonlocal x, y +39 | +40 | +41 | def f5(): FURB154 [*] Use of repeated consecutive `global` --> FURB154.py:46:9 @@ -194,17 +178,15 @@ FURB154 [*] Use of repeated consecutive `global` 49 | nonlocal z | help: Merge `global` statements - -ℹ Safe fix -43 43 | w = x = y = z = 1 -44 44 | -45 45 | def inner(): -46 |- global w -47 |- global x - 46 |+ global w, x -48 47 | nonlocal y -49 48 | nonlocal z -50 49 | +43 | w = x = y = z = 1 +44 | +45 | def inner(): + - global w + - global x +46 + global w, x +47 | nonlocal y +48 | nonlocal z +49 | FURB154 [*] Use of repeated consecutive `nonlocal` --> FURB154.py:48:9 @@ -218,17 +200,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal` 51 | def inner2(): | help: Merge `nonlocal` statements - -ℹ Safe fix -45 45 | def inner(): -46 46 | global w -47 47 | global x -48 |- nonlocal y -49 |- nonlocal z - 48 |+ nonlocal y, z -50 49 | -51 50 | def inner2(): -52 51 | global x +45 | def inner(): +46 | global w +47 | global x + - nonlocal y + - nonlocal z +48 + nonlocal y, z +49 | +50 | def inner2(): +51 | global x FURB154 [*] Use of repeated consecutive `nonlocal` --> FURB154.py:53:9 @@ -240,17 +220,15 @@ FURB154 [*] Use of repeated consecutive `nonlocal` | |__________________^ | help: Merge `nonlocal` statements - -ℹ Safe fix -50 50 | -51 51 | def inner2(): -52 52 | global x -53 |- nonlocal y -54 |- nonlocal z - 53 |+ nonlocal y, z -55 54 | -56 55 | -57 56 | def f6(): +50 | +51 | def inner2(): +52 | global x + - nonlocal y + - nonlocal z +53 + nonlocal y, z +54 | +55 | +56 | def f6(): FURB154 [*] Use of repeated consecutive `global` --> FURB154.py:58:5 @@ -262,15 +240,13 @@ FURB154 [*] Use of repeated consecutive `global` | |__________________^ | help: Merge `global` statements - -ℹ Safe fix -55 55 | -56 56 | -57 57 | def f6(): -58 |- global x, y, z -59 |- global a, b, c -60 |- global d, e, f - 58 |+ global x, y, z, a, b, c, d, e, f -61 59 | -62 60 | -63 61 | # Ok +55 | +56 | +57 | def f6(): + - global x, y, z + - global a, b, c + - global d, e, f +58 + global x, y, z, a, b, c, d, e, f +59 | +60 | +61 | # Ok diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap index 110c33052e..dee2d3685a 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB156_FURB156.py.snap @@ -12,16 +12,14 @@ FURB156 [*] Use of hardcoded string charset 5 | _ = "0123456789abcdefABCDEF" | help: Replace hardcoded charset with `string.digits` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 |-_ = "0123456789" - 4 |+_ = string.digits -4 5 | _ = "01234567" -5 6 | _ = "0123456789abcdefABCDEF" -6 7 | _ = "abcdefghijklmnopqrstuvwxyz" +1 | # Errors +2 + import string +3 | + - _ = "0123456789" +4 + _ = string.digits +5 | _ = "01234567" +6 | _ = "0123456789abcdefABCDEF" +7 | _ = "abcdefghijklmnopqrstuvwxyz" FURB156 [*] Use of hardcoded string charset --> FURB156.py:4:5 @@ -33,17 +31,15 @@ FURB156 [*] Use of hardcoded string charset 6 | _ = "abcdefghijklmnopqrstuvwxyz" | help: Replace hardcoded charset with `string.octdigits` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 |-_ = "01234567" - 5 |+_ = string.octdigits -5 6 | _ = "0123456789abcdefABCDEF" -6 7 | _ = "abcdefghijklmnopqrstuvwxyz" -7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" + - _ = "01234567" +5 + _ = string.octdigits +6 | _ = "0123456789abcdefABCDEF" +7 | _ = "abcdefghijklmnopqrstuvwxyz" +8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" FURB156 [*] Use of hardcoded string charset --> FURB156.py:5:5 @@ -56,18 +52,16 @@ FURB156 [*] Use of hardcoded string charset 7 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" | help: Replace hardcoded charset with `string.hexdigits` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" -5 |-_ = "0123456789abcdefABCDEF" - 6 |+_ = string.hexdigits -6 7 | _ = "abcdefghijklmnopqrstuvwxyz" -7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" + - _ = "0123456789abcdefABCDEF" +6 + _ = string.hexdigits +7 | _ = "abcdefghijklmnopqrstuvwxyz" +8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" FURB156 [*] Use of hardcoded string charset --> FURB156.py:6:5 @@ -80,19 +74,17 @@ FURB156 [*] Use of hardcoded string charset 8 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" | help: Replace hardcoded charset with `string.ascii_lowercase` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" -5 6 | _ = "0123456789abcdefABCDEF" -6 |-_ = "abcdefghijklmnopqrstuvwxyz" - 7 |+_ = string.ascii_lowercase -7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" -9 10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" +6 | _ = "0123456789abcdefABCDEF" + - _ = "abcdefghijklmnopqrstuvwxyz" +7 + _ = string.ascii_lowercase +8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" FURB156 [*] Use of hardcoded string charset --> FURB156.py:7:5 @@ -105,20 +97,18 @@ FURB156 [*] Use of hardcoded string charset 9 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" | help: Replace hardcoded charset with `string.ascii_uppercase` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" -5 6 | _ = "0123456789abcdefABCDEF" -6 7 | _ = "abcdefghijklmnopqrstuvwxyz" -7 |-_ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - 8 |+_ = string.ascii_uppercase -8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" -9 10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" -10 11 | _ = " \t\n\r\v\f" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" +6 | _ = "0123456789abcdefABCDEF" +7 | _ = "abcdefghijklmnopqrstuvwxyz" + - _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +8 + _ = string.ascii_uppercase +9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" +11 | _ = " \t\n\r\v\f" FURB156 [*] Use of hardcoded string charset --> FURB156.py:8:5 @@ -131,21 +121,19 @@ FURB156 [*] Use of hardcoded string charset 10 | _ = " \t\n\r\v\f" | help: Replace hardcoded charset with `string.ascii_letters` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" -5 6 | _ = "0123456789abcdefABCDEF" -6 7 | _ = "abcdefghijklmnopqrstuvwxyz" -7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -8 |-_ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - 9 |+_ = string.ascii_letters -9 10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" -10 11 | _ = " \t\n\r\v\f" -11 12 | +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" +6 | _ = "0123456789abcdefABCDEF" +7 | _ = "abcdefghijklmnopqrstuvwxyz" +8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + - _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +9 + _ = string.ascii_letters +10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" +11 | _ = " \t\n\r\v\f" +12 | FURB156 [*] Use of hardcoded string charset --> FURB156.py:9:5 @@ -157,22 +145,20 @@ FURB156 [*] Use of hardcoded string charset 10 | _ = " \t\n\r\v\f" | help: Replace hardcoded charset with `string.punctuation` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -6 7 | _ = "abcdefghijklmnopqrstuvwxyz" -7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" -9 |-_ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" - 10 |+_ = string.punctuation -10 11 | _ = " \t\n\r\v\f" -11 12 | -12 13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' +7 | _ = "abcdefghijklmnopqrstuvwxyz" +8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + - _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" +10 + _ = string.punctuation +11 | _ = " \t\n\r\v\f" +12 | +13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' FURB156 [*] Use of hardcoded string charset --> FURB156.py:10:5 @@ -185,22 +171,20 @@ FURB156 [*] Use of hardcoded string charset 12 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' | help: Replace hardcoded charset with `string.whitespace` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -7 8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -8 9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" -9 10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" -10 |-_ = " \t\n\r\v\f" - 11 |+_ = string.whitespace -11 12 | -12 13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' -13 14 | _ = ( +8 | _ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +9 | _ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" +10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" + - _ = " \t\n\r\v\f" +11 + _ = string.whitespace +12 | +13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' +14 | _ = ( FURB156 [*] Use of hardcoded string charset --> FURB156.py:12:5 @@ -213,22 +197,20 @@ FURB156 [*] Use of hardcoded string charset 14 | '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&' | help: Replace hardcoded charset with `string.printable` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -9 10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" -10 11 | _ = " \t\n\r\v\f" -11 12 | -12 |-_ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' - 13 |+_ = string.printable -13 14 | _ = ( -14 15 | '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&' -15 16 | "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c" +10 | _ = r"""!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~""" +11 | _ = " \t\n\r\v\f" +12 | + - _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' +13 + _ = string.printable +14 | _ = ( +15 | '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&' +16 | "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c" FURB156 [*] Use of hardcoded string charset --> FURB156.py:14:5 @@ -242,23 +224,21 @@ FURB156 [*] Use of hardcoded string charset 17 | _ = id("0123" | help: Replace hardcoded charset with `string.printable` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -11 12 | -12 13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' -13 14 | _ = ( -14 |- '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&' -15 |- "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c" - 15 |+ string.printable -16 16 | ) -17 17 | _ = id("0123" -18 18 | "4567" +12 | +13 | _ = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c' +14 | _ = ( + - '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&' + - "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c" +15 + string.printable +16 | ) +17 | _ = id("0123" +18 | "4567" FURB156 [*] Use of hardcoded string charset --> FURB156.py:17:8 @@ -274,24 +254,22 @@ FURB156 [*] Use of hardcoded string charset 21 | _ = ( | help: Replace hardcoded charset with `string.digits` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -14 15 | '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&' -15 16 | "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c" -16 17 | ) -17 |-_ = id("0123" -18 |- "4567" -19 |- "89") - 18 |+_ = id(string.digits) -20 19 | -21 20 | _ = ( -22 21 | "0123456789" +15 | '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!"#$%&' +16 | "'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r\x0b\x0c" +17 | ) + - _ = id("0123" + - "4567" + - "89") +18 + _ = id(string.digits) +19 | +20 | _ = ( +21 | "0123456789" FURB156 [*] Use of hardcoded string charset --> FURB156.py:22:5 @@ -302,22 +280,20 @@ FURB156 [*] Use of hardcoded string charset 23 | ).capitalize() | help: Replace hardcoded charset with `string.digits` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -19 20 | "89") -20 21 | -21 22 | _ = ( -22 |- "0123456789" - 23 |+ string.digits -23 24 | ).capitalize() -24 25 | -25 26 | _ = ( +20 | "89") +21 | +22 | _ = ( + - "0123456789" +23 + string.digits +24 | ).capitalize() +25 | +26 | _ = ( FURB156 [*] Use of hardcoded string charset --> FURB156.py:26:5 @@ -329,22 +305,20 @@ FURB156 [*] Use of hardcoded string charset 28 | ).capitalize() | help: Replace hardcoded charset with `string.digits` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -23 24 | ).capitalize() -24 25 | -25 26 | _ = ( -26 |- "0123456789" - 27 |+ string.digits -27 28 | # with comment -28 29 | ).capitalize() -29 30 | +24 | ).capitalize() +25 | +26 | _ = ( + - "0123456789" +27 + string.digits +28 | # with comment +29 | ).capitalize() +30 | FURB156 [*] Use of hardcoded string charset --> FURB156.py:31:6 @@ -356,19 +330,17 @@ FURB156 [*] Use of hardcoded string charset 33 | # OK | help: Replace hardcoded charset with `string.digits` - -ℹ Safe fix -1 1 | # Errors - 2 |+import string -2 3 | -3 4 | _ = "0123456789" -4 5 | _ = "01234567" +1 | # Errors +2 + import string +3 | +4 | _ = "0123456789" +5 | _ = "01234567" -------------------------------------------------------------------------------- -28 29 | ).capitalize() -29 30 | -30 31 | # example with augmented assignment -31 |-_ += "0123456789" - 32 |+_ += string.digits -32 33 | -33 34 | # OK -34 35 | +29 | ).capitalize() +30 | +31 | # example with augmented assignment + - _ += "0123456789" +32 + _ += string.digits +33 | +34 | # OK +35 | diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap index 8b422fc66a..3bb10588ab 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB157_FURB157.py.snap @@ -11,16 +11,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 7 | Decimal(float("Infinity")) | help: Replace with `0` - -ℹ Safe fix -2 2 | from decimal import Decimal -3 3 | -4 4 | # Errors -5 |-Decimal("0") - 5 |+Decimal(0) -6 6 | Decimal("-42") -7 7 | Decimal(float("Infinity")) -8 8 | Decimal(float("-Infinity")) +2 | from decimal import Decimal +3 | +4 | # Errors + - Decimal("0") +5 + Decimal(0) +6 | Decimal("-42") +7 | Decimal(float("Infinity")) +8 | Decimal(float("-Infinity")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:6:9 @@ -33,16 +31,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 8 | Decimal(float("-Infinity")) | help: Replace with `-42` - -ℹ Safe fix -3 3 | -4 4 | # Errors -5 5 | Decimal("0") -6 |-Decimal("-42") - 6 |+Decimal(-42) -7 7 | Decimal(float("Infinity")) -8 8 | Decimal(float("-Infinity")) -9 9 | Decimal(float("inf")) +3 | +4 | # Errors +5 | Decimal("0") + - Decimal("-42") +6 + Decimal(-42) +7 | Decimal(float("Infinity")) +8 | Decimal(float("-Infinity")) +9 | Decimal(float("inf")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:7:9 @@ -55,16 +51,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 9 | Decimal(float("inf")) | help: Replace with `"Infinity"` - -ℹ Safe fix -4 4 | # Errors -5 5 | Decimal("0") -6 6 | Decimal("-42") -7 |-Decimal(float("Infinity")) - 7 |+Decimal("Infinity") -8 8 | Decimal(float("-Infinity")) -9 9 | Decimal(float("inf")) -10 10 | Decimal(float("-inf")) +4 | # Errors +5 | Decimal("0") +6 | Decimal("-42") + - Decimal(float("Infinity")) +7 + Decimal("Infinity") +8 | Decimal(float("-Infinity")) +9 | Decimal(float("inf")) +10 | Decimal(float("-inf")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:8:9 @@ -77,16 +71,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 10 | Decimal(float("-inf")) | help: Replace with `"-Infinity"` - -ℹ Safe fix -5 5 | Decimal("0") -6 6 | Decimal("-42") -7 7 | Decimal(float("Infinity")) -8 |-Decimal(float("-Infinity")) - 8 |+Decimal("-Infinity") -9 9 | Decimal(float("inf")) -10 10 | Decimal(float("-inf")) -11 11 | Decimal(float("nan")) +5 | Decimal("0") +6 | Decimal("-42") +7 | Decimal(float("Infinity")) + - Decimal(float("-Infinity")) +8 + Decimal("-Infinity") +9 | Decimal(float("inf")) +10 | Decimal(float("-inf")) +11 | Decimal(float("nan")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:9:9 @@ -99,16 +91,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 11 | Decimal(float("nan")) | help: Replace with `"inf"` - -ℹ Safe fix -6 6 | Decimal("-42") -7 7 | Decimal(float("Infinity")) -8 8 | Decimal(float("-Infinity")) -9 |-Decimal(float("inf")) - 9 |+Decimal("inf") -10 10 | Decimal(float("-inf")) -11 11 | Decimal(float("nan")) -12 12 | decimal.Decimal("0") +6 | Decimal("-42") +7 | Decimal(float("Infinity")) +8 | Decimal(float("-Infinity")) + - Decimal(float("inf")) +9 + Decimal("inf") +10 | Decimal(float("-inf")) +11 | Decimal(float("nan")) +12 | decimal.Decimal("0") FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:10:9 @@ -121,16 +111,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 12 | decimal.Decimal("0") | help: Replace with `"-inf"` - -ℹ Safe fix -7 7 | Decimal(float("Infinity")) -8 8 | Decimal(float("-Infinity")) -9 9 | Decimal(float("inf")) -10 |-Decimal(float("-inf")) - 10 |+Decimal("-inf") -11 11 | Decimal(float("nan")) -12 12 | decimal.Decimal("0") -13 13 | +7 | Decimal(float("Infinity")) +8 | Decimal(float("-Infinity")) +9 | Decimal(float("inf")) + - Decimal(float("-inf")) +10 + Decimal("-inf") +11 | Decimal(float("nan")) +12 | decimal.Decimal("0") +13 | FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:11:9 @@ -142,16 +130,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 12 | decimal.Decimal("0") | help: Replace with `"nan"` - -ℹ Safe fix -8 8 | Decimal(float("-Infinity")) -9 9 | Decimal(float("inf")) -10 10 | Decimal(float("-inf")) -11 |-Decimal(float("nan")) - 11 |+Decimal("nan") -12 12 | decimal.Decimal("0") -13 13 | -14 14 | # OK +8 | Decimal(float("-Infinity")) +9 | Decimal(float("inf")) +10 | Decimal(float("-inf")) + - Decimal(float("nan")) +11 + Decimal("nan") +12 | decimal.Decimal("0") +13 | +14 | # OK FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:12:17 @@ -164,16 +150,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 14 | # OK | help: Replace with `0` - -ℹ Safe fix -9 9 | Decimal(float("inf")) -10 10 | Decimal(float("-inf")) -11 11 | Decimal(float("nan")) -12 |-decimal.Decimal("0") - 12 |+decimal.Decimal(0) -13 13 | -14 14 | # OK -15 15 | Decimal(0) +9 | Decimal(float("inf")) +10 | Decimal(float("-inf")) +11 | Decimal(float("nan")) + - decimal.Decimal("0") +12 + decimal.Decimal(0) +13 | +14 | # OK +15 | Decimal(0) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:23:9 @@ -184,16 +168,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 24 | Decimal("__1____000") | help: Replace with `1000` - -ℹ Safe fix -20 20 | # See https://github.com/astral-sh/ruff/issues/13807 -21 21 | -22 22 | # Errors -23 |-Decimal("1_000") - 23 |+Decimal(1000) -24 24 | Decimal("__1____000") -25 25 | -26 26 | # Ok +20 | # See https://github.com/astral-sh/ruff/issues/13807 +21 | +22 | # Errors + - Decimal("1_000") +23 + Decimal(1000) +24 | Decimal("__1____000") +25 | +26 | # Ok FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:24:9 @@ -206,16 +188,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 26 | # Ok | help: Replace with `1000` - -ℹ Safe fix -21 21 | -22 22 | # Errors -23 23 | Decimal("1_000") -24 |-Decimal("__1____000") - 24 |+Decimal(1000) -25 25 | -26 26 | # Ok -27 27 | Decimal("2e-4") +21 | +22 | # Errors +23 | Decimal("1_000") + - Decimal("__1____000") +24 + Decimal(1000) +25 | +26 | # Ok +27 | Decimal("2e-4") FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:48:9 @@ -228,16 +208,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 50 | # In this one case, " -nan ", the fix has to be | help: Replace with `" nan "` - -ℹ Safe fix -45 45 | -46 46 | # Non-finite variants -47 47 | # https://github.com/astral-sh/ruff/issues/14587 -48 |-Decimal(float(" nan ")) # Decimal(" nan ") - 48 |+Decimal(" nan ") # Decimal(" nan ") -49 49 | Decimal(float(" +nan ")) # Decimal(" +nan ") -50 50 | # In this one case, " -nan ", the fix has to be -51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` +45 | +46 | # Non-finite variants +47 | # https://github.com/astral-sh/ruff/issues/14587 + - Decimal(float(" nan ")) # Decimal(" nan ") +48 + Decimal(" nan ") # Decimal(" nan ") +49 | Decimal(float(" +nan ")) # Decimal(" +nan ") +50 | # In this one case, " -nan ", the fix has to be +51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:49:9 @@ -250,16 +228,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` | help: Replace with `" +nan "` - -ℹ Safe fix -46 46 | # Non-finite variants -47 47 | # https://github.com/astral-sh/ruff/issues/14587 -48 48 | Decimal(float(" nan ")) # Decimal(" nan ") -49 |-Decimal(float(" +nan ")) # Decimal(" +nan ") - 49 |+Decimal(" +nan ") # Decimal(" +nan ") -50 50 | # In this one case, " -nan ", the fix has to be -51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` -52 52 | Decimal(float(" -nan ")) # Decimal("nan") +46 | # Non-finite variants +47 | # https://github.com/astral-sh/ruff/issues/14587 +48 | Decimal(float(" nan ")) # Decimal(" nan ") + - Decimal(float(" +nan ")) # Decimal(" +nan ") +49 + Decimal(" +nan ") # Decimal(" +nan ") +50 | # In this one case, " -nan ", the fix has to be +51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` +52 | Decimal(float(" -nan ")) # Decimal("nan") FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:52:9 @@ -272,16 +248,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 54 | Decimal(float(" +inf ")) # Decimal(" +inf ") | help: Replace with `"nan"` - -ℹ Safe fix -49 49 | Decimal(float(" +nan ")) # Decimal(" +nan ") -50 50 | # In this one case, " -nan ", the fix has to be -51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` -52 |-Decimal(float(" -nan ")) # Decimal("nan") - 52 |+Decimal("nan") # Decimal("nan") -53 53 | Decimal(float(" inf ")) # Decimal(" inf ") -54 54 | Decimal(float(" +inf ")) # Decimal(" +inf ") -55 55 | Decimal(float(" -inf ")) # Decimal(" -inf ") +49 | Decimal(float(" +nan ")) # Decimal(" +nan ") +50 | # In this one case, " -nan ", the fix has to be +51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` + - Decimal(float(" -nan ")) # Decimal("nan") +52 + Decimal("nan") # Decimal("nan") +53 | Decimal(float(" inf ")) # Decimal(" inf ") +54 | Decimal(float(" +inf ")) # Decimal(" +inf ") +55 | Decimal(float(" -inf ")) # Decimal(" -inf ") FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:53:9 @@ -294,16 +268,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 55 | Decimal(float(" -inf ")) # Decimal(" -inf ") | help: Replace with `" inf "` - -ℹ Safe fix -50 50 | # In this one case, " -nan ", the fix has to be -51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` -52 52 | Decimal(float(" -nan ")) # Decimal("nan") -53 |-Decimal(float(" inf ")) # Decimal(" inf ") - 53 |+Decimal(" inf ") # Decimal(" inf ") -54 54 | Decimal(float(" +inf ")) # Decimal(" +inf ") -55 55 | Decimal(float(" -inf ")) # Decimal(" -inf ") -56 56 | Decimal(float(" infinity ")) # Decimal(" infinity ") +50 | # In this one case, " -nan ", the fix has to be +51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` +52 | Decimal(float(" -nan ")) # Decimal("nan") + - Decimal(float(" inf ")) # Decimal(" inf ") +53 + Decimal(" inf ") # Decimal(" inf ") +54 | Decimal(float(" +inf ")) # Decimal(" +inf ") +55 | Decimal(float(" -inf ")) # Decimal(" -inf ") +56 | Decimal(float(" infinity ")) # Decimal(" infinity ") FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:54:9 @@ -316,16 +288,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 56 | Decimal(float(" infinity ")) # Decimal(" infinity ") | help: Replace with `" +inf "` - -ℹ Safe fix -51 51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` -52 52 | Decimal(float(" -nan ")) # Decimal("nan") -53 53 | Decimal(float(" inf ")) # Decimal(" inf ") -54 |-Decimal(float(" +inf ")) # Decimal(" +inf ") - 54 |+Decimal(" +inf ") # Decimal(" +inf ") -55 55 | Decimal(float(" -inf ")) # Decimal(" -inf ") -56 56 | Decimal(float(" infinity ")) # Decimal(" infinity ") -57 57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") +51 | # `Decimal(" nan ")`` because `Decimal("-nan") != Decimal(float("-nan"))` +52 | Decimal(float(" -nan ")) # Decimal("nan") +53 | Decimal(float(" inf ")) # Decimal(" inf ") + - Decimal(float(" +inf ")) # Decimal(" +inf ") +54 + Decimal(" +inf ") # Decimal(" +inf ") +55 | Decimal(float(" -inf ")) # Decimal(" -inf ") +56 | Decimal(float(" infinity ")) # Decimal(" infinity ") +57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:55:9 @@ -338,16 +308,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") | help: Replace with `" -inf "` - -ℹ Safe fix -52 52 | Decimal(float(" -nan ")) # Decimal("nan") -53 53 | Decimal(float(" inf ")) # Decimal(" inf ") -54 54 | Decimal(float(" +inf ")) # Decimal(" +inf ") -55 |-Decimal(float(" -inf ")) # Decimal(" -inf ") - 55 |+Decimal(" -inf ") # Decimal(" -inf ") -56 56 | Decimal(float(" infinity ")) # Decimal(" infinity ") -57 57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") -58 58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") +52 | Decimal(float(" -nan ")) # Decimal("nan") +53 | Decimal(float(" inf ")) # Decimal(" inf ") +54 | Decimal(float(" +inf ")) # Decimal(" +inf ") + - Decimal(float(" -inf ")) # Decimal(" -inf ") +55 + Decimal(" -inf ") # Decimal(" -inf ") +56 | Decimal(float(" infinity ")) # Decimal(" infinity ") +57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") +58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:56:9 @@ -360,16 +328,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") | help: Replace with `" infinity "` - -ℹ Safe fix -53 53 | Decimal(float(" inf ")) # Decimal(" inf ") -54 54 | Decimal(float(" +inf ")) # Decimal(" +inf ") -55 55 | Decimal(float(" -inf ")) # Decimal(" -inf ") -56 |-Decimal(float(" infinity ")) # Decimal(" infinity ") - 56 |+Decimal(" infinity ") # Decimal(" infinity ") -57 57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") -58 58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") -59 59 | +53 | Decimal(float(" inf ")) # Decimal(" inf ") +54 | Decimal(float(" +inf ")) # Decimal(" +inf ") +55 | Decimal(float(" -inf ")) # Decimal(" -inf ") + - Decimal(float(" infinity ")) # Decimal(" infinity ") +56 + Decimal(" infinity ") # Decimal(" infinity ") +57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") +58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") +59 | FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:57:9 @@ -381,16 +347,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") | help: Replace with `" +infinity "` - -ℹ Safe fix -54 54 | Decimal(float(" +inf ")) # Decimal(" +inf ") -55 55 | Decimal(float(" -inf ")) # Decimal(" -inf ") -56 56 | Decimal(float(" infinity ")) # Decimal(" infinity ") -57 |-Decimal(float(" +infinity ")) # Decimal(" +infinity ") - 57 |+Decimal(" +infinity ") # Decimal(" +infinity ") -58 58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") -59 59 | -60 60 | # Escape sequence handling in "-nan" case +54 | Decimal(float(" +inf ")) # Decimal(" +inf ") +55 | Decimal(float(" -inf ")) # Decimal(" -inf ") +56 | Decimal(float(" infinity ")) # Decimal(" infinity ") + - Decimal(float(" +infinity ")) # Decimal(" +infinity ") +57 + Decimal(" +infinity ") # Decimal(" +infinity ") +58 | Decimal(float(" -infinity ")) # Decimal(" -infinity ") +59 | +60 | # Escape sequence handling in "-nan" case FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:58:9 @@ -403,16 +367,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 60 | # Escape sequence handling in "-nan" case | help: Replace with `" -infinity "` - -ℹ Safe fix -55 55 | Decimal(float(" -inf ")) # Decimal(" -inf ") -56 56 | Decimal(float(" infinity ")) # Decimal(" infinity ") -57 57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") -58 |-Decimal(float(" -infinity ")) # Decimal(" -infinity ") - 58 |+Decimal(" -infinity ") # Decimal(" -infinity ") -59 59 | -60 60 | # Escape sequence handling in "-nan" case -61 61 | # Here we do not bother respecting the original whitespace +55 | Decimal(float(" -inf ")) # Decimal(" -inf ") +56 | Decimal(float(" infinity ")) # Decimal(" infinity ") +57 | Decimal(float(" +infinity ")) # Decimal(" +infinity ") + - Decimal(float(" -infinity ")) # Decimal(" -infinity ") +58 + Decimal(" -infinity ") # Decimal(" -infinity ") +59 | +60 | # Escape sequence handling in "-nan" case +61 | # Here we do not bother respecting the original whitespace FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:64:9 @@ -425,16 +387,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 66 | Decimal(float("\x20\u002dnan")) | help: Replace with `"nan"` - -ℹ Safe fix -61 61 | # Here we do not bother respecting the original whitespace -62 62 | # and other trivia when offering a fix. -63 63 | # https://github.com/astral-sh/ruff/issues/16771 -64 |-Decimal(float("\x2dnan")) - 64 |+Decimal("nan") -65 65 | Decimal(float("\x20\x2dnan")) -66 66 | Decimal(float("\x20\u002dnan")) -67 67 | Decimal(float("\x20\U0000002dnan")) +61 | # Here we do not bother respecting the original whitespace +62 | # and other trivia when offering a fix. +63 | # https://github.com/astral-sh/ruff/issues/16771 + - Decimal(float("\x2dnan")) +64 + Decimal("nan") +65 | Decimal(float("\x20\x2dnan")) +66 | Decimal(float("\x20\u002dnan")) +67 | Decimal(float("\x20\U0000002dnan")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:65:9 @@ -447,16 +407,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 67 | Decimal(float("\x20\U0000002dnan")) | help: Replace with `"nan"` - -ℹ Safe fix -62 62 | # and other trivia when offering a fix. -63 63 | # https://github.com/astral-sh/ruff/issues/16771 -64 64 | Decimal(float("\x2dnan")) -65 |-Decimal(float("\x20\x2dnan")) - 65 |+Decimal("nan") -66 66 | Decimal(float("\x20\u002dnan")) -67 67 | Decimal(float("\x20\U0000002dnan")) -68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) +62 | # and other trivia when offering a fix. +63 | # https://github.com/astral-sh/ruff/issues/16771 +64 | Decimal(float("\x2dnan")) + - Decimal(float("\x20\x2dnan")) +65 + Decimal("nan") +66 | Decimal(float("\x20\u002dnan")) +67 | Decimal(float("\x20\U0000002dnan")) +68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:66:9 @@ -469,16 +427,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) | help: Replace with `"nan"` - -ℹ Safe fix -63 63 | # https://github.com/astral-sh/ruff/issues/16771 -64 64 | Decimal(float("\x2dnan")) -65 65 | Decimal(float("\x20\x2dnan")) -66 |-Decimal(float("\x20\u002dnan")) - 66 |+Decimal("nan") -67 67 | Decimal(float("\x20\U0000002dnan")) -68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) -69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) +63 | # https://github.com/astral-sh/ruff/issues/16771 +64 | Decimal(float("\x2dnan")) +65 | Decimal(float("\x20\x2dnan")) + - Decimal(float("\x20\u002dnan")) +66 + Decimal("nan") +67 | Decimal(float("\x20\U0000002dnan")) +68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) +69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:67:9 @@ -491,16 +447,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) | help: Replace with `"nan"` - -ℹ Safe fix -64 64 | Decimal(float("\x2dnan")) -65 65 | Decimal(float("\x20\x2dnan")) -66 66 | Decimal(float("\x20\u002dnan")) -67 |-Decimal(float("\x20\U0000002dnan")) - 67 |+Decimal("nan") -68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) -69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) -70 70 | Decimal(float(" -" "nan")) +64 | Decimal(float("\x2dnan")) +65 | Decimal(float("\x20\x2dnan")) +66 | Decimal(float("\x20\u002dnan")) + - Decimal(float("\x20\U0000002dnan")) +67 + Decimal("nan") +68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) +69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) +70 | Decimal(float(" -" "nan")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:68:9 @@ -513,16 +467,14 @@ FURB157 [*] Verbose expression in `Decimal` constructor 70 | Decimal(float(" -" "nan")) | help: Replace with `"nan"` - -ℹ Safe fix -65 65 | Decimal(float("\x20\x2dnan")) -66 66 | Decimal(float("\x20\u002dnan")) -67 67 | Decimal(float("\x20\U0000002dnan")) -68 |-Decimal(float("\N{space}\N{hyPHen-MINus}nan")) - 68 |+Decimal("nan") -69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) -70 70 | Decimal(float(" -" "nan")) -71 71 | Decimal(float("-nAn")) +65 | Decimal(float("\x20\x2dnan")) +66 | Decimal(float("\x20\u002dnan")) +67 | Decimal(float("\x20\U0000002dnan")) + - Decimal(float("\N{space}\N{hyPHen-MINus}nan")) +68 + Decimal("nan") +69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) +70 | Decimal(float(" -" "nan")) +71 | Decimal(float("-nAn")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:69:9 @@ -535,15 +487,13 @@ FURB157 [*] Verbose expression in `Decimal` constructor 71 | Decimal(float("-nAn")) | help: Replace with `"nan"` - -ℹ Safe fix -66 66 | Decimal(float("\x20\u002dnan")) -67 67 | Decimal(float("\x20\U0000002dnan")) -68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) -69 |-Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) - 69 |+Decimal("nan") -70 70 | Decimal(float(" -" "nan")) -71 71 | Decimal(float("-nAn")) +66 | Decimal(float("\x20\u002dnan")) +67 | Decimal(float("\x20\U0000002dnan")) +68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) + - Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) +69 + Decimal("nan") +70 | Decimal(float(" -" "nan")) +71 | Decimal(float("-nAn")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:70:9 @@ -555,14 +505,12 @@ FURB157 [*] Verbose expression in `Decimal` constructor 71 | Decimal(float("-nAn")) | help: Replace with `"nan"` - -ℹ Safe fix -67 67 | Decimal(float("\x20\U0000002dnan")) -68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) -69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) -70 |-Decimal(float(" -" "nan")) - 70 |+Decimal("nan") -71 71 | Decimal(float("-nAn")) +67 | Decimal(float("\x20\U0000002dnan")) +68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) +69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) + - Decimal(float(" -" "nan")) +70 + Decimal("nan") +71 | Decimal(float("-nAn")) FURB157 [*] Verbose expression in `Decimal` constructor --> FURB157.py:71:9 @@ -573,10 +521,8 @@ FURB157 [*] Verbose expression in `Decimal` constructor | ^^^^^^^^^^^^^ | help: Replace with `"nan"` - -ℹ Safe fix -68 68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) -69 69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) -70 70 | Decimal(float(" -" "nan")) -71 |-Decimal(float("-nAn")) - 71 |+Decimal("nan") +68 | Decimal(float("\N{space}\N{hyPHen-MINus}nan")) +69 | Decimal(float("\x20\N{character tabulation}\N{hyphen-minus}nan")) +70 | Decimal(float(" -" "nan")) + - Decimal(float("-nAn")) +71 + Decimal("nan") diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap index 8c499ed411..3930eed181 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB161_FURB161.py.snap @@ -12,16 +12,15 @@ FURB161 [*] Use of `bin(x).count('1')` 8 | count = bin(0b1010).count("1") # FURB161 | help: Replace with `(x).bit_count()` - -ℹ Unsafe fix -3 3 | def ten() -> int: -4 4 | return 10 -5 5 | -6 |-count = bin(x).count("1") # FURB161 - 6 |+count = (x).bit_count() # FURB161 -7 7 | count = bin(10).count("1") # FURB161 -8 8 | count = bin(0b1010).count("1") # FURB161 -9 9 | count = bin(0xA).count("1") # FURB161 +3 | def ten() -> int: +4 | return 10 +5 | + - count = bin(x).count("1") # FURB161 +6 + count = (x).bit_count() # FURB161 +7 | count = bin(10).count("1") # FURB161 +8 | count = bin(0b1010).count("1") # FURB161 +9 | count = bin(0xA).count("1") # FURB161 +note: This is an unsafe fix and may change runtime behavior FURB161 [*] Use of `bin(10).count('1')` --> FURB161.py:7:9 @@ -33,16 +32,14 @@ FURB161 [*] Use of `bin(10).count('1')` 9 | count = bin(0xA).count("1") # FURB161 | help: Replace with `(10).bit_count()` - -ℹ Safe fix -4 4 | return 10 -5 5 | -6 6 | count = bin(x).count("1") # FURB161 -7 |-count = bin(10).count("1") # FURB161 - 7 |+count = (10).bit_count() # FURB161 -8 8 | count = bin(0b1010).count("1") # FURB161 -9 9 | count = bin(0xA).count("1") # FURB161 -10 10 | count = bin(0o12).count("1") # FURB161 +4 | return 10 +5 | +6 | count = bin(x).count("1") # FURB161 + - count = bin(10).count("1") # FURB161 +7 + count = (10).bit_count() # FURB161 +8 | count = bin(0b1010).count("1") # FURB161 +9 | count = bin(0xA).count("1") # FURB161 +10 | count = bin(0o12).count("1") # FURB161 FURB161 [*] Use of `bin(0b1010).count('1')` --> FURB161.py:8:9 @@ -55,16 +52,14 @@ FURB161 [*] Use of `bin(0b1010).count('1')` 10 | count = bin(0o12).count("1") # FURB161 | help: Replace with `0b1010.bit_count()` - -ℹ Safe fix -5 5 | -6 6 | count = bin(x).count("1") # FURB161 -7 7 | count = bin(10).count("1") # FURB161 -8 |-count = bin(0b1010).count("1") # FURB161 - 8 |+count = 0b1010.bit_count() # FURB161 -9 9 | count = bin(0xA).count("1") # FURB161 -10 10 | count = bin(0o12).count("1") # FURB161 -11 11 | count = bin(0x10 + 0x1000).count("1") # FURB161 +5 | +6 | count = bin(x).count("1") # FURB161 +7 | count = bin(10).count("1") # FURB161 + - count = bin(0b1010).count("1") # FURB161 +8 + count = 0b1010.bit_count() # FURB161 +9 | count = bin(0xA).count("1") # FURB161 +10 | count = bin(0o12).count("1") # FURB161 +11 | count = bin(0x10 + 0x1000).count("1") # FURB161 FURB161 [*] Use of `bin(0xA).count('1')` --> FURB161.py:9:9 @@ -77,16 +72,14 @@ FURB161 [*] Use of `bin(0xA).count('1')` 11 | count = bin(0x10 + 0x1000).count("1") # FURB161 | help: Replace with `0xA.bit_count()` - -ℹ Safe fix -6 6 | count = bin(x).count("1") # FURB161 -7 7 | count = bin(10).count("1") # FURB161 -8 8 | count = bin(0b1010).count("1") # FURB161 -9 |-count = bin(0xA).count("1") # FURB161 - 9 |+count = 0xA.bit_count() # FURB161 -10 10 | count = bin(0o12).count("1") # FURB161 -11 11 | count = bin(0x10 + 0x1000).count("1") # FURB161 -12 12 | count = bin(ten()).count("1") # FURB161 +6 | count = bin(x).count("1") # FURB161 +7 | count = bin(10).count("1") # FURB161 +8 | count = bin(0b1010).count("1") # FURB161 + - count = bin(0xA).count("1") # FURB161 +9 + count = 0xA.bit_count() # FURB161 +10 | count = bin(0o12).count("1") # FURB161 +11 | count = bin(0x10 + 0x1000).count("1") # FURB161 +12 | count = bin(ten()).count("1") # FURB161 FURB161 [*] Use of `bin(0o12).count('1')` --> FURB161.py:10:9 @@ -99,16 +92,14 @@ FURB161 [*] Use of `bin(0o12).count('1')` 12 | count = bin(ten()).count("1") # FURB161 | help: Replace with `0o12.bit_count()` - -ℹ Safe fix -7 7 | count = bin(10).count("1") # FURB161 -8 8 | count = bin(0b1010).count("1") # FURB161 -9 9 | count = bin(0xA).count("1") # FURB161 -10 |-count = bin(0o12).count("1") # FURB161 - 10 |+count = 0o12.bit_count() # FURB161 -11 11 | count = bin(0x10 + 0x1000).count("1") # FURB161 -12 12 | count = bin(ten()).count("1") # FURB161 -13 13 | count = bin((10)).count("1") # FURB161 +7 | count = bin(10).count("1") # FURB161 +8 | count = bin(0b1010).count("1") # FURB161 +9 | count = bin(0xA).count("1") # FURB161 + - count = bin(0o12).count("1") # FURB161 +10 + count = 0o12.bit_count() # FURB161 +11 | count = bin(0x10 + 0x1000).count("1") # FURB161 +12 | count = bin(ten()).count("1") # FURB161 +13 | count = bin((10)).count("1") # FURB161 FURB161 [*] Use of `bin(0x10 + 0x1000).count('1')` --> FURB161.py:11:9 @@ -121,16 +112,14 @@ FURB161 [*] Use of `bin(0x10 + 0x1000).count('1')` 13 | count = bin((10)).count("1") # FURB161 | help: Replace with `(0x10 + 0x1000).bit_count()` - -ℹ Safe fix -8 8 | count = bin(0b1010).count("1") # FURB161 -9 9 | count = bin(0xA).count("1") # FURB161 -10 10 | count = bin(0o12).count("1") # FURB161 -11 |-count = bin(0x10 + 0x1000).count("1") # FURB161 - 11 |+count = (0x10 + 0x1000).bit_count() # FURB161 -12 12 | count = bin(ten()).count("1") # FURB161 -13 13 | count = bin((10)).count("1") # FURB161 -14 14 | count = bin("10" "15").count("1") # FURB161 +8 | count = bin(0b1010).count("1") # FURB161 +9 | count = bin(0xA).count("1") # FURB161 +10 | count = bin(0o12).count("1") # FURB161 + - count = bin(0x10 + 0x1000).count("1") # FURB161 +11 + count = (0x10 + 0x1000).bit_count() # FURB161 +12 | count = bin(ten()).count("1") # FURB161 +13 | count = bin((10)).count("1") # FURB161 +14 | count = bin("10" "15").count("1") # FURB161 FURB161 [*] Use of `bin(ten()).count('1')` --> FURB161.py:12:9 @@ -143,16 +132,15 @@ FURB161 [*] Use of `bin(ten()).count('1')` 14 | count = bin("10" "15").count("1") # FURB161 | help: Replace with `ten().bit_count()` - -ℹ Unsafe fix -9 9 | count = bin(0xA).count("1") # FURB161 -10 10 | count = bin(0o12).count("1") # FURB161 -11 11 | count = bin(0x10 + 0x1000).count("1") # FURB161 -12 |-count = bin(ten()).count("1") # FURB161 - 12 |+count = ten().bit_count() # FURB161 -13 13 | count = bin((10)).count("1") # FURB161 -14 14 | count = bin("10" "15").count("1") # FURB161 -15 15 | count = bin("123").count("1") # FURB161 +9 | count = bin(0xA).count("1") # FURB161 +10 | count = bin(0o12).count("1") # FURB161 +11 | count = bin(0x10 + 0x1000).count("1") # FURB161 + - count = bin(ten()).count("1") # FURB161 +12 + count = ten().bit_count() # FURB161 +13 | count = bin((10)).count("1") # FURB161 +14 | count = bin("10" "15").count("1") # FURB161 +15 | count = bin("123").count("1") # FURB161 +note: This is an unsafe fix and may change runtime behavior FURB161 [*] Use of `bin(10).count('1')` --> FURB161.py:13:9 @@ -165,16 +153,14 @@ FURB161 [*] Use of `bin(10).count('1')` 15 | count = bin("123").count("1") # FURB161 | help: Replace with `(10).bit_count()` - -ℹ Safe fix -10 10 | count = bin(0o12).count("1") # FURB161 -11 11 | count = bin(0x10 + 0x1000).count("1") # FURB161 -12 12 | count = bin(ten()).count("1") # FURB161 -13 |-count = bin((10)).count("1") # FURB161 - 13 |+count = (10).bit_count() # FURB161 -14 14 | count = bin("10" "15").count("1") # FURB161 -15 15 | count = bin("123").count("1") # FURB161 -16 16 | +10 | count = bin(0o12).count("1") # FURB161 +11 | count = bin(0x10 + 0x1000).count("1") # FURB161 +12 | count = bin(ten()).count("1") # FURB161 + - count = bin((10)).count("1") # FURB161 +13 + count = (10).bit_count() # FURB161 +14 | count = bin("10" "15").count("1") # FURB161 +15 | count = bin("123").count("1") # FURB161 +16 | FURB161 [*] Use of `bin("10" "15").count('1')` --> FURB161.py:14:9 @@ -186,16 +172,15 @@ FURB161 [*] Use of `bin("10" "15").count('1')` 15 | count = bin("123").count("1") # FURB161 | help: Replace with `("10" "15").bit_count()` - -ℹ Unsafe fix -11 11 | count = bin(0x10 + 0x1000).count("1") # FURB161 -12 12 | count = bin(ten()).count("1") # FURB161 -13 13 | count = bin((10)).count("1") # FURB161 -14 |-count = bin("10" "15").count("1") # FURB161 - 14 |+count = ("10" "15").bit_count() # FURB161 -15 15 | count = bin("123").count("1") # FURB161 -16 16 | -17 17 | count = x.bit_count() # OK +11 | count = bin(0x10 + 0x1000).count("1") # FURB161 +12 | count = bin(ten()).count("1") # FURB161 +13 | count = bin((10)).count("1") # FURB161 + - count = bin("10" "15").count("1") # FURB161 +14 + count = ("10" "15").bit_count() # FURB161 +15 | count = bin("123").count("1") # FURB161 +16 | +17 | count = x.bit_count() # OK +note: This is an unsafe fix and may change runtime behavior FURB161 [*] Use of `bin("123").count('1')` --> FURB161.py:15:9 @@ -208,13 +193,12 @@ FURB161 [*] Use of `bin("123").count('1')` 17 | count = x.bit_count() # OK | help: Replace with `"123".bit_count()` - -ℹ Unsafe fix -12 12 | count = bin(ten()).count("1") # FURB161 -13 13 | count = bin((10)).count("1") # FURB161 -14 14 | count = bin("10" "15").count("1") # FURB161 -15 |-count = bin("123").count("1") # FURB161 - 15 |+count = "123".bit_count() # FURB161 -16 16 | -17 17 | count = x.bit_count() # OK -18 18 | count = (10).bit_count() # OK +12 | count = bin(ten()).count("1") # FURB161 +13 | count = bin((10)).count("1") # FURB161 +14 | count = bin("10" "15").count("1") # FURB161 + - count = bin("123").count("1") # FURB161 +15 + count = "123".bit_count() # FURB161 +16 | +17 | count = x.bit_count() # OK +18 | count = (10).bit_count() # OK +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap index d34aad2d15..048da43128 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB162_FURB162.py.snap @@ -11,16 +11,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 9 | datetime.fromisoformat(date.replace("Z", "-00:" "00")) | help: Remove `.replace()` call - -ℹ Unsafe fix -5 5 | -6 6 | ### Errors -7 7 | -8 |-datetime.fromisoformat(date.replace("Z", "+00:00")) - 8 |+datetime.fromisoformat(date) -9 9 | datetime.fromisoformat(date.replace("Z", "-00:" "00")) -10 10 | -11 11 | datetime.fromisoformat(date[:-1] + "-00") +5 | +6 | ### Errors +7 | + - datetime.fromisoformat(date.replace("Z", "+00:00")) +8 + datetime.fromisoformat(date) +9 | datetime.fromisoformat(date.replace("Z", "-00:" "00")) +10 | +11 | datetime.fromisoformat(date[:-1] + "-00") +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:9:24 @@ -32,16 +31,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 11 | datetime.fromisoformat(date[:-1] + "-00") | help: Remove `.replace()` call - -ℹ Unsafe fix -6 6 | ### Errors -7 7 | -8 8 | datetime.fromisoformat(date.replace("Z", "+00:00")) -9 |-datetime.fromisoformat(date.replace("Z", "-00:" "00")) - 9 |+datetime.fromisoformat(date) -10 10 | -11 11 | datetime.fromisoformat(date[:-1] + "-00") -12 12 | datetime.fromisoformat(date[:-1:] + "-0000") +6 | ### Errors +7 | +8 | datetime.fromisoformat(date.replace("Z", "+00:00")) + - datetime.fromisoformat(date.replace("Z", "-00:" "00")) +9 + datetime.fromisoformat(date) +10 | +11 | datetime.fromisoformat(date[:-1] + "-00") +12 | datetime.fromisoformat(date[:-1:] + "-0000") +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:11:24 @@ -53,16 +51,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 12 | datetime.fromisoformat(date[:-1:] + "-0000") | help: Remove `.replace()` call - -ℹ Unsafe fix -8 8 | datetime.fromisoformat(date.replace("Z", "+00:00")) -9 9 | datetime.fromisoformat(date.replace("Z", "-00:" "00")) -10 10 | -11 |-datetime.fromisoformat(date[:-1] + "-00") - 11 |+datetime.fromisoformat(date) -12 12 | datetime.fromisoformat(date[:-1:] + "-0000") -13 13 | -14 14 | datetime.fromisoformat(date.strip("Z") + """+0""" +8 | datetime.fromisoformat(date.replace("Z", "+00:00")) +9 | datetime.fromisoformat(date.replace("Z", "-00:" "00")) +10 | + - datetime.fromisoformat(date[:-1] + "-00") +11 + datetime.fromisoformat(date) +12 | datetime.fromisoformat(date[:-1:] + "-0000") +13 | +14 | datetime.fromisoformat(date.strip("Z") + """+0""" +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:12:24 @@ -74,16 +71,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 14 | datetime.fromisoformat(date.strip("Z") + """+0""" | help: Remove `.replace()` call - -ℹ Unsafe fix -9 9 | datetime.fromisoformat(date.replace("Z", "-00:" "00")) -10 10 | -11 11 | datetime.fromisoformat(date[:-1] + "-00") -12 |-datetime.fromisoformat(date[:-1:] + "-0000") - 12 |+datetime.fromisoformat(date) -13 13 | -14 14 | datetime.fromisoformat(date.strip("Z") + """+0""" -15 15 | """0""") +9 | datetime.fromisoformat(date.replace("Z", "-00:" "00")) +10 | +11 | datetime.fromisoformat(date[:-1] + "-00") + - datetime.fromisoformat(date[:-1:] + "-0000") +12 + datetime.fromisoformat(date) +13 | +14 | datetime.fromisoformat(date.strip("Z") + """+0""" +15 | """0""") +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:14:24 @@ -97,17 +93,16 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 16 | datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}') | help: Remove `.replace()` call - -ℹ Unsafe fix -11 11 | datetime.fromisoformat(date[:-1] + "-00") -12 12 | datetime.fromisoformat(date[:-1:] + "-0000") -13 13 | -14 |-datetime.fromisoformat(date.strip("Z") + """+0""" -15 |- """0""") - 14 |+datetime.fromisoformat(date) -16 15 | datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}') -17 16 | -18 17 | datetime.fromisoformat( +11 | datetime.fromisoformat(date[:-1] + "-00") +12 | datetime.fromisoformat(date[:-1:] + "-0000") +13 | + - datetime.fromisoformat(date.strip("Z") + """+0""" + - """0""") +14 + datetime.fromisoformat(date) +15 | datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}') +16 | +17 | datetime.fromisoformat( +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:16:24 @@ -120,16 +115,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 18 | datetime.fromisoformat( | help: Remove `.replace()` call - -ℹ Unsafe fix -13 13 | -14 14 | datetime.fromisoformat(date.strip("Z") + """+0""" -15 15 | """0""") -16 |-datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}') - 16 |+datetime.fromisoformat(date) -17 17 | -18 18 | datetime.fromisoformat( -19 19 | # Preserved +13 | +14 | datetime.fromisoformat(date.strip("Z") + """+0""" +15 | """0""") + - datetime.fromisoformat(date.rstrip("Z") + "+\x30\60" '\u0030\N{DIGIT ZERO}') +16 + datetime.fromisoformat(date) +17 | +18 | datetime.fromisoformat( +19 | # Preserved +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:20:5 @@ -143,16 +137,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 23 | ) | help: Remove `.replace()` call - -ℹ Unsafe fix -19 19 | # Preserved -20 20 | ( # Preserved -21 21 | date -22 |- ).replace("Z", "+00") - 22 |+ ) -23 23 | ) -24 24 | -25 25 | datetime.fromisoformat( +19 | # Preserved +20 | ( # Preserved +21 | date + - ).replace("Z", "+00") +22 + ) +23 | ) +24 | +25 | datetime.fromisoformat( +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:26:5 @@ -169,20 +162,19 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 33 | ) | help: Remove `.replace()` call - -ℹ Unsafe fix -25 25 | datetime.fromisoformat( -26 26 | (date -27 27 | # Preserved -28 |- ) -29 |- . -30 |- rstrip("Z" -31 |- # Unsafe -32 |- ) + "-00" # Preserved - 28 |+ ) # Preserved -33 29 | ) -34 30 | -35 31 | datetime.fromisoformat( +25 | datetime.fromisoformat( +26 | (date +27 | # Preserved + - ) + - . + - rstrip("Z" + - # Unsafe + - ) + "-00" # Preserved +28 + ) # Preserved +29 | ) +30 | +31 | datetime.fromisoformat( +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:36:5 @@ -195,16 +187,15 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 39 | ) | help: Remove `.replace()` call - -ℹ Unsafe fix -35 35 | datetime.fromisoformat( -36 36 | ( # Preserved -37 37 | date -38 |- ).strip("Z") + "+0000" - 38 |+ ) -39 39 | ) -40 40 | -41 41 | datetime.fromisoformat( +35 | datetime.fromisoformat( +36 | ( # Preserved +37 | date + - ).strip("Z") + "+0000" +38 + ) +39 | ) +40 | +41 | datetime.fromisoformat( +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:42:5 @@ -220,17 +211,16 @@ FURB162 [*] Unnecessary timezone replacement with zero offset 48 | ) | help: Remove `.replace()` call - -ℹ Unsafe fix -42 42 | (date -43 43 | # Preserved -44 44 | ) -45 |- [ # Unsafe -46 |- :-1 -47 |- ] + "-00" -48 45 | ) -49 46 | -50 47 | +42 | (date +43 | # Preserved +44 | ) + - [ # Unsafe + - :-1 + - ] + "-00" +45 | ) +46 | +47 | +note: This is an unsafe fix and may change runtime behavior FURB162 [*] Unnecessary timezone replacement with zero offset --> FURB162.py:52:24 @@ -240,13 +230,12 @@ FURB162 [*] Unnecessary timezone replacement with zero offset | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove `.replace()` call - -ℹ Unsafe fix -49 49 | -50 50 | -51 51 | # Edge case -52 |-datetime.fromisoformat("Z2025-01-01T00:00:00Z".strip("Z") + "+00:00") - 52 |+datetime.fromisoformat("Z2025-01-01T00:00:00Z") -53 53 | -54 54 | -55 55 | ### No errors +49 | +50 | +51 | # Edge case + - datetime.fromisoformat("Z2025-01-01T00:00:00Z".strip("Z") + "+00:00") +52 + datetime.fromisoformat("Z2025-01-01T00:00:00Z") +53 | +54 | +55 | ### No errors +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap index 3966ed43d0..9c8c186546 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB163_FURB163.py.snap @@ -11,16 +11,15 @@ FURB163 [*] Prefer `math.log2(1)` over `math.log` with a redundant base 6 | math.log(1, math.e) | help: Replace with `math.log2(1)` - -ℹ Unsafe fix -1 1 | import math -2 2 | -3 3 | # Errors -4 |-math.log(1, 2) - 4 |+math.log2(1) -5 5 | math.log(1, 10) -6 6 | math.log(1, math.e) -7 7 | foo = ... +1 | import math +2 | +3 | # Errors + - math.log(1, 2) +4 + math.log2(1) +5 | math.log(1, 10) +6 | math.log(1, math.e) +7 | foo = ... +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base --> FURB163.py:5:1 @@ -33,16 +32,15 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base 7 | foo = ... | help: Replace with `math.log10(1)` - -ℹ Unsafe fix -2 2 | -3 3 | # Errors -4 4 | math.log(1, 2) -5 |-math.log(1, 10) - 5 |+math.log10(1) -6 6 | math.log(1, math.e) -7 7 | foo = ... -8 8 | math.log(foo, 2) +2 | +3 | # Errors +4 | math.log(1, 2) + - math.log(1, 10) +5 + math.log10(1) +6 | math.log(1, math.e) +7 | foo = ... +8 | math.log(foo, 2) +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log(1)` over `math.log` with a redundant base --> FURB163.py:6:1 @@ -55,16 +53,14 @@ FURB163 [*] Prefer `math.log(1)` over `math.log` with a redundant base 8 | math.log(foo, 2) | help: Replace with `math.log(1)` - -ℹ Safe fix -3 3 | # Errors -4 4 | math.log(1, 2) -5 5 | math.log(1, 10) -6 |-math.log(1, math.e) - 6 |+math.log(1) -7 7 | foo = ... -8 8 | math.log(foo, 2) -9 9 | math.log(foo, 10) +3 | # Errors +4 | math.log(1, 2) +5 | math.log(1, 10) + - math.log(1, math.e) +6 + math.log(1) +7 | foo = ... +8 | math.log(foo, 2) +9 | math.log(foo, 10) FURB163 [*] Prefer `math.log2(foo)` over `math.log` with a redundant base --> FURB163.py:8:1 @@ -77,16 +73,15 @@ FURB163 [*] Prefer `math.log2(foo)` over `math.log` with a redundant base 10 | math.log(foo, math.e) | help: Replace with `math.log2(foo)` - -ℹ Unsafe fix -5 5 | math.log(1, 10) -6 6 | math.log(1, math.e) -7 7 | foo = ... -8 |-math.log(foo, 2) - 8 |+math.log2(foo) -9 9 | math.log(foo, 10) -10 10 | math.log(foo, math.e) -11 11 | math.log(1, 2.0) +5 | math.log(1, 10) +6 | math.log(1, math.e) +7 | foo = ... + - math.log(foo, 2) +8 + math.log2(foo) +9 | math.log(foo, 10) +10 | math.log(foo, math.e) +11 | math.log(1, 2.0) +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log10(foo)` over `math.log` with a redundant base --> FURB163.py:9:1 @@ -99,16 +94,15 @@ FURB163 [*] Prefer `math.log10(foo)` over `math.log` with a redundant base 11 | math.log(1, 2.0) | help: Replace with `math.log10(foo)` - -ℹ Unsafe fix -6 6 | math.log(1, math.e) -7 7 | foo = ... -8 8 | math.log(foo, 2) -9 |-math.log(foo, 10) - 9 |+math.log10(foo) -10 10 | math.log(foo, math.e) -11 11 | math.log(1, 2.0) -12 12 | math.log(1, 10.0) +6 | math.log(1, math.e) +7 | foo = ... +8 | math.log(foo, 2) + - math.log(foo, 10) +9 + math.log10(foo) +10 | math.log(foo, math.e) +11 | math.log(1, 2.0) +12 | math.log(1, 10.0) +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log(foo)` over `math.log` with a redundant base --> FURB163.py:10:1 @@ -121,16 +115,14 @@ FURB163 [*] Prefer `math.log(foo)` over `math.log` with a redundant base 12 | math.log(1, 10.0) | help: Replace with `math.log(foo)` - -ℹ Safe fix -7 7 | foo = ... -8 8 | math.log(foo, 2) -9 9 | math.log(foo, 10) -10 |-math.log(foo, math.e) - 10 |+math.log(foo) -11 11 | math.log(1, 2.0) -12 12 | math.log(1, 10.0) -13 13 | +7 | foo = ... +8 | math.log(foo, 2) +9 | math.log(foo, 10) + - math.log(foo, math.e) +10 + math.log(foo) +11 | math.log(1, 2.0) +12 | math.log(1, 10.0) +13 | FURB163 [*] Prefer `math.log2(1)` over `math.log` with a redundant base --> FURB163.py:11:1 @@ -142,16 +134,15 @@ FURB163 [*] Prefer `math.log2(1)` over `math.log` with a redundant base 12 | math.log(1, 10.0) | help: Replace with `math.log2(1)` - -ℹ Unsafe fix -8 8 | math.log(foo, 2) -9 9 | math.log(foo, 10) -10 10 | math.log(foo, math.e) -11 |-math.log(1, 2.0) - 11 |+math.log2(1) -12 12 | math.log(1, 10.0) -13 13 | -14 14 | # OK +8 | math.log(foo, 2) +9 | math.log(foo, 10) +10 | math.log(foo, math.e) + - math.log(1, 2.0) +11 + math.log2(1) +12 | math.log(1, 10.0) +13 | +14 | # OK +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base --> FURB163.py:12:1 @@ -164,16 +155,15 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base 14 | # OK | help: Replace with `math.log10(1)` - -ℹ Unsafe fix -9 9 | math.log(foo, 10) -10 10 | math.log(foo, math.e) -11 11 | math.log(1, 2.0) -12 |-math.log(1, 10.0) - 12 |+math.log10(1) -13 13 | -14 14 | # OK -15 15 | math.log2(1) +9 | math.log(foo, 10) +10 | math.log(foo, math.e) +11 | math.log(1, 2.0) + - math.log(1, 10.0) +12 + math.log10(1) +13 | +14 | # OK +15 | math.log2(1) +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log(yield)` over `math.log` with a redundant base --> FURB163.py:49:11 @@ -184,16 +174,14 @@ FURB163 [*] Prefer `math.log(yield)` over `math.log` with a redundant base | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `math.log(yield)` - -ℹ Safe fix -46 46 | -47 47 | # https://github.com/astral-sh/ruff/issues/18747 -48 48 | def log(): -49 |- yield math.log((yield), math.e) - 49 |+ yield math.log((yield)) -50 50 | -51 51 | -52 52 | def log(): +46 | +47 | # https://github.com/astral-sh/ruff/issues/18747 +48 | def log(): + - yield math.log((yield), math.e) +49 + yield math.log((yield)) +50 | +51 | +52 | def log(): FURB163 [*] Prefer `math.log(yield from x)` over `math.log` with a redundant base --> FURB163.py:53:11 @@ -205,16 +193,14 @@ FURB163 [*] Prefer `math.log(yield from x)` over `math.log` with a redundant bas 55 | # see: https://github.com/astral-sh/ruff/issues/18639 | help: Replace with `math.log(yield from x)` - -ℹ Safe fix -50 50 | -51 51 | -52 52 | def log(): -53 |- yield math.log((yield from x), math.e) - 53 |+ yield math.log((yield from x)) -54 54 | -55 55 | # see: https://github.com/astral-sh/ruff/issues/18639 -56 56 | math.log(1, 10 # comment +50 | +51 | +52 | def log(): + - yield math.log((yield from x), math.e) +53 + yield math.log((yield from x)) +54 | +55 | # see: https://github.com/astral-sh/ruff/issues/18639 +56 | math.log(1, 10 # comment FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base --> FURB163.py:56:1 @@ -227,17 +213,16 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base 59 | math.log(1, | help: Replace with `math.log10(1)` - -ℹ Unsafe fix -53 53 | yield math.log((yield from x), math.e) -54 54 | -55 55 | # see: https://github.com/astral-sh/ruff/issues/18639 -56 |-math.log(1, 10 # comment -57 |- ) - 56 |+math.log10(1) -58 57 | -59 58 | math.log(1, -60 59 | 10 # comment +53 | yield math.log((yield from x), math.e) +54 | +55 | # see: https://github.com/astral-sh/ruff/issues/18639 + - math.log(1, 10 # comment + - ) +56 + math.log10(1) +57 | +58 | math.log(1, +59 | 10 # comment +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base --> FURB163.py:59:1 @@ -252,18 +237,17 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base 63 | math.log(1 # comment | help: Replace with `math.log10(1)` - -ℹ Unsafe fix -56 56 | math.log(1, 10 # comment -57 57 | ) -58 58 | -59 |-math.log(1, -60 |- 10 # comment -61 |- ) - 59 |+math.log10(1) -62 60 | -63 61 | math.log(1 # comment -64 62 | , # comment +56 | math.log(1, 10 # comment +57 | ) +58 | + - math.log(1, + - 10 # comment + - ) +59 + math.log10(1) +60 | +61 | math.log(1 # comment +62 | , # comment +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base --> FURB163.py:63:1 @@ -279,19 +263,18 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base 68 | math.log( | help: Replace with `math.log10(1)` - -ℹ Unsafe fix -60 60 | 10 # comment -61 61 | ) -62 62 | -63 |-math.log(1 # comment -64 |- , # comment -65 |- 10 # comment -66 |- ) - 63 |+math.log10(1) -67 64 | -68 65 | math.log( -69 66 | 1 # comment +60 | 10 # comment +61 | ) +62 | + - math.log(1 # comment + - , # comment + - 10 # comment + - ) +63 + math.log10(1) +64 | +65 | math.log( +66 | 1 # comment +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base --> FURB163.py:68:1 @@ -308,20 +291,19 @@ FURB163 [*] Prefer `math.log10(1)` over `math.log` with a redundant base 74 | math.log(4.13e223, 2) | help: Replace with `math.log10(1)` - -ℹ Unsafe fix -65 65 | 10 # comment -66 66 | ) -67 67 | -68 |-math.log( -69 |- 1 # comment -70 |- , -71 |- 10 # comment -72 |-) - 68 |+math.log10(1) -73 69 | -74 70 | math.log(4.13e223, 2) -75 71 | math.log(4.14e223, 10) +65 | 10 # comment +66 | ) +67 | + - math.log( + - 1 # comment + - , + - 10 # comment + - ) +68 + math.log10(1) +69 | +70 | math.log(4.13e223, 2) +71 | math.log(4.14e223, 10) +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log2(4.13e223)` over `math.log` with a redundant base --> FURB163.py:74:1 @@ -333,16 +315,15 @@ FURB163 [*] Prefer `math.log2(4.13e223)` over `math.log` with a redundant base 75 | math.log(4.14e223, 10) | help: Replace with `math.log2(4.13e223)` - -ℹ Unsafe fix -71 71 | 10 # comment -72 72 | ) -73 73 | -74 |-math.log(4.13e223, 2) - 74 |+math.log2(4.13e223) -75 75 | math.log(4.14e223, 10) -76 76 | -77 77 | +71 | 10 # comment +72 | ) +73 | + - math.log(4.13e223, 2) +74 + math.log2(4.13e223) +75 | math.log(4.14e223, 10) +76 | +77 | +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log10(4.14e223)` over `math.log` with a redundant base --> FURB163.py:75:1 @@ -352,16 +333,15 @@ FURB163 [*] Prefer `math.log10(4.14e223)` over `math.log` with a redundant base | ^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `math.log10(4.14e223)` - -ℹ Unsafe fix -72 72 | ) -73 73 | -74 74 | math.log(4.13e223, 2) -75 |-math.log(4.14e223, 10) - 75 |+math.log10(4.14e223) -76 76 | -77 77 | -78 78 | def print_log(*args): +72 | ) +73 | +74 | math.log(4.13e223, 2) + - math.log(4.14e223, 10) +75 + math.log10(4.14e223) +76 | +77 | +78 | def print_log(*args): +note: This is an unsafe fix and may change runtime behavior FURB163 [*] Prefer `math.log(*args)` over `math.log` with a redundant base --> FURB163.py:80:15 @@ -374,12 +354,11 @@ FURB163 [*] Prefer `math.log(*args)` over `math.log` with a redundant base 82 | print(repr(e)) | help: Replace with `math.log(*args)` - -ℹ Unsafe fix -77 77 | -78 78 | def print_log(*args): -79 79 | try: -80 |- print(math.log(*args, math.e)) - 80 |+ print(math.log(*args)) -81 81 | except TypeError as e: -82 82 | print(repr(e)) +77 | +78 | def print_log(*args): +79 | try: + - print(math.log(*args, math.e)) +80 + print(math.log(*args)) +81 | except TypeError as e: +82 | print(repr(e)) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap index 2d866ca424..87ea8a0126 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB164_FURB164.py.snap @@ -11,16 +11,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction 9 | _ = Fraction.from_float(5.0) | help: Replace with `Fraction` constructor - -ℹ Safe fix -4 4 | import fractions -5 5 | -6 6 | # Errors -7 |-_ = Fraction.from_float(0.1) - 7 |+_ = Fraction(0.1) -8 8 | _ = Fraction.from_float(-0.5) -9 9 | _ = Fraction.from_float(5.0) -10 10 | _ = fractions.Fraction.from_float(4.2) +4 | import fractions +5 | +6 | # Errors + - _ = Fraction.from_float(0.1) +7 + _ = Fraction(0.1) +8 | _ = Fraction.from_float(-0.5) +9 | _ = Fraction.from_float(5.0) +10 | _ = fractions.Fraction.from_float(4.2) FURB164 [*] Verbose method `from_float` in `Fraction` construction --> FURB164.py:8:5 @@ -33,16 +31,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction 10 | _ = fractions.Fraction.from_float(4.2) | help: Replace with `Fraction` constructor - -ℹ Safe fix -5 5 | -6 6 | # Errors -7 7 | _ = Fraction.from_float(0.1) -8 |-_ = Fraction.from_float(-0.5) - 8 |+_ = Fraction(-0.5) -9 9 | _ = Fraction.from_float(5.0) -10 10 | _ = fractions.Fraction.from_float(4.2) -11 11 | _ = Fraction.from_decimal(Decimal("4.2")) +5 | +6 | # Errors +7 | _ = Fraction.from_float(0.1) + - _ = Fraction.from_float(-0.5) +8 + _ = Fraction(-0.5) +9 | _ = Fraction.from_float(5.0) +10 | _ = fractions.Fraction.from_float(4.2) +11 | _ = Fraction.from_decimal(Decimal("4.2")) FURB164 [*] Verbose method `from_float` in `Fraction` construction --> FURB164.py:9:5 @@ -55,16 +51,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction 11 | _ = Fraction.from_decimal(Decimal("4.2")) | help: Replace with `Fraction` constructor - -ℹ Safe fix -6 6 | # Errors -7 7 | _ = Fraction.from_float(0.1) -8 8 | _ = Fraction.from_float(-0.5) -9 |-_ = Fraction.from_float(5.0) - 9 |+_ = Fraction(5.0) -10 10 | _ = fractions.Fraction.from_float(4.2) -11 11 | _ = Fraction.from_decimal(Decimal("4.2")) -12 12 | _ = Fraction.from_decimal(Decimal("-4.2")) +6 | # Errors +7 | _ = Fraction.from_float(0.1) +8 | _ = Fraction.from_float(-0.5) + - _ = Fraction.from_float(5.0) +9 + _ = Fraction(5.0) +10 | _ = fractions.Fraction.from_float(4.2) +11 | _ = Fraction.from_decimal(Decimal("4.2")) +12 | _ = Fraction.from_decimal(Decimal("-4.2")) FURB164 [*] Verbose method `from_float` in `Fraction` construction --> FURB164.py:10:5 @@ -77,16 +71,14 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction 12 | _ = Fraction.from_decimal(Decimal("-4.2")) | help: Replace with `Fraction` constructor - -ℹ Safe fix -7 7 | _ = Fraction.from_float(0.1) -8 8 | _ = Fraction.from_float(-0.5) -9 9 | _ = Fraction.from_float(5.0) -10 |-_ = fractions.Fraction.from_float(4.2) - 10 |+_ = fractions.Fraction(4.2) -11 11 | _ = Fraction.from_decimal(Decimal("4.2")) -12 12 | _ = Fraction.from_decimal(Decimal("-4.2")) -13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) +7 | _ = Fraction.from_float(0.1) +8 | _ = Fraction.from_float(-0.5) +9 | _ = Fraction.from_float(5.0) + - _ = fractions.Fraction.from_float(4.2) +10 + _ = fractions.Fraction(4.2) +11 | _ = Fraction.from_decimal(Decimal("4.2")) +12 | _ = Fraction.from_decimal(Decimal("-4.2")) +13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) FURB164 [*] Verbose method `from_decimal` in `Fraction` construction --> FURB164.py:11:5 @@ -99,16 +91,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) | help: Replace with `Fraction` constructor - -ℹ Unsafe fix -8 8 | _ = Fraction.from_float(-0.5) -9 9 | _ = Fraction.from_float(5.0) -10 10 | _ = fractions.Fraction.from_float(4.2) -11 |-_ = Fraction.from_decimal(Decimal("4.2")) - 11 |+_ = Fraction(Decimal("4.2")) -12 12 | _ = Fraction.from_decimal(Decimal("-4.2")) -13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) -14 14 | _ = Decimal.from_float(0.1) +8 | _ = Fraction.from_float(-0.5) +9 | _ = Fraction.from_float(5.0) +10 | _ = fractions.Fraction.from_float(4.2) + - _ = Fraction.from_decimal(Decimal("4.2")) +11 + _ = Fraction(Decimal("4.2")) +12 | _ = Fraction.from_decimal(Decimal("-4.2")) +13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) +14 | _ = Decimal.from_float(0.1) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_decimal` in `Fraction` construction --> FURB164.py:12:5 @@ -121,16 +112,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction 14 | _ = Decimal.from_float(0.1) | help: Replace with `Fraction` constructor - -ℹ Unsafe fix -9 9 | _ = Fraction.from_float(5.0) -10 10 | _ = fractions.Fraction.from_float(4.2) -11 11 | _ = Fraction.from_decimal(Decimal("4.2")) -12 |-_ = Fraction.from_decimal(Decimal("-4.2")) - 12 |+_ = Fraction(Decimal("-4.2")) -13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) -14 14 | _ = Decimal.from_float(0.1) -15 15 | _ = Decimal.from_float(-0.5) +9 | _ = Fraction.from_float(5.0) +10 | _ = fractions.Fraction.from_float(4.2) +11 | _ = Fraction.from_decimal(Decimal("4.2")) + - _ = Fraction.from_decimal(Decimal("-4.2")) +12 + _ = Fraction(Decimal("-4.2")) +13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) +14 | _ = Decimal.from_float(0.1) +15 | _ = Decimal.from_float(-0.5) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_decimal` in `Fraction` construction --> FURB164.py:13:5 @@ -143,16 +133,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction 15 | _ = Decimal.from_float(-0.5) | help: Replace with `Fraction` constructor - -ℹ Unsafe fix -10 10 | _ = fractions.Fraction.from_float(4.2) -11 11 | _ = Fraction.from_decimal(Decimal("4.2")) -12 12 | _ = Fraction.from_decimal(Decimal("-4.2")) -13 |-_ = Fraction.from_decimal(Decimal.from_float(4.2)) - 13 |+_ = Fraction(Decimal.from_float(4.2)) -14 14 | _ = Decimal.from_float(0.1) -15 15 | _ = Decimal.from_float(-0.5) -16 16 | _ = Decimal.from_float(5.0) +10 | _ = fractions.Fraction.from_float(4.2) +11 | _ = Fraction.from_decimal(Decimal("4.2")) +12 | _ = Fraction.from_decimal(Decimal("-4.2")) + - _ = Fraction.from_decimal(Decimal.from_float(4.2)) +13 + _ = Fraction(Decimal.from_float(4.2)) +14 | _ = Decimal.from_float(0.1) +15 | _ = Decimal.from_float(-0.5) +16 | _ = Decimal.from_float(5.0) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:13:27 @@ -165,16 +154,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 15 | _ = Decimal.from_float(-0.5) | help: Replace with `Decimal` constructor - -ℹ Unsafe fix -10 10 | _ = fractions.Fraction.from_float(4.2) -11 11 | _ = Fraction.from_decimal(Decimal("4.2")) -12 12 | _ = Fraction.from_decimal(Decimal("-4.2")) -13 |-_ = Fraction.from_decimal(Decimal.from_float(4.2)) - 13 |+_ = Fraction.from_decimal(Decimal(4.2)) -14 14 | _ = Decimal.from_float(0.1) -15 15 | _ = Decimal.from_float(-0.5) -16 16 | _ = Decimal.from_float(5.0) +10 | _ = fractions.Fraction.from_float(4.2) +11 | _ = Fraction.from_decimal(Decimal("4.2")) +12 | _ = Fraction.from_decimal(Decimal("-4.2")) + - _ = Fraction.from_decimal(Decimal.from_float(4.2)) +13 + _ = Fraction.from_decimal(Decimal(4.2)) +14 | _ = Decimal.from_float(0.1) +15 | _ = Decimal.from_float(-0.5) +16 | _ = Decimal.from_float(5.0) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:14:5 @@ -187,16 +175,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 16 | _ = Decimal.from_float(5.0) | help: Replace with `Decimal` constructor - -ℹ Unsafe fix -11 11 | _ = Fraction.from_decimal(Decimal("4.2")) -12 12 | _ = Fraction.from_decimal(Decimal("-4.2")) -13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) -14 |-_ = Decimal.from_float(0.1) - 14 |+_ = Decimal(0.1) -15 15 | _ = Decimal.from_float(-0.5) -16 16 | _ = Decimal.from_float(5.0) -17 17 | _ = decimal.Decimal.from_float(4.2) +11 | _ = Fraction.from_decimal(Decimal("4.2")) +12 | _ = Fraction.from_decimal(Decimal("-4.2")) +13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) + - _ = Decimal.from_float(0.1) +14 + _ = Decimal(0.1) +15 | _ = Decimal.from_float(-0.5) +16 | _ = Decimal.from_float(5.0) +17 | _ = decimal.Decimal.from_float(4.2) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:15:5 @@ -209,16 +196,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 17 | _ = decimal.Decimal.from_float(4.2) | help: Replace with `Decimal` constructor - -ℹ Unsafe fix -12 12 | _ = Fraction.from_decimal(Decimal("-4.2")) -13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) -14 14 | _ = Decimal.from_float(0.1) -15 |-_ = Decimal.from_float(-0.5) - 15 |+_ = Decimal(-0.5) -16 16 | _ = Decimal.from_float(5.0) -17 17 | _ = decimal.Decimal.from_float(4.2) -18 18 | _ = Decimal.from_float(float("inf")) +12 | _ = Fraction.from_decimal(Decimal("-4.2")) +13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) +14 | _ = Decimal.from_float(0.1) + - _ = Decimal.from_float(-0.5) +15 + _ = Decimal(-0.5) +16 | _ = Decimal.from_float(5.0) +17 | _ = decimal.Decimal.from_float(4.2) +18 | _ = Decimal.from_float(float("inf")) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:16:5 @@ -231,16 +217,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 18 | _ = Decimal.from_float(float("inf")) | help: Replace with `Decimal` constructor - -ℹ Unsafe fix -13 13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) -14 14 | _ = Decimal.from_float(0.1) -15 15 | _ = Decimal.from_float(-0.5) -16 |-_ = Decimal.from_float(5.0) - 16 |+_ = Decimal(5.0) -17 17 | _ = decimal.Decimal.from_float(4.2) -18 18 | _ = Decimal.from_float(float("inf")) -19 19 | _ = Decimal.from_float(float("-inf")) +13 | _ = Fraction.from_decimal(Decimal.from_float(4.2)) +14 | _ = Decimal.from_float(0.1) +15 | _ = Decimal.from_float(-0.5) + - _ = Decimal.from_float(5.0) +16 + _ = Decimal(5.0) +17 | _ = decimal.Decimal.from_float(4.2) +18 | _ = Decimal.from_float(float("inf")) +19 | _ = Decimal.from_float(float("-inf")) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:17:5 @@ -253,16 +238,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 19 | _ = Decimal.from_float(float("-inf")) | help: Replace with `Decimal` constructor - -ℹ Unsafe fix -14 14 | _ = Decimal.from_float(0.1) -15 15 | _ = Decimal.from_float(-0.5) -16 16 | _ = Decimal.from_float(5.0) -17 |-_ = decimal.Decimal.from_float(4.2) - 17 |+_ = decimal.Decimal(4.2) -18 18 | _ = Decimal.from_float(float("inf")) -19 19 | _ = Decimal.from_float(float("-inf")) -20 20 | _ = Decimal.from_float(float("Infinity")) +14 | _ = Decimal.from_float(0.1) +15 | _ = Decimal.from_float(-0.5) +16 | _ = Decimal.from_float(5.0) + - _ = decimal.Decimal.from_float(4.2) +17 + _ = decimal.Decimal(4.2) +18 | _ = Decimal.from_float(float("inf")) +19 | _ = Decimal.from_float(float("-inf")) +20 | _ = Decimal.from_float(float("Infinity")) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:18:5 @@ -275,16 +259,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 20 | _ = Decimal.from_float(float("Infinity")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -15 15 | _ = Decimal.from_float(-0.5) -16 16 | _ = Decimal.from_float(5.0) -17 17 | _ = decimal.Decimal.from_float(4.2) -18 |-_ = Decimal.from_float(float("inf")) - 18 |+_ = Decimal("inf") -19 19 | _ = Decimal.from_float(float("-inf")) -20 20 | _ = Decimal.from_float(float("Infinity")) -21 21 | _ = Decimal.from_float(float("-Infinity")) +15 | _ = Decimal.from_float(-0.5) +16 | _ = Decimal.from_float(5.0) +17 | _ = decimal.Decimal.from_float(4.2) + - _ = Decimal.from_float(float("inf")) +18 + _ = Decimal("inf") +19 | _ = Decimal.from_float(float("-inf")) +20 | _ = Decimal.from_float(float("Infinity")) +21 | _ = Decimal.from_float(float("-Infinity")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:19:5 @@ -297,16 +279,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 21 | _ = Decimal.from_float(float("-Infinity")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -16 16 | _ = Decimal.from_float(5.0) -17 17 | _ = decimal.Decimal.from_float(4.2) -18 18 | _ = Decimal.from_float(float("inf")) -19 |-_ = Decimal.from_float(float("-inf")) - 19 |+_ = Decimal("-inf") -20 20 | _ = Decimal.from_float(float("Infinity")) -21 21 | _ = Decimal.from_float(float("-Infinity")) -22 22 | _ = Decimal.from_float(float("nan")) +16 | _ = Decimal.from_float(5.0) +17 | _ = decimal.Decimal.from_float(4.2) +18 | _ = Decimal.from_float(float("inf")) + - _ = Decimal.from_float(float("-inf")) +19 + _ = Decimal("-inf") +20 | _ = Decimal.from_float(float("Infinity")) +21 | _ = Decimal.from_float(float("-Infinity")) +22 | _ = Decimal.from_float(float("nan")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:20:5 @@ -319,16 +299,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 22 | _ = Decimal.from_float(float("nan")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -17 17 | _ = decimal.Decimal.from_float(4.2) -18 18 | _ = Decimal.from_float(float("inf")) -19 19 | _ = Decimal.from_float(float("-inf")) -20 |-_ = Decimal.from_float(float("Infinity")) - 20 |+_ = Decimal("infinity") -21 21 | _ = Decimal.from_float(float("-Infinity")) -22 22 | _ = Decimal.from_float(float("nan")) -23 23 | _ = Decimal.from_float(float("-NaN ")) +17 | _ = decimal.Decimal.from_float(4.2) +18 | _ = Decimal.from_float(float("inf")) +19 | _ = Decimal.from_float(float("-inf")) + - _ = Decimal.from_float(float("Infinity")) +20 + _ = Decimal("infinity") +21 | _ = Decimal.from_float(float("-Infinity")) +22 | _ = Decimal.from_float(float("nan")) +23 | _ = Decimal.from_float(float("-NaN ")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:21:5 @@ -341,16 +319,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 23 | _ = Decimal.from_float(float("-NaN ")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -18 18 | _ = Decimal.from_float(float("inf")) -19 19 | _ = Decimal.from_float(float("-inf")) -20 20 | _ = Decimal.from_float(float("Infinity")) -21 |-_ = Decimal.from_float(float("-Infinity")) - 21 |+_ = Decimal("-infinity") -22 22 | _ = Decimal.from_float(float("nan")) -23 23 | _ = Decimal.from_float(float("-NaN ")) -24 24 | _ = Decimal.from_float(float(" \n+nan \t")) +18 | _ = Decimal.from_float(float("inf")) +19 | _ = Decimal.from_float(float("-inf")) +20 | _ = Decimal.from_float(float("Infinity")) + - _ = Decimal.from_float(float("-Infinity")) +21 + _ = Decimal("-infinity") +22 | _ = Decimal.from_float(float("nan")) +23 | _ = Decimal.from_float(float("-NaN ")) +24 | _ = Decimal.from_float(float(" \n+nan \t")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:22:5 @@ -363,16 +339,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 24 | _ = Decimal.from_float(float(" \n+nan \t")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -19 19 | _ = Decimal.from_float(float("-inf")) -20 20 | _ = Decimal.from_float(float("Infinity")) -21 21 | _ = Decimal.from_float(float("-Infinity")) -22 |-_ = Decimal.from_float(float("nan")) - 22 |+_ = Decimal("nan") -23 23 | _ = Decimal.from_float(float("-NaN ")) -24 24 | _ = Decimal.from_float(float(" \n+nan \t")) -25 25 | _ = Decimal.from_float(float(" iNf \n\t ")) +19 | _ = Decimal.from_float(float("-inf")) +20 | _ = Decimal.from_float(float("Infinity")) +21 | _ = Decimal.from_float(float("-Infinity")) + - _ = Decimal.from_float(float("nan")) +22 + _ = Decimal("nan") +23 | _ = Decimal.from_float(float("-NaN ")) +24 | _ = Decimal.from_float(float(" \n+nan \t")) +25 | _ = Decimal.from_float(float(" iNf \n\t ")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:23:5 @@ -385,16 +359,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 25 | _ = Decimal.from_float(float(" iNf \n\t ")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -20 20 | _ = Decimal.from_float(float("Infinity")) -21 21 | _ = Decimal.from_float(float("-Infinity")) -22 22 | _ = Decimal.from_float(float("nan")) -23 |-_ = Decimal.from_float(float("-NaN ")) - 23 |+_ = Decimal("-nan") -24 24 | _ = Decimal.from_float(float(" \n+nan \t")) -25 25 | _ = Decimal.from_float(float(" iNf \n\t ")) -26 26 | _ = Decimal.from_float(float("  -inF\n \t")) +20 | _ = Decimal.from_float(float("Infinity")) +21 | _ = Decimal.from_float(float("-Infinity")) +22 | _ = Decimal.from_float(float("nan")) + - _ = Decimal.from_float(float("-NaN ")) +23 + _ = Decimal("-nan") +24 | _ = Decimal.from_float(float(" \n+nan \t")) +25 | _ = Decimal.from_float(float(" iNf \n\t ")) +26 | _ = Decimal.from_float(float("  -inF\n \t")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:24:5 @@ -407,16 +379,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 26 | _ = Decimal.from_float(float("  -inF\n \t")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -21 21 | _ = Decimal.from_float(float("-Infinity")) -22 22 | _ = Decimal.from_float(float("nan")) -23 23 | _ = Decimal.from_float(float("-NaN ")) -24 |-_ = Decimal.from_float(float(" \n+nan \t")) - 24 |+_ = Decimal("+nan") -25 25 | _ = Decimal.from_float(float(" iNf \n\t ")) -26 26 | _ = Decimal.from_float(float("  -inF\n \t")) -27 27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) +21 | _ = Decimal.from_float(float("-Infinity")) +22 | _ = Decimal.from_float(float("nan")) +23 | _ = Decimal.from_float(float("-NaN ")) + - _ = Decimal.from_float(float(" \n+nan \t")) +24 + _ = Decimal("+nan") +25 | _ = Decimal.from_float(float(" iNf \n\t ")) +26 | _ = Decimal.from_float(float("  -inF\n \t")) +27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:25:5 @@ -429,16 +399,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -22 22 | _ = Decimal.from_float(float("nan")) -23 23 | _ = Decimal.from_float(float("-NaN ")) -24 24 | _ = Decimal.from_float(float(" \n+nan \t")) -25 |-_ = Decimal.from_float(float(" iNf \n\t ")) - 25 |+_ = Decimal("inf") -26 26 | _ = Decimal.from_float(float("  -inF\n \t")) -27 27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) -28 28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) +22 | _ = Decimal.from_float(float("nan")) +23 | _ = Decimal.from_float(float("-NaN ")) +24 | _ = Decimal.from_float(float(" \n+nan \t")) + - _ = Decimal.from_float(float(" iNf \n\t ")) +25 + _ = Decimal("inf") +26 | _ = Decimal.from_float(float("  -inF\n \t")) +27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) +28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:26:5 @@ -451,16 +419,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -23 23 | _ = Decimal.from_float(float("-NaN ")) -24 24 | _ = Decimal.from_float(float(" \n+nan \t")) -25 25 | _ = Decimal.from_float(float(" iNf \n\t ")) -26 |-_ = Decimal.from_float(float("  -inF\n \t")) - 26 |+_ = Decimal("-inf") -27 27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) -28 28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) -29 29 | +23 | _ = Decimal.from_float(float("-NaN ")) +24 | _ = Decimal.from_float(float(" \n+nan \t")) +25 | _ = Decimal.from_float(float(" iNf \n\t ")) + - _ = Decimal.from_float(float("  -inF\n \t")) +26 + _ = Decimal("-inf") +27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) +28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) +29 | FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:27:5 @@ -472,16 +438,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -24 24 | _ = Decimal.from_float(float(" \n+nan \t")) -25 25 | _ = Decimal.from_float(float(" iNf \n\t ")) -26 26 | _ = Decimal.from_float(float("  -inF\n \t")) -27 |-_ = Decimal.from_float(float(" InfinIty \n\t ")) - 27 |+_ = Decimal("infinity") -28 28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) -29 29 | -30 30 | # Cases with keyword arguments - should produce unsafe fixes +24 | _ = Decimal.from_float(float(" \n+nan \t")) +25 | _ = Decimal.from_float(float(" iNf \n\t ")) +26 | _ = Decimal.from_float(float("  -inF\n \t")) + - _ = Decimal.from_float(float(" InfinIty \n\t ")) +27 + _ = Decimal("infinity") +28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) +29 | +30 | # Cases with keyword arguments - should produce unsafe fixes FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:28:5 @@ -494,16 +458,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 30 | # Cases with keyword arguments - should produce unsafe fixes | help: Replace with `Decimal` constructor - -ℹ Safe fix -25 25 | _ = Decimal.from_float(float(" iNf \n\t ")) -26 26 | _ = Decimal.from_float(float("  -inF\n \t")) -27 27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) -28 |-_ = Decimal.from_float(float("  -InfinIty\n \t")) - 28 |+_ = Decimal("-infinity") -29 29 | -30 30 | # Cases with keyword arguments - should produce unsafe fixes -31 31 | _ = Fraction.from_decimal(dec=Decimal("4.2")) +25 | _ = Decimal.from_float(float(" iNf \n\t ")) +26 | _ = Decimal.from_float(float("  -inF\n \t")) +27 | _ = Decimal.from_float(float(" InfinIty \n\t ")) + - _ = Decimal.from_float(float("  -InfinIty\n \t")) +28 + _ = Decimal("-infinity") +29 | +30 | # Cases with keyword arguments - should produce unsafe fixes +31 | _ = Fraction.from_decimal(dec=Decimal("4.2")) FURB164 [*] Verbose method `from_decimal` in `Fraction` construction --> FURB164.py:31:5 @@ -514,16 +476,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction 32 | _ = Decimal.from_float(f=4.2) | help: Replace with `Fraction` constructor - -ℹ Unsafe fix -28 28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) -29 29 | -30 30 | # Cases with keyword arguments - should produce unsafe fixes -31 |-_ = Fraction.from_decimal(dec=Decimal("4.2")) - 31 |+_ = Fraction(Decimal("4.2")) -32 32 | _ = Decimal.from_float(f=4.2) -33 33 | -34 34 | # Cases with invalid argument counts - should not get fixes +28 | _ = Decimal.from_float(float("  -InfinIty\n \t")) +29 | +30 | # Cases with keyword arguments - should produce unsafe fixes + - _ = Fraction.from_decimal(dec=Decimal("4.2")) +31 + _ = Fraction(Decimal("4.2")) +32 | _ = Decimal.from_float(f=4.2) +33 | +34 | # Cases with invalid argument counts - should not get fixes +note: This is an unsafe fix and may change runtime behavior FURB164 Verbose method `from_float` in `Decimal` construction --> FURB164.py:32:5 @@ -591,16 +552,15 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 45 | _ = Fraction.from_float("4.2") # Invalid type for from_float | help: Replace with `Decimal` constructor - -ℹ Unsafe fix -40 40 | _ = Decimal.from_float(value=4.2) -41 41 | -42 42 | # Cases with type validation issues - should produce unsafe fixes -43 |-_ = Decimal.from_float("4.2") # Invalid type for from_float - 43 |+_ = Decimal("4.2") # Invalid type for from_float -44 44 | _ = Fraction.from_decimal(4.2) # Invalid type for from_decimal -45 45 | _ = Fraction.from_float("4.2") # Invalid type for from_float -46 46 | +40 | _ = Decimal.from_float(value=4.2) +41 | +42 | # Cases with type validation issues - should produce unsafe fixes + - _ = Decimal.from_float("4.2") # Invalid type for from_float +43 + _ = Decimal("4.2") # Invalid type for from_float +44 | _ = Fraction.from_decimal(4.2) # Invalid type for from_decimal +45 | _ = Fraction.from_float("4.2") # Invalid type for from_float +46 | +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_decimal` in `Fraction` construction --> FURB164.py:44:5 @@ -612,16 +572,15 @@ FURB164 [*] Verbose method `from_decimal` in `Fraction` construction 45 | _ = Fraction.from_float("4.2") # Invalid type for from_float | help: Replace with `Fraction` constructor - -ℹ Unsafe fix -41 41 | -42 42 | # Cases with type validation issues - should produce unsafe fixes -43 43 | _ = Decimal.from_float("4.2") # Invalid type for from_float -44 |-_ = Fraction.from_decimal(4.2) # Invalid type for from_decimal - 44 |+_ = Fraction(4.2) # Invalid type for from_decimal -45 45 | _ = Fraction.from_float("4.2") # Invalid type for from_float -46 46 | -47 47 | # OK - should not trigger the rule +41 | +42 | # Cases with type validation issues - should produce unsafe fixes +43 | _ = Decimal.from_float("4.2") # Invalid type for from_float + - _ = Fraction.from_decimal(4.2) # Invalid type for from_decimal +44 + _ = Fraction(4.2) # Invalid type for from_decimal +45 | _ = Fraction.from_float("4.2") # Invalid type for from_float +46 | +47 | # OK - should not trigger the rule +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Fraction` construction --> FURB164.py:45:5 @@ -634,16 +593,15 @@ FURB164 [*] Verbose method `from_float` in `Fraction` construction 47 | # OK - should not trigger the rule | help: Replace with `Fraction` constructor - -ℹ Unsafe fix -42 42 | # Cases with type validation issues - should produce unsafe fixes -43 43 | _ = Decimal.from_float("4.2") # Invalid type for from_float -44 44 | _ = Fraction.from_decimal(4.2) # Invalid type for from_decimal -45 |-_ = Fraction.from_float("4.2") # Invalid type for from_float - 45 |+_ = Fraction("4.2") # Invalid type for from_float -46 46 | -47 47 | # OK - should not trigger the rule -48 48 | _ = Fraction(0.1) +42 | # Cases with type validation issues - should produce unsafe fixes +43 | _ = Decimal.from_float("4.2") # Invalid type for from_float +44 | _ = Fraction.from_decimal(4.2) # Invalid type for from_decimal + - _ = Fraction.from_float("4.2") # Invalid type for from_float +45 + _ = Fraction("4.2") # Invalid type for from_float +46 | +47 | # OK - should not trigger the rule +48 | _ = Fraction(0.1) +note: This is an unsafe fix and may change runtime behavior FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:60:5 @@ -654,16 +612,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 61 | _ = Decimal.from_float(True) | help: Replace with `Decimal` constructor - -ℹ Safe fix -57 57 | _ = decimal.Decimal(4.2) -58 58 | -59 59 | # Cases with int and bool - should produce safe fixes -60 |-_ = Decimal.from_float(1) - 60 |+_ = Decimal(1) -61 61 | _ = Decimal.from_float(True) -62 62 | -63 63 | # Cases with non-finite floats - should produce safe fixes +57 | _ = decimal.Decimal(4.2) +58 | +59 | # Cases with int and bool - should produce safe fixes + - _ = Decimal.from_float(1) +60 + _ = Decimal(1) +61 | _ = Decimal.from_float(True) +62 | +63 | # Cases with non-finite floats - should produce safe fixes FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:61:5 @@ -676,16 +632,14 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 63 | # Cases with non-finite floats - should produce safe fixes | help: Replace with `Decimal` constructor - -ℹ Safe fix -58 58 | -59 59 | # Cases with int and bool - should produce safe fixes -60 60 | _ = Decimal.from_float(1) -61 |-_ = Decimal.from_float(True) - 61 |+_ = Decimal(True) -62 62 | -63 63 | # Cases with non-finite floats - should produce safe fixes -64 64 | _ = Decimal.from_float(float("-nan")) +58 | +59 | # Cases with int and bool - should produce safe fixes +60 | _ = Decimal.from_float(1) + - _ = Decimal.from_float(True) +61 + _ = Decimal(True) +62 | +63 | # Cases with non-finite floats - should produce safe fixes +64 | _ = Decimal.from_float(float("-nan")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:64:5 @@ -697,15 +651,13 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -61 61 | _ = Decimal.from_float(True) -62 62 | -63 63 | # Cases with non-finite floats - should produce safe fixes -64 |-_ = Decimal.from_float(float("-nan")) - 64 |+_ = Decimal("-nan") -65 65 | _ = Decimal.from_float(float("\x2dnan")) -66 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) +61 | _ = Decimal.from_float(True) +62 | +63 | # Cases with non-finite floats - should produce safe fixes + - _ = Decimal.from_float(float("-nan")) +64 + _ = Decimal("-nan") +65 | _ = Decimal.from_float(float("\x2dnan")) +66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:65:5 @@ -717,14 +669,12 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) | help: Replace with `Decimal` constructor - -ℹ Safe fix -62 62 | -63 63 | # Cases with non-finite floats - should produce safe fixes -64 64 | _ = Decimal.from_float(float("-nan")) -65 |-_ = Decimal.from_float(float("\x2dnan")) - 65 |+_ = Decimal("-nan") -66 66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) +62 | +63 | # Cases with non-finite floats - should produce safe fixes +64 | _ = Decimal.from_float(float("-nan")) + - _ = Decimal.from_float(float("\x2dnan")) +65 + _ = Decimal("-nan") +66 | _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) FURB164 [*] Verbose method `from_float` in `Decimal` construction --> FURB164.py:66:5 @@ -735,10 +685,8 @@ FURB164 [*] Verbose method `from_float` in `Decimal` construction | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `Decimal` constructor - -ℹ Safe fix -63 63 | # Cases with non-finite floats - should produce safe fixes -64 64 | _ = Decimal.from_float(float("-nan")) -65 65 | _ = Decimal.from_float(float("\x2dnan")) -66 |-_ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) - 66 |+_ = Decimal("-nan") +63 | # Cases with non-finite floats - should produce safe fixes +64 | _ = Decimal.from_float(float("-nan")) +65 | _ = Decimal.from_float(float("\x2dnan")) + - _ = Decimal.from_float(float("\N{HYPHEN-MINUS}nan")) +66 + _ = Decimal("-nan") diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap index 2ea45e5340..ada47f04be 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB166_FURB166.py.snap @@ -12,15 +12,14 @@ FURB166 [*] Use of `int` with explicit `base=2` after removing prefix 5 | _ = int("0xFFFF"[2:], 16) | help: Replace with `base=0` - -ℹ Unsafe fix -1 1 | # Errors -2 2 | -3 |-_ = int("0b1010"[2:], 2) - 3 |+_ = int("0b1010", 0) -4 4 | _ = int("0o777"[2:], 8) -5 5 | _ = int("0xFFFF"[2:], 16) -6 6 | +1 | # Errors +2 | + - _ = int("0b1010"[2:], 2) +3 + _ = int("0b1010", 0) +4 | _ = int("0o777"[2:], 8) +5 | _ = int("0xFFFF"[2:], 16) +6 | +note: This is an unsafe fix and may change runtime behavior FURB166 [*] Use of `int` with explicit `base=8` after removing prefix --> FURB166.py:4:5 @@ -31,16 +30,15 @@ FURB166 [*] Use of `int` with explicit `base=8` after removing prefix 5 | _ = int("0xFFFF"[2:], 16) | help: Replace with `base=0` - -ℹ Unsafe fix -1 1 | # Errors -2 2 | -3 3 | _ = int("0b1010"[2:], 2) -4 |-_ = int("0o777"[2:], 8) - 4 |+_ = int("0o777", 0) -5 5 | _ = int("0xFFFF"[2:], 16) -6 6 | -7 7 | b = "0b11" +1 | # Errors +2 | +3 | _ = int("0b1010"[2:], 2) + - _ = int("0o777"[2:], 8) +4 + _ = int("0o777", 0) +5 | _ = int("0xFFFF"[2:], 16) +6 | +7 | b = "0b11" +note: This is an unsafe fix and may change runtime behavior FURB166 [*] Use of `int` with explicit `base=16` after removing prefix --> FURB166.py:5:5 @@ -53,16 +51,15 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix 7 | b = "0b11" | help: Replace with `base=0` - -ℹ Unsafe fix -2 2 | -3 3 | _ = int("0b1010"[2:], 2) -4 4 | _ = int("0o777"[2:], 8) -5 |-_ = int("0xFFFF"[2:], 16) - 5 |+_ = int("0xFFFF", 0) -6 6 | -7 7 | b = "0b11" -8 8 | _ = int(b[2:], 2) +2 | +3 | _ = int("0b1010"[2:], 2) +4 | _ = int("0o777"[2:], 8) + - _ = int("0xFFFF"[2:], 16) +5 + _ = int("0xFFFF", 0) +6 | +7 | b = "0b11" +8 | _ = int(b[2:], 2) +note: This is an unsafe fix and may change runtime behavior FURB166 [*] Use of `int` with explicit `base=2` after removing prefix --> FURB166.py:8:5 @@ -74,16 +71,15 @@ FURB166 [*] Use of `int` with explicit `base=2` after removing prefix 10 | _ = int("0xFFFF"[2:], base=16) | help: Replace with `base=0` - -ℹ Unsafe fix -5 5 | _ = int("0xFFFF"[2:], 16) -6 6 | -7 7 | b = "0b11" -8 |-_ = int(b[2:], 2) - 8 |+_ = int(b, 0) -9 9 | -10 10 | _ = int("0xFFFF"[2:], base=16) -11 11 | +5 | _ = int("0xFFFF"[2:], 16) +6 | +7 | b = "0b11" + - _ = int(b[2:], 2) +8 + _ = int(b, 0) +9 | +10 | _ = int("0xFFFF"[2:], base=16) +11 | +note: This is an unsafe fix and may change runtime behavior FURB166 [*] Use of `int` with explicit `base=16` after removing prefix --> FURB166.py:10:5 @@ -96,16 +92,15 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix 12 | _ = int(b"0xFFFF"[2:], 16) | help: Replace with `base=0` - -ℹ Unsafe fix -7 7 | b = "0b11" -8 8 | _ = int(b[2:], 2) -9 9 | -10 |-_ = int("0xFFFF"[2:], base=16) - 10 |+_ = int("0xFFFF", base=0) -11 11 | -12 12 | _ = int(b"0xFFFF"[2:], 16) -13 13 | +7 | b = "0b11" +8 | _ = int(b[2:], 2) +9 | + - _ = int("0xFFFF"[2:], base=16) +10 + _ = int("0xFFFF", base=0) +11 | +12 | _ = int(b"0xFFFF"[2:], 16) +13 | +note: This is an unsafe fix and may change runtime behavior FURB166 [*] Use of `int` with explicit `base=16` after removing prefix --> FURB166.py:12:5 @@ -116,16 +111,15 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix | ^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `base=0` - -ℹ Unsafe fix -9 9 | -10 10 | _ = int("0xFFFF"[2:], base=16) -11 11 | -12 |-_ = int(b"0xFFFF"[2:], 16) - 12 |+_ = int(b"0xFFFF", 0) -13 13 | -14 14 | -15 15 | def get_str(): +9 | +10 | _ = int("0xFFFF"[2:], base=16) +11 | + - _ = int(b"0xFFFF"[2:], 16) +12 + _ = int(b"0xFFFF", 0) +13 | +14 | +15 | def get_str(): +note: This is an unsafe fix and may change runtime behavior FURB166 [*] Use of `int` with explicit `base=16` after removing prefix --> FURB166.py:19:5 @@ -136,13 +130,12 @@ FURB166 [*] Use of `int` with explicit `base=16` after removing prefix 21 | # OK | help: Replace with `base=0` - -ℹ Unsafe fix -16 16 | return "0xFFF" -17 17 | -18 18 | -19 |-_ = int(get_str()[2:], 16) - 19 |+_ = int(get_str(), 0) -20 20 | -21 21 | # OK -22 22 | +16 | return "0xFFF" +17 | +18 | + - _ = int(get_str()[2:], 16) +19 + _ = int(get_str(), 0) +20 | +21 | # OK +22 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap index 63c13cf4d4..9f70110621 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB167_FURB167.py.snap @@ -10,16 +10,14 @@ FURB167 [*] Use of regular expression alias `re.I` 14 | pass | help: Replace with `re.IGNORECASE` - -ℹ Safe fix -10 10 | import re -11 11 | -12 12 | # FURB167 -13 |- if re.match("^hello", "hello world", re.I): - 13 |+ if re.match("^hello", "hello world", re.IGNORECASE): -14 14 | pass -15 15 | -16 16 | +10 | import re +11 | +12 | # FURB167 + - if re.match("^hello", "hello world", re.I): +13 + if re.match("^hello", "hello world", re.IGNORECASE): +14 | pass +15 | +16 | FURB167 [*] Use of regular expression alias `re.I` --> FURB167.py:21:39 @@ -30,16 +28,14 @@ FURB167 [*] Use of regular expression alias `re.I` 22 | pass | help: Replace with `re.IGNORECASE` - -ℹ Safe fix - 1 |+import re -1 2 | def func(): -2 3 | import re -3 4 | +1 + import re +2 | def func(): +3 | import re +4 | -------------------------------------------------------------------------------- -18 19 | from re import match, I -19 20 | -20 21 | # FURB167 -21 |- if match("^hello", "hello world", I): - 22 |+ if match("^hello", "hello world", re.IGNORECASE): -22 23 | pass +19 | from re import match, I +20 | +21 | # FURB167 + - if match("^hello", "hello world", I): +22 + if match("^hello", "hello world", re.IGNORECASE): +23 | pass diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap index b8a8552814..d4bd261b5f 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB168_FURB168.py.snap @@ -11,16 +11,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 6 | pass | help: Replace with `is` operator - -ℹ Safe fix -2 2 | -3 3 | # Errors. -4 4 | -5 |-if isinstance(foo, type(None)): - 5 |+if foo is None: -6 6 | pass -7 7 | -8 8 | if isinstance(foo and bar, type(None)): +2 | +3 | # Errors. +4 | + - if isinstance(foo, type(None)): +5 + if foo is None: +6 | pass +7 | +8 | if isinstance(foo and bar, type(None)): FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:8:4 @@ -32,16 +30,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 9 | pass | help: Replace with `is` operator - -ℹ Safe fix -5 5 | if isinstance(foo, type(None)): -6 6 | pass -7 7 | -8 |-if isinstance(foo and bar, type(None)): - 8 |+if (foo and bar) is None: -9 9 | pass -10 10 | -11 11 | if isinstance(foo, (type(None), type(None), type(None))): +5 | if isinstance(foo, type(None)): +6 | pass +7 | + - if isinstance(foo and bar, type(None)): +8 + if (foo and bar) is None: +9 | pass +10 | +11 | if isinstance(foo, (type(None), type(None), type(None))): FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:11:4 @@ -53,16 +49,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 12 | pass | help: Replace with `is` operator - -ℹ Safe fix -8 8 | if isinstance(foo and bar, type(None)): -9 9 | pass -10 10 | -11 |-if isinstance(foo, (type(None), type(None), type(None))): - 11 |+if foo is None: -12 12 | pass -13 13 | -14 14 | if isinstance(foo, type(None)) is True: +8 | if isinstance(foo and bar, type(None)): +9 | pass +10 | + - if isinstance(foo, (type(None), type(None), type(None))): +11 + if foo is None: +12 | pass +13 | +14 | if isinstance(foo, type(None)) is True: FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:14:4 @@ -74,16 +68,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 15 | pass | help: Replace with `is` operator - -ℹ Safe fix -11 11 | if isinstance(foo, (type(None), type(None), type(None))): -12 12 | pass -13 13 | -14 |-if isinstance(foo, type(None)) is True: - 14 |+if (foo is None) is True: -15 15 | pass -16 16 | -17 17 | if -isinstance(foo, type(None)): +11 | if isinstance(foo, (type(None), type(None), type(None))): +12 | pass +13 | + - if isinstance(foo, type(None)) is True: +14 + if (foo is None) is True: +15 | pass +16 | +17 | if -isinstance(foo, type(None)): FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:17:5 @@ -95,16 +87,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 18 | pass | help: Replace with `is` operator - -ℹ Safe fix -14 14 | if isinstance(foo, type(None)) is True: -15 15 | pass -16 16 | -17 |-if -isinstance(foo, type(None)): - 17 |+if -(foo is None): -18 18 | pass -19 19 | -20 20 | if isinstance(foo, None | type(None)): +14 | if isinstance(foo, type(None)) is True: +15 | pass +16 | + - if -isinstance(foo, type(None)): +17 + if -(foo is None): +18 | pass +19 | +20 | if isinstance(foo, None | type(None)): FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:20:4 @@ -116,16 +106,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 21 | pass | help: Replace with `is` operator - -ℹ Safe fix -17 17 | if -isinstance(foo, type(None)): -18 18 | pass -19 19 | -20 |-if isinstance(foo, None | type(None)): - 20 |+if foo is None: -21 21 | pass -22 22 | -23 23 | if isinstance(foo, type(None) | type(None)): +17 | if -isinstance(foo, type(None)): +18 | pass +19 | + - if isinstance(foo, None | type(None)): +20 + if foo is None: +21 | pass +22 | +23 | if isinstance(foo, type(None) | type(None)): FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:23:4 @@ -137,16 +125,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 24 | pass | help: Replace with `is` operator - -ℹ Safe fix -20 20 | if isinstance(foo, None | type(None)): -21 21 | pass -22 22 | -23 |-if isinstance(foo, type(None) | type(None)): - 23 |+if foo is None: -24 24 | pass -25 25 | -26 26 | # A bit contrived, but is both technically valid and equivalent to the above. +20 | if isinstance(foo, None | type(None)): +21 | pass +22 | + - if isinstance(foo, type(None) | type(None)): +23 + if foo is None: +24 | pass +25 | +26 | # A bit contrived, but is both technically valid and equivalent to the above. FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:27:4 @@ -157,16 +143,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 28 | pass | help: Replace with `is` operator - -ℹ Safe fix -24 24 | pass -25 25 | -26 26 | # A bit contrived, but is both technically valid and equivalent to the above. -27 |-if isinstance(foo, (type(None) | ((((type(None))))) | ((None | type(None))))): - 27 |+if foo is None: -28 28 | pass -29 29 | -30 30 | if isinstance( +24 | pass +25 | +26 | # A bit contrived, but is both technically valid and equivalent to the above. + - if isinstance(foo, (type(None) | ((((type(None))))) | ((None | type(None))))): +27 + if foo is None: +28 | pass +29 | +30 | if isinstance( FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:38:4 @@ -178,16 +162,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 39 | ... | help: Replace with `is` operator - -ℹ Safe fix -35 35 | -36 36 | from typing import Union -37 37 | -38 |-if isinstance(foo, Union[None]): - 38 |+if foo is None: -39 39 | ... -40 40 | -41 41 | if isinstance(foo, Union[None, None]): +35 | +36 | from typing import Union +37 | + - if isinstance(foo, Union[None]): +38 + if foo is None: +39 | ... +40 | +41 | if isinstance(foo, Union[None, None]): FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:41:4 @@ -199,16 +181,14 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 42 | ... | help: Replace with `is` operator - -ℹ Safe fix -38 38 | if isinstance(foo, Union[None]): -39 39 | ... -40 40 | -41 |-if isinstance(foo, Union[None, None]): - 41 |+if foo is None: -42 42 | ... -43 43 | -44 44 | if isinstance(foo, Union[None, type(None)]): +38 | if isinstance(foo, Union[None]): +39 | ... +40 | + - if isinstance(foo, Union[None, None]): +41 + if foo is None: +42 | ... +43 | +44 | if isinstance(foo, Union[None, type(None)]): FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `None` --> FURB168.py:44:4 @@ -220,13 +200,11 @@ FURB168 [*] Prefer `is` operator over `isinstance` to check if an object is `Non 45 | ... | help: Replace with `is` operator - -ℹ Safe fix -41 41 | if isinstance(foo, Union[None, None]): -42 42 | ... -43 43 | -44 |-if isinstance(foo, Union[None, type(None)]): - 44 |+if foo is None: -45 45 | ... -46 46 | -47 47 | +41 | if isinstance(foo, Union[None, None]): +42 | ... +43 | + - if isinstance(foo, Union[None, type(None)]): +44 + if foo is None: +45 | ... +46 | +47 | diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap index 93c3f0d88b..78132e701c 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB169_FURB169.py.snap @@ -12,16 +12,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 7 | type(None) is type(foo) | help: Replace with `is None` - -ℹ Safe fix -2 2 | -3 3 | # Error. -4 4 | -5 |-type(foo) is type(None) - 5 |+foo is None -6 6 | -7 7 | type(None) is type(foo) -8 8 | +2 | +3 | # Error. +4 | + - type(foo) is type(None) +5 + foo is None +6 | +7 | type(None) is type(foo) +8 | FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)` --> FURB169.py:7:1 @@ -34,16 +32,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 9 | type(None) is type(None) | help: Replace with `is None` - -ℹ Safe fix -4 4 | -5 5 | type(foo) is type(None) -6 6 | -7 |-type(None) is type(foo) - 7 |+foo is None -8 8 | -9 9 | type(None) is type(None) -10 10 | +4 | +5 | type(foo) is type(None) +6 | + - type(None) is type(foo) +7 + foo is None +8 | +9 | type(None) is type(None) +10 | FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)` --> FURB169.py:9:1 @@ -56,16 +52,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 11 | type(foo) is not type(None) | help: Replace with `is None` - -ℹ Safe fix -6 6 | -7 7 | type(None) is type(foo) -8 8 | -9 |-type(None) is type(None) - 9 |+None is None -10 10 | -11 11 | type(foo) is not type(None) -12 12 | +6 | +7 | type(None) is type(foo) +8 | + - type(None) is type(None) +9 + None is None +10 | +11 | type(foo) is not type(None) +12 | FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:11:1 @@ -78,16 +72,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit 13 | type(None) is not type(foo) | help: Replace with `is not None` - -ℹ Safe fix -8 8 | -9 9 | type(None) is type(None) -10 10 | -11 |-type(foo) is not type(None) - 11 |+foo is not None -12 12 | -13 13 | type(None) is not type(foo) -14 14 | +8 | +9 | type(None) is type(None) +10 | + - type(foo) is not type(None) +11 + foo is not None +12 | +13 | type(None) is not type(foo) +14 | FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:13:1 @@ -100,16 +92,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit 15 | type(None) is not type(None) | help: Replace with `is not None` - -ℹ Safe fix -10 10 | -11 11 | type(foo) is not type(None) -12 12 | -13 |-type(None) is not type(foo) - 13 |+foo is not None -14 14 | -15 15 | type(None) is not type(None) -16 16 | +10 | +11 | type(foo) is not type(None) +12 | + - type(None) is not type(foo) +13 + foo is not None +14 | +15 | type(None) is not type(None) +16 | FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:15:1 @@ -122,16 +112,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit 17 | type(foo) == type(None) | help: Replace with `is not None` - -ℹ Safe fix -12 12 | -13 13 | type(None) is not type(foo) -14 14 | -15 |-type(None) is not type(None) - 15 |+None is not None -16 16 | -17 17 | type(foo) == type(None) -18 18 | +12 | +13 | type(None) is not type(foo) +14 | + - type(None) is not type(None) +15 + None is not None +16 | +17 | type(foo) == type(None) +18 | FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)` --> FURB169.py:17:1 @@ -144,16 +132,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 19 | type(None) == type(foo) | help: Replace with `is None` - -ℹ Safe fix -14 14 | -15 15 | type(None) is not type(None) -16 16 | -17 |-type(foo) == type(None) - 17 |+foo is None -18 18 | -19 19 | type(None) == type(foo) -20 20 | +14 | +15 | type(None) is not type(None) +16 | + - type(foo) == type(None) +17 + foo is None +18 | +19 | type(None) == type(foo) +20 | FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)` --> FURB169.py:19:1 @@ -166,16 +152,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 21 | type(None) == type(None) | help: Replace with `is None` - -ℹ Safe fix -16 16 | -17 17 | type(foo) == type(None) -18 18 | -19 |-type(None) == type(foo) - 19 |+foo is None -20 20 | -21 21 | type(None) == type(None) -22 22 | +16 | +17 | type(foo) == type(None) +18 | + - type(None) == type(foo) +19 + foo is None +20 | +21 | type(None) == type(None) +22 | FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)` --> FURB169.py:21:1 @@ -188,16 +172,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 23 | type(foo) != type(None) | help: Replace with `is None` - -ℹ Safe fix -18 18 | -19 19 | type(None) == type(foo) -20 20 | -21 |-type(None) == type(None) - 21 |+None is None -22 22 | -23 23 | type(foo) != type(None) -24 24 | +18 | +19 | type(None) == type(foo) +20 | + - type(None) == type(None) +21 + None is None +22 | +23 | type(foo) != type(None) +24 | FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:23:1 @@ -210,16 +192,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit 25 | type(None) != type(foo) | help: Replace with `is not None` - -ℹ Safe fix -20 20 | -21 21 | type(None) == type(None) -22 22 | -23 |-type(foo) != type(None) - 23 |+foo is not None -24 24 | -25 25 | type(None) != type(foo) -26 26 | +20 | +21 | type(None) == type(None) +22 | + - type(foo) != type(None) +23 + foo is not None +24 | +25 | type(None) != type(foo) +26 | FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:25:1 @@ -232,16 +212,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit 27 | type(None) != type(None) | help: Replace with `is not None` - -ℹ Safe fix -22 22 | -23 23 | type(foo) != type(None) -24 24 | -25 |-type(None) != type(foo) - 25 |+foo is not None -26 26 | -27 27 | type(None) != type(None) -28 28 | +22 | +23 | type(foo) != type(None) +24 | + - type(None) != type(foo) +25 + foo is not None +26 | +27 | type(None) != type(None) +28 | FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:27:1 @@ -254,16 +232,14 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit 29 | type(a.b) is type(None) | help: Replace with `is not None` - -ℹ Safe fix -24 24 | -25 25 | type(None) != type(foo) -26 26 | -27 |-type(None) != type(None) - 27 |+None is not None -28 28 | -29 29 | type(a.b) is type(None) -30 30 | +24 | +25 | type(None) != type(foo) +26 | + - type(None) != type(None) +27 + None is not None +28 | +29 | type(a.b) is type(None) +30 | FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)` --> FURB169.py:29:1 @@ -276,16 +252,14 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 31 | type( | help: Replace with `is None` - -ℹ Safe fix -26 26 | -27 27 | type(None) != type(None) -28 28 | -29 |-type(a.b) is type(None) - 29 |+a.b is None -30 30 | -31 31 | type( -32 32 | a( +26 | +27 | type(None) != type(None) +28 | + - type(a.b) is type(None) +29 + a.b is None +30 | +31 | type( +32 | a( FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:31:1 @@ -302,20 +276,19 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit 37 | type( | help: Replace with `is not None` - -ℹ Unsafe fix -28 28 | -29 29 | type(a.b) is type(None) -30 30 | -31 |-type( -32 |- a( -33 |- # Comment -34 |- ) -35 |-) != type(None) - 31 |+a() is not None -36 32 | -37 33 | type( -38 34 | a := 1 +28 | +29 | type(a.b) is type(None) +30 | + - type( + - a( + - # Comment + - ) + - ) != type(None) +31 + a() is not None +32 | +33 | type( +34 | a := 1 +note: This is an unsafe fix and may change runtime behavior FURB169 [*] When checking against `None`, use `is` instead of comparison with `type(None)` --> FURB169.py:37:1 @@ -330,18 +303,16 @@ FURB169 [*] When checking against `None`, use `is` instead of comparison with `t 41 | type( | help: Replace with `is None` - -ℹ Safe fix -34 34 | ) -35 35 | ) != type(None) -36 36 | -37 |-type( -38 |- a := 1 -39 |-) == type(None) - 37 |+(a := 1) is None -40 38 | -41 39 | type( -42 40 | a for a in range(0) +34 | ) +35 | ) != type(None) +36 | + - type( + - a := 1 + - ) == type(None) +37 + (a := 1) is None +38 | +39 | type( +40 | a for a in range(0) FURB169 [*] When checking against `None`, use `is not` instead of comparison with `type(None)` --> FURB169.py:41:1 @@ -354,15 +325,13 @@ FURB169 [*] When checking against `None`, use `is not` instead of comparison wit | |___________________^ | help: Replace with `is not None` - -ℹ Safe fix -38 38 | a := 1 -39 39 | ) == type(None) -40 40 | -41 |-type( -42 |- a for a in range(0) -43 |-) is not type(None) - 41 |+(a for a in range(0)) is not None -44 42 | -45 43 | -46 44 | # Ok. +38 | a := 1 +39 | ) == type(None) +40 | + - type( + - a for a in range(0) + - ) is not type(None) +41 + (a for a in range(0)) is not None +42 | +43 | +44 | # Ok. diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap index d9a8c46147..49277079fc 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_0.py.snap @@ -11,15 +11,13 @@ FURB171 [*] Membership test against single-item container 4 | print("Single-element tuple") | help: Convert to equality test - -ℹ Safe fix -1 1 | # Errors. -2 2 | -3 |-if 1 in (1,): - 3 |+if 1 == 1: -4 4 | print("Single-element tuple") -5 5 | -6 6 | if 1 in [1]: +1 | # Errors. +2 | + - if 1 in (1,): +3 + if 1 == 1: +4 | print("Single-element tuple") +5 | +6 | if 1 in [1]: FURB171 [*] Membership test against single-item container --> FURB171_0.py:6:4 @@ -31,16 +29,14 @@ FURB171 [*] Membership test against single-item container 7 | print("Single-element list") | help: Convert to equality test - -ℹ Safe fix -3 3 | if 1 in (1,): -4 4 | print("Single-element tuple") -5 5 | -6 |-if 1 in [1]: - 6 |+if 1 == 1: -7 7 | print("Single-element list") -8 8 | -9 9 | if 1 in {1}: +3 | if 1 in (1,): +4 | print("Single-element tuple") +5 | + - if 1 in [1]: +6 + if 1 == 1: +7 | print("Single-element list") +8 | +9 | if 1 in {1}: FURB171 [*] Membership test against single-item container --> FURB171_0.py:9:4 @@ -52,16 +48,14 @@ FURB171 [*] Membership test against single-item container 10 | print("Single-element set") | help: Convert to equality test - -ℹ Safe fix -6 6 | if 1 in [1]: -7 7 | print("Single-element list") -8 8 | -9 |-if 1 in {1}: - 9 |+if 1 == 1: -10 10 | print("Single-element set") -11 11 | -12 12 | if "a" in "a": +6 | if 1 in [1]: +7 | print("Single-element list") +8 | + - if 1 in {1}: +9 + if 1 == 1: +10 | print("Single-element set") +11 | +12 | if "a" in "a": FURB171 [*] Membership test against single-item container --> FURB171_0.py:12:4 @@ -73,16 +67,15 @@ FURB171 [*] Membership test against single-item container 13 | print("Single-element string") | help: Convert to equality test - -ℹ Unsafe fix -9 9 | if 1 in {1}: -10 10 | print("Single-element set") -11 11 | -12 |-if "a" in "a": - 12 |+if "a" == "a": -13 13 | print("Single-element string") -14 14 | -15 15 | if 1 not in (1,): +9 | if 1 in {1}: +10 | print("Single-element set") +11 | + - if "a" in "a": +12 + if "a" == "a": +13 | print("Single-element string") +14 | +15 | if 1 not in (1,): +note: This is an unsafe fix and may change runtime behavior FURB171 [*] Membership test against single-item container --> FURB171_0.py:15:4 @@ -94,16 +87,14 @@ FURB171 [*] Membership test against single-item container 16 | print("Check `not in` membership test") | help: Convert to inequality test - -ℹ Safe fix -12 12 | if "a" in "a": -13 13 | print("Single-element string") -14 14 | -15 |-if 1 not in (1,): - 15 |+if 1 != 1: -16 16 | print("Check `not in` membership test") -17 17 | -18 18 | if not 1 in (1,): +12 | if "a" in "a": +13 | print("Single-element string") +14 | + - if 1 not in (1,): +15 + if 1 != 1: +16 | print("Check `not in` membership test") +17 | +18 | if not 1 in (1,): FURB171 [*] Membership test against single-item container --> FURB171_0.py:18:8 @@ -115,16 +106,14 @@ FURB171 [*] Membership test against single-item container 19 | print("Check the negated membership test") | help: Convert to equality test - -ℹ Safe fix -15 15 | if 1 not in (1,): -16 16 | print("Check `not in` membership test") -17 17 | -18 |-if not 1 in (1,): - 18 |+if not 1 == 1: -19 19 | print("Check the negated membership test") -20 20 | -21 21 | # Non-errors. +15 | if 1 not in (1,): +16 | print("Check `not in` membership test") +17 | + - if not 1 in (1,): +18 + if not 1 == 1: +19 | print("Check the negated membership test") +20 | +21 | # Non-errors. FURB171 [*] Membership test against single-item container --> FURB171_0.py:52:5 @@ -140,19 +129,18 @@ FURB171 [*] Membership test against single-item container 57 | _ = a in ( # Foo1 | help: Convert to equality test - -ℹ Unsafe fix -49 49 | -50 50 | -51 51 | # https://github.com/astral-sh/ruff/issues/10063 -52 |-_ = a in ( -53 |- # Foo -54 |- b, -55 |-) - 52 |+_ = a == b -56 53 | -57 54 | _ = a in ( # Foo1 -58 55 | ( # Foo2 +49 | +50 | +51 | # https://github.com/astral-sh/ruff/issues/10063 + - _ = a in ( + - # Foo + - b, + - ) +52 + _ = a == b +53 | +54 | _ = a in ( # Foo1 +55 | ( # Foo2 +note: This is an unsafe fix and may change runtime behavior FURB171 [*] Membership test against single-item container --> FURB171_0.py:57:5 @@ -181,31 +169,30 @@ FURB171 [*] Membership test against single-item container 74 | foo = ( | help: Convert to equality test - -ℹ Unsafe fix -54 54 | b, -55 55 | ) -56 56 | -57 |-_ = a in ( # Foo1 -58 |- ( # Foo2 -59 |- # Foo3 -60 |- ( # Tuple -61 |- ( # Bar - 57 |+_ = a == ( # Bar -62 58 | (b -63 59 | # Bar -64 60 | ) -65 61 | ) -66 |- # Foo4 -67 |- # Foo5 -68 |- , -69 |- ) -70 |- # Foo6 -71 |- ) -72 |-) -73 62 | -74 63 | foo = ( -75 64 | lorem() +54 | b, +55 | ) +56 | + - _ = a in ( # Foo1 + - ( # Foo2 + - # Foo3 + - ( # Tuple + - ( # Bar +57 + _ = a == ( # Bar +58 | (b +59 | # Bar +60 | ) +61 | ) + - # Foo4 + - # Foo5 + - , + - ) + - # Foo6 + - ) + - ) +62 | +63 | foo = ( +64 | lorem() +note: This is an unsafe fix and may change runtime behavior FURB171 [*] Membership test against single-item container --> FURB171_0.py:77:28 @@ -222,20 +209,19 @@ FURB171 [*] Membership test against single-item container 82 | ) | help: Convert to equality test - -ℹ Unsafe fix -74 74 | foo = ( -75 75 | lorem() -76 76 | .ipsum() -77 |- .dolor(lambda sit: sit in ( -78 |- # Foo1 -79 |- # Foo2 -80 |- amet, -81 |- )) - 77 |+ .dolor(lambda sit: sit == amet) -82 78 | ) -83 79 | -84 80 | foo = ( +74 | foo = ( +75 | lorem() +76 | .ipsum() + - .dolor(lambda sit: sit in ( + - # Foo1 + - # Foo2 + - amet, + - )) +77 + .dolor(lambda sit: sit == amet) +78 | ) +79 | +80 | foo = ( +note: This is an unsafe fix and may change runtime behavior FURB171 [*] Membership test against single-item container --> FURB171_0.py:87:28 @@ -254,23 +240,22 @@ FURB171 [*] Membership test against single-item container 94 | ) | help: Convert to equality test - -ℹ Unsafe fix -84 84 | foo = ( -85 85 | lorem() -86 86 | .ipsum() -87 |- .dolor(lambda sit: sit in ( -88 |- ( - 87 |+ .dolor(lambda sit: sit == ( -89 88 | # Foo1 -90 89 | # Foo2 -91 90 | amet -92 |- ), -93 |- )) - 91 |+ )) -94 92 | ) -95 93 | -96 94 | foo = lorem() \ +84 | foo = ( +85 | lorem() +86 | .ipsum() + - .dolor(lambda sit: sit in ( + - ( +87 + .dolor(lambda sit: sit == ( +88 | # Foo1 +89 | # Foo2 +90 | amet + - ), + - )) +91 + )) +92 | ) +93 | +94 | foo = lorem() \ +note: This is an unsafe fix and may change runtime behavior FURB171 [*] Membership test against single-item container --> FURB171_0.py:98:24 @@ -288,20 +273,19 @@ FURB171 [*] Membership test against single-item container 104 | def _(): | help: Convert to equality test - -ℹ Unsafe fix -95 95 | -96 96 | foo = lorem() \ -97 97 | .ipsum() \ -98 |- .dolor(lambda sit: sit in ( -99 |- # Foo1 -100 |- # Foo2 -101 |- amet, -102 |- )) - 98 |+ .dolor(lambda sit: sit == amet) -103 99 | -104 100 | def _(): -105 101 | if foo not \ +95 | +96 | foo = lorem() \ +97 | .ipsum() \ + - .dolor(lambda sit: sit in ( + - # Foo1 + - # Foo2 + - amet, + - )) +98 + .dolor(lambda sit: sit == amet) +99 | +100 | def _(): +101 | if foo not \ +note: This is an unsafe fix and may change runtime behavior FURB171 [*] Membership test against single-item container --> FURB171_0.py:105:8 @@ -319,21 +303,20 @@ FURB171 [*] Membership test against single-item container 112 | def _(): | help: Convert to inequality test - -ℹ Unsafe fix -102 102 | )) -103 103 | -104 104 | def _(): -105 |- if foo not \ -106 |- in [ -107 |- # Before -108 |- bar -109 |- # After -110 |- ]: ... - 105 |+ if foo != bar: ... -111 106 | -112 107 | def _(): -113 108 | if foo not \ +102 | )) +103 | +104 | def _(): + - if foo not \ + - in [ + - # Before + - bar + - # After + - ]: ... +105 + if foo != bar: ... +106 | +107 | def _(): +108 | if foo not \ +note: This is an unsafe fix and may change runtime behavior FURB171 [*] Membership test against single-item container --> FURB171_0.py:113:8 @@ -350,16 +333,15 @@ FURB171 [*] Membership test against single-item container 119 | 0 < 1: ... | help: Convert to inequality test - -ℹ Unsafe fix -110 110 | ]: ... -111 111 | -112 112 | def _(): -113 |- if foo not \ -114 |- in [ -115 |- # Before -116 |- bar -117 |- # After -118 |- ] and \ - 113 |+ if foo != bar and \ -119 114 | 0 < 1: ... +110 | ]: ... +111 | +112 | def _(): + - if foo not \ + - in [ + - # Before + - bar + - # After + - ] and \ +113 + if foo != bar and \ +114 | 0 < 1: ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap index 06bb3cfc0d..a662206459 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB171_FURB171_1.py.snap @@ -11,15 +11,13 @@ FURB171 [*] Membership test against single-item container 4 | print("Single-element set") | help: Convert to equality test - -ℹ Safe fix -1 1 | # Errors. -2 2 | -3 |-if 1 in set([1]): - 3 |+if 1 == 1: -4 4 | print("Single-element set") -5 5 | -6 6 | if 1 in set((1,)): +1 | # Errors. +2 | + - if 1 in set([1]): +3 + if 1 == 1: +4 | print("Single-element set") +5 | +6 | if 1 in set((1,)): FURB171 [*] Membership test against single-item container --> FURB171_1.py:6:4 @@ -31,16 +29,14 @@ FURB171 [*] Membership test against single-item container 7 | print("Single-element set") | help: Convert to equality test - -ℹ Safe fix -3 3 | if 1 in set([1]): -4 4 | print("Single-element set") -5 5 | -6 |-if 1 in set((1,)): - 6 |+if 1 == 1: -7 7 | print("Single-element set") -8 8 | -9 9 | if 1 in set({1}): +3 | if 1 in set([1]): +4 | print("Single-element set") +5 | + - if 1 in set((1,)): +6 + if 1 == 1: +7 | print("Single-element set") +8 | +9 | if 1 in set({1}): FURB171 [*] Membership test against single-item container --> FURB171_1.py:9:4 @@ -52,16 +48,14 @@ FURB171 [*] Membership test against single-item container 10 | print("Single-element set") | help: Convert to equality test - -ℹ Safe fix -6 6 | if 1 in set((1,)): -7 7 | print("Single-element set") -8 8 | -9 |-if 1 in set({1}): - 9 |+if 1 == 1: -10 10 | print("Single-element set") -11 11 | -12 12 | if 1 in frozenset([1]): +6 | if 1 in set((1,)): +7 | print("Single-element set") +8 | + - if 1 in set({1}): +9 + if 1 == 1: +10 | print("Single-element set") +11 | +12 | if 1 in frozenset([1]): FURB171 [*] Membership test against single-item container --> FURB171_1.py:12:4 @@ -73,16 +67,14 @@ FURB171 [*] Membership test against single-item container 13 | print("Single-element set") | help: Convert to equality test - -ℹ Safe fix -9 9 | if 1 in set({1}): -10 10 | print("Single-element set") -11 11 | -12 |-if 1 in frozenset([1]): - 12 |+if 1 == 1: -13 13 | print("Single-element set") -14 14 | -15 15 | if 1 in frozenset((1,)): +9 | if 1 in set({1}): +10 | print("Single-element set") +11 | + - if 1 in frozenset([1]): +12 + if 1 == 1: +13 | print("Single-element set") +14 | +15 | if 1 in frozenset((1,)): FURB171 [*] Membership test against single-item container --> FURB171_1.py:15:4 @@ -94,16 +86,14 @@ FURB171 [*] Membership test against single-item container 16 | print("Single-element set") | help: Convert to equality test - -ℹ Safe fix -12 12 | if 1 in frozenset([1]): -13 13 | print("Single-element set") -14 14 | -15 |-if 1 in frozenset((1,)): - 15 |+if 1 == 1: -16 16 | print("Single-element set") -17 17 | -18 18 | if 1 in frozenset({1}): +12 | if 1 in frozenset([1]): +13 | print("Single-element set") +14 | + - if 1 in frozenset((1,)): +15 + if 1 == 1: +16 | print("Single-element set") +17 | +18 | if 1 in frozenset({1}): FURB171 [*] Membership test against single-item container --> FURB171_1.py:18:4 @@ -115,16 +105,14 @@ FURB171 [*] Membership test against single-item container 19 | print("Single-element set") | help: Convert to equality test - -ℹ Safe fix -15 15 | if 1 in frozenset((1,)): -16 16 | print("Single-element set") -17 17 | -18 |-if 1 in frozenset({1}): - 18 |+if 1 == 1: -19 19 | print("Single-element set") -20 20 | -21 21 | if 1 in set(set([1])): +15 | if 1 in frozenset((1,)): +16 | print("Single-element set") +17 | + - if 1 in frozenset({1}): +18 + if 1 == 1: +19 | print("Single-element set") +20 | +21 | if 1 in set(set([1])): FURB171 [*] Membership test against single-item container --> FURB171_1.py:21:4 @@ -136,13 +124,11 @@ FURB171 [*] Membership test against single-item container 22 | print('Recursive solution') | help: Convert to equality test - -ℹ Safe fix -18 18 | if 1 in frozenset({1}): -19 19 | print("Single-element set") -20 20 | -21 |-if 1 in set(set([1])): - 21 |+if 1 == 1: -22 22 | print('Recursive solution') -23 23 | -24 24 | +18 | if 1 in frozenset({1}): +19 | print("Single-element set") +20 | + - if 1 in set(set([1])): +21 + if 1 == 1: +22 | print('Recursive solution') +23 | +24 | diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap index d93305cf69..3f5159c903 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB177_FURB177.py.snap @@ -10,16 +10,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 6 | _ = pathlib.Path().resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -2 2 | from pathlib import Path -3 3 | -4 4 | # Errors -5 |-_ = Path().resolve() - 5 |+_ = Path.cwd() -6 6 | _ = pathlib.Path().resolve() -7 7 | -8 8 | _ = Path("").resolve() +2 | from pathlib import Path +3 | +4 | # Errors + - _ = Path().resolve() +5 + _ = Path.cwd() +6 | _ = pathlib.Path().resolve() +7 | +8 | _ = Path("").resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:6:5 @@ -32,16 +31,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 8 | _ = Path("").resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -3 3 | -4 4 | # Errors -5 5 | _ = Path().resolve() -6 |-_ = pathlib.Path().resolve() - 6 |+_ = Path.cwd() -7 7 | -8 8 | _ = Path("").resolve() -9 9 | _ = pathlib.Path("").resolve() +3 | +4 | # Errors +5 | _ = Path().resolve() + - _ = pathlib.Path().resolve() +6 + _ = Path.cwd() +7 | +8 | _ = Path("").resolve() +9 | _ = pathlib.Path("").resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:8:5 @@ -53,16 +51,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 9 | _ = pathlib.Path("").resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -5 5 | _ = Path().resolve() -6 6 | _ = pathlib.Path().resolve() -7 7 | -8 |-_ = Path("").resolve() - 8 |+_ = Path.cwd() -9 9 | _ = pathlib.Path("").resolve() -10 10 | -11 11 | _ = Path(".").resolve() +5 | _ = Path().resolve() +6 | _ = pathlib.Path().resolve() +7 | + - _ = Path("").resolve() +8 + _ = Path.cwd() +9 | _ = pathlib.Path("").resolve() +10 | +11 | _ = Path(".").resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:9:5 @@ -74,16 +71,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 11 | _ = Path(".").resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -6 6 | _ = pathlib.Path().resolve() -7 7 | -8 8 | _ = Path("").resolve() -9 |-_ = pathlib.Path("").resolve() - 9 |+_ = Path.cwd() -10 10 | -11 11 | _ = Path(".").resolve() -12 12 | _ = pathlib.Path(".").resolve() +6 | _ = pathlib.Path().resolve() +7 | +8 | _ = Path("").resolve() + - _ = pathlib.Path("").resolve() +9 + _ = Path.cwd() +10 | +11 | _ = Path(".").resolve() +12 | _ = pathlib.Path(".").resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:11:5 @@ -95,16 +91,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 12 | _ = pathlib.Path(".").resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -8 8 | _ = Path("").resolve() -9 9 | _ = pathlib.Path("").resolve() -10 10 | -11 |-_ = Path(".").resolve() - 11 |+_ = Path.cwd() -12 12 | _ = pathlib.Path(".").resolve() -13 13 | -14 14 | _ = Path("", **kwargs).resolve() +8 | _ = Path("").resolve() +9 | _ = pathlib.Path("").resolve() +10 | + - _ = Path(".").resolve() +11 + _ = Path.cwd() +12 | _ = pathlib.Path(".").resolve() +13 | +14 | _ = Path("", **kwargs).resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:12:5 @@ -116,16 +111,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 14 | _ = Path("", **kwargs).resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -9 9 | _ = pathlib.Path("").resolve() -10 10 | -11 11 | _ = Path(".").resolve() -12 |-_ = pathlib.Path(".").resolve() - 12 |+_ = Path.cwd() -13 13 | -14 14 | _ = Path("", **kwargs).resolve() -15 15 | _ = pathlib.Path("", **kwargs).resolve() +9 | _ = pathlib.Path("").resolve() +10 | +11 | _ = Path(".").resolve() + - _ = pathlib.Path(".").resolve() +12 + _ = Path.cwd() +13 | +14 | _ = Path("", **kwargs).resolve() +15 | _ = pathlib.Path("", **kwargs).resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:14:5 @@ -137,16 +131,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 15 | _ = pathlib.Path("", **kwargs).resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -11 11 | _ = Path(".").resolve() -12 12 | _ = pathlib.Path(".").resolve() -13 13 | -14 |-_ = Path("", **kwargs).resolve() - 14 |+_ = Path.cwd() -15 15 | _ = pathlib.Path("", **kwargs).resolve() -16 16 | -17 17 | _ = Path(".", **kwargs).resolve() +11 | _ = Path(".").resolve() +12 | _ = pathlib.Path(".").resolve() +13 | + - _ = Path("", **kwargs).resolve() +14 + _ = Path.cwd() +15 | _ = pathlib.Path("", **kwargs).resolve() +16 | +17 | _ = Path(".", **kwargs).resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:15:5 @@ -158,16 +151,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 17 | _ = Path(".", **kwargs).resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -12 12 | _ = pathlib.Path(".").resolve() -13 13 | -14 14 | _ = Path("", **kwargs).resolve() -15 |-_ = pathlib.Path("", **kwargs).resolve() - 15 |+_ = Path.cwd() -16 16 | -17 17 | _ = Path(".", **kwargs).resolve() -18 18 | _ = pathlib.Path(".", **kwargs).resolve() +12 | _ = pathlib.Path(".").resolve() +13 | +14 | _ = Path("", **kwargs).resolve() + - _ = pathlib.Path("", **kwargs).resolve() +15 + _ = Path.cwd() +16 | +17 | _ = Path(".", **kwargs).resolve() +18 | _ = pathlib.Path(".", **kwargs).resolve() +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:17:5 @@ -179,16 +171,15 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 18 | _ = pathlib.Path(".", **kwargs).resolve() | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -14 14 | _ = Path("", **kwargs).resolve() -15 15 | _ = pathlib.Path("", **kwargs).resolve() -16 16 | -17 |-_ = Path(".", **kwargs).resolve() - 17 |+_ = Path.cwd() -18 18 | _ = pathlib.Path(".", **kwargs).resolve() -19 19 | -20 20 | # OK +14 | _ = Path("", **kwargs).resolve() +15 | _ = pathlib.Path("", **kwargs).resolve() +16 | + - _ = Path(".", **kwargs).resolve() +17 + _ = Path.cwd() +18 | _ = pathlib.Path(".", **kwargs).resolve() +19 | +20 | # OK +note: This is an unsafe fix and may change runtime behavior FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lookups --> FURB177.py:18:5 @@ -200,13 +191,12 @@ FURB177 [*] Prefer `Path.cwd()` over `Path().resolve()` for current-directory lo 20 | # OK | help: Replace `Path().resolve()` with `Path.cwd()` - -ℹ Unsafe fix -15 15 | _ = pathlib.Path("", **kwargs).resolve() -16 16 | -17 17 | _ = Path(".", **kwargs).resolve() -18 |-_ = pathlib.Path(".", **kwargs).resolve() - 18 |+_ = Path.cwd() -19 19 | -20 20 | # OK -21 21 | _ = Path.cwd() +15 | _ = pathlib.Path("", **kwargs).resolve() +16 | +17 | _ = Path(".", **kwargs).resolve() + - _ = pathlib.Path(".", **kwargs).resolve() +18 + _ = Path.cwd() +19 | +20 | # OK +21 | _ = Path.cwd() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap index 5461e27403..be994f1cc5 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB180_FURB180.py.snap @@ -12,16 +12,14 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class 9 | def foo(self): pass | help: Replace with `abc.ABC` - -ℹ Safe fix -4 4 | -5 5 | # Errors -6 6 | -7 |-class A0(metaclass=abc.ABCMeta): - 7 |+class A0(abc.ABC): -8 8 | @abstractmethod -9 9 | def foo(self): pass -10 10 | +4 | +5 | # Errors +6 | + - class A0(metaclass=abc.ABCMeta): +7 + class A0(abc.ABC): +8 | @abstractmethod +9 | def foo(self): pass +10 | FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class --> FURB180.py:12:10 @@ -32,16 +30,14 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class 14 | def foo(self): pass | help: Replace with `abc.ABC` - -ℹ Safe fix -9 9 | def foo(self): pass -10 10 | -11 11 | -12 |-class A1(metaclass=ABCMeta): - 12 |+class A1(abc.ABC): -13 13 | @abstractmethod -14 14 | def foo(self): pass -15 15 | +9 | def foo(self): pass +10 | +11 | + - class A1(metaclass=ABCMeta): +12 + class A1(abc.ABC): +13 | @abstractmethod +14 | def foo(self): pass +15 | FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class --> FURB180.py:26:18 @@ -52,16 +48,15 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class 28 | def foo(self): pass | help: Replace with `abc.ABC` - -ℹ Unsafe fix -23 23 | pass -24 24 | -25 25 | -26 |-class A2(B0, B1, metaclass=ABCMeta): - 26 |+class A2(B0, B1, abc.ABC): -27 27 | @abstractmethod -28 28 | def foo(self): pass -29 29 | +23 | pass +24 | +25 | + - class A2(B0, B1, metaclass=ABCMeta): +26 + class A2(B0, B1, abc.ABC): +27 | @abstractmethod +28 | def foo(self): pass +29 | +note: This is an unsafe fix and may change runtime behavior FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class --> FURB180.py:31:34 @@ -71,13 +66,12 @@ FURB180 [*] Use of `metaclass=abc.ABCMeta` to define abstract base class 32 | pass | help: Replace with `abc.ABC` - -ℹ Unsafe fix -28 28 | def foo(self): pass -29 29 | -30 30 | -31 |-class A3(B0, before_metaclass=1, metaclass=abc.ABCMeta): - 31 |+class A3(B0, abc.ABC, before_metaclass=1): -32 32 | pass -33 33 | -34 34 | +28 | def foo(self): pass +29 | +30 | + - class A3(B0, before_metaclass=1, metaclass=abc.ABCMeta): +31 + class A3(B0, abc.ABC, before_metaclass=1): +32 | pass +33 | +34 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap index 8bf362eba6..d437b1ae07 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB181_FURB181.py.snap @@ -12,16 +12,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 21 | md5().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -16 16 | -17 17 | # these will match -18 18 | -19 |-blake2b().digest().hex() - 19 |+blake2b().hexdigest() -20 20 | blake2s().digest().hex() -21 21 | md5().digest().hex() -22 22 | sha1().digest().hex() +16 | +17 | # these will match +18 | + - blake2b().digest().hex() +19 + blake2b().hexdigest() +20 | blake2s().digest().hex() +21 | md5().digest().hex() +22 | sha1().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:20:1 @@ -33,16 +31,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 22 | sha1().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -17 17 | # these will match -18 18 | -19 19 | blake2b().digest().hex() -20 |-blake2s().digest().hex() - 20 |+blake2s().hexdigest() -21 21 | md5().digest().hex() -22 22 | sha1().digest().hex() -23 23 | sha224().digest().hex() +17 | # these will match +18 | +19 | blake2b().digest().hex() + - blake2s().digest().hex() +20 + blake2s().hexdigest() +21 | md5().digest().hex() +22 | sha1().digest().hex() +23 | sha224().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:21:1 @@ -55,16 +51,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 23 | sha224().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -18 18 | -19 19 | blake2b().digest().hex() -20 20 | blake2s().digest().hex() -21 |-md5().digest().hex() - 21 |+md5().hexdigest() -22 22 | sha1().digest().hex() -23 23 | sha224().digest().hex() -24 24 | sha256().digest().hex() +18 | +19 | blake2b().digest().hex() +20 | blake2s().digest().hex() + - md5().digest().hex() +21 + md5().hexdigest() +22 | sha1().digest().hex() +23 | sha224().digest().hex() +24 | sha256().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:22:1 @@ -77,16 +71,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 24 | sha256().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -19 19 | blake2b().digest().hex() -20 20 | blake2s().digest().hex() -21 21 | md5().digest().hex() -22 |-sha1().digest().hex() - 22 |+sha1().hexdigest() -23 23 | sha224().digest().hex() -24 24 | sha256().digest().hex() -25 25 | sha384().digest().hex() +19 | blake2b().digest().hex() +20 | blake2s().digest().hex() +21 | md5().digest().hex() + - sha1().digest().hex() +22 + sha1().hexdigest() +23 | sha224().digest().hex() +24 | sha256().digest().hex() +25 | sha384().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:23:1 @@ -99,16 +91,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 25 | sha384().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -20 20 | blake2s().digest().hex() -21 21 | md5().digest().hex() -22 22 | sha1().digest().hex() -23 |-sha224().digest().hex() - 23 |+sha224().hexdigest() -24 24 | sha256().digest().hex() -25 25 | sha384().digest().hex() -26 26 | sha3_224().digest().hex() +20 | blake2s().digest().hex() +21 | md5().digest().hex() +22 | sha1().digest().hex() + - sha224().digest().hex() +23 + sha224().hexdigest() +24 | sha256().digest().hex() +25 | sha384().digest().hex() +26 | sha3_224().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:24:1 @@ -121,16 +111,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 26 | sha3_224().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -21 21 | md5().digest().hex() -22 22 | sha1().digest().hex() -23 23 | sha224().digest().hex() -24 |-sha256().digest().hex() - 24 |+sha256().hexdigest() -25 25 | sha384().digest().hex() -26 26 | sha3_224().digest().hex() -27 27 | sha3_256().digest().hex() +21 | md5().digest().hex() +22 | sha1().digest().hex() +23 | sha224().digest().hex() + - sha256().digest().hex() +24 + sha256().hexdigest() +25 | sha384().digest().hex() +26 | sha3_224().digest().hex() +27 | sha3_256().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:25:1 @@ -143,16 +131,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 27 | sha3_256().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -22 22 | sha1().digest().hex() -23 23 | sha224().digest().hex() -24 24 | sha256().digest().hex() -25 |-sha384().digest().hex() - 25 |+sha384().hexdigest() -26 26 | sha3_224().digest().hex() -27 27 | sha3_256().digest().hex() -28 28 | sha3_384().digest().hex() +22 | sha1().digest().hex() +23 | sha224().digest().hex() +24 | sha256().digest().hex() + - sha384().digest().hex() +25 + sha384().hexdigest() +26 | sha3_224().digest().hex() +27 | sha3_256().digest().hex() +28 | sha3_384().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:26:1 @@ -165,16 +151,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 28 | sha3_384().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -23 23 | sha224().digest().hex() -24 24 | sha256().digest().hex() -25 25 | sha384().digest().hex() -26 |-sha3_224().digest().hex() - 26 |+sha3_224().hexdigest() -27 27 | sha3_256().digest().hex() -28 28 | sha3_384().digest().hex() -29 29 | sha3_512().digest().hex() +23 | sha224().digest().hex() +24 | sha256().digest().hex() +25 | sha384().digest().hex() + - sha3_224().digest().hex() +26 + sha3_224().hexdigest() +27 | sha3_256().digest().hex() +28 | sha3_384().digest().hex() +29 | sha3_512().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:27:1 @@ -187,16 +171,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 29 | sha3_512().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -24 24 | sha256().digest().hex() -25 25 | sha384().digest().hex() -26 26 | sha3_224().digest().hex() -27 |-sha3_256().digest().hex() - 27 |+sha3_256().hexdigest() -28 28 | sha3_384().digest().hex() -29 29 | sha3_512().digest().hex() -30 30 | sha512().digest().hex() +24 | sha256().digest().hex() +25 | sha384().digest().hex() +26 | sha3_224().digest().hex() + - sha3_256().digest().hex() +27 + sha3_256().hexdigest() +28 | sha3_384().digest().hex() +29 | sha3_512().digest().hex() +30 | sha512().digest().hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:28:1 @@ -209,16 +191,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 30 | sha512().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -25 25 | sha384().digest().hex() -26 26 | sha3_224().digest().hex() -27 27 | sha3_256().digest().hex() -28 |-sha3_384().digest().hex() - 28 |+sha3_384().hexdigest() -29 29 | sha3_512().digest().hex() -30 30 | sha512().digest().hex() -31 31 | shake_128().digest(10).hex() +25 | sha384().digest().hex() +26 | sha3_224().digest().hex() +27 | sha3_256().digest().hex() + - sha3_384().digest().hex() +28 + sha3_384().hexdigest() +29 | sha3_512().digest().hex() +30 | sha512().digest().hex() +31 | shake_128().digest(10).hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:29:1 @@ -231,16 +211,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 31 | shake_128().digest(10).hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -26 26 | sha3_224().digest().hex() -27 27 | sha3_256().digest().hex() -28 28 | sha3_384().digest().hex() -29 |-sha3_512().digest().hex() - 29 |+sha3_512().hexdigest() -30 30 | sha512().digest().hex() -31 31 | shake_128().digest(10).hex() -32 32 | shake_256().digest(10).hex() +26 | sha3_224().digest().hex() +27 | sha3_256().digest().hex() +28 | sha3_384().digest().hex() + - sha3_512().digest().hex() +29 + sha3_512().hexdigest() +30 | sha512().digest().hex() +31 | shake_128().digest(10).hex() +32 | shake_256().digest(10).hex() FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:30:1 @@ -253,16 +231,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 32 | shake_256().digest(10).hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -27 27 | sha3_256().digest().hex() -28 28 | sha3_384().digest().hex() -29 29 | sha3_512().digest().hex() -30 |-sha512().digest().hex() - 30 |+sha512().hexdigest() -31 31 | shake_128().digest(10).hex() -32 32 | shake_256().digest(10).hex() -33 33 | +27 | sha3_256().digest().hex() +28 | sha3_384().digest().hex() +29 | sha3_512().digest().hex() + - sha512().digest().hex() +30 + sha512().hexdigest() +31 | shake_128().digest(10).hex() +32 | shake_256().digest(10).hex() +33 | FURB181 Use of hashlib's `.digest().hex()` --> FURB181.py:31:1 @@ -298,16 +274,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 36 | sha256(b"text").digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -31 31 | shake_128().digest(10).hex() -32 32 | shake_256().digest(10).hex() -33 33 | -34 |-hashlib.sha256().digest().hex() - 34 |+hashlib.sha256().hexdigest() -35 35 | -36 36 | sha256(b"text").digest().hex() -37 37 | +31 | shake_128().digest(10).hex() +32 | shake_256().digest(10).hex() +33 | + - hashlib.sha256().digest().hex() +34 + hashlib.sha256().hexdigest() +35 | +36 | sha256(b"text").digest().hex() +37 | FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:36:1 @@ -320,16 +294,14 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 38 | hash_algo().digest().hex() | help: Replace with `.hexdigest()` - -ℹ Safe fix -33 33 | -34 34 | hashlib.sha256().digest().hex() -35 35 | -36 |-sha256(b"text").digest().hex() - 36 |+sha256(b"text").hexdigest() -37 37 | -38 38 | hash_algo().digest().hex() -39 39 | +33 | +34 | hashlib.sha256().digest().hex() +35 | + - sha256(b"text").digest().hex() +36 + sha256(b"text").hexdigest() +37 | +38 | hash_algo().digest().hex() +39 | FURB181 [*] Use of hashlib's `.digest().hex()` --> FURB181.py:38:1 @@ -342,13 +314,11 @@ FURB181 [*] Use of hashlib's `.digest().hex()` 40 | # not yet supported | help: Replace with `.hexdigest()` - -ℹ Safe fix -35 35 | -36 36 | sha256(b"text").digest().hex() -37 37 | -38 |-hash_algo().digest().hex() - 38 |+hash_algo().hexdigest() -39 39 | -40 40 | # not yet supported -41 41 | h = sha256() +35 | +36 | sha256(b"text").digest().hex() +37 | + - hash_algo().digest().hex() +38 + hash_algo().hexdigest() +39 | +40 | # not yet supported +41 | h = sha256() diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap index 4287365e6a..7a1cc9bf24 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB187_FURB187.py.snap @@ -10,16 +10,15 @@ FURB187 [*] Use of assignment of `reversed` on list `l` | ^^^^^^^^^^^^^^^ | help: Replace with `l.reverse()` - -ℹ Unsafe fix -3 3 | -4 4 | def a(): -5 5 | l = [] -6 |- l = reversed(l) - 6 |+ l.reverse() -7 7 | -8 8 | -9 9 | def b(): +3 | +4 | def a(): +5 | l = [] + - l = reversed(l) +6 + l.reverse() +7 | +8 | +9 | def b(): +note: This is an unsafe fix and may change runtime behavior FURB187 [*] Use of assignment of `reversed` on list `l` --> FURB187.py:11:5 @@ -30,16 +29,15 @@ FURB187 [*] Use of assignment of `reversed` on list `l` | ^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `l.reverse()` - -ℹ Unsafe fix -8 8 | -9 9 | def b(): -10 10 | l = [] -11 |- l = list(reversed(l)) - 11 |+ l.reverse() -12 12 | -13 13 | -14 14 | def c(): +8 | +9 | def b(): +10 | l = [] + - l = list(reversed(l)) +11 + l.reverse() +12 | +13 | +14 | def c(): +note: This is an unsafe fix and may change runtime behavior FURB187 [*] Use of assignment of `reversed` on list `l` --> FURB187.py:16:5 @@ -50,13 +48,12 @@ FURB187 [*] Use of assignment of `reversed` on list `l` | ^^^^^^^^^^^ | help: Replace with `l.reverse()` - -ℹ Unsafe fix -13 13 | -14 14 | def c(): -15 15 | l = [] -16 |- l = l[::-1] - 16 |+ l.reverse() -17 17 | -18 18 | -19 19 | # False negative +13 | +14 | def c(): +15 | l = [] + - l = l[::-1] +16 + l.reverse() +17 | +18 | +19 | # False negative +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap index 6231a0d701..21e50d3130 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB188_FURB188.py.snap @@ -12,17 +12,15 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. 10 | return filename | help: Use removesuffix instead of assignment conditional upon endswith. - -ℹ Safe fix -4 4 | # these should match -5 5 | -6 6 | def remove_extension_via_slice(filename: str) -> str: -7 |- if filename.endswith(".txt"): -8 |- filename = filename[:-4] - 7 |+ filename = filename.removesuffix(".txt") -9 8 | -10 9 | return filename -11 10 | +4 | # these should match +5 | +6 | def remove_extension_via_slice(filename: str) -> str: + - if filename.endswith(".txt"): + - filename = filename[:-4] +7 + filename = filename.removesuffix(".txt") +8 | +9 | return filename +10 | FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. --> FURB188.py:14:5 @@ -35,17 +33,15 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. 17 | return filename | help: Use removesuffix instead of assignment conditional upon endswith. - -ℹ Safe fix -11 11 | -12 12 | -13 13 | def remove_extension_via_slice_len(filename: str, extension: str) -> str: -14 |- if filename.endswith(extension): -15 |- filename = filename[:-len(extension)] - 14 |+ filename = filename.removesuffix(extension) -16 15 | -17 16 | return filename -18 17 | +11 | +12 | +13 | def remove_extension_via_slice_len(filename: str, extension: str) -> str: + - if filename.endswith(extension): + - filename = filename[:-len(extension)] +14 + filename = filename.removesuffix(extension) +15 | +16 | return filename +17 | FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. --> FURB188.py:21:12 @@ -55,16 +51,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use removesuffix instead of ternary expression conditional upon endswith. - -ℹ Safe fix -18 18 | -19 19 | -20 20 | def remove_extension_via_ternary(filename: str) -> str: -21 |- return filename[:-4] if filename.endswith(".txt") else filename - 21 |+ return filename.removesuffix(".txt") -22 22 | -23 23 | -24 24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str: +18 | +19 | +20 | def remove_extension_via_ternary(filename: str) -> str: + - return filename[:-4] if filename.endswith(".txt") else filename +21 + return filename.removesuffix(".txt") +22 | +23 | +24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str: FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. --> FURB188.py:25:12 @@ -74,16 +68,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use removesuffix instead of ternary expression conditional upon endswith. - -ℹ Safe fix -22 22 | -23 23 | -24 24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str: -25 |- return filename[:-len(extension)] if filename.endswith(extension) else filename - 25 |+ return filename.removesuffix(extension) -26 26 | -27 27 | -28 28 | def remove_prefix(filename: str) -> str: +22 | +23 | +24 | def remove_extension_via_ternary_with_len(filename: str, extension: str) -> str: + - return filename[:-len(extension)] if filename.endswith(extension) else filename +25 + return filename.removesuffix(extension) +26 | +27 | +28 | def remove_prefix(filename: str) -> str: FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:29:12 @@ -93,16 +85,14 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use removeprefix instead of ternary expression conditional upon startswith. - -ℹ Safe fix -26 26 | -27 27 | -28 28 | def remove_prefix(filename: str) -> str: -29 |- return filename[4:] if filename.startswith("abc-") else filename - 29 |+ return filename.removeprefix("abc-") -30 30 | -31 31 | -32 32 | def remove_prefix_via_len(filename: str, prefix: str) -> str: +26 | +27 | +28 | def remove_prefix(filename: str) -> str: + - return filename[4:] if filename.startswith("abc-") else filename +29 + return filename.removeprefix("abc-") +30 | +31 | +32 | def remove_prefix_via_len(filename: str, prefix: str) -> str: FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:33:12 @@ -112,16 +102,14 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use removeprefix instead of ternary expression conditional upon startswith. - -ℹ Safe fix -30 30 | -31 31 | -32 32 | def remove_prefix_via_len(filename: str, prefix: str) -> str: -33 |- return filename[len(prefix):] if filename.startswith(prefix) else filename - 33 |+ return filename.removeprefix(prefix) -34 34 | -35 35 | -36 36 | # these should not +30 | +31 | +32 | def remove_prefix_via_len(filename: str, prefix: str) -> str: + - return filename[len(prefix):] if filename.startswith(prefix) else filename +33 + return filename.removeprefix(prefix) +34 | +35 | +36 | # these should not FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. --> FURB188.py:146:9 @@ -134,16 +122,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. 148 | def remove_prefix_comparable_literal_expr() -> None: | help: Use removesuffix instead of ternary expression conditional upon endswith. - -ℹ Safe fix -143 143 | -144 144 | SUFFIX = "suffix" -145 145 | -146 |- x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz - 146 |+ x = foo.bar.baz.removesuffix(SUFFIX) -147 147 | -148 148 | def remove_prefix_comparable_literal_expr() -> None: -149 149 | return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def" +143 | +144 | SUFFIX = "suffix" +145 | + - x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz +146 + x = foo.bar.baz.removesuffix(SUFFIX) +147 | +148 | def remove_prefix_comparable_literal_expr() -> None: +149 | return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def" FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:149:12 @@ -155,16 +141,14 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. 151 | def shadow_builtins(filename: str, extension: str) -> None: | help: Use removeprefix instead of ternary expression conditional upon startswith. - -ℹ Safe fix -146 146 | x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz -147 147 | -148 148 | def remove_prefix_comparable_literal_expr() -> None: -149 |- return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def" - 149 |+ return "abc" "def".removeprefix("abc") -150 150 | -151 151 | def shadow_builtins(filename: str, extension: str) -> None: -152 152 | from builtins import len as builtins_len +146 | x = foo.bar.baz[:-len(SUFFIX)] if foo.bar.baz.endswith(SUFFIX) else foo.bar.baz +147 | +148 | def remove_prefix_comparable_literal_expr() -> None: + - return ("abc" "def")[3:] if ("abc" "def").startswith("abc") else "abc" "def" +149 + return "abc" "def".removeprefix("abc") +150 | +151 | def shadow_builtins(filename: str, extension: str) -> None: +152 | from builtins import len as builtins_len FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. --> FURB188.py:154:12 @@ -177,16 +161,14 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. 156 | def okay_steps(): | help: Use removesuffix instead of ternary expression conditional upon endswith. - -ℹ Safe fix -151 151 | def shadow_builtins(filename: str, extension: str) -> None: -152 152 | from builtins import len as builtins_len -153 153 | -154 |- return filename[:-builtins_len(extension)] if filename.endswith(extension) else filename - 154 |+ return filename.removesuffix(extension) -155 155 | -156 156 | def okay_steps(): -157 157 | text = "!x!y!z" +151 | def shadow_builtins(filename: str, extension: str) -> None: +152 | from builtins import len as builtins_len +153 | + - return filename[:-builtins_len(extension)] if filename.endswith(extension) else filename +154 + return filename.removesuffix(extension) +155 | +156 | def okay_steps(): +157 | text = "!x!y!z" FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:158:5 @@ -200,17 +182,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. 161 | text = text[1::True] | help: Use removeprefix instead of assignment conditional upon startswith. - -ℹ Safe fix -155 155 | -156 156 | def okay_steps(): -157 157 | text = "!x!y!z" -158 |- if text.startswith("!"): -159 |- text = text[1::1] - 158 |+ text = text.removeprefix("!") -160 159 | if text.startswith("!"): -161 160 | text = text[1::True] -162 161 | if text.startswith("!"): +155 | +156 | def okay_steps(): +157 | text = "!x!y!z" + - if text.startswith("!"): + - text = text[1::1] +158 + text = text.removeprefix("!") +159 | if text.startswith("!"): +160 | text = text[1::True] +161 | if text.startswith("!"): FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:160:5 @@ -224,17 +204,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. 163 | text = text[1::None] | help: Use removeprefix instead of assignment conditional upon startswith. - -ℹ Safe fix -157 157 | text = "!x!y!z" -158 158 | if text.startswith("!"): -159 159 | text = text[1::1] -160 |- if text.startswith("!"): -161 |- text = text[1::True] - 160 |+ text = text.removeprefix("!") -162 161 | if text.startswith("!"): -163 162 | text = text[1::None] -164 163 | print(text) +157 | text = "!x!y!z" +158 | if text.startswith("!"): +159 | text = text[1::1] + - if text.startswith("!"): + - text = text[1::True] +160 + text = text.removeprefix("!") +161 | if text.startswith("!"): +162 | text = text[1::None] +163 | print(text) FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:162:5 @@ -247,17 +225,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. 164 | print(text) | help: Use removeprefix instead of assignment conditional upon startswith. - -ℹ Safe fix -159 159 | text = text[1::1] -160 160 | if text.startswith("!"): -161 161 | text = text[1::True] -162 |- if text.startswith("!"): -163 |- text = text[1::None] - 162 |+ text = text.removeprefix("!") -164 163 | print(text) -165 164 | -166 165 | +159 | text = text[1::1] +160 | if text.startswith("!"): +161 | text = text[1::True] + - if text.startswith("!"): + - text = text[1::None] +162 + text = text.removeprefix("!") +163 | print(text) +164 | +165 | FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:183:5 @@ -269,17 +245,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. | |_______________________^ | help: Use removeprefix instead of assignment conditional upon startswith. - -ℹ Safe fix -180 180 | # should be linted -181 181 | # with fix `text = text.removeprefix("ř")` -182 182 | text = "řetězec" -183 |- if text.startswith("ř"): -184 |- text = text[1:] - 183 |+ text = text.removeprefix("ř") -185 184 | -186 185 | -187 186 | def handle_surrogates(): +180 | # should be linted +181 | # with fix `text = text.removeprefix("ř")` +182 | text = "řetězec" + - if text.startswith("ř"): + - text = text[1:] +183 + text = text.removeprefix("ř") +184 | +185 | +186 | def handle_surrogates(): FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:190:5 @@ -293,17 +267,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. 193 | if text.startswith("\U00010000"): | help: Use removeprefix instead of assignment conditional upon startswith. - -ℹ Safe fix -187 187 | def handle_surrogates(): -188 188 | # should be linted -189 189 | text = "\ud800\udc00heythere" -190 |- if text.startswith("\ud800\udc00"): -191 |- text = text[2:] - 190 |+ text = text.removeprefix("\ud800\udc00") -192 191 | text = "\U00010000heythere" -193 192 | if text.startswith("\U00010000"): -194 193 | text = text[1:] +187 | def handle_surrogates(): +188 | # should be linted +189 | text = "\ud800\udc00heythere" + - if text.startswith("\ud800\udc00"): + - text = text[2:] +190 + text = text.removeprefix("\ud800\udc00") +191 | text = "\U00010000heythere" +192 | if text.startswith("\U00010000"): +193 | text = text[1:] FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. --> FURB188.py:193:5 @@ -317,17 +289,15 @@ FURB188 [*] Prefer `str.removeprefix()` over conditionally replacing with slice. 196 | # should not be linted | help: Use removeprefix instead of assignment conditional upon startswith. - -ℹ Safe fix -190 190 | if text.startswith("\ud800\udc00"): -191 191 | text = text[2:] -192 192 | text = "\U00010000heythere" -193 |- if text.startswith("\U00010000"): -194 |- text = text[1:] - 193 |+ text = text.removeprefix("\U00010000") -195 194 | -196 195 | # should not be linted -197 196 | text = "\ud800\udc00heythere" +190 | if text.startswith("\ud800\udc00"): +191 | text = text[2:] +192 | text = "\U00010000heythere" + - if text.startswith("\U00010000"): + - text = text[1:] +193 + text = text.removeprefix("\U00010000") +194 | +195 | # should not be linted +196 | text = "\ud800\udc00heythere" FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. --> FURB188.py:205:5 @@ -340,12 +310,10 @@ FURB188 [*] Prefer `str.removesuffix()` over conditionally replacing with slice. 207 | print(a) | help: Use removesuffix instead of assignment conditional upon endswith. - -ℹ Safe fix -202 202 | # https://github.com/astral-sh/ruff/issues/16231 -203 203 | def func(): -204 204 | a = "sjdfaskldjfakljklfoo" -205 |- if a.endswith("foo"): -206 |- a = a[: -len("foo")] - 205 |+ a = a.removesuffix("foo") -207 206 | print(a) +202 | # https://github.com/astral-sh/ruff/issues/16231 +203 | def func(): +204 | a = "sjdfaskldjfakljklfoo" + - if a.endswith("foo"): + - a = a[: -len("foo")] +205 + a = a.removesuffix("foo") +206 | print(a) diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap index 24184590d2..c484e558a9 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB189_FURB189.py.snap @@ -10,24 +10,23 @@ FURB189 [*] Subclassing `dict` can be error prone, use `collections.UserDict` in 18 | pass | help: Replace with `collections.UserDict` - -ℹ Unsafe fix -1 1 | # setup -2 2 | from enum import Enum, EnumMeta -3 |-from collections import UserList as UL - 3 |+from collections import UserList as UL, UserDict -4 4 | -5 5 | class SetOnceMappingMixin: -6 6 | __slots__ = () +1 | # setup +2 | from enum import Enum, EnumMeta + - from collections import UserList as UL +3 + from collections import UserList as UL, UserDict +4 | +5 | class SetOnceMappingMixin: +6 | __slots__ = () -------------------------------------------------------------------------------- -14 14 | pass -15 15 | -16 16 | # positives -17 |-class D(dict): - 17 |+class D(UserDict): -18 18 | pass -19 19 | -20 20 | class L(list): +14 | pass +15 | +16 | # positives + - class D(dict): +17 + class D(UserDict): +18 | pass +19 | +20 | class L(list): +note: This is an unsafe fix and may change runtime behavior FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` instead --> FURB189.py:20:9 @@ -39,16 +38,15 @@ FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` in 21 | pass | help: Replace with `collections.UserList` - -ℹ Unsafe fix -17 17 | class D(dict): -18 18 | pass -19 19 | -20 |-class L(list): - 20 |+class L(UL): -21 21 | pass -22 22 | -23 23 | class S(str): +17 | class D(dict): +18 | pass +19 | + - class L(list): +20 + class L(UL): +21 | pass +22 | +23 | class S(str): +note: This is an unsafe fix and may change runtime behavior FURB189 [*] Subclassing `str` can be error prone, use `collections.UserString` instead --> FURB189.py:23:9 @@ -60,24 +58,23 @@ FURB189 [*] Subclassing `str` can be error prone, use `collections.UserString` i 24 | pass | help: Replace with `collections.UserString` - -ℹ Unsafe fix -1 1 | # setup -2 2 | from enum import Enum, EnumMeta -3 |-from collections import UserList as UL - 3 |+from collections import UserList as UL, UserString -4 4 | -5 5 | class SetOnceMappingMixin: -6 6 | __slots__ = () +1 | # setup +2 | from enum import Enum, EnumMeta + - from collections import UserList as UL +3 + from collections import UserList as UL, UserString +4 | +5 | class SetOnceMappingMixin: +6 | __slots__ = () -------------------------------------------------------------------------------- -20 20 | class L(list): -21 21 | pass -22 22 | -23 |-class S(str): - 23 |+class S(UserString): -24 24 | pass -25 25 | -26 26 | class SubscriptDict(dict[str, str]): +20 | class L(list): +21 | pass +22 | + - class S(str): +23 + class S(UserString): +24 | pass +25 | +26 | class SubscriptDict(dict[str, str]): +note: This is an unsafe fix and may change runtime behavior FURB189 [*] Subclassing `dict` can be error prone, use `collections.UserDict` instead --> FURB189.py:26:21 @@ -89,24 +86,23 @@ FURB189 [*] Subclassing `dict` can be error prone, use `collections.UserDict` in 27 | pass | help: Replace with `collections.UserDict` - -ℹ Unsafe fix -1 1 | # setup -2 2 | from enum import Enum, EnumMeta -3 |-from collections import UserList as UL - 3 |+from collections import UserList as UL, UserDict -4 4 | -5 5 | class SetOnceMappingMixin: -6 6 | __slots__ = () +1 | # setup +2 | from enum import Enum, EnumMeta + - from collections import UserList as UL +3 + from collections import UserList as UL, UserDict +4 | +5 | class SetOnceMappingMixin: +6 | __slots__ = () -------------------------------------------------------------------------------- -23 23 | class S(str): -24 24 | pass -25 25 | -26 |-class SubscriptDict(dict[str, str]): - 26 |+class SubscriptDict(UserDict[str, str]): -27 27 | pass -28 28 | -29 29 | class SubscriptList(list[str]): +23 | class S(str): +24 | pass +25 | + - class SubscriptDict(dict[str, str]): +26 + class SubscriptDict(UserDict[str, str]): +27 | pass +28 | +29 | class SubscriptList(list[str]): +note: This is an unsafe fix and may change runtime behavior FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` instead --> FURB189.py:29:21 @@ -118,13 +114,12 @@ FURB189 [*] Subclassing `list` can be error prone, use `collections.UserList` in 30 | pass | help: Replace with `collections.UserList` - -ℹ Unsafe fix -26 26 | class SubscriptDict(dict[str, str]): -27 27 | pass -28 28 | -29 |-class SubscriptList(list[str]): - 29 |+class SubscriptList(UL[str]): -30 30 | pass -31 31 | -32 32 | # currently not detected +26 | class SubscriptDict(dict[str, str]): +27 | pass +28 | + - class SubscriptList(list[str]): +29 + class SubscriptList(UL[str]): +30 | pass +31 | +32 | # currently not detected +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap index 8db1953f8f..120e2db30f 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__FURB192_FURB192.py.snap @@ -12,15 +12,13 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque 5 | sorted(l)[-1] | help: Replace with `min` - -ℹ Safe fix -1 1 | # Errors -2 2 | -3 |-sorted(l)[0] - 3 |+min(l) -4 4 | -5 5 | sorted(l)[-1] -6 6 | +1 | # Errors +2 | + - sorted(l)[0] +3 + min(l) +4 | +5 | sorted(l)[-1] +6 | FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a sequence --> FURB192.py:5:1 @@ -33,16 +31,14 @@ FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a seque 7 | sorted(l, reverse=False)[-1] | help: Replace with `max` - -ℹ Safe fix -2 2 | -3 3 | sorted(l)[0] -4 4 | -5 |-sorted(l)[-1] - 5 |+max(l) -6 6 | -7 7 | sorted(l, reverse=False)[-1] -8 8 | +2 | +3 | sorted(l)[0] +4 | + - sorted(l)[-1] +5 + max(l) +6 | +7 | sorted(l, reverse=False)[-1] +8 | FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a sequence --> FURB192.py:7:1 @@ -55,16 +51,14 @@ FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a seque 9 | sorted(l, key=lambda x: x)[0] | help: Replace with `max` - -ℹ Safe fix -4 4 | -5 5 | sorted(l)[-1] -6 6 | -7 |-sorted(l, reverse=False)[-1] - 7 |+max(l) -8 8 | -9 9 | sorted(l, key=lambda x: x)[0] -10 10 | +4 | +5 | sorted(l)[-1] +6 | + - sorted(l, reverse=False)[-1] +7 + max(l) +8 | +9 | sorted(l, key=lambda x: x)[0] +10 | FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence --> FURB192.py:9:1 @@ -77,16 +71,14 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque 11 | sorted(l, key=key_fn)[0] | help: Replace with `min` - -ℹ Safe fix -6 6 | -7 7 | sorted(l, reverse=False)[-1] -8 8 | -9 |-sorted(l, key=lambda x: x)[0] - 9 |+min(l, key=lambda x: x) -10 10 | -11 11 | sorted(l, key=key_fn)[0] -12 12 | +6 | +7 | sorted(l, reverse=False)[-1] +8 | + - sorted(l, key=lambda x: x)[0] +9 + min(l, key=lambda x: x) +10 | +11 | sorted(l, key=key_fn)[0] +12 | FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence --> FURB192.py:11:1 @@ -99,16 +91,14 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque 13 | sorted([1, 2, 3])[0] | help: Replace with `min` - -ℹ Safe fix -8 8 | -9 9 | sorted(l, key=lambda x: x)[0] -10 10 | -11 |-sorted(l, key=key_fn)[0] - 11 |+min(l, key=key_fn) -12 12 | -13 13 | sorted([1, 2, 3])[0] -14 14 | +8 | +9 | sorted(l, key=lambda x: x)[0] +10 | + - sorted(l, key=key_fn)[0] +11 + min(l, key=key_fn) +12 | +13 | sorted([1, 2, 3])[0] +14 | FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence --> FURB192.py:13:1 @@ -121,16 +111,14 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque 15 | # Unsafe | help: Replace with `min` - -ℹ Safe fix -10 10 | -11 11 | sorted(l, key=key_fn)[0] -12 12 | -13 |-sorted([1, 2, 3])[0] - 13 |+min([1, 2, 3]) -14 14 | -15 15 | # Unsafe -16 16 | +10 | +11 | sorted(l, key=key_fn)[0] +12 | + - sorted([1, 2, 3])[0] +13 + min([1, 2, 3]) +14 | +15 | # Unsafe +16 | FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence --> FURB192.py:17:1 @@ -143,16 +131,15 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque 19 | sorted(l, reverse=True)[0] | help: Replace with `min` - -ℹ Unsafe fix -14 14 | -15 15 | # Unsafe -16 16 | -17 |-sorted(l, key=key_fn, reverse=True)[-1] - 17 |+min(l, key=key_fn) -18 18 | -19 19 | sorted(l, reverse=True)[0] -20 20 | +14 | +15 | # Unsafe +16 | + - sorted(l, key=key_fn, reverse=True)[-1] +17 + min(l, key=key_fn) +18 | +19 | sorted(l, reverse=True)[0] +20 | +note: This is an unsafe fix and may change runtime behavior FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a sequence --> FURB192.py:19:1 @@ -165,16 +152,15 @@ FURB192 [*] Prefer `max` over `sorted()` to compute the maximum value in a seque 21 | sorted(l, reverse=True)[-1] | help: Replace with `max` - -ℹ Unsafe fix -16 16 | -17 17 | sorted(l, key=key_fn, reverse=True)[-1] -18 18 | -19 |-sorted(l, reverse=True)[0] - 19 |+max(l) -20 20 | -21 21 | sorted(l, reverse=True)[-1] -22 22 | +16 | +17 | sorted(l, key=key_fn, reverse=True)[-1] +18 | + - sorted(l, reverse=True)[0] +19 + max(l) +20 | +21 | sorted(l, reverse=True)[-1] +22 | +note: This is an unsafe fix and may change runtime behavior FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a sequence --> FURB192.py:21:1 @@ -187,13 +173,12 @@ FURB192 [*] Prefer `min` over `sorted()` to compute the minimum value in a seque 23 | # Non-errors | help: Replace with `min` - -ℹ Unsafe fix -18 18 | -19 19 | sorted(l, reverse=True)[0] -20 20 | -21 |-sorted(l, reverse=True)[-1] - 21 |+min(l) -22 22 | -23 23 | # Non-errors -24 24 | +18 | +19 | sorted(l, reverse=True)[0] +20 | + - sorted(l, reverse=True)[-1] +21 + min(l) +22 | +23 | # Non-errors +24 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap index a6796cea74..0175e931f8 100644 --- a/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap +++ b/crates/ruff_linter/src/rules/refurb/snapshots/ruff_linter__rules__refurb__tests__fstring_number_format_python_311.snap @@ -12,16 +12,15 @@ FURB116 Replace `oct` call with `f"{num:o}"` 11 | print(bin(num)[2:]) # FURB116 | help: Replace with `f"{num:o}"` - -ℹ Display-only fix -6 6 | def return_num() -> int: -7 7 | return num -8 8 | -9 |-print(oct(num)[2:]) # FURB116 - 9 |+print(f"{num:o}") # FURB116 -10 10 | print(hex(num)[2:]) # FURB116 -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | +6 | def return_num() -> int: +7 | return num +8 | + - print(oct(num)[2:]) # FURB116 +9 + print(f"{num:o}") # FURB116 +10 | print(hex(num)[2:]) # FURB116 +11 | print(bin(num)[2:]) # FURB116 +12 | +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `hex` call with `f"{num:x}"` --> FURB116.py:10:7 @@ -32,16 +31,15 @@ FURB116 Replace `hex` call with `f"{num:x}"` 11 | print(bin(num)[2:]) # FURB116 | help: Replace with `f"{num:x}"` - -ℹ Display-only fix -7 7 | return num -8 8 | -9 9 | print(oct(num)[2:]) # FURB116 -10 |-print(hex(num)[2:]) # FURB116 - 10 |+print(f"{num:x}") # FURB116 -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 +7 | return num +8 | +9 | print(oct(num)[2:]) # FURB116 + - print(hex(num)[2:]) # FURB116 +10 + print(f"{num:x}") # FURB116 +11 | print(bin(num)[2:]) # FURB116 +12 | +13 | print(oct(1337)[2:]) # FURB116 +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with `f"{num:b}"` --> FURB116.py:11:7 @@ -54,16 +52,15 @@ FURB116 Replace `bin` call with `f"{num:b}"` 13 | print(oct(1337)[2:]) # FURB116 | help: Replace with `f"{num:b}"` - -ℹ Display-only fix -8 8 | -9 9 | print(oct(num)[2:]) # FURB116 -10 10 | print(hex(num)[2:]) # FURB116 -11 |-print(bin(num)[2:]) # FURB116 - 11 |+print(f"{num:b}") # FURB116 -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 +8 | +9 | print(oct(num)[2:]) # FURB116 +10 | print(hex(num)[2:]) # FURB116 + - print(bin(num)[2:]) # FURB116 +11 + print(f"{num:b}") # FURB116 +12 | +13 | print(oct(1337)[2:]) # FURB116 +14 | print(hex(1337)[2:]) # FURB116 +note: This is a display-only fix and is likely to be incorrect FURB116 [*] Replace `oct` call with `f"{1337:o}"` --> FURB116.py:13:7 @@ -76,16 +73,14 @@ FURB116 [*] Replace `oct` call with `f"{1337:o}"` 15 | print(bin(1337)[2:]) # FURB116 | help: Replace with `f"{1337:o}"` - -ℹ Safe fix -10 10 | print(hex(num)[2:]) # FURB116 -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | -13 |-print(oct(1337)[2:]) # FURB116 - 13 |+print(f"{1337:o}") # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 -15 15 | print(bin(1337)[2:]) # FURB116 -16 16 | print(bin(+1337)[2:]) # FURB116 +10 | print(hex(num)[2:]) # FURB116 +11 | print(bin(num)[2:]) # FURB116 +12 | + - print(oct(1337)[2:]) # FURB116 +13 + print(f"{1337:o}") # FURB116 +14 | print(hex(1337)[2:]) # FURB116 +15 | print(bin(1337)[2:]) # FURB116 +16 | print(bin(+1337)[2:]) # FURB116 FURB116 [*] Replace `hex` call with `f"{1337:x}"` --> FURB116.py:14:7 @@ -97,16 +92,14 @@ FURB116 [*] Replace `hex` call with `f"{1337:x}"` 16 | print(bin(+1337)[2:]) # FURB116 | help: Replace with `f"{1337:x}"` - -ℹ Safe fix -11 11 | print(bin(num)[2:]) # FURB116 -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 -14 |-print(hex(1337)[2:]) # FURB116 - 14 |+print(f"{1337:x}") # FURB116 -15 15 | print(bin(1337)[2:]) # FURB116 -16 16 | print(bin(+1337)[2:]) # FURB116 -17 17 | +11 | print(bin(num)[2:]) # FURB116 +12 | +13 | print(oct(1337)[2:]) # FURB116 + - print(hex(1337)[2:]) # FURB116 +14 + print(f"{1337:x}") # FURB116 +15 | print(bin(1337)[2:]) # FURB116 +16 | print(bin(+1337)[2:]) # FURB116 +17 | FURB116 [*] Replace `bin` call with `f"{1337:b}"` --> FURB116.py:15:7 @@ -118,16 +111,14 @@ FURB116 [*] Replace `bin` call with `f"{1337:b}"` 16 | print(bin(+1337)[2:]) # FURB116 | help: Replace with `f"{1337:b}"` - -ℹ Safe fix -12 12 | -13 13 | print(oct(1337)[2:]) # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 -15 |-print(bin(1337)[2:]) # FURB116 - 15 |+print(f"{1337:b}") # FURB116 -16 16 | print(bin(+1337)[2:]) # FURB116 -17 17 | -18 18 | print(bin(return_num())[2:]) # FURB116 (no autofix) +12 | +13 | print(oct(1337)[2:]) # FURB116 +14 | print(hex(1337)[2:]) # FURB116 + - print(bin(1337)[2:]) # FURB116 +15 + print(f"{1337:b}") # FURB116 +16 | print(bin(+1337)[2:]) # FURB116 +17 | +18 | print(bin(return_num())[2:]) # FURB116 (no autofix) FURB116 [*] Replace `bin` call with `f"{+1337:b}"` --> FURB116.py:16:7 @@ -140,16 +131,14 @@ FURB116 [*] Replace `bin` call with `f"{+1337:b}"` 18 | print(bin(return_num())[2:]) # FURB116 (no autofix) | help: Replace with `f"{+1337:b}"` - -ℹ Safe fix -13 13 | print(oct(1337)[2:]) # FURB116 -14 14 | print(hex(1337)[2:]) # FURB116 -15 15 | print(bin(1337)[2:]) # FURB116 -16 |-print(bin(+1337)[2:]) # FURB116 - 16 |+print(f"{+1337:b}") # FURB116 -17 17 | -18 18 | print(bin(return_num())[2:]) # FURB116 (no autofix) -19 19 | print(bin(int(f"{num}"))[2:]) # FURB116 (no autofix) +13 | print(oct(1337)[2:]) # FURB116 +14 | print(hex(1337)[2:]) # FURB116 +15 | print(bin(1337)[2:]) # FURB116 + - print(bin(+1337)[2:]) # FURB116 +16 + print(f"{+1337:b}") # FURB116 +17 | +18 | print(bin(return_num())[2:]) # FURB116 (no autofix) +19 | print(bin(int(f"{num}"))[2:]) # FURB116 (no autofix) FURB116 Replace `bin` call with f-string --> FURB116.py:18:7 @@ -184,16 +173,15 @@ FURB116 Replace `bin` call with `f"{d:b}"` 34 | print(bin(len("xyz").numerator)[2:]) | help: Replace with `f"{d:b}"` - -ℹ Display-only fix -29 29 | -30 30 | d = datetime.datetime.now(tz=datetime.UTC) -31 31 | # autofix is display-only -32 |-print(bin(d)[2:]) - 32 |+print(f"{d:b}") -33 33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error -34 34 | print(bin(len("xyz").numerator)[2:]) -35 35 | +29 | +30 | d = datetime.datetime.now(tz=datetime.UTC) +31 | # autofix is display-only + - print(bin(d)[2:]) +32 + print(f"{d:b}") +33 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error +34 | print(bin(len("xyz").numerator)[2:]) +35 | +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with f-string --> FURB116.py:34:7 @@ -217,16 +205,15 @@ FURB116 Replace `bin` call with `f"{ {0: 1}[0].numerator:b}"` 39 | print(bin(ord("\\").numerator)[2:]) | help: Replace with `f"{ {0: 1}[0].numerator:b}"` - -ℹ Display-only fix -34 34 | print(bin(len("xyz").numerator)[2:]) -35 35 | -36 36 | # autofix is display-only -37 |-print(bin({0: 1}[0].numerator)[2:]) - 37 |+print(f"{ {0: 1}[0].numerator:b}") -38 38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error -39 39 | print(bin(ord("\\").numerator)[2:]) -40 40 | print(hex(sys +34 | print(bin(len("xyz").numerator)[2:]) +35 | +36 | # autofix is display-only + - print(bin({0: 1}[0].numerator)[2:]) +37 + print(f"{ {0: 1}[0].numerator:b}") +38 | # no autofix for Python 3.11 and earlier, as it introduces a syntax error +39 | print(bin(ord("\\").numerator)[2:]) +40 | print(hex(sys +note: This is a display-only fix and is likely to be incorrect FURB116 Replace `bin` call with f-string --> FURB116.py:39:7 @@ -262,10 +249,9 @@ FURB116 Replace `bin` call with `f"{-1:b}"` | ^^^^^^^^^^^ | help: Replace with `f"{-1:b}"` - -ℹ Display-only fix -41 41 | .maxunicode)[2:]) -42 42 | -43 43 | # for negatives numbers autofix is display-only -44 |-print(bin(-1)[2:]) - 44 |+print(f"{-1:b}") +41 | .maxunicode)[2:]) +42 | +43 | # for negatives numbers autofix is display-only + - print(bin(-1)[2:]) +44 + print(f"{-1:b}") +note: This is a display-only fix and is likely to be incorrect diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap index b72fdd934e..d420f81376 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_0.py.snap @@ -9,16 +9,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 21 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -17 17 | pass -18 18 | -19 19 | -20 |-def f(arg: int = None): # RUF013 - 20 |+def f(arg: Optional[int] = None): # RUF013 -21 21 | pass -22 22 | -23 23 | +17 | pass +18 | +19 | + - def f(arg: int = None): # RUF013 +20 + def f(arg: Optional[int] = None): # RUF013 +21 | pass +22 | +23 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:24:12 @@ -28,16 +27,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 25 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -21 21 | pass -22 22 | -23 23 | -24 |-def f(arg: str = None): # RUF013 - 24 |+def f(arg: Optional[str] = None): # RUF013 -25 25 | pass -26 26 | -27 27 | +21 | pass +22 | +23 | + - def f(arg: str = None): # RUF013 +24 + def f(arg: Optional[str] = None): # RUF013 +25 | pass +26 | +27 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:28:12 @@ -47,16 +45,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 29 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -25 25 | pass -26 26 | -27 27 | -28 |-def f(arg: Tuple[str] = None): # RUF013 - 28 |+def f(arg: Optional[Tuple[str]] = None): # RUF013 -29 29 | pass -30 30 | -31 31 | +25 | pass +26 | +27 | + - def f(arg: Tuple[str] = None): # RUF013 +28 + def f(arg: Optional[Tuple[str]] = None): # RUF013 +29 | pass +30 | +31 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:58:12 @@ -66,16 +63,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 59 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -55 55 | pass -56 56 | -57 57 | -58 |-def f(arg: Union = None): # RUF013 - 58 |+def f(arg: Optional[Union] = None): # RUF013 -59 59 | pass -60 60 | -61 61 | +55 | pass +56 | +57 | + - def f(arg: Union = None): # RUF013 +58 + def f(arg: Optional[Union] = None): # RUF013 +59 | pass +60 | +61 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:62:12 @@ -85,16 +81,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 63 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -59 59 | pass -60 60 | -61 61 | -62 |-def f(arg: Union[int] = None): # RUF013 - 62 |+def f(arg: Optional[Union[int]] = None): # RUF013 -63 63 | pass -64 64 | -65 65 | +59 | pass +60 | +61 | + - def f(arg: Union[int] = None): # RUF013 +62 + def f(arg: Optional[Union[int]] = None): # RUF013 +63 | pass +64 | +65 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:66:12 @@ -104,16 +99,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 67 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -63 63 | pass -64 64 | -65 65 | -66 |-def f(arg: Union[int, str] = None): # RUF013 - 66 |+def f(arg: Optional[Union[int, str]] = None): # RUF013 -67 67 | pass -68 68 | -69 69 | +63 | pass +64 | +65 | + - def f(arg: Union[int, str] = None): # RUF013 +66 + def f(arg: Optional[Union[int, str]] = None): # RUF013 +67 | pass +68 | +69 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:85:12 @@ -123,16 +117,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 86 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -82 82 | pass -83 83 | -84 84 | -85 |-def f(arg: int | float = None): # RUF013 - 85 |+def f(arg: Optional[int | float] = None): # RUF013 -86 86 | pass -87 87 | -88 88 | +82 | pass +83 | +84 | + - def f(arg: int | float = None): # RUF013 +85 + def f(arg: Optional[int | float] = None): # RUF013 +86 | pass +87 | +88 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:89:12 @@ -142,16 +135,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 90 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -86 86 | pass -87 87 | -88 88 | -89 |-def f(arg: int | float | str | bytes = None): # RUF013 - 89 |+def f(arg: Optional[int | float | str | bytes] = None): # RUF013 -90 90 | pass -91 91 | -92 92 | +86 | pass +87 | +88 | + - def f(arg: int | float | str | bytes = None): # RUF013 +89 + def f(arg: Optional[int | float | str | bytes] = None): # RUF013 +90 | pass +91 | +92 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:108:12 @@ -161,16 +153,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 109 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -105 105 | pass -106 106 | -107 107 | -108 |-def f(arg: Literal[1] = None): # RUF013 - 108 |+def f(arg: Optional[Literal[1]] = None): # RUF013 -109 109 | pass -110 110 | -111 111 | +105 | pass +106 | +107 | + - def f(arg: Literal[1] = None): # RUF013 +108 + def f(arg: Optional[Literal[1]] = None): # RUF013 +109 | pass +110 | +111 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:112:12 @@ -180,16 +171,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 113 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -109 109 | pass -110 110 | -111 111 | -112 |-def f(arg: Literal[1, "foo"] = None): # RUF013 - 112 |+def f(arg: Optional[Literal[1, "foo"]] = None): # RUF013 -113 113 | pass -114 114 | -115 115 | +109 | pass +110 | +111 | + - def f(arg: Literal[1, "foo"] = None): # RUF013 +112 + def f(arg: Optional[Literal[1, "foo"]] = None): # RUF013 +113 | pass +114 | +115 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:131:22 @@ -199,16 +189,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 132 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -128 128 | pass -129 129 | -130 130 | -131 |-def f(arg: Annotated[int, ...] = None): # RUF013 - 131 |+def f(arg: Annotated[Optional[int], ...] = None): # RUF013 -132 132 | pass -133 133 | -134 134 | +128 | pass +129 | +130 | + - def f(arg: Annotated[int, ...] = None): # RUF013 +131 + def f(arg: Annotated[Optional[int], ...] = None): # RUF013 +132 | pass +133 | +134 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:135:32 @@ -218,16 +207,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 136 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -132 132 | pass -133 133 | -134 134 | -135 |-def f(arg: Annotated[Annotated[int | str, ...], ...] = None): # RUF013 - 135 |+def f(arg: Annotated[Annotated[Optional[int | str], ...], ...] = None): # RUF013 -136 136 | pass -137 137 | -138 138 | +132 | pass +133 | +134 | + - def f(arg: Annotated[Annotated[int | str, ...], ...] = None): # RUF013 +135 + def f(arg: Annotated[Annotated[Optional[int | str], ...], ...] = None): # RUF013 +136 | pass +137 | +138 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:151:11 @@ -239,16 +227,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 153 | arg3: Literal[1, 2, 3] = None, # RUF013 | help: Convert to `Optional[T]` - -ℹ Unsafe fix -148 148 | -149 149 | -150 150 | def f( -151 |- arg1: int = None, # RUF013 - 151 |+ arg1: Optional[int] = None, # RUF013 -152 152 | arg2: Union[int, float] = None, # RUF013 -153 153 | arg3: Literal[1, 2, 3] = None, # RUF013 -154 154 | ): +148 | +149 | +150 | def f( + - arg1: int = None, # RUF013 +151 + arg1: Optional[int] = None, # RUF013 +152 | arg2: Union[int, float] = None, # RUF013 +153 | arg3: Literal[1, 2, 3] = None, # RUF013 +154 | ): +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:152:11 @@ -261,16 +248,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 154 | ): | help: Convert to `Optional[T]` - -ℹ Unsafe fix -149 149 | -150 150 | def f( -151 151 | arg1: int = None, # RUF013 -152 |- arg2: Union[int, float] = None, # RUF013 - 152 |+ arg2: Optional[Union[int, float]] = None, # RUF013 -153 153 | arg3: Literal[1, 2, 3] = None, # RUF013 -154 154 | ): -155 155 | pass +149 | +150 | def f( +151 | arg1: int = None, # RUF013 + - arg2: Union[int, float] = None, # RUF013 +152 + arg2: Optional[Union[int, float]] = None, # RUF013 +153 | arg3: Literal[1, 2, 3] = None, # RUF013 +154 | ): +155 | pass +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:153:11 @@ -283,16 +269,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 155 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -150 150 | def f( -151 151 | arg1: int = None, # RUF013 -152 152 | arg2: Union[int, float] = None, # RUF013 -153 |- arg3: Literal[1, 2, 3] = None, # RUF013 - 153 |+ arg3: Optional[Literal[1, 2, 3]] = None, # RUF013 -154 154 | ): -155 155 | pass -156 156 | +150 | def f( +151 | arg1: int = None, # RUF013 +152 | arg2: Union[int, float] = None, # RUF013 + - arg3: Literal[1, 2, 3] = None, # RUF013 +153 + arg3: Optional[Literal[1, 2, 3]] = None, # RUF013 +154 | ): +155 | pass +156 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:181:12 @@ -302,16 +287,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 182 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -178 178 | pass -179 179 | -180 180 | -181 |-def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None): # RUF013 - 181 |+def f(arg: Optional[Union[Annotated[int, ...], Union[str, bytes]]] = None): # RUF013 -182 182 | pass -183 183 | -184 184 | +178 | pass +179 | +180 | + - def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None): # RUF013 +181 + def f(arg: Optional[Union[Annotated[int, ...], Union[str, bytes]]] = None): # RUF013 +182 | pass +183 | +184 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:188:13 @@ -321,16 +305,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 189 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -185 185 | # Quoted -186 186 | -187 187 | -188 |-def f(arg: "int" = None): # RUF013 - 188 |+def f(arg: "Optional[int]" = None): # RUF013 -189 189 | pass -190 190 | -191 191 | +185 | # Quoted +186 | +187 | + - def f(arg: "int" = None): # RUF013 +188 + def f(arg: "Optional[int]" = None): # RUF013 +189 | pass +190 | +191 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:192:13 @@ -340,16 +323,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 193 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -189 189 | pass -190 190 | -191 191 | -192 |-def f(arg: "str" = None): # RUF013 - 192 |+def f(arg: "Optional[str]" = None): # RUF013 -193 193 | pass -194 194 | -195 195 | +189 | pass +190 | +191 | + - def f(arg: "str" = None): # RUF013 +192 + def f(arg: "Optional[str]" = None): # RUF013 +193 | pass +194 | +195 | +note: This is an unsafe fix and may change runtime behavior RUF013 PEP 484 prohibits implicit `Optional` --> RUF013_0.py:196:12 @@ -368,13 +350,12 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 205 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -201 201 | pass -202 202 | -203 203 | -204 |-def f(arg: Union["int", "str"] = None): # RUF013 - 204 |+def f(arg: Optional[Union["int", "str"]] = None): # RUF013 -205 205 | pass -206 206 | -207 207 | +201 | pass +202 | +203 | + - def f(arg: Union["int", "str"] = None): # RUF013 +204 + def f(arg: Optional[Union["int", "str"]] = None): # RUF013 +205 | pass +206 | +207 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap index 05e593b1d1..63e5b089eb 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__PY39_RUF013_RUF013_1.py.snap @@ -9,12 +9,11 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 5 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -1 1 | # No `typing.Optional` import - 2 |+from typing import Optional -2 3 | -3 4 | -4 |-def f(arg: int = None): # RUF013 - 5 |+def f(arg: Optional[int] = None): # RUF013 -5 6 | pass +1 | # No `typing.Optional` import +2 + from typing import Optional +3 | +4 | + - def f(arg: int = None): # RUF013 +5 + def f(arg: Optional[int] = None): # RUF013 +6 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap index e9c0fc8f02..83ecad8d84 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005.py.snap @@ -55,16 +55,15 @@ RUF005 [*] Consider `[1, 2, 3, *foo]` instead of concatenation 41 | quux = (7, 8, 9) + zoob | help: Replace with `[1, 2, 3, *foo]` - -ℹ Unsafe fix -36 36 | yay = Fun().yay -37 37 | -38 38 | foo = [4, 5, 6] -39 |-bar = [1, 2, 3] + foo - 39 |+bar = [1, 2, 3, *foo] -40 40 | zoob = tuple(bar) -41 41 | quux = (7, 8, 9) + zoob -42 42 | spam = quux + (10, 11, 12) +36 | yay = Fun().yay +37 | +38 | foo = [4, 5, 6] + - bar = [1, 2, 3] + foo +39 + bar = [1, 2, 3, *foo] +40 | zoob = tuple(bar) +41 | quux = (7, 8, 9) + zoob +42 | spam = quux + (10, 11, 12) +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `(7, 8, 9, *zoob)` instead of concatenation --> RUF005.py:41:8 @@ -77,16 +76,15 @@ RUF005 [*] Consider `(7, 8, 9, *zoob)` instead of concatenation 43 | spom = list(spam) | help: Replace with `(7, 8, 9, *zoob)` - -ℹ Unsafe fix -38 38 | foo = [4, 5, 6] -39 39 | bar = [1, 2, 3] + foo -40 40 | zoob = tuple(bar) -41 |-quux = (7, 8, 9) + zoob - 41 |+quux = (7, 8, 9, *zoob) -42 42 | spam = quux + (10, 11, 12) -43 43 | spom = list(spam) -44 44 | eggs = spom + [13, 14, 15] +38 | foo = [4, 5, 6] +39 | bar = [1, 2, 3] + foo +40 | zoob = tuple(bar) + - quux = (7, 8, 9) + zoob +41 + quux = (7, 8, 9, *zoob) +42 | spam = quux + (10, 11, 12) +43 | spom = list(spam) +44 | eggs = spom + [13, 14, 15] +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `(*quux, 10, 11, 12)` instead of concatenation --> RUF005.py:42:8 @@ -99,16 +97,15 @@ RUF005 [*] Consider `(*quux, 10, 11, 12)` instead of concatenation 44 | eggs = spom + [13, 14, 15] | help: Replace with `(*quux, 10, 11, 12)` - -ℹ Unsafe fix -39 39 | bar = [1, 2, 3] + foo -40 40 | zoob = tuple(bar) -41 41 | quux = (7, 8, 9) + zoob -42 |-spam = quux + (10, 11, 12) - 42 |+spam = (*quux, 10, 11, 12) -43 43 | spom = list(spam) -44 44 | eggs = spom + [13, 14, 15] -45 45 | elatement = ("we all say",) + yay() +39 | bar = [1, 2, 3] + foo +40 | zoob = tuple(bar) +41 | quux = (7, 8, 9) + zoob + - spam = quux + (10, 11, 12) +42 + spam = (*quux, 10, 11, 12) +43 | spom = list(spam) +44 | eggs = spom + [13, 14, 15] +45 | elatement = ("we all say",) + yay() +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[*spom, 13, 14, 15]` instead of concatenation --> RUF005.py:44:8 @@ -121,16 +118,15 @@ RUF005 [*] Consider `[*spom, 13, 14, 15]` instead of concatenation 46 | excitement = ("we all think",) + Fun().yay() | help: Replace with `[*spom, 13, 14, 15]` - -ℹ Unsafe fix -41 41 | quux = (7, 8, 9) + zoob -42 42 | spam = quux + (10, 11, 12) -43 43 | spom = list(spam) -44 |-eggs = spom + [13, 14, 15] - 44 |+eggs = [*spom, 13, 14, 15] -45 45 | elatement = ("we all say",) + yay() -46 46 | excitement = ("we all think",) + Fun().yay() -47 47 | astonishment = ("we all feel",) + Fun.words +41 | quux = (7, 8, 9) + zoob +42 | spam = quux + (10, 11, 12) +43 | spom = list(spam) + - eggs = spom + [13, 14, 15] +44 + eggs = [*spom, 13, 14, 15] +45 | elatement = ("we all say",) + yay() +46 | excitement = ("we all think",) + Fun().yay() +47 | astonishment = ("we all feel",) + Fun.words +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `("we all say", *yay())` instead of concatenation --> RUF005.py:45:13 @@ -143,16 +139,15 @@ RUF005 [*] Consider `("we all say", *yay())` instead of concatenation 47 | astonishment = ("we all feel",) + Fun.words | help: Replace with `("we all say", *yay())` - -ℹ Unsafe fix -42 42 | spam = quux + (10, 11, 12) -43 43 | spom = list(spam) -44 44 | eggs = spom + [13, 14, 15] -45 |-elatement = ("we all say",) + yay() - 45 |+elatement = ("we all say", *yay()) -46 46 | excitement = ("we all think",) + Fun().yay() -47 47 | astonishment = ("we all feel",) + Fun.words -48 48 | +42 | spam = quux + (10, 11, 12) +43 | spom = list(spam) +44 | eggs = spom + [13, 14, 15] + - elatement = ("we all say",) + yay() +45 + elatement = ("we all say", *yay()) +46 | excitement = ("we all think",) + Fun().yay() +47 | astonishment = ("we all feel",) + Fun.words +48 | +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `("we all think", *Fun().yay())` instead of concatenation --> RUF005.py:46:14 @@ -164,16 +159,15 @@ RUF005 [*] Consider `("we all think", *Fun().yay())` instead of concatenation 47 | astonishment = ("we all feel",) + Fun.words | help: Replace with `("we all think", *Fun().yay())` - -ℹ Unsafe fix -43 43 | spom = list(spam) -44 44 | eggs = spom + [13, 14, 15] -45 45 | elatement = ("we all say",) + yay() -46 |-excitement = ("we all think",) + Fun().yay() - 46 |+excitement = ("we all think", *Fun().yay()) -47 47 | astonishment = ("we all feel",) + Fun.words -48 48 | -49 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) +43 | spom = list(spam) +44 | eggs = spom + [13, 14, 15] +45 | elatement = ("we all say",) + yay() + - excitement = ("we all think",) + Fun().yay() +46 + excitement = ("we all think", *Fun().yay()) +47 | astonishment = ("we all feel",) + Fun.words +48 | +49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `("we all feel", *Fun.words)` instead of concatenation --> RUF005.py:47:16 @@ -186,16 +180,15 @@ RUF005 [*] Consider `("we all feel", *Fun.words)` instead of concatenation 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) | help: Replace with `("we all feel", *Fun.words)` - -ℹ Unsafe fix -44 44 | eggs = spom + [13, 14, 15] -45 45 | elatement = ("we all say",) + yay() -46 46 | excitement = ("we all think",) + Fun().yay() -47 |-astonishment = ("we all feel",) + Fun.words - 47 |+astonishment = ("we all feel", *Fun.words) -48 48 | -49 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) -50 50 | +44 | eggs = spom + [13, 14, 15] +45 | elatement = ("we all say",) + yay() +46 | excitement = ("we all think",) + Fun().yay() + - astonishment = ("we all feel",) + Fun.words +47 + astonishment = ("we all feel", *Fun.words) +48 | +49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) +50 | +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider iterable unpacking instead of concatenation --> RUF005.py:49:9 @@ -208,16 +201,15 @@ RUF005 [*] Consider iterable unpacking instead of concatenation 51 | baz = () + zoob | help: Replace with iterable unpacking - -ℹ Unsafe fix -46 46 | excitement = ("we all think",) + Fun().yay() -47 47 | astonishment = ("we all feel",) + Fun.words -48 48 | -49 |-chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) - 49 |+chain = ["a", "b", "c", *eggs, *list(("yes", "no", "pants") + zoob)] -50 50 | -51 51 | baz = () + zoob -52 52 | +46 | excitement = ("we all think",) + Fun().yay() +47 | astonishment = ("we all feel",) + Fun.words +48 | + - chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) +49 + chain = ["a", "b", "c", *eggs, *list(("yes", "no", "pants") + zoob)] +50 | +51 | baz = () + zoob +52 | +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `("yes", "no", "pants", *zoob)` instead of concatenation --> RUF005.py:49:39 @@ -230,16 +222,15 @@ RUF005 [*] Consider `("yes", "no", "pants", *zoob)` instead of concatenation 51 | baz = () + zoob | help: Replace with `("yes", "no", "pants", *zoob)` - -ℹ Unsafe fix -46 46 | excitement = ("we all think",) + Fun().yay() -47 47 | astonishment = ("we all feel",) + Fun.words -48 48 | -49 |-chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) - 49 |+chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants", *zoob)) -50 50 | -51 51 | baz = () + zoob -52 52 | +46 | excitement = ("we all think",) + Fun().yay() +47 | astonishment = ("we all feel",) + Fun.words +48 | + - chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) +49 + chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants", *zoob)) +50 | +51 | baz = () + zoob +52 | +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `(*zoob,)` instead of concatenation --> RUF005.py:51:7 @@ -252,16 +243,15 @@ RUF005 [*] Consider `(*zoob,)` instead of concatenation 53 | [] + foo + [ | help: Replace with `(*zoob,)` - -ℹ Unsafe fix -48 48 | -49 49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) -50 50 | -51 |-baz = () + zoob - 51 |+baz = (*zoob,) -52 52 | -53 53 | [] + foo + [ -54 54 | ] +48 | +49 | chain = ["a", "b", "c"] + eggs + list(("yes", "no", "pants") + zoob) +50 | + - baz = () + zoob +51 + baz = (*zoob,) +52 | +53 | [] + foo + [ +54 | ] +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[*foo]` instead of concatenation --> RUF005.py:53:1 @@ -275,17 +265,16 @@ RUF005 [*] Consider `[*foo]` instead of concatenation 56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path] | help: Replace with `[*foo]` - -ℹ Unsafe fix -50 50 | -51 51 | baz = () + zoob -52 52 | -53 |-[] + foo + [ -54 |-] - 53 |+[*foo] -55 54 | -56 55 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path] -57 56 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) +50 | +51 | baz = () + zoob +52 | + - [] + foo + [ + - ] +53 + [*foo] +54 | +55 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path] +56 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[sys.executable, "-m", "pylint", *args, path]` instead of concatenation --> RUF005.py:56:15 @@ -298,16 +287,15 @@ RUF005 [*] Consider `[sys.executable, "-m", "pylint", *args, path]` instead of c 58 | b = a + [2, 3] + [4] | help: Replace with `[sys.executable, "-m", "pylint", *args, path]` - -ℹ Unsafe fix -53 53 | [] + foo + [ -54 54 | ] -55 55 | -56 |-pylint_call = [sys.executable, "-m", "pylint"] + args + [path] - 56 |+pylint_call = [sys.executable, "-m", "pylint", *args, path] -57 57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) -58 58 | b = a + [2, 3] + [4] -59 59 | +53 | [] + foo + [ +54 | ] +55 | + - pylint_call = [sys.executable, "-m", "pylint"] + args + [path] +56 + pylint_call = [sys.executable, "-m", "pylint", *args, path] +57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) +58 | b = a + [2, 3] + [4] +59 | +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider iterable unpacking instead of concatenation --> RUF005.py:57:21 @@ -318,16 +306,15 @@ RUF005 [*] Consider iterable unpacking instead of concatenation 58 | b = a + [2, 3] + [4] | help: Replace with iterable unpacking - -ℹ Unsafe fix -54 54 | ] -55 55 | -56 56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path] -57 |-pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) - 57 |+pylint_call_tuple = (sys.executable, "-m", "pylint", *args, path, path2) -58 58 | b = a + [2, 3] + [4] -59 59 | -60 60 | # Uses the non-preferred quote style, which should be retained. +54 | ] +55 | +56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path] + - pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) +57 + pylint_call_tuple = (sys.executable, "-m", "pylint", *args, path, path2) +58 | b = a + [2, 3] + [4] +59 | +60 | # Uses the non-preferred quote style, which should be retained. +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[*a, 2, 3, 4]` instead of concatenation --> RUF005.py:58:5 @@ -340,16 +327,15 @@ RUF005 [*] Consider `[*a, 2, 3, 4]` instead of concatenation 60 | # Uses the non-preferred quote style, which should be retained. | help: Replace with `[*a, 2, 3, 4]` - -ℹ Unsafe fix -55 55 | -56 56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path] -57 57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) -58 |-b = a + [2, 3] + [4] - 58 |+b = [*a, 2, 3, 4] -59 59 | -60 60 | # Uses the non-preferred quote style, which should be retained. -61 61 | f"{a() + ['b']}" +55 | +56 | pylint_call = [sys.executable, "-m", "pylint"] + args + [path] +57 | pylint_call_tuple = (sys.executable, "-m", "pylint") + args + (path, path2) + - b = a + [2, 3] + [4] +58 + b = [*a, 2, 3, 4] +59 | +60 | # Uses the non-preferred quote style, which should be retained. +61 | f"{a() + ['b']}" +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[*a(), 'b']` instead of concatenation --> RUF005.py:61:4 @@ -361,13 +347,12 @@ RUF005 [*] Consider `[*a(), 'b']` instead of concatenation 63 | ### | help: Replace with `[*a(), 'b']` - -ℹ Unsafe fix -58 58 | b = a + [2, 3] + [4] -59 59 | -60 60 | # Uses the non-preferred quote style, which should be retained. -61 |-f"{a() + ['b']}" - 61 |+f"{[*a(), 'b']}" -62 62 | -63 63 | ### -64 64 | # Non-errors. +58 | b = a + [2, 3] + [4] +59 | +60 | # Uses the non-preferred quote style, which should be retained. + - f"{a() + ['b']}" +61 + f"{[*a(), 'b']}" +62 | +63 | ### +64 | # Non-errors. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap index 3b32b1c582..e304a88615 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF005_RUF005_slices.py.snap @@ -11,14 +11,13 @@ RUF005 [*] Consider `[1, 2, 3, *foo]` instead of concatenation 4 | slicing2 = [7, 8, 9] + bar[1:] | help: Replace with `[1, 2, 3, *foo]` - -ℹ Unsafe fix -1 1 | foo = [4, 5, 6] -2 |-bar = [1, 2, 3] + foo - 2 |+bar = [1, 2, 3, *foo] -3 3 | slicing1 = foo[:1] + [7, 8, 9] -4 4 | slicing2 = [7, 8, 9] + bar[1:] -5 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:] +1 | foo = [4, 5, 6] + - bar = [1, 2, 3] + foo +2 + bar = [1, 2, 3, *foo] +3 | slicing1 = foo[:1] + [7, 8, 9] +4 | slicing2 = [7, 8, 9] + bar[1:] +5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:] +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[*foo[:1], 7, 8, 9]` instead of concatenation --> RUF005_slices.py:3:12 @@ -31,15 +30,14 @@ RUF005 [*] Consider `[*foo[:1], 7, 8, 9]` instead of concatenation 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:] | help: Replace with `[*foo[:1], 7, 8, 9]` - -ℹ Unsafe fix -1 1 | foo = [4, 5, 6] -2 2 | bar = [1, 2, 3] + foo -3 |-slicing1 = foo[:1] + [7, 8, 9] - 3 |+slicing1 = [*foo[:1], 7, 8, 9] -4 4 | slicing2 = [7, 8, 9] + bar[1:] -5 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:] -6 6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. +1 | foo = [4, 5, 6] +2 | bar = [1, 2, 3] + foo + - slicing1 = foo[:1] + [7, 8, 9] +3 + slicing1 = [*foo[:1], 7, 8, 9] +4 | slicing2 = [7, 8, 9] + bar[1:] +5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:] +6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[7, 8, 9, *bar[1:]]` instead of concatenation --> RUF005_slices.py:4:12 @@ -52,15 +50,14 @@ RUF005 [*] Consider `[7, 8, 9, *bar[1:]]` instead of concatenation 6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. | help: Replace with `[7, 8, 9, *bar[1:]]` - -ℹ Unsafe fix -1 1 | foo = [4, 5, 6] -2 2 | bar = [1, 2, 3] + foo -3 3 | slicing1 = foo[:1] + [7, 8, 9] -4 |-slicing2 = [7, 8, 9] + bar[1:] - 4 |+slicing2 = [7, 8, 9, *bar[1:]] -5 5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:] -6 6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. +1 | foo = [4, 5, 6] +2 | bar = [1, 2, 3] + foo +3 | slicing1 = foo[:1] + [7, 8, 9] + - slicing2 = [7, 8, 9] + bar[1:] +4 + slicing2 = [7, 8, 9, *bar[1:]] +5 | slicing3 = foo[:1] + [7, 8, 9] + bar[1:] +6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. +note: This is an unsafe fix and may change runtime behavior RUF005 [*] Consider `[*foo[:1], 7, 8, 9, *bar[1:]]` instead of concatenation --> RUF005_slices.py:5:12 @@ -72,11 +69,10 @@ RUF005 [*] Consider `[*foo[:1], 7, 8, 9, *bar[1:]]` instead of concatenation 6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. | help: Replace with `[*foo[:1], 7, 8, 9, *bar[1:]]` - -ℹ Unsafe fix -2 2 | bar = [1, 2, 3] + foo -3 3 | slicing1 = foo[:1] + [7, 8, 9] -4 4 | slicing2 = [7, 8, 9] + bar[1:] -5 |-slicing3 = foo[:1] + [7, 8, 9] + bar[1:] - 5 |+slicing3 = [*foo[:1], 7, 8, 9, *bar[1:]] -6 6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. +2 | bar = [1, 2, 3] + foo +3 | slicing1 = foo[:1] + [7, 8, 9] +4 | slicing2 = [7, 8, 9] + bar[1:] + - slicing3 = foo[:1] + [7, 8, 9] + bar[1:] +5 + slicing3 = [*foo[:1], 7, 8, 9, *bar[1:]] +6 | indexing = foo[0] + [7, 8, 9] + bar[1] # Not changed; looks a little suspect for concatenation. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap index 660348b7da..7fac92db9c 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF007_RUF007.py.snap @@ -11,21 +11,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 18 | zip(input[:-1], input[1:]) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -13 14 | zip(foo[:-1], foo[1:], foo, strict=True) # more than 2 inputs -14 15 | -15 16 | # Errors -16 |-zip(input, input[1:]) - 17 |+itertools.pairwise(input) -17 18 | zip(input, input[1::1]) -18 19 | zip(input[:-1], input[1:]) -19 20 | zip(input[1:], input[2:]) +14 | zip(foo[:-1], foo[1:], foo, strict=True) # more than 2 inputs +15 | +16 | # Errors + - zip(input, input[1:]) +17 + itertools.pairwise(input) +18 | zip(input, input[1::1]) +19 | zip(input[:-1], input[1:]) +20 | zip(input[1:], input[2:]) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:17:1 @@ -38,21 +37,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 19 | zip(input[1:], input[2:]) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -14 15 | -15 16 | # Errors -16 17 | zip(input, input[1:]) -17 |-zip(input, input[1::1]) - 18 |+itertools.pairwise(input) -18 19 | zip(input[:-1], input[1:]) -19 20 | zip(input[1:], input[2:]) -20 21 | zip(input[1:-1], input[2:]) +15 | +16 | # Errors +17 | zip(input, input[1:]) + - zip(input, input[1::1]) +18 + itertools.pairwise(input) +19 | zip(input[:-1], input[1:]) +20 | zip(input[1:], input[2:]) +21 | zip(input[1:-1], input[2:]) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:18:1 @@ -65,21 +63,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 20 | zip(input[1:-1], input[2:]) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -15 16 | # Errors -16 17 | zip(input, input[1:]) -17 18 | zip(input, input[1::1]) -18 |-zip(input[:-1], input[1:]) - 19 |+itertools.pairwise(input) -19 20 | zip(input[1:], input[2:]) -20 21 | zip(input[1:-1], input[2:]) -21 22 | list(zip(input, input[1:])) +16 | # Errors +17 | zip(input, input[1:]) +18 | zip(input, input[1::1]) + - zip(input[:-1], input[1:]) +19 + itertools.pairwise(input) +20 | zip(input[1:], input[2:]) +21 | zip(input[1:-1], input[2:]) +22 | list(zip(input, input[1:])) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:19:1 @@ -92,21 +89,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 21 | list(zip(input, input[1:])) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -16 17 | zip(input, input[1:]) -17 18 | zip(input, input[1::1]) -18 19 | zip(input[:-1], input[1:]) -19 |-zip(input[1:], input[2:]) - 20 |+itertools.pairwise(input) -20 21 | zip(input[1:-1], input[2:]) -21 22 | list(zip(input, input[1:])) -22 23 | list(zip(input[:-1], input[1:])) +17 | zip(input, input[1:]) +18 | zip(input, input[1::1]) +19 | zip(input[:-1], input[1:]) + - zip(input[1:], input[2:]) +20 + itertools.pairwise(input) +21 | zip(input[1:-1], input[2:]) +22 | list(zip(input, input[1:])) +23 | list(zip(input[:-1], input[1:])) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:20:1 @@ -119,21 +115,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 22 | list(zip(input[:-1], input[1:])) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -17 18 | zip(input, input[1::1]) -18 19 | zip(input[:-1], input[1:]) -19 20 | zip(input[1:], input[2:]) -20 |-zip(input[1:-1], input[2:]) - 21 |+itertools.pairwise(input) -21 22 | list(zip(input, input[1:])) -22 23 | list(zip(input[:-1], input[1:])) -23 24 | zip(foo[:-1], foo[1:], strict=True) +18 | zip(input, input[1::1]) +19 | zip(input[:-1], input[1:]) +20 | zip(input[1:], input[2:]) + - zip(input[1:-1], input[2:]) +21 + itertools.pairwise(input) +22 | list(zip(input, input[1:])) +23 | list(zip(input[:-1], input[1:])) +24 | zip(foo[:-1], foo[1:], strict=True) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:21:6 @@ -146,21 +141,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 23 | zip(foo[:-1], foo[1:], strict=True) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -18 19 | zip(input[:-1], input[1:]) -19 20 | zip(input[1:], input[2:]) -20 21 | zip(input[1:-1], input[2:]) -21 |-list(zip(input, input[1:])) - 22 |+list(itertools.pairwise(input)) -22 23 | list(zip(input[:-1], input[1:])) -23 24 | zip(foo[:-1], foo[1:], strict=True) -24 25 | zip(foo[:-1], foo[1:], strict=False) +19 | zip(input[:-1], input[1:]) +20 | zip(input[1:], input[2:]) +21 | zip(input[1:-1], input[2:]) + - list(zip(input, input[1:])) +22 + list(itertools.pairwise(input)) +23 | list(zip(input[:-1], input[1:])) +24 | zip(foo[:-1], foo[1:], strict=True) +25 | zip(foo[:-1], foo[1:], strict=False) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:22:6 @@ -173,21 +167,20 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 24 | zip(foo[:-1], foo[1:], strict=False) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -19 20 | zip(input[1:], input[2:]) -20 21 | zip(input[1:-1], input[2:]) -21 22 | list(zip(input, input[1:])) -22 |-list(zip(input[:-1], input[1:])) - 23 |+list(itertools.pairwise(input)) -23 24 | zip(foo[:-1], foo[1:], strict=True) -24 25 | zip(foo[:-1], foo[1:], strict=False) -25 26 | zip(foo[:-1], foo[1:], strict=bool(foo)) +20 | zip(input[1:], input[2:]) +21 | zip(input[1:-1], input[2:]) +22 | list(zip(input, input[1:])) + - list(zip(input[:-1], input[1:])) +23 + list(itertools.pairwise(input)) +24 | zip(foo[:-1], foo[1:], strict=True) +25 | zip(foo[:-1], foo[1:], strict=False) +26 | zip(foo[:-1], foo[1:], strict=bool(foo)) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:23:1 @@ -200,20 +193,19 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 25 | zip(foo[:-1], foo[1:], strict=bool(foo)) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -20 21 | zip(input[1:-1], input[2:]) -21 22 | list(zip(input, input[1:])) -22 23 | list(zip(input[:-1], input[1:])) -23 |-zip(foo[:-1], foo[1:], strict=True) - 24 |+itertools.pairwise(foo) -24 25 | zip(foo[:-1], foo[1:], strict=False) -25 26 | zip(foo[:-1], foo[1:], strict=bool(foo)) +21 | zip(input[1:-1], input[2:]) +22 | list(zip(input, input[1:])) +23 | list(zip(input[:-1], input[1:])) + - zip(foo[:-1], foo[1:], strict=True) +24 + itertools.pairwise(foo) +25 | zip(foo[:-1], foo[1:], strict=False) +26 | zip(foo[:-1], foo[1:], strict=bool(foo)) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:24:1 @@ -225,19 +217,18 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes 25 | zip(foo[:-1], foo[1:], strict=bool(foo)) | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -21 22 | list(zip(input, input[1:])) -22 23 | list(zip(input[:-1], input[1:])) -23 24 | zip(foo[:-1], foo[1:], strict=True) -24 |-zip(foo[:-1], foo[1:], strict=False) - 25 |+itertools.pairwise(foo) -25 26 | zip(foo[:-1], foo[1:], strict=bool(foo)) +22 | list(zip(input, input[1:])) +23 | list(zip(input[:-1], input[1:])) +24 | zip(foo[:-1], foo[1:], strict=True) + - zip(foo[:-1], foo[1:], strict=False) +25 + itertools.pairwise(foo) +26 | zip(foo[:-1], foo[1:], strict=bool(foo)) +note: This is an unsafe fix and may change runtime behavior RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs --> RUF007.py:25:1 @@ -248,15 +239,14 @@ RUF007 [*] Prefer `itertools.pairwise()` over `zip()` when iterating over succes | ^^^ | help: Replace `zip()` with `itertools.pairwise()` - -ℹ Unsafe fix - 1 |+import itertools -1 2 | input = [1, 2, 3] -2 3 | otherInput = [2, 3, 4] -3 4 | foo = [1, 2, 3, 4] +1 + import itertools +2 | input = [1, 2, 3] +3 | otherInput = [2, 3, 4] +4 | foo = [1, 2, 3, 4] -------------------------------------------------------------------------------- -22 23 | list(zip(input[:-1], input[1:])) -23 24 | zip(foo[:-1], foo[1:], strict=True) -24 25 | zip(foo[:-1], foo[1:], strict=False) -25 |-zip(foo[:-1], foo[1:], strict=bool(foo)) - 26 |+itertools.pairwise(foo) +23 | list(zip(input[:-1], input[1:])) +24 | zip(foo[:-1], foo[1:], strict=True) +25 | zip(foo[:-1], foo[1:], strict=False) + - zip(foo[:-1], foo[1:], strict=bool(foo)) +26 + itertools.pairwise(foo) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap index 0ebd46dd4f..578c619aa0 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF010_RUF010.py.snap @@ -10,16 +10,14 @@ RUF010 [*] Use explicit conversion flag 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -6 6 | pass -7 7 | -8 8 | -9 |-f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 - 9 |+f"{bla!s}, {repr(bla)}, {ascii(bla)}" # RUF010 -10 10 | -11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 -12 12 | +6 | pass +7 | +8 | + - f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 +9 + f"{bla!s}, {repr(bla)}, {ascii(bla)}" # RUF010 +10 | +11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +12 | RUF010 [*] Use explicit conversion flag --> RUF010.py:9:16 @@ -30,16 +28,14 @@ RUF010 [*] Use explicit conversion flag 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -6 6 | pass -7 7 | -8 8 | -9 |-f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 - 9 |+f"{str(bla)}, {bla!r}, {ascii(bla)}" # RUF010 -10 10 | -11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 -12 12 | +6 | pass +7 | +8 | + - f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 +9 + f"{str(bla)}, {bla!r}, {ascii(bla)}" # RUF010 +10 | +11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +12 | RUF010 [*] Use explicit conversion flag --> RUF010.py:9:29 @@ -50,16 +46,14 @@ RUF010 [*] Use explicit conversion flag 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -6 6 | pass -7 7 | -8 8 | -9 |-f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 - 9 |+f"{str(bla)}, {repr(bla)}, {bla!a}" # RUF010 -10 10 | -11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 -12 12 | +6 | pass +7 | +8 | + - f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 +9 + f"{str(bla)}, {repr(bla)}, {bla!a}" # RUF010 +10 | +11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +12 | RUF010 [*] Use explicit conversion flag --> RUF010.py:11:4 @@ -72,16 +66,14 @@ RUF010 [*] Use explicit conversion flag 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -8 8 | -9 9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 -10 10 | -11 |-f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 - 11 |+f"{d['a']!s}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 -12 12 | -13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -14 14 | +8 | +9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 +10 | + - f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +11 + f"{d['a']!s}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +12 | +13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +14 | RUF010 [*] Use explicit conversion flag --> RUF010.py:11:19 @@ -94,16 +86,14 @@ RUF010 [*] Use explicit conversion flag 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -8 8 | -9 9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 -10 10 | -11 |-f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 - 11 |+f"{str(d['a'])}, {d['b']!r}, {ascii(d['c'])}" # RUF010 -12 12 | -13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -14 14 | +8 | +9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 +10 | + - f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +11 + f"{str(d['a'])}, {d['b']!r}, {ascii(d['c'])}" # RUF010 +12 | +13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +14 | RUF010 [*] Use explicit conversion flag --> RUF010.py:11:35 @@ -116,16 +106,14 @@ RUF010 [*] Use explicit conversion flag 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -8 8 | -9 9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 -10 10 | -11 |-f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 - 11 |+f"{str(d['a'])}, {repr(d['b'])}, {d['c']!a}" # RUF010 -12 12 | -13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -14 14 | +8 | +9 | f"{str(bla)}, {repr(bla)}, {ascii(bla)}" # RUF010 +10 | + - f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +11 + f"{str(d['a'])}, {repr(d['b'])}, {d['c']!a}" # RUF010 +12 | +13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +14 | RUF010 [*] Use explicit conversion flag --> RUF010.py:13:5 @@ -138,16 +126,14 @@ RUF010 [*] Use explicit conversion flag 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -10 10 | -11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 -12 12 | -13 |-f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 - 13 |+f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -14 14 | -15 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -16 16 | +10 | +11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +12 | + - f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +13 + f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +14 | +15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +16 | RUF010 [*] Use explicit conversion flag --> RUF010.py:13:19 @@ -160,16 +146,14 @@ RUF010 [*] Use explicit conversion flag 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -10 10 | -11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 -12 12 | -13 |-f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 - 13 |+f"{(str(bla))}, {bla!r}, {(ascii(bla))}" # RUF010 -14 14 | -15 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -16 16 | +10 | +11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +12 | + - f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +13 + f"{(str(bla))}, {bla!r}, {(ascii(bla))}" # RUF010 +14 | +15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +16 | RUF010 [*] Use explicit conversion flag --> RUF010.py:13:34 @@ -182,16 +166,14 @@ RUF010 [*] Use explicit conversion flag 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 | help: Replace with conversion flag - -ℹ Safe fix -10 10 | -11 11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 -12 12 | -13 |-f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 - 13 |+f"{(str(bla))}, {(repr(bla))}, {bla!a}" # RUF010 -14 14 | -15 15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -16 16 | +10 | +11 | f"{str(d['a'])}, {repr(d['b'])}, {ascii(d['c'])}" # RUF010 +12 | + - f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +13 + f"{(str(bla))}, {(repr(bla))}, {bla!a}" # RUF010 +14 | +15 | f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +16 | RUF010 [*] Use explicit conversion flag --> RUF010.py:15:14 @@ -204,16 +186,14 @@ RUF010 [*] Use explicit conversion flag 17 | f"{foo(bla)}" # OK | help: Replace with conversion flag - -ℹ Safe fix -12 12 | -13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -14 14 | -15 |-f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 - 15 |+f"{bla!s}, {bla!r}, {(ascii(bla))}" # RUF010 -16 16 | -17 17 | f"{foo(bla)}" # OK -18 18 | +12 | +13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +14 | + - f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +15 + f"{bla!s}, {bla!r}, {(ascii(bla))}" # RUF010 +16 | +17 | f"{foo(bla)}" # OK +18 | RUF010 [*] Use explicit conversion flag --> RUF010.py:15:29 @@ -226,16 +206,14 @@ RUF010 [*] Use explicit conversion flag 17 | f"{foo(bla)}" # OK | help: Replace with conversion flag - -ℹ Safe fix -12 12 | -13 13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 -14 14 | -15 |-f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 - 15 |+f"{bla!s}, {(repr(bla))}, {bla!a}" # RUF010 -16 16 | -17 17 | f"{foo(bla)}" # OK -18 18 | +12 | +13 | f"{(str(bla))}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +14 | + - f"{bla!s}, {(repr(bla))}, {(ascii(bla))}" # RUF010 +15 + f"{bla!s}, {(repr(bla))}, {bla!a}" # RUF010 +16 | +17 | f"{foo(bla)}" # OK +18 | RUF010 [*] Use explicit conversion flag --> RUF010.py:35:20 @@ -247,16 +225,14 @@ RUF010 [*] Use explicit conversion flag 36 | ) | help: Replace with conversion flag - -ℹ Safe fix -32 32 | ( -33 33 | f"Member of tuple mismatches type at index {i}. Expected {of_shape_i}. Got " -34 34 | " intermediary content " -35 |- f" that flows {repr(obj)} of type {type(obj)}.{additional_message}" # RUF010 - 35 |+ f" that flows {obj!r} of type {type(obj)}.{additional_message}" # RUF010 -36 36 | ) -37 37 | -38 38 | +32 | ( +33 | f"Member of tuple mismatches type at index {i}. Expected {of_shape_i}. Got " +34 | " intermediary content " + - f" that flows {repr(obj)} of type {type(obj)}.{additional_message}" # RUF010 +35 + f" that flows {obj!r} of type {type(obj)}.{additional_message}" # RUF010 +36 | ) +37 | +38 | RUF010 [*] Use explicit conversion flag --> RUF010.py:40:4 @@ -268,16 +244,14 @@ RUF010 [*] Use explicit conversion flag 42 | f"{str({} | {})}" | help: Replace with conversion flag - -ℹ Safe fix -37 37 | -38 38 | -39 39 | # https://github.com/astral-sh/ruff/issues/16325 -40 |-f"{str({})}" - 40 |+f"{ {}!s}" -41 41 | -42 42 | f"{str({} | {})}" -43 43 | +37 | +38 | +39 | # https://github.com/astral-sh/ruff/issues/16325 + - f"{str({})}" +40 + f"{ {}!s}" +41 | +42 | f"{str({} | {})}" +43 | RUF010 [*] Use explicit conversion flag --> RUF010.py:42:4 @@ -290,16 +264,14 @@ RUF010 [*] Use explicit conversion flag 44 | import builtins | help: Replace with conversion flag - -ℹ Safe fix -39 39 | # https://github.com/astral-sh/ruff/issues/16325 -40 40 | f"{str({})}" -41 41 | -42 |-f"{str({} | {})}" - 42 |+f"{ {} | {}!s}" -43 43 | -44 44 | import builtins -45 45 | +39 | # https://github.com/astral-sh/ruff/issues/16325 +40 | f"{str({})}" +41 | + - f"{str({} | {})}" +42 + f"{ {} | {}!s}" +43 | +44 | import builtins +45 | RUF010 [*] Use explicit conversion flag --> RUF010.py:46:4 @@ -312,16 +284,14 @@ RUF010 [*] Use explicit conversion flag 48 | f"{repr(1)=}" | help: Replace with conversion flag - -ℹ Safe fix -43 43 | -44 44 | import builtins -45 45 | -46 |-f"{builtins.repr(1)}" - 46 |+f"{1!r}" -47 47 | -48 48 | f"{repr(1)=}" -49 49 | +43 | +44 | import builtins +45 | + - f"{builtins.repr(1)}" +46 + f"{1!r}" +47 | +48 | f"{repr(1)=}" +49 | RUF010 Use explicit conversion flag --> RUF010.py:48:4 @@ -346,16 +316,14 @@ RUF010 [*] Use explicit conversion flag 52 | f"{repr(x := 2)}" | help: Replace with conversion flag - -ℹ Safe fix -47 47 | -48 48 | f"{repr(1)=}" -49 49 | -50 |-f"{repr(lambda: 1)}" - 50 |+f"{(lambda: 1)!r}" -51 51 | -52 52 | f"{repr(x := 2)}" -53 53 | +47 | +48 | f"{repr(1)=}" +49 | + - f"{repr(lambda: 1)}" +50 + f"{(lambda: 1)!r}" +51 | +52 | f"{repr(x := 2)}" +53 | RUF010 [*] Use explicit conversion flag --> RUF010.py:52:4 @@ -368,16 +336,14 @@ RUF010 [*] Use explicit conversion flag 54 | f"{str(object=3)}" | help: Replace with conversion flag - -ℹ Safe fix -49 49 | -50 50 | f"{repr(lambda: 1)}" -51 51 | -52 |-f"{repr(x := 2)}" - 52 |+f"{(x := 2)!r}" -53 53 | -54 54 | f"{str(object=3)}" -55 55 | +49 | +50 | f"{repr(lambda: 1)}" +51 | + - f"{repr(x := 2)}" +52 + f"{(x := 2)!r}" +53 | +54 | f"{str(object=3)}" +55 | RUF010 [*] Use explicit conversion flag --> RUF010.py:54:4 @@ -390,16 +356,14 @@ RUF010 [*] Use explicit conversion flag 56 | f"{str(x for x in [])}" | help: Replace with conversion flag - -ℹ Safe fix -51 51 | -52 52 | f"{repr(x := 2)}" -53 53 | -54 |-f"{str(object=3)}" - 54 |+f"{3!s}" -55 55 | -56 56 | f"{str(x for x in [])}" -57 57 | +51 | +52 | f"{repr(x := 2)}" +53 | + - f"{str(object=3)}" +54 + f"{3!s}" +55 | +56 | f"{str(x for x in [])}" +57 | RUF010 [*] Use explicit conversion flag --> RUF010.py:56:4 @@ -412,15 +376,13 @@ RUF010 [*] Use explicit conversion flag 58 | f"{str((x for x in []))}" | help: Replace with conversion flag - -ℹ Safe fix -53 53 | -54 54 | f"{str(object=3)}" -55 55 | -56 |-f"{str(x for x in [])}" - 56 |+f"{(x for x in [])!s}" -57 57 | -58 58 | f"{str((x for x in []))}" +53 | +54 | f"{str(object=3)}" +55 | + - f"{str(x for x in [])}" +56 + f"{(x for x in [])!s}" +57 | +58 | f"{str((x for x in []))}" RUF010 [*] Use explicit conversion flag --> RUF010.py:58:4 @@ -431,10 +393,8 @@ RUF010 [*] Use explicit conversion flag | ^^^^^^^^^^^^^^^^^^^^ | help: Replace with conversion flag - -ℹ Safe fix -55 55 | -56 56 | f"{str(x for x in [])}" -57 57 | -58 |-f"{str((x for x in []))}" - 58 |+f"{(x for x in [])!s}" +55 | +56 | f"{str(x for x in [])}" +57 | + - f"{str((x for x in []))}" +58 + f"{(x for x in [])!s}" diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap index 7c2a377ade..4c04be3042 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_0.py.snap @@ -9,16 +9,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 21 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -17 17 | pass -18 18 | -19 19 | -20 |-def f(arg: int = None): # RUF013 - 20 |+def f(arg: int | None = None): # RUF013 -21 21 | pass -22 22 | -23 23 | +17 | pass +18 | +19 | + - def f(arg: int = None): # RUF013 +20 + def f(arg: int | None = None): # RUF013 +21 | pass +22 | +23 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:24:12 @@ -28,16 +27,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 25 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -21 21 | pass -22 22 | -23 23 | -24 |-def f(arg: str = None): # RUF013 - 24 |+def f(arg: str | None = None): # RUF013 -25 25 | pass -26 26 | -27 27 | +21 | pass +22 | +23 | + - def f(arg: str = None): # RUF013 +24 + def f(arg: str | None = None): # RUF013 +25 | pass +26 | +27 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:28:12 @@ -47,16 +45,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 29 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -25 25 | pass -26 26 | -27 27 | -28 |-def f(arg: Tuple[str] = None): # RUF013 - 28 |+def f(arg: Tuple[str] | None = None): # RUF013 -29 29 | pass -30 30 | -31 31 | +25 | pass +26 | +27 | + - def f(arg: Tuple[str] = None): # RUF013 +28 + def f(arg: Tuple[str] | None = None): # RUF013 +29 | pass +30 | +31 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:58:12 @@ -66,16 +63,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 59 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -55 55 | pass -56 56 | -57 57 | -58 |-def f(arg: Union = None): # RUF013 - 58 |+def f(arg: Union | None = None): # RUF013 -59 59 | pass -60 60 | -61 61 | +55 | pass +56 | +57 | + - def f(arg: Union = None): # RUF013 +58 + def f(arg: Union | None = None): # RUF013 +59 | pass +60 | +61 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:62:12 @@ -85,16 +81,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 63 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -59 59 | pass -60 60 | -61 61 | -62 |-def f(arg: Union[int] = None): # RUF013 - 62 |+def f(arg: Union[int] | None = None): # RUF013 -63 63 | pass -64 64 | -65 65 | +59 | pass +60 | +61 | + - def f(arg: Union[int] = None): # RUF013 +62 + def f(arg: Union[int] | None = None): # RUF013 +63 | pass +64 | +65 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:66:12 @@ -104,16 +99,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 67 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -63 63 | pass -64 64 | -65 65 | -66 |-def f(arg: Union[int, str] = None): # RUF013 - 66 |+def f(arg: Union[int, str] | None = None): # RUF013 -67 67 | pass -68 68 | -69 69 | +63 | pass +64 | +65 | + - def f(arg: Union[int, str] = None): # RUF013 +66 + def f(arg: Union[int, str] | None = None): # RUF013 +67 | pass +68 | +69 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:85:12 @@ -123,16 +117,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 86 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -82 82 | pass -83 83 | -84 84 | -85 |-def f(arg: int | float = None): # RUF013 - 85 |+def f(arg: int | float | None = None): # RUF013 -86 86 | pass -87 87 | -88 88 | +82 | pass +83 | +84 | + - def f(arg: int | float = None): # RUF013 +85 + def f(arg: int | float | None = None): # RUF013 +86 | pass +87 | +88 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:89:12 @@ -142,16 +135,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 90 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -86 86 | pass -87 87 | -88 88 | -89 |-def f(arg: int | float | str | bytes = None): # RUF013 - 89 |+def f(arg: int | float | str | bytes | None = None): # RUF013 -90 90 | pass -91 91 | -92 92 | +86 | pass +87 | +88 | + - def f(arg: int | float | str | bytes = None): # RUF013 +89 + def f(arg: int | float | str | bytes | None = None): # RUF013 +90 | pass +91 | +92 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:108:12 @@ -161,16 +153,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 109 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -105 105 | pass -106 106 | -107 107 | -108 |-def f(arg: Literal[1] = None): # RUF013 - 108 |+def f(arg: Literal[1] | None = None): # RUF013 -109 109 | pass -110 110 | -111 111 | +105 | pass +106 | +107 | + - def f(arg: Literal[1] = None): # RUF013 +108 + def f(arg: Literal[1] | None = None): # RUF013 +109 | pass +110 | +111 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:112:12 @@ -180,16 +171,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 113 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -109 109 | pass -110 110 | -111 111 | -112 |-def f(arg: Literal[1, "foo"] = None): # RUF013 - 112 |+def f(arg: Literal[1, "foo"] | None = None): # RUF013 -113 113 | pass -114 114 | -115 115 | +109 | pass +110 | +111 | + - def f(arg: Literal[1, "foo"] = None): # RUF013 +112 + def f(arg: Literal[1, "foo"] | None = None): # RUF013 +113 | pass +114 | +115 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:131:22 @@ -199,16 +189,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 132 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -128 128 | pass -129 129 | -130 130 | -131 |-def f(arg: Annotated[int, ...] = None): # RUF013 - 131 |+def f(arg: Annotated[int | None, ...] = None): # RUF013 -132 132 | pass -133 133 | -134 134 | +128 | pass +129 | +130 | + - def f(arg: Annotated[int, ...] = None): # RUF013 +131 + def f(arg: Annotated[int | None, ...] = None): # RUF013 +132 | pass +133 | +134 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:135:32 @@ -218,16 +207,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 136 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -132 132 | pass -133 133 | -134 134 | -135 |-def f(arg: Annotated[Annotated[int | str, ...], ...] = None): # RUF013 - 135 |+def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None): # RUF013 -136 136 | pass -137 137 | -138 138 | +132 | pass +133 | +134 | + - def f(arg: Annotated[Annotated[int | str, ...], ...] = None): # RUF013 +135 + def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None): # RUF013 +136 | pass +137 | +138 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:151:11 @@ -239,16 +227,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 153 | arg3: Literal[1, 2, 3] = None, # RUF013 | help: Convert to `T | None` - -ℹ Unsafe fix -148 148 | -149 149 | -150 150 | def f( -151 |- arg1: int = None, # RUF013 - 151 |+ arg1: int | None = None, # RUF013 -152 152 | arg2: Union[int, float] = None, # RUF013 -153 153 | arg3: Literal[1, 2, 3] = None, # RUF013 -154 154 | ): +148 | +149 | +150 | def f( + - arg1: int = None, # RUF013 +151 + arg1: int | None = None, # RUF013 +152 | arg2: Union[int, float] = None, # RUF013 +153 | arg3: Literal[1, 2, 3] = None, # RUF013 +154 | ): +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:152:11 @@ -261,16 +248,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 154 | ): | help: Convert to `T | None` - -ℹ Unsafe fix -149 149 | -150 150 | def f( -151 151 | arg1: int = None, # RUF013 -152 |- arg2: Union[int, float] = None, # RUF013 - 152 |+ arg2: Union[int, float] | None = None, # RUF013 -153 153 | arg3: Literal[1, 2, 3] = None, # RUF013 -154 154 | ): -155 155 | pass +149 | +150 | def f( +151 | arg1: int = None, # RUF013 + - arg2: Union[int, float] = None, # RUF013 +152 + arg2: Union[int, float] | None = None, # RUF013 +153 | arg3: Literal[1, 2, 3] = None, # RUF013 +154 | ): +155 | pass +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:153:11 @@ -283,16 +269,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 155 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -150 150 | def f( -151 151 | arg1: int = None, # RUF013 -152 152 | arg2: Union[int, float] = None, # RUF013 -153 |- arg3: Literal[1, 2, 3] = None, # RUF013 - 153 |+ arg3: Literal[1, 2, 3] | None = None, # RUF013 -154 154 | ): -155 155 | pass -156 156 | +150 | def f( +151 | arg1: int = None, # RUF013 +152 | arg2: Union[int, float] = None, # RUF013 + - arg3: Literal[1, 2, 3] = None, # RUF013 +153 + arg3: Literal[1, 2, 3] | None = None, # RUF013 +154 | ): +155 | pass +156 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:181:12 @@ -302,16 +287,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 182 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -178 178 | pass -179 179 | -180 180 | -181 |-def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None): # RUF013 - 181 |+def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None): # RUF013 -182 182 | pass -183 183 | -184 184 | +178 | pass +179 | +180 | + - def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None): # RUF013 +181 + def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None): # RUF013 +182 | pass +183 | +184 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:188:13 @@ -321,16 +305,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 189 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -185 185 | # Quoted -186 186 | -187 187 | -188 |-def f(arg: "int" = None): # RUF013 - 188 |+def f(arg: "int | None" = None): # RUF013 -189 189 | pass -190 190 | -191 191 | +185 | # Quoted +186 | +187 | + - def f(arg: "int" = None): # RUF013 +188 + def f(arg: "int | None" = None): # RUF013 +189 | pass +190 | +191 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:192:13 @@ -340,16 +323,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 193 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -189 189 | pass -190 190 | -191 191 | -192 |-def f(arg: "str" = None): # RUF013 - 192 |+def f(arg: "str | None" = None): # RUF013 -193 193 | pass -194 194 | -195 195 | +189 | pass +190 | +191 | + - def f(arg: "str" = None): # RUF013 +192 + def f(arg: "str | None" = None): # RUF013 +193 | pass +194 | +195 | +note: This is an unsafe fix and may change runtime behavior RUF013 PEP 484 prohibits implicit `Optional` --> RUF013_0.py:196:12 @@ -368,13 +350,12 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 205 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -201 201 | pass -202 202 | -203 203 | -204 |-def f(arg: Union["int", "str"] = None): # RUF013 - 204 |+def f(arg: Union["int", "str"] | None = None): # RUF013 -205 205 | pass -206 206 | -207 207 | +201 | pass +202 | +203 | + - def f(arg: Union["int", "str"] = None): # RUF013 +204 + def f(arg: Union["int", "str"] | None = None): # RUF013 +205 | pass +206 | +207 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap index c91c0f4574..9c2dccbd4c 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_1.py.snap @@ -9,11 +9,10 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 5 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -1 1 | # No `typing.Optional` import -2 2 | -3 3 | -4 |-def f(arg: int = None): # RUF013 - 4 |+def f(arg: int | None = None): # RUF013 -5 5 | pass +1 | # No `typing.Optional` import +2 | +3 | + - def f(arg: int = None): # RUF013 +4 + def f(arg: int | None = None): # RUF013 +5 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap index d56804b898..43dc92c128 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_3.py.snap @@ -9,16 +9,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 5 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -1 1 | import typing -2 2 | -3 3 | -4 |-def f(arg: typing.List[str] = None): # RUF013 - 4 |+def f(arg: typing.List[str] | None = None): # RUF013 -5 5 | pass -6 6 | -7 7 | +1 | import typing +2 | +3 | + - def f(arg: typing.List[str] = None): # RUF013 +4 + def f(arg: typing.List[str] | None = None): # RUF013 +5 | pass +6 | +7 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_3.py:22:12 @@ -28,16 +27,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 23 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -19 19 | pass -20 20 | -21 21 | -22 |-def f(arg: typing.Union[int, str] = None): # RUF013 - 22 |+def f(arg: typing.Union[int, str] | None = None): # RUF013 -23 23 | pass -24 24 | -25 25 | +19 | pass +20 | +21 | + - def f(arg: typing.Union[int, str] = None): # RUF013 +22 + def f(arg: typing.Union[int, str] | None = None): # RUF013 +23 | pass +24 | +25 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_3.py:29:12 @@ -47,11 +45,10 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 30 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -26 26 | # Literal -27 27 | -28 28 | -29 |-def f(arg: typing.Literal[1, "foo", True] = None): # RUF013 - 29 |+def f(arg: typing.Literal[1, "foo", True] | None = None): # RUF013 -30 30 | pass +26 | # Literal +27 | +28 | + - def f(arg: typing.Literal[1, "foo", True] = None): # RUF013 +29 + def f(arg: typing.Literal[1, "foo", True] | None = None): # RUF013 +30 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap index a32c119f25..8674b1a3e6 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF013_RUF013_4.py.snap @@ -8,13 +8,12 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` | ^^^ | help: Convert to `T | None` - -ℹ Unsafe fix -12 12 | def multiple_1(arg1: Optional, arg2: Optional = None): ... -13 13 | -14 14 | -15 |-def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ... - 15 |+def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ... -16 16 | -17 17 | -18 18 | def return_type(arg: Optional = None) -> Optional: ... +12 | def multiple_1(arg1: Optional, arg2: Optional = None): ... +13 | +14 | + - def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ... +15 + def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ... +16 | +17 | +18 | def return_type(arg: Optional = None) -> Optional: ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap index a079cdb11d..ede065800b 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF015_RUF015.py.snap @@ -11,16 +11,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice 6 | list(i for i in x)[0] | help: Replace with `next(iter(x))` - -ℹ Unsafe fix -1 1 | x = range(10) -2 2 | -3 3 | # RUF015 -4 |-list(x)[0] - 4 |+next(iter(x)) -5 5 | tuple(x)[0] -6 6 | list(i for i in x)[0] -7 7 | [i for i in x][0] +1 | x = range(10) +2 | +3 | # RUF015 + - list(x)[0] +4 + next(iter(x)) +5 | tuple(x)[0] +6 | list(i for i in x)[0] +7 | [i for i in x][0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x))` over single element slice --> RUF015.py:5:1 @@ -33,16 +32,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice 7 | [i for i in x][0] | help: Replace with `next(iter(x))` - -ℹ Unsafe fix -2 2 | -3 3 | # RUF015 -4 4 | list(x)[0] -5 |-tuple(x)[0] - 5 |+next(iter(x)) -6 6 | list(i for i in x)[0] -7 7 | [i for i in x][0] -8 8 | +2 | +3 | # RUF015 +4 | list(x)[0] + - tuple(x)[0] +5 + next(iter(x)) +6 | list(i for i in x)[0] +7 | [i for i in x][0] +8 | +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x))` over single element slice --> RUF015.py:6:1 @@ -54,16 +52,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice 7 | [i for i in x][0] | help: Replace with `next(iter(x))` - -ℹ Unsafe fix -3 3 | # RUF015 -4 4 | list(x)[0] -5 5 | tuple(x)[0] -6 |-list(i for i in x)[0] - 6 |+next(iter(x)) -7 7 | [i for i in x][0] -8 8 | -9 9 | # OK (not indexing (solely) the first element) +3 | # RUF015 +4 | list(x)[0] +5 | tuple(x)[0] + - list(i for i in x)[0] +6 + next(iter(x)) +7 | [i for i in x][0] +8 | +9 | # OK (not indexing (solely) the first element) +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x))` over single element slice --> RUF015.py:7:1 @@ -76,16 +73,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice 9 | # OK (not indexing (solely) the first element) | help: Replace with `next(iter(x))` - -ℹ Unsafe fix -4 4 | list(x)[0] -5 5 | tuple(x)[0] -6 6 | list(i for i in x)[0] -7 |-[i for i in x][0] - 7 |+next(iter(x)) -8 8 | -9 9 | # OK (not indexing (solely) the first element) -10 10 | list(x) +4 | list(x)[0] +5 | tuple(x)[0] +6 | list(i for i in x)[0] + - [i for i in x][0] +7 + next(iter(x)) +8 | +9 | # OK (not indexing (solely) the first element) +10 | list(x) +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(i + 1 for i in x)` over single element slice --> RUF015.py:29:1 @@ -97,16 +93,15 @@ RUF015 [*] Prefer `next(i + 1 for i in x)` over single element slice 31 | [(i, i + 1) for i in x][0] | help: Replace with `next(i + 1 for i in x)` - -ℹ Unsafe fix -26 26 | [i for i in x][::] -27 27 | -28 28 | # RUF015 (doesn't mirror the underlying list) -29 |-[i + 1 for i in x][0] - 29 |+next(i + 1 for i in x) -30 30 | [i for i in x if i > 5][0] -31 31 | [(i, i + 1) for i in x][0] -32 32 | +26 | [i for i in x][::] +27 | +28 | # RUF015 (doesn't mirror the underlying list) + - [i + 1 for i in x][0] +29 + next(i + 1 for i in x) +30 | [i for i in x if i > 5][0] +31 | [(i, i + 1) for i in x][0] +32 | +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(i for i in x if i > 5)` over single element slice --> RUF015.py:30:1 @@ -118,16 +113,15 @@ RUF015 [*] Prefer `next(i for i in x if i > 5)` over single element slice 31 | [(i, i + 1) for i in x][0] | help: Replace with `next(i for i in x if i > 5)` - -ℹ Unsafe fix -27 27 | -28 28 | # RUF015 (doesn't mirror the underlying list) -29 29 | [i + 1 for i in x][0] -30 |-[i for i in x if i > 5][0] - 30 |+next(i for i in x if i > 5) -31 31 | [(i, i + 1) for i in x][0] -32 32 | -33 33 | # RUF015 (multiple generators) +27 | +28 | # RUF015 (doesn't mirror the underlying list) +29 | [i + 1 for i in x][0] + - [i for i in x if i > 5][0] +30 + next(i for i in x if i > 5) +31 | [(i, i + 1) for i in x][0] +32 | +33 | # RUF015 (multiple generators) +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next((i, i + 1) for i in x)` over single element slice --> RUF015.py:31:1 @@ -140,16 +134,15 @@ RUF015 [*] Prefer `next((i, i + 1) for i in x)` over single element slice 33 | # RUF015 (multiple generators) | help: Replace with `next((i, i + 1) for i in x)` - -ℹ Unsafe fix -28 28 | # RUF015 (doesn't mirror the underlying list) -29 29 | [i + 1 for i in x][0] -30 30 | [i for i in x if i > 5][0] -31 |-[(i, i + 1) for i in x][0] - 31 |+next((i, i + 1) for i in x) -32 32 | -33 33 | # RUF015 (multiple generators) -34 34 | y = range(10) +28 | # RUF015 (doesn't mirror the underlying list) +29 | [i + 1 for i in x][0] +30 | [i for i in x if i > 5][0] + - [(i, i + 1) for i in x][0] +31 + next((i, i + 1) for i in x) +32 | +33 | # RUF015 (multiple generators) +34 | y = range(10) +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(i + j for i in x for j in y)` over single element slice --> RUF015.py:35:1 @@ -162,16 +155,15 @@ RUF015 [*] Prefer `next(i + j for i in x for j in y)` over single element slice 37 | # RUF015 | help: Replace with `next(i + j for i in x for j in y)` - -ℹ Unsafe fix -32 32 | -33 33 | # RUF015 (multiple generators) -34 34 | y = range(10) -35 |-[i + j for i in x for j in y][0] - 35 |+next(i + j for i in x for j in y) -36 36 | -37 37 | # RUF015 -38 38 | list(range(10))[0] +32 | +33 | # RUF015 (multiple generators) +34 | y = range(10) + - [i + j for i in x for j in y][0] +35 + next(i + j for i in x for j in y) +36 | +37 | # RUF015 +38 | list(range(10))[0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(range(10)))` over single element slice --> RUF015.py:38:1 @@ -183,16 +175,15 @@ RUF015 [*] Prefer `next(iter(range(10)))` over single element slice 40 | list(x["y"])[0] | help: Replace with `next(iter(range(10)))` - -ℹ Unsafe fix -35 35 | [i + j for i in x for j in y][0] -36 36 | -37 37 | # RUF015 -38 |-list(range(10))[0] - 38 |+next(iter(range(10))) -39 39 | list(x.y)[0] -40 40 | list(x["y"])[0] -41 41 | [*range(10)][0] +35 | [i + j for i in x for j in y][0] +36 | +37 | # RUF015 + - list(range(10))[0] +38 + next(iter(range(10))) +39 | list(x.y)[0] +40 | list(x["y"])[0] +41 | [*range(10)][0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x.y))` over single element slice --> RUF015.py:39:1 @@ -205,16 +196,15 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice 41 | [*range(10)][0] | help: Replace with `next(iter(x.y))` - -ℹ Unsafe fix -36 36 | -37 37 | # RUF015 -38 38 | list(range(10))[0] -39 |-list(x.y)[0] - 39 |+next(iter(x.y)) -40 40 | list(x["y"])[0] -41 41 | [*range(10)][0] -42 42 | [*x["y"]][0] +36 | +37 | # RUF015 +38 | list(range(10))[0] + - list(x.y)[0] +39 + next(iter(x.y)) +40 | list(x["y"])[0] +41 | [*range(10)][0] +42 | [*x["y"]][0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice --> RUF015.py:40:1 @@ -227,16 +217,15 @@ RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice 42 | [*x["y"]][0] | help: Replace with `next(iter(x["y"]))` - -ℹ Unsafe fix -37 37 | # RUF015 -38 38 | list(range(10))[0] -39 39 | list(x.y)[0] -40 |-list(x["y"])[0] - 40 |+next(iter(x["y"])) -41 41 | [*range(10)][0] -42 42 | [*x["y"]][0] -43 43 | [*x.y][0] +37 | # RUF015 +38 | list(range(10))[0] +39 | list(x.y)[0] + - list(x["y"])[0] +40 + next(iter(x["y"])) +41 | [*range(10)][0] +42 | [*x["y"]][0] +43 | [*x.y][0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(range(10)))` over single element slice --> RUF015.py:41:1 @@ -249,16 +238,15 @@ RUF015 [*] Prefer `next(iter(range(10)))` over single element slice 43 | [*x.y][0] | help: Replace with `next(iter(range(10)))` - -ℹ Unsafe fix -38 38 | list(range(10))[0] -39 39 | list(x.y)[0] -40 40 | list(x["y"])[0] -41 |-[*range(10)][0] - 41 |+next(iter(range(10))) -42 42 | [*x["y"]][0] -43 43 | [*x.y][0] -44 44 | [* x.y][0] +38 | list(range(10))[0] +39 | list(x.y)[0] +40 | list(x["y"])[0] + - [*range(10)][0] +41 + next(iter(range(10))) +42 | [*x["y"]][0] +43 | [*x.y][0] +44 | [* x.y][0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice --> RUF015.py:42:1 @@ -271,16 +259,15 @@ RUF015 [*] Prefer `next(iter(x["y"]))` over single element slice 44 | [* x.y][0] | help: Replace with `next(iter(x["y"]))` - -ℹ Unsafe fix -39 39 | list(x.y)[0] -40 40 | list(x["y"])[0] -41 41 | [*range(10)][0] -42 |-[*x["y"]][0] - 42 |+next(iter(x["y"])) -43 43 | [*x.y][0] -44 44 | [* x.y][0] -45 45 | [ +39 | list(x.y)[0] +40 | list(x["y"])[0] +41 | [*range(10)][0] + - [*x["y"]][0] +42 + next(iter(x["y"])) +43 | [*x.y][0] +44 | [* x.y][0] +45 | [ +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x.y))` over single element slice --> RUF015.py:43:1 @@ -293,16 +280,15 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice 45 | [ | help: Replace with `next(iter(x.y))` - -ℹ Unsafe fix -40 40 | list(x["y"])[0] -41 41 | [*range(10)][0] -42 42 | [*x["y"]][0] -43 |-[*x.y][0] - 43 |+next(iter(x.y)) -44 44 | [* x.y][0] -45 45 | [ -46 46 | *x.y +40 | list(x["y"])[0] +41 | [*range(10)][0] +42 | [*x["y"]][0] + - [*x.y][0] +43 + next(iter(x.y)) +44 | [* x.y][0] +45 | [ +46 | *x.y +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x.y))` over single element slice --> RUF015.py:44:1 @@ -315,16 +301,15 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice 46 | *x.y | help: Replace with `next(iter(x.y))` - -ℹ Unsafe fix -41 41 | [*range(10)][0] -42 42 | [*x["y"]][0] -43 43 | [*x.y][0] -44 |-[* x.y][0] - 44 |+next(iter(x.y)) -45 45 | [ -46 46 | *x.y -47 47 | ][0] +41 | [*range(10)][0] +42 | [*x["y"]][0] +43 | [*x.y][0] + - [* x.y][0] +44 + next(iter(x.y)) +45 | [ +46 | *x.y +47 | ][0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x.y))` over single element slice --> RUF015.py:45:1 @@ -339,18 +324,17 @@ RUF015 [*] Prefer `next(iter(x.y))` over single element slice 49 | # RUF015 (multi-line) | help: Replace with `next(iter(x.y))` - -ℹ Unsafe fix -42 42 | [*x["y"]][0] -43 43 | [*x.y][0] -44 44 | [* x.y][0] -45 |-[ -46 |- *x.y -47 |-][0] - 45 |+next(iter(x.y)) -48 46 | -49 47 | # RUF015 (multi-line) -50 48 | revision_heads_map_ast = [ +42 | [*x["y"]][0] +43 | [*x.y][0] +44 | [* x.y][0] + - [ + - *x.y + - ][0] +45 + next(iter(x.y)) +46 | +47 | # RUF015 (multi-line) +48 | revision_heads_map_ast = [ +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(...)` over single element slice --> RUF015.py:50:26 @@ -367,21 +351,20 @@ RUF015 [*] Prefer `next(...)` over single element slice 56 | # RUF015 (zip) | help: Replace with `next(...)` - -ℹ Unsafe fix -47 47 | ][0] -48 48 | -49 49 | # RUF015 (multi-line) -50 |-revision_heads_map_ast = [ - 50 |+revision_heads_map_ast = next( -51 51 | a -52 52 | for a in revision_heads_map_ast_obj.body -53 53 | if isinstance(a, ast.Assign) and a.targets[0].id == "REVISION_HEADS_MAP" -54 |-][0] - 54 |+) -55 55 | -56 56 | # RUF015 (zip) -57 57 | list(zip(x, y))[0] +47 | ][0] +48 | +49 | # RUF015 (multi-line) + - revision_heads_map_ast = [ +50 + revision_heads_map_ast = next( +51 | a +52 | for a in revision_heads_map_ast_obj.body +53 | if isinstance(a, ast.Assign) and a.targets[0].id == "REVISION_HEADS_MAP" + - ][0] +54 + ) +55 | +56 | # RUF015 (zip) +57 | list(zip(x, y))[0] +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(zip(x, y))` over single element slice --> RUF015.py:57:1 @@ -392,16 +375,15 @@ RUF015 [*] Prefer `next(zip(x, y))` over single element slice 58 | [*zip(x, y)][0] | help: Replace with `next(zip(x, y))` - -ℹ Unsafe fix -54 54 | ][0] -55 55 | -56 56 | # RUF015 (zip) -57 |-list(zip(x, y))[0] - 57 |+next(zip(x, y)) -58 58 | [*zip(x, y)][0] -59 59 | -60 60 | # RUF015 (pop) +54 | ][0] +55 | +56 | # RUF015 (zip) + - list(zip(x, y))[0] +57 + next(zip(x, y)) +58 | [*zip(x, y)][0] +59 | +60 | # RUF015 (pop) +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(zip(x, y))` over single element slice --> RUF015.py:58:1 @@ -414,16 +396,15 @@ RUF015 [*] Prefer `next(zip(x, y))` over single element slice 60 | # RUF015 (pop) | help: Replace with `next(zip(x, y))` - -ℹ Unsafe fix -55 55 | -56 56 | # RUF015 (zip) -57 57 | list(zip(x, y))[0] -58 |-[*zip(x, y)][0] - 58 |+next(zip(x, y)) -59 59 | -60 60 | # RUF015 (pop) -61 61 | list(x).pop(0) +55 | +56 | # RUF015 (zip) +57 | list(zip(x, y))[0] + - [*zip(x, y)][0] +58 + next(zip(x, y)) +59 | +60 | # RUF015 (pop) +61 | list(x).pop(0) +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x))` over single element slice --> RUF015.py:61:1 @@ -435,16 +416,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice 63 | list(i for i in x).pop(0) | help: Replace with `next(iter(x))` - -ℹ Unsafe fix -58 58 | [*zip(x, y)][0] -59 59 | -60 60 | # RUF015 (pop) -61 |-list(x).pop(0) - 61 |+next(iter(x)) -62 62 | [i for i in x].pop(0) -63 63 | list(i for i in x).pop(0) -64 64 | +58 | [*zip(x, y)][0] +59 | +60 | # RUF015 (pop) + - list(x).pop(0) +61 + next(iter(x)) +62 | [i for i in x].pop(0) +63 | list(i for i in x).pop(0) +64 | +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x))` over single element slice --> RUF015.py:62:1 @@ -456,16 +436,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice 63 | list(i for i in x).pop(0) | help: Replace with `next(iter(x))` - -ℹ Unsafe fix -59 59 | -60 60 | # RUF015 (pop) -61 61 | list(x).pop(0) -62 |-[i for i in x].pop(0) - 62 |+next(iter(x)) -63 63 | list(i for i in x).pop(0) -64 64 | -65 65 | # OK +59 | +60 | # RUF015 (pop) +61 | list(x).pop(0) + - [i for i in x].pop(0) +62 + next(iter(x)) +63 | list(i for i in x).pop(0) +64 | +65 | # OK +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(x))` over single element slice --> RUF015.py:63:1 @@ -478,16 +457,15 @@ RUF015 [*] Prefer `next(iter(x))` over single element slice 65 | # OK | help: Replace with `next(iter(x))` - -ℹ Unsafe fix -60 60 | # RUF015 (pop) -61 61 | list(x).pop(0) -62 62 | [i for i in x].pop(0) -63 |-list(i for i in x).pop(0) - 63 |+next(iter(x)) -64 64 | -65 65 | # OK -66 66 | list(x).pop(1) +60 | # RUF015 (pop) +61 | list(x).pop(0) +62 | [i for i in x].pop(0) + - list(i for i in x).pop(0) +63 + next(iter(x)) +64 | +65 | # OK +66 | list(x).pop(1) +note: This is an unsafe fix and may change runtime behavior RUF015 [*] Prefer `next(iter(zip(x, y)))` over single element slice --> RUF015.py:73:5 @@ -498,10 +476,9 @@ RUF015 [*] Prefer `next(iter(zip(x, y)))` over single element slice | ^^^^^^^^^^^^^^^^^^ | help: Replace with `next(iter(zip(x, y)))` - -ℹ Unsafe fix -70 70 | -71 71 | def test(): -72 72 | zip = list # Overwrite the builtin zip -73 |- list(zip(x, y))[0] - 73 |+ next(iter(zip(x, y))) +70 | +71 | def test(): +72 | zip = list # Overwrite the builtin zip + - list(zip(x, y))[0] +73 + next(iter(zip(x, y))) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap index 298419f4b3..f030213a1e 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_0.py.snap @@ -11,19 +11,18 @@ RUF017 [*] Avoid quadratic list summation 7 | sum([[1, 2, 3], [4, 5, 6]], start=[]) | help: Replace with `functools.reduce` - -ℹ Unsafe fix - 1 |+import functools - 2 |+import operator -1 3 | x = [1, 2, 3] -2 4 | y = [4, 5, 6] -3 5 | -4 6 | # RUF017 -5 |-sum([x, y], start=[]) - 7 |+functools.reduce(operator.iadd, [x, y], []) -6 8 | sum([x, y], []) -7 9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) -8 10 | sum([[1, 2, 3], [4, 5, 6]], []) +1 + import functools +2 + import operator +3 | x = [1, 2, 3] +4 | y = [4, 5, 6] +5 | +6 | # RUF017 + - sum([x, y], start=[]) +7 + functools.reduce(operator.iadd, [x, y], []) +8 | sum([x, y], []) +9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) +10 | sum([[1, 2, 3], [4, 5, 6]], []) +note: This is an unsafe fix and may change runtime behavior RUF017 [*] Avoid quadratic list summation --> RUF017_0.py:6:1 @@ -36,20 +35,19 @@ RUF017 [*] Avoid quadratic list summation 8 | sum([[1, 2, 3], [4, 5, 6]], []) | help: Replace with `functools.reduce` - -ℹ Unsafe fix - 1 |+import functools - 2 |+import operator -1 3 | x = [1, 2, 3] -2 4 | y = [4, 5, 6] -3 5 | -4 6 | # RUF017 -5 7 | sum([x, y], start=[]) -6 |-sum([x, y], []) - 8 |+functools.reduce(operator.iadd, [x, y], []) -7 9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) -8 10 | sum([[1, 2, 3], [4, 5, 6]], []) -9 11 | sum([[1, 2, 3], [4, 5, 6]], +1 + import functools +2 + import operator +3 | x = [1, 2, 3] +4 | y = [4, 5, 6] +5 | +6 | # RUF017 +7 | sum([x, y], start=[]) + - sum([x, y], []) +8 + functools.reduce(operator.iadd, [x, y], []) +9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) +10 | sum([[1, 2, 3], [4, 5, 6]], []) +11 | sum([[1, 2, 3], [4, 5, 6]], +note: This is an unsafe fix and may change runtime behavior RUF017 [*] Avoid quadratic list summation --> RUF017_0.py:7:1 @@ -62,21 +60,20 @@ RUF017 [*] Avoid quadratic list summation 9 | sum([[1, 2, 3], [4, 5, 6]], | help: Replace with `functools.reduce` - -ℹ Unsafe fix - 1 |+import functools - 2 |+import operator -1 3 | x = [1, 2, 3] -2 4 | y = [4, 5, 6] -3 5 | -4 6 | # RUF017 -5 7 | sum([x, y], start=[]) -6 8 | sum([x, y], []) -7 |-sum([[1, 2, 3], [4, 5, 6]], start=[]) - 9 |+functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], []) -8 10 | sum([[1, 2, 3], [4, 5, 6]], []) -9 11 | sum([[1, 2, 3], [4, 5, 6]], -10 12 | []) +1 + import functools +2 + import operator +3 | x = [1, 2, 3] +4 | y = [4, 5, 6] +5 | +6 | # RUF017 +7 | sum([x, y], start=[]) +8 | sum([x, y], []) + - sum([[1, 2, 3], [4, 5, 6]], start=[]) +9 + functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], []) +10 | sum([[1, 2, 3], [4, 5, 6]], []) +11 | sum([[1, 2, 3], [4, 5, 6]], +12 | []) +note: This is an unsafe fix and may change runtime behavior RUF017 [*] Avoid quadratic list summation --> RUF017_0.py:8:1 @@ -89,22 +86,21 @@ RUF017 [*] Avoid quadratic list summation 10 | []) | help: Replace with `functools.reduce` - -ℹ Unsafe fix - 1 |+import functools - 2 |+import operator -1 3 | x = [1, 2, 3] -2 4 | y = [4, 5, 6] -3 5 | +1 + import functools +2 + import operator +3 | x = [1, 2, 3] +4 | y = [4, 5, 6] +5 | -------------------------------------------------------------------------------- -5 7 | sum([x, y], start=[]) -6 8 | sum([x, y], []) -7 9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) -8 |-sum([[1, 2, 3], [4, 5, 6]], []) - 10 |+functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], []) -9 11 | sum([[1, 2, 3], [4, 5, 6]], -10 12 | []) -11 13 | +7 | sum([x, y], start=[]) +8 | sum([x, y], []) +9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) + - sum([[1, 2, 3], [4, 5, 6]], []) +10 + functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], []) +11 | sum([[1, 2, 3], [4, 5, 6]], +12 | []) +13 | +note: This is an unsafe fix and may change runtime behavior RUF017 [*] Avoid quadratic list summation --> RUF017_0.py:9:1 @@ -118,23 +114,22 @@ RUF017 [*] Avoid quadratic list summation 12 | # OK | help: Replace with `functools.reduce` - -ℹ Unsafe fix - 1 |+import functools - 2 |+import operator -1 3 | x = [1, 2, 3] -2 4 | y = [4, 5, 6] -3 5 | +1 + import functools +2 + import operator +3 | x = [1, 2, 3] +4 | y = [4, 5, 6] +5 | -------------------------------------------------------------------------------- -6 8 | sum([x, y], []) -7 9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) -8 10 | sum([[1, 2, 3], [4, 5, 6]], []) -9 |-sum([[1, 2, 3], [4, 5, 6]], -10 |- []) - 11 |+functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], []) -11 12 | -12 13 | # OK -13 14 | sum([x, y]) +8 | sum([x, y], []) +9 | sum([[1, 2, 3], [4, 5, 6]], start=[]) +10 | sum([[1, 2, 3], [4, 5, 6]], []) + - sum([[1, 2, 3], [4, 5, 6]], + - []) +11 + functools.reduce(operator.iadd, [[1, 2, 3], [4, 5, 6]], []) +12 | +13 | # OK +14 | sum([x, y]) +note: This is an unsafe fix and may change runtime behavior RUF017 [*] Avoid quadratic list summation --> RUF017_0.py:21:5 @@ -145,16 +140,15 @@ RUF017 [*] Avoid quadratic list summation | ^^^^^^^^^^^^^^^ | help: Replace with `functools.reduce` - -ℹ Unsafe fix -18 18 | def func(): -19 19 | import functools, operator -20 20 | -21 |- sum([x, y], []) - 21 |+ functools.reduce(operator.iadd, [x, y], []) -22 22 | -23 23 | -24 24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718 +18 | def func(): +19 | import functools, operator +20 | + - sum([x, y], []) +21 + functools.reduce(operator.iadd, [x, y], []) +22 | +23 | +24 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718 +note: This is an unsafe fix and may change runtime behavior RUF017 [*] Avoid quadratic list summation --> RUF017_0.py:26:5 @@ -165,16 +159,15 @@ RUF017 [*] Avoid quadratic list summation | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `functools.reduce` - -ℹ Unsafe fix - 1 |+import functools - 2 |+import operator -1 3 | x = [1, 2, 3] -2 4 | y = [4, 5, 6] -3 5 | +1 + import functools +2 + import operator +3 | x = [1, 2, 3] +4 | y = [4, 5, 6] +5 | -------------------------------------------------------------------------------- -23 25 | -24 26 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718 -25 27 | def func(): -26 |- sum((factor.dims for factor in bases), []) - 28 |+ functools.reduce(operator.iadd, (factor.dims for factor in bases), []) +25 | +26 | # Regression test for: https://github.com/astral-sh/ruff/issues/7718 +27 | def func(): + - sum((factor.dims for factor in bases), []) +28 + functools.reduce(operator.iadd, (factor.dims for factor in bases), []) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap index f85dbf7125..371f5b8a6d 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF017_RUF017_1.py.snap @@ -8,9 +8,8 @@ RUF017 [*] Avoid quadratic list summation | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `functools.reduce` - -ℹ Unsafe fix -1 |-sum((factor.dims for factor in bases), []) - 1 |+import functools - 2 |+import operator - 3 |+functools.reduce(operator.iadd, (factor.dims for factor in bases), []) + - sum((factor.dims for factor in bases), []) +1 + import functools +2 + import operator +3 + functools.reduce(operator.iadd, (factor.dims for factor in bases), []) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap index 18047142fa..ba96087e04 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF019_RUF019.py.snap @@ -11,15 +11,13 @@ RUF019 [*] Unnecessary key check before dictionary access 4 | pass | help: Replace with `dict.get` - -ℹ Safe fix -1 1 | d = {} -2 2 | # RUF019 -3 |-if "k" in d and d["k"]: - 3 |+if d.get("k"): -4 4 | pass -5 5 | -6 6 | k = "k" +1 | d = {} +2 | # RUF019 + - if "k" in d and d["k"]: +3 + if d.get("k"): +4 | pass +5 | +6 | k = "k" RUF019 [*] Unnecessary key check before dictionary access --> RUF019.py:7:4 @@ -30,16 +28,14 @@ RUF019 [*] Unnecessary key check before dictionary access 8 | pass | help: Replace with `dict.get` - -ℹ Safe fix -4 4 | pass -5 5 | -6 6 | k = "k" -7 |-if k in d and d[k]: - 7 |+if d.get(k): -8 8 | pass -9 9 | -10 10 | if (k) in d and d[k]: +4 | pass +5 | +6 | k = "k" + - if k in d and d[k]: +7 + if d.get(k): +8 | pass +9 | +10 | if (k) in d and d[k]: RUF019 [*] Unnecessary key check before dictionary access --> RUF019.py:10:4 @@ -51,16 +47,14 @@ RUF019 [*] Unnecessary key check before dictionary access 11 | pass | help: Replace with `dict.get` - -ℹ Safe fix -7 7 | if k in d and d[k]: -8 8 | pass -9 9 | -10 |-if (k) in d and d[k]: - 10 |+if d.get(k): -11 11 | pass -12 12 | -13 13 | if k in d and d[(k)]: +7 | if k in d and d[k]: +8 | pass +9 | + - if (k) in d and d[k]: +10 + if d.get(k): +11 | pass +12 | +13 | if k in d and d[(k)]: RUF019 [*] Unnecessary key check before dictionary access --> RUF019.py:13:4 @@ -72,16 +66,14 @@ RUF019 [*] Unnecessary key check before dictionary access 14 | pass | help: Replace with `dict.get` - -ℹ Safe fix -10 10 | if (k) in d and d[k]: -11 11 | pass -12 12 | -13 |-if k in d and d[(k)]: - 13 |+if d.get((k)): -14 14 | pass -15 15 | -16 16 | not ("key" in dct and dct["key"]) +10 | if (k) in d and d[k]: +11 | pass +12 | + - if k in d and d[(k)]: +13 + if d.get((k)): +14 | pass +15 | +16 | not ("key" in dct and dct["key"]) RUF019 [*] Unnecessary key check before dictionary access --> RUF019.py:16:6 @@ -94,16 +86,14 @@ RUF019 [*] Unnecessary key check before dictionary access 18 | bool("key" in dct and dct["key"]) | help: Replace with `dict.get` - -ℹ Safe fix -13 13 | if k in d and d[(k)]: -14 14 | pass -15 15 | -16 |-not ("key" in dct and dct["key"]) - 16 |+not (dct.get("key")) -17 17 | -18 18 | bool("key" in dct and dct["key"]) -19 19 | +13 | if k in d and d[(k)]: +14 | pass +15 | + - not ("key" in dct and dct["key"]) +16 + not (dct.get("key")) +17 | +18 | bool("key" in dct and dct["key"]) +19 | RUF019 [*] Unnecessary key check before dictionary access --> RUF019.py:18:6 @@ -116,13 +106,11 @@ RUF019 [*] Unnecessary key check before dictionary access 20 | # OK | help: Replace with `dict.get` - -ℹ Safe fix -15 15 | -16 16 | not ("key" in dct and dct["key"]) -17 17 | -18 |-bool("key" in dct and dct["key"]) - 18 |+bool(dct.get("key")) -19 19 | -20 20 | # OK -21 21 | v = "k" in d and d["k"] +15 | +16 | not ("key" in dct and dct["key"]) +17 | + - bool("key" in dct and dct["key"]) +18 + bool(dct.get("key")) +19 | +20 | # OK +21 | v = "k" in d and d["k"] diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap index 622af1339b..2f048321b6 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF020_RUF020.py.snap @@ -12,15 +12,13 @@ RUF020 [*] `Union[Never, T]` is equivalent to `T` 5 | Never | int | help: Remove `Never` - -ℹ Safe fix -1 1 | from typing import Never, NoReturn, Union -2 2 | -3 |-Union[Never, int] - 3 |+int -4 4 | Union[NoReturn, int] -5 5 | Never | int -6 6 | NoReturn | int +1 | from typing import Never, NoReturn, Union +2 | + - Union[Never, int] +3 + int +4 | Union[NoReturn, int] +5 | Never | int +6 | NoReturn | int RUF020 [*] `Union[NoReturn, T]` is equivalent to `T` --> RUF020.py:4:7 @@ -32,16 +30,14 @@ RUF020 [*] `Union[NoReturn, T]` is equivalent to `T` 6 | NoReturn | int | help: Remove `NoReturn` - -ℹ Safe fix -1 1 | from typing import Never, NoReturn, Union -2 2 | -3 3 | Union[Never, int] -4 |-Union[NoReturn, int] - 4 |+int -5 5 | Never | int -6 6 | NoReturn | int -7 7 | Union[Union[Never, int], Union[NoReturn, int]] +1 | from typing import Never, NoReturn, Union +2 | +3 | Union[Never, int] + - Union[NoReturn, int] +4 + int +5 | Never | int +6 | NoReturn | int +7 | Union[Union[Never, int], Union[NoReturn, int]] RUF020 [*] `Never | T` is equivalent to `T` --> RUF020.py:5:1 @@ -54,16 +50,14 @@ RUF020 [*] `Never | T` is equivalent to `T` 7 | Union[Union[Never, int], Union[NoReturn, int]] | help: Remove `Never` - -ℹ Safe fix -2 2 | -3 3 | Union[Never, int] -4 4 | Union[NoReturn, int] -5 |-Never | int - 5 |+int -6 6 | NoReturn | int -7 7 | Union[Union[Never, int], Union[NoReturn, int]] -8 8 | Union[NoReturn, int, float] +2 | +3 | Union[Never, int] +4 | Union[NoReturn, int] + - Never | int +5 + int +6 | NoReturn | int +7 | Union[Union[Never, int], Union[NoReturn, int]] +8 | Union[NoReturn, int, float] RUF020 [*] `NoReturn | T` is equivalent to `T` --> RUF020.py:6:1 @@ -76,16 +70,14 @@ RUF020 [*] `NoReturn | T` is equivalent to `T` 8 | Union[NoReturn, int, float] | help: Remove `NoReturn` - -ℹ Safe fix -3 3 | Union[Never, int] -4 4 | Union[NoReturn, int] -5 5 | Never | int -6 |-NoReturn | int - 6 |+int -7 7 | Union[Union[Never, int], Union[NoReturn, int]] -8 8 | Union[NoReturn, int, float] -9 9 | +3 | Union[Never, int] +4 | Union[NoReturn, int] +5 | Never | int + - NoReturn | int +6 + int +7 | Union[Union[Never, int], Union[NoReturn, int]] +8 | Union[NoReturn, int, float] +9 | RUF020 [*] `Union[Never, T]` is equivalent to `T` --> RUF020.py:7:13 @@ -97,16 +89,14 @@ RUF020 [*] `Union[Never, T]` is equivalent to `T` 8 | Union[NoReturn, int, float] | help: Remove `Never` - -ℹ Safe fix -4 4 | Union[NoReturn, int] -5 5 | Never | int -6 6 | NoReturn | int -7 |-Union[Union[Never, int], Union[NoReturn, int]] - 7 |+Union[int, Union[NoReturn, int]] -8 8 | Union[NoReturn, int, float] -9 9 | -10 10 | +4 | Union[NoReturn, int] +5 | Never | int +6 | NoReturn | int + - Union[Union[Never, int], Union[NoReturn, int]] +7 + Union[int, Union[NoReturn, int]] +8 | Union[NoReturn, int, float] +9 | +10 | RUF020 [*] `Union[NoReturn, T]` is equivalent to `T` --> RUF020.py:7:32 @@ -118,16 +108,14 @@ RUF020 [*] `Union[NoReturn, T]` is equivalent to `T` 8 | Union[NoReturn, int, float] | help: Remove `NoReturn` - -ℹ Safe fix -4 4 | Union[NoReturn, int] -5 5 | Never | int -6 6 | NoReturn | int -7 |-Union[Union[Never, int], Union[NoReturn, int]] - 7 |+Union[Union[Never, int], int] -8 8 | Union[NoReturn, int, float] -9 9 | -10 10 | +4 | Union[NoReturn, int] +5 | Never | int +6 | NoReturn | int + - Union[Union[Never, int], Union[NoReturn, int]] +7 + Union[Union[Never, int], int] +8 | Union[NoReturn, int, float] +9 | +10 | RUF020 [*] `Union[NoReturn, T]` is equivalent to `T` --> RUF020.py:8:7 @@ -138,16 +126,14 @@ RUF020 [*] `Union[NoReturn, T]` is equivalent to `T` | ^^^^^^^^ | help: Remove `NoReturn` - -ℹ Safe fix -5 5 | Never | int -6 6 | NoReturn | int -7 7 | Union[Union[Never, int], Union[NoReturn, int]] -8 |-Union[NoReturn, int, float] - 8 |+Union[int, float] -9 9 | -10 10 | -11 11 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 +5 | Never | int +6 | NoReturn | int +7 | Union[Union[Never, int], Union[NoReturn, int]] + - Union[NoReturn, int, float] +8 + Union[int, float] +9 | +10 | +11 | # Regression tests for https://github.com/astral-sh/ruff/issues/14567 RUF020 `Never | T` is equivalent to `T` --> RUF020.py:12:11 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap index 6ea60e2fbe..3da0741c5f 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF021_RUF021.py.snap @@ -10,16 +10,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 13 | x = a or b and c # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix | help: Parenthesize the `and` subexpression - -ℹ Safe fix -9 9 | # as part of a chain. -10 10 | -11 11 | a, b, c = 1, 0, 2 -12 |-x = a or b and c # RUF021: => `a or (b and c)` - 12 |+x = a or (b and c) # RUF021: => `a or (b and c)` -13 13 | x = a or b and c # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix -14 14 | -15 15 | a, b, c = 0, 1, 2 +9 | # as part of a chain. +10 | +11 | a, b, c = 1, 0, 2 + - x = a or b and c # RUF021: => `a or (b and c)` +12 + x = a or (b and c) # RUF021: => `a or (b and c)` +13 | x = a or b and c # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix +14 | +15 | a, b, c = 0, 1, 2 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:13:10 @@ -32,16 +30,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 15 | a, b, c = 0, 1, 2 | help: Parenthesize the `and` subexpression - -ℹ Safe fix -10 10 | -11 11 | a, b, c = 1, 0, 2 -12 12 | x = a or b and c # RUF021: => `a or (b and c)` -13 |-x = a or b and c # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix - 13 |+x = a or (b and c) # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix -14 14 | -15 15 | a, b, c = 0, 1, 2 -16 16 | y = a and b or c # RUF021: => `(a and b) or c` +10 | +11 | a, b, c = 1, 0, 2 +12 | x = a or b and c # RUF021: => `a or (b and c)` + - x = a or b and c # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix +13 + x = a or (b and c) # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix +14 | +15 | a, b, c = 0, 1, 2 +16 | y = a and b or c # RUF021: => `(a and b) or c` RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:16:5 @@ -53,16 +49,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 18 | a, b, c, d = 1, 2, 0, 3 | help: Parenthesize the `and` subexpression - -ℹ Safe fix -13 13 | x = a or b and c # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix -14 14 | -15 15 | a, b, c = 0, 1, 2 -16 |-y = a and b or c # RUF021: => `(a and b) or c` - 16 |+y = (a and b) or c # RUF021: => `(a and b) or c` -17 17 | -18 18 | a, b, c, d = 1, 2, 0, 3 -19 19 | if a or b or c and d: # RUF021: => `a or b or (c and d)` +13 | x = a or b and c # looooooooooooooooooooooooooooooong comment but it won't prevent an autofix +14 | +15 | a, b, c = 0, 1, 2 + - y = a and b or c # RUF021: => `(a and b) or c` +16 + y = (a and b) or c # RUF021: => `(a and b) or c` +17 | +18 | a, b, c, d = 1, 2, 0, 3 +19 | if a or b or c and d: # RUF021: => `a or b or (c and d)` RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:19:14 @@ -73,16 +67,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 20 | pass | help: Parenthesize the `and` subexpression - -ℹ Safe fix -16 16 | y = a and b or c # RUF021: => `(a and b) or c` -17 17 | -18 18 | a, b, c, d = 1, 2, 0, 3 -19 |-if a or b or c and d: # RUF021: => `a or b or (c and d)` - 19 |+if a or b or (c and d): # RUF021: => `a or b or (c and d)` -20 20 | pass -21 21 | -22 22 | a, b, c, d = 0, 0, 2, 3 +16 | y = a and b or c # RUF021: => `(a and b) or c` +17 | +18 | a, b, c, d = 1, 2, 0, 3 + - if a or b or c and d: # RUF021: => `a or b or (c and d)` +19 + if a or b or (c and d): # RUF021: => `a or b or (c and d)` +20 | pass +21 | +22 | a, b, c, d = 0, 0, 2, 3 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:26:11 @@ -94,16 +86,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 27 | pass | help: Parenthesize the `and` subexpression - -ℹ Safe fix -23 23 | -24 24 | if bool(): -25 25 | pass -26 |-elif a or b and c or d: # RUF021: => `a or (b and c) or d` - 26 |+elif a or (b and c) or d: # RUF021: => `a or (b and c) or d` -27 27 | pass -28 28 | -29 29 | a, b, c, d = 0, 1, 0, 2 +23 | +24 | if bool(): +25 | pass + - elif a or b and c or d: # RUF021: => `a or (b and c) or d` +26 + elif a or (b and c) or d: # RUF021: => `a or (b and c) or d` +27 | pass +28 | +29 | a, b, c, d = 0, 1, 0, 2 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:30:7 @@ -114,16 +104,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 31 | pass | help: Parenthesize the `and` subexpression - -ℹ Safe fix -27 27 | pass -28 28 | -29 29 | a, b, c, d = 0, 1, 0, 2 -30 |-while a and b or c and d: # RUF021: => `(and b) or (c and d)` - 30 |+while (a and b) or c and d: # RUF021: => `(and b) or (c and d)` -31 31 | pass -32 32 | -33 33 | b, c, d, e = 2, 3, 0, 4 +27 | pass +28 | +29 | a, b, c, d = 0, 1, 0, 2 + - while a and b or c and d: # RUF021: => `(and b) or (c and d)` +30 + while (a and b) or c and d: # RUF021: => `(and b) or (c and d)` +31 | pass +32 | +33 | b, c, d, e = 2, 3, 0, 4 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:30:18 @@ -134,16 +122,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 31 | pass | help: Parenthesize the `and` subexpression - -ℹ Safe fix -27 27 | pass -28 28 | -29 29 | a, b, c, d = 0, 1, 0, 2 -30 |-while a and b or c and d: # RUF021: => `(and b) or (c and d)` - 30 |+while a and b or (c and d): # RUF021: => `(and b) or (c and d)` -31 31 | pass -32 32 | -33 33 | b, c, d, e = 2, 3, 0, 4 +27 | pass +28 | +29 | a, b, c, d = 0, 1, 0, 2 + - while a and b or c and d: # RUF021: => `(and b) or (c and d)` +30 + while a and b or (c and d): # RUF021: => `(and b) or (c and d)` +31 | pass +32 | +33 | b, c, d, e = 2, 3, 0, 4 RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:35:44 @@ -156,16 +142,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 37 | a, b, c, d = 0, 1, 3, 0 | help: Parenthesize the `and` subexpression - -ℹ Safe fix -32 32 | -33 33 | b, c, d, e = 2, 3, 0, 4 -34 34 | # RUF021: => `a or b or c or (d and e)`: -35 |-z = [a for a in range(5) if a or b or c or d and e] - 35 |+z = [a for a in range(5) if a or b or c or (d and e)] -36 36 | -37 37 | a, b, c, d = 0, 1, 3, 0 -38 38 | assert not a and b or c or d # RUF021: => `(not a and b) or c or d` +32 | +33 | b, c, d, e = 2, 3, 0, 4 +34 | # RUF021: => `a or b or c or (d and e)`: + - z = [a for a in range(5) if a or b or c or d and e] +35 + z = [a for a in range(5) if a or b or c or (d and e)] +36 | +37 | a, b, c, d = 0, 1, 3, 0 +38 | assert not a and b or c or d # RUF021: => `(not a and b) or c or d` RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:38:8 @@ -177,16 +161,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 40 | if (not a) and b or c or d: # RUF021: => `((not a) and b) or c or d` | help: Parenthesize the `and` subexpression - -ℹ Safe fix -35 35 | z = [a for a in range(5) if a or b or c or d and e] -36 36 | -37 37 | a, b, c, d = 0, 1, 3, 0 -38 |-assert not a and b or c or d # RUF021: => `(not a and b) or c or d` - 38 |+assert (not a and b) or c or d # RUF021: => `(not a and b) or c or d` -39 39 | -40 40 | if (not a) and b or c or d: # RUF021: => `((not a) and b) or c or d` -41 41 | if (not a and b) or c or d: # OK +35 | z = [a for a in range(5) if a or b or c or d and e] +36 | +37 | a, b, c, d = 0, 1, 3, 0 + - assert not a and b or c or d # RUF021: => `(not a and b) or c or d` +38 + assert (not a and b) or c or d # RUF021: => `(not a and b) or c or d` +39 | +40 | if (not a) and b or c or d: # RUF021: => `((not a) and b) or c or d` +41 | if (not a and b) or c or d: # OK RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:40:4 @@ -199,16 +181,14 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 42 | pass | help: Parenthesize the `and` subexpression - -ℹ Safe fix -37 37 | a, b, c, d = 0, 1, 3, 0 -38 38 | assert not a and b or c or d # RUF021: => `(not a and b) or c or d` -39 39 | -40 |-if (not a) and b or c or d: # RUF021: => `((not a) and b) or c or d` - 40 |+if ((not a) and b) or c or d: # RUF021: => `((not a) and b) or c or d` -41 41 | if (not a and b) or c or d: # OK -42 42 | pass -43 43 | +37 | a, b, c, d = 0, 1, 3, 0 +38 | assert not a and b or c or d # RUF021: => `(not a and b) or c or d` +39 | + - if (not a) and b or c or d: # RUF021: => `((not a) and b) or c or d` +40 + if ((not a) and b) or c or d: # RUF021: => `((not a) and b) or c or d` +41 | if (not a and b) or c or d: # OK +42 | pass +43 | RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:46:8 @@ -223,18 +203,16 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 49 | and some_fifth_reasonably_long_condition | help: Parenthesize the `and` subexpression - -ℹ Safe fix -43 43 | -44 44 | if ( -45 45 | some_reasonably_long_condition -46 |- or some_other_reasonably_long_condition -47 |- and some_third_reasonably_long_condition - 46 |+ or (some_other_reasonably_long_condition - 47 |+ and some_third_reasonably_long_condition) -48 48 | or some_fourth_reasonably_long_condition -49 49 | and some_fifth_reasonably_long_condition -50 50 | # a comment +43 | +44 | if ( +45 | some_reasonably_long_condition + - or some_other_reasonably_long_condition + - and some_third_reasonably_long_condition +46 + or (some_other_reasonably_long_condition +47 + and some_third_reasonably_long_condition) +48 | or some_fourth_reasonably_long_condition +49 | and some_fifth_reasonably_long_condition +50 | # a comment RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --> RUF021.py:48:8 @@ -252,18 +230,16 @@ RUF021 [*] Parenthesize `a and b` expressions when chaining `and` and `or` toget 54 | or some_eighth_reasonably_long_condition | help: Parenthesize the `and` subexpression - -ℹ Safe fix -45 45 | some_reasonably_long_condition -46 46 | or some_other_reasonably_long_condition -47 47 | and some_third_reasonably_long_condition -48 |- or some_fourth_reasonably_long_condition - 48 |+ or (some_fourth_reasonably_long_condition -49 49 | and some_fifth_reasonably_long_condition -50 50 | # a comment -51 51 | and some_sixth_reasonably_long_condition -52 |- and some_seventh_reasonably_long_condition - 52 |+ and some_seventh_reasonably_long_condition) -53 53 | # another comment -54 54 | or some_eighth_reasonably_long_condition -55 55 | ): +45 | some_reasonably_long_condition +46 | or some_other_reasonably_long_condition +47 | and some_third_reasonably_long_condition + - or some_fourth_reasonably_long_condition +48 + or (some_fourth_reasonably_long_condition +49 | and some_fifth_reasonably_long_condition +50 | # a comment +51 | and some_sixth_reasonably_long_condition + - and some_seventh_reasonably_long_condition +52 + and some_seventh_reasonably_long_condition) +53 | # another comment +54 | or some_eighth_reasonably_long_condition +55 | ): diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap index bc41f1e126..4b78a27794 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF022_RUF022.py.snap @@ -12,16 +12,14 @@ RUF022 [*] `__all__` is not sorted 7 | __all__ = ("d", "c", "b", "a") | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -2 2 | # Single-line __all__ definitions (nice 'n' easy!) -3 3 | ################################################## -4 4 | -5 |-__all__ = ["d", "c", "b", "a"] # a comment that is untouched - 5 |+__all__ = ["a", "b", "c", "d"] # a comment that is untouched -6 6 | __all__ += ["foo", "bar", "antipasti"] -7 7 | __all__ = ("d", "c", "b", "a") -8 8 | +2 | # Single-line __all__ definitions (nice 'n' easy!) +3 | ################################################## +4 | + - __all__ = ["d", "c", "b", "a"] # a comment that is untouched +5 + __all__ = ["a", "b", "c", "d"] # a comment that is untouched +6 | __all__ += ["foo", "bar", "antipasti"] +7 | __all__ = ("d", "c", "b", "a") +8 | RUF022 [*] `__all__` is not sorted --> RUF022.py:6:12 @@ -32,16 +30,14 @@ RUF022 [*] `__all__` is not sorted 7 | __all__ = ("d", "c", "b", "a") | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -3 3 | ################################################## -4 4 | -5 5 | __all__ = ["d", "c", "b", "a"] # a comment that is untouched -6 |-__all__ += ["foo", "bar", "antipasti"] - 6 |+__all__ += ["antipasti", "bar", "foo"] -7 7 | __all__ = ("d", "c", "b", "a") -8 8 | -9 9 | # Quoting style is retained, +3 | ################################################## +4 | +5 | __all__ = ["d", "c", "b", "a"] # a comment that is untouched + - __all__ += ["foo", "bar", "antipasti"] +6 + __all__ += ["antipasti", "bar", "foo"] +7 | __all__ = ("d", "c", "b", "a") +8 | +9 | # Quoting style is retained, RUF022 [*] `__all__` is not sorted --> RUF022.py:7:11 @@ -54,16 +50,14 @@ RUF022 [*] `__all__` is not sorted 9 | # Quoting style is retained, | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -4 4 | -5 5 | __all__ = ["d", "c", "b", "a"] # a comment that is untouched -6 6 | __all__ += ["foo", "bar", "antipasti"] -7 |-__all__ = ("d", "c", "b", "a") - 7 |+__all__ = ("a", "b", "c", "d") -8 8 | -9 9 | # Quoting style is retained, -10 10 | # but unnecessary parens are not +4 | +5 | __all__ = ["d", "c", "b", "a"] # a comment that is untouched +6 | __all__ += ["foo", "bar", "antipasti"] + - __all__ = ("d", "c", "b", "a") +7 + __all__ = ("a", "b", "c", "d") +8 | +9 | # Quoting style is retained, +10 | # but unnecessary parens are not RUF022 [*] `__all__` is not sorted --> RUF022.py:11:17 @@ -76,16 +70,14 @@ RUF022 [*] `__all__` is not sorted 13 | # (but they are in multiline `__all__` definitions) | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -8 8 | -9 9 | # Quoting style is retained, -10 10 | # but unnecessary parens are not -11 |-__all__: list = ['b', "c", ((('a')))] - 11 |+__all__: list = ['a', 'b', "c"] -12 12 | # Trailing commas are also not retained in single-line `__all__` definitions -13 13 | # (but they are in multiline `__all__` definitions) -14 14 | __all__: tuple = ("b", "c", "a",) +8 | +9 | # Quoting style is retained, +10 | # but unnecessary parens are not + - __all__: list = ['b', "c", ((('a')))] +11 + __all__: list = ['a', 'b', "c"] +12 | # Trailing commas are also not retained in single-line `__all__` definitions +13 | # (but they are in multiline `__all__` definitions) +14 | __all__: tuple = ("b", "c", "a",) RUF022 [*] `__all__` is not sorted --> RUF022.py:14:18 @@ -98,16 +90,14 @@ RUF022 [*] `__all__` is not sorted 16 | if bool(): | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -11 11 | __all__: list = ['b', "c", ((('a')))] -12 12 | # Trailing commas are also not retained in single-line `__all__` definitions -13 13 | # (but they are in multiline `__all__` definitions) -14 |-__all__: tuple = ("b", "c", "a",) - 14 |+__all__: tuple = ("a", "b", "c") -15 15 | -16 16 | if bool(): -17 17 | __all__ += ("x", "m", "a", "s") +11 | __all__: list = ['b', "c", ((('a')))] +12 | # Trailing commas are also not retained in single-line `__all__` definitions +13 | # (but they are in multiline `__all__` definitions) + - __all__: tuple = ("b", "c", "a",) +14 + __all__: tuple = ("a", "b", "c") +15 | +16 | if bool(): +17 | __all__ += ("x", "m", "a", "s") RUF022 [*] `__all__` is not sorted --> RUF022.py:17:16 @@ -119,16 +109,14 @@ RUF022 [*] `__all__` is not sorted 19 | __all__ += "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -14 14 | __all__: tuple = ("b", "c", "a",) -15 15 | -16 16 | if bool(): -17 |- __all__ += ("x", "m", "a", "s") - 17 |+ __all__ += ("a", "m", "s", "x") -18 18 | else: -19 19 | __all__ += "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) -20 20 | +14 | __all__: tuple = ("b", "c", "a",) +15 | +16 | if bool(): + - __all__ += ("x", "m", "a", "s") +17 + __all__ += ("a", "m", "s", "x") +18 | else: +19 | __all__ += "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) +20 | RUF022 [*] `__all__` is not sorted --> RUF022.py:19:16 @@ -141,16 +129,14 @@ RUF022 [*] `__all__` is not sorted 21 | __all__: list[str] = ["the", "three", "little", "pigs"] | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -16 16 | if bool(): -17 17 | __all__ += ("x", "m", "a", "s") -18 18 | else: -19 |- __all__ += "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) - 19 |+ __all__ += "foo1", "foo2", "foo3" # NB: an implicit tuple (without parens) -20 20 | -21 21 | __all__: list[str] = ["the", "three", "little", "pigs"] -22 22 | +16 | if bool(): +17 | __all__ += ("x", "m", "a", "s") +18 | else: + - __all__ += "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) +19 + __all__ += "foo1", "foo2", "foo3" # NB: an implicit tuple (without parens) +20 | +21 | __all__: list[str] = ["the", "three", "little", "pigs"] +22 | RUF022 [*] `__all__` is not sorted --> RUF022.py:21:22 @@ -163,16 +149,14 @@ RUF022 [*] `__all__` is not sorted 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -18 18 | else: -19 19 | __all__ += "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) -20 20 | -21 |-__all__: list[str] = ["the", "three", "little", "pigs"] - 21 |+__all__: list[str] = ["little", "pigs", "the", "three"] -22 22 | -23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") -24 24 | __all__.extend(["foo", "bar"]) +18 | else: +19 | __all__ += "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) +20 | + - __all__: list[str] = ["the", "three", "little", "pigs"] +21 + __all__: list[str] = ["little", "pigs", "the", "three"] +22 | +23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +24 | __all__.extend(["foo", "bar"]) RUF022 [*] `__all__` is not sorted --> RUF022.py:23:11 @@ -185,16 +169,14 @@ RUF022 [*] `__all__` is not sorted 25 | __all__.extend(("foo", "bar")) | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -20 20 | -21 21 | __all__: list[str] = ["the", "three", "little", "pigs"] -22 22 | -23 |-__all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") - 23 |+__all__ = "an_unparenthesized_tuple", "in", "parenthesized_item" -24 24 | __all__.extend(["foo", "bar"]) -25 25 | __all__.extend(("foo", "bar")) -26 26 | __all__.extend((((["foo", "bar"])))) +20 | +21 | __all__: list[str] = ["the", "three", "little", "pigs"] +22 | + - __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +23 + __all__ = "an_unparenthesized_tuple", "in", "parenthesized_item" +24 | __all__.extend(["foo", "bar"]) +25 | __all__.extend(("foo", "bar")) +26 | __all__.extend((((["foo", "bar"])))) RUF022 [*] `__all__` is not sorted --> RUF022.py:24:16 @@ -206,16 +188,14 @@ RUF022 [*] `__all__` is not sorted 26 | __all__.extend((((["foo", "bar"])))) | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -21 21 | __all__: list[str] = ["the", "three", "little", "pigs"] -22 22 | -23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") -24 |-__all__.extend(["foo", "bar"]) - 24 |+__all__.extend(["bar", "foo"]) -25 25 | __all__.extend(("foo", "bar")) -26 26 | __all__.extend((((["foo", "bar"])))) -27 27 | +21 | __all__: list[str] = ["the", "three", "little", "pigs"] +22 | +23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") + - __all__.extend(["foo", "bar"]) +24 + __all__.extend(["bar", "foo"]) +25 | __all__.extend(("foo", "bar")) +26 | __all__.extend((((["foo", "bar"])))) +27 | RUF022 [*] `__all__` is not sorted --> RUF022.py:25:16 @@ -227,16 +207,14 @@ RUF022 [*] `__all__` is not sorted 26 | __all__.extend((((["foo", "bar"])))) | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -22 22 | -23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") -24 24 | __all__.extend(["foo", "bar"]) -25 |-__all__.extend(("foo", "bar")) - 25 |+__all__.extend(("bar", "foo")) -26 26 | __all__.extend((((["foo", "bar"])))) -27 27 | -28 28 | #################################### +22 | +23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +24 | __all__.extend(["foo", "bar"]) + - __all__.extend(("foo", "bar")) +25 + __all__.extend(("bar", "foo")) +26 | __all__.extend((((["foo", "bar"])))) +27 | +28 | #################################### RUF022 [*] `__all__` is not sorted --> RUF022.py:26:19 @@ -249,16 +227,14 @@ RUF022 [*] `__all__` is not sorted 28 | #################################### | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -23 23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") -24 24 | __all__.extend(["foo", "bar"]) -25 25 | __all__.extend(("foo", "bar")) -26 |-__all__.extend((((["foo", "bar"])))) - 26 |+__all__.extend((((["bar", "foo"])))) -27 27 | -28 28 | #################################### -29 29 | # Neat multiline __all__ definitions +23 | __all__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +24 | __all__.extend(["foo", "bar"]) +25 | __all__.extend(("foo", "bar")) + - __all__.extend((((["foo", "bar"])))) +26 + __all__.extend((((["bar", "foo"])))) +27 | +28 | #################################### +29 | # Neat multiline __all__ definitions RUF022 [*] `__all__` is not sorted --> RUF022.py:32:11 @@ -278,23 +254,22 @@ RUF022 [*] `__all__` is not sorted 40 | __all__ = [ | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -30 30 | #################################### -31 31 | -32 32 | __all__ = ( -33 |- "d0", - 33 |+ # a comment regarding 'a0': - 34 |+ "a0", - 35 |+ "b0", -34 36 | "c0", # a comment regarding 'c0' -35 |- "b0", -36 |- # a comment regarding 'a0': -37 |- "a0" - 37 |+ "d0" -38 38 | ) -39 39 | -40 40 | __all__ = [ +30 | #################################### +31 | +32 | __all__ = ( + - "d0", +33 + # a comment regarding 'a0': +34 + "a0", +35 + "b0", +36 | "c0", # a comment regarding 'c0' + - "b0", + - # a comment regarding 'a0': + - "a0" +37 + "d0" +38 | ) +39 | +40 | __all__ = [ +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:40:11 @@ -314,23 +289,22 @@ RUF022 [*] `__all__` is not sorted 48 | # we implement an "isort-style sort": | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -38 38 | ) -39 39 | -40 40 | __all__ = [ -41 |- "d", - 41 |+ # a comment regarding 'a': - 42 |+ "a", - 43 |+ "b", -42 44 | "c", # a comment regarding 'c' -43 |- "b", -44 |- # a comment regarding 'a': -45 |- "a" - 45 |+ "d" -46 46 | ] -47 47 | -48 48 | # we implement an "isort-style sort": +38 | ) +39 | +40 | __all__ = [ + - "d", +41 + # a comment regarding 'a': +42 + "a", +43 + "b", +44 | "c", # a comment regarding 'c' + - "b", + - # a comment regarding 'a': + - "a" +45 + "d" +46 | ] +47 | +48 | # we implement an "isort-style sort": +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:54:11 @@ -374,51 +348,49 @@ RUF022 [*] `__all__` is not sorted 86 | ########################################## | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -54 54 | __all__ = [ -55 55 | "APRIL", -56 56 | "AUGUST", -57 |- "Calendar", -58 57 | "DECEMBER", -59 |- "Day", -60 58 | "FEBRUARY", -61 59 | "FRIDAY", -62 |- "HTMLCalendar", -63 |- "IllegalMonthError", -64 60 | "JANUARY", -65 61 | "JULY", -66 62 | "JUNE", -67 |- "LocaleHTMLCalendar", -68 63 | "MARCH", -69 64 | "MAY", -70 65 | "MONDAY", -71 |- "Month", -72 66 | "NOVEMBER", -73 67 | "OCTOBER", -74 68 | "SATURDAY", +54 | __all__ = [ +55 | "APRIL", +56 | "AUGUST", + - "Calendar", +57 | "DECEMBER", + - "Day", +58 | "FEBRUARY", +59 | "FRIDAY", + - "HTMLCalendar", + - "IllegalMonthError", +60 | "JANUARY", +61 | "JULY", +62 | "JUNE", + - "LocaleHTMLCalendar", +63 | "MARCH", +64 | "MAY", +65 | "MONDAY", + - "Month", +66 | "NOVEMBER", +67 | "OCTOBER", +68 | "SATURDAY", -------------------------------------------------------------------------------- -76 70 | "SUNDAY", -77 71 | "THURSDAY", -78 72 | "TUESDAY", -79 |- "TextCalendar", -80 73 | "WEDNESDAY", - 74 |+ "Calendar", - 75 |+ "Day", - 76 |+ "HTMLCalendar", - 77 |+ "IllegalMonthError", - 78 |+ "LocaleHTMLCalendar", - 79 |+ "Month", - 80 |+ "TextCalendar", -81 81 | "calendar", -82 82 | "timegm", -83 83 | "weekday", -84 |- "weekheader"] - 84 |+ "weekheader", - 85 |+] -85 86 | -86 87 | ########################################## -87 88 | # Messier multiline __all__ definitions... +70 | "SUNDAY", +71 | "THURSDAY", +72 | "TUESDAY", + - "TextCalendar", +73 | "WEDNESDAY", +74 + "Calendar", +75 + "Day", +76 + "HTMLCalendar", +77 + "IllegalMonthError", +78 + "LocaleHTMLCalendar", +79 + "Month", +80 + "TextCalendar", +81 | "calendar", +82 | "timegm", +83 | "weekday", + - "weekheader"] +84 + "weekheader", +85 + ] +86 | +87 | ########################################## +88 | # Messier multiline __all__ definitions... RUF022 [*] `__all__` is not sorted --> RUF022.py:91:11 @@ -437,28 +409,27 @@ RUF022 [*] `__all__` is not sorted 99 | # comment7 | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -88 88 | ########################################## -89 89 | -90 90 | # comment0 -91 |-__all__ = ("d", "a", # comment1 -92 |- # comment2 -93 |- "f", "b", -94 |- "strangely", # comment3 -95 |- # comment4 - 91 |+__all__ = ( - 92 |+ "a", - 93 |+ "b", - 94 |+ "d", # comment1 - 95 |+ # comment2 - 96 |+ "f", - 97 |+ # comment4 -96 98 | "formatted", - 99 |+ "strangely", # comment3 -97 100 | # comment5 -98 101 | ) # comment6 -99 102 | # comment7 +88 | ########################################## +89 | +90 | # comment0 + - __all__ = ("d", "a", # comment1 + - # comment2 + - "f", "b", + - "strangely", # comment3 + - # comment4 +91 + __all__ = ( +92 + "a", +93 + "b", +94 + "d", # comment1 +95 + # comment2 +96 + "f", +97 + # comment4 +98 | "formatted", +99 + "strangely", # comment3 +100 | # comment5 +101 | ) # comment6 +102 | # comment7 +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:101:11 @@ -479,21 +450,20 @@ RUF022 [*] `__all__` is not sorted 110 | __all__ = ["register", "lookup", "open", "EncodedFile", "BOM", "BOM_BE", | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -99 99 | # comment7 -100 100 | -101 101 | __all__ = [ # comment0 - 102 |+ "ax", - 103 |+ "bx", - 104 |+ "cx", -102 105 | # comment1 -103 106 | # comment2 -104 |- "dx", "cx", "bx", "ax" # comment3 - 107 |+ "dx" # comment3 -105 108 | # comment4 -106 109 | # comment5 -107 110 | # comment6 +99 | # comment7 +100 | +101 | __all__ = [ # comment0 +102 + "ax", +103 + "bx", +104 + "cx", +105 | # comment1 +106 | # comment2 + - "dx", "cx", "bx", "ax" # comment3 +107 + "dx" # comment3 +108 | # comment4 +109 | # comment5 +110 | # comment6 +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:110:11 @@ -520,74 +490,72 @@ RUF022 [*] `__all__` is not sorted 125 | __all__: tuple[str, ...] = ( # a comment about the opening paren | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -107 107 | # comment6 -108 108 | ] # comment7 -109 109 | -110 |-__all__ = ["register", "lookup", "open", "EncodedFile", "BOM", "BOM_BE", -111 |- "BOM_LE", "BOM32_BE", "BOM32_LE", "BOM64_BE", "BOM64_LE", -112 |- "BOM_UTF8", "BOM_UTF16", "BOM_UTF16_LE", "BOM_UTF16_BE", -113 |- "BOM_UTF32", "BOM_UTF32_LE", "BOM_UTF32_BE", -114 |- "CodecInfo", "Codec", "IncrementalEncoder", "IncrementalDecoder", -115 |- "StreamReader", "StreamWriter", -116 |- "StreamReaderWriter", "StreamRecoder", -117 |- "getencoder", "getdecoder", "getincrementalencoder", -118 |- "getincrementaldecoder", "getreader", "getwriter", -119 |- "encode", "decode", "iterencode", "iterdecode", -120 |- "strict_errors", "ignore_errors", "replace_errors", -121 |- "xmlcharrefreplace_errors", -122 |- "backslashreplace_errors", "namereplace_errors", -123 |- "register_error", "lookup_error"] - 110 |+__all__ = [ - 111 |+ "BOM", - 112 |+ "BOM32_BE", - 113 |+ "BOM32_LE", - 114 |+ "BOM64_BE", - 115 |+ "BOM64_LE", - 116 |+ "BOM_BE", - 117 |+ "BOM_LE", - 118 |+ "BOM_UTF8", - 119 |+ "BOM_UTF16", - 120 |+ "BOM_UTF16_BE", - 121 |+ "BOM_UTF16_LE", - 122 |+ "BOM_UTF32", - 123 |+ "BOM_UTF32_BE", - 124 |+ "BOM_UTF32_LE", - 125 |+ "Codec", - 126 |+ "CodecInfo", - 127 |+ "EncodedFile", - 128 |+ "IncrementalDecoder", - 129 |+ "IncrementalEncoder", - 130 |+ "StreamReader", - 131 |+ "StreamReaderWriter", - 132 |+ "StreamRecoder", - 133 |+ "StreamWriter", - 134 |+ "backslashreplace_errors", - 135 |+ "decode", - 136 |+ "encode", - 137 |+ "getdecoder", - 138 |+ "getencoder", - 139 |+ "getincrementaldecoder", - 140 |+ "getincrementalencoder", - 141 |+ "getreader", - 142 |+ "getwriter", - 143 |+ "ignore_errors", - 144 |+ "iterdecode", - 145 |+ "iterencode", - 146 |+ "lookup", - 147 |+ "lookup_error", - 148 |+ "namereplace_errors", - 149 |+ "open", - 150 |+ "register", - 151 |+ "register_error", - 152 |+ "replace_errors", - 153 |+ "strict_errors", - 154 |+ "xmlcharrefreplace_errors", - 155 |+] -124 156 | -125 157 | __all__: tuple[str, ...] = ( # a comment about the opening paren -126 158 | # multiline comment about "bbb" part 1 +107 | # comment6 +108 | ] # comment7 +109 | + - __all__ = ["register", "lookup", "open", "EncodedFile", "BOM", "BOM_BE", + - "BOM_LE", "BOM32_BE", "BOM32_LE", "BOM64_BE", "BOM64_LE", + - "BOM_UTF8", "BOM_UTF16", "BOM_UTF16_LE", "BOM_UTF16_BE", + - "BOM_UTF32", "BOM_UTF32_LE", "BOM_UTF32_BE", + - "CodecInfo", "Codec", "IncrementalEncoder", "IncrementalDecoder", + - "StreamReader", "StreamWriter", + - "StreamReaderWriter", "StreamRecoder", + - "getencoder", "getdecoder", "getincrementalencoder", + - "getincrementaldecoder", "getreader", "getwriter", + - "encode", "decode", "iterencode", "iterdecode", + - "strict_errors", "ignore_errors", "replace_errors", + - "xmlcharrefreplace_errors", + - "backslashreplace_errors", "namereplace_errors", + - "register_error", "lookup_error"] +110 + __all__ = [ +111 + "BOM", +112 + "BOM32_BE", +113 + "BOM32_LE", +114 + "BOM64_BE", +115 + "BOM64_LE", +116 + "BOM_BE", +117 + "BOM_LE", +118 + "BOM_UTF8", +119 + "BOM_UTF16", +120 + "BOM_UTF16_BE", +121 + "BOM_UTF16_LE", +122 + "BOM_UTF32", +123 + "BOM_UTF32_BE", +124 + "BOM_UTF32_LE", +125 + "Codec", +126 + "CodecInfo", +127 + "EncodedFile", +128 + "IncrementalDecoder", +129 + "IncrementalEncoder", +130 + "StreamReader", +131 + "StreamReaderWriter", +132 + "StreamRecoder", +133 + "StreamWriter", +134 + "backslashreplace_errors", +135 + "decode", +136 + "encode", +137 + "getdecoder", +138 + "getencoder", +139 + "getincrementaldecoder", +140 + "getincrementalencoder", +141 + "getreader", +142 + "getwriter", +143 + "ignore_errors", +144 + "iterdecode", +145 + "iterencode", +146 + "lookup", +147 + "lookup_error", +148 + "namereplace_errors", +149 + "open", +150 + "register", +151 + "register_error", +152 + "replace_errors", +153 + "strict_errors", +154 + "xmlcharrefreplace_errors", +155 + ] +156 | +157 | __all__: tuple[str, ...] = ( # a comment about the opening paren +158 | # multiline comment about "bbb" part 1 RUF022 [*] `__all__` is not sorted --> RUF022.py:125:28 @@ -608,23 +576,22 @@ RUF022 [*] `__all__` is not sorted 134 | # we use natural sort for `__all__`, | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -123 123 | "register_error", "lookup_error"] -124 124 | -125 125 | __all__: tuple[str, ...] = ( # a comment about the opening paren - 126 |+ # multiline comment about "aaa" part 1 - 127 |+ # multiline comment about "aaa" part 2 - 128 |+ "aaa", -126 129 | # multiline comment about "bbb" part 1 -127 130 | # multiline comment about "bbb" part 2 -128 131 | "bbb", -129 |- # multiline comment about "aaa" part 1 -130 |- # multiline comment about "aaa" part 2 -131 |- "aaa", -132 132 | ) -133 133 | -134 134 | # we use natural sort for `__all__`, +123 | "register_error", "lookup_error"] +124 | +125 | __all__: tuple[str, ...] = ( # a comment about the opening paren +126 + # multiline comment about "aaa" part 1 +127 + # multiline comment about "aaa" part 2 +128 + "aaa", +129 | # multiline comment about "bbb" part 1 +130 | # multiline comment about "bbb" part 2 +131 | "bbb", + - # multiline comment about "aaa" part 1 + - # multiline comment about "aaa" part 2 + - "aaa", +132 | ) +133 | +134 | # we use natural sort for `__all__`, +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:138:11 @@ -643,21 +610,19 @@ RUF022 [*] `__all__` is not sorted 145 | __all__.extend(( # comment0 | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -136 136 | # Also, this doesn't end with a trailing comma, -137 137 | # so the autofix shouldn't introduce one: -138 138 | __all__ = ( - 139 |+ "aadvark174", # the very long whitespace span before this comment is retained -139 140 | "aadvark237", -140 |- "aadvark10092", -141 |- "aadvark174", # the very long whitespace span before this comment is retained -142 |- "aadvark532" # the even longer whitespace span before this comment is retained - 141 |+ "aadvark532", # the even longer whitespace span before this comment is retained - 142 |+ "aadvark10092" -143 143 | ) -144 144 | -145 145 | __all__.extend(( # comment0 +136 | # Also, this doesn't end with a trailing comma, +137 | # so the autofix shouldn't introduce one: +138 | __all__ = ( +139 + "aadvark174", # the very long whitespace span before this comment is retained +140 | "aadvark237", + - "aadvark10092", + - "aadvark174", # the very long whitespace span before this comment is retained + - "aadvark532" # the even longer whitespace span before this comment is retained +141 + "aadvark532", # the even longer whitespace span before this comment is retained +142 + "aadvark10092" +143 | ) +144 | +145 | __all__.extend(( # comment0 RUF022 [*] `__all__` is not sorted --> RUF022.py:145:16 @@ -677,21 +642,20 @@ RUF022 [*] `__all__` is not sorted 153 | __all__.extend( # comment0 | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -143 143 | ) -144 144 | -145 145 | __all__.extend(( # comment0 - 146 |+ # comment about bar - 147 |+ "bar", # comment about bar -146 148 | # comment about foo -147 |- "foo", # comment about foo -148 |- # comment about bar -149 |- "bar" # comment about bar - 149 |+ "foo" # comment about foo -150 150 | # comment1 -151 151 | )) # comment2 -152 152 | +143 | ) +144 | +145 | __all__.extend(( # comment0 +146 + # comment about bar +147 + "bar", # comment about bar +148 | # comment about foo + - "foo", # comment about foo + - # comment about bar + - "bar" # comment about bar +149 + "foo" # comment about foo +150 | # comment1 +151 | )) # comment2 +152 | +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:155:5 @@ -709,21 +673,20 @@ RUF022 [*] `__all__` is not sorted 162 | ) # comment2 | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -153 153 | __all__.extend( # comment0 -154 154 | # comment1 -155 155 | ( # comment2 - 156 |+ # comment about bar - 157 |+ "bar", # comment about bar -156 158 | # comment about foo -157 |- "foo", # comment about foo -158 |- # comment about bar -159 |- "bar" # comment about bar - 159 |+ "foo" # comment about foo -160 160 | # comment3 -161 161 | ) # comment4 -162 162 | ) # comment2 +153 | __all__.extend( # comment0 +154 | # comment1 +155 | ( # comment2 +156 + # comment about bar +157 + "bar", # comment about bar +158 | # comment about foo + - "foo", # comment about foo + - # comment about bar + - "bar" # comment about bar +159 + "foo" # comment about foo +160 | # comment3 +161 | ) # comment4 +162 | ) # comment2 +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:164:16 @@ -743,21 +706,20 @@ RUF022 [*] `__all__` is not sorted 172 | __all__.extend( # comment0 | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -162 162 | ) # comment2 -163 163 | -164 164 | __all__.extend([ # comment0 - 165 |+ # comment about bar - 166 |+ "bar", # comment about bar -165 167 | # comment about foo -166 |- "foo", # comment about foo -167 |- # comment about bar -168 |- "bar" # comment about bar - 168 |+ "foo" # comment about foo -169 169 | # comment1 -170 170 | ]) # comment2 -171 171 | +162 | ) # comment2 +163 | +164 | __all__.extend([ # comment0 +165 + # comment about bar +166 + "bar", # comment about bar +167 | # comment about foo + - "foo", # comment about foo + - # comment about bar + - "bar" # comment about bar +168 + "foo" # comment about foo +169 | # comment1 +170 | ]) # comment2 +171 | +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:174:5 @@ -775,21 +737,20 @@ RUF022 [*] `__all__` is not sorted 181 | ) # comment2 | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -172 172 | __all__.extend( # comment0 -173 173 | # comment1 -174 174 | [ # comment2 - 175 |+ # comment about bar - 176 |+ "bar", # comment about bar -175 177 | # comment about foo -176 |- "foo", # comment about foo -177 |- # comment about bar -178 |- "bar" # comment about bar - 178 |+ "foo" # comment about foo -179 179 | # comment3 -180 180 | ] # comment4 -181 181 | ) # comment2 +172 | __all__.extend( # comment0 +173 | # comment1 +174 | [ # comment2 +175 + # comment about bar +176 + "bar", # comment about bar +177 | # comment about foo + - "foo", # comment about foo + - # comment about bar + - "bar" # comment about bar +178 + "foo" # comment about foo +179 | # comment3 +180 | ] # comment4 +181 | ) # comment2 +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:183:11 @@ -806,23 +767,22 @@ RUF022 [*] `__all__` is not sorted 188 | __all__ = ["Awaitable", "Coroutine", | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -180 180 | ] # comment4 -181 181 | ) # comment2 -182 182 | -183 |-__all__ = ["Style", "Treeview", -184 |- # Extensions -185 |- "LabeledScale", "OptionMenu", - 183 |+__all__ = [ - 184 |+ # Extensions - 185 |+ "LabeledScale", - 186 |+ "OptionMenu", - 187 |+ "Style", - 188 |+ "Treeview", -186 189 | ] -187 190 | -188 191 | __all__ = ["Awaitable", "Coroutine", +180 | ] # comment4 +181 | ) # comment2 +182 | + - __all__ = ["Style", "Treeview", + - # Extensions + - "LabeledScale", "OptionMenu", +183 + __all__ = [ +184 + # Extensions +185 + "LabeledScale", +186 + "OptionMenu", +187 + "Style", +188 + "Treeview", +189 | ] +190 | +191 | __all__ = ["Awaitable", "Coroutine", +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:188:11 @@ -838,24 +798,22 @@ RUF022 [*] `__all__` is not sorted 192 | __all__ = [ | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -185 185 | "LabeledScale", "OptionMenu", -186 186 | ] -187 187 | -188 |-__all__ = ["Awaitable", "Coroutine", -189 |- "AsyncIterable", "AsyncIterator", "AsyncGenerator", -190 |- ] - 188 |+__all__ = [ - 189 |+ "AsyncGenerator", - 190 |+ "AsyncIterable", - 191 |+ "AsyncIterator", - 192 |+ "Awaitable", - 193 |+ "Coroutine", - 194 |+] -191 195 | -192 196 | __all__ = [ -193 197 | "foo", +185 | "LabeledScale", "OptionMenu", +186 | ] +187 | + - __all__ = ["Awaitable", "Coroutine", + - "AsyncIterable", "AsyncIterator", "AsyncGenerator", + - ] +188 + __all__ = [ +189 + "AsyncGenerator", +190 + "AsyncIterable", +191 + "AsyncIterator", +192 + "Awaitable", +193 + "Coroutine", +194 + ] +195 | +196 | __all__ = [ +197 | "foo", RUF022 [*] `__all__` is not sorted --> RUF022.py:192:11 @@ -873,18 +831,16 @@ RUF022 [*] `__all__` is not sorted 198 | ######################################################################### | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -190 190 | ] -191 191 | -192 192 | __all__ = [ -193 |- "foo", -194 193 | "bar", -195 194 | "baz", - 195 |+ "foo", -196 196 | ] -197 197 | -198 198 | ######################################################################### +190 | ] +191 | +192 | __all__ = [ + - "foo", +193 | "bar", +194 | "baz", +195 + "foo", +196 | ] +197 | +198 | ######################################################################### RUF022 `__all__` is not sorted --> RUF022.py:204:11 @@ -949,18 +905,16 @@ RUF022 [*] `__all__` is not sorted 229 | __all__ = [ | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -223 223 | ############################################################ -224 224 | -225 225 | __all__ = ( - 226 |+ "dumps", -226 227 | "loads", -227 |- "dumps",) - 228 |+) -228 229 | -229 230 | __all__ = [ -230 231 | "loads", +223 | ############################################################ +224 | +225 | __all__ = ( +226 + "dumps", +227 | "loads", + - "dumps",) +228 + ) +229 | +230 | __all__ = [ +231 | "loads", RUF022 [*] `__all__` is not sorted --> RUF022.py:229:11 @@ -976,18 +930,16 @@ RUF022 [*] `__all__` is not sorted 233 | __all__ = ['xp', 'yp', | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -227 227 | "dumps",) -228 228 | -229 229 | __all__ = [ -230 |- "loads", -231 |- "dumps" , ] - 230 |+ "dumps", - 231 |+ "loads" , ] -232 232 | -233 233 | __all__ = ['xp', 'yp', -234 234 | 'canvas' +227 | "dumps",) +228 | +229 | __all__ = [ + - "loads", + - "dumps" , ] +230 + "dumps", +231 + "loads" , ] +232 | +233 | __all__ = ['xp', 'yp', +234 | 'canvas' RUF022 [*] `__all__` is not sorted --> RUF022.py:233:11 @@ -1009,20 +961,18 @@ RUF022 [*] `__all__` is not sorted 243 | __all__ = ( | help: Apply an isort-style sorting to `__all__` - -ℹ Safe fix -230 230 | "loads", -231 231 | "dumps" , ] -232 232 | -233 |-__all__ = ['xp', 'yp', -234 |- 'canvas' - 233 |+__all__ = [ - 234 |+ 'canvas', - 235 |+ 'xp', - 236 |+ 'yp' -235 237 | -236 238 | # very strangely placed comment -237 239 | +230 | "loads", +231 | "dumps" , ] +232 | + - __all__ = ['xp', 'yp', + - 'canvas' +233 + __all__ = [ +234 + 'canvas', +235 + 'xp', +236 + 'yp' +237 | +238 | # very strangely placed comment +239 | RUF022 [*] `__all__` is not sorted --> RUF022.py:243:11 @@ -1044,21 +994,20 @@ RUF022 [*] `__all__` is not sorted 253 | __all__ = ( # comment about the opening paren | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -241 241 | ] -242 242 | -243 243 | __all__ = ( -244 |- "foo" -245 244 | # strange comment 1 -246 |- , -247 245 | # comment about bar -248 |- "bar" - 246 |+ "bar", - 247 |+ "foo" -249 248 | # strange comment 2 -250 249 | , -251 250 | ) +241 | ] +242 | +243 | __all__ = ( + - "foo" +244 | # strange comment 1 + - , +245 | # comment about bar + - "bar" +246 + "bar", +247 + "foo" +248 | # strange comment 2 +249 | , +250 | ) +note: This is an unsafe fix and may change runtime behavior RUF022 [*] `__all__` is not sorted --> RUF022.py:253:11 @@ -1087,25 +1036,24 @@ RUF022 [*] `__all__` is not sorted 270 | ################################### | help: Apply an isort-style sorting to `__all__` - -ℹ Unsafe fix -251 251 | ) -252 252 | -253 253 | __all__ = ( # comment about the opening paren -254 |- # multiline strange comment 0a -255 |- # multiline strange comment 0b -256 |- "foo" # inline comment about foo -257 254 | # multiline strange comment 1a -258 255 | # multiline strange comment 1b -259 |- , # comment about the comma?? - 256 |+ # comment about the comma?? -260 257 | # comment about bar part a -261 258 | # comment about bar part b -262 |- "bar" # inline comment about bar - 259 |+ "bar", # inline comment about bar - 260 |+ # multiline strange comment 0a - 261 |+ # multiline strange comment 0b - 262 |+ "foo" # inline comment about foo -263 263 | # strange multiline comment comment 2a -264 264 | # strange multiline comment 2b -265 265 | , +251 | ) +252 | +253 | __all__ = ( # comment about the opening paren + - # multiline strange comment 0a + - # multiline strange comment 0b + - "foo" # inline comment about foo +254 | # multiline strange comment 1a +255 | # multiline strange comment 1b + - , # comment about the comma?? +256 + # comment about the comma?? +257 | # comment about bar part a +258 | # comment about bar part b + - "bar" # inline comment about bar +259 + "bar", # inline comment about bar +260 + # multiline strange comment 0a +261 + # multiline strange comment 0b +262 + "foo" # inline comment about foo +263 | # strange multiline comment comment 2a +264 | # strange multiline comment 2b +265 | , +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap index a65d4c791d..31141c4872 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF023_RUF023.py.snap @@ -10,16 +10,14 @@ RUF023 [*] `Klass.__slots__` is not sorted 7 | __slots__ = ("d", "c", "b", "a") | help: Apply a natural sort to `Klass.__slots__` - -ℹ Safe fix -3 3 | ######################### -4 4 | -5 5 | class Klass: -6 |- __slots__ = ["d", "c", "b", "a"] # a comment that is untouched - 6 |+ __slots__ = ["a", "b", "c", "d"] # a comment that is untouched -7 7 | __slots__ = ("d", "c", "b", "a") -8 8 | -9 9 | # Quoting style is retained, +3 | ######################### +4 | +5 | class Klass: + - __slots__ = ["d", "c", "b", "a"] # a comment that is untouched +6 + __slots__ = ["a", "b", "c", "d"] # a comment that is untouched +7 | __slots__ = ("d", "c", "b", "a") +8 | +9 | # Quoting style is retained, RUF023 [*] `Klass.__slots__` is not sorted --> RUF023.py:7:17 @@ -32,16 +30,14 @@ RUF023 [*] `Klass.__slots__` is not sorted 9 | # Quoting style is retained, | help: Apply a natural sort to `Klass.__slots__` - -ℹ Safe fix -4 4 | -5 5 | class Klass: -6 6 | __slots__ = ["d", "c", "b", "a"] # a comment that is untouched -7 |- __slots__ = ("d", "c", "b", "a") - 7 |+ __slots__ = ("a", "b", "c", "d") -8 8 | -9 9 | # Quoting style is retained, -10 10 | # but unnecessary parens are not +4 | +5 | class Klass: +6 | __slots__ = ["d", "c", "b", "a"] # a comment that is untouched + - __slots__ = ("d", "c", "b", "a") +7 + __slots__ = ("a", "b", "c", "d") +8 | +9 | # Quoting style is retained, +10 | # but unnecessary parens are not RUF023 [*] `Klass.__slots__` is not sorted --> RUF023.py:11:22 @@ -54,16 +50,14 @@ RUF023 [*] `Klass.__slots__` is not sorted 13 | # (but they are in multiline definitions) | help: Apply a natural sort to `Klass.__slots__` - -ℹ Safe fix -8 8 | -9 9 | # Quoting style is retained, -10 10 | # but unnecessary parens are not -11 |- __slots__: set = {'b', "c", ((('a')))} - 11 |+ __slots__: set = {'a', 'b', "c"} -12 12 | # Trailing commas are also not retained for single-line definitions -13 13 | # (but they are in multiline definitions) -14 14 | __slots__: tuple = ("b", "c", "a",) +8 | +9 | # Quoting style is retained, +10 | # but unnecessary parens are not + - __slots__: set = {'b', "c", ((('a')))} +11 + __slots__: set = {'a', 'b', "c"} +12 | # Trailing commas are also not retained for single-line definitions +13 | # (but they are in multiline definitions) +14 | __slots__: tuple = ("b", "c", "a",) RUF023 [*] `Klass.__slots__` is not sorted --> RUF023.py:14:24 @@ -76,16 +70,14 @@ RUF023 [*] `Klass.__slots__` is not sorted 16 | class Klass2: | help: Apply a natural sort to `Klass.__slots__` - -ℹ Safe fix -11 11 | __slots__: set = {'b', "c", ((('a')))} -12 12 | # Trailing commas are also not retained for single-line definitions -13 13 | # (but they are in multiline definitions) -14 |- __slots__: tuple = ("b", "c", "a",) - 14 |+ __slots__: tuple = ("a", "b", "c") -15 15 | -16 16 | class Klass2: -17 17 | if bool(): +11 | __slots__: set = {'b', "c", ((('a')))} +12 | # Trailing commas are also not retained for single-line definitions +13 | # (but they are in multiline definitions) + - __slots__: tuple = ("b", "c", "a",) +14 + __slots__: tuple = ("a", "b", "c") +15 | +16 | class Klass2: +17 | if bool(): RUF023 [*] `Klass2.__slots__` is not sorted --> RUF023.py:18:21 @@ -98,16 +90,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted 20 | __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) | help: Apply a natural sort to `Klass2.__slots__` - -ℹ Safe fix -15 15 | -16 16 | class Klass2: -17 17 | if bool(): -18 |- __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"} - 18 |+ __slots__ = {"a": "docs for a", "m": "docs for m", "x": "docs for x"} -19 19 | else: -20 20 | __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) -21 21 | +15 | +16 | class Klass2: +17 | if bool(): + - __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"} +18 + __slots__ = {"a": "docs for a", "m": "docs for m", "x": "docs for x"} +19 | else: +20 | __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) +21 | RUF023 [*] `Klass2.__slots__` is not sorted --> RUF023.py:20:21 @@ -120,16 +110,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted 22 | __slots__: list[str] = ["the", "three", "little", "pigs"] | help: Apply a natural sort to `Klass2.__slots__` - -ℹ Safe fix -17 17 | if bool(): -18 18 | __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"} -19 19 | else: -20 |- __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) - 20 |+ __slots__ = "foo1", "foo2", "foo3" # NB: an implicit tuple (without parens) -21 21 | -22 22 | __slots__: list[str] = ["the", "three", "little", "pigs"] -23 23 | __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +17 | if bool(): +18 | __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"} +19 | else: + - __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) +20 + __slots__ = "foo1", "foo2", "foo3" # NB: an implicit tuple (without parens) +21 | +22 | __slots__: list[str] = ["the", "three", "little", "pigs"] +23 | __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") RUF023 [*] `Klass2.__slots__` is not sorted --> RUF023.py:22:28 @@ -142,16 +130,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted 24 | # we use natural sort, | help: Apply a natural sort to `Klass2.__slots__` - -ℹ Safe fix -19 19 | else: -20 20 | __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) -21 21 | -22 |- __slots__: list[str] = ["the", "three", "little", "pigs"] - 22 |+ __slots__: list[str] = ["little", "pigs", "the", "three"] -23 23 | __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") -24 24 | # we use natural sort, -25 25 | # not alphabetical sort or "isort-style" sort +19 | else: +20 | __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) +21 | + - __slots__: list[str] = ["the", "three", "little", "pigs"] +22 + __slots__: list[str] = ["little", "pigs", "the", "three"] +23 | __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +24 | # we use natural sort, +25 | # not alphabetical sort or "isort-style" sort RUF023 [*] `Klass2.__slots__` is not sorted --> RUF023.py:23:17 @@ -163,16 +149,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted 25 | # not alphabetical sort or "isort-style" sort | help: Apply a natural sort to `Klass2.__slots__` - -ℹ Safe fix -20 20 | __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) -21 21 | -22 22 | __slots__: list[str] = ["the", "three", "little", "pigs"] -23 |- __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") - 23 |+ __slots__ = "an_unparenthesized_tuple", "in", "parenthesized_item" -24 24 | # we use natural sort, -25 25 | # not alphabetical sort or "isort-style" sort -26 26 | __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"} +20 | __slots__ = "foo3", "foo2", "foo1" # NB: an implicit tuple (without parens) +21 | +22 | __slots__: list[str] = ["the", "three", "little", "pigs"] + - __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +23 + __slots__ = "an_unparenthesized_tuple", "in", "parenthesized_item" +24 | # we use natural sort, +25 | # not alphabetical sort or "isort-style" sort +26 | __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"} RUF023 [*] `Klass2.__slots__` is not sorted --> RUF023.py:26:17 @@ -185,16 +169,14 @@ RUF023 [*] `Klass2.__slots__` is not sorted 28 | ############################ | help: Apply a natural sort to `Klass2.__slots__` - -ℹ Safe fix -23 23 | __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") -24 24 | # we use natural sort, -25 25 | # not alphabetical sort or "isort-style" sort -26 |- __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"} - 26 |+ __slots__ = {"aadvark174", "aadvark237", "aadvark532", "aadvark10092"} -27 27 | -28 28 | ############################ -29 29 | # Neat multiline definitions +23 | __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple") +24 | # we use natural sort, +25 | # not alphabetical sort or "isort-style" sort + - __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"} +26 + __slots__ = {"aadvark174", "aadvark237", "aadvark532", "aadvark10092"} +27 | +28 | ############################ +29 | # Neat multiline definitions RUF023 [*] `Klass3.__slots__` is not sorted --> RUF023.py:33:17 @@ -213,23 +195,22 @@ RUF023 [*] `Klass3.__slots__` is not sorted 41 | "d", | help: Apply a natural sort to `Klass3.__slots__` - -ℹ Unsafe fix -31 31 | -32 32 | class Klass3: -33 33 | __slots__ = ( -34 |- "d0", - 34 |+ # a comment regarding 'a0': - 35 |+ "a0", - 36 |+ "b0", -35 37 | "c0", # a comment regarding 'c0' -36 |- "b0", -37 |- # a comment regarding 'a0': -38 |- "a0" - 38 |+ "d0" -39 39 | ) -40 40 | __slots__ = [ -41 41 | "d", +31 | +32 | class Klass3: +33 | __slots__ = ( + - "d0", +34 + # a comment regarding 'a0': +35 + "a0", +36 + "b0", +37 | "c0", # a comment regarding 'c0' + - "b0", + - # a comment regarding 'a0': + - "a0" +38 + "d0" +39 | ) +40 | __slots__ = [ +41 | "d", +note: This is an unsafe fix and may change runtime behavior RUF023 [*] `Klass3.__slots__` is not sorted --> RUF023.py:40:17 @@ -249,23 +230,22 @@ RUF023 [*] `Klass3.__slots__` is not sorted 48 | ################################## | help: Apply a natural sort to `Klass3.__slots__` - -ℹ Unsafe fix -38 38 | "a0" -39 39 | ) -40 40 | __slots__ = [ -41 |- "d", - 41 |+ # a comment regarding 'a': - 42 |+ "a", - 43 |+ "b", -42 44 | "c", # a comment regarding 'c' -43 |- "b", -44 |- # a comment regarding 'a': -45 |- "a" - 45 |+ "d" -46 46 | ] -47 47 | -48 48 | ################################## +38 | "a0" +39 | ) +40 | __slots__ = [ + - "d", +41 + # a comment regarding 'a': +42 + "a", +43 + "b", +44 | "c", # a comment regarding 'c' + - "b", + - # a comment regarding 'a': + - "a" +45 + "d" +46 | ] +47 | +48 | ################################## +note: This is an unsafe fix and may change runtime behavior RUF023 [*] `Klass4.__slots__` is not sorted --> RUF023.py:54:17 @@ -285,28 +265,27 @@ RUF023 [*] `Klass4.__slots__` is not sorted 62 | # comment7 | help: Apply a natural sort to `Klass4.__slots__` - -ℹ Unsafe fix -51 51 | -52 52 | class Klass4: -53 53 | # comment0 -54 |- __slots__ = ("d", "a", # comment1 -55 |- # comment2 -56 |- "f", "b", -57 |- "strangely", # comment3 -58 |- # comment4 - 54 |+ __slots__ = ( - 55 |+ "a", - 56 |+ "b", - 57 |+ "d", # comment1 - 58 |+ # comment2 - 59 |+ "f", - 60 |+ # comment4 -59 61 | "formatted", - 62 |+ "strangely", # comment3 -60 63 | # comment5 -61 64 | ) # comment6 -62 65 | # comment7 +51 | +52 | class Klass4: +53 | # comment0 + - __slots__ = ("d", "a", # comment1 + - # comment2 + - "f", "b", + - "strangely", # comment3 + - # comment4 +54 + __slots__ = ( +55 + "a", +56 + "b", +57 + "d", # comment1 +58 + # comment2 +59 + "f", +60 + # comment4 +61 | "formatted", +62 + "strangely", # comment3 +63 | # comment5 +64 | ) # comment6 +65 | # comment7 +note: This is an unsafe fix and may change runtime behavior RUF023 [*] `Klass4.__slots__` is not sorted --> RUF023.py:64:17 @@ -327,21 +306,20 @@ RUF023 [*] `Klass4.__slots__` is not sorted 73 | # from cpython/Lib/pathlib/__init__.py | help: Apply a natural sort to `Klass4.__slots__` - -ℹ Unsafe fix -62 62 | # comment7 -63 63 | -64 64 | __slots__ = [ # comment0 - 65 |+ "ax", - 66 |+ "bx", - 67 |+ "cx", -65 68 | # comment1 -66 69 | # comment2 -67 |- "dx", "cx", "bx", "ax" # comment3 - 70 |+ "dx" # comment3 -68 71 | # comment4 -69 72 | # comment5 -70 73 | # comment6 +62 | # comment7 +63 | +64 | __slots__ = [ # comment0 +65 + "ax", +66 + "bx", +67 + "cx", +68 | # comment1 +69 | # comment2 + - "dx", "cx", "bx", "ax" # comment3 +70 + "dx" # comment3 +71 | # comment4 +72 | # comment5 +73 | # comment6 +note: This is an unsafe fix and may change runtime behavior RUF023 [*] `PurePath.__slots__` is not sorted --> RUF023.py:75:17 @@ -389,61 +367,60 @@ RUF023 [*] `PurePath.__slots__` is not sorted 111 | # From cpython/Lib/pickletools.py | help: Apply a natural sort to `PurePath.__slots__` - -ℹ Unsafe fix -73 73 | # from cpython/Lib/pathlib/__init__.py -74 74 | class PurePath: -75 75 | __slots__ = ( -76 |- # The `_raw_paths` slot stores unnormalized string paths. This is set -77 |- # in the `__init__()` method. -78 |- '_raw_paths', -79 |- -80 76 | # The `_drv`, `_root` and `_tail_cached` slots store parsed and -81 77 | # normalized parts of the path. They are set when any of the `drive`, -82 78 | # `root` or `_tail` properties are accessed for the first time. The +73 | # from cpython/Lib/pathlib/__init__.py +74 | class PurePath: +75 | __slots__ = ( + - # The `_raw_paths` slot stores unnormalized string paths. This is set + - # in the `__init__()` method. + - '_raw_paths', + - +76 | # The `_drv`, `_root` and `_tail_cached` slots store parsed and +77 | # normalized parts of the path. They are set when any of the `drive`, +78 | # `root` or `_tail` properties are accessed for the first time. The -------------------------------------------------------------------------------- -84 80 | # `os.path.splitroot()`, except that the tail is further split on path -85 81 | # separators (i.e. it is a list of strings), and that the root and -86 82 | # tail are normalized. -87 |- '_drv', '_root', '_tail_cached', -88 |- - 83 |+ '_drv', - 84 |+ # The `_hash` slot stores the hash of the case-normalized string - 85 |+ # path. It's set when `__hash__()` is called for the first time. - 86 |+ '_hash', - 87 |+ # The `_parts_normcase_cached` slot stores the case-normalized - 88 |+ # string path after splitting on path separators. It's set when the - 89 |+ # `_parts_normcase` property is accessed for the first time. It's used - 90 |+ # to implement comparison methods like `__lt__()`. - 91 |+ '_parts_normcase_cached', - 92 |+ # The `_raw_paths` slot stores unnormalized string paths. This is set - 93 |+ # in the `__init__()` method. - 94 |+ '_raw_paths', - 95 |+ '_root', -89 96 | # The `_str` slot stores the string representation of the path, -90 97 | # computed from the drive, root and tail when `__str__()` is called -91 98 | # for the first time. It's used to implement `_str_normcase` -92 99 | '_str', -93 |- -94 100 | # The `_str_normcase_cached` slot stores the string path with -95 101 | # normalized case. It is set when the `_str_normcase` property is -96 102 | # accessed for the first time. It's used to implement `__eq__()` -97 103 | # `__hash__()`, and `_parts_normcase` -98 104 | '_str_normcase_cached', -99 |- -100 |- # The `_parts_normcase_cached` slot stores the case-normalized -101 |- # string path after splitting on path separators. It's set when the -102 |- # `_parts_normcase` property is accessed for the first time. It's used -103 |- # to implement comparison methods like `__lt__()`. -104 |- '_parts_normcase_cached', -105 |- -106 |- # The `_hash` slot stores the hash of the case-normalized string -107 |- # path. It's set when `__hash__()` is called for the first time. -108 |- '_hash', - 105 |+ '_tail_cached', -109 106 | ) -110 107 | -111 108 | # From cpython/Lib/pickletools.py +80 | # `os.path.splitroot()`, except that the tail is further split on path +81 | # separators (i.e. it is a list of strings), and that the root and +82 | # tail are normalized. + - '_drv', '_root', '_tail_cached', + - +83 + '_drv', +84 + # The `_hash` slot stores the hash of the case-normalized string +85 + # path. It's set when `__hash__()` is called for the first time. +86 + '_hash', +87 + # The `_parts_normcase_cached` slot stores the case-normalized +88 + # string path after splitting on path separators. It's set when the +89 + # `_parts_normcase` property is accessed for the first time. It's used +90 + # to implement comparison methods like `__lt__()`. +91 + '_parts_normcase_cached', +92 + # The `_raw_paths` slot stores unnormalized string paths. This is set +93 + # in the `__init__()` method. +94 + '_raw_paths', +95 + '_root', +96 | # The `_str` slot stores the string representation of the path, +97 | # computed from the drive, root and tail when `__str__()` is called +98 | # for the first time. It's used to implement `_str_normcase` +99 | '_str', + - +100 | # The `_str_normcase_cached` slot stores the string path with +101 | # normalized case. It is set when the `_str_normcase` property is +102 | # accessed for the first time. It's used to implement `__eq__()` +103 | # `__hash__()`, and `_parts_normcase` +104 | '_str_normcase_cached', + - + - # The `_parts_normcase_cached` slot stores the case-normalized + - # string path after splitting on path separators. It's set when the + - # `_parts_normcase` property is accessed for the first time. It's used + - # to implement comparison methods like `__lt__()`. + - '_parts_normcase_cached', + - + - # The `_hash` slot stores the hash of the case-normalized string + - # path. It's set when `__hash__()` is called for the first time. + - '_hash', +105 + '_tail_cached', +106 | ) +107 | +108 | # From cpython/Lib/pickletools.py +note: This is an unsafe fix and may change runtime behavior RUF023 [*] `ArgumentDescriptor.__slots__` is not sorted --> RUF023.py:113:17 @@ -473,33 +450,32 @@ RUF023 [*] `ArgumentDescriptor.__slots__` is not sorted 131 | #################################### | help: Apply a natural sort to `ArgumentDescriptor.__slots__` - -ℹ Unsafe fix -111 111 | # From cpython/Lib/pickletools.py -112 112 | class ArgumentDescriptor(object): -113 113 | __slots__ = ( -114 |- # name of descriptor record, also a module global name; a string -115 |- 'name', -116 |- - 114 |+ # human-readable docs for this arg descriptor; a string - 115 |+ 'doc', -117 116 | # length of argument, in bytes; an int; UP_TO_NEWLINE and -118 117 | # TAKEN_FROM_ARGUMENT{1,4,8} are negative values for variable-length -119 118 | # cases -120 119 | 'n', -121 |- - 120 |+ # name of descriptor record, also a module global name; a string - 121 |+ 'name', -122 122 | # a function taking a file-like object, reading this kind of argument -123 123 | # from the object at the current position, advancing the current -124 124 | # position by n bytes, and returning the value of the argument -125 125 | 'reader', -126 |- -127 |- # human-readable docs for this arg descriptor; a string -128 |- 'doc', -129 126 | ) -130 127 | -131 128 | #################################### +111 | # From cpython/Lib/pickletools.py +112 | class ArgumentDescriptor(object): +113 | __slots__ = ( + - # name of descriptor record, also a module global name; a string + - 'name', + - +114 + # human-readable docs for this arg descriptor; a string +115 + 'doc', +116 | # length of argument, in bytes; an int; UP_TO_NEWLINE and +117 | # TAKEN_FROM_ARGUMENT{1,4,8} are negative values for variable-length +118 | # cases +119 | 'n', + - +120 + # name of descriptor record, also a module global name; a string +121 + 'name', +122 | # a function taking a file-like object, reading this kind of argument +123 | # from the object at the current position, advancing the current +124 | # position by n bytes, and returning the value of the argument +125 | 'reader', + - + - # human-readable docs for this arg descriptor; a string + - 'doc', +126 | ) +127 | +128 | #################################### +note: This is an unsafe fix and may change runtime behavior RUF023 `SlotUser.__slots__` is not sorted --> RUF023.py:138:17 @@ -574,21 +550,19 @@ RUF023 [*] `BezierBuilder.__slots__` is not sorted 165 | class BezierBuilder2: | help: Apply a natural sort to `BezierBuilder.__slots__` - -ℹ Safe fix -159 159 | ############################################################ -160 160 | -161 161 | class BezierBuilder: -162 |- __slots__ = ('xp', 'yp', -163 |- 'canvas',) - 162 |+ __slots__ = ( - 163 |+ 'canvas', - 164 |+ 'xp', - 165 |+ 'yp', - 166 |+ ) -164 167 | -165 168 | class BezierBuilder2: -166 169 | __slots__ = {'xp', 'yp', +159 | ############################################################ +160 | +161 | class BezierBuilder: + - __slots__ = ('xp', 'yp', + - 'canvas',) +162 + __slots__ = ( +163 + 'canvas', +164 + 'xp', +165 + 'yp', +166 + ) +167 | +168 | class BezierBuilder2: +169 | __slots__ = {'xp', 'yp', RUF023 [*] `BezierBuilder2.__slots__` is not sorted --> RUF023.py:166:17 @@ -602,20 +576,18 @@ RUF023 [*] `BezierBuilder2.__slots__` is not sorted 169 | class BezierBuilder3: | help: Apply a natural sort to `BezierBuilder2.__slots__` - -ℹ Safe fix -163 163 | 'canvas',) -164 164 | -165 165 | class BezierBuilder2: -166 |- __slots__ = {'xp', 'yp', -167 |- 'canvas' , } - 166 |+ __slots__ = { - 167 |+ 'canvas', - 168 |+ 'xp', - 169 |+ 'yp' , } -168 170 | -169 171 | class BezierBuilder3: -170 172 | __slots__ = ['xp', 'yp', +163 | 'canvas',) +164 | +165 | class BezierBuilder2: + - __slots__ = {'xp', 'yp', + - 'canvas' , } +166 + __slots__ = { +167 + 'canvas', +168 + 'xp', +169 + 'yp' , } +170 | +171 | class BezierBuilder3: +172 | __slots__ = ['xp', 'yp', RUF023 [*] `BezierBuilder3.__slots__` is not sorted --> RUF023.py:170:17 @@ -636,20 +608,18 @@ RUF023 [*] `BezierBuilder3.__slots__` is not sorted 180 | class BezierBuilder4: | help: Apply a natural sort to `BezierBuilder3.__slots__` - -ℹ Safe fix -167 167 | 'canvas' , } -168 168 | -169 169 | class BezierBuilder3: -170 |- __slots__ = ['xp', 'yp', -171 |- 'canvas' - 170 |+ __slots__ = [ - 171 |+ 'canvas', - 172 |+ 'xp', - 173 |+ 'yp' -172 174 | -173 175 | # very strangely placed comment -174 176 | +167 | 'canvas' , } +168 | +169 | class BezierBuilder3: + - __slots__ = ['xp', 'yp', + - 'canvas' +170 + __slots__ = [ +171 + 'canvas', +172 + 'xp', +173 + 'yp' +174 | +175 | # very strangely placed comment +176 | RUF023 [*] `BezierBuilder4.__slots__` is not sorted --> RUF023.py:181:17 @@ -670,21 +640,20 @@ RUF023 [*] `BezierBuilder4.__slots__` is not sorted 191 | __slots__ = {"foo", "bar", | help: Apply a natural sort to `BezierBuilder4.__slots__` - -ℹ Unsafe fix -179 179 | -180 180 | class BezierBuilder4: -181 181 | __slots__ = ( -182 |- "foo" -183 182 | # strange comment 1 -184 |- , -185 183 | # comment about bar -186 |- "bar" - 184 |+ "bar", - 185 |+ "foo" -187 186 | # strange comment 2 -188 187 | , -189 188 | ) +179 | +180 | class BezierBuilder4: +181 | __slots__ = ( + - "foo" +182 | # strange comment 1 + - , +183 | # comment about bar + - "bar" +184 + "bar", +185 + "foo" +186 | # strange comment 2 +187 | , +188 | ) +note: This is an unsafe fix and may change runtime behavior RUF023 [*] `BezierBuilder4.__slots__` is not sorted --> RUF023.py:191:17 @@ -698,23 +667,21 @@ RUF023 [*] `BezierBuilder4.__slots__` is not sorted | |__________________^ | help: Apply a natural sort to `BezierBuilder4.__slots__` - -ℹ Safe fix -188 188 | , -189 189 | ) -190 190 | -191 |- __slots__ = {"foo", "bar", -192 |- "baz", "bingo" -193 |- } - 191 |+ __slots__ = { - 192 |+ "bar", - 193 |+ "baz", - 194 |+ "bingo", - 195 |+ "foo" - 196 |+ } -194 197 | -195 198 | -196 199 | class VeryDRY: +188 | , +189 | ) +190 | + - __slots__ = {"foo", "bar", + - "baz", "bingo" + - } +191 + __slots__ = { +192 + "bar", +193 + "baz", +194 + "bingo", +195 + "foo" +196 + } +197 | +198 | +199 | class VeryDRY: RUF023 [*] `VeryDRY.__slots__` is not sorted --> RUF023.py:199:17 @@ -726,13 +693,12 @@ RUF023 [*] `VeryDRY.__slots__` is not sorted 200 | __match_args__ = __slots__ | help: Apply a natural sort to `VeryDRY.__slots__` - -ℹ Unsafe fix -196 196 | class VeryDRY: -197 197 | # This should get flagged, *but* the fix is unsafe, -198 198 | # since the `__slots__` binding is used by the `__match_args__` definition -199 |- __slots__ = ("foo", "bar") - 199 |+ __slots__ = ("bar", "foo") -200 200 | __match_args__ = __slots__ -201 201 | -202 202 | +196 | class VeryDRY: +197 | # This should get flagged, *but* the fix is unsafe, +198 | # since the `__slots__` binding is used by the `__match_args__` definition + - __slots__ = ("foo", "bar") +199 + __slots__ = ("bar", "foo") +200 | __match_args__ = __slots__ +201 | +202 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap index ce97d23957..7074716545 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF024_RUF024.py.snap @@ -11,16 +11,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` 11 | dict.fromkeys(pierogi_fillings, {}) | help: Replace with comprehension - -ℹ Unsafe fix -6 6 | ] -7 7 | -8 8 | # Errors. -9 |-dict.fromkeys(pierogi_fillings, []) - 9 |+{key: [] for key in pierogi_fillings} -10 10 | dict.fromkeys(pierogi_fillings, list()) -11 11 | dict.fromkeys(pierogi_fillings, {}) -12 12 | dict.fromkeys(pierogi_fillings, set()) +6 | ] +7 | +8 | # Errors. + - dict.fromkeys(pierogi_fillings, []) +9 + {key: [] for key in pierogi_fillings} +10 | dict.fromkeys(pierogi_fillings, list()) +11 | dict.fromkeys(pierogi_fillings, {}) +12 | dict.fromkeys(pierogi_fillings, set()) +note: This is an unsafe fix and may change runtime behavior RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` --> RUF024.py:10:1 @@ -33,16 +32,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` 12 | dict.fromkeys(pierogi_fillings, set()) | help: Replace with comprehension - -ℹ Unsafe fix -7 7 | -8 8 | # Errors. -9 9 | dict.fromkeys(pierogi_fillings, []) -10 |-dict.fromkeys(pierogi_fillings, list()) - 10 |+{key: list() for key in pierogi_fillings} -11 11 | dict.fromkeys(pierogi_fillings, {}) -12 12 | dict.fromkeys(pierogi_fillings, set()) -13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) +7 | +8 | # Errors. +9 | dict.fromkeys(pierogi_fillings, []) + - dict.fromkeys(pierogi_fillings, list()) +10 + {key: list() for key in pierogi_fillings} +11 | dict.fromkeys(pierogi_fillings, {}) +12 | dict.fromkeys(pierogi_fillings, set()) +13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) +note: This is an unsafe fix and may change runtime behavior RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` --> RUF024.py:11:1 @@ -55,16 +53,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) | help: Replace with comprehension - -ℹ Unsafe fix -8 8 | # Errors. -9 9 | dict.fromkeys(pierogi_fillings, []) -10 10 | dict.fromkeys(pierogi_fillings, list()) -11 |-dict.fromkeys(pierogi_fillings, {}) - 11 |+{key: {} for key in pierogi_fillings} -12 12 | dict.fromkeys(pierogi_fillings, set()) -13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) -14 14 | dict.fromkeys(pierogi_fillings, dict()) +8 | # Errors. +9 | dict.fromkeys(pierogi_fillings, []) +10 | dict.fromkeys(pierogi_fillings, list()) + - dict.fromkeys(pierogi_fillings, {}) +11 + {key: {} for key in pierogi_fillings} +12 | dict.fromkeys(pierogi_fillings, set()) +13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) +14 | dict.fromkeys(pierogi_fillings, dict()) +note: This is an unsafe fix and may change runtime behavior RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` --> RUF024.py:12:1 @@ -77,16 +74,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` 14 | dict.fromkeys(pierogi_fillings, dict()) | help: Replace with comprehension - -ℹ Unsafe fix -9 9 | dict.fromkeys(pierogi_fillings, []) -10 10 | dict.fromkeys(pierogi_fillings, list()) -11 11 | dict.fromkeys(pierogi_fillings, {}) -12 |-dict.fromkeys(pierogi_fillings, set()) - 12 |+{key: set() for key in pierogi_fillings} -13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) -14 14 | dict.fromkeys(pierogi_fillings, dict()) -15 15 | import builtins +9 | dict.fromkeys(pierogi_fillings, []) +10 | dict.fromkeys(pierogi_fillings, list()) +11 | dict.fromkeys(pierogi_fillings, {}) + - dict.fromkeys(pierogi_fillings, set()) +12 + {key: set() for key in pierogi_fillings} +13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) +14 | dict.fromkeys(pierogi_fillings, dict()) +15 | import builtins +note: This is an unsafe fix and may change runtime behavior RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` --> RUF024.py:13:1 @@ -99,16 +95,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` 15 | import builtins | help: Replace with comprehension - -ℹ Unsafe fix -10 10 | dict.fromkeys(pierogi_fillings, list()) -11 11 | dict.fromkeys(pierogi_fillings, {}) -12 12 | dict.fromkeys(pierogi_fillings, set()) -13 |-dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) - 13 |+{key: {"pre": "populated!"} for key in pierogi_fillings} -14 14 | dict.fromkeys(pierogi_fillings, dict()) -15 15 | import builtins -16 16 | builtins.dict.fromkeys(pierogi_fillings, dict()) +10 | dict.fromkeys(pierogi_fillings, list()) +11 | dict.fromkeys(pierogi_fillings, {}) +12 | dict.fromkeys(pierogi_fillings, set()) + - dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) +13 + {key: {"pre": "populated!"} for key in pierogi_fillings} +14 | dict.fromkeys(pierogi_fillings, dict()) +15 | import builtins +16 | builtins.dict.fromkeys(pierogi_fillings, dict()) +note: This is an unsafe fix and may change runtime behavior RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` --> RUF024.py:14:1 @@ -121,16 +116,15 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` 16 | builtins.dict.fromkeys(pierogi_fillings, dict()) | help: Replace with comprehension - -ℹ Unsafe fix -11 11 | dict.fromkeys(pierogi_fillings, {}) -12 12 | dict.fromkeys(pierogi_fillings, set()) -13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) -14 |-dict.fromkeys(pierogi_fillings, dict()) - 14 |+{key: dict() for key in pierogi_fillings} -15 15 | import builtins -16 16 | builtins.dict.fromkeys(pierogi_fillings, dict()) -17 17 | +11 | dict.fromkeys(pierogi_fillings, {}) +12 | dict.fromkeys(pierogi_fillings, set()) +13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) + - dict.fromkeys(pierogi_fillings, dict()) +14 + {key: dict() for key in pierogi_fillings} +15 | import builtins +16 | builtins.dict.fromkeys(pierogi_fillings, dict()) +17 | +note: This is an unsafe fix and may change runtime behavior RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` --> RUF024.py:16:1 @@ -143,13 +137,12 @@ RUF024 [*] Do not pass mutable objects as values to `dict.fromkeys` 18 | # Okay. | help: Replace with comprehension - -ℹ Unsafe fix -13 13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) -14 14 | dict.fromkeys(pierogi_fillings, dict()) -15 15 | import builtins -16 |-builtins.dict.fromkeys(pierogi_fillings, dict()) - 16 |+{key: dict() for key in pierogi_fillings} -17 17 | -18 18 | # Okay. -19 19 | dict.fromkeys(pierogi_fillings) +13 | dict.fromkeys(pierogi_fillings, {"pre": "populated!"}) +14 | dict.fromkeys(pierogi_fillings, dict()) +15 | import builtins + - builtins.dict.fromkeys(pierogi_fillings, dict()) +16 + {key: dict() for key in pierogi_fillings} +17 | +18 | # Okay. +19 | dict.fromkeys(pierogi_fillings) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap index d04a3b3768..1cff1f125a 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF026_RUF026.py.snap @@ -9,16 +9,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=int)` - -ℹ Unsafe fix -8 8 | -9 9 | -10 10 | def func(): -11 |- defaultdict(default_factory=int) # RUF026 - 11 |+ defaultdict(int) # RUF026 -12 12 | -13 13 | -14 14 | def func(): +8 | +9 | +10 | def func(): + - defaultdict(default_factory=int) # RUF026 +11 + defaultdict(int) # RUF026 +12 | +13 | +14 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:15:5 @@ -28,16 +27,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=float)` - -ℹ Unsafe fix -12 12 | -13 13 | -14 14 | def func(): -15 |- defaultdict(default_factory=float) # RUF026 - 15 |+ defaultdict(float) # RUF026 -16 16 | -17 17 | -18 18 | def func(): +12 | +13 | +14 | def func(): + - defaultdict(default_factory=float) # RUF026 +15 + defaultdict(float) # RUF026 +16 | +17 | +18 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:19:5 @@ -47,16 +45,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=dict)` - -ℹ Unsafe fix -16 16 | -17 17 | -18 18 | def func(): -19 |- defaultdict(default_factory=dict) # RUF026 - 19 |+ defaultdict(dict) # RUF026 -20 20 | -21 21 | -22 22 | def func(): +16 | +17 | +18 | def func(): + - defaultdict(default_factory=dict) # RUF026 +19 + defaultdict(dict) # RUF026 +20 | +21 | +22 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:23:5 @@ -66,16 +63,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=list)` - -ℹ Unsafe fix -20 20 | -21 21 | -22 22 | def func(): -23 |- defaultdict(default_factory=list) # RUF026 - 23 |+ defaultdict(list) # RUF026 -24 24 | -25 25 | -26 26 | def func(): +20 | +21 | +22 | def func(): + - defaultdict(default_factory=list) # RUF026 +23 + defaultdict(list) # RUF026 +24 | +25 | +26 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:27:5 @@ -85,16 +81,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=tuple)` - -ℹ Unsafe fix -24 24 | -25 25 | -26 26 | def func(): -27 |- defaultdict(default_factory=tuple) # RUF026 - 27 |+ defaultdict(tuple) # RUF026 -28 28 | -29 29 | -30 30 | def func(): +24 | +25 | +26 | def func(): + - defaultdict(default_factory=tuple) # RUF026 +27 + defaultdict(tuple) # RUF026 +28 | +29 | +30 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:34:5 @@ -105,16 +100,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=foo)` - -ℹ Unsafe fix -31 31 | def foo(): -32 32 | pass -33 33 | -34 |- defaultdict(default_factory=foo) # RUF026 - 34 |+ defaultdict(foo) # RUF026 -35 35 | -36 36 | -37 37 | def func(): +31 | def foo(): +32 | pass +33 | + - defaultdict(default_factory=foo) # RUF026 +34 + defaultdict(foo) # RUF026 +35 | +36 | +37 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:38:5 @@ -124,16 +118,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=lambda: 1)` - -ℹ Unsafe fix -35 35 | -36 36 | -37 37 | def func(): -38 |- defaultdict(default_factory=lambda: 1) # RUF026 - 38 |+ defaultdict(lambda: 1) # RUF026 -39 39 | -40 40 | -41 41 | def func(): +35 | +36 | +37 | def func(): + - defaultdict(default_factory=lambda: 1) # RUF026 +38 + defaultdict(lambda: 1) # RUF026 +39 | +40 | +41 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:44:5 @@ -144,16 +137,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=deque)` - -ℹ Unsafe fix -41 41 | def func(): -42 42 | from collections import deque -43 43 | -44 |- defaultdict(default_factory=deque) # RUF026 - 44 |+ defaultdict(deque) # RUF026 -45 45 | -46 46 | -47 47 | def func(): +41 | def func(): +42 | from collections import deque +43 | + - defaultdict(default_factory=deque) # RUF026 +44 + defaultdict(deque) # RUF026 +45 | +46 | +47 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:52:5 @@ -164,16 +156,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=MyCallable())` - -ℹ Unsafe fix -49 49 | def __call__(self): -50 50 | pass -51 51 | -52 |- defaultdict(default_factory=MyCallable()) # RUF026 - 52 |+ defaultdict(MyCallable()) # RUF026 -53 53 | -54 54 | -55 55 | def func(): +49 | def __call__(self): +50 | pass +51 | + - defaultdict(default_factory=MyCallable()) # RUF026 +52 + defaultdict(MyCallable()) # RUF026 +53 | +54 | +55 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:56:5 @@ -183,16 +174,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=tuple)` - -ℹ Unsafe fix -53 53 | -54 54 | -55 55 | def func(): -56 |- defaultdict(default_factory=tuple, member=1) # RUF026 - 56 |+ defaultdict(tuple, member=1) # RUF026 -57 57 | -58 58 | -59 59 | def func(): +53 | +54 | +55 | def func(): + - defaultdict(default_factory=tuple, member=1) # RUF026 +56 + defaultdict(tuple, member=1) # RUF026 +57 | +58 | +59 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:60:5 @@ -202,16 +192,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=tuple)` - -ℹ Unsafe fix -57 57 | -58 58 | -59 59 | def func(): -60 |- defaultdict(member=1, default_factory=tuple) # RUF026 - 60 |+ defaultdict(tuple, member=1) # RUF026 -61 61 | -62 62 | -63 63 | def func(): +57 | +58 | +59 | def func(): + - defaultdict(member=1, default_factory=tuple) # RUF026 +60 + defaultdict(tuple, member=1) # RUF026 +61 | +62 | +63 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:64:5 @@ -221,16 +210,15 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `defaultdict(default_factory=tuple)` - -ℹ Unsafe fix -61 61 | -62 62 | -63 63 | def func(): -64 |- defaultdict(member=1, default_factory=tuple,) # RUF026 - 64 |+ defaultdict(tuple, member=1,) # RUF026 -65 65 | -66 66 | -67 67 | def func(): +61 | +62 | +63 | def func(): + - defaultdict(member=1, default_factory=tuple,) # RUF026 +64 + defaultdict(tuple, member=1,) # RUF026 +65 | +66 | +67 | def func(): +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:68:5 @@ -243,17 +231,16 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | |_____^ | help: Replace with `defaultdict(default_factory=tuple)` - -ℹ Unsafe fix -66 66 | -67 67 | def func(): -68 68 | defaultdict( -69 |- member=1, -70 |- default_factory=tuple, - 69 |+ tuple, member=1, -71 70 | ) # RUF026 -72 71 | -73 72 | +66 | +67 | def func(): +68 | defaultdict( + - member=1, + - default_factory=tuple, +69 + tuple, member=1, +70 | ) # RUF026 +71 | +72 | +note: This is an unsafe fix and may change runtime behavior RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` --> RUF026.py:75:5 @@ -266,14 +253,13 @@ RUF026 [*] `default_factory` is a positional-only argument to `defaultdict` | |_____^ | help: Replace with `defaultdict(default_factory=tuple)` - -ℹ Unsafe fix -73 73 | -74 74 | def func(): -75 75 | defaultdict( -76 |- default_factory=tuple, -77 |- member=1, - 76 |+ tuple, member=1, -78 77 | ) # RUF026 -79 78 | -80 79 | +73 | +74 | def func(): +75 | defaultdict( + - default_factory=tuple, + - member=1, +76 + tuple, member=1, +77 | ) # RUF026 +78 | +79 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap index 755a39d5df..fcac406153 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF027_RUF027_0.py.snap @@ -10,16 +10,15 @@ RUF027 [*] Possible f-string without an `f` prefix | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `f` prefix - -ℹ Unsafe fix -2 2 | -3 3 | "always ignore this: {val}" -4 4 | -5 |-print("but don't ignore this: {val}") # RUF027 - 5 |+print(f"but don't ignore this: {val}") # RUF027 -6 6 | -7 7 | -8 8 | def simple_cases(): +2 | +3 | "always ignore this: {val}" +4 | + - print("but don't ignore this: {val}") # RUF027 +5 + print(f"but don't ignore this: {val}") # RUF027 +6 | +7 | +8 | def simple_cases(): +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:10:9 @@ -31,16 +30,15 @@ RUF027 [*] Possible f-string without an `f` prefix 11 | c = "{a} {b} f'{val}' " # RUF027 | help: Add `f` prefix - -ℹ Unsafe fix -7 7 | -8 8 | def simple_cases(): -9 9 | a = 4 -10 |- b = "{a}" # RUF027 - 10 |+ b = f"{a}" # RUF027 -11 11 | c = "{a} {b} f'{val}' " # RUF027 -12 12 | -13 13 | +7 | +8 | def simple_cases(): +9 | a = 4 + - b = "{a}" # RUF027 +10 + b = f"{a}" # RUF027 +11 | c = "{a} {b} f'{val}' " # RUF027 +12 | +13 | +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:11:9 @@ -51,16 +49,15 @@ RUF027 [*] Possible f-string without an `f` prefix | ^^^^^^^^^^^^^^^^^^^ | help: Add `f` prefix - -ℹ Unsafe fix -8 8 | def simple_cases(): -9 9 | a = 4 -10 10 | b = "{a}" # RUF027 -11 |- c = "{a} {b} f'{val}' " # RUF027 - 11 |+ c = f"{a} {b} f'{val}' " # RUF027 -12 12 | -13 13 | -14 14 | def escaped_string(): +8 | def simple_cases(): +9 | a = 4 +10 | b = "{a}" # RUF027 + - c = "{a} {b} f'{val}' " # RUF027 +11 + c = f"{a} {b} f'{val}' " # RUF027 +12 | +13 | +14 | def escaped_string(): +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:21:9 @@ -72,16 +69,15 @@ RUF027 [*] Possible f-string without an `f` prefix 22 | c = r"raw string with \backslashes\ and \"escaped quotes\": {a}" # RUF027 | help: Add `f` prefix - -ℹ Unsafe fix -18 18 | -19 19 | def raw_string(): -20 20 | a = 4 -21 |- b = r"raw string with formatting: {a}" # RUF027 - 21 |+ b = fr"raw string with formatting: {a}" # RUF027 -22 22 | c = r"raw string with \backslashes\ and \"escaped quotes\": {a}" # RUF027 -23 23 | -24 24 | +18 | +19 | def raw_string(): +20 | a = 4 + - b = r"raw string with formatting: {a}" # RUF027 +21 + b = fr"raw string with formatting: {a}" # RUF027 +22 | c = r"raw string with \backslashes\ and \"escaped quotes\": {a}" # RUF027 +23 | +24 | +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:22:9 @@ -92,16 +88,15 @@ RUF027 [*] Possible f-string without an `f` prefix | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `f` prefix - -ℹ Unsafe fix -19 19 | def raw_string(): -20 20 | a = 4 -21 21 | b = r"raw string with formatting: {a}" # RUF027 -22 |- c = r"raw string with \backslashes\ and \"escaped quotes\": {a}" # RUF027 - 22 |+ c = fr"raw string with \backslashes\ and \"escaped quotes\": {a}" # RUF027 -23 23 | -24 24 | -25 25 | def print_name(name: str): +19 | def raw_string(): +20 | a = 4 +21 | b = r"raw string with formatting: {a}" # RUF027 + - c = r"raw string with \backslashes\ and \"escaped quotes\": {a}" # RUF027 +22 + c = fr"raw string with \backslashes\ and \"escaped quotes\": {a}" # RUF027 +23 | +24 | +25 | def print_name(name: str): +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:27:11 @@ -113,16 +108,15 @@ RUF027 [*] Possible f-string without an `f` prefix 28 | print("The test value we're using today is {a}") # RUF027 | help: Add `f` prefix - -ℹ Unsafe fix -24 24 | -25 25 | def print_name(name: str): -26 26 | a = 4 -27 |- print("Hello, {name}!") # RUF027 - 27 |+ print(f"Hello, {name}!") # RUF027 -28 28 | print("The test value we're using today is {a}") # RUF027 -29 29 | -30 30 | +24 | +25 | def print_name(name: str): +26 | a = 4 + - print("Hello, {name}!") # RUF027 +27 + print(f"Hello, {name}!") # RUF027 +28 | print("The test value we're using today is {a}") # RUF027 +29 | +30 | +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:28:11 @@ -133,16 +127,15 @@ RUF027 [*] Possible f-string without an `f` prefix | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `f` prefix - -ℹ Unsafe fix -25 25 | def print_name(name: str): -26 26 | a = 4 -27 27 | print("Hello, {name}!") # RUF027 -28 |- print("The test value we're using today is {a}") # RUF027 - 28 |+ print(f"The test value we're using today is {a}") # RUF027 -29 29 | -30 30 | -31 31 | def nested_funcs(): +25 | def print_name(name: str): +26 | a = 4 +27 | print("Hello, {name}!") # RUF027 + - print("The test value we're using today is {a}") # RUF027 +28 + print(f"The test value we're using today is {a}") # RUF027 +29 | +30 | +31 | def nested_funcs(): +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:33:33 @@ -153,16 +146,15 @@ RUF027 [*] Possible f-string without an `f` prefix | ^^^^^ | help: Add `f` prefix - -ℹ Unsafe fix -30 30 | -31 31 | def nested_funcs(): -32 32 | a = 4 -33 |- print(do_nothing(do_nothing("{a}"))) # RUF027 - 33 |+ print(do_nothing(do_nothing(f"{a}"))) # RUF027 -34 34 | -35 35 | -36 36 | def tripled_quoted(): +30 | +31 | def nested_funcs(): +32 | a = 4 + - print(do_nothing(do_nothing("{a}"))) # RUF027 +33 + print(do_nothing(do_nothing(f"{a}"))) # RUF027 +34 | +35 | +36 | def tripled_quoted(): +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:39:19 @@ -175,16 +167,15 @@ RUF027 [*] Possible f-string without an `f` prefix 41 | multi_line = a = """b { # comment | help: Add `f` prefix - -ℹ Unsafe fix -36 36 | def tripled_quoted(): -37 37 | a = 4 -38 38 | c = a -39 |- single_line = """ {a} """ # RUF027 - 39 |+ single_line = f""" {a} """ # RUF027 -40 40 | # RUF027 -41 41 | multi_line = a = """b { # comment -42 42 | c} d +36 | def tripled_quoted(): +37 | a = 4 +38 | c = a + - single_line = """ {a} """ # RUF027 +39 + single_line = f""" {a} """ # RUF027 +40 | # RUF027 +41 | multi_line = a = """b { # comment +42 | c} d +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:41:22 @@ -198,16 +189,15 @@ RUF027 [*] Possible f-string without an `f` prefix | |_______^ | help: Add `f` prefix - -ℹ Unsafe fix -38 38 | c = a -39 39 | single_line = """ {a} """ # RUF027 -40 40 | # RUF027 -41 |- multi_line = a = """b { # comment - 41 |+ multi_line = a = f"""b { # comment -42 42 | c} d -43 43 | """ -44 44 | +38 | c = a +39 | single_line = """ {a} """ # RUF027 +40 | # RUF027 + - multi_line = a = """b { # comment +41 + multi_line = a = f"""b { # comment +42 | c} d +43 | """ +44 | +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:49:9 @@ -221,16 +211,15 @@ RUF027 [*] Possible f-string without an `f` prefix | |_____^ | help: Add `f` prefix - -ℹ Unsafe fix -46 46 | def single_quoted_multi_line(): -47 47 | a = 4 -48 48 | # RUF027 -49 |- b = " {\ - 49 |+ b = f" {\ -50 50 | a} \ -51 51 | " -52 52 | +46 | def single_quoted_multi_line(): +47 | a = 4 +48 | # RUF027 + - b = " {\ +49 + b = f" {\ +50 | a} \ +51 | " +52 | +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:56:9 @@ -242,16 +231,15 @@ RUF027 [*] Possible f-string without an `f` prefix 57 | print(f"{a}" "{a}" f"{b}") # RUF027 | help: Add `f` prefix - -ℹ Unsafe fix -53 53 | -54 54 | def implicit_concat(): -55 55 | a = 4 -56 |- b = "{a}" "+" "{b}" r" \\ " # RUF027 for the first part only - 56 |+ b = f"{a}" "+" "{b}" r" \\ " # RUF027 for the first part only -57 57 | print(f"{a}" "{a}" f"{b}") # RUF027 -58 58 | -59 59 | +53 | +54 | def implicit_concat(): +55 | a = 4 + - b = "{a}" "+" "{b}" r" \\ " # RUF027 for the first part only +56 + b = f"{a}" "+" "{b}" r" \\ " # RUF027 for the first part only +57 | print(f"{a}" "{a}" f"{b}") # RUF027 +58 | +59 | +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:57:18 @@ -262,16 +250,15 @@ RUF027 [*] Possible f-string without an `f` prefix | ^^^^^ | help: Add `f` prefix - -ℹ Unsafe fix -54 54 | def implicit_concat(): -55 55 | a = 4 -56 56 | b = "{a}" "+" "{b}" r" \\ " # RUF027 for the first part only -57 |- print(f"{a}" "{a}" f"{b}") # RUF027 - 57 |+ print(f"{a}" f"{a}" f"{b}") # RUF027 -58 58 | -59 59 | -60 60 | def escaped_chars(): +54 | def implicit_concat(): +55 | a = 4 +56 | b = "{a}" "+" "{b}" r" \\ " # RUF027 for the first part only + - print(f"{a}" "{a}" f"{b}") # RUF027 +57 + print(f"{a}" f"{a}" f"{b}") # RUF027 +58 | +59 | +60 | def escaped_chars(): +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:62:9 @@ -282,16 +269,15 @@ RUF027 [*] Possible f-string without an `f` prefix | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Add `f` prefix - -ℹ Unsafe fix -59 59 | -60 60 | def escaped_chars(): -61 61 | a = 4 -62 |- b = "\"not escaped:\" '{a}' \"escaped:\": '{{c}}'" # RUF027 - 62 |+ b = f"\"not escaped:\" '{a}' \"escaped:\": '{{c}}'" # RUF027 -63 63 | -64 64 | -65 65 | def method_calls(): +59 | +60 | def escaped_chars(): +61 | a = 4 + - b = "\"not escaped:\" '{a}' \"escaped:\": '{{c}}'" # RUF027 +62 + b = f"\"not escaped:\" '{a}' \"escaped:\": '{{c}}'" # RUF027 +63 | +64 | +65 | def method_calls(): +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:70:18 @@ -304,16 +290,15 @@ RUF027 [*] Possible f-string without an `f` prefix 72 | def format_specifiers(): | help: Add `f` prefix - -ℹ Unsafe fix -67 67 | value.method = print_name -68 68 | first = "Wendy" -69 69 | last = "Appleseed" -70 |- value.method("{first} {last}") # RUF027 - 70 |+ value.method(f"{first} {last}") # RUF027 -71 71 | -72 72 | def format_specifiers(): -73 73 | a = 4 +67 | value.method = print_name +68 | first = "Wendy" +69 | last = "Appleseed" + - value.method("{first} {last}") # RUF027 +70 + value.method(f"{first} {last}") # RUF027 +71 | +72 | def format_specifiers(): +73 | a = 4 +note: This is an unsafe fix and may change runtime behavior RUF027 [*] Possible f-string without an `f` prefix --> RUF027_0.py:74:9 @@ -326,13 +311,12 @@ RUF027 [*] Possible f-string without an `f` prefix 76 | # fstrings are never correct as type definitions | help: Add `f` prefix - -ℹ Unsafe fix -71 71 | -72 72 | def format_specifiers(): -73 73 | a = 4 -74 |- b = "{a:b} {a:^5}" - 74 |+ b = f"{a:b} {a:^5}" -75 75 | -76 76 | # fstrings are never correct as type definitions -77 77 | # so we should always skip those +71 | +72 | def format_specifiers(): +73 | a = 4 + - b = "{a:b} {a:^5}" +74 + b = f"{a:b} {a:^5}" +75 | +76 | # fstrings are never correct as type definitions +77 | # so we should always skip those +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap index 4c37b85d0a..871026607a 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF028_RUF028.py.snap @@ -12,14 +12,13 @@ RUF028 [*] This suppression comment is invalid because it cannot be in an expres 5 | 2, | help: Remove this comment - -ℹ Unsafe fix -1 1 | def fmt_off_between_lists(): -2 2 | test_list = [ -3 |- # fmt: off -4 3 | 1, -5 4 | 2, -6 5 | 3, +1 | def fmt_off_between_lists(): +2 | test_list = [ + - # fmt: off +3 | 1, +4 | 2, +5 | 3, +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be on its own line --> RUF028.py:12:5 @@ -31,15 +30,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be on its own l 13 | pass # fmt: skip | help: Remove this comment - -ℹ Unsafe fix -9 9 | -10 10 | # note: the second `fmt: skip`` should be OK -11 11 | def fmt_skip_on_own_line(): -12 |- # fmt: skip -13 12 | pass # fmt: skip -14 13 | -15 14 | +9 | +10 | # note: the second `fmt: skip`` should be OK +11 | def fmt_skip_on_own_line(): + - # fmt: skip +12 | pass # fmt: skip +13 | +14 | +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be after a decorator --> RUF028.py:17:1 @@ -51,15 +49,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be after a deco 19 | def fmt_off_between_decorators(): | help: Remove this comment - -ℹ Unsafe fix -14 14 | -15 15 | -16 16 | @fmt_skip_on_own_line -17 |-# fmt: off -18 17 | @fmt_off_between_lists -19 18 | def fmt_off_between_decorators(): -20 19 | pass +14 | +15 | +16 | @fmt_skip_on_own_line + - # fmt: off +17 | @fmt_off_between_lists +18 | def fmt_off_between_decorators(): +19 | pass +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be after a decorator --> RUF028.py:24:1 @@ -71,15 +68,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be after a deco 26 | ... | help: Remove this comment - -ℹ Unsafe fix -21 21 | -22 22 | -23 23 | @fmt_off_between_decorators -24 |-# fmt: off -25 24 | class FmtOffBetweenClassDecorators: -26 25 | ... -27 26 | +21 | +22 | +23 | @fmt_off_between_decorators + - # fmt: off +24 | class FmtOffBetweenClassDecorators: +25 | ... +26 | +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be directly above an alternate body --> RUF028.py:33:5 @@ -92,15 +88,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be directly abo 35 | print("done") | help: Remove this comment - -ℹ Unsafe fix -30 30 | x = [1, 2, 3] -31 31 | for val in x: -32 32 | print(x) -33 |- # fmt: off -34 33 | else: -35 34 | print("done") -36 35 | while False: +30 | x = [1, 2, 3] +31 | for val in x: +32 | print(x) + - # fmt: off +33 | else: +34 | print("done") +35 | while False: +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be directly above an alternate body --> RUF028.py:39:5 @@ -113,15 +108,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be directly abo 41 | print("done") | help: Remove this comment - -ℹ Unsafe fix -36 36 | while False: -37 37 | print("while") -38 38 | # fmt: off -39 |- # fmt: off -40 39 | else: -41 40 | print("done") -42 41 | if len(x) > 3: +36 | while False: +37 | print("while") +38 | # fmt: off + - # fmt: off +39 | else: +40 | print("done") +41 | if len(x) > 3: +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be directly above an alternate body --> RUF028.py:45:5 @@ -134,15 +128,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be directly abo 47 | print("expected") | help: Remove this comment - -ℹ Unsafe fix -42 42 | if len(x) > 3: -43 43 | print("huh?") -44 44 | # fmt: on -45 |- # fmt: off -46 45 | else: -47 46 | print("expected") -48 47 | +42 | if len(x) > 3: +43 | print("huh?") +44 | # fmt: on + - # fmt: off +45 | else: +46 | print("expected") +47 | +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be after a decorator --> RUF028.py:52:5 @@ -155,15 +148,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be after a deco 54 | # fmt: off | help: Remove this comment - -ℹ Unsafe fix -49 49 | -50 50 | class Test: -51 51 | @classmethod -52 |- # fmt: off -53 52 | def cls_method_a( -54 53 | # fmt: off -55 54 | cls, +49 | +50 | class Test: +51 | @classmethod + - # fmt: off +52 | def cls_method_a( +53 | # fmt: off +54 | cls, +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be in an expression, pattern, argument list, or other non-statement --> RUF028.py:54:9 @@ -176,15 +168,14 @@ RUF028 [*] This suppression comment is invalid because it cannot be in an expres 56 | ) -> None: # noqa: test # fmt: skip | help: Remove this comment - -ℹ Unsafe fix -51 51 | @classmethod -52 52 | # fmt: off -53 53 | def cls_method_a( -54 |- # fmt: off -55 54 | cls, -56 55 | ) -> None: # noqa: test # fmt: skip -57 56 | pass +51 | @classmethod +52 | # fmt: off +53 | def cls_method_a( + - # fmt: off +54 | cls, +55 | ) -> None: # noqa: test # fmt: skip +56 | pass +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be at the end of a line --> RUF028.py:62:13 @@ -196,16 +187,15 @@ RUF028 [*] This suppression comment is invalid because it cannot be at the end o 63 | pass # fmt: on | help: Remove this comment - -ℹ Unsafe fix -59 59 | -60 60 | def fmt_on_trailing(): -61 61 | # fmt: off -62 |- val = 5 # fmt: on - 62 |+ val = 5 -63 63 | pass # fmt: on -64 64 | -65 65 | +59 | +60 | def fmt_on_trailing(): +61 | # fmt: off + - val = 5 # fmt: on +62 + val = 5 +63 | pass # fmt: on +64 | +65 | +note: This is an unsafe fix and may change runtime behavior RUF028 [*] This suppression comment is invalid because it cannot be at the end of a line --> RUF028.py:63:10 @@ -216,13 +206,12 @@ RUF028 [*] This suppression comment is invalid because it cannot be at the end o | ^^^^^^^^^ | help: Remove this comment - -ℹ Unsafe fix -60 60 | def fmt_on_trailing(): -61 61 | # fmt: off -62 62 | val = 5 # fmt: on -63 |- pass # fmt: on - 63 |+ pass -64 64 | -65 65 | -66 66 | # all of these should be fine +60 | def fmt_on_trailing(): +61 | # fmt: off +62 | val = 5 # fmt: on + - pass # fmt: on +63 + pass +64 | +65 | +66 | # all of these should be fine +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap index 72d4b03736..bb1fc392e9 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF030_RUF030.py.snap @@ -12,16 +12,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 8 | # Concatenated string literals | help: Remove `print` - -ℹ Unsafe fix -3 3 | # Standard Case -4 4 | # Expects: -5 5 | # - single StringLiteral -6 |-assert True, print("This print is not intentional.") - 6 |+assert True, "This print is not intentional." -7 7 | -8 8 | # Concatenated string literals -9 9 | # Expects: +3 | # Standard Case +4 | # Expects: +5 | # - single StringLiteral + - assert True, print("This print is not intentional.") +6 + assert True, "This print is not intentional." +7 | +8 | # Concatenated string literals +9 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:11:14 @@ -34,16 +33,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 13 | # Positional arguments, string literals | help: Remove `print` - -ℹ Unsafe fix -8 8 | # Concatenated string literals -9 9 | # Expects: -10 10 | # - single StringLiteral -11 |-assert True, print("This print" " is not intentional.") - 11 |+assert True, "This print is not intentional." -12 12 | -13 13 | # Positional arguments, string literals -14 14 | # Expects: +8 | # Concatenated string literals +9 | # Expects: +10 | # - single StringLiteral + - assert True, print("This print" " is not intentional.") +11 + assert True, "This print is not intentional." +12 | +13 | # Positional arguments, string literals +14 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:16:14 @@ -56,16 +54,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 18 | # Concatenated string literals combined with Positional arguments | help: Remove `print` - -ℹ Unsafe fix -13 13 | # Positional arguments, string literals -14 14 | # Expects: -15 15 | # - single StringLiteral concatenated with " " -16 |-assert True, print("This print", "is not intentional") - 16 |+assert True, "This print is not intentional" -17 17 | -18 18 | # Concatenated string literals combined with Positional arguments -19 19 | # Expects: +13 | # Positional arguments, string literals +14 | # Expects: +15 | # - single StringLiteral concatenated with " " + - assert True, print("This print", "is not intentional") +16 + assert True, "This print is not intentional" +17 | +18 | # Concatenated string literals combined with Positional arguments +19 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:21:14 @@ -78,16 +75,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 23 | # Positional arguments, string literals with a variable | help: Remove `print` - -ℹ Unsafe fix -18 18 | # Concatenated string literals combined with Positional arguments -19 19 | # Expects: -20 20 | # - single stringliteral concatenated with " " only between `print` and `is` -21 |-assert True, print("This " "print", "is not intentional.") - 21 |+assert True, "This print is not intentional." -22 22 | -23 23 | # Positional arguments, string literals with a variable -24 24 | # Expects: +18 | # Concatenated string literals combined with Positional arguments +19 | # Expects: +20 | # - single stringliteral concatenated with " " only between `print` and `is` + - assert True, print("This " "print", "is not intentional.") +21 + assert True, "This print is not intentional." +22 | +23 | # Positional arguments, string literals with a variable +24 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:26:14 @@ -100,16 +96,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 28 | # Mixed brackets string literals | help: Remove `print` - -ℹ Unsafe fix -23 23 | # Positional arguments, string literals with a variable -24 24 | # Expects: -25 25 | # - single FString concatenated with " " -26 |-assert True, print("This", print.__name__, "is not intentional.") - 26 |+assert True, f"This {print.__name__} is not intentional." -27 27 | -28 28 | # Mixed brackets string literals -29 29 | # Expects: +23 | # Positional arguments, string literals with a variable +24 | # Expects: +25 | # - single FString concatenated with " " + - assert True, print("This", print.__name__, "is not intentional.") +26 + assert True, f"This {print.__name__} is not intentional." +27 | +28 | # Mixed brackets string literals +29 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:31:14 @@ -122,16 +117,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 33 | # Mixed brackets with other brackets inside | help: Remove `print` - -ℹ Unsafe fix -28 28 | # Mixed brackets string literals -29 29 | # Expects: -30 30 | # - single StringLiteral concatenated with " " -31 |-assert True, print("This print", 'is not intentional', """and should be removed""") - 31 |+assert True, "This print is not intentional and should be removed" -32 32 | -33 33 | # Mixed brackets with other brackets inside -34 34 | # Expects: +28 | # Mixed brackets string literals +29 | # Expects: +30 | # - single StringLiteral concatenated with " " + - assert True, print("This print", 'is not intentional', """and should be removed""") +31 + assert True, "This print is not intentional and should be removed" +32 | +33 | # Mixed brackets with other brackets inside +34 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:36:14 @@ -144,16 +138,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 38 | # Positional arguments, string literals with a separator | help: Remove `print` - -ℹ Unsafe fix -33 33 | # Mixed brackets with other brackets inside -34 34 | # Expects: -35 35 | # - single StringLiteral concatenated with " " and escaped brackets -36 |-assert True, print("This print", 'is not "intentional"', """and "should" be 'removed'""") - 36 |+assert True, "This print is not \"intentional\" and \"should\" be 'removed'" -37 37 | -38 38 | # Positional arguments, string literals with a separator -39 39 | # Expects: +33 | # Mixed brackets with other brackets inside +34 | # Expects: +35 | # - single StringLiteral concatenated with " " and escaped brackets + - assert True, print("This print", 'is not "intentional"', """and "should" be 'removed'""") +36 + assert True, "This print is not \"intentional\" and \"should\" be 'removed'" +37 | +38 | # Positional arguments, string literals with a separator +39 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:41:14 @@ -166,16 +159,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 43 | # Positional arguments, string literals with None as separator | help: Remove `print` - -ℹ Unsafe fix -38 38 | # Positional arguments, string literals with a separator -39 39 | # Expects: -40 40 | # - single StringLiteral concatenated with "|" -41 |-assert True, print("This print", "is not intentional", sep="|") - 41 |+assert True, "This print|is not intentional" -42 42 | -43 43 | # Positional arguments, string literals with None as separator -44 44 | # Expects: +38 | # Positional arguments, string literals with a separator +39 | # Expects: +40 | # - single StringLiteral concatenated with "|" + - assert True, print("This print", "is not intentional", sep="|") +41 + assert True, "This print|is not intentional" +42 | +43 | # Positional arguments, string literals with None as separator +44 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:46:14 @@ -188,16 +180,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 48 | # Positional arguments, string literals with variable as separator, needs f-string | help: Remove `print` - -ℹ Unsafe fix -43 43 | # Positional arguments, string literals with None as separator -44 44 | # Expects: -45 45 | # - single StringLiteral concatenated with " " -46 |-assert True, print("This print", "is not intentional", sep=None) - 46 |+assert True, "This print is not intentional" -47 47 | -48 48 | # Positional arguments, string literals with variable as separator, needs f-string -49 49 | # Expects: +43 | # Positional arguments, string literals with None as separator +44 | # Expects: +45 | # - single StringLiteral concatenated with " " + - assert True, print("This print", "is not intentional", sep=None) +46 + assert True, "This print is not intentional" +47 | +48 | # Positional arguments, string literals with variable as separator, needs f-string +49 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:51:14 @@ -210,16 +201,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 53 | # Unnecessary f-string | help: Remove `print` - -ℹ Unsafe fix -48 48 | # Positional arguments, string literals with variable as separator, needs f-string -49 49 | # Expects: -50 50 | # - single FString concatenated with "{U00A0}" -51 |-assert True, print("This print", "is not intentional", sep=U00A0) - 51 |+assert True, f"This print{U00A0}is not intentional" -52 52 | -53 53 | # Unnecessary f-string -54 54 | # Expects: +48 | # Positional arguments, string literals with variable as separator, needs f-string +49 | # Expects: +50 | # - single FString concatenated with "{U00A0}" + - assert True, print("This print", "is not intentional", sep=U00A0) +51 + assert True, f"This print{U00A0}is not intentional" +52 | +53 | # Unnecessary f-string +54 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:56:14 @@ -232,16 +222,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 58 | # Positional arguments, string literals and f-strings | help: Remove `print` - -ℹ Unsafe fix -53 53 | # Unnecessary f-string -54 54 | # Expects: -55 55 | # - single StringLiteral -56 |-assert True, print(f"This f-string is just a literal.") - 56 |+assert True, "This f-string is just a literal." -57 57 | -58 58 | # Positional arguments, string literals and f-strings -59 59 | # Expects: +53 | # Unnecessary f-string +54 | # Expects: +55 | # - single StringLiteral + - assert True, print(f"This f-string is just a literal.") +56 + assert True, "This f-string is just a literal." +57 | +58 | # Positional arguments, string literals and f-strings +59 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:61:14 @@ -254,16 +243,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 63 | # Positional arguments, string literals and f-strings with a separator | help: Remove `print` - -ℹ Unsafe fix -58 58 | # Positional arguments, string literals and f-strings -59 59 | # Expects: -60 60 | # - single FString concatenated with " " -61 |-assert True, print("This print", f"is not {'intentional':s}") - 61 |+assert True, f"This print is not {'intentional':s}" -62 62 | -63 63 | # Positional arguments, string literals and f-strings with a separator -64 64 | # Expects: +58 | # Positional arguments, string literals and f-strings +59 | # Expects: +60 | # - single FString concatenated with " " + - assert True, print("This print", f"is not {'intentional':s}") +61 + assert True, f"This print is not {'intentional':s}" +62 | +63 | # Positional arguments, string literals and f-strings with a separator +64 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:66:14 @@ -276,16 +264,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 68 | # A single f-string | help: Remove `print` - -ℹ Unsafe fix -63 63 | # Positional arguments, string literals and f-strings with a separator -64 64 | # Expects: -65 65 | # - single FString concatenated with "|" -66 |-assert True, print("This print", f"is not {'intentional':s}", sep="|") - 66 |+assert True, f"This print|is not {'intentional':s}" -67 67 | -68 68 | # A single f-string -69 69 | # Expects: +63 | # Positional arguments, string literals and f-strings with a separator +64 | # Expects: +65 | # - single FString concatenated with "|" + - assert True, print("This print", f"is not {'intentional':s}", sep="|") +66 + assert True, f"This print|is not {'intentional':s}" +67 | +68 | # A single f-string +69 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:71:14 @@ -298,16 +285,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 73 | # A single f-string with a redundant separator | help: Remove `print` - -ℹ Unsafe fix -68 68 | # A single f-string -69 69 | # Expects: -70 70 | # - single FString -71 |-assert True, print(f"This print is not {'intentional':s}") - 71 |+assert True, f"This print is not {'intentional':s}" -72 72 | -73 73 | # A single f-string with a redundant separator -74 74 | # Expects: +68 | # A single f-string +69 | # Expects: +70 | # - single FString + - assert True, print(f"This print is not {'intentional':s}") +71 + assert True, f"This print is not {'intentional':s}" +72 | +73 | # A single f-string with a redundant separator +74 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:76:14 @@ -320,16 +306,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 78 | # Complex f-string with variable as separator | help: Remove `print` - -ℹ Unsafe fix -73 73 | # A single f-string with a redundant separator -74 74 | # Expects: -75 75 | # - single FString -76 |-assert True, print(f"This print is not {'intentional':s}", sep="|") - 76 |+assert True, f"This print is not {'intentional':s}" -77 77 | -78 78 | # Complex f-string with variable as separator -79 79 | # Expects: +73 | # A single f-string with a redundant separator +74 | # Expects: +75 | # - single FString + - assert True, print(f"This print is not {'intentional':s}", sep="|") +76 + assert True, f"This print is not {'intentional':s}" +77 | +78 | # Complex f-string with variable as separator +79 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:83:14 @@ -342,16 +327,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 85 | # Empty print | help: Remove `print` - -ℹ Unsafe fix -80 80 | # - single FString concatenated with "{U00A0}", all placeholders preserved -81 81 | condition = "True is True" -82 82 | maintainer = "John Doe" -83 |-assert True, print("Unreachable due to", condition, f", ask {maintainer} for advice", sep=U00A0) - 83 |+assert True, f"Unreachable due to{U00A0}{condition}{U00A0}, ask {maintainer} for advice" -84 84 | -85 85 | # Empty print -86 86 | # Expects: +80 | # - single FString concatenated with "{U00A0}", all placeholders preserved +81 | condition = "True is True" +82 | maintainer = "John Doe" + - assert True, print("Unreachable due to", condition, f", ask {maintainer} for advice", sep=U00A0) +83 + assert True, f"Unreachable due to{U00A0}{condition}{U00A0}, ask {maintainer} for advice" +84 | +85 | # Empty print +86 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:88:14 @@ -364,16 +348,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 90 | # Empty print with separator | help: Remove `print` - -ℹ Unsafe fix -85 85 | # Empty print -86 86 | # Expects: -87 87 | # - `msg` entirely removed from assertion -88 |-assert True, print() - 88 |+assert True -89 89 | -90 90 | # Empty print with separator -91 91 | # Expects: +85 | # Empty print +86 | # Expects: +87 | # - `msg` entirely removed from assertion + - assert True, print() +88 + assert True +89 | +90 | # Empty print with separator +91 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:93:14 @@ -386,16 +369,15 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional 95 | # Custom print function that actually returns a string | help: Remove `print` - -ℹ Unsafe fix -90 90 | # Empty print with separator -91 91 | # Expects: -92 92 | # - `msg` entirely removed from assertion -93 |-assert True, print(sep=" ") - 93 |+assert True -94 94 | -95 95 | # Custom print function that actually returns a string -96 96 | # Expects: +90 | # Empty print with separator +91 | # Expects: +92 | # - `msg` entirely removed from assertion + - assert True, print(sep=" ") +93 + assert True +94 | +95 | # Custom print function that actually returns a string +96 | # Expects: +note: This is an unsafe fix and may change runtime behavior RUF030 [*] `print()` call in `assert` statement is likely unintentional --> RUF030.py:108:14 @@ -406,10 +388,9 @@ RUF030 [*] `print()` call in `assert` statement is likely unintentional | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove `print` - -ℹ Unsafe fix -105 105 | # Use of `builtins.print` -106 106 | # Expects: -107 107 | # - single StringLiteral -108 |-assert True, builtins.print("This print should be removed.") - 108 |+assert True, "This print should be removed." +105 | # Use of `builtins.print` +106 | # Expects: +107 | # - single StringLiteral + - assert True, builtins.print("This print should be removed.") +108 + assert True, "This print should be removed." +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap index 95d2710e2c..6801d5bf38 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap @@ -11,14 +11,12 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 4 | 1, | help: Remove parentheses - -ℹ Safe fix -1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} -2 |-d[(1,2)] - 2 |+d[1,2] -3 3 | d[( -4 4 | 1, -5 5 | 2 +1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} + - d[(1,2)] +2 + d[1,2] +3 | d[( +4 | 1, +5 | 2 RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:3:3 @@ -35,19 +33,17 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 8 | 1, | help: Remove parentheses - -ℹ Safe fix -1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} -2 2 | d[(1,2)] -3 |-d[( - 3 |+d[ -4 4 | 1, -5 5 | 2 -6 |-)] - 6 |+] -7 7 | d[ -8 8 | 1, -9 9 | 2 +1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} +2 | d[(1,2)] + - d[( +3 + d[ +4 | 1, +5 | 2 + - )] +6 + ] +7 | d[ +8 | 1, +9 | 2 RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:11:3 @@ -60,16 +56,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 13 | d[(8,)] | help: Remove parentheses - -ℹ Safe fix -8 8 | 1, -9 9 | 2 -10 10 | ] -11 |-d[(2,4)] - 11 |+d[2,4] -12 12 | d[(5,6,7)] -13 13 | d[(8,)] -14 14 | d[tuple(1,2)] +8 | 1, +9 | 2 +10 | ] + - d[(2,4)] +11 + d[2,4] +12 | d[(5,6,7)] +13 | d[(8,)] +14 | d[tuple(1,2)] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:12:3 @@ -82,16 +76,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 14 | d[tuple(1,2)] | help: Remove parentheses - -ℹ Safe fix -9 9 | 2 -10 10 | ] -11 11 | d[(2,4)] -12 |-d[(5,6,7)] - 12 |+d[5,6,7] -13 13 | d[(8,)] -14 14 | d[tuple(1,2)] -15 15 | d[tuple(8)] +9 | 2 +10 | ] +11 | d[(2,4)] + - d[(5,6,7)] +12 + d[5,6,7] +13 | d[(8,)] +14 | d[tuple(1,2)] +15 | d[tuple(8)] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:13:3 @@ -104,16 +96,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 15 | d[tuple(8)] | help: Remove parentheses - -ℹ Safe fix -10 10 | ] -11 11 | d[(2,4)] -12 12 | d[(5,6,7)] -13 |-d[(8,)] - 13 |+d[8,] -14 14 | d[tuple(1,2)] -15 15 | d[tuple(8)] -16 16 | d[1,2] +10 | ] +11 | d[(2,4)] +12 | d[(5,6,7)] + - d[(8,)] +13 + d[8,] +14 | d[tuple(1,2)] +15 | d[tuple(8)] +16 | d[1,2] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:20:3 @@ -125,17 +115,15 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 21 | e[(1,2),(3,4)] | help: Remove parentheses - -ℹ Safe fix -17 17 | d[3,4] -18 18 | d[5,6,7] -19 19 | e = {((1,2),(3,4)):"a"} -20 |-e[((1,2),(3,4))] -21 20 | e[(1,2),(3,4)] - 21 |+e[(1,2),(3,4)] -22 22 | -23 23 | token_features[ -24 24 | (window_position, feature_name) +17 | d[3,4] +18 | d[5,6,7] +19 | e = {((1,2),(3,4)):"a"} + - e[((1,2),(3,4))] +20 | e[(1,2),(3,4)] +21 + e[(1,2),(3,4)] +22 | +23 | token_features[ +24 | (window_position, feature_name) RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:24:5 @@ -146,16 +134,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 25 | ] = self._extract_raw_features_from_token | help: Remove parentheses - -ℹ Safe fix -21 21 | e[(1,2),(3,4)] -22 22 | -23 23 | token_features[ -24 |- (window_position, feature_name) - 24 |+ window_position, feature_name -25 25 | ] = self._extract_raw_features_from_token -26 26 | -27 27 | d[1,] +21 | e[(1,2),(3,4)] +22 | +23 | token_features[ + - (window_position, feature_name) +24 + window_position, feature_name +25 | ] = self._extract_raw_features_from_token +26 | +27 | d[1,] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:28:3 @@ -167,16 +153,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 30 | d[:,] # slices in the subscript lead to syntax error if parens are added | help: Remove parentheses - -ℹ Safe fix -25 25 | ] = self._extract_raw_features_from_token -26 26 | -27 27 | d[1,] -28 |-d[(1,)] - 28 |+d[1,] -29 29 | d[()] # empty tuples should be ignored -30 30 | d[:,] # slices in the subscript lead to syntax error if parens are added -31 31 | d[1,2,:] +25 | ] = self._extract_raw_features_from_token +26 | +27 | d[1,] + - d[(1,)] +28 + d[1,] +29 | d[()] # empty tuples should be ignored +30 | d[:,] # slices in the subscript lead to syntax error if parens are added +31 | d[1,2,:] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:36:3 @@ -189,13 +173,11 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 38 | x: dict[str, int] # tuples inside type annotations should never be altered | help: Remove parentheses - -ℹ Safe fix -33 33 | # Should keep these parentheses in -34 34 | # Python <=3.10 to avoid syntax error. -35 35 | # https://github.com/astral-sh/ruff/issues/12776 -36 |-d[(*foo,bar)] - 36 |+d[*foo,bar] -37 37 | -38 38 | x: dict[str, int] # tuples inside type annotations should never be altered -39 39 | +33 | # Should keep these parentheses in +34 | # Python <=3.10 to avoid syntax error. +35 | # https://github.com/astral-sh/ruff/issues/12776 + - d[(*foo,bar)] +36 + d[*foo,bar] +37 | +38 | x: dict[str, int] # tuples inside type annotations should never be altered +39 | diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap index 03c1b8af41..f28d3d9702 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF032_RUF032.py.snap @@ -12,16 +12,15 @@ RUF032 [*] `Decimal()` called with float literal argument 8 | decimal.Decimal("0.0") | help: Replace with string literal - -ℹ Unsafe fix -3 3 | # Tests with fully qualified import -4 4 | decimal.Decimal(0) -5 5 | -6 |-decimal.Decimal(0.0) # Should error - 6 |+decimal.Decimal("0.0") # Should error -7 7 | -8 8 | decimal.Decimal("0.0") -9 9 | +3 | # Tests with fully qualified import +4 | decimal.Decimal(0) +5 | + - decimal.Decimal(0.0) # Should error +6 + decimal.Decimal("0.0") # Should error +7 | +8 | decimal.Decimal("0.0") +9 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:12:17 @@ -34,16 +33,15 @@ RUF032 [*] `Decimal()` called with float literal argument 14 | decimal.Decimal("10.0") | help: Replace with string literal - -ℹ Unsafe fix -9 9 | -10 10 | decimal.Decimal(10) -11 11 | -12 |-decimal.Decimal(10.0) # Should error - 12 |+decimal.Decimal("10.0") # Should error -13 13 | -14 14 | decimal.Decimal("10.0") -15 15 | +9 | +10 | decimal.Decimal(10) +11 | + - decimal.Decimal(10.0) # Should error +12 + decimal.Decimal("10.0") # Should error +13 | +14 | decimal.Decimal("10.0") +15 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:18:17 @@ -56,16 +54,15 @@ RUF032 [*] `Decimal()` called with float literal argument 20 | decimal.Decimal("-10.0") | help: Replace with string literal - -ℹ Unsafe fix -15 15 | -16 16 | decimal.Decimal(-10) -17 17 | -18 |-decimal.Decimal(-10.0) # Should error - 18 |+decimal.Decimal("-10.0") # Should error -19 19 | -20 20 | decimal.Decimal("-10.0") -21 21 | +15 | +16 | decimal.Decimal(-10) +17 | + - decimal.Decimal(-10.0) # Should error +18 + decimal.Decimal("-10.0") # Should error +19 | +20 | decimal.Decimal("-10.0") +21 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:33:15 @@ -78,16 +75,15 @@ RUF032 [*] `Decimal()` called with float literal argument 35 | val = Decimal("0.0") | help: Replace with string literal - -ℹ Unsafe fix -30 30 | -31 31 | val = Decimal(0) -32 32 | -33 |-val = Decimal(0.0) # Should error - 33 |+val = Decimal("0.0") # Should error -34 34 | -35 35 | val = Decimal("0.0") -36 36 | +30 | +31 | val = Decimal(0) +32 | + - val = Decimal(0.0) # Should error +33 + val = Decimal("0.0") # Should error +34 | +35 | val = Decimal("0.0") +36 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:39:15 @@ -100,16 +96,15 @@ RUF032 [*] `Decimal()` called with float literal argument 41 | val = Decimal("10.0") | help: Replace with string literal - -ℹ Unsafe fix -36 36 | -37 37 | val = Decimal(10) -38 38 | -39 |-val = Decimal(10.0) # Should error - 39 |+val = Decimal("10.0") # Should error -40 40 | -41 41 | val = Decimal("10.0") -42 42 | +36 | +37 | val = Decimal(10) +38 | + - val = Decimal(10.0) # Should error +39 + val = Decimal("10.0") # Should error +40 | +41 | val = Decimal("10.0") +42 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:45:15 @@ -122,16 +117,15 @@ RUF032 [*] `Decimal()` called with float literal argument 47 | val = Decimal("-10.0") | help: Replace with string literal - -ℹ Unsafe fix -42 42 | -43 43 | val = Decimal(-10) -44 44 | -45 |-val = Decimal(-10.0) # Should error - 45 |+val = Decimal("-10.0") # Should error -46 46 | -47 47 | val = Decimal("-10.0") -48 48 | +42 | +43 | val = Decimal(-10) +44 | + - val = Decimal(-10.0) # Should error +45 + val = Decimal("-10.0") # Should error +46 | +47 | val = Decimal("-10.0") +48 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:56:15 @@ -144,16 +138,15 @@ RUF032 [*] `Decimal()` called with float literal argument 58 | val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` | help: Replace with string literal - -ℹ Unsafe fix -53 53 | # See https://github.com/astral-sh/ruff/issues/13258 -54 54 | val = Decimal(~4.0) # Skip -55 55 | -56 |-val = Decimal(++4.0) # Suggest `Decimal("4.0")` - 56 |+val = Decimal("4.0") # Suggest `Decimal("4.0")` -57 57 | -58 58 | val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` -59 59 | +53 | # See https://github.com/astral-sh/ruff/issues/13258 +54 | val = Decimal(~4.0) # Skip +55 | + - val = Decimal(++4.0) # Suggest `Decimal("4.0")` +56 + val = Decimal("4.0") # Suggest `Decimal("4.0")` +57 | +58 | val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` +59 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:58:15 @@ -164,16 +157,15 @@ RUF032 [*] `Decimal()` called with float literal argument | ^^^^^^^^^^^ | help: Replace with string literal - -ℹ Unsafe fix -55 55 | -56 56 | val = Decimal(++4.0) # Suggest `Decimal("4.0")` -57 57 | -58 |-val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` - 58 |+val = Decimal("-4.0") # Suggest `Decimal("-4.0")` -59 59 | -60 60 | -61 61 | # Tests with shadowed name +55 | +56 | val = Decimal(++4.0) # Suggest `Decimal("4.0")` +57 | + - val = Decimal(-+--++--4.0) # Suggest `Decimal("-4.0")` +58 + val = Decimal("-4.0") # Suggest `Decimal("-4.0")` +59 | +60 | +61 | # Tests with shadowed name +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:88:23 @@ -186,16 +178,15 @@ RUF032 [*] `Decimal()` called with float literal argument 90 | val = decimal.Decimal("0.0") | help: Replace with string literal - -ℹ Unsafe fix -85 85 | -86 86 | # Retest with fully qualified import -87 87 | -88 |-val = decimal.Decimal(0.0) # Should error - 88 |+val = decimal.Decimal("0.0") # Should error -89 89 | -90 90 | val = decimal.Decimal("0.0") -91 91 | +85 | +86 | # Retest with fully qualified import +87 | + - val = decimal.Decimal(0.0) # Should error +88 + val = decimal.Decimal("0.0") # Should error +89 | +90 | val = decimal.Decimal("0.0") +91 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:92:23 @@ -208,16 +199,15 @@ RUF032 [*] `Decimal()` called with float literal argument 94 | val = decimal.Decimal("10.0") | help: Replace with string literal - -ℹ Unsafe fix -89 89 | -90 90 | val = decimal.Decimal("0.0") -91 91 | -92 |-val = decimal.Decimal(10.0) # Should error - 92 |+val = decimal.Decimal("10.0") # Should error -93 93 | -94 94 | val = decimal.Decimal("10.0") -95 95 | +89 | +90 | val = decimal.Decimal("0.0") +91 | + - val = decimal.Decimal(10.0) # Should error +92 + val = decimal.Decimal("10.0") # Should error +93 | +94 | val = decimal.Decimal("10.0") +95 | +note: This is an unsafe fix and may change runtime behavior RUF032 [*] `Decimal()` called with float literal argument --> RUF032.py:96:23 @@ -230,13 +220,12 @@ RUF032 [*] `Decimal()` called with float literal argument 98 | val = decimal.Decimal("-10.0") | help: Replace with string literal - -ℹ Unsafe fix -93 93 | -94 94 | val = decimal.Decimal("10.0") -95 95 | -96 |-val = decimal.Decimal(-10.0) # Should error - 96 |+val = decimal.Decimal("-10.0") # Should error -97 97 | -98 98 | val = decimal.Decimal("-10.0") -99 99 | +93 | +94 | val = decimal.Decimal("10.0") +95 | + - val = decimal.Decimal(-10.0) # Should error +96 + val = decimal.Decimal("-10.0") # Should error +97 | +98 | val = decimal.Decimal("-10.0") +99 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap index e3dc5e551e..a0b00883ab 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF033_RUF033.py.snap @@ -30,17 +30,16 @@ RUF033 [*] `__post_init__` method with argument defaults | ^^ | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -22 22 | # RUF033 -23 23 | @dataclass -24 24 | class Foo: -25 |- def __post_init__(self, bar = 11, baz = 11) -> None: ... - 25 |+ bar: InitVar = 11 - 26 |+ def __post_init__(self, bar, baz = 11) -> None: ... -26 27 | -27 28 | -28 29 | # OK +22 | # RUF033 +23 | @dataclass +24 | class Foo: + - def __post_init__(self, bar = 11, baz = 11) -> None: ... +25 + bar: InitVar = 11 +26 + def __post_init__(self, bar, baz = 11) -> None: ... +27 | +28 | +29 | # OK +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:25:45 @@ -51,17 +50,16 @@ RUF033 [*] `__post_init__` method with argument defaults | ^^ | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -22 22 | # RUF033 -23 23 | @dataclass -24 24 | class Foo: -25 |- def __post_init__(self, bar = 11, baz = 11) -> None: ... - 25 |+ baz: InitVar = 11 - 26 |+ def __post_init__(self, bar = 11, baz) -> None: ... -26 27 | -27 28 | -28 29 | # OK +22 | # RUF033 +23 | @dataclass +24 | class Foo: + - def __post_init__(self, bar = 11, baz = 11) -> None: ... +25 + baz: InitVar = 11 +26 + def __post_init__(self, bar = 11, baz) -> None: ... +27 | +28 | +29 | # OK +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:46:40 @@ -72,17 +70,16 @@ RUF033 [*] `__post_init__` method with argument defaults | ^^ | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -43 43 | # RUF033 -44 44 | @dataclass -45 45 | class Foo: -46 |- def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ... - 46 |+ bar: InitVar[int] = 11 - 47 |+ def __post_init__(self, bar: int, baz: Something[Whatever | None] = 11) -> None: ... -47 48 | -48 49 | -49 50 | # RUF033 +43 | # RUF033 +44 | @dataclass +45 | class Foo: + - def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ... +46 + bar: InitVar[int] = 11 +47 + def __post_init__(self, bar: int, baz: Something[Whatever | None] = 11) -> None: ... +48 | +49 | +50 | # RUF033 +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:46:78 @@ -93,17 +90,16 @@ RUF033 [*] `__post_init__` method with argument defaults | ^^ | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -43 43 | # RUF033 -44 44 | @dataclass -45 45 | class Foo: -46 |- def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ... - 46 |+ baz: InitVar[Something[Whatever | None]] = 11 - 47 |+ def __post_init__(self, bar: int = 11, baz: Something[Whatever | None]) -> None: ... -47 48 | -48 49 | -49 50 | # RUF033 +43 | # RUF033 +44 | @dataclass +45 | class Foo: + - def __post_init__(self, bar: int = 11, baz: Something[Whatever | None] = 11) -> None: ... +46 + baz: InitVar[Something[Whatever | None]] = 11 +47 + def __post_init__(self, bar: int = 11, baz: Something[Whatever | None]) -> None: ... +48 | +49 | +50 | # RUF033 +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:59:40 @@ -114,17 +110,16 @@ RUF033 [*] `__post_init__` method with argument defaults | ^^ | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -56 56 | -57 57 | ping = "pong" -58 58 | -59 |- def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ... - 59 |+ bar: InitVar[int] = 11 - 60 |+ def __post_init__(self, bar: int, baz: int = 12) -> None: ... -60 61 | -61 62 | -62 63 | # RUF033 +56 | +57 | ping = "pong" +58 | + - def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ... +59 + bar: InitVar[int] = 11 +60 + def __post_init__(self, bar: int, baz: int = 12) -> None: ... +61 | +62 | +63 | # RUF033 +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:59:55 @@ -135,17 +130,16 @@ RUF033 [*] `__post_init__` method with argument defaults | ^^ | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -56 56 | -57 57 | ping = "pong" -58 58 | -59 |- def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ... - 59 |+ baz: InitVar[int] = 12 - 60 |+ def __post_init__(self, bar: int = 11, baz: int) -> None: ... -60 61 | -61 62 | -62 63 | # RUF033 +56 | +57 | ping = "pong" +58 | + - def __post_init__(self, bar: int = 11, baz: int = 12) -> None: ... +59 + baz: InitVar[int] = 12 +60 + def __post_init__(self, bar: int = 11, baz: int) -> None: ... +61 | +62 | +63 | # RUF033 +note: This is an unsafe fix and may change runtime behavior RUF033 `__post_init__` method with argument defaults --> RUF033.py:67:40 @@ -177,17 +171,16 @@ RUF033 [*] `__post_init__` method with argument defaults 74 | pass | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -70 70 | # https://github.com/astral-sh/ruff/issues/18950 -71 71 | @dataclass -72 72 | class Foo: -73 |- def __post_init__(self, bar: int = (x := 1)) -> None: - 73 |+ bar: InitVar[int] = (x := 1) - 74 |+ def __post_init__(self, bar: int) -> None: -74 75 | pass -75 76 | -76 77 | +70 | # https://github.com/astral-sh/ruff/issues/18950 +71 | @dataclass +72 | class Foo: + - def __post_init__(self, bar: int = (x := 1)) -> None: +73 + bar: InitVar[int] = (x := 1) +74 + def __post_init__(self, bar: int) -> None: +75 | pass +76 | +77 | +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:81:21 @@ -200,19 +193,18 @@ RUF033 [*] `__post_init__` method with argument defaults 83 | baz: int = (y := 2), # comment | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -76 76 | -77 77 | @dataclass -78 78 | class Foo: - 79 |+ bar: InitVar[int] = (x := 1) -79 80 | def __post_init__( -80 81 | self, -81 |- bar: int = (x := 1) # comment - 82 |+ bar: int # comment -82 83 | , -83 84 | baz: int = (y := 2), # comment -84 85 | foo = (a := 1) # comment +76 | +77 | @dataclass +78 | class Foo: +79 + bar: InitVar[int] = (x := 1) +80 | def __post_init__( +81 | self, + - bar: int = (x := 1) # comment +82 + bar: int # comment +83 | , +84 | baz: int = (y := 2), # comment +85 | foo = (a := 1) # comment +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:83:21 @@ -225,21 +217,20 @@ RUF033 [*] `__post_init__` method with argument defaults 85 | , | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -76 76 | -77 77 | @dataclass -78 78 | class Foo: - 79 |+ baz: InitVar[int] = (y := 2) -79 80 | def __post_init__( -80 81 | self, -81 82 | bar: int = (x := 1) # comment -82 83 | , -83 |- baz: int = (y := 2), # comment - 84 |+ baz: int, # comment -84 85 | foo = (a := 1) # comment -85 86 | , -86 87 | faz = (b := 2), # comment +76 | +77 | @dataclass +78 | class Foo: +79 + baz: InitVar[int] = (y := 2) +80 | def __post_init__( +81 | self, +82 | bar: int = (x := 1) # comment +83 | , + - baz: int = (y := 2), # comment +84 + baz: int, # comment +85 | foo = (a := 1) # comment +86 | , +87 | faz = (b := 2), # comment +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:84:16 @@ -252,22 +243,21 @@ RUF033 [*] `__post_init__` method with argument defaults 86 | faz = (b := 2), # comment | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -76 76 | -77 77 | @dataclass -78 78 | class Foo: - 79 |+ foo: InitVar = (a := 1) -79 80 | def __post_init__( -80 81 | self, -81 82 | bar: int = (x := 1) # comment -82 83 | , -83 84 | baz: int = (y := 2), # comment -84 |- foo = (a := 1) # comment - 85 |+ foo # comment -85 86 | , -86 87 | faz = (b := 2), # comment -87 88 | ) -> None: +76 | +77 | @dataclass +78 | class Foo: +79 + foo: InitVar = (a := 1) +80 | def __post_init__( +81 | self, +82 | bar: int = (x := 1) # comment +83 | , +84 | baz: int = (y := 2), # comment + - foo = (a := 1) # comment +85 + foo # comment +86 | , +87 | faz = (b := 2), # comment +88 | ) -> None: +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:86:16 @@ -280,24 +270,23 @@ RUF033 [*] `__post_init__` method with argument defaults 88 | pass | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -76 76 | -77 77 | @dataclass -78 78 | class Foo: - 79 |+ faz: InitVar = (b := 2) -79 80 | def __post_init__( -80 81 | self, -81 82 | bar: int = (x := 1) # comment +76 | +77 | @dataclass +78 | class Foo: +79 + faz: InitVar = (b := 2) +80 | def __post_init__( +81 | self, +82 | bar: int = (x := 1) # comment -------------------------------------------------------------------------------- -83 84 | baz: int = (y := 2), # comment -84 85 | foo = (a := 1) # comment -85 86 | , -86 |- faz = (b := 2), # comment - 87 |+ faz, # comment -87 88 | ) -> None: -88 89 | pass -89 90 | +84 | baz: int = (y := 2), # comment +85 | foo = (a := 1) # comment +86 | , + - faz = (b := 2), # comment +87 + faz, # comment +88 | ) -> None: +89 | pass +90 | +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:95:20 @@ -310,19 +299,18 @@ RUF033 [*] `__post_init__` method with argument defaults 97 | ) -> None: | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -90 90 | -91 91 | @dataclass -92 92 | class Foo: - 93 |+ bar: InitVar[int] = 1 -93 94 | def __post_init__( -94 95 | self, -95 |- bar: int = 1, # comment - 96 |+ bar: int, # comment -96 97 | baz: int = 2, # comment -97 98 | ) -> None: -98 99 | pass +90 | +91 | @dataclass +92 | class Foo: +93 + bar: InitVar[int] = 1 +94 | def __post_init__( +95 | self, + - bar: int = 1, # comment +96 + bar: int, # comment +97 | baz: int = 2, # comment +98 | ) -> None: +99 | pass +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:96:20 @@ -335,20 +323,19 @@ RUF033 [*] `__post_init__` method with argument defaults 98 | pass | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -90 90 | -91 91 | @dataclass -92 92 | class Foo: - 93 |+ baz: InitVar[int] = 2 -93 94 | def __post_init__( -94 95 | self, -95 96 | bar: int = 1, # comment -96 |- baz: int = 2, # comment - 97 |+ baz: int, # comment -97 98 | ) -> None: -98 99 | pass -99 100 | +90 | +91 | @dataclass +92 | class Foo: +93 + baz: InitVar[int] = 2 +94 | def __post_init__( +95 | self, +96 | bar: int = 1, # comment + - baz: int = 2, # comment +97 + baz: int, # comment +98 | ) -> None: +99 | pass +100 | +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:105:22 @@ -361,19 +348,18 @@ RUF033 [*] `__post_init__` method with argument defaults 107 | arg2: int = ((1)) # comment | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -100 100 | -101 101 | @dataclass -102 102 | class Foo: - 103 |+ arg1: InitVar[int] = (1) -103 104 | def __post_init__( -104 105 | self, -105 |- arg1: int = (1) # comment - 106 |+ arg1: int # comment -106 107 | , -107 108 | arg2: int = ((1)) # comment -108 109 | , +100 | +101 | @dataclass +102 | class Foo: +103 + arg1: InitVar[int] = (1) +104 | def __post_init__( +105 | self, + - arg1: int = (1) # comment +106 + arg1: int # comment +107 | , +108 | arg2: int = ((1)) # comment +109 | , +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:107:23 @@ -386,21 +372,20 @@ RUF033 [*] `__post_init__` method with argument defaults 109 | arg2: int = (i for i in range(10)) # comment | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -100 100 | -101 101 | @dataclass -102 102 | class Foo: - 103 |+ arg2: InitVar[int] = ((1)) -103 104 | def __post_init__( -104 105 | self, -105 106 | arg1: int = (1) # comment -106 107 | , -107 |- arg2: int = ((1)) # comment - 108 |+ arg2: int # comment -108 109 | , -109 110 | arg2: int = (i for i in range(10)) # comment -110 111 | , +100 | +101 | @dataclass +102 | class Foo: +103 + arg2: InitVar[int] = ((1)) +104 | def __post_init__( +105 | self, +106 | arg1: int = (1) # comment +107 | , + - arg2: int = ((1)) # comment +108 + arg2: int # comment +109 | , +110 | arg2: int = (i for i in range(10)) # comment +111 | , +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:109:21 @@ -413,23 +398,22 @@ RUF033 [*] `__post_init__` method with argument defaults 111 | ) -> None: | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -100 100 | -101 101 | @dataclass -102 102 | class Foo: - 103 |+ arg2: InitVar[int] = (i for i in range(10)) -103 104 | def __post_init__( -104 105 | self, -105 106 | arg1: int = (1) # comment -106 107 | , -107 108 | arg2: int = ((1)) # comment -108 109 | , -109 |- arg2: int = (i for i in range(10)) # comment - 110 |+ arg2: int # comment -110 111 | , -111 112 | ) -> None: -112 113 | pass +100 | +101 | @dataclass +102 | class Foo: +103 + arg2: InitVar[int] = (i for i in range(10)) +104 | def __post_init__( +105 | self, +106 | arg1: int = (1) # comment +107 | , +108 | arg2: int = ((1)) # comment +109 | , + - arg2: int = (i for i in range(10)) # comment +110 + arg2: int # comment +111 | , +112 | ) -> None: +113 | pass +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:121:27 @@ -442,19 +426,18 @@ RUF033 [*] `__post_init__` method with argument defaults 123 | ) -> None: | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -116 116 | def fun_with_python_syntax(): -117 117 | @dataclass -118 118 | class Foo: - 119 |+ bar: InitVar[int] = (yield from range(5)) -119 120 | def __post_init__( -120 121 | self, -121 |- bar: (int) = (yield from range(5)) # comment - 122 |+ bar: (int) # comment -122 123 | , -123 124 | ) -> None: -124 125 | ... +116 | def fun_with_python_syntax(): +117 | @dataclass +118 | class Foo: +119 + bar: InitVar[int] = (yield from range(5)) +120 | def __post_init__( +121 | self, + - bar: (int) = (yield from range(5)) # comment +122 + bar: (int) # comment +123 | , +124 | ) -> None: +125 | ... +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:131:50 @@ -470,21 +453,20 @@ RUF033 [*] `__post_init__` method with argument defaults 135 | self.x = x | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -128 128 | -129 129 | @dataclass -130 130 | class C: -131 |- def __post_init__(self, x: tuple[int, ...] = ( - 131 |+ x: InitVar[tuple[int, ...]] = ( -132 132 | 1, -133 133 | 2, -134 |- )) -> None: - 134 |+ ) - 135 |+ def __post_init__(self, x: tuple[int, ...]) -> None: -135 136 | self.x = x -136 137 | -137 138 | +128 | +129 | @dataclass +130 | class C: + - def __post_init__(self, x: tuple[int, ...] = ( +131 + x: InitVar[tuple[int, ...]] = ( +132 | 1, +133 | 2, + - )) -> None: +134 + ) +135 + def __post_init__(self, x: tuple[int, ...]) -> None: +136 | self.x = x +137 | +138 | +note: This is an unsafe fix and may change runtime behavior RUF033 [*] `__post_init__` method with argument defaults --> RUF033.py:140:38 @@ -498,14 +480,13 @@ RUF033 [*] `__post_init__` method with argument defaults 142 | self.x = x | help: Use `dataclasses.InitVar` instead - -ℹ Unsafe fix -137 137 | -138 138 | @dataclass -139 139 | class D: -140 |- def __post_init__(self, x: int = """ -141 |- """) -> None: - 140 |+ x: InitVar[int] = """ - 141 |+ """ - 142 |+ def __post_init__(self, x: int) -> None: -142 143 | self.x = x +137 | +138 | @dataclass +139 | class D: + - def __post_init__(self, x: int = """ + - """) -> None: +140 + x: InitVar[int] = """ +141 + """ +142 + def __post_init__(self, x: int) -> None: +143 | self.x = x +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap index 97b71fd4a5..8950219905 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF037_RUF037.py.snap @@ -9,16 +9,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `deque()` - -ℹ Safe fix -3 3 | -4 4 | -5 5 | def f(): -6 |- queue = collections.deque([]) # RUF037 - 6 |+ queue = collections.deque() # RUF037 -7 7 | -8 8 | -9 9 | def f(): +3 | +4 | +5 | def f(): + - queue = collections.deque([]) # RUF037 +6 + queue = collections.deque() # RUF037 +7 | +8 | +9 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:10:13 @@ -28,16 +26,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `deque(maxlen=...)` - -ℹ Safe fix -7 7 | -8 8 | -9 9 | def f(): -10 |- queue = collections.deque([], maxlen=10) # RUF037 - 10 |+ queue = collections.deque(maxlen=10) # RUF037 -11 11 | -12 12 | -13 13 | def f(): +7 | +8 | +9 | def f(): + - queue = collections.deque([], maxlen=10) # RUF037 +10 + queue = collections.deque(maxlen=10) # RUF037 +11 | +12 | +13 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:14:13 @@ -47,16 +43,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^ | help: Replace with `deque()` - -ℹ Safe fix -11 11 | -12 12 | -13 13 | def f(): -14 |- queue = deque([]) # RUF037 - 14 |+ queue = deque() # RUF037 -15 15 | -16 16 | -17 17 | def f(): +11 | +12 | +13 | def f(): + - queue = deque([]) # RUF037 +14 + queue = deque() # RUF037 +15 | +16 | +17 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:18:13 @@ -66,16 +60,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^ | help: Replace with `deque()` - -ℹ Safe fix -15 15 | -16 16 | -17 17 | def f(): -18 |- queue = deque(()) # RUF037 - 18 |+ queue = deque() # RUF037 -19 19 | -20 20 | -21 21 | def f(): +15 | +16 | +17 | def f(): + - queue = deque(()) # RUF037 +18 + queue = deque() # RUF037 +19 | +20 | +21 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:22:13 @@ -85,16 +77,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^ | help: Replace with `deque()` - -ℹ Safe fix -19 19 | -20 20 | -21 21 | def f(): -22 |- queue = deque({}) # RUF037 - 22 |+ queue = deque() # RUF037 -23 23 | -24 24 | -25 25 | def f(): +19 | +20 | +21 | def f(): + - queue = deque({}) # RUF037 +22 + queue = deque() # RUF037 +23 | +24 | +25 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:26:13 @@ -104,16 +94,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^^^^ | help: Replace with `deque()` - -ℹ Safe fix -23 23 | -24 24 | -25 25 | def f(): -26 |- queue = deque(set()) # RUF037 - 26 |+ queue = deque() # RUF037 -27 27 | -28 28 | -29 29 | def f(): +23 | +24 | +25 | def f(): + - queue = deque(set()) # RUF037 +26 + queue = deque() # RUF037 +27 | +28 | +29 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:30:13 @@ -123,16 +111,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `deque(maxlen=...)` - -ℹ Safe fix -27 27 | -28 28 | -29 29 | def f(): -30 |- queue = collections.deque([], maxlen=10) # RUF037 - 30 |+ queue = collections.deque(maxlen=10) # RUF037 -31 31 | -32 32 | -33 33 | def f(): +27 | +28 | +29 | def f(): + - queue = collections.deque([], maxlen=10) # RUF037 +30 + queue = collections.deque(maxlen=10) # RUF037 +31 | +32 | +33 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:61:13 @@ -142,16 +128,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^^^ | help: Replace with `deque()` - -ℹ Safe fix -58 58 | queue = deque() # Ok -59 59 | -60 60 | def f(): -61 |- x = 0 or(deque)([]) - 61 |+ x = 0 or(deque)() -62 62 | -63 63 | -64 64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612 +58 | queue = deque() # Ok +59 | +60 | def f(): + - x = 0 or(deque)([]) +61 + x = 0 or(deque)() +62 | +63 | +64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612 RUF037 Unnecessary empty iterable within a deque call --> RUF037.py:66:5 @@ -175,16 +159,15 @@ RUF037 [*] Unnecessary empty iterable within a deque call 68 | deque([], foo=1) # RUF037 | help: Replace with `deque()` - -ℹ Unsafe fix -64 64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612 -65 65 | def f(): -66 66 | deque([], *[10]) # RUF037 but no fix -67 |- deque([], **{"maxlen": 10}) # RUF037 - 67 |+ deque(**{"maxlen": 10}) # RUF037 -68 68 | deque([], foo=1) # RUF037 -69 69 | -70 70 | +64 | # regression tests for https://github.com/astral-sh/ruff/issues/18612 +65 | def f(): +66 | deque([], *[10]) # RUF037 but no fix + - deque([], **{"maxlen": 10}) # RUF037 +67 + deque(**{"maxlen": 10}) # RUF037 +68 | deque([], foo=1) # RUF037 +69 | +70 | +note: This is an unsafe fix and may change runtime behavior RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:68:5 @@ -195,16 +178,15 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^^^^^^^^ | help: Replace with `deque()` - -ℹ Unsafe fix -65 65 | def f(): -66 66 | deque([], *[10]) # RUF037 but no fix -67 67 | deque([], **{"maxlen": 10}) # RUF037 -68 |- deque([], foo=1) # RUF037 - 68 |+ deque(foo=1) # RUF037 -69 69 | -70 70 | -71 71 | # Somewhat related to the issue, both okay because we can't generally look +65 | def f(): +66 | deque([], *[10]) # RUF037 but no fix +67 | deque([], **{"maxlen": 10}) # RUF037 + - deque([], foo=1) # RUF037 +68 + deque(foo=1) # RUF037 +69 | +70 | +71 | # Somewhat related to the issue, both okay because we can't generally look +note: This is an unsafe fix and may change runtime behavior RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:80:5 @@ -219,20 +201,19 @@ RUF037 [*] Unnecessary empty iterable within a deque call | |_________^ | help: Replace with `deque(maxlen=...)` - -ℹ Unsafe fix -77 77 | # The fix was actually always unsafe in the presence of comments. all of these -78 78 | # are deleted -79 79 | def f(): -80 |- deque( # a comment in deque, deleted -81 |- [ # a comment _in_ the list, deleted -82 |- ], # a comment after the list, deleted -83 |- maxlen=10, # a comment on maxlen, deleted -84 |- ) # only this is preserved - 80 |+ deque(maxlen=10) # only this is preserved -85 81 | -86 82 | -87 83 | # `maxlen` can also be passed positionally +77 | # The fix was actually always unsafe in the presence of comments. all of these +78 | # are deleted +79 | def f(): + - deque( # a comment in deque, deleted + - [ # a comment _in_ the list, deleted + - ], # a comment after the list, deleted + - maxlen=10, # a comment on maxlen, deleted + - ) # only this is preserved +80 + deque(maxlen=10) # only this is preserved +81 | +82 | +83 | # `maxlen` can also be passed positionally +note: This is an unsafe fix and may change runtime behavior RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:89:5 @@ -243,16 +224,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call | ^^^^^^^^^^^^^ | help: Replace with `deque(maxlen=...)` - -ℹ Safe fix -86 86 | -87 87 | # `maxlen` can also be passed positionally -88 88 | def f(): -89 |- deque([], 10) - 89 |+ deque(maxlen=10) -90 90 | -91 91 | -92 92 | def f(): +86 | +87 | # `maxlen` can also be passed positionally +88 | def f(): + - deque([], 10) +89 + deque(maxlen=10) +90 | +91 | +92 | def f(): RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:93:5 @@ -264,16 +243,15 @@ RUF037 [*] Unnecessary empty iterable within a deque call 95 | # https://github.com/astral-sh/ruff/issues/18854 | help: Replace with `deque()` - -ℹ Unsafe fix -90 90 | -91 91 | -92 92 | def f(): -93 |- deque([], iterable=[]) - 93 |+ deque([]) -94 94 | -95 95 | # https://github.com/astral-sh/ruff/issues/18854 -96 96 | deque("") +90 | +91 | +92 | def f(): + - deque([], iterable=[]) +93 + deque([]) +94 | +95 | # https://github.com/astral-sh/ruff/issues/18854 +96 | deque("") +note: This is an unsafe fix and may change runtime behavior RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:96:1 @@ -285,16 +263,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call 98 | deque(f"") | help: Replace with `deque()` - -ℹ Safe fix -93 93 | deque([], iterable=[]) -94 94 | -95 95 | # https://github.com/astral-sh/ruff/issues/18854 -96 |-deque("") - 96 |+deque() -97 97 | deque(b"") -98 98 | deque(f"") -99 99 | deque(f"" "") +93 | deque([], iterable=[]) +94 | +95 | # https://github.com/astral-sh/ruff/issues/18854 + - deque("") +96 + deque() +97 | deque(b"") +98 | deque(f"") +99 | deque(f"" "") RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:97:1 @@ -307,16 +283,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call 99 | deque(f"" "") | help: Replace with `deque()` - -ℹ Safe fix -94 94 | -95 95 | # https://github.com/astral-sh/ruff/issues/18854 -96 96 | deque("") -97 |-deque(b"") - 97 |+deque() -98 98 | deque(f"") -99 99 | deque(f"" "") -100 100 | deque(f"" f"") +94 | +95 | # https://github.com/astral-sh/ruff/issues/18854 +96 | deque("") + - deque(b"") +97 + deque() +98 | deque(f"") +99 | deque(f"" "") +100 | deque(f"" f"") RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:98:1 @@ -329,16 +303,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call 100 | deque(f"" f"") | help: Replace with `deque()` - -ℹ Safe fix -95 95 | # https://github.com/astral-sh/ruff/issues/18854 -96 96 | deque("") -97 97 | deque(b"") -98 |-deque(f"") - 98 |+deque() -99 99 | deque(f"" "") -100 100 | deque(f"" f"") -101 101 | deque("abc") # OK +95 | # https://github.com/astral-sh/ruff/issues/18854 +96 | deque("") +97 | deque(b"") + - deque(f"") +98 + deque() +99 | deque(f"" "") +100 | deque(f"" f"") +101 | deque("abc") # OK RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:99:1 @@ -351,16 +323,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call 101 | deque("abc") # OK | help: Replace with `deque()` - -ℹ Safe fix -96 96 | deque("") -97 97 | deque(b"") -98 98 | deque(f"") -99 |-deque(f"" "") - 99 |+deque() -100 100 | deque(f"" f"") -101 101 | deque("abc") # OK -102 102 | deque(b"abc") # OK +96 | deque("") +97 | deque(b"") +98 | deque(f"") + - deque(f"" "") +99 + deque() +100 | deque(f"" f"") +101 | deque("abc") # OK +102 | deque(b"abc") # OK RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:100:1 @@ -373,16 +343,14 @@ RUF037 [*] Unnecessary empty iterable within a deque call 102 | deque(b"abc") # OK | help: Replace with `deque()` - -ℹ Safe fix -97 97 | deque(b"") -98 98 | deque(f"") -99 99 | deque(f"" "") -100 |-deque(f"" f"") - 100 |+deque() -101 101 | deque("abc") # OK -102 102 | deque(b"abc") # OK -103 103 | deque(f"" "a") # OK +97 | deque(b"") +98 | deque(f"") +99 | deque(f"" "") + - deque(f"" f"") +100 + deque() +101 | deque("abc") # OK +102 | deque(b"abc") # OK +103 | deque(f"" "a") # OK RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:107:1 @@ -394,15 +362,13 @@ RUF037 [*] Unnecessary empty iterable within a deque call 109 | deque(t"{""}") # OK | help: Replace with `deque()` - -ℹ Safe fix -104 104 | deque(f"{x}" "") # OK -105 105 | -106 106 | # https://github.com/astral-sh/ruff/issues/19951 -107 |-deque(t"") - 107 |+deque() -108 108 | deque(t"" t"") -109 109 | deque(t"{""}") # OK +104 | deque(f"{x}" "") # OK +105 | +106 | # https://github.com/astral-sh/ruff/issues/19951 + - deque(t"") +107 + deque() +108 | deque(t"" t"") +109 | deque(t"{""}") # OK RUF037 [*] Unnecessary empty iterable within a deque call --> RUF037.py:108:1 @@ -414,11 +380,9 @@ RUF037 [*] Unnecessary empty iterable within a deque call 109 | deque(t"{""}") # OK | help: Replace with `deque()` - -ℹ Safe fix -105 105 | -106 106 | # https://github.com/astral-sh/ruff/issues/19951 -107 107 | deque(t"") -108 |-deque(t"" t"") - 108 |+deque() -109 109 | deque(t"{""}") # OK +105 | +106 | # https://github.com/astral-sh/ruff/issues/19951 +107 | deque(t"") + - deque(t"" t"") +108 + deque() +109 | deque(t"{""}") # OK diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap index a52ca0b528..ea56bd8a4d 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.py.snap @@ -9,16 +9,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 5 | ... | help: Replace with `bool` - -ℹ Unsafe fix -1 1 | from typing import Literal -2 2 | -3 3 | -4 |-def func1(arg1: Literal[True, False]): - 4 |+def func1(arg1: bool): -5 5 | ... -6 6 | -7 7 | +1 | from typing import Literal +2 | +3 | + - def func1(arg1: Literal[True, False]): +4 + def func1(arg1: bool): +5 | ... +6 | +7 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.py:8:17 @@ -28,16 +27,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 9 | ... | help: Replace with `bool` - -ℹ Unsafe fix -5 5 | ... -6 6 | -7 7 | -8 |-def func2(arg1: Literal[True, False, True]): - 8 |+def func2(arg1: bool): -9 9 | ... -10 10 | -11 11 | +5 | ... +6 | +7 | + - def func2(arg1: Literal[True, False, True]): +8 + def func2(arg1: bool): +9 | ... +10 | +11 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.py:12:16 @@ -47,16 +45,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 13 | ... | help: Replace with `bool` - -ℹ Unsafe fix -9 9 | ... -10 10 | -11 11 | -12 |-def func3() -> Literal[True, False]: - 12 |+def func3() -> bool: -13 13 | ... -14 14 | -15 15 | +9 | ... +10 | +11 | + - def func3() -> Literal[True, False]: +12 + def func3() -> bool: +13 | ... +14 | +15 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.py:16:17 @@ -66,16 +63,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 17 | ... | help: Replace with `bool` - -ℹ Unsafe fix -13 13 | ... -14 14 | -15 15 | -16 |-def func4(arg1: Literal[True, False] | bool): - 16 |+def func4(arg1: bool | bool): -17 17 | ... -18 18 | -19 19 | +13 | ... +14 | +15 | + - def func4(arg1: Literal[True, False] | bool): +16 + def func4(arg1: bool | bool): +17 | ... +18 | +19 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.py:20:17 @@ -85,16 +81,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 21 | ... | help: Replace with `bool` - -ℹ Unsafe fix -17 17 | ... -18 18 | -19 19 | -20 |-def func5(arg1: Literal[False, True]): - 20 |+def func5(arg1: bool): -21 21 | ... -22 22 | -23 23 | +17 | ... +18 | +19 | + - def func5(arg1: Literal[False, True]): +20 + def func5(arg1: bool): +21 | ... +22 | +23 | +note: This is an unsafe fix and may change runtime behavior RUF038 `Literal[True, False, ...]` can be replaced with `Literal[...] | bool` --> RUF038.py:24:17 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap index 0f4170e303..164e51b31b 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF038_RUF038.pyi.snap @@ -10,16 +10,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 6 | def func2(arg1: Literal[True, False, True]): ... | help: Replace with `bool` - -ℹ Unsafe fix -1 1 | from typing import Literal -2 2 | -3 3 | -4 |-def func1(arg1: Literal[True, False]): ... - 4 |+def func1(arg1: bool): ... -5 5 | -6 6 | def func2(arg1: Literal[True, False, True]): ... -7 7 | +1 | from typing import Literal +2 | +3 | + - def func1(arg1: Literal[True, False]): ... +4 + def func1(arg1: bool): ... +5 | +6 | def func2(arg1: Literal[True, False, True]): ... +7 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.pyi:6:17 @@ -32,16 +31,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 8 | def func3() -> Literal[True, False]: ... | help: Replace with `bool` - -ℹ Unsafe fix -3 3 | -4 4 | def func1(arg1: Literal[True, False]): ... -5 5 | -6 |-def func2(arg1: Literal[True, False, True]): ... - 6 |+def func2(arg1: bool): ... -7 7 | -8 8 | def func3() -> Literal[True, False]: ... -9 9 | +3 | +4 | def func1(arg1: Literal[True, False]): ... +5 | + - def func2(arg1: Literal[True, False, True]): ... +6 + def func2(arg1: bool): ... +7 | +8 | def func3() -> Literal[True, False]: ... +9 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.pyi:8:16 @@ -54,16 +52,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 10 | def func4(arg1: Literal[True, False] | bool): ... | help: Replace with `bool` - -ℹ Unsafe fix -5 5 | -6 6 | def func2(arg1: Literal[True, False, True]): ... -7 7 | -8 |-def func3() -> Literal[True, False]: ... - 8 |+def func3() -> bool: ... -9 9 | -10 10 | def func4(arg1: Literal[True, False] | bool): ... -11 11 | +5 | +6 | def func2(arg1: Literal[True, False, True]): ... +7 | + - def func3() -> Literal[True, False]: ... +8 + def func3() -> bool: ... +9 | +10 | def func4(arg1: Literal[True, False] | bool): ... +11 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.pyi:10:17 @@ -76,16 +73,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 12 | def func5(arg1: Literal[False, True]): ... | help: Replace with `bool` - -ℹ Unsafe fix -7 7 | -8 8 | def func3() -> Literal[True, False]: ... -9 9 | -10 |-def func4(arg1: Literal[True, False] | bool): ... - 10 |+def func4(arg1: bool | bool): ... -11 11 | -12 12 | def func5(arg1: Literal[False, True]): ... -13 13 | +7 | +8 | def func3() -> Literal[True, False]: ... +9 | + - def func4(arg1: Literal[True, False] | bool): ... +10 + def func4(arg1: bool | bool): ... +11 | +12 | def func5(arg1: Literal[False, True]): ... +13 | +note: This is an unsafe fix and may change runtime behavior RUF038 [*] `Literal[True, False]` can be replaced with `bool` --> RUF038.pyi:12:17 @@ -98,16 +94,15 @@ RUF038 [*] `Literal[True, False]` can be replaced with `bool` 14 | def func6(arg1: Literal[True, False, "hello", "world"]): ... | help: Replace with `bool` - -ℹ Unsafe fix -9 9 | -10 10 | def func4(arg1: Literal[True, False] | bool): ... -11 11 | -12 |-def func5(arg1: Literal[False, True]): ... - 12 |+def func5(arg1: bool): ... -13 13 | -14 14 | def func6(arg1: Literal[True, False, "hello", "world"]): ... -15 15 | +9 | +10 | def func4(arg1: Literal[True, False] | bool): ... +11 | + - def func5(arg1: Literal[False, True]): ... +12 + def func5(arg1: bool): ... +13 | +14 | def func6(arg1: Literal[True, False, "hello", "world"]): ... +15 | +note: This is an unsafe fix and may change runtime behavior RUF038 `Literal[True, False, ...]` can be replaced with `Literal[...] | bool` --> RUF038.pyi:14:17 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap index 3f44d5eee8..272f8a43bb 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.py.snap @@ -10,16 +10,14 @@ RUF041 [*] Unnecessary nested `Literal` 8 | Literal[1, 2, Literal[1, 2]] | help: Replace with flattened `Literal` - -ℹ Safe fix -3 3 | import typing_extensions -4 4 | -5 5 | -6 |-y: Literal[1, print("hello"), 3, Literal[4, 1]] - 6 |+y: Literal[1, print("hello"), 3, 4, 1] -7 7 | Literal[1, Literal[1]] -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] +3 | import typing_extensions +4 | +5 | + - y: Literal[1, print("hello"), 3, Literal[4, 1]] +6 + y: Literal[1, print("hello"), 3, 4, 1] +7 | Literal[1, Literal[1]] +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:7:1 @@ -31,16 +29,14 @@ RUF041 [*] Unnecessary nested `Literal` 9 | Literal[1, Literal[1], Literal[1]] | help: Replace with flattened `Literal` - -ℹ Safe fix -4 4 | -5 5 | -6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] -7 |-Literal[1, Literal[1]] - 7 |+Literal[1, 1] -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] +4 | +5 | +6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] + - Literal[1, Literal[1]] +7 + Literal[1, 1] +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:8:1 @@ -53,16 +49,14 @@ RUF041 [*] Unnecessary nested `Literal` 10 | Literal[1, Literal[2], Literal[2]] | help: Replace with flattened `Literal` - -ℹ Safe fix -5 5 | -6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] -7 7 | Literal[1, Literal[1]] -8 |-Literal[1, 2, Literal[1, 2]] - 8 |+Literal[1, 2, 1, 2] -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] +5 | +6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] +7 | Literal[1, Literal[1]] + - Literal[1, 2, Literal[1, 2]] +8 + Literal[1, 2, 1, 2] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:9:1 @@ -75,16 +69,14 @@ RUF041 [*] Unnecessary nested `Literal` 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] | help: Replace with flattened `Literal` - -ℹ Safe fix -6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] -7 7 | Literal[1, Literal[1]] -8 8 | Literal[1, 2, Literal[1, 2]] -9 |-Literal[1, Literal[1], Literal[1]] - 9 |+Literal[1, 1, 1] -10 10 | Literal[1, Literal[2], Literal[2]] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] -12 12 | Literal[ +6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] +7 | Literal[1, Literal[1]] +8 | Literal[1, 2, Literal[1, 2]] + - Literal[1, Literal[1], Literal[1]] +9 + Literal[1, 1, 1] +10 | Literal[1, Literal[2], Literal[2]] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] +12 | Literal[ RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:10:1 @@ -97,16 +89,14 @@ RUF041 [*] Unnecessary nested `Literal` 12 | Literal[ | help: Replace with flattened `Literal` - -ℹ Safe fix -7 7 | Literal[1, Literal[1]] -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] -10 |-Literal[1, Literal[2], Literal[2]] - 10 |+Literal[1, 2, 2] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] -12 12 | Literal[ -13 13 | 1, # comment 1 +7 | Literal[1, Literal[1]] +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] + - Literal[1, Literal[2], Literal[2]] +10 + Literal[1, 2, 2] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] +12 | Literal[ +13 | 1, # comment 1 RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:11:1 @@ -119,16 +109,14 @@ RUF041 [*] Unnecessary nested `Literal` 13 | 1, # comment 1 | help: Replace with flattened `Literal` - -ℹ Safe fix -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] -11 |-t.Literal[1, t.Literal[2, t.Literal[1]]] - 11 |+t.Literal[1, 2, 1] -12 12 | Literal[ -13 13 | 1, # comment 1 -14 14 | Literal[ # another comment +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] + - t.Literal[1, t.Literal[2, t.Literal[1]]] +11 + t.Literal[1, 2, 1] +12 | Literal[ +13 | 1, # comment 1 +14 | Literal[ # another comment RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:12:1 @@ -146,21 +134,20 @@ RUF041 [*] Unnecessary nested `Literal` 19 | # Ensure issue is only raised once, even on nested literals | help: Replace with flattened `Literal` - -ℹ Unsafe fix -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] -12 |-Literal[ -13 |- 1, # comment 1 -14 |- Literal[ # another comment -15 |- 1 # yet another comment -16 |- ] -17 |-] # once - 12 |+Literal[1, 1] # once -18 13 | -19 14 | # Ensure issue is only raised once, even on nested literals -20 15 | MyType = Literal["foo", Literal[True, False, True], "bar"] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] + - Literal[ + - 1, # comment 1 + - Literal[ # another comment + - 1 # yet another comment + - ] + - ] # once +12 + Literal[1, 1] # once +13 | +14 | # Ensure issue is only raised once, even on nested literals +15 | MyType = Literal["foo", Literal[True, False, True], "bar"] +note: This is an unsafe fix and may change runtime behavior RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:20:10 @@ -172,16 +159,14 @@ RUF041 [*] Unnecessary nested `Literal` 22 | # nested literals, all equivalent to `Literal[1]` | help: Replace with flattened `Literal` - -ℹ Safe fix -17 17 | ] # once -18 18 | -19 19 | # Ensure issue is only raised once, even on nested literals -20 |-MyType = Literal["foo", Literal[True, False, True], "bar"] - 20 |+MyType = Literal["foo", True, False, True, "bar"] -21 21 | -22 22 | # nested literals, all equivalent to `Literal[1]` -23 23 | Literal[Literal[1]] +17 | ] # once +18 | +19 | # Ensure issue is only raised once, even on nested literals + - MyType = Literal["foo", Literal[True, False, True], "bar"] +20 + MyType = Literal["foo", True, False, True, "bar"] +21 | +22 | # nested literals, all equivalent to `Literal[1]` +23 | Literal[Literal[1]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:23:1 @@ -193,16 +178,14 @@ RUF041 [*] Unnecessary nested `Literal` 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] | help: Replace with flattened `Literal` - -ℹ Safe fix -20 20 | MyType = Literal["foo", Literal[True, False, True], "bar"] -21 21 | -22 22 | # nested literals, all equivalent to `Literal[1]` -23 |-Literal[Literal[1]] - 23 |+Literal[1] -24 24 | Literal[Literal[Literal[1], Literal[1]]] -25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] -26 26 | +20 | MyType = Literal["foo", Literal[True, False, True], "bar"] +21 | +22 | # nested literals, all equivalent to `Literal[1]` + - Literal[Literal[1]] +23 + Literal[1] +24 | Literal[Literal[Literal[1], Literal[1]]] +25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] +26 | RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:24:1 @@ -214,16 +197,14 @@ RUF041 [*] Unnecessary nested `Literal` 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] | help: Replace with flattened `Literal` - -ℹ Safe fix -21 21 | -22 22 | # nested literals, all equivalent to `Literal[1]` -23 23 | Literal[Literal[1]] -24 |-Literal[Literal[Literal[1], Literal[1]]] - 24 |+Literal[1, 1] -25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] -26 26 | -27 27 | # OK +21 | +22 | # nested literals, all equivalent to `Literal[1]` +23 | Literal[Literal[1]] + - Literal[Literal[Literal[1], Literal[1]]] +24 + Literal[1, 1] +25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] +26 | +27 | # OK RUF041 [*] Unnecessary nested `Literal` --> RUF041.py:25:1 @@ -236,13 +217,11 @@ RUF041 [*] Unnecessary nested `Literal` 27 | # OK | help: Replace with flattened `Literal` - -ℹ Safe fix -22 22 | # nested literals, all equivalent to `Literal[1]` -23 23 | Literal[Literal[1]] -24 24 | Literal[Literal[Literal[1], Literal[1]]] -25 |-Literal[Literal[1], Literal[Literal[Literal[1]]]] - 25 |+Literal[1, 1] -26 26 | -27 27 | # OK -28 28 | x: Literal[True, False, True, False] +22 | # nested literals, all equivalent to `Literal[1]` +23 | Literal[Literal[1]] +24 | Literal[Literal[Literal[1], Literal[1]]] + - Literal[Literal[1], Literal[Literal[Literal[1]]]] +25 + Literal[1, 1] +26 | +27 | # OK +28 | x: Literal[True, False, True, False] diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap index c62475a490..17fad72a99 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF041_RUF041.pyi.snap @@ -10,16 +10,14 @@ RUF041 [*] Unnecessary nested `Literal` 8 | Literal[1, 2, Literal[1, 2]] | help: Replace with flattened `Literal` - -ℹ Safe fix -3 3 | import typing_extensions -4 4 | -5 5 | -6 |-y: Literal[1, print("hello"), 3, Literal[4, 1]] - 6 |+y: Literal[1, print("hello"), 3, 4, 1] -7 7 | Literal[1, Literal[1]] -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] +3 | import typing_extensions +4 | +5 | + - y: Literal[1, print("hello"), 3, Literal[4, 1]] +6 + y: Literal[1, print("hello"), 3, 4, 1] +7 | Literal[1, Literal[1]] +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:7:1 @@ -31,16 +29,14 @@ RUF041 [*] Unnecessary nested `Literal` 9 | Literal[1, Literal[1], Literal[1]] | help: Replace with flattened `Literal` - -ℹ Safe fix -4 4 | -5 5 | -6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] -7 |-Literal[1, Literal[1]] - 7 |+Literal[1, 1] -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] +4 | +5 | +6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] + - Literal[1, Literal[1]] +7 + Literal[1, 1] +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:8:1 @@ -53,16 +49,14 @@ RUF041 [*] Unnecessary nested `Literal` 10 | Literal[1, Literal[2], Literal[2]] | help: Replace with flattened `Literal` - -ℹ Safe fix -5 5 | -6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] -7 7 | Literal[1, Literal[1]] -8 |-Literal[1, 2, Literal[1, 2]] - 8 |+Literal[1, 2, 1, 2] -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] +5 | +6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] +7 | Literal[1, Literal[1]] + - Literal[1, 2, Literal[1, 2]] +8 + Literal[1, 2, 1, 2] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:9:1 @@ -75,16 +69,14 @@ RUF041 [*] Unnecessary nested `Literal` 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] | help: Replace with flattened `Literal` - -ℹ Safe fix -6 6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] -7 7 | Literal[1, Literal[1]] -8 8 | Literal[1, 2, Literal[1, 2]] -9 |-Literal[1, Literal[1], Literal[1]] - 9 |+Literal[1, 1, 1] -10 10 | Literal[1, Literal[2], Literal[2]] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] -12 12 | Literal[ +6 | y: Literal[1, print("hello"), 3, Literal[4, 1]] +7 | Literal[1, Literal[1]] +8 | Literal[1, 2, Literal[1, 2]] + - Literal[1, Literal[1], Literal[1]] +9 + Literal[1, 1, 1] +10 | Literal[1, Literal[2], Literal[2]] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] +12 | Literal[ RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:10:1 @@ -97,16 +89,14 @@ RUF041 [*] Unnecessary nested `Literal` 12 | Literal[ | help: Replace with flattened `Literal` - -ℹ Safe fix -7 7 | Literal[1, Literal[1]] -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] -10 |-Literal[1, Literal[2], Literal[2]] - 10 |+Literal[1, 2, 2] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] -12 12 | Literal[ -13 13 | 1, # comment 1 +7 | Literal[1, Literal[1]] +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] + - Literal[1, Literal[2], Literal[2]] +10 + Literal[1, 2, 2] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] +12 | Literal[ +13 | 1, # comment 1 RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:11:1 @@ -119,16 +109,14 @@ RUF041 [*] Unnecessary nested `Literal` 13 | 1, # comment 1 | help: Replace with flattened `Literal` - -ℹ Safe fix -8 8 | Literal[1, 2, Literal[1, 2]] -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] -11 |-t.Literal[1, t.Literal[2, t.Literal[1]]] - 11 |+t.Literal[1, 2, 1] -12 12 | Literal[ -13 13 | 1, # comment 1 -14 14 | Literal[ # another comment +8 | Literal[1, 2, Literal[1, 2]] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] + - t.Literal[1, t.Literal[2, t.Literal[1]]] +11 + t.Literal[1, 2, 1] +12 | Literal[ +13 | 1, # comment 1 +14 | Literal[ # another comment RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:12:1 @@ -146,21 +134,20 @@ RUF041 [*] Unnecessary nested `Literal` 19 | # Ensure issue is only raised once, even on nested literals | help: Replace with flattened `Literal` - -ℹ Unsafe fix -9 9 | Literal[1, Literal[1], Literal[1]] -10 10 | Literal[1, Literal[2], Literal[2]] -11 11 | t.Literal[1, t.Literal[2, t.Literal[1]]] -12 |-Literal[ -13 |- 1, # comment 1 -14 |- Literal[ # another comment -15 |- 1 # yet another comment -16 |- ] -17 |-] # once - 12 |+Literal[1, 1] # once -18 13 | -19 14 | # Ensure issue is only raised once, even on nested literals -20 15 | MyType = Literal["foo", Literal[True, False, True], "bar"] +9 | Literal[1, Literal[1], Literal[1]] +10 | Literal[1, Literal[2], Literal[2]] +11 | t.Literal[1, t.Literal[2, t.Literal[1]]] + - Literal[ + - 1, # comment 1 + - Literal[ # another comment + - 1 # yet another comment + - ] + - ] # once +12 + Literal[1, 1] # once +13 | +14 | # Ensure issue is only raised once, even on nested literals +15 | MyType = Literal["foo", Literal[True, False, True], "bar"] +note: This is an unsafe fix and may change runtime behavior RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:20:10 @@ -172,16 +159,14 @@ RUF041 [*] Unnecessary nested `Literal` 22 | # nested literals, all equivalent to `Literal[1]` | help: Replace with flattened `Literal` - -ℹ Safe fix -17 17 | ] # once -18 18 | -19 19 | # Ensure issue is only raised once, even on nested literals -20 |-MyType = Literal["foo", Literal[True, False, True], "bar"] - 20 |+MyType = Literal["foo", True, False, True, "bar"] -21 21 | -22 22 | # nested literals, all equivalent to `Literal[1]` -23 23 | Literal[Literal[1]] +17 | ] # once +18 | +19 | # Ensure issue is only raised once, even on nested literals + - MyType = Literal["foo", Literal[True, False, True], "bar"] +20 + MyType = Literal["foo", True, False, True, "bar"] +21 | +22 | # nested literals, all equivalent to `Literal[1]` +23 | Literal[Literal[1]] RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:23:1 @@ -193,16 +178,14 @@ RUF041 [*] Unnecessary nested `Literal` 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] | help: Replace with flattened `Literal` - -ℹ Safe fix -20 20 | MyType = Literal["foo", Literal[True, False, True], "bar"] -21 21 | -22 22 | # nested literals, all equivalent to `Literal[1]` -23 |-Literal[Literal[1]] - 23 |+Literal[1] -24 24 | Literal[Literal[Literal[1], Literal[1]]] -25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] -26 26 | +20 | MyType = Literal["foo", Literal[True, False, True], "bar"] +21 | +22 | # nested literals, all equivalent to `Literal[1]` + - Literal[Literal[1]] +23 + Literal[1] +24 | Literal[Literal[Literal[1], Literal[1]]] +25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] +26 | RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:24:1 @@ -214,16 +197,14 @@ RUF041 [*] Unnecessary nested `Literal` 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] | help: Replace with flattened `Literal` - -ℹ Safe fix -21 21 | -22 22 | # nested literals, all equivalent to `Literal[1]` -23 23 | Literal[Literal[1]] -24 |-Literal[Literal[Literal[1], Literal[1]]] - 24 |+Literal[1, 1] -25 25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] -26 26 | -27 27 | # OK +21 | +22 | # nested literals, all equivalent to `Literal[1]` +23 | Literal[Literal[1]] + - Literal[Literal[Literal[1], Literal[1]]] +24 + Literal[1, 1] +25 | Literal[Literal[1], Literal[Literal[Literal[1]]]] +26 | +27 | # OK RUF041 [*] Unnecessary nested `Literal` --> RUF041.pyi:25:1 @@ -236,13 +217,11 @@ RUF041 [*] Unnecessary nested `Literal` 27 | # OK | help: Replace with flattened `Literal` - -ℹ Safe fix -22 22 | # nested literals, all equivalent to `Literal[1]` -23 23 | Literal[Literal[1]] -24 24 | Literal[Literal[Literal[1], Literal[1]]] -25 |-Literal[Literal[1], Literal[Literal[Literal[1]]]] - 25 |+Literal[1, 1] -26 26 | -27 27 | # OK -28 28 | x: Literal[True, False, True, False] +22 | # nested literals, all equivalent to `Literal[1]` +23 | Literal[Literal[1]] +24 | Literal[Literal[Literal[1], Literal[1]]] + - Literal[Literal[1], Literal[Literal[Literal[1]]]] +25 + Literal[1, 1] +26 | +27 | # OK +28 | x: Literal[True, False, True, False] diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap index 31fdadacf3..e9b6399c96 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046.py.snap @@ -12,16 +12,14 @@ RUF046 [*] Value being cast to `int` is already an integer 12 | int(ord(foo)) | help: Remove unnecessary `int` call - -ℹ Safe fix -7 7 | -8 8 | ### Safely fixable -9 9 | -10 |-int(id()) - 10 |+id() -11 11 | int(len([])) -12 12 | int(ord(foo)) -13 13 | int(hash(foo, bar)) +7 | +8 | ### Safely fixable +9 | + - int(id()) +10 + id() +11 | int(len([])) +12 | int(ord(foo)) +13 | int(hash(foo, bar)) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:11:1 @@ -33,16 +31,14 @@ RUF046 [*] Value being cast to `int` is already an integer 13 | int(hash(foo, bar)) | help: Remove unnecessary `int` call - -ℹ Safe fix -8 8 | ### Safely fixable -9 9 | -10 10 | int(id()) -11 |-int(len([])) - 11 |+len([]) -12 12 | int(ord(foo)) -13 13 | int(hash(foo, bar)) -14 14 | int(int('')) +8 | ### Safely fixable +9 | +10 | int(id()) + - int(len([])) +11 + len([]) +12 | int(ord(foo)) +13 | int(hash(foo, bar)) +14 | int(int('')) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:12:1 @@ -55,16 +51,14 @@ RUF046 [*] Value being cast to `int` is already an integer 14 | int(int('')) | help: Remove unnecessary `int` call - -ℹ Safe fix -9 9 | -10 10 | int(id()) -11 11 | int(len([])) -12 |-int(ord(foo)) - 12 |+ord(foo) -13 13 | int(hash(foo, bar)) -14 14 | int(int('')) -15 15 | +9 | +10 | int(id()) +11 | int(len([])) + - int(ord(foo)) +12 + ord(foo) +13 | int(hash(foo, bar)) +14 | int(int('')) +15 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:13:1 @@ -76,16 +70,14 @@ RUF046 [*] Value being cast to `int` is already an integer 14 | int(int('')) | help: Remove unnecessary `int` call - -ℹ Safe fix -10 10 | int(id()) -11 11 | int(len([])) -12 12 | int(ord(foo)) -13 |-int(hash(foo, bar)) - 13 |+hash(foo, bar) -14 14 | int(int('')) -15 15 | -16 16 | int(math.comb()) +10 | int(id()) +11 | int(len([])) +12 | int(ord(foo)) + - int(hash(foo, bar)) +13 + hash(foo, bar) +14 | int(int('')) +15 | +16 | int(math.comb()) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:14:1 @@ -98,16 +90,14 @@ RUF046 [*] Value being cast to `int` is already an integer 16 | int(math.comb()) | help: Remove unnecessary `int` call - -ℹ Safe fix -11 11 | int(len([])) -12 12 | int(ord(foo)) -13 13 | int(hash(foo, bar)) -14 |-int(int('')) - 14 |+int('') -15 15 | -16 16 | int(math.comb()) -17 17 | int(math.factorial()) +11 | int(len([])) +12 | int(ord(foo)) +13 | int(hash(foo, bar)) + - int(int('')) +14 + int('') +15 | +16 | int(math.comb()) +17 | int(math.factorial()) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:16:1 @@ -120,16 +110,14 @@ RUF046 [*] Value being cast to `int` is already an integer 18 | int(math.gcd()) | help: Remove unnecessary `int` call - -ℹ Safe fix -13 13 | int(hash(foo, bar)) -14 14 | int(int('')) -15 15 | -16 |-int(math.comb()) - 16 |+math.comb() -17 17 | int(math.factorial()) -18 18 | int(math.gcd()) -19 19 | int(math.lcm()) +13 | int(hash(foo, bar)) +14 | int(int('')) +15 | + - int(math.comb()) +16 + math.comb() +17 | int(math.factorial()) +18 | int(math.gcd()) +19 | int(math.lcm()) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:17:1 @@ -141,16 +129,14 @@ RUF046 [*] Value being cast to `int` is already an integer 19 | int(math.lcm()) | help: Remove unnecessary `int` call - -ℹ Safe fix -14 14 | int(int('')) -15 15 | -16 16 | int(math.comb()) -17 |-int(math.factorial()) - 17 |+math.factorial() -18 18 | int(math.gcd()) -19 19 | int(math.lcm()) -20 20 | int(math.isqrt()) +14 | int(int('')) +15 | +16 | int(math.comb()) + - int(math.factorial()) +17 + math.factorial() +18 | int(math.gcd()) +19 | int(math.lcm()) +20 | int(math.isqrt()) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:18:1 @@ -163,16 +149,14 @@ RUF046 [*] Value being cast to `int` is already an integer 20 | int(math.isqrt()) | help: Remove unnecessary `int` call - -ℹ Safe fix -15 15 | -16 16 | int(math.comb()) -17 17 | int(math.factorial()) -18 |-int(math.gcd()) - 18 |+math.gcd() -19 19 | int(math.lcm()) -20 20 | int(math.isqrt()) -21 21 | int(math.perm()) +15 | +16 | int(math.comb()) +17 | int(math.factorial()) + - int(math.gcd()) +18 + math.gcd() +19 | int(math.lcm()) +20 | int(math.isqrt()) +21 | int(math.perm()) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:19:1 @@ -185,16 +169,14 @@ RUF046 [*] Value being cast to `int` is already an integer 21 | int(math.perm()) | help: Remove unnecessary `int` call - -ℹ Safe fix -16 16 | int(math.comb()) -17 17 | int(math.factorial()) -18 18 | int(math.gcd()) -19 |-int(math.lcm()) - 19 |+math.lcm() -20 20 | int(math.isqrt()) -21 21 | int(math.perm()) -22 22 | +16 | int(math.comb()) +17 | int(math.factorial()) +18 | int(math.gcd()) + - int(math.lcm()) +19 + math.lcm() +20 | int(math.isqrt()) +21 | int(math.perm()) +22 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:20:1 @@ -206,16 +188,14 @@ RUF046 [*] Value being cast to `int` is already an integer 21 | int(math.perm()) | help: Remove unnecessary `int` call - -ℹ Safe fix -17 17 | int(math.factorial()) -18 18 | int(math.gcd()) -19 19 | int(math.lcm()) -20 |-int(math.isqrt()) - 20 |+math.isqrt() -21 21 | int(math.perm()) -22 22 | -23 23 | int(round(1, 0)) +17 | int(math.factorial()) +18 | int(math.gcd()) +19 | int(math.lcm()) + - int(math.isqrt()) +20 + math.isqrt() +21 | int(math.perm()) +22 | +23 | int(round(1, 0)) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:21:1 @@ -228,16 +208,14 @@ RUF046 [*] Value being cast to `int` is already an integer 23 | int(round(1, 0)) | help: Remove unnecessary `int` call - -ℹ Safe fix -18 18 | int(math.gcd()) -19 19 | int(math.lcm()) -20 20 | int(math.isqrt()) -21 |-int(math.perm()) - 21 |+math.perm() -22 22 | -23 23 | int(round(1, 0)) -24 24 | int(round(1, 10)) +18 | int(math.gcd()) +19 | int(math.lcm()) +20 | int(math.isqrt()) + - int(math.perm()) +21 + math.perm() +22 | +23 | int(round(1, 0)) +24 | int(round(1, 10)) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:23:1 @@ -249,16 +227,14 @@ RUF046 [*] Value being cast to `int` is already an integer 24 | int(round(1, 10)) | help: Remove unnecessary `int` call - -ℹ Safe fix -20 20 | int(math.isqrt()) -21 21 | int(math.perm()) -22 22 | -23 |-int(round(1, 0)) - 23 |+round(1, 0) -24 24 | int(round(1, 10)) -25 25 | -26 26 | int(round(1)) +20 | int(math.isqrt()) +21 | int(math.perm()) +22 | + - int(round(1, 0)) +23 + round(1, 0) +24 | int(round(1, 10)) +25 | +26 | int(round(1)) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:24:1 @@ -270,16 +246,14 @@ RUF046 [*] Value being cast to `int` is already an integer 26 | int(round(1)) | help: Remove unnecessary `int` call - -ℹ Safe fix -21 21 | int(math.perm()) -22 22 | -23 23 | int(round(1, 0)) -24 |-int(round(1, 10)) - 24 |+round(1, 10) -25 25 | -26 26 | int(round(1)) -27 27 | int(round(1, None)) +21 | int(math.perm()) +22 | +23 | int(round(1, 0)) + - int(round(1, 10)) +24 + round(1, 10) +25 | +26 | int(round(1)) +27 | int(round(1, None)) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:26:1 @@ -291,16 +265,14 @@ RUF046 [*] Value being cast to `int` is already an integer 27 | int(round(1, None)) | help: Remove unnecessary `int` call - -ℹ Safe fix -23 23 | int(round(1, 0)) -24 24 | int(round(1, 10)) -25 25 | -26 |-int(round(1)) - 26 |+round(1) -27 27 | int(round(1, None)) -28 28 | -29 29 | int(round(1.)) +23 | int(round(1, 0)) +24 | int(round(1, 10)) +25 | + - int(round(1)) +26 + round(1) +27 | int(round(1, None)) +28 | +29 | int(round(1.)) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:27:1 @@ -312,16 +284,14 @@ RUF046 [*] Value being cast to `int` is already an integer 29 | int(round(1.)) | help: Remove unnecessary `int` call - -ℹ Safe fix -24 24 | int(round(1, 10)) -25 25 | -26 26 | int(round(1)) -27 |-int(round(1, None)) - 27 |+round(1, None) -28 28 | -29 29 | int(round(1.)) -30 30 | int(round(1., None)) +24 | int(round(1, 10)) +25 | +26 | int(round(1)) + - int(round(1, None)) +27 + round(1, None) +28 | +29 | int(round(1.)) +30 | int(round(1., None)) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:29:1 @@ -333,16 +303,14 @@ RUF046 [*] Value being cast to `int` is already an integer 30 | int(round(1., None)) | help: Remove unnecessary `int` call - -ℹ Safe fix -26 26 | int(round(1)) -27 27 | int(round(1, None)) -28 28 | -29 |-int(round(1.)) - 29 |+round(1.) -30 30 | int(round(1., None)) -31 31 | -32 32 | int(1) +26 | int(round(1)) +27 | int(round(1, None)) +28 | + - int(round(1.)) +29 + round(1.) +30 | int(round(1., None)) +31 | +32 | int(1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:30:1 @@ -354,16 +322,14 @@ RUF046 [*] Value being cast to `int` is already an integer 32 | int(1) | help: Remove unnecessary `int` call - -ℹ Safe fix -27 27 | int(round(1, None)) -28 28 | -29 29 | int(round(1.)) -30 |-int(round(1., None)) - 30 |+round(1., None) -31 31 | -32 32 | int(1) -33 33 | int(v := 1) +27 | int(round(1, None)) +28 | +29 | int(round(1.)) + - int(round(1., None)) +30 + round(1., None) +31 | +32 | int(1) +33 | int(v := 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:32:1 @@ -376,16 +342,14 @@ RUF046 [*] Value being cast to `int` is already an integer 34 | int(~1) | help: Remove unnecessary `int` call - -ℹ Safe fix -29 29 | int(round(1.)) -30 30 | int(round(1., None)) -31 31 | -32 |-int(1) - 32 |+1 -33 33 | int(v := 1) -34 34 | int(~1) -35 35 | int(-1) +29 | int(round(1.)) +30 | int(round(1., None)) +31 | + - int(1) +32 + 1 +33 | int(v := 1) +34 | int(~1) +35 | int(-1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:33:1 @@ -397,16 +361,14 @@ RUF046 [*] Value being cast to `int` is already an integer 35 | int(-1) | help: Remove unnecessary `int` call - -ℹ Safe fix -30 30 | int(round(1., None)) -31 31 | -32 32 | int(1) -33 |-int(v := 1) - 33 |+(v := 1) -34 34 | int(~1) -35 35 | int(-1) -36 36 | int(+1) +30 | int(round(1., None)) +31 | +32 | int(1) + - int(v := 1) +33 + (v := 1) +34 | int(~1) +35 | int(-1) +36 | int(+1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:34:1 @@ -419,16 +381,14 @@ RUF046 [*] Value being cast to `int` is already an integer 36 | int(+1) | help: Remove unnecessary `int` call - -ℹ Safe fix -31 31 | -32 32 | int(1) -33 33 | int(v := 1) -34 |-int(~1) - 34 |+~1 -35 35 | int(-1) -36 36 | int(+1) -37 37 | +31 | +32 | int(1) +33 | int(v := 1) + - int(~1) +34 + ~1 +35 | int(-1) +36 | int(+1) +37 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:35:1 @@ -440,16 +400,14 @@ RUF046 [*] Value being cast to `int` is already an integer 36 | int(+1) | help: Remove unnecessary `int` call - -ℹ Safe fix -32 32 | int(1) -33 33 | int(v := 1) -34 34 | int(~1) -35 |-int(-1) - 35 |+-1 -36 36 | int(+1) -37 37 | -38 38 | int(1 + 1) +32 | int(1) +33 | int(v := 1) +34 | int(~1) + - int(-1) +35 + -1 +36 | int(+1) +37 | +38 | int(1 + 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:36:1 @@ -462,16 +420,14 @@ RUF046 [*] Value being cast to `int` is already an integer 38 | int(1 + 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -33 33 | int(v := 1) -34 34 | int(~1) -35 35 | int(-1) -36 |-int(+1) - 36 |++1 -37 37 | -38 38 | int(1 + 1) -39 39 | int(1 - 1) +33 | int(v := 1) +34 | int(~1) +35 | int(-1) + - int(+1) +36 + +1 +37 | +38 | int(1 + 1) +39 | int(1 - 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:38:1 @@ -484,16 +440,14 @@ RUF046 [*] Value being cast to `int` is already an integer 40 | int(1 * 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -35 35 | int(-1) -36 36 | int(+1) -37 37 | -38 |-int(1 + 1) - 38 |+1 + 1 -39 39 | int(1 - 1) -40 40 | int(1 * 1) -41 41 | int(1 % 1) +35 | int(-1) +36 | int(+1) +37 | + - int(1 + 1) +38 + 1 + 1 +39 | int(1 - 1) +40 | int(1 * 1) +41 | int(1 % 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:39:1 @@ -505,16 +459,14 @@ RUF046 [*] Value being cast to `int` is already an integer 41 | int(1 % 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -36 36 | int(+1) -37 37 | -38 38 | int(1 + 1) -39 |-int(1 - 1) - 39 |+1 - 1 -40 40 | int(1 * 1) -41 41 | int(1 % 1) -42 42 | int(1 ** 1) +36 | int(+1) +37 | +38 | int(1 + 1) + - int(1 - 1) +39 + 1 - 1 +40 | int(1 * 1) +41 | int(1 % 1) +42 | int(1 ** 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:40:1 @@ -527,16 +479,14 @@ RUF046 [*] Value being cast to `int` is already an integer 42 | int(1 ** 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -37 37 | -38 38 | int(1 + 1) -39 39 | int(1 - 1) -40 |-int(1 * 1) - 40 |+1 * 1 -41 41 | int(1 % 1) -42 42 | int(1 ** 1) -43 43 | int(1 << 1) +37 | +38 | int(1 + 1) +39 | int(1 - 1) + - int(1 * 1) +40 + 1 * 1 +41 | int(1 % 1) +42 | int(1 ** 1) +43 | int(1 << 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:41:1 @@ -549,16 +499,14 @@ RUF046 [*] Value being cast to `int` is already an integer 43 | int(1 << 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -38 38 | int(1 + 1) -39 39 | int(1 - 1) -40 40 | int(1 * 1) -41 |-int(1 % 1) - 41 |+1 % 1 -42 42 | int(1 ** 1) -43 43 | int(1 << 1) -44 44 | int(1 >> 1) +38 | int(1 + 1) +39 | int(1 - 1) +40 | int(1 * 1) + - int(1 % 1) +41 + 1 % 1 +42 | int(1 ** 1) +43 | int(1 << 1) +44 | int(1 >> 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:42:1 @@ -571,16 +519,14 @@ RUF046 [*] Value being cast to `int` is already an integer 44 | int(1 >> 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -39 39 | int(1 - 1) -40 40 | int(1 * 1) -41 41 | int(1 % 1) -42 |-int(1 ** 1) - 42 |+1 ** 1 -43 43 | int(1 << 1) -44 44 | int(1 >> 1) -45 45 | int(1 | 1) +39 | int(1 - 1) +40 | int(1 * 1) +41 | int(1 % 1) + - int(1 ** 1) +42 + 1 ** 1 +43 | int(1 << 1) +44 | int(1 >> 1) +45 | int(1 | 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:43:1 @@ -593,16 +539,14 @@ RUF046 [*] Value being cast to `int` is already an integer 45 | int(1 | 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -40 40 | int(1 * 1) -41 41 | int(1 % 1) -42 42 | int(1 ** 1) -43 |-int(1 << 1) - 43 |+1 << 1 -44 44 | int(1 >> 1) -45 45 | int(1 | 1) -46 46 | int(1 ^ 1) +40 | int(1 * 1) +41 | int(1 % 1) +42 | int(1 ** 1) + - int(1 << 1) +43 + 1 << 1 +44 | int(1 >> 1) +45 | int(1 | 1) +46 | int(1 ^ 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:44:1 @@ -615,16 +559,14 @@ RUF046 [*] Value being cast to `int` is already an integer 46 | int(1 ^ 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -41 41 | int(1 % 1) -42 42 | int(1 ** 1) -43 43 | int(1 << 1) -44 |-int(1 >> 1) - 44 |+1 >> 1 -45 45 | int(1 | 1) -46 46 | int(1 ^ 1) -47 47 | int(1 & 1) +41 | int(1 % 1) +42 | int(1 ** 1) +43 | int(1 << 1) + - int(1 >> 1) +44 + 1 >> 1 +45 | int(1 | 1) +46 | int(1 ^ 1) +47 | int(1 & 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:45:1 @@ -637,16 +579,14 @@ RUF046 [*] Value being cast to `int` is already an integer 47 | int(1 & 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -42 42 | int(1 ** 1) -43 43 | int(1 << 1) -44 44 | int(1 >> 1) -45 |-int(1 | 1) - 45 |+1 | 1 -46 46 | int(1 ^ 1) -47 47 | int(1 & 1) -48 48 | int(1 // 1) +42 | int(1 ** 1) +43 | int(1 << 1) +44 | int(1 >> 1) + - int(1 | 1) +45 + 1 | 1 +46 | int(1 ^ 1) +47 | int(1 & 1) +48 | int(1 // 1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:46:1 @@ -659,16 +599,14 @@ RUF046 [*] Value being cast to `int` is already an integer 48 | int(1 // 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -43 43 | int(1 << 1) -44 44 | int(1 >> 1) -45 45 | int(1 | 1) -46 |-int(1 ^ 1) - 46 |+1 ^ 1 -47 47 | int(1 & 1) -48 48 | int(1 // 1) -49 49 | +43 | int(1 << 1) +44 | int(1 >> 1) +45 | int(1 | 1) + - int(1 ^ 1) +46 + 1 ^ 1 +47 | int(1 & 1) +48 | int(1 // 1) +49 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:47:1 @@ -680,16 +618,14 @@ RUF046 [*] Value being cast to `int` is already an integer 48 | int(1 // 1) | help: Remove unnecessary `int` call - -ℹ Safe fix -44 44 | int(1 >> 1) -45 45 | int(1 | 1) -46 46 | int(1 ^ 1) -47 |-int(1 & 1) - 47 |+1 & 1 -48 48 | int(1 // 1) -49 49 | -50 50 | int(1 if ... else 2) +44 | int(1 >> 1) +45 | int(1 | 1) +46 | int(1 ^ 1) + - int(1 & 1) +47 + 1 & 1 +48 | int(1 // 1) +49 | +50 | int(1 if ... else 2) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:48:1 @@ -702,16 +638,14 @@ RUF046 [*] Value being cast to `int` is already an integer 50 | int(1 if ... else 2) | help: Remove unnecessary `int` call - -ℹ Safe fix -45 45 | int(1 | 1) -46 46 | int(1 ^ 1) -47 47 | int(1 & 1) -48 |-int(1 // 1) - 48 |+1 // 1 -49 49 | -50 50 | int(1 if ... else 2) -51 51 | +45 | int(1 | 1) +46 | int(1 ^ 1) +47 | int(1 & 1) + - int(1 // 1) +48 + 1 // 1 +49 | +50 | int(1 if ... else 2) +51 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:50:1 @@ -724,16 +658,14 @@ RUF046 [*] Value being cast to `int` is already an integer 52 | int(1 and 0) | help: Remove unnecessary `int` call - -ℹ Safe fix -47 47 | int(1 & 1) -48 48 | int(1 // 1) -49 49 | -50 |-int(1 if ... else 2) - 50 |+1 if ... else 2 -51 51 | -52 52 | int(1 and 0) -53 53 | int(0 or -1) +47 | int(1 & 1) +48 | int(1 // 1) +49 | + - int(1 if ... else 2) +50 + 1 if ... else 2 +51 | +52 | int(1 and 0) +53 | int(0 or -1) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:52:1 @@ -745,16 +677,14 @@ RUF046 [*] Value being cast to `int` is already an integer 53 | int(0 or -1) | help: Remove unnecessary `int` call - -ℹ Safe fix -49 49 | -50 50 | int(1 if ... else 2) -51 51 | -52 |-int(1 and 0) - 52 |+1 and 0 -53 53 | int(0 or -1) -54 54 | -55 55 | +49 | +50 | int(1 if ... else 2) +51 | + - int(1 and 0) +52 + 1 and 0 +53 | int(0 or -1) +54 | +55 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:53:1 @@ -764,16 +694,14 @@ RUF046 [*] Value being cast to `int` is already an integer | ^^^^^^^^^^^^ | help: Remove unnecessary `int` call - -ℹ Safe fix -50 50 | int(1 if ... else 2) -51 51 | -52 52 | int(1 and 0) -53 |-int(0 or -1) - 53 |+0 or -1 -54 54 | -55 55 | -56 56 | if int(1 + 2) * 3: +50 | int(1 if ... else 2) +51 | +52 | int(1 and 0) + - int(0 or -1) +53 + 0 or -1 +54 | +55 | +56 | if int(1 + 2) * 3: RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:56:4 @@ -783,16 +711,14 @@ RUF046 [*] Value being cast to `int` is already an integer 57 | ... | help: Remove unnecessary `int` call - -ℹ Safe fix -53 53 | int(0 or -1) -54 54 | -55 55 | -56 |-if int(1 + 2) * 3: - 56 |+if (1 + 2) * 3: -57 57 | ... -58 58 | -59 59 | +53 | int(0 or -1) +54 | +55 | + - if int(1 + 2) * 3: +56 + if (1 + 2) * 3: +57 | ... +58 | +59 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:62:1 @@ -805,16 +731,15 @@ RUF046 [*] Value being cast to `int` is already an integer 64 | int(math.trunc()) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -59 59 | -60 60 | ### Unsafe -61 61 | -62 |-int(math.ceil()) - 62 |+math.ceil() -63 63 | int(math.floor()) -64 64 | int(math.trunc()) -65 65 | +59 | +60 | ### Unsafe +61 | + - int(math.ceil()) +62 + math.ceil() +63 | int(math.floor()) +64 | int(math.trunc()) +65 | +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:63:1 @@ -825,16 +750,15 @@ RUF046 [*] Value being cast to `int` is already an integer 64 | int(math.trunc()) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -60 60 | ### Unsafe -61 61 | -62 62 | int(math.ceil()) -63 |-int(math.floor()) - 63 |+math.floor() -64 64 | int(math.trunc()) -65 65 | -66 66 | int(round(inferred_int, 0)) +60 | ### Unsafe +61 | +62 | int(math.ceil()) + - int(math.floor()) +63 + math.floor() +64 | int(math.trunc()) +65 | +66 | int(round(inferred_int, 0)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:64:1 @@ -847,16 +771,15 @@ RUF046 [*] Value being cast to `int` is already an integer 66 | int(round(inferred_int, 0)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -61 61 | -62 62 | int(math.ceil()) -63 63 | int(math.floor()) -64 |-int(math.trunc()) - 64 |+math.trunc() -65 65 | -66 66 | int(round(inferred_int, 0)) -67 67 | int(round(inferred_int, 10)) +61 | +62 | int(math.ceil()) +63 | int(math.floor()) + - int(math.trunc()) +64 + math.trunc() +65 | +66 | int(round(inferred_int, 0)) +67 | int(round(inferred_int, 10)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:66:1 @@ -868,16 +791,15 @@ RUF046 [*] Value being cast to `int` is already an integer 67 | int(round(inferred_int, 10)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -63 63 | int(math.floor()) -64 64 | int(math.trunc()) -65 65 | -66 |-int(round(inferred_int, 0)) - 66 |+round(inferred_int, 0) -67 67 | int(round(inferred_int, 10)) -68 68 | -69 69 | int(round(inferred_int)) +63 | int(math.floor()) +64 | int(math.trunc()) +65 | + - int(round(inferred_int, 0)) +66 + round(inferred_int, 0) +67 | int(round(inferred_int, 10)) +68 | +69 | int(round(inferred_int)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:67:1 @@ -889,16 +811,15 @@ RUF046 [*] Value being cast to `int` is already an integer 69 | int(round(inferred_int)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -64 64 | int(math.trunc()) -65 65 | -66 66 | int(round(inferred_int, 0)) -67 |-int(round(inferred_int, 10)) - 67 |+round(inferred_int, 10) -68 68 | -69 69 | int(round(inferred_int)) -70 70 | int(round(inferred_int, None)) +64 | int(math.trunc()) +65 | +66 | int(round(inferred_int, 0)) + - int(round(inferred_int, 10)) +67 + round(inferred_int, 10) +68 | +69 | int(round(inferred_int)) +70 | int(round(inferred_int, None)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:69:1 @@ -910,16 +831,15 @@ RUF046 [*] Value being cast to `int` is already an integer 70 | int(round(inferred_int, None)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -66 66 | int(round(inferred_int, 0)) -67 67 | int(round(inferred_int, 10)) -68 68 | -69 |-int(round(inferred_int)) - 69 |+round(inferred_int) -70 70 | int(round(inferred_int, None)) -71 71 | -72 72 | int(round(inferred_float)) +66 | int(round(inferred_int, 0)) +67 | int(round(inferred_int, 10)) +68 | + - int(round(inferred_int)) +69 + round(inferred_int) +70 | int(round(inferred_int, None)) +71 | +72 | int(round(inferred_float)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:70:1 @@ -931,16 +851,15 @@ RUF046 [*] Value being cast to `int` is already an integer 72 | int(round(inferred_float)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -67 67 | int(round(inferred_int, 10)) -68 68 | -69 69 | int(round(inferred_int)) -70 |-int(round(inferred_int, None)) - 70 |+round(inferred_int, None) -71 71 | -72 72 | int(round(inferred_float)) -73 73 | int(round(inferred_float, None)) +67 | int(round(inferred_int, 10)) +68 | +69 | int(round(inferred_int)) + - int(round(inferred_int, None)) +70 + round(inferred_int, None) +71 | +72 | int(round(inferred_float)) +73 | int(round(inferred_float, None)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:72:1 @@ -952,16 +871,15 @@ RUF046 [*] Value being cast to `int` is already an integer 73 | int(round(inferred_float, None)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -69 69 | int(round(inferred_int)) -70 70 | int(round(inferred_int, None)) -71 71 | -72 |-int(round(inferred_float)) - 72 |+round(inferred_float) -73 73 | int(round(inferred_float, None)) -74 74 | -75 75 | int(round(unknown)) +69 | int(round(inferred_int)) +70 | int(round(inferred_int, None)) +71 | + - int(round(inferred_float)) +72 + round(inferred_float) +73 | int(round(inferred_float, None)) +74 | +75 | int(round(unknown)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:73:1 @@ -973,16 +891,15 @@ RUF046 [*] Value being cast to `int` is already an integer 75 | int(round(unknown)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -70 70 | int(round(inferred_int, None)) -71 71 | -72 72 | int(round(inferred_float)) -73 |-int(round(inferred_float, None)) - 73 |+round(inferred_float, None) -74 74 | -75 75 | int(round(unknown)) -76 76 | int(round(unknown, None)) +70 | int(round(inferred_int, None)) +71 | +72 | int(round(inferred_float)) + - int(round(inferred_float, None)) +73 + round(inferred_float, None) +74 | +75 | int(round(unknown)) +76 | int(round(unknown, None)) +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:75:1 @@ -994,16 +911,15 @@ RUF046 [*] Value being cast to `int` is already an integer 76 | int(round(unknown, None)) | help: Remove unnecessary `int` call - -ℹ Unsafe fix -72 72 | int(round(inferred_float)) -73 73 | int(round(inferred_float, None)) -74 74 | -75 |-int(round(unknown)) - 75 |+round(unknown) -76 76 | int(round(unknown, None)) -77 77 | -78 78 | +72 | int(round(inferred_float)) +73 | int(round(inferred_float, None)) +74 | + - int(round(unknown)) +75 + round(unknown) +76 | int(round(unknown, None)) +77 | +78 | +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:76:1 @@ -1013,16 +929,15 @@ RUF046 [*] Value being cast to `int` is already an integer | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove unnecessary `int` call - -ℹ Unsafe fix -73 73 | int(round(inferred_float, None)) -74 74 | -75 75 | int(round(unknown)) -76 |-int(round(unknown, None)) - 76 |+round(unknown, None) -77 77 | -78 78 | -79 79 | ### No errors +73 | int(round(inferred_float, None)) +74 | +75 | int(round(unknown)) + - int(round(unknown, None)) +76 + round(unknown, None) +77 | +78 | +79 | ### No errors +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:158:1 @@ -1036,16 +951,14 @@ RUF046 [*] Value being cast to `int` is already an integer 161 | int(round(1, | help: Remove unnecessary `int` call - -ℹ Safe fix -155 155 | -156 156 | int(1. if ... else .2) -157 157 | -158 |-int(1 + - 158 |+(1 + -159 159 | 1) -160 160 | -161 161 | int(round(1, +155 | +156 | int(1. if ... else .2) +157 | + - int(1 + +158 + (1 + +159 | 1) +160 | +161 | int(round(1, RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:161:1 @@ -1059,18 +972,16 @@ RUF046 [*] Value being cast to `int` is already an integer 164 | # function calls may need to retain parentheses | help: Remove unnecessary `int` call - -ℹ Safe fix -158 158 | int(1 + -159 159 | 1) -160 160 | -161 |-int(round(1, -162 |- 0)) - 161 |+round(1, - 162 |+ 0) -163 163 | -164 164 | # function calls may need to retain parentheses -165 165 | # if the parentheses for the call itself +158 | int(1 + +159 | 1) +160 | + - int(round(1, + - 0)) +161 + round(1, +162 + 0) +163 | +164 | # function calls may need to retain parentheses +165 | # if the parentheses for the call itself RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:168:1 @@ -1084,16 +995,14 @@ RUF046 [*] Value being cast to `int` is already an integer 171 | int(round # a comment | help: Remove unnecessary `int` call - -ℹ Safe fix -165 165 | # if the parentheses for the call itself -166 166 | # lie on the next line. -167 167 | # See https://github.com/astral-sh/ruff/issues/15263 -168 |-int(round - 168 |+(round -169 169 | (1)) -170 170 | -171 171 | int(round # a comment +165 | # if the parentheses for the call itself +166 | # lie on the next line. +167 | # See https://github.com/astral-sh/ruff/issues/15263 + - int(round +168 + (round +169 | (1)) +170 | +171 | int(round # a comment RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:171:1 @@ -1109,20 +1018,18 @@ RUF046 [*] Value being cast to `int` is already an integer 176 | int(round (17)) # this is safe without parens | help: Remove unnecessary `int` call - -ℹ Safe fix -168 168 | int(round -169 169 | (1)) -170 170 | -171 |-int(round # a comment - 171 |+(round # a comment -172 172 | # and another comment -173 |-(10) -174 |-) - 173 |+(10)) -175 174 | -176 175 | int(round (17)) # this is safe without parens -177 176 | +168 | int(round +169 | (1)) +170 | + - int(round # a comment +171 + (round # a comment +172 | # and another comment + - (10) + - ) +173 + (10)) +174 | +175 | int(round (17)) # this is safe without parens +176 | RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:176:1 @@ -1135,16 +1042,14 @@ RUF046 [*] Value being cast to `int` is already an integer 178 | int( round ( | help: Remove unnecessary `int` call - -ℹ Safe fix -173 173 | (10) -174 174 | ) -175 175 | -176 |-int(round (17)) # this is safe without parens - 176 |+round (17) # this is safe without parens -177 177 | -178 178 | int( round ( -179 179 | 17 +173 | (10) +174 | ) +175 | + - int(round (17)) # this is safe without parens +176 + round (17) # this is safe without parens +177 | +178 | int( round ( +179 | 17 RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:178:1 @@ -1159,19 +1064,17 @@ RUF046 [*] Value being cast to `int` is already an integer 182 | int((round) # Comment | help: Remove unnecessary `int` call - -ℹ Safe fix -175 175 | -176 176 | int(round (17)) # this is safe without parens -177 177 | -178 |-int( round ( - 178 |+round ( -179 179 | 17 -180 |- )) # this is also safe without parens - 180 |+ ) # this is also safe without parens -181 181 | -182 182 | int((round) # Comment -183 183 | (42) +175 | +176 | int(round (17)) # this is safe without parens +177 | + - int( round ( +178 + round ( +179 | 17 + - )) # this is also safe without parens +180 + ) # this is also safe without parens +181 | +182 | int((round) # Comment +183 | (42) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:182:1 @@ -1186,19 +1089,17 @@ RUF046 [*] Value being cast to `int` is already an integer 186 | int((round # Comment | help: Remove unnecessary `int` call - -ℹ Safe fix -179 179 | 17 -180 180 | )) # this is also safe without parens -181 181 | -182 |-int((round) # Comment -183 |-(42) -184 |-) - 182 |+((round) # Comment - 183 |+(42)) -185 184 | -186 185 | int((round # Comment -187 186 | )(42) +179 | 17 +180 | )) # this is also safe without parens +181 | + - int((round) # Comment + - (42) + - ) +182 + ((round) # Comment +183 + (42)) +184 | +185 | int((round # Comment +186 | )(42) RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:186:1 @@ -1213,18 +1114,16 @@ RUF046 [*] Value being cast to `int` is already an integer 190 | int( # Unsafe fix because of this comment | help: Remove unnecessary `int` call - -ℹ Safe fix -183 183 | (42) -184 184 | ) -185 185 | -186 |-int((round # Comment - 186 |+(round # Comment -187 187 | )(42) -188 |-) -189 188 | -190 189 | int( # Unsafe fix because of this comment -191 190 | ( # Comment +183 | (42) +184 | ) +185 | + - int((round # Comment +186 + (round # Comment +187 | )(42) + - ) +188 | +189 | int( # Unsafe fix because of this comment +190 | ( # Comment RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:190:1 @@ -1242,20 +1141,19 @@ RUF046 [*] Value being cast to `int` is already an integer 197 | int( | help: Remove unnecessary `int` call - -ℹ Unsafe fix -187 187 | )(42) -188 188 | ) -189 189 | -190 |-int( # Unsafe fix because of this comment -191 190 | ( # Comment -192 191 | (round -193 192 | ) # Comment -194 193 | )(42) -195 |-) -196 194 | -197 195 | int( -198 196 | round( +187 | )(42) +188 | ) +189 | + - int( # Unsafe fix because of this comment +190 | ( # Comment +191 | (round +192 | ) # Comment +193 | )(42) + - ) +194 | +195 | int( +196 | round( +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:197:1 @@ -1272,21 +1170,20 @@ RUF046 [*] Value being cast to `int` is already an integer 203 | int( | help: Remove unnecessary `int` call - -ℹ Unsafe fix -194 194 | )(42) -195 195 | ) -196 196 | -197 |-int( -198 |- round( - 197 |+round( -199 198 | 42 -200 |- ) # unsafe fix because of this comment -201 |-) - 199 |+ ) -202 200 | -203 201 | int( -204 202 | round( +194 | )(42) +195 | ) +196 | + - int( + - round( +197 + round( +198 | 42 + - ) # unsafe fix because of this comment + - ) +199 + ) +200 | +201 | int( +202 | round( +note: This is an unsafe fix and may change runtime behavior RUF046 [*] Value being cast to `int` is already an integer --> RUF046.py:203:1 @@ -1302,16 +1199,15 @@ RUF046 [*] Value being cast to `int` is already an integer | |_^ | help: Remove unnecessary `int` call - -ℹ Unsafe fix -200 200 | ) # unsafe fix because of this comment -201 201 | ) -202 202 | -203 |-int( -204 |- round( - 203 |+round( -205 204 | 42 -206 |- ) -207 |-# unsafe fix because of this comment -208 |-) - 205 |+ ) +200 | ) # unsafe fix because of this comment +201 | ) +202 | + - int( + - round( +203 + round( +204 | 42 + - ) + - # unsafe fix because of this comment + - ) +205 + ) +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap index 9451245979..b130cd1233 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_CR.py.snap @@ -9,6 +9,4 @@ RUF046 [*] Value being cast to `int` is already an integer | |______^ | help: Remove unnecessary `int` call - -ℹ Safe fix -1 |-int(- 1 |+(- 2 2 | 1) # Carriage return as newline + - int(- 1 + (- 2 | 1) # Carriage return as newline diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap index 97b2815ed0..d2e413a39e 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF046_RUF046_LF.py.snap @@ -10,9 +10,7 @@ RUF046 [*] Value being cast to `int` is already an integer | |______^ | help: Remove unnecessary `int` call - -ℹ Safe fix -1 1 | # \n as newline -2 |-int(- - 2 |+(- -3 3 | 1) +1 | # \n as newline + - int(- +2 + (- +3 | 1) diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap index d3418eb4ab..8ca8916d3f 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_for.py.snap @@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause | |________^ | help: Remove the `else` clause - -ℹ Safe fix -3 3 | for _ in range(0): -4 4 | loop_body_is_not_checked() -5 5 | break -6 |-else: -7 |- pass -8 6 | -9 7 | -10 8 | for this in comment: +3 | for _ in range(0): +4 | loop_body_is_not_checked() +5 | break + - else: + - pass +6 | +7 | +8 | for this in comment: RUF047 [*] Empty `else` clause --> RUF047_for.py:12:1 @@ -32,13 +30,11 @@ RUF047 [*] Empty `else` clause | |_______^ | help: Remove the `else` clause - -ℹ Safe fix -9 9 | -10 10 | for this in comment: -11 11 | belongs_to() # `for` -12 |-else: -13 |- ... -14 12 | -15 13 | -16 14 | for of in course(): +9 | +10 | for this in comment: +11 | belongs_to() # `for` + - else: + - ... +12 | +13 | +14 | for of in course(): diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap index dedd1f90f0..45bc6e2a70 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_if.py.snap @@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause | |________^ | help: Remove the `else` clause - -ℹ Safe fix -2 2 | -3 3 | if False: -4 4 | condition_is_not_evaluated() -5 |-else: -6 |- pass -7 5 | -8 6 | -9 7 | if this_comment(): +2 | +3 | if False: +4 | condition_is_not_evaluated() + - else: + - pass +5 | +6 | +7 | if this_comment(): RUF047 [*] Empty `else` clause --> RUF047_if.py:11:1 @@ -32,16 +30,14 @@ RUF047 [*] Empty `else` clause | |_______^ | help: Remove the `else` clause - -ℹ Safe fix -8 8 | -9 9 | if this_comment(): -10 10 | belongs_to() # `if` -11 |-else: -12 |- ... -13 11 | -14 12 | -15 13 | if elif_is(): +8 | +9 | if this_comment(): +10 | belongs_to() # `if` + - else: + - ... +11 | +12 | +13 | if elif_is(): RUF047 [*] Empty `else` clause --> RUF047_if.py:19:1 @@ -53,16 +49,14 @@ RUF047 [*] Empty `else` clause | |________^ | help: Remove the `else` clause - -ℹ Safe fix -16 16 | treated() -17 17 | elif the_same(): -18 18 | as_if() -19 |-else: -20 |- pass -21 19 | -22 20 | -23 21 | if this_second_comment(): +16 | treated() +17 | elif the_same(): +18 | as_if() + - else: + - pass +19 | +20 | +21 | if this_second_comment(): RUF047 [*] Empty `else` clause --> RUF047_if.py:26:1 @@ -76,16 +70,14 @@ RUF047 [*] Empty `else` clause 29 | if this_second_comment(): | help: Remove the `else` clause - -ℹ Safe fix -23 23 | if this_second_comment(): -24 24 | belongs() # to -25 25 | # `if` -26 |-else: -27 |- pass -28 26 | -29 27 | if this_second_comment(): -30 28 | belongs() # to +23 | if this_second_comment(): +24 | belongs() # to +25 | # `if` + - else: + - pass +26 | +27 | if this_second_comment(): +28 | belongs() # to RUF047 [*] Empty `else` clause --> RUF047_if.py:32:1 @@ -97,16 +89,14 @@ RUF047 [*] Empty `else` clause | |________^ | help: Remove the `else` clause - -ℹ Safe fix -29 29 | if this_second_comment(): -30 30 | belongs() # to -31 31 | # `if` -32 |-else: -33 |- pass -34 32 | -35 33 | -36 34 | if of_course(): +29 | if this_second_comment(): +30 | belongs() # to +31 | # `if` + - else: + - pass +32 | +33 | +34 | if of_course(): RUF047 [*] Empty `else` clause --> RUF047_if.py:44:1 @@ -116,15 +106,13 @@ RUF047 [*] Empty `else` clause | ^^^^^^^^^ | help: Remove the `else` clause - -ℹ Safe fix -41 41 | -42 42 | -43 43 | if of_course: this() -44 |-else: ... -45 44 | -46 45 | -47 46 | if of_course: +41 | +42 | +43 | if of_course: this() + - else: ... +44 | +45 | +46 | if of_course: RUF047 [*] Empty `else` clause --> RUF047_if.py:49:1 @@ -135,15 +123,13 @@ RUF047 [*] Empty `else` clause | ^^^^^^^^^ | help: Remove the `else` clause - -ℹ Safe fix -46 46 | -47 47 | if of_course: -48 48 | this() # comment -49 |-else: ... -50 49 | -51 50 | -52 51 | def nested(): +46 | +47 | if of_course: +48 | this() # comment + - else: ... +49 | +50 | +51 | def nested(): RUF047 [*] Empty `else` clause --> RUF047_if.py:55:5 @@ -155,13 +141,11 @@ RUF047 [*] Empty `else` clause | |___________^ | help: Remove the `else` clause - -ℹ Safe fix -52 52 | def nested(): -53 53 | if a: -54 54 | b() -55 |- else: -56 |- ... -57 55 | -58 56 | -59 57 | ### No errors +52 | def nested(): +53 | if a: +54 | b() + - else: + - ... +55 | +56 | +57 | ### No errors diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap index 1677b1ca0d..7690c8b504 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_try.py.snap @@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause | |________^ | help: Remove the `else` clause - -ℹ Safe fix -4 4 | raise try_body_is_not_checked() -5 5 | except: -6 6 | pass -7 |-else: -8 |- pass -9 7 | -10 8 | -11 9 | try: +4 | raise try_body_is_not_checked() +5 | except: +6 | pass + - else: + - pass +7 | +8 | +9 | try: RUF047 [*] Empty `else` clause --> RUF047_try.py:17:1 @@ -32,13 +30,11 @@ RUF047 [*] Empty `else` clause | |_______^ | help: Remove the `else` clause - -ℹ Safe fix -14 14 | belongs() -15 15 | except: -16 16 | to() # `except` -17 |-else: -18 |- ... -19 17 | -20 18 | -21 19 | try: +14 | belongs() +15 | except: +16 | to() # `except` + - else: + - ... +17 | +18 | +19 | try: diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap index dd8bbd01fc..bb90b60015 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF047_RUF047_while.py.snap @@ -11,16 +11,14 @@ RUF047 [*] Empty `else` clause | |________^ | help: Remove the `else` clause - -ℹ Safe fix -3 3 | while True: -4 4 | loop_body_is_not_checked() -5 5 | break -6 |-else: -7 |- pass -8 6 | -9 7 | -10 8 | while this_comment: +3 | while True: +4 | loop_body_is_not_checked() +5 | break + - else: + - pass +6 | +7 | +8 | while this_comment: RUF047 [*] Empty `else` clause --> RUF047_while.py:12:1 @@ -32,13 +30,11 @@ RUF047 [*] Empty `else` clause | |_______^ | help: Remove the `else` clause - -ℹ Safe fix -9 9 | -10 10 | while this_comment: -11 11 | belongs_to() # `for` -12 |-else: -13 |- ... -14 12 | -15 13 | -16 14 | while of_course(): +9 | +10 | while this_comment: +11 | belongs_to() # `for` + - else: + - ... +12 | +13 | +14 | while of_course(): diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap index c64bab5ddc..54def0c584 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF051_RUF051.py.snap @@ -11,17 +11,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 10 | if '' in d: # String | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -4 4 | -5 5 | ### Errors -6 6 | -7 |-if k in d: # Bare name -8 |- del d[k] - 7 |+d.pop(k, None) -9 8 | -10 9 | if '' in d: # String -11 10 | del d[""] # Different quotes +4 | +5 | ### Errors +6 | + - if k in d: # Bare name + - del d[k] +7 + d.pop(k, None) +8 | +9 | if '' in d: # String +10 | del d[""] # Different quotes +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:11:5 @@ -33,17 +32,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 13 | if b"" in d: # Bytes | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -7 7 | if k in d: # Bare name -8 8 | del d[k] -9 9 | -10 |-if '' in d: # String -11 |- del d[""] # Different quotes - 10 |+d.pop('', None) # Different quotes -12 11 | -13 12 | if b"" in d: # Bytes -14 13 | del d[ # Multiline slice +7 | if k in d: # Bare name +8 | del d[k] +9 | + - if '' in d: # String + - del d[""] # Different quotes +10 + d.pop('', None) # Different quotes +11 | +12 | if b"" in d: # Bytes +13 | del d[ # Multiline slice +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:14:5 @@ -57,19 +55,18 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 18 | if 0 in d: del d[0] # Single-line statement | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -10 10 | if '' in d: # String -11 11 | del d[""] # Different quotes -12 12 | -13 |-if b"" in d: # Bytes -14 |- del d[ # Multiline slice -15 |- b'''''' # Triple quotes -16 |- ] - 13 |+d.pop(b"", None) -17 14 | -18 15 | if 0 in d: del d[0] # Single-line statement -19 16 | +10 | if '' in d: # String +11 | del d[""] # Different quotes +12 | + - if b"" in d: # Bytes + - del d[ # Multiline slice + - b'''''' # Triple quotes + - ] +13 + d.pop(b"", None) +14 | +15 | if 0 in d: del d[0] # Single-line statement +16 | +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:18:12 @@ -82,16 +79,14 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 20 | if 3j in d: # Complex | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -15 15 | b'''''' # Triple quotes -16 16 | ] -17 17 | -18 |-if 0 in d: del d[0] # Single-line statement - 18 |+d.pop(0, None) # Single-line statement -19 19 | -20 20 | if 3j in d: # Complex -21 21 | del d[3j] +15 | b'''''' # Triple quotes +16 | ] +17 | + - if 0 in d: del d[0] # Single-line statement +18 + d.pop(0, None) # Single-line statement +19 | +20 | if 3j in d: # Complex +21 | del d[3j] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:21:5 @@ -103,17 +98,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 23 | if 0.1234 in d: # Float | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -17 17 | -18 18 | if 0 in d: del d[0] # Single-line statement -19 19 | -20 |-if 3j in d: # Complex -21 |- del d[3j] - 20 |+d.pop(3j, None) -22 21 | -23 22 | if 0.1234 in d: # Float -24 23 | del d[.1_2_3_4] # Number separators and shorthand syntax +17 | +18 | if 0 in d: del d[0] # Single-line statement +19 | + - if 3j in d: # Complex + - del d[3j] +20 + d.pop(3j, None) +21 | +22 | if 0.1234 in d: # Float +23 | del d[.1_2_3_4] # Number separators and shorthand syntax +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:24:5 @@ -125,17 +119,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 26 | if True in d: # True | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -20 20 | if 3j in d: # Complex -21 21 | del d[3j] -22 22 | -23 |-if 0.1234 in d: # Float -24 |- del d[.1_2_3_4] # Number separators and shorthand syntax - 23 |+d.pop(0.1234, None) # Number separators and shorthand syntax -25 24 | -26 25 | if True in d: # True -27 26 | del d[True] +20 | if 3j in d: # Complex +21 | del d[3j] +22 | + - if 0.1234 in d: # Float + - del d[.1_2_3_4] # Number separators and shorthand syntax +23 + d.pop(0.1234, None) # Number separators and shorthand syntax +24 | +25 | if True in d: # True +26 | del d[True] +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:27:5 @@ -147,17 +140,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 29 | if False in d: # False | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -23 23 | if 0.1234 in d: # Float -24 24 | del d[.1_2_3_4] # Number separators and shorthand syntax -25 25 | -26 |-if True in d: # True -27 |- del d[True] - 26 |+d.pop(True, None) -28 27 | -29 28 | if False in d: # False -30 29 | del d[False] +23 | if 0.1234 in d: # Float +24 | del d[.1_2_3_4] # Number separators and shorthand syntax +25 | + - if True in d: # True + - del d[True] +26 + d.pop(True, None) +27 | +28 | if False in d: # False +29 | del d[False] +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:30:5 @@ -169,17 +161,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 32 | if None in d: # None | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -26 26 | if True in d: # True -27 27 | del d[True] -28 28 | -29 |-if False in d: # False -30 |- del d[False] - 29 |+d.pop(False, None) -31 30 | -32 31 | if None in d: # None -33 32 | del d[ +26 | if True in d: # True +27 | del d[True] +28 | + - if False in d: # False + - del d[False] +29 + d.pop(False, None) +30 | +31 | if None in d: # None +32 | del d[ +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:33:5 @@ -194,20 +185,19 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 38 | if ... in d: # Ellipsis | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -29 29 | if False in d: # False -30 30 | del d[False] -31 31 | -32 |-if None in d: # None -33 |- del d[ -34 |- # Comment in the middle -35 |- None -36 |- ] - 32 |+d.pop(None, None) -37 33 | -38 34 | if ... in d: # Ellipsis -39 35 | del d[ +29 | if False in d: # False +30 | del d[False] +31 | + - if None in d: # None + - del d[ + - # Comment in the middle + - None + - ] +32 + d.pop(None, None) +33 | +34 | if ... in d: # Ellipsis +35 | del d[ +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:39:5 @@ -221,19 +211,18 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 43 | if "a" "bc" in d: # String concatenation | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -35 35 | None -36 36 | ] -37 37 | -38 |-if ... in d: # Ellipsis -39 |- del d[ -40 |- # Comment in the middle, indented -41 |- ...] - 38 |+d.pop(..., None) -42 39 | -43 40 | if "a" "bc" in d: # String concatenation -44 41 | del d['abc'] +35 | None +36 | ] +37 | + - if ... in d: # Ellipsis + - del d[ + - # Comment in the middle, indented + - ...] +38 + d.pop(..., None) +39 | +40 | if "a" "bc" in d: # String concatenation +41 | del d['abc'] +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:44:5 @@ -245,17 +234,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 46 | if r"\foo" in d: # Raw string | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -40 40 | # Comment in the middle, indented -41 41 | ...] -42 42 | -43 |-if "a" "bc" in d: # String concatenation -44 |- del d['abc'] - 43 |+d.pop("a" "bc", None) -45 44 | -46 45 | if r"\foo" in d: # Raw string -47 46 | del d['\\foo'] +40 | # Comment in the middle, indented +41 | ...] +42 | + - if "a" "bc" in d: # String concatenation + - del d['abc'] +43 + d.pop("a" "bc", None) +44 | +45 | if r"\foo" in d: # Raw string +46 | del d['\\foo'] +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:47:5 @@ -267,17 +255,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 49 | if b'yt' b'es' in d: # Bytes concatenation | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -43 43 | if "a" "bc" in d: # String concatenation -44 44 | del d['abc'] -45 45 | -46 |-if r"\foo" in d: # Raw string -47 |- del d['\\foo'] - 46 |+d.pop(r"\foo", None) -48 47 | -49 48 | if b'yt' b'es' in d: # Bytes concatenation -50 49 | del d[rb"""ytes"""] # Raw bytes +43 | if "a" "bc" in d: # String concatenation +44 | del d['abc'] +45 | + - if r"\foo" in d: # Raw string + - del d['\\foo'] +46 + d.pop(r"\foo", None) +47 | +48 | if b'yt' b'es' in d: # Bytes concatenation +49 | del d[rb"""ytes"""] # Raw bytes +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:50:5 @@ -289,17 +276,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 52 | if k in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -46 46 | if r"\foo" in d: # Raw string -47 47 | del d['\\foo'] -48 48 | -49 |-if b'yt' b'es' in d: # Bytes concatenation -50 |- del d[rb"""ytes"""] # Raw bytes - 49 |+d.pop(b'yt' b'es', None) # Raw bytes -51 50 | -52 51 | if k in d: -53 52 | # comment that gets dropped +46 | if r"\foo" in d: # Raw string +47 | del d['\\foo'] +48 | + - if b'yt' b'es' in d: # Bytes concatenation + - del d[rb"""ytes"""] # Raw bytes +49 + d.pop(b'yt' b'es', None) # Raw bytes +50 | +51 | if k in d: +52 | # comment that gets dropped +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:54:5 @@ -312,18 +298,17 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 56 | ### Safely fixable | help: Replace `if` statement with `.pop(..., None)` - -ℹ Unsafe fix -49 49 | if b'yt' b'es' in d: # Bytes concatenation -50 50 | del d[rb"""ytes"""] # Raw bytes -51 51 | -52 |-if k in d: -53 |- # comment that gets dropped -54 |- del d[k] - 52 |+d.pop(k, None) -55 53 | -56 54 | ### Safely fixable -57 55 | +49 | if b'yt' b'es' in d: # Bytes concatenation +50 | del d[rb"""ytes"""] # Raw bytes +51 | + - if k in d: + - # comment that gets dropped + - del d[k] +52 + d.pop(k, None) +53 | +54 | ### Safely fixable +55 | +note: This is an unsafe fix and may change runtime behavior RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:59:5 @@ -335,17 +320,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 61 | if '' in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -55 55 | -56 56 | ### Safely fixable -57 57 | -58 |-if k in d: -59 |- del d[k] - 58 |+d.pop(k, None) -60 59 | -61 60 | if '' in d: -62 61 | del d[""] +55 | +56 | ### Safely fixable +57 | + - if k in d: + - del d[k] +58 + d.pop(k, None) +59 | +60 | if '' in d: +61 | del d[""] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:62:5 @@ -357,17 +340,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 64 | if b"" in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -58 58 | if k in d: -59 59 | del d[k] -60 60 | -61 |-if '' in d: -62 |- del d[""] - 61 |+d.pop('', None) -63 62 | -64 63 | if b"" in d: -65 64 | del d[ +58 | if k in d: +59 | del d[k] +60 | + - if '' in d: + - del d[""] +61 + d.pop('', None) +62 | +63 | if b"" in d: +64 | del d[ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:65:5 @@ -381,19 +362,17 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 69 | if 0 in d: del d[0] | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -61 61 | if '' in d: -62 62 | del d[""] -63 63 | -64 |-if b"" in d: -65 |- del d[ -66 |- b'''''' -67 |- ] - 64 |+d.pop(b"", None) -68 65 | -69 66 | if 0 in d: del d[0] -70 67 | +61 | if '' in d: +62 | del d[""] +63 | + - if b"" in d: + - del d[ + - b'''''' + - ] +64 + d.pop(b"", None) +65 | +66 | if 0 in d: del d[0] +67 | RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:69:12 @@ -406,16 +385,14 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 71 | if 3j in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -66 66 | b'''''' -67 67 | ] -68 68 | -69 |-if 0 in d: del d[0] - 69 |+d.pop(0, None) -70 70 | -71 71 | if 3j in d: -72 72 | del d[3j] +66 | b'''''' +67 | ] +68 | + - if 0 in d: del d[0] +69 + d.pop(0, None) +70 | +71 | if 3j in d: +72 | del d[3j] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:72:5 @@ -427,17 +404,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 74 | if 0.1234 in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -68 68 | -69 69 | if 0 in d: del d[0] -70 70 | -71 |-if 3j in d: -72 |- del d[3j] - 71 |+d.pop(3j, None) -73 72 | -74 73 | if 0.1234 in d: -75 74 | del d[.1_2_3_4] +68 | +69 | if 0 in d: del d[0] +70 | + - if 3j in d: + - del d[3j] +71 + d.pop(3j, None) +72 | +73 | if 0.1234 in d: +74 | del d[.1_2_3_4] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:75:5 @@ -449,17 +424,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 77 | if True in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -71 71 | if 3j in d: -72 72 | del d[3j] -73 73 | -74 |-if 0.1234 in d: -75 |- del d[.1_2_3_4] - 74 |+d.pop(0.1234, None) -76 75 | -77 76 | if True in d: -78 77 | del d[True] +71 | if 3j in d: +72 | del d[3j] +73 | + - if 0.1234 in d: + - del d[.1_2_3_4] +74 + d.pop(0.1234, None) +75 | +76 | if True in d: +77 | del d[True] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:78:5 @@ -471,17 +444,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 80 | if False in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -74 74 | if 0.1234 in d: -75 75 | del d[.1_2_3_4] -76 76 | -77 |-if True in d: -78 |- del d[True] - 77 |+d.pop(True, None) -79 78 | -80 79 | if False in d: -81 80 | del d[False] +74 | if 0.1234 in d: +75 | del d[.1_2_3_4] +76 | + - if True in d: + - del d[True] +77 + d.pop(True, None) +78 | +79 | if False in d: +80 | del d[False] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:81:5 @@ -493,17 +464,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 83 | if None in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -77 77 | if True in d: -78 78 | del d[True] -79 79 | -80 |-if False in d: -81 |- del d[False] - 80 |+d.pop(False, None) -82 81 | -83 82 | if None in d: -84 83 | del d[ +77 | if True in d: +78 | del d[True] +79 | + - if False in d: + - del d[False] +80 + d.pop(False, None) +81 | +82 | if None in d: +83 | del d[ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:84:5 @@ -517,19 +486,17 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 88 | if ... in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -80 80 | if False in d: -81 81 | del d[False] -82 82 | -83 |-if None in d: -84 |- del d[ -85 |- None -86 |- ] - 83 |+d.pop(None, None) -87 84 | -88 85 | if ... in d: -89 86 | del d[ +80 | if False in d: +81 | del d[False] +82 | + - if None in d: + - del d[ + - None + - ] +83 + d.pop(None, None) +84 | +85 | if ... in d: +86 | del d[ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:89:5 @@ -542,18 +509,16 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 92 | if "a" "bc" in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -85 85 | None -86 86 | ] -87 87 | -88 |-if ... in d: -89 |- del d[ -90 |- ...] - 88 |+d.pop(..., None) -91 89 | -92 90 | if "a" "bc" in d: -93 91 | del d['abc'] +85 | None +86 | ] +87 | + - if ... in d: + - del d[ + - ...] +88 + d.pop(..., None) +89 | +90 | if "a" "bc" in d: +91 | del d['abc'] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:93:5 @@ -565,17 +530,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 95 | if r"\foo" in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -89 89 | del d[ -90 90 | ...] -91 91 | -92 |-if "a" "bc" in d: -93 |- del d['abc'] - 92 |+d.pop("a" "bc", None) -94 93 | -95 94 | if r"\foo" in d: -96 95 | del d['\\foo'] +89 | del d[ +90 | ...] +91 | + - if "a" "bc" in d: + - del d['abc'] +92 + d.pop("a" "bc", None) +93 | +94 | if r"\foo" in d: +95 | del d['\\foo'] RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:96:5 @@ -587,17 +550,15 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` 98 | if b'yt' b'es' in d: | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -92 92 | if "a" "bc" in d: -93 93 | del d['abc'] -94 94 | -95 |-if r"\foo" in d: -96 |- del d['\\foo'] - 95 |+d.pop(r"\foo", None) -97 96 | -98 97 | if b'yt' b'es' in d: -99 98 | del d[rb"""ytes"""] # This should not make the fix unsafe +92 | if "a" "bc" in d: +93 | del d['abc'] +94 | + - if r"\foo" in d: + - del d['\\foo'] +95 + d.pop(r"\foo", None) +96 | +97 | if b'yt' b'es' in d: +98 | del d[rb"""ytes"""] # This should not make the fix unsafe RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` --> RUF051.py:99:5 @@ -607,14 +568,12 @@ RUF051 [*] Use `pop` instead of `key in dict` followed by `del dict[key]` | ^^^^^^^^^^^^^^^^^^^ | help: Replace `if` statement with `.pop(..., None)` - -ℹ Safe fix -95 95 | if r"\foo" in d: -96 96 | del d['\\foo'] -97 97 | -98 |-if b'yt' b'es' in d: -99 |- del d[rb"""ytes"""] # This should not make the fix unsafe - 98 |+d.pop(b'yt' b'es', None) # This should not make the fix unsafe -100 99 | -101 100 | -102 101 | +95 | if r"\foo" in d: +96 | del d['\\foo'] +97 | + - if b'yt' b'es' in d: + - del d[rb"""ytes"""] # This should not make the fix unsafe +98 + d.pop(b'yt' b'es', None) # This should not make the fix unsafe +99 | +100 | +101 | diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap index 9c7eaadd88..d6c759ad67 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF052_RUF052.py.snap @@ -11,18 +11,17 @@ RUF052 [*] Local dummy variable `_var` is accessed 93 | return _var | help: Remove leading underscores - -ℹ Unsafe fix -89 89 | -90 90 | class Class_: -91 91 | def fun(self): -92 |- _var = "method variable" # [RUF052] -93 |- return _var - 92 |+ var = "method variable" # [RUF052] - 93 |+ return var -94 94 | -95 95 | def fun(_var): # parameters are ignored -96 96 | return _var +89 | +90 | class Class_: +91 | def fun(self): + - _var = "method variable" # [RUF052] + - return _var +92 + var = "method variable" # [RUF052] +93 + return var +94 | +95 | def fun(_var): # parameters are ignored +96 | return _var +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_list` is accessed --> RUF052.py:99:5 @@ -33,18 +32,17 @@ RUF052 [*] Local dummy variable `_list` is accessed 100 | return _list | help: Prefer using trailing underscores to avoid shadowing a built-in - -ℹ Unsafe fix -96 96 | return _var -97 97 | -98 98 | def fun(): -99 |- _list = "built-in" # [RUF052] -100 |- return _list - 99 |+ list_ = "built-in" # [RUF052] - 100 |+ return list_ -101 101 | -102 102 | x = "global" -103 103 | +96 | return _var +97 | +98 | def fun(): + - _list = "built-in" # [RUF052] + - return _list +99 + list_ = "built-in" # [RUF052] +100 + return list_ +101 | +102 | x = "global" +103 | +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_x` is accessed --> RUF052.py:106:5 @@ -56,18 +54,17 @@ RUF052 [*] Local dummy variable `_x` is accessed 107 | return _x | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -103 103 | -104 104 | def fun(): -105 105 | global x -106 |- _x = "shadows global" # [RUF052] -107 |- return _x - 106 |+ x_ = "shadows global" # [RUF052] - 107 |+ return x_ -108 108 | -109 109 | def foo(): -110 110 | x = "outer" +103 | +104 | def fun(): +105 | global x + - _x = "shadows global" # [RUF052] + - return _x +106 + x_ = "shadows global" # [RUF052] +107 + return x_ +108 | +109 | def foo(): +110 | x = "outer" +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_x` is accessed --> RUF052.py:113:5 @@ -80,18 +77,17 @@ RUF052 [*] Local dummy variable `_x` is accessed 115 | bar() | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -110 110 | x = "outer" -111 111 | def bar(): -112 112 | nonlocal x -113 |- _x = "shadows nonlocal" # [RUF052] -114 |- return _x - 113 |+ x_ = "shadows nonlocal" # [RUF052] - 114 |+ return x_ -115 115 | bar() -116 116 | return x -117 117 | +110 | x = "outer" +111 | def bar(): +112 | nonlocal x + - _x = "shadows nonlocal" # [RUF052] + - return _x +113 + x_ = "shadows nonlocal" # [RUF052] +114 + return x_ +115 | bar() +116 | return x +117 | +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_x` is accessed --> RUF052.py:120:5 @@ -103,18 +99,17 @@ RUF052 [*] Local dummy variable `_x` is accessed 121 | return _x | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -117 117 | -118 118 | def fun(): -119 119 | x = "local" -120 |- _x = "shadows local" # [RUF052] -121 |- return _x - 120 |+ x_ = "shadows local" # [RUF052] - 121 |+ return x_ -122 122 | -123 123 | -124 124 | GLOBAL_1 = "global 1" +117 | +118 | def fun(): +119 | x = "local" + - _x = "shadows local" # [RUF052] + - return _x +120 + x_ = "shadows local" # [RUF052] +121 + return x_ +122 | +123 | +124 | GLOBAL_1 = "global 1" +note: This is an unsafe fix and may change runtime behavior RUF052 Local dummy variable `_GLOBAL_1` is accessed --> RUF052.py:128:5 @@ -169,25 +164,24 @@ RUF052 [*] Local dummy variable `_P` is accessed 155 | _NT = NamedTuple("_NT", [("foo", int)]) | help: Remove leading underscores - -ℹ Unsafe fix -150 150 | from enum import Enum -151 151 | from collections import namedtuple -152 152 | -153 |- _P = ParamSpec("_P") - 153 |+ P = ParamSpec("P") -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) +150 | from enum import Enum +151 | from collections import namedtuple +152 | + - _P = ParamSpec("_P") +153 + P = ParamSpec("P") +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) -------------------------------------------------------------------------------- -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_T` is accessed --> RUF052.py:154:5 @@ -199,25 +193,24 @@ RUF052 [*] Local dummy variable `_T` is accessed 156 | _E = Enum("_E", ["a", "b", "c"]) | help: Remove leading underscores - -ℹ Unsafe fix -151 151 | from collections import namedtuple -152 152 | -153 153 | _P = ParamSpec("_P") -154 |- _T = TypeVar(name="_T", covariant=True, bound=int|str) - 154 |+ T = TypeVar(name="T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +151 | from collections import namedtuple +152 | +153 | _P = ParamSpec("_P") + - _T = TypeVar(name="_T", covariant=True, bound=int|str) +154 + T = TypeVar(name="T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -------------------------------------------------------------------------------- -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NT` is accessed --> RUF052.py:155:5 @@ -230,24 +223,23 @@ RUF052 [*] Local dummy variable `_NT` is accessed 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) | help: Remove leading underscores - -ℹ Unsafe fix -152 152 | -153 153 | _P = ParamSpec("_P") -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 |- _NT = NamedTuple("_NT", [("foo", int)]) - 155 |+ NT = NamedTuple("NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +152 | +153 | _P = ParamSpec("_P") +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) + - _NT = NamedTuple("_NT", [("foo", int)]) +155 + NT = NamedTuple("NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_E` is accessed --> RUF052.py:156:5 @@ -260,23 +252,22 @@ RUF052 [*] Local dummy variable `_E` is accessed 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) | help: Remove leading underscores - -ℹ Unsafe fix -153 153 | _P = ParamSpec("_P") -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 |- _E = Enum("_E", ["a", "b", "c"]) - 156 |+ E = Enum("E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +153 | _P = ParamSpec("_P") +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) + - _E = Enum("_E", ["a", "b", "c"]) +156 + E = Enum("E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NT2` is accessed --> RUF052.py:157:5 @@ -289,22 +280,21 @@ RUF052 [*] Local dummy variable `_NT2` is accessed 159 | _DynamicClass = type("_DynamicClass", (), {}) | help: Remove leading underscores - -ℹ Unsafe fix -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 |- _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) - 157 |+ NT2 = namedtuple("NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) + - _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +157 + NT2 = namedtuple("NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NT3` is accessed --> RUF052.py:158:5 @@ -317,21 +307,20 @@ RUF052 [*] Local dummy variable `_NT3` is accessed 160 | _NotADynamicClass = type("_NotADynamicClass") | help: Remove leading underscores - -ℹ Unsafe fix -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 |- _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) - 158 |+ NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) + - _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +158 + NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_DynamicClass` is accessed --> RUF052.py:159:5 @@ -343,20 +332,19 @@ RUF052 [*] Local dummy variable `_DynamicClass` is accessed 160 | _NotADynamicClass = type("_NotADynamicClass") | help: Remove leading underscores - -ℹ Unsafe fix -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 |- _DynamicClass = type("_DynamicClass", (), {}) - 159 |+ DynamicClass = type("DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) + - _DynamicClass = type("_DynamicClass", (), {}) +159 + DynamicClass = type("DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed --> RUF052.py:160:5 @@ -369,19 +357,18 @@ RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed 162 | print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) | help: Remove leading underscores - -ℹ Unsafe fix -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 |- _NotADynamicClass = type("_NotADynamicClass") - 160 |+ NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) + - _NotADynamicClass = type("_NotADynamicClass") +160 + NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_dummy_var` is accessed --> RUF052.py:182:5 @@ -393,21 +380,20 @@ RUF052 [*] Local dummy variable `_dummy_var` is accessed 184 | def bar(): | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -179 179 | -180 180 | -181 181 | def foo(): -182 |- _dummy_var = 42 - 182 |+ dummy_var_ = 42 -183 183 | -184 184 | def bar(): -185 185 | dummy_var = 43 -186 |- print(_dummy_var) - 186 |+ print(dummy_var_) -187 187 | -188 188 | -189 189 | def foo(): +179 | +180 | +181 | def foo(): + - _dummy_var = 42 +182 + dummy_var_ = 42 +183 | +184 | def bar(): +185 | dummy_var = 43 + - print(_dummy_var) +186 + print(dummy_var_) +187 | +188 | +189 | def foo(): +note: This is an unsafe fix and may change runtime behavior RUF052 Local dummy variable `_dummy_var` is accessed --> RUF052.py:192:5 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap index c1c1e734e1..6796ee91b8 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF053_RUF053.py.snap @@ -12,16 +12,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 25 | class C[T](int, Generic[_C]): ... | help: Remove `Generic` base class - -ℹ Unsafe fix -20 20 | -21 21 | ### Errors -22 22 | -23 |-class C[T](Generic[_A]): ... - 23 |+class C[T, _A]: ... -24 24 | class C[T](Generic[_B], str): ... -25 25 | class C[T](int, Generic[_C]): ... -26 26 | class C[T](bytes, Generic[_D], bool): ... # TODO: Type parameter defaults +20 | +21 | ### Errors +22 | + - class C[T](Generic[_A]): ... +23 + class C[T, _A]: ... +24 | class C[T](Generic[_B], str): ... +25 | class C[T](int, Generic[_C]): ... +26 | class C[T](bytes, Generic[_D], bool): ... # TODO: Type parameter defaults +note: This is an unsafe fix and may change runtime behavior RUF053 [*] Class with type parameter list inherits from `Generic` --> RUF053.py:24:12 @@ -33,16 +32,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 26 | class C[T](bytes, Generic[_D], bool): ... # TODO: Type parameter defaults | help: Remove `Generic` base class - -ℹ Unsafe fix -21 21 | ### Errors -22 22 | -23 23 | class C[T](Generic[_A]): ... -24 |-class C[T](Generic[_B], str): ... - 24 |+class C[T, _B: int](str): ... -25 25 | class C[T](int, Generic[_C]): ... -26 26 | class C[T](bytes, Generic[_D], bool): ... # TODO: Type parameter defaults -27 27 | class C[T](Generic[_E], list[_E]): ... # TODO: Type parameter defaults +21 | ### Errors +22 | +23 | class C[T](Generic[_A]): ... + - class C[T](Generic[_B], str): ... +24 + class C[T, _B: int](str): ... +25 | class C[T](int, Generic[_C]): ... +26 | class C[T](bytes, Generic[_D], bool): ... # TODO: Type parameter defaults +27 | class C[T](Generic[_E], list[_E]): ... # TODO: Type parameter defaults +note: This is an unsafe fix and may change runtime behavior RUF053 [*] Class with type parameter list inherits from `Generic` --> RUF053.py:25:17 @@ -55,16 +53,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 27 | class C[T](Generic[_E], list[_E]): ... # TODO: Type parameter defaults | help: Remove `Generic` base class - -ℹ Unsafe fix -22 22 | -23 23 | class C[T](Generic[_A]): ... -24 24 | class C[T](Generic[_B], str): ... -25 |-class C[T](int, Generic[_C]): ... - 25 |+class C[T, _C: (str, bytes)](int): ... -26 26 | class C[T](bytes, Generic[_D], bool): ... # TODO: Type parameter defaults -27 27 | class C[T](Generic[_E], list[_E]): ... # TODO: Type parameter defaults -28 28 | class C[T](list[_F], Generic[_F]): ... # TODO: Type parameter defaults +22 | +23 | class C[T](Generic[_A]): ... +24 | class C[T](Generic[_B], str): ... + - class C[T](int, Generic[_C]): ... +25 + class C[T, _C: (str, bytes)](int): ... +26 | class C[T](bytes, Generic[_D], bool): ... # TODO: Type parameter defaults +27 | class C[T](Generic[_E], list[_E]): ... # TODO: Type parameter defaults +28 | class C[T](list[_F], Generic[_F]): ... # TODO: Type parameter defaults +note: This is an unsafe fix and may change runtime behavior RUF053 Class with type parameter list inherits from `Generic` --> RUF053.py:26:19 @@ -112,16 +109,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ... | help: Remove `Generic` base class - -ℹ Unsafe fix -27 27 | class C[T](Generic[_E], list[_E]): ... # TODO: Type parameter defaults -28 28 | class C[T](list[_F], Generic[_F]): ... # TODO: Type parameter defaults -29 29 | -30 |-class C[*Ts](Generic[*_As]): ... - 30 |+class C[*Ts, *_As]: ... -31 31 | class C[*Ts](Generic[Unpack[_As]]): ... -32 32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ... -33 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ... # TODO: Type parameter defaults +27 | class C[T](Generic[_E], list[_E]): ... # TODO: Type parameter defaults +28 | class C[T](list[_F], Generic[_F]): ... # TODO: Type parameter defaults +29 | + - class C[*Ts](Generic[*_As]): ... +30 + class C[*Ts, *_As]: ... +31 | class C[*Ts](Generic[Unpack[_As]]): ... +32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ... +33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ... # TODO: Type parameter defaults +note: This is an unsafe fix and may change runtime behavior RUF053 [*] Class with type parameter list inherits from `Generic` --> RUF053.py:31:14 @@ -133,16 +129,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ... # TODO: Type parameter defaults | help: Remove `Generic` base class - -ℹ Unsafe fix -28 28 | class C[T](list[_F], Generic[_F]): ... # TODO: Type parameter defaults -29 29 | -30 30 | class C[*Ts](Generic[*_As]): ... -31 |-class C[*Ts](Generic[Unpack[_As]]): ... - 31 |+class C[*Ts, *_As]: ... -32 32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ... -33 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ... # TODO: Type parameter defaults -34 34 | +28 | class C[T](list[_F], Generic[_F]): ... # TODO: Type parameter defaults +29 | +30 | class C[*Ts](Generic[*_As]): ... + - class C[*Ts](Generic[Unpack[_As]]): ... +31 + class C[*Ts, *_As]: ... +32 | class C[*Ts](Generic[Unpack[_Bs]], tuple[*Bs]): ... +33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ... # TODO: Type parameter defaults +34 | +note: This is an unsafe fix and may change runtime behavior RUF053 Class with type parameter list inherits from `Generic` --> RUF053.py:32:14 @@ -174,16 +169,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 38 | class C[**P](Generic[_P3]): ... # TODO: Type parameter defaults | help: Remove `Generic` base class - -ℹ Unsafe fix -33 33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ... # TODO: Type parameter defaults -34 34 | -35 35 | -36 |-class C[**P](Generic[_P1]): ... - 36 |+class C[**P, **_P1]: ... -37 37 | class C[**P](Generic[_P2]): ... -38 38 | class C[**P](Generic[_P3]): ... # TODO: Type parameter defaults -39 39 | +33 | class C[*Ts](Callable[[*_Cs], tuple[*Ts]], Generic[_Cs]): ... # TODO: Type parameter defaults +34 | +35 | + - class C[**P](Generic[_P1]): ... +36 + class C[**P, **_P1]: ... +37 | class C[**P](Generic[_P2]): ... +38 | class C[**P](Generic[_P3]): ... # TODO: Type parameter defaults +39 | +note: This is an unsafe fix and may change runtime behavior RUF053 Class with type parameter list inherits from `Generic` --> RUF053.py:37:14 @@ -212,16 +206,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` | ^^^^^^^^^^^^^^ | help: Remove `Generic` base class - -ℹ Unsafe fix -38 38 | class C[**P](Generic[_P3]): ... # TODO: Type parameter defaults -39 39 | -40 40 | -41 |-class C[T](Generic[T, _A]): ... - 41 |+class C[T, _A]: ... -42 42 | -43 43 | -44 44 | # See `is_existing_param_of_same_class`. +38 | class C[**P](Generic[_P3]): ... # TODO: Type parameter defaults +39 | +40 | + - class C[T](Generic[T, _A]): ... +41 + class C[T, _A]: ... +42 | +43 | +44 | # See `is_existing_param_of_same_class`. +note: This is an unsafe fix and may change runtime behavior RUF053 Class with type parameter list inherits from `Generic` --> RUF053.py:47:35 @@ -241,16 +234,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` | ^^^^^^^^^^^^^^ | help: Remove `Generic` base class - -ℹ Unsafe fix -48 48 | -49 49 | -50 50 | class C(Generic[_B]): -51 |- class D[T](Generic[_B, T]): ... - 51 |+ class D[T, _B: int]: ... -52 52 | -53 53 | -54 54 | class C[T]: +48 | +49 | +50 | class C(Generic[_B]): + - class D[T](Generic[_B, T]): ... +51 + class D[T, _B: int]: ... +52 | +53 | +54 | class C[T]: +note: This is an unsafe fix and may change runtime behavior RUF053 Class with type parameter list inherits from `Generic` --> RUF053.py:55:16 @@ -271,16 +263,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 61 | class C[T, _C: (str, bytes)](Generic[_D]): ... # TODO: Type parameter defaults | help: Remove `Generic` base class - -ℹ Unsafe fix -57 57 | -58 58 | # In a single run, only the first is reported. -59 59 | # Others will be reported/fixed in following iterations. -60 |-class C[T](Generic[_C], Generic[_D]): ... - 60 |+class C[T, _C: (str, bytes)](Generic[_D]): ... -61 61 | class C[T, _C: (str, bytes)](Generic[_D]): ... # TODO: Type parameter defaults -62 62 | -63 63 | +57 | +58 | # In a single run, only the first is reported. +59 | # Others will be reported/fixed in following iterations. + - class C[T](Generic[_C], Generic[_D]): ... +60 + class C[T, _C: (str, bytes)](Generic[_D]): ... +61 | class C[T, _C: (str, bytes)](Generic[_D]): ... # TODO: Type parameter defaults +62 | +63 | +note: This is an unsafe fix and may change runtime behavior RUF053 Class with type parameter list inherits from `Generic` --> RUF053.py:61:30 @@ -377,16 +368,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 79 | class C[T](Generic[*_As, _A]): ... | help: Remove `Generic` base class - -ℹ Unsafe fix -74 74 | class C[T](Generic[Unpack[_As, _Bs]]): ... -75 75 | -76 76 | -77 |-class C[T](Generic[_A, _A]): ... - 77 |+class C[T, _A]: ... -78 78 | class C[T](Generic[_A, Unpack[_As]]): ... -79 79 | class C[T](Generic[*_As, _A]): ... -80 80 | +74 | class C[T](Generic[Unpack[_As, _Bs]]): ... +75 | +76 | + - class C[T](Generic[_A, _A]): ... +77 + class C[T, _A]: ... +78 | class C[T](Generic[_A, Unpack[_As]]): ... +79 | class C[T](Generic[*_As, _A]): ... +80 | +note: This is an unsafe fix and may change runtime behavior RUF053 [*] Class with type parameter list inherits from `Generic` --> RUF053.py:78:12 @@ -397,16 +387,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 79 | class C[T](Generic[*_As, _A]): ... | help: Remove `Generic` base class - -ℹ Unsafe fix -75 75 | -76 76 | -77 77 | class C[T](Generic[_A, _A]): ... -78 |-class C[T](Generic[_A, Unpack[_As]]): ... - 78 |+class C[T, _A, *_As]: ... -79 79 | class C[T](Generic[*_As, _A]): ... -80 80 | -81 81 | +75 | +76 | +77 | class C[T](Generic[_A, _A]): ... + - class C[T](Generic[_A, Unpack[_As]]): ... +78 + class C[T, _A, *_As]: ... +79 | class C[T](Generic[*_As, _A]): ... +80 | +81 | +note: This is an unsafe fix and may change runtime behavior RUF053 [*] Class with type parameter list inherits from `Generic` --> RUF053.py:79:12 @@ -417,16 +406,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` | ^^^^^^^^^^^^^^^^^ | help: Remove `Generic` base class - -ℹ Unsafe fix -76 76 | -77 77 | class C[T](Generic[_A, _A]): ... -78 78 | class C[T](Generic[_A, Unpack[_As]]): ... -79 |-class C[T](Generic[*_As, _A]): ... - 79 |+class C[T, *_As, _A]: ... -80 80 | -81 81 | -82 82 | from somewhere import APublicTypeVar +76 | +77 | class C[T](Generic[_A, _A]): ... +78 | class C[T](Generic[_A, Unpack[_As]]): ... + - class C[T](Generic[*_As, _A]): ... +79 + class C[T, *_As, _A]: ... +80 | +81 | +82 | from somewhere import APublicTypeVar +note: This is an unsafe fix and may change runtime behavior RUF053 Class with type parameter list inherits from `Generic` --> RUF053.py:83:12 @@ -457,16 +445,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` | ^^^^^^^^^^^ | help: Remove `Generic` base class - -ℹ Unsafe fix -88 88 | # The latter cannot be used as a PEP 695 constraint, -89 89 | # as named expressions are forbidden within type parameter lists. -90 90 | # See also the `_Z` example above. -91 |-class C[T](Generic[_G]): ... # Should be moved down below eventually - 91 |+class C[T, _G: (str, a := int)]: ... # Should be moved down below eventually -92 92 | -93 93 | -94 94 | # Single-element constraints should not be converted to a bound. +88 | # The latter cannot be used as a PEP 695 constraint, +89 | # as named expressions are forbidden within type parameter lists. +90 | # See also the `_Z` example above. + - class C[T](Generic[_G]): ... # Should be moved down below eventually +91 + class C[T, _G: (str, a := int)]: ... # Should be moved down below eventually +92 | +93 | +94 | # Single-element constraints should not be converted to a bound. +note: This is an unsafe fix and may change runtime behavior RUF053 [*] Class with type parameter list inherits from `Generic` --> RUF053.py:95:20 @@ -477,16 +464,15 @@ RUF053 [*] Class with type parameter list inherits from `Generic` 96 | class C[T: [a]](Generic[_A]): ... | help: Remove `Generic` base class - -ℹ Unsafe fix -92 92 | -93 93 | -94 94 | # Single-element constraints should not be converted to a bound. -95 |-class C[T: (str,)](Generic[_A]): ... - 95 |+class C[T: (str), _A]: ... -96 96 | class C[T: [a]](Generic[_A]): ... -97 97 | -98 98 | +92 | +93 | +94 | # Single-element constraints should not be converted to a bound. + - class C[T: (str,)](Generic[_A]): ... +95 + class C[T: (str), _A]: ... +96 | class C[T: [a]](Generic[_A]): ... +97 | +98 | +note: This is an unsafe fix and may change runtime behavior RUF053 [*] Class with type parameter list inherits from `Generic` --> RUF053.py:96:17 @@ -497,13 +483,12 @@ RUF053 [*] Class with type parameter list inherits from `Generic` | ^^^^^^^^^^^ | help: Remove `Generic` base class - -ℹ Unsafe fix -93 93 | -94 94 | # Single-element constraints should not be converted to a bound. -95 95 | class C[T: (str,)](Generic[_A]): ... -96 |-class C[T: [a]](Generic[_A]): ... - 96 |+class C[T: [a], _A]: ... -97 97 | -98 98 | -99 99 | # Existing bounds should not be deparenthesized. +93 | +94 | # Single-element constraints should not be converted to a bound. +95 | class C[T: (str,)](Generic[_A]): ... + - class C[T: [a]](Generic[_A]): ... +96 + class C[T: [a], _A]: ... +97 | +98 | +99 | # Existing bounds should not be deparenthesized. +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap index a54df64cc7..0e4c71d6d1 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF056_RUF056.py.snap @@ -11,16 +11,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 119 | # dict.get in an if statement | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -114 114 | # Invalid falsy fallbacks are when the call to dict.get is used in a boolean context -115 115 | -116 116 | # dict.get in ternary expression -117 |-value = "not found" if my_dict.get("key", False) else "default" # [RUF056] - 117 |+value = "not found" if my_dict.get("key") else "default" # [RUF056] -118 118 | -119 119 | # dict.get in an if statement -120 120 | if my_dict.get("key", False): # [RUF056] +114 | # Invalid falsy fallbacks are when the call to dict.get is used in a boolean context +115 | +116 | # dict.get in ternary expression + - value = "not found" if my_dict.get("key", False) else "default" # [RUF056] +117 + value = "not found" if my_dict.get("key") else "default" # [RUF056] +118 | +119 | # dict.get in an if statement +120 | if my_dict.get("key", False): # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:120:23 @@ -31,16 +29,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 121 | pass | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -117 117 | value = "not found" if my_dict.get("key", False) else "default" # [RUF056] -118 118 | -119 119 | # dict.get in an if statement -120 |-if my_dict.get("key", False): # [RUF056] - 120 |+if my_dict.get("key"): # [RUF056] -121 121 | pass -122 122 | -123 123 | # dict.get in compound if statement +117 | value = "not found" if my_dict.get("key", False) else "default" # [RUF056] +118 | +119 | # dict.get in an if statement + - if my_dict.get("key", False): # [RUF056] +120 + if my_dict.get("key"): # [RUF056] +121 | pass +122 | +123 | # dict.get in compound if statement RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:124:32 @@ -51,16 +47,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 125 | pass | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -121 121 | pass -122 122 | -123 123 | # dict.get in compound if statement -124 |-if True and my_dict.get("key", False): # [RUF056] - 124 |+if True and my_dict.get("key"): # [RUF056] -125 125 | pass -126 126 | -127 127 | if my_dict.get("key", False) or True: # [RUF056] +121 | pass +122 | +123 | # dict.get in compound if statement + - if True and my_dict.get("key", False): # [RUF056] +124 + if True and my_dict.get("key"): # [RUF056] +125 | pass +126 | +127 | if my_dict.get("key", False) or True: # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:127:23 @@ -72,16 +66,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 128 | pass | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -124 124 | if True and my_dict.get("key", False): # [RUF056] -125 125 | pass -126 126 | -127 |-if my_dict.get("key", False) or True: # [RUF056] - 127 |+if my_dict.get("key") or True: # [RUF056] -128 128 | pass -129 129 | -130 130 | # dict.get in an assert statement +124 | if True and my_dict.get("key", False): # [RUF056] +125 | pass +126 | + - if my_dict.get("key", False) or True: # [RUF056] +127 + if my_dict.get("key") or True: # [RUF056] +128 | pass +129 | +130 | # dict.get in an assert statement RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:131:27 @@ -93,16 +85,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 133 | # dict.get in a while statement | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -128 128 | pass -129 129 | -130 130 | # dict.get in an assert statement -131 |-assert my_dict.get("key", False) # [RUF056] - 131 |+assert my_dict.get("key") # [RUF056] -132 132 | -133 133 | # dict.get in a while statement -134 134 | while my_dict.get("key", False): # [RUF056] +128 | pass +129 | +130 | # dict.get in an assert statement + - assert my_dict.get("key", False) # [RUF056] +131 + assert my_dict.get("key") # [RUF056] +132 | +133 | # dict.get in a while statement +134 | while my_dict.get("key", False): # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:134:26 @@ -113,16 +103,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 135 | pass | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -131 131 | assert my_dict.get("key", False) # [RUF056] -132 132 | -133 133 | # dict.get in a while statement -134 |-while my_dict.get("key", False): # [RUF056] - 134 |+while my_dict.get("key"): # [RUF056] -135 135 | pass -136 136 | -137 137 | # dict.get in unary not expression +131 | assert my_dict.get("key", False) # [RUF056] +132 | +133 | # dict.get in a while statement + - while my_dict.get("key", False): # [RUF056] +134 + while my_dict.get("key"): # [RUF056] +135 | pass +136 | +137 | # dict.get in unary not expression RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:138:32 @@ -134,16 +122,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 140 | # testing all falsy fallbacks | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -135 135 | pass -136 136 | -137 137 | # dict.get in unary not expression -138 |-value = not my_dict.get("key", False) # [RUF056] - 138 |+value = not my_dict.get("key") # [RUF056] -139 139 | -140 140 | # testing all falsy fallbacks -141 141 | value = not my_dict.get("key", False) # [RUF056] +135 | pass +136 | +137 | # dict.get in unary not expression + - value = not my_dict.get("key", False) # [RUF056] +138 + value = not my_dict.get("key") # [RUF056] +139 | +140 | # testing all falsy fallbacks +141 | value = not my_dict.get("key", False) # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:141:32 @@ -155,16 +141,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 143 | value = not my_dict.get("key", list()) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -138 138 | value = not my_dict.get("key", False) # [RUF056] -139 139 | -140 140 | # testing all falsy fallbacks -141 |-value = not my_dict.get("key", False) # [RUF056] - 141 |+value = not my_dict.get("key") # [RUF056] -142 142 | value = not my_dict.get("key", []) # [RUF056] -143 143 | value = not my_dict.get("key", list()) # [RUF056] -144 144 | value = not my_dict.get("key", {}) # [RUF056] +138 | value = not my_dict.get("key", False) # [RUF056] +139 | +140 | # testing all falsy fallbacks + - value = not my_dict.get("key", False) # [RUF056] +141 + value = not my_dict.get("key") # [RUF056] +142 | value = not my_dict.get("key", []) # [RUF056] +143 | value = not my_dict.get("key", list()) # [RUF056] +144 | value = not my_dict.get("key", {}) # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:142:32 @@ -177,16 +161,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 144 | value = not my_dict.get("key", {}) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -139 139 | -140 140 | # testing all falsy fallbacks -141 141 | value = not my_dict.get("key", False) # [RUF056] -142 |-value = not my_dict.get("key", []) # [RUF056] - 142 |+value = not my_dict.get("key") # [RUF056] -143 143 | value = not my_dict.get("key", list()) # [RUF056] -144 144 | value = not my_dict.get("key", {}) # [RUF056] -145 145 | value = not my_dict.get("key", dict()) # [RUF056] +139 | +140 | # testing all falsy fallbacks +141 | value = not my_dict.get("key", False) # [RUF056] + - value = not my_dict.get("key", []) # [RUF056] +142 + value = not my_dict.get("key") # [RUF056] +143 | value = not my_dict.get("key", list()) # [RUF056] +144 | value = not my_dict.get("key", {}) # [RUF056] +145 | value = not my_dict.get("key", dict()) # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:143:32 @@ -199,16 +181,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 145 | value = not my_dict.get("key", dict()) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -140 140 | # testing all falsy fallbacks -141 141 | value = not my_dict.get("key", False) # [RUF056] -142 142 | value = not my_dict.get("key", []) # [RUF056] -143 |-value = not my_dict.get("key", list()) # [RUF056] - 143 |+value = not my_dict.get("key") # [RUF056] -144 144 | value = not my_dict.get("key", {}) # [RUF056] -145 145 | value = not my_dict.get("key", dict()) # [RUF056] -146 146 | value = not my_dict.get("key", set()) # [RUF056] +140 | # testing all falsy fallbacks +141 | value = not my_dict.get("key", False) # [RUF056] +142 | value = not my_dict.get("key", []) # [RUF056] + - value = not my_dict.get("key", list()) # [RUF056] +143 + value = not my_dict.get("key") # [RUF056] +144 | value = not my_dict.get("key", {}) # [RUF056] +145 | value = not my_dict.get("key", dict()) # [RUF056] +146 | value = not my_dict.get("key", set()) # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:144:32 @@ -221,16 +201,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 146 | value = not my_dict.get("key", set()) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -141 141 | value = not my_dict.get("key", False) # [RUF056] -142 142 | value = not my_dict.get("key", []) # [RUF056] -143 143 | value = not my_dict.get("key", list()) # [RUF056] -144 |-value = not my_dict.get("key", {}) # [RUF056] - 144 |+value = not my_dict.get("key") # [RUF056] -145 145 | value = not my_dict.get("key", dict()) # [RUF056] -146 146 | value = not my_dict.get("key", set()) # [RUF056] -147 147 | value = not my_dict.get("key", None) # [RUF056] +141 | value = not my_dict.get("key", False) # [RUF056] +142 | value = not my_dict.get("key", []) # [RUF056] +143 | value = not my_dict.get("key", list()) # [RUF056] + - value = not my_dict.get("key", {}) # [RUF056] +144 + value = not my_dict.get("key") # [RUF056] +145 | value = not my_dict.get("key", dict()) # [RUF056] +146 | value = not my_dict.get("key", set()) # [RUF056] +147 | value = not my_dict.get("key", None) # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:145:32 @@ -243,16 +221,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 147 | value = not my_dict.get("key", None) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -142 142 | value = not my_dict.get("key", []) # [RUF056] -143 143 | value = not my_dict.get("key", list()) # [RUF056] -144 144 | value = not my_dict.get("key", {}) # [RUF056] -145 |-value = not my_dict.get("key", dict()) # [RUF056] - 145 |+value = not my_dict.get("key") # [RUF056] -146 146 | value = not my_dict.get("key", set()) # [RUF056] -147 147 | value = not my_dict.get("key", None) # [RUF056] -148 148 | value = not my_dict.get("key", 0) # [RUF056] +142 | value = not my_dict.get("key", []) # [RUF056] +143 | value = not my_dict.get("key", list()) # [RUF056] +144 | value = not my_dict.get("key", {}) # [RUF056] + - value = not my_dict.get("key", dict()) # [RUF056] +145 + value = not my_dict.get("key") # [RUF056] +146 | value = not my_dict.get("key", set()) # [RUF056] +147 | value = not my_dict.get("key", None) # [RUF056] +148 | value = not my_dict.get("key", 0) # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:146:32 @@ -265,16 +241,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 148 | value = not my_dict.get("key", 0) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -143 143 | value = not my_dict.get("key", list()) # [RUF056] -144 144 | value = not my_dict.get("key", {}) # [RUF056] -145 145 | value = not my_dict.get("key", dict()) # [RUF056] -146 |-value = not my_dict.get("key", set()) # [RUF056] - 146 |+value = not my_dict.get("key") # [RUF056] -147 147 | value = not my_dict.get("key", None) # [RUF056] -148 148 | value = not my_dict.get("key", 0) # [RUF056] -149 149 | value = not my_dict.get("key", 0.0) # [RUF056] +143 | value = not my_dict.get("key", list()) # [RUF056] +144 | value = not my_dict.get("key", {}) # [RUF056] +145 | value = not my_dict.get("key", dict()) # [RUF056] + - value = not my_dict.get("key", set()) # [RUF056] +146 + value = not my_dict.get("key") # [RUF056] +147 | value = not my_dict.get("key", None) # [RUF056] +148 | value = not my_dict.get("key", 0) # [RUF056] +149 | value = not my_dict.get("key", 0.0) # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:147:32 @@ -287,16 +261,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 149 | value = not my_dict.get("key", 0.0) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -144 144 | value = not my_dict.get("key", {}) # [RUF056] -145 145 | value = not my_dict.get("key", dict()) # [RUF056] -146 146 | value = not my_dict.get("key", set()) # [RUF056] -147 |-value = not my_dict.get("key", None) # [RUF056] - 147 |+value = not my_dict.get("key") # [RUF056] -148 148 | value = not my_dict.get("key", 0) # [RUF056] -149 149 | value = not my_dict.get("key", 0.0) # [RUF056] -150 150 | value = not my_dict.get("key", "") # [RUF056] +144 | value = not my_dict.get("key", {}) # [RUF056] +145 | value = not my_dict.get("key", dict()) # [RUF056] +146 | value = not my_dict.get("key", set()) # [RUF056] + - value = not my_dict.get("key", None) # [RUF056] +147 + value = not my_dict.get("key") # [RUF056] +148 | value = not my_dict.get("key", 0) # [RUF056] +149 | value = not my_dict.get("key", 0.0) # [RUF056] +150 | value = not my_dict.get("key", "") # [RUF056] RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:148:32 @@ -309,16 +281,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 150 | value = not my_dict.get("key", "") # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -145 145 | value = not my_dict.get("key", dict()) # [RUF056] -146 146 | value = not my_dict.get("key", set()) # [RUF056] -147 147 | value = not my_dict.get("key", None) # [RUF056] -148 |-value = not my_dict.get("key", 0) # [RUF056] - 148 |+value = not my_dict.get("key") # [RUF056] -149 149 | value = not my_dict.get("key", 0.0) # [RUF056] -150 150 | value = not my_dict.get("key", "") # [RUF056] -151 151 | +145 | value = not my_dict.get("key", dict()) # [RUF056] +146 | value = not my_dict.get("key", set()) # [RUF056] +147 | value = not my_dict.get("key", None) # [RUF056] + - value = not my_dict.get("key", 0) # [RUF056] +148 + value = not my_dict.get("key") # [RUF056] +149 | value = not my_dict.get("key", 0.0) # [RUF056] +150 | value = not my_dict.get("key", "") # [RUF056] +151 | RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:149:32 @@ -330,16 +300,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 150 | value = not my_dict.get("key", "") # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -146 146 | value = not my_dict.get("key", set()) # [RUF056] -147 147 | value = not my_dict.get("key", None) # [RUF056] -148 148 | value = not my_dict.get("key", 0) # [RUF056] -149 |-value = not my_dict.get("key", 0.0) # [RUF056] - 149 |+value = not my_dict.get("key") # [RUF056] -150 150 | value = not my_dict.get("key", "") # [RUF056] -151 151 | -152 152 | # testing invalid dict.get call with inline comment +146 | value = not my_dict.get("key", set()) # [RUF056] +147 | value = not my_dict.get("key", None) # [RUF056] +148 | value = not my_dict.get("key", 0) # [RUF056] + - value = not my_dict.get("key", 0.0) # [RUF056] +149 + value = not my_dict.get("key") # [RUF056] +150 | value = not my_dict.get("key", "") # [RUF056] +151 | +152 | # testing invalid dict.get call with inline comment RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:150:32 @@ -352,16 +320,14 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 152 | # testing invalid dict.get call with inline comment | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -147 147 | value = not my_dict.get("key", None) # [RUF056] -148 148 | value = not my_dict.get("key", 0) # [RUF056] -149 149 | value = not my_dict.get("key", 0.0) # [RUF056] -150 |-value = not my_dict.get("key", "") # [RUF056] - 150 |+value = not my_dict.get("key") # [RUF056] -151 151 | -152 152 | # testing invalid dict.get call with inline comment -153 153 | value = not my_dict.get("key", # comment1 +147 | value = not my_dict.get("key", None) # [RUF056] +148 | value = not my_dict.get("key", 0) # [RUF056] +149 | value = not my_dict.get("key", 0.0) # [RUF056] + - value = not my_dict.get("key", "") # [RUF056] +150 + value = not my_dict.get("key") # [RUF056] +151 | +152 | # testing invalid dict.get call with inline comment +153 | value = not my_dict.get("key", # comment1 RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:154:22 @@ -373,17 +339,16 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi 155 | ) # [RUF056] | help: Remove falsy fallback from `dict.get()` - -ℹ Unsafe fix -150 150 | value = not my_dict.get("key", "") # [RUF056] -151 151 | -152 152 | # testing invalid dict.get call with inline comment -153 |-value = not my_dict.get("key", # comment1 -154 |- [] # comment2 - 153 |+value = not my_dict.get("key" # comment2 -155 154 | ) # [RUF056] -156 155 | -157 156 | # regression tests for https://github.com/astral-sh/ruff/issues/18628 +150 | value = not my_dict.get("key", "") # [RUF056] +151 | +152 | # testing invalid dict.get call with inline comment + - value = not my_dict.get("key", # comment1 + - [] # comment2 +153 + value = not my_dict.get("key" # comment2 +154 | ) # [RUF056] +155 | +156 | # regression tests for https://github.com/astral-sh/ruff/issues/18628 +note: This is an unsafe fix and may change runtime behavior RUF056 Avoid providing a falsy fallback to `dict.get()` in boolean test positions. The default fallback `None` is already falsy. --> RUF056.py:163:24 @@ -511,10 +476,8 @@ RUF056 [*] Avoid providing a falsy fallback to `dict.get()` in boolean test posi | ^^^^^ | help: Remove falsy fallback from `dict.get()` - -ℹ Safe fix -188 188 | -189 189 | # https://github.com/astral-sh/ruff/issues/18798 -190 190 | d = {} -191 |-not d.get("key", (False)) - 191 |+not d.get("key") +188 | +189 | # https://github.com/astral-sh/ruff/issues/18798 +190 | d = {} + - not d.get("key", (False)) +191 + not d.get("key") diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap index 63e33ff282..abace6c8b4 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF057_RUF057.py.snap @@ -10,16 +10,14 @@ RUF057 [*] Value being rounded is already an integer 8 | round(42, 2) # Error (safe) | help: Remove unnecessary `round` call - -ℹ Safe fix -3 3 | -4 4 | -5 5 | -6 |-round(42) # Error (safe) - 6 |+42 # Error (safe) -7 7 | round(42, None) # Error (safe) -8 8 | round(42, 2) # Error (safe) -9 9 | round(42, -2) # No error +3 | +4 | +5 | + - round(42) # Error (safe) +6 + 42 # Error (safe) +7 | round(42, None) # Error (safe) +8 | round(42, 2) # Error (safe) +9 | round(42, -2) # No error RUF057 [*] Value being rounded is already an integer --> RUF057.py:7:1 @@ -31,16 +29,14 @@ RUF057 [*] Value being rounded is already an integer 9 | round(42, -2) # No error | help: Remove unnecessary `round` call - -ℹ Safe fix -4 4 | -5 5 | -6 6 | round(42) # Error (safe) -7 |-round(42, None) # Error (safe) - 7 |+42 # Error (safe) -8 8 | round(42, 2) # Error (safe) -9 9 | round(42, -2) # No error -10 10 | round(42, inferred_int) # No error +4 | +5 | +6 | round(42) # Error (safe) + - round(42, None) # Error (safe) +7 + 42 # Error (safe) +8 | round(42, 2) # Error (safe) +9 | round(42, -2) # No error +10 | round(42, inferred_int) # No error RUF057 [*] Value being rounded is already an integer --> RUF057.py:8:1 @@ -53,16 +49,14 @@ RUF057 [*] Value being rounded is already an integer 10 | round(42, inferred_int) # No error | help: Remove unnecessary `round` call - -ℹ Safe fix -5 5 | -6 6 | round(42) # Error (safe) -7 7 | round(42, None) # Error (safe) -8 |-round(42, 2) # Error (safe) - 8 |+42 # Error (safe) -9 9 | round(42, -2) # No error -10 10 | round(42, inferred_int) # No error -11 11 | round(42, 3 + 4) # No error +5 | +6 | round(42) # Error (safe) +7 | round(42, None) # Error (safe) + - round(42, 2) # Error (safe) +8 + 42 # Error (safe) +9 | round(42, -2) # No error +10 | round(42, inferred_int) # No error +11 | round(42, 3 + 4) # No error RUF057 [*] Value being rounded is already an integer --> RUF057.py:24:1 @@ -73,16 +67,14 @@ RUF057 [*] Value being rounded is already an integer 26 | round(4 + 2, 2) # Error (safe) | help: Remove unnecessary `round` call - -ℹ Safe fix -21 21 | round(42., foo) # No error -22 22 | -23 23 | -24 |-round(4 + 2) # Error (safe) - 24 |+4 + 2 # Error (safe) -25 25 | round(4 + 2, None) # Error (safe) -26 26 | round(4 + 2, 2) # Error (safe) -27 27 | round(4 + 2, -2) # No error +21 | round(42., foo) # No error +22 | +23 | + - round(4 + 2) # Error (safe) +24 + 4 + 2 # Error (safe) +25 | round(4 + 2, None) # Error (safe) +26 | round(4 + 2, 2) # Error (safe) +27 | round(4 + 2, -2) # No error RUF057 [*] Value being rounded is already an integer --> RUF057.py:25:1 @@ -94,16 +86,14 @@ RUF057 [*] Value being rounded is already an integer 27 | round(4 + 2, -2) # No error | help: Remove unnecessary `round` call - -ℹ Safe fix -22 22 | -23 23 | -24 24 | round(4 + 2) # Error (safe) -25 |-round(4 + 2, None) # Error (safe) - 25 |+4 + 2 # Error (safe) -26 26 | round(4 + 2, 2) # Error (safe) -27 27 | round(4 + 2, -2) # No error -28 28 | round(4 + 2, inferred_int) # No error +22 | +23 | +24 | round(4 + 2) # Error (safe) + - round(4 + 2, None) # Error (safe) +25 + 4 + 2 # Error (safe) +26 | round(4 + 2, 2) # Error (safe) +27 | round(4 + 2, -2) # No error +28 | round(4 + 2, inferred_int) # No error RUF057 [*] Value being rounded is already an integer --> RUF057.py:26:1 @@ -116,16 +106,14 @@ RUF057 [*] Value being rounded is already an integer 28 | round(4 + 2, inferred_int) # No error | help: Remove unnecessary `round` call - -ℹ Safe fix -23 23 | -24 24 | round(4 + 2) # Error (safe) -25 25 | round(4 + 2, None) # Error (safe) -26 |-round(4 + 2, 2) # Error (safe) - 26 |+4 + 2 # Error (safe) -27 27 | round(4 + 2, -2) # No error -28 28 | round(4 + 2, inferred_int) # No error -29 29 | round(4 + 2, 3 + 4) # No error +23 | +24 | round(4 + 2) # Error (safe) +25 | round(4 + 2, None) # Error (safe) + - round(4 + 2, 2) # Error (safe) +26 + 4 + 2 # Error (safe) +27 | round(4 + 2, -2) # No error +28 | round(4 + 2, inferred_int) # No error +29 | round(4 + 2, 3 + 4) # No error RUF057 [*] Value being rounded is already an integer --> RUF057.py:42:1 @@ -136,16 +124,15 @@ RUF057 [*] Value being rounded is already an integer 44 | round(inferred_int, 2) # Error (unsafe) | help: Remove unnecessary `round` call - -ℹ Unsafe fix -39 39 | round(4. + 2., foo) # No error -40 40 | -41 41 | -42 |-round(inferred_int) # Error (unsafe) - 42 |+inferred_int # Error (unsafe) -43 43 | round(inferred_int, None) # Error (unsafe) -44 44 | round(inferred_int, 2) # Error (unsafe) -45 45 | round(inferred_int, -2) # No error +39 | round(4. + 2., foo) # No error +40 | +41 | + - round(inferred_int) # Error (unsafe) +42 + inferred_int # Error (unsafe) +43 | round(inferred_int, None) # Error (unsafe) +44 | round(inferred_int, 2) # Error (unsafe) +45 | round(inferred_int, -2) # No error +note: This is an unsafe fix and may change runtime behavior RUF057 [*] Value being rounded is already an integer --> RUF057.py:43:1 @@ -157,16 +144,15 @@ RUF057 [*] Value being rounded is already an integer 45 | round(inferred_int, -2) # No error | help: Remove unnecessary `round` call - -ℹ Unsafe fix -40 40 | -41 41 | -42 42 | round(inferred_int) # Error (unsafe) -43 |-round(inferred_int, None) # Error (unsafe) - 43 |+inferred_int # Error (unsafe) -44 44 | round(inferred_int, 2) # Error (unsafe) -45 45 | round(inferred_int, -2) # No error -46 46 | round(inferred_int, inferred_int) # No error +40 | +41 | +42 | round(inferred_int) # Error (unsafe) + - round(inferred_int, None) # Error (unsafe) +43 + inferred_int # Error (unsafe) +44 | round(inferred_int, 2) # Error (unsafe) +45 | round(inferred_int, -2) # No error +46 | round(inferred_int, inferred_int) # No error +note: This is an unsafe fix and may change runtime behavior RUF057 [*] Value being rounded is already an integer --> RUF057.py:44:1 @@ -179,16 +165,15 @@ RUF057 [*] Value being rounded is already an integer 46 | round(inferred_int, inferred_int) # No error | help: Remove unnecessary `round` call - -ℹ Unsafe fix -41 41 | -42 42 | round(inferred_int) # Error (unsafe) -43 43 | round(inferred_int, None) # Error (unsafe) -44 |-round(inferred_int, 2) # Error (unsafe) - 44 |+inferred_int # Error (unsafe) -45 45 | round(inferred_int, -2) # No error -46 46 | round(inferred_int, inferred_int) # No error -47 47 | round(inferred_int, 3 + 4) # No error +41 | +42 | round(inferred_int) # Error (unsafe) +43 | round(inferred_int, None) # Error (unsafe) + - round(inferred_int, 2) # Error (unsafe) +44 + inferred_int # Error (unsafe) +45 | round(inferred_int, -2) # No error +46 | round(inferred_int, inferred_int) # No error +47 | round(inferred_int, 3 + 4) # No error +note: This is an unsafe fix and may change runtime behavior RUF057 [*] Value being rounded is already an integer --> RUF057.py:71:1 @@ -202,16 +187,14 @@ RUF057 [*] Value being rounded is already an integer 74 | *1 | help: Remove unnecessary `round` call - -ℹ Safe fix -68 68 | # Fixes should preserve parentheses when argument -69 69 | # contains newline. -70 70 | # See https://github.com/astral-sh/ruff/issues/15598 -71 |-round(- - 71 |+(- -72 72 | 1) -73 73 | round(1 -74 74 | *1 +68 | # Fixes should preserve parentheses when argument +69 | # contains newline. +70 | # See https://github.com/astral-sh/ruff/issues/15598 + - round(- +71 + (- +72 | 1) +73 | round(1 +74 | *1 RUF057 [*] Value being rounded is already an integer --> RUF057.py:73:1 @@ -226,19 +209,17 @@ RUF057 [*] Value being rounded is already an integer 77 | # fix should be unsafe if comment is in call range | help: Remove unnecessary `round` call - -ℹ Safe fix -70 70 | # See https://github.com/astral-sh/ruff/issues/15598 -71 71 | round(- -72 72 | 1) -73 |-round(1 -74 |-*1 -75 |-) - 73 |+(1 - 74 |+*1) -76 75 | -77 76 | # fix should be unsafe if comment is in call range -78 77 | round(# a comment +70 | # See https://github.com/astral-sh/ruff/issues/15598 +71 | round(- +72 | 1) + - round(1 + - *1 + - ) +73 + (1 +74 + *1) +75 | +76 | # fix should be unsafe if comment is in call range +77 | round(# a comment RUF057 [*] Value being rounded is already an integer --> RUF057.py:78:1 @@ -252,17 +233,16 @@ RUF057 [*] Value being rounded is already an integer 82 | 17 # a comment | help: Remove unnecessary `round` call - -ℹ Unsafe fix -75 75 | ) -76 76 | -77 77 | # fix should be unsafe if comment is in call range -78 |-round(# a comment -79 78 | 17 -80 |-) -81 79 | round( -82 80 | 17 # a comment -83 81 | ) +75 | ) +76 | +77 | # fix should be unsafe if comment is in call range + - round(# a comment +78 | 17 + - ) +79 | round( +80 | 17 # a comment +81 | ) +note: This is an unsafe fix and may change runtime behavior RUF057 [*] Value being rounded is already an integer --> RUF057.py:81:1 @@ -275,12 +255,11 @@ RUF057 [*] Value being rounded is already an integer | |_^ | help: Remove unnecessary `round` call - -ℹ Unsafe fix -78 78 | round(# a comment -79 79 | 17 -80 80 | ) -81 |-round( -82 |- 17 # a comment -83 |-) - 81 |+17 +78 | round(# a comment +79 | 17 +80 | ) + - round( + - 17 # a comment + - ) +81 + 17 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap index faec036b07..83bc6b8d0c 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF058_RUF058_0.py.snap @@ -11,16 +11,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable 8 | starmap(func, zip([])) | help: Use `map` instead - -ℹ Safe fix -4 4 | -5 5 | # Errors -6 6 | -7 |-starmap(func, zip()) - 7 |+map(func, []) -8 8 | starmap(func, zip([])) -9 9 | -10 10 | +4 | +5 | # Errors +6 | + - starmap(func, zip()) +7 + map(func, []) +8 | starmap(func, zip([])) +9 | +10 | RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_0.py:8:1 @@ -30,16 +28,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable | ^^^^^^^^^^^^^^^^^^^^^^ | help: Use `map` instead - -ℹ Safe fix -5 5 | # Errors -6 6 | -7 7 | starmap(func, zip()) -8 |-starmap(func, zip([])) - 8 |+map(func, []) -9 9 | -10 10 | -11 11 | starmap(func, zip(a, b, c,),) +5 | # Errors +6 | +7 | starmap(func, zip()) + - starmap(func, zip([])) +8 + map(func, []) +9 | +10 | +11 | starmap(func, zip(a, b, c,),) RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_0.py:11:1 @@ -48,16 +44,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `map` instead - -ℹ Safe fix -8 8 | starmap(func, zip([])) -9 9 | -10 10 | -11 |-starmap(func, zip(a, b, c,),) - 11 |+map(func, a, b, c,) -12 12 | -13 13 | -14 14 | starmap( +8 | starmap(func, zip([])) +9 | +10 | + - starmap(func, zip(a, b, c,),) +11 + map(func, a, b, c,) +12 | +13 | +14 | starmap( RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_0.py:14:1 @@ -74,23 +68,22 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable 22 | ( # Foo | help: Use `map` instead - -ℹ Unsafe fix -11 11 | starmap(func, zip(a, b, c,),) -12 12 | -13 13 | -14 |-starmap( - 14 |+map( -15 15 | func, # Foo -16 |- zip( - 16 |+ [] -17 17 | # Foo -18 18 | -19 |- ) - 19 |+ -20 20 | ) -21 21 | -22 22 | ( # Foo +11 | starmap(func, zip(a, b, c,),) +12 | +13 | + - starmap( +14 + map( +15 | func, # Foo + - zip( +16 + [] +17 | # Foo +18 | + - ) +19 + +20 | ) +21 | +22 | ( # Foo +note: This is an unsafe fix and may change runtime behavior RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_0.py:22:1 @@ -110,24 +103,23 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable 31 | ( # Foobar | help: Use `map` instead - -ℹ Unsafe fix -19 19 | ) -20 20 | ) -21 21 | -22 |-( # Foo -23 |- itertools -24 |- ) . starmap ( - 22 |+map ( -25 23 | -26 |- func, zip ( - 24 |+ func, -27 25 | a, b, c, -28 |- ), - 26 |+ -29 27 | ) -30 28 | -31 29 | ( # Foobar +19 | ) +20 | ) +21 | + - ( # Foo + - itertools + - ) . starmap ( +22 + map ( +23 | + - func, zip ( +24 + func, +25 | a, b, c, + - ), +26 + +27 | ) +28 | +29 | ( # Foobar +note: This is an unsafe fix and may change runtime behavior RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_0.py:31:1 @@ -158,35 +150,34 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable 51 | starmap( | help: Use `map` instead - -ℹ Unsafe fix -29 29 | ) -30 30 | -31 31 | ( # Foobar -32 |- ( starmap ) - 32 |+ ( map ) -33 33 | # Bazqux -34 34 | ) \ -35 35 | (func, -36 |- ( ( -37 |- ( # Zip -38 |- ( -39 |- ( zip -40 |- # Zip -41 |- ) -42 |- ) -43 |- ) -44 |- (a, # A - 36 |+ - 37 |+ a, # A -45 38 | b, # B -46 39 | c, # C -47 |- ) ) -48 |- ), - 40 |+ -49 41 | ) -50 42 | -51 43 | starmap( +29 | ) +30 | +31 | ( # Foobar + - ( starmap ) +32 + ( map ) +33 | # Bazqux +34 | ) \ +35 | (func, + - ( ( + - ( # Zip + - ( + - ( zip + - # Zip + - ) + - ) + - ) + - (a, # A +36 + +37 + a, # A +38 | b, # B +39 | c, # C + - ) ) + - ), +40 + +41 | ) +42 | +43 | starmap( +note: This is an unsafe fix and may change runtime behavior RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_0.py:51:1 @@ -206,24 +197,22 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable | |_^ | help: Use `map` instead - -ℹ Safe fix -48 48 | ), -49 49 | ) -50 50 | -51 |-starmap( - 51 |+map( -52 52 | func \ -53 53 | , \ -54 |- zip \ -55 |- ( - 54 |+ \ - 55 |+ -56 56 | a,\ -57 57 | b,\ -58 58 | c,\ -59 |- ) - 59 |+ -60 60 | ) -61 61 | -62 62 | +48 | ), +49 | ) +50 | + - starmap( +51 + map( +52 | func \ +53 | , \ + - zip \ + - ( +54 + \ +55 + +56 | a,\ +57 | b,\ +58 | c,\ + - ) +59 + +60 | ) +61 | +62 | diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap index a6d9e9ab12..1ad51e4521 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_0.py.snap @@ -11,16 +11,15 @@ RUF059 [*] Unpacked variable `c` is never used 26 | (x, y) = baz = bar | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -21 21 | (a, b) = (1, 2) -22 22 | -23 23 | bar = (1, 2) -24 |- (c, d) = bar - 24 |+ (_c, d) = bar -25 25 | -26 26 | (x, y) = baz = bar -27 27 | +21 | (a, b) = (1, 2) +22 | +23 | bar = (1, 2) + - (c, d) = bar +24 + (_c, d) = bar +25 | +26 | (x, y) = baz = bar +27 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `d` is never used --> RUF059_0.py:24:9 @@ -32,16 +31,15 @@ RUF059 [*] Unpacked variable `d` is never used 26 | (x, y) = baz = bar | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -21 21 | (a, b) = (1, 2) -22 22 | -23 23 | bar = (1, 2) -24 |- (c, d) = bar - 24 |+ (c, _d) = bar -25 25 | -26 26 | (x, y) = baz = bar -27 27 | +21 | (a, b) = (1, 2) +22 | +23 | bar = (1, 2) + - (c, d) = bar +24 + (c, _d) = bar +25 | +26 | (x, y) = baz = bar +27 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `x` is never used --> RUF059_0.py:26:6 @@ -52,16 +50,15 @@ RUF059 [*] Unpacked variable `x` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -23 23 | bar = (1, 2) -24 24 | (c, d) = bar -25 25 | -26 |- (x, y) = baz = bar - 26 |+ (_x, y) = baz = bar -27 27 | -28 28 | -29 29 | def f(): +23 | bar = (1, 2) +24 | (c, d) = bar +25 | + - (x, y) = baz = bar +26 + (_x, y) = baz = bar +27 | +28 | +29 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y` is never used --> RUF059_0.py:26:9 @@ -72,16 +69,15 @@ RUF059 [*] Unpacked variable `y` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -23 23 | bar = (1, 2) -24 24 | (c, d) = bar -25 25 | -26 |- (x, y) = baz = bar - 26 |+ (x, _y) = baz = bar -27 27 | -28 28 | -29 29 | def f(): +23 | bar = (1, 2) +24 | (c, d) = bar +25 | + - (x, y) = baz = bar +26 + (x, _y) = baz = bar +27 | +28 | +29 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `connection` is never used --> RUF059_0.py:66:24 @@ -93,16 +89,15 @@ RUF059 [*] Unpacked variable `connection` is never used 67 | cursor.execute("SELECT * FROM users") | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -63 63 | def connect(): -64 64 | return None, None -65 65 | -66 |- with connect() as (connection, cursor): - 66 |+ with connect() as (_connection, cursor): -67 67 | cursor.execute("SELECT * FROM users") -68 68 | -69 69 | +63 | def connect(): +64 | return None, None +65 | + - with connect() as (connection, cursor): +66 + with connect() as (_connection, cursor): +67 | cursor.execute("SELECT * FROM users") +68 | +69 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `connection` is never used --> RUF059_0.py:74:24 @@ -114,16 +109,15 @@ RUF059 [*] Unpacked variable `connection` is never used 75 | cursor.execute("SELECT * FROM users") | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -71 71 | def connect(): -72 72 | return None, None -73 73 | -74 |- with connect() as (connection, cursor): - 74 |+ with connect() as (_connection, cursor): -75 75 | cursor.execute("SELECT * FROM users") -76 76 | -77 77 | +71 | def connect(): +72 | return None, None +73 | + - with connect() as (connection, cursor): +74 + with connect() as (_connection, cursor): +75 | cursor.execute("SELECT * FROM users") +76 | +77 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `this` is never used --> RUF059_0.py:79:49 @@ -134,16 +128,15 @@ RUF059 [*] Unpacked variable `this` is never used 80 | print("hello") | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -76 76 | -77 77 | -78 78 | def f(): -79 |- with open("file") as my_file, open("") as ((this, that)): - 79 |+ with open("file") as my_file, open("") as ((_this, that)): -80 80 | print("hello") -81 81 | -82 82 | +76 | +77 | +78 | def f(): + - with open("file") as my_file, open("") as ((this, that)): +79 + with open("file") as my_file, open("") as ((_this, that)): +80 | print("hello") +81 | +82 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `that` is never used --> RUF059_0.py:79:55 @@ -154,16 +147,15 @@ RUF059 [*] Unpacked variable `that` is never used 80 | print("hello") | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -76 76 | -77 77 | -78 78 | def f(): -79 |- with open("file") as my_file, open("") as ((this, that)): - 79 |+ with open("file") as my_file, open("") as ((this, _that)): -80 80 | print("hello") -81 81 | -82 82 | +76 | +77 | +78 | def f(): + - with open("file") as my_file, open("") as ((this, that)): +79 + with open("file") as my_file, open("") as ((this, _that)): +80 | print("hello") +81 | +82 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `this` is never used --> RUF059_0.py:86:23 @@ -176,16 +168,15 @@ RUF059 [*] Unpacked variable `this` is never used 88 | print("hello") | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -83 83 | def f(): -84 84 | with ( -85 85 | open("file") as my_file, -86 |- open("") as ((this, that)), - 86 |+ open("") as ((_this, that)), -87 87 | ): -88 88 | print("hello") -89 89 | +83 | def f(): +84 | with ( +85 | open("file") as my_file, + - open("") as ((this, that)), +86 + open("") as ((_this, that)), +87 | ): +88 | print("hello") +89 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `that` is never used --> RUF059_0.py:86:29 @@ -198,16 +189,15 @@ RUF059 [*] Unpacked variable `that` is never used 88 | print("hello") | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -83 83 | def f(): -84 84 | with ( -85 85 | open("file") as my_file, -86 |- open("") as ((this, that)), - 86 |+ open("") as ((this, _that)), -87 87 | ): -88 88 | print("hello") -89 89 | +83 | def f(): +84 | with ( +85 | open("file") as my_file, + - open("") as ((this, that)), +86 + open("") as ((this, _that)), +87 | ): +88 | print("hello") +89 | +note: This is an unsafe fix and may change runtime behavior RUF059 Unpacked variable `x` is never used --> RUF059_0.py:101:5 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap index b748594e1f..dbecc86b23 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_1.py.snap @@ -9,14 +9,13 @@ RUF059 [*] Unpacked variable `x` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -1 1 | def f(tup): -2 |- x, y = tup - 2 |+ _x, y = tup -3 3 | -4 4 | -5 5 | def f(): +1 | def f(tup): + - x, y = tup +2 + _x, y = tup +3 | +4 | +5 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y` is never used --> RUF059_1.py:2:8 @@ -26,14 +25,13 @@ RUF059 [*] Unpacked variable `y` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -1 1 | def f(tup): -2 |- x, y = tup - 2 |+ x, _y = tup -3 3 | -4 4 | -5 5 | def f(): +1 | def f(tup): + - x, y = tup +2 + x, _y = tup +3 | +4 | +5 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y` is never used --> RUF059_1.py:10:9 @@ -45,16 +43,15 @@ RUF059 [*] Unpacked variable `y` is never used 12 | print(coords) | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -7 7 | -8 8 | -9 9 | def f(): -10 |- (x, y) = coords = 1, 2 - 10 |+ (x, _y) = coords = 1, 2 -11 11 | if x > 1: -12 12 | print(coords) -13 13 | +7 | +8 | +9 | def f(): + - (x, y) = coords = 1, 2 +10 + (x, _y) = coords = 1, 2 +11 | if x > 1: +12 | print(coords) +13 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `x` is never used --> RUF059_1.py:16:6 @@ -64,16 +61,15 @@ RUF059 [*] Unpacked variable `x` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -13 13 | -14 14 | -15 15 | def f(): -16 |- (x, y) = coords = 1, 2 - 16 |+ (_x, y) = coords = 1, 2 -17 17 | -18 18 | -19 19 | def f(): +13 | +14 | +15 | def f(): + - (x, y) = coords = 1, 2 +16 + (_x, y) = coords = 1, 2 +17 | +18 | +19 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y` is never used --> RUF059_1.py:16:9 @@ -83,16 +79,15 @@ RUF059 [*] Unpacked variable `y` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -13 13 | -14 14 | -15 15 | def f(): -16 |- (x, y) = coords = 1, 2 - 16 |+ (x, _y) = coords = 1, 2 -17 17 | -18 18 | -19 19 | def f(): +13 | +14 | +15 | def f(): + - (x, y) = coords = 1, 2 +16 + (x, _y) = coords = 1, 2 +17 | +18 | +19 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `x` is never used --> RUF059_1.py:20:15 @@ -102,16 +97,15 @@ RUF059 [*] Unpacked variable `x` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def f(): -20 |- coords = (x, y) = 1, 2 - 20 |+ coords = (_x, y) = 1, 2 -21 21 | -22 22 | -23 23 | def f(): +17 | +18 | +19 | def f(): + - coords = (x, y) = 1, 2 +20 + coords = (_x, y) = 1, 2 +21 | +22 | +23 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y` is never used --> RUF059_1.py:20:18 @@ -121,13 +115,12 @@ RUF059 [*] Unpacked variable `y` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def f(): -20 |- coords = (x, y) = 1, 2 - 20 |+ coords = (x, _y) = 1, 2 -21 21 | -22 22 | -23 23 | def f(): +17 | +18 | +19 | def f(): + - coords = (x, y) = 1, 2 +20 + coords = (x, _y) = 1, 2 +21 | +22 | +23 | def f(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap index 9ff869dde6..dfc5ca2041 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_2.py.snap @@ -11,16 +11,15 @@ RUF059 [*] Unpacked variable `x2` is never used 9 | pass | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -5 5 | with foo() as x1: -6 6 | pass -7 7 | -8 |- with foo() as (x2, y2): - 8 |+ with foo() as (_x2, y2): -9 9 | pass -10 10 | -11 11 | with (foo() as x3, foo() as y3, foo() as z3): +5 | with foo() as x1: +6 | pass +7 | + - with foo() as (x2, y2): +8 + with foo() as (_x2, y2): +9 | pass +10 | +11 | with (foo() as x3, foo() as y3, foo() as z3): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y2` is never used --> RUF059_2.py:8:24 @@ -32,16 +31,15 @@ RUF059 [*] Unpacked variable `y2` is never used 9 | pass | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -5 5 | with foo() as x1: -6 6 | pass -7 7 | -8 |- with foo() as (x2, y2): - 8 |+ with foo() as (x2, _y2): -9 9 | pass -10 10 | -11 11 | with (foo() as x3, foo() as y3, foo() as z3): +5 | with foo() as x1: +6 | pass +7 | + - with foo() as (x2, y2): +8 + with foo() as (x2, _y2): +9 | pass +10 | +11 | with (foo() as x3, foo() as y3, foo() as z3): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `x2` is never used --> RUF059_2.py:17:6 @@ -53,16 +51,15 @@ RUF059 [*] Unpacked variable `x2` is never used 18 | coords3 = (x3, y3) = (1, 2) | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -14 14 | -15 15 | def f(): -16 16 | (x1, y1) = (1, 2) -17 |- (x2, y2) = coords2 = (1, 2) - 17 |+ (_x2, y2) = coords2 = (1, 2) -18 18 | coords3 = (x3, y3) = (1, 2) -19 19 | -20 20 | +14 | +15 | def f(): +16 | (x1, y1) = (1, 2) + - (x2, y2) = coords2 = (1, 2) +17 + (_x2, y2) = coords2 = (1, 2) +18 | coords3 = (x3, y3) = (1, 2) +19 | +20 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y2` is never used --> RUF059_2.py:17:10 @@ -74,16 +71,15 @@ RUF059 [*] Unpacked variable `y2` is never used 18 | coords3 = (x3, y3) = (1, 2) | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -14 14 | -15 15 | def f(): -16 16 | (x1, y1) = (1, 2) -17 |- (x2, y2) = coords2 = (1, 2) - 17 |+ (x2, _y2) = coords2 = (1, 2) -18 18 | coords3 = (x3, y3) = (1, 2) -19 19 | -20 20 | +14 | +15 | def f(): +16 | (x1, y1) = (1, 2) + - (x2, y2) = coords2 = (1, 2) +17 + (x2, _y2) = coords2 = (1, 2) +18 | coords3 = (x3, y3) = (1, 2) +19 | +20 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `x3` is never used --> RUF059_2.py:18:16 @@ -94,16 +90,15 @@ RUF059 [*] Unpacked variable `x3` is never used | ^^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -15 15 | def f(): -16 16 | (x1, y1) = (1, 2) -17 17 | (x2, y2) = coords2 = (1, 2) -18 |- coords3 = (x3, y3) = (1, 2) - 18 |+ coords3 = (_x3, y3) = (1, 2) -19 19 | -20 20 | -21 21 | def f(): +15 | def f(): +16 | (x1, y1) = (1, 2) +17 | (x2, y2) = coords2 = (1, 2) + - coords3 = (x3, y3) = (1, 2) +18 + coords3 = (_x3, y3) = (1, 2) +19 | +20 | +21 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y3` is never used --> RUF059_2.py:18:20 @@ -114,16 +109,15 @@ RUF059 [*] Unpacked variable `y3` is never used | ^^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -15 15 | def f(): -16 16 | (x1, y1) = (1, 2) -17 17 | (x2, y2) = coords2 = (1, 2) -18 |- coords3 = (x3, y3) = (1, 2) - 18 |+ coords3 = (x3, _y3) = (1, 2) -19 19 | -20 20 | -21 21 | def f(): +15 | def f(): +16 | (x1, y1) = (1, 2) +17 | (x2, y2) = coords2 = (1, 2) + - coords3 = (x3, y3) = (1, 2) +18 + coords3 = (x3, _y3) = (1, 2) +19 | +20 | +21 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `x` is never used --> RUF059_2.py:22:24 @@ -134,16 +128,15 @@ RUF059 [*] Unpacked variable `x` is never used 23 | pass | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -19 19 | -20 20 | -21 21 | def f(): -22 |- with Nested(m) as (x, y): - 22 |+ with Nested(m) as (_x, y): -23 23 | pass -24 24 | -25 25 | +19 | +20 | +21 | def f(): + - with Nested(m) as (x, y): +22 + with Nested(m) as (_x, y): +23 | pass +24 | +25 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `y` is never used --> RUF059_2.py:22:27 @@ -154,16 +147,15 @@ RUF059 [*] Unpacked variable `y` is never used 23 | pass | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -19 19 | -20 20 | -21 21 | def f(): -22 |- with Nested(m) as (x, y): - 22 |+ with Nested(m) as (x, _y): -23 23 | pass -24 24 | -25 25 | +19 | +20 | +21 | def f(): + - with Nested(m) as (x, y): +22 + with Nested(m) as (x, _y): +23 | pass +24 | +25 | +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `a` is never used --> RUF059_2.py:27:17 @@ -173,16 +165,15 @@ RUF059 [*] Unpacked variable `a` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -24 24 | -25 25 | -26 26 | def f(): -27 |- toplevel = (a, b) = lexer.get_token() - 27 |+ toplevel = (_a, b) = lexer.get_token() -28 28 | -29 29 | -30 30 | def f(): +24 | +25 | +26 | def f(): + - toplevel = (a, b) = lexer.get_token() +27 + toplevel = (_a, b) = lexer.get_token() +28 | +29 | +30 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `b` is never used --> RUF059_2.py:27:20 @@ -192,16 +183,15 @@ RUF059 [*] Unpacked variable `b` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -24 24 | -25 25 | -26 26 | def f(): -27 |- toplevel = (a, b) = lexer.get_token() - 27 |+ toplevel = (a, _b) = lexer.get_token() -28 28 | -29 29 | -30 30 | def f(): +24 | +25 | +26 | def f(): + - toplevel = (a, b) = lexer.get_token() +27 + toplevel = (a, _b) = lexer.get_token() +28 | +29 | +30 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `a` is never used --> RUF059_2.py:31:6 @@ -211,13 +201,12 @@ RUF059 [*] Unpacked variable `a` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -28 28 | -29 29 | -30 30 | def f(): -31 |- (a, b) = toplevel = lexer.get_token() - 31 |+ (_a, b) = toplevel = lexer.get_token() +28 | +29 | +30 | def f(): + - (a, b) = toplevel = lexer.get_token() +31 + (_a, b) = toplevel = lexer.get_token() +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `b` is never used --> RUF059_2.py:31:9 @@ -227,10 +216,9 @@ RUF059 [*] Unpacked variable `b` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -28 28 | -29 29 | -30 30 | def f(): -31 |- (a, b) = toplevel = lexer.get_token() - 31 |+ (a, _b) = toplevel = lexer.get_token() +28 | +29 | +30 | def f(): + - (a, b) = toplevel = lexer.get_token() +31 + (a, _b) = toplevel = lexer.get_token() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap index 4f8d754651..cc61f87b5a 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF059_RUF059_3.py.snap @@ -10,16 +10,15 @@ RUF059 [*] Unpacked variable `b` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -10 10 | -11 11 | def bar(): -12 12 | a = foo() -13 |- b, c = foo() - 13 |+ _b, c = foo() -14 14 | -15 15 | -16 16 | def baz(): +10 | +11 | def bar(): +12 | a = foo() + - b, c = foo() +13 + _b, c = foo() +14 | +15 | +16 | def baz(): +note: This is an unsafe fix and may change runtime behavior RUF059 [*] Unpacked variable `c` is never used --> RUF059_3.py:13:8 @@ -30,13 +29,12 @@ RUF059 [*] Unpacked variable `c` is never used | ^ | help: Prefix it with an underscore or any other dummy variable pattern - -ℹ Unsafe fix -10 10 | -11 11 | def bar(): -12 12 | a = foo() -13 |- b, c = foo() - 13 |+ b, _c = foo() -14 14 | -15 15 | -16 16 | def baz(): +10 | +11 | def bar(): +12 | a = foo() + - b, c = foo() +13 + b, _c = foo() +14 | +15 | +16 | def baz(): +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap index f25897d788..7cb614a440 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_deprecated_call.py.snap @@ -9,17 +9,16 @@ RUF061 [*] Use context-manager form of `pytest.deprecated_call()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.deprecated_call()` as a context-manager - -ℹ Unsafe fix -13 13 | -14 14 | -15 15 | def test_error_trivial(): -16 |- pytest.deprecated_call(raise_deprecation_warning, "deprecated") - 16 |+ with pytest.deprecated_call(): - 17 |+ raise_deprecation_warning("deprecated") -17 18 | -18 19 | -19 20 | def test_error_assign(): +13 | +14 | +15 | def test_error_trivial(): + - pytest.deprecated_call(raise_deprecation_warning, "deprecated") +16 + with pytest.deprecated_call(): +17 + raise_deprecation_warning("deprecated") +18 | +19 | +20 | def test_error_assign(): +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.deprecated_call()` --> RUF061_deprecated_call.py:20:9 @@ -30,17 +29,16 @@ RUF061 [*] Use context-manager form of `pytest.deprecated_call()` 21 | print(s) | help: Use `pytest.deprecated_call()` as a context-manager - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def test_error_assign(): -20 |- s = pytest.deprecated_call(raise_deprecation_warning, "deprecated") - 20 |+ with pytest.deprecated_call(): - 21 |+ s = raise_deprecation_warning("deprecated") -21 22 | print(s) -22 23 | -23 24 | +17 | +18 | +19 | def test_error_assign(): + - s = pytest.deprecated_call(raise_deprecation_warning, "deprecated") +20 + with pytest.deprecated_call(): +21 + s = raise_deprecation_warning("deprecated") +22 | print(s) +23 | +24 | +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.deprecated_call()` --> RUF061_deprecated_call.py:25:5 @@ -50,11 +48,10 @@ RUF061 [*] Use context-manager form of `pytest.deprecated_call()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.deprecated_call()` as a context-manager - -ℹ Unsafe fix -22 22 | -23 23 | -24 24 | def test_error_lambda(): -25 |- pytest.deprecated_call(lambda: warnings.warn("", DeprecationWarning)) - 25 |+ with pytest.deprecated_call(): - 26 |+ (lambda: warnings.warn("", DeprecationWarning))() +22 | +23 | +24 | def test_error_lambda(): + - pytest.deprecated_call(lambda: warnings.warn("", DeprecationWarning)) +25 + with pytest.deprecated_call(): +26 + (lambda: warnings.warn("", DeprecationWarning))() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap index 59cd74756d..d6f7b220c5 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_raises.py.snap @@ -9,17 +9,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.raises()` as a context-manager - -ℹ Unsafe fix -16 16 | -17 17 | -18 18 | def test_error_trivial(): -19 |- pytest.raises(ZeroDivisionError, func, 1, b=0) - 19 |+ with pytest.raises(ZeroDivisionError): - 20 |+ func(1, b=0) -20 21 | -21 22 | -22 23 | def test_error_match(): +16 | +17 | +18 | def test_error_trivial(): + - pytest.raises(ZeroDivisionError, func, 1, b=0) +19 + with pytest.raises(ZeroDivisionError): +20 + func(1, b=0) +21 | +22 | +23 | def test_error_match(): +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.raises()` --> RUF061_raises.py:23:5 @@ -29,17 +28,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.raises()` as a context-manager - -ℹ Unsafe fix -20 20 | -21 21 | -22 22 | def test_error_match(): -23 |- pytest.raises(ZeroDivisionError, func, 1, b=0).match("division by zero") - 23 |+ with pytest.raises(ZeroDivisionError, match="division by zero"): - 24 |+ func(1, b=0) -24 25 | -25 26 | -26 27 | def test_error_assign(): +20 | +21 | +22 | def test_error_match(): + - pytest.raises(ZeroDivisionError, func, 1, b=0).match("division by zero") +23 + with pytest.raises(ZeroDivisionError, match="division by zero"): +24 + func(1, b=0) +25 | +26 | +27 | def test_error_assign(): +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.raises()` --> RUF061_raises.py:27:15 @@ -49,17 +47,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.raises()` as a context-manager - -ℹ Unsafe fix -24 24 | -25 25 | -26 26 | def test_error_assign(): -27 |- excinfo = pytest.raises(ZeroDivisionError, func, 1, b=0) - 27 |+ with pytest.raises(ZeroDivisionError) as excinfo: - 28 |+ func(1, b=0) -28 29 | -29 30 | -30 31 | def test_error_kwargs(): +24 | +25 | +26 | def test_error_assign(): + - excinfo = pytest.raises(ZeroDivisionError, func, 1, b=0) +27 + with pytest.raises(ZeroDivisionError) as excinfo: +28 + func(1, b=0) +29 | +30 | +31 | def test_error_kwargs(): +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.raises()` --> RUF061_raises.py:31:5 @@ -69,17 +66,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.raises()` as a context-manager - -ℹ Unsafe fix -28 28 | -29 29 | -30 30 | def test_error_kwargs(): -31 |- pytest.raises(func=func, expected_exception=ZeroDivisionError) - 31 |+ with pytest.raises(ZeroDivisionError): - 32 |+ func() -32 33 | -33 34 | -34 35 | def test_error_multi_statement(): +28 | +29 | +30 | def test_error_kwargs(): + - pytest.raises(func=func, expected_exception=ZeroDivisionError) +31 + with pytest.raises(ZeroDivisionError): +32 + func() +33 | +34 | +35 | def test_error_multi_statement(): +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.raises()` --> RUF061_raises.py:35:15 @@ -90,17 +86,16 @@ RUF061 [*] Use context-manager form of `pytest.raises()` 36 | assert excinfo.match("^invalid literal") | help: Use `pytest.raises()` as a context-manager - -ℹ Unsafe fix -32 32 | -33 33 | -34 34 | def test_error_multi_statement(): -35 |- excinfo = pytest.raises(ValueError, int, "hello") - 35 |+ with pytest.raises(ValueError) as excinfo: - 36 |+ int("hello") -36 37 | assert excinfo.match("^invalid literal") -37 38 | -38 39 | +32 | +33 | +34 | def test_error_multi_statement(): + - excinfo = pytest.raises(ValueError, int, "hello") +35 + with pytest.raises(ValueError) as excinfo: +36 + int("hello") +37 | assert excinfo.match("^invalid literal") +38 | +39 | +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.raises()` --> RUF061_raises.py:40:5 @@ -110,11 +105,10 @@ RUF061 [*] Use context-manager form of `pytest.raises()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.raises()` as a context-manager - -ℹ Unsafe fix -37 37 | -38 38 | -39 39 | def test_error_lambda(): -40 |- pytest.raises(ZeroDivisionError, lambda: 1 / 0) - 40 |+ with pytest.raises(ZeroDivisionError): - 41 |+ (lambda: 1 / 0)() +37 | +38 | +39 | def test_error_lambda(): + - pytest.raises(ZeroDivisionError, lambda: 1 / 0) +40 + with pytest.raises(ZeroDivisionError): +41 + (lambda: 1 / 0)() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap index cbe5d04a21..eca30980c7 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF061_RUF061_warns.py.snap @@ -9,17 +9,16 @@ RUF061 [*] Use context-manager form of `pytest.warns()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.warns()` as a context-manager - -ℹ Unsafe fix -13 13 | -14 14 | -15 15 | def test_error_trivial(): -16 |- pytest.warns(UserWarning, raise_user_warning, "warning") - 16 |+ with pytest.warns(UserWarning): - 17 |+ raise_user_warning("warning") -17 18 | -18 19 | -19 20 | def test_error_assign(): +13 | +14 | +15 | def test_error_trivial(): + - pytest.warns(UserWarning, raise_user_warning, "warning") +16 + with pytest.warns(UserWarning): +17 + raise_user_warning("warning") +18 | +19 | +20 | def test_error_assign(): +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.warns()` --> RUF061_warns.py:20:9 @@ -30,17 +29,16 @@ RUF061 [*] Use context-manager form of `pytest.warns()` 21 | print(s) | help: Use `pytest.warns()` as a context-manager - -ℹ Unsafe fix -17 17 | -18 18 | -19 19 | def test_error_assign(): -20 |- s = pytest.warns(UserWarning, raise_user_warning, "warning") - 20 |+ with pytest.warns(UserWarning): - 21 |+ s = raise_user_warning("warning") -21 22 | print(s) -22 23 | -23 24 | +17 | +18 | +19 | def test_error_assign(): + - s = pytest.warns(UserWarning, raise_user_warning, "warning") +20 + with pytest.warns(UserWarning): +21 + s = raise_user_warning("warning") +22 | print(s) +23 | +24 | +note: This is an unsafe fix and may change runtime behavior RUF061 [*] Use context-manager form of `pytest.warns()` --> RUF061_warns.py:25:5 @@ -50,11 +48,10 @@ RUF061 [*] Use context-manager form of `pytest.warns()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `pytest.warns()` as a context-manager - -ℹ Unsafe fix -22 22 | -23 23 | -24 24 | def test_error_lambda(): -25 |- pytest.warns(UserWarning, lambda: warnings.warn("", UserWarning)) - 25 |+ with pytest.warns(UserWarning): - 26 |+ (lambda: warnings.warn("", UserWarning))() +22 | +23 | +24 | def test_error_lambda(): + - pytest.warns(UserWarning, lambda: warnings.warn("", UserWarning)) +25 + with pytest.warns(UserWarning): +26 + (lambda: warnings.warn("", UserWarning))() +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap index 4aace6b857..9a88ad5557 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF064_RUF064.py.snap @@ -12,16 +12,15 @@ RUF064 [*] Non-octal mode 8 | os.chmod("foo", 7777) # Error | help: Replace with octal literal - -ℹ Unsafe fix -3 3 | import os -4 4 | from pathlib import Path -5 5 | -6 |-os.chmod("foo", 444) # Error - 6 |+os.chmod("foo", 0o444) # Error -7 7 | os.chmod("foo", 0o444) # OK -8 8 | os.chmod("foo", 7777) # Error -9 9 | os.chmod("foo", 10000) # Error +3 | import os +4 | from pathlib import Path +5 | + - os.chmod("foo", 444) # Error +6 + os.chmod("foo", 0o444) # Error +7 | os.chmod("foo", 0o444) # OK +8 | os.chmod("foo", 7777) # Error +9 | os.chmod("foo", 10000) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 Non-octal mode --> RUF064.py:8:17 @@ -68,16 +67,15 @@ RUF064 [*] Non-octal mode 13 | os.umask(0o777) # OK | help: Replace with octal literal - -ℹ Unsafe fix -9 9 | os.chmod("foo", 10000) # Error -10 10 | os.chmod("foo", 99999) # Error -11 11 | -12 |-os.umask(777) # Error - 12 |+os.umask(0o777) # Error -13 13 | os.umask(0o777) # OK -14 14 | -15 15 | os.fchmod(0, 400) # Error +9 | os.chmod("foo", 10000) # Error +10 | os.chmod("foo", 99999) # Error +11 | + - os.umask(777) # Error +12 + os.umask(0o777) # Error +13 | os.umask(0o777) # OK +14 | +15 | os.fchmod(0, 400) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:15:14 @@ -89,16 +87,15 @@ RUF064 [*] Non-octal mode 16 | os.fchmod(0, 0o400) # OK | help: Replace with octal literal - -ℹ Unsafe fix -12 12 | os.umask(777) # Error -13 13 | os.umask(0o777) # OK -14 14 | -15 |-os.fchmod(0, 400) # Error - 15 |+os.fchmod(0, 0o400) # Error -16 16 | os.fchmod(0, 0o400) # OK -17 17 | -18 18 | os.lchmod("foo", 755) # Error +12 | os.umask(777) # Error +13 | os.umask(0o777) # OK +14 | + - os.fchmod(0, 400) # Error +15 + os.fchmod(0, 0o400) # Error +16 | os.fchmod(0, 0o400) # OK +17 | +18 | os.lchmod("foo", 755) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:18:18 @@ -110,16 +107,15 @@ RUF064 [*] Non-octal mode 19 | os.lchmod("foo", 0o755) # OK | help: Replace with octal literal - -ℹ Unsafe fix -15 15 | os.fchmod(0, 400) # Error -16 16 | os.fchmod(0, 0o400) # OK -17 17 | -18 |-os.lchmod("foo", 755) # Error - 18 |+os.lchmod("foo", 0o755) # Error -19 19 | os.lchmod("foo", 0o755) # OK -20 20 | -21 21 | os.mkdir("foo", 600) # Error +15 | os.fchmod(0, 400) # Error +16 | os.fchmod(0, 0o400) # OK +17 | + - os.lchmod("foo", 755) # Error +18 + os.lchmod("foo", 0o755) # Error +19 | os.lchmod("foo", 0o755) # OK +20 | +21 | os.mkdir("foo", 600) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:21:17 @@ -131,16 +127,15 @@ RUF064 [*] Non-octal mode 22 | os.mkdir("foo", 0o600) # OK | help: Replace with octal literal - -ℹ Unsafe fix -18 18 | os.lchmod("foo", 755) # Error -19 19 | os.lchmod("foo", 0o755) # OK -20 20 | -21 |-os.mkdir("foo", 600) # Error - 21 |+os.mkdir("foo", 0o600) # Error -22 22 | os.mkdir("foo", 0o600) # OK -23 23 | -24 24 | os.makedirs("foo", 644) # Error +18 | os.lchmod("foo", 755) # Error +19 | os.lchmod("foo", 0o755) # OK +20 | + - os.mkdir("foo", 600) # Error +21 + os.mkdir("foo", 0o600) # Error +22 | os.mkdir("foo", 0o600) # OK +23 | +24 | os.makedirs("foo", 644) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:24:20 @@ -152,16 +147,15 @@ RUF064 [*] Non-octal mode 25 | os.makedirs("foo", 0o644) # OK | help: Replace with octal literal - -ℹ Unsafe fix -21 21 | os.mkdir("foo", 600) # Error -22 22 | os.mkdir("foo", 0o600) # OK -23 23 | -24 |-os.makedirs("foo", 644) # Error - 24 |+os.makedirs("foo", 0o644) # Error -25 25 | os.makedirs("foo", 0o644) # OK -26 26 | -27 27 | os.mkfifo("foo", 640) # Error +21 | os.mkdir("foo", 600) # Error +22 | os.mkdir("foo", 0o600) # OK +23 | + - os.makedirs("foo", 644) # Error +24 + os.makedirs("foo", 0o644) # Error +25 | os.makedirs("foo", 0o644) # OK +26 | +27 | os.mkfifo("foo", 640) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:27:18 @@ -173,16 +167,15 @@ RUF064 [*] Non-octal mode 28 | os.mkfifo("foo", 0o640) # OK | help: Replace with octal literal - -ℹ Unsafe fix -24 24 | os.makedirs("foo", 644) # Error -25 25 | os.makedirs("foo", 0o644) # OK -26 26 | -27 |-os.mkfifo("foo", 640) # Error - 27 |+os.mkfifo("foo", 0o640) # Error -28 28 | os.mkfifo("foo", 0o640) # OK -29 29 | -30 30 | os.mknod("foo", 660) # Error +24 | os.makedirs("foo", 644) # Error +25 | os.makedirs("foo", 0o644) # OK +26 | + - os.mkfifo("foo", 640) # Error +27 + os.mkfifo("foo", 0o640) # Error +28 | os.mkfifo("foo", 0o640) # OK +29 | +30 | os.mknod("foo", 660) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:30:17 @@ -194,16 +187,15 @@ RUF064 [*] Non-octal mode 31 | os.mknod("foo", 0o660) # OK | help: Replace with octal literal - -ℹ Unsafe fix -27 27 | os.mkfifo("foo", 640) # Error -28 28 | os.mkfifo("foo", 0o640) # OK -29 29 | -30 |-os.mknod("foo", 660) # Error - 30 |+os.mknod("foo", 0o660) # Error -31 31 | os.mknod("foo", 0o660) # OK -32 32 | -33 33 | os.open("foo", os.O_CREAT, 644) # Error +27 | os.mkfifo("foo", 640) # Error +28 | os.mkfifo("foo", 0o640) # OK +29 | + - os.mknod("foo", 660) # Error +30 + os.mknod("foo", 0o660) # Error +31 | os.mknod("foo", 0o660) # OK +32 | +33 | os.open("foo", os.O_CREAT, 644) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:33:28 @@ -215,16 +207,15 @@ RUF064 [*] Non-octal mode 34 | os.open("foo", os.O_CREAT, 0o644) # OK | help: Replace with octal literal - -ℹ Unsafe fix -30 30 | os.mknod("foo", 660) # Error -31 31 | os.mknod("foo", 0o660) # OK -32 32 | -33 |-os.open("foo", os.O_CREAT, 644) # Error - 33 |+os.open("foo", os.O_CREAT, 0o644) # Error -34 34 | os.open("foo", os.O_CREAT, 0o644) # OK -35 35 | -36 36 | Path("bar").chmod(755) # Error +30 | os.mknod("foo", 660) # Error +31 | os.mknod("foo", 0o660) # OK +32 | + - os.open("foo", os.O_CREAT, 644) # Error +33 + os.open("foo", os.O_CREAT, 0o644) # Error +34 | os.open("foo", os.O_CREAT, 0o644) # OK +35 | +36 | Path("bar").chmod(755) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:36:19 @@ -236,16 +227,15 @@ RUF064 [*] Non-octal mode 37 | Path("bar").chmod(0o755) # OK | help: Replace with octal literal - -ℹ Unsafe fix -33 33 | os.open("foo", os.O_CREAT, 644) # Error -34 34 | os.open("foo", os.O_CREAT, 0o644) # OK -35 35 | -36 |-Path("bar").chmod(755) # Error - 36 |+Path("bar").chmod(0o755) # Error -37 37 | Path("bar").chmod(0o755) # OK -38 38 | -39 39 | path = Path("bar") +33 | os.open("foo", os.O_CREAT, 644) # Error +34 | os.open("foo", os.O_CREAT, 0o644) # OK +35 | + - Path("bar").chmod(755) # Error +36 + Path("bar").chmod(0o755) # Error +37 | Path("bar").chmod(0o755) # OK +38 | +39 | path = Path("bar") +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:40:12 @@ -256,16 +246,15 @@ RUF064 [*] Non-octal mode 41 | path.chmod(0o755) # OK | help: Replace with octal literal - -ℹ Unsafe fix -37 37 | Path("bar").chmod(0o755) # OK -38 38 | -39 39 | path = Path("bar") -40 |-path.chmod(755) # Error - 40 |+path.chmod(0o755) # Error -41 41 | path.chmod(0o755) # OK -42 42 | -43 43 | dbm.open("db", "r", 600) # Error +37 | Path("bar").chmod(0o755) # OK +38 | +39 | path = Path("bar") + - path.chmod(755) # Error +40 + path.chmod(0o755) # Error +41 | path.chmod(0o755) # OK +42 | +43 | dbm.open("db", "r", 600) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:43:21 @@ -277,16 +266,15 @@ RUF064 [*] Non-octal mode 44 | dbm.open("db", "r", 0o600) # OK | help: Replace with octal literal - -ℹ Unsafe fix -40 40 | path.chmod(755) # Error -41 41 | path.chmod(0o755) # OK -42 42 | -43 |-dbm.open("db", "r", 600) # Error - 43 |+dbm.open("db", "r", 0o600) # Error -44 44 | dbm.open("db", "r", 0o600) # OK -45 45 | -46 46 | dbm.gnu.open("db", "r", 600) # Error +40 | path.chmod(755) # Error +41 | path.chmod(0o755) # OK +42 | + - dbm.open("db", "r", 600) # Error +43 + dbm.open("db", "r", 0o600) # Error +44 | dbm.open("db", "r", 0o600) # OK +45 | +46 | dbm.gnu.open("db", "r", 600) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:46:25 @@ -298,16 +286,15 @@ RUF064 [*] Non-octal mode 47 | dbm.gnu.open("db", "r", 0o600) # OK | help: Replace with octal literal - -ℹ Unsafe fix -43 43 | dbm.open("db", "r", 600) # Error -44 44 | dbm.open("db", "r", 0o600) # OK -45 45 | -46 |-dbm.gnu.open("db", "r", 600) # Error - 46 |+dbm.gnu.open("db", "r", 0o600) # Error -47 47 | dbm.gnu.open("db", "r", 0o600) # OK -48 48 | -49 49 | dbm.ndbm.open("db", "r", 600) # Error +43 | dbm.open("db", "r", 600) # Error +44 | dbm.open("db", "r", 0o600) # OK +45 | + - dbm.gnu.open("db", "r", 600) # Error +46 + dbm.gnu.open("db", "r", 0o600) # Error +47 | dbm.gnu.open("db", "r", 0o600) # OK +48 | +49 | dbm.ndbm.open("db", "r", 600) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:49:26 @@ -319,16 +306,15 @@ RUF064 [*] Non-octal mode 50 | dbm.ndbm.open("db", "r", 0o600) # OK | help: Replace with octal literal - -ℹ Unsafe fix -46 46 | dbm.gnu.open("db", "r", 600) # Error -47 47 | dbm.gnu.open("db", "r", 0o600) # OK -48 48 | -49 |-dbm.ndbm.open("db", "r", 600) # Error - 49 |+dbm.ndbm.open("db", "r", 0o600) # Error -50 50 | dbm.ndbm.open("db", "r", 0o600) # OK -51 51 | -52 52 | os.fchmod(0, 256) # 0o400 +46 | dbm.gnu.open("db", "r", 600) # Error +47 | dbm.gnu.open("db", "r", 0o600) # OK +48 | + - dbm.ndbm.open("db", "r", 600) # Error +49 + dbm.ndbm.open("db", "r", 0o600) # Error +50 | dbm.ndbm.open("db", "r", 0o600) # OK +51 | +52 | os.fchmod(0, 256) # 0o400 +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:52:14 @@ -340,16 +326,15 @@ RUF064 [*] Non-octal mode 53 | os.fchmod(0, 493) # 0o755 | help: Replace with octal literal - -ℹ Unsafe fix -49 49 | dbm.ndbm.open("db", "r", 600) # Error -50 50 | dbm.ndbm.open("db", "r", 0o600) # OK -51 51 | -52 |-os.fchmod(0, 256) # 0o400 - 52 |+os.fchmod(0, 0o400) # 0o400 -53 53 | os.fchmod(0, 493) # 0o755 -54 54 | -55 55 | # https://github.com/astral-sh/ruff/issues/19010 +49 | dbm.ndbm.open("db", "r", 600) # Error +50 | dbm.ndbm.open("db", "r", 0o600) # OK +51 | + - os.fchmod(0, 256) # 0o400 +52 + os.fchmod(0, 0o400) # 0o400 +53 | os.fchmod(0, 493) # 0o755 +54 | +55 | # https://github.com/astral-sh/ruff/issues/19010 +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:53:14 @@ -361,16 +346,15 @@ RUF064 [*] Non-octal mode 55 | # https://github.com/astral-sh/ruff/issues/19010 | help: Replace with octal literal - -ℹ Unsafe fix -50 50 | dbm.ndbm.open("db", "r", 0o600) # OK -51 51 | -52 52 | os.fchmod(0, 256) # 0o400 -53 |-os.fchmod(0, 493) # 0o755 - 53 |+os.fchmod(0, 0o755) # 0o755 -54 54 | -55 55 | # https://github.com/astral-sh/ruff/issues/19010 -56 56 | os.chmod("foo", 000) # Error +50 | dbm.ndbm.open("db", "r", 0o600) # OK +51 | +52 | os.fchmod(0, 256) # 0o400 + - os.fchmod(0, 493) # 0o755 +53 + os.fchmod(0, 0o755) # 0o755 +54 | +55 | # https://github.com/astral-sh/ruff/issues/19010 +56 | os.chmod("foo", 000) # Error +note: This is an unsafe fix and may change runtime behavior RUF064 [*] Non-octal mode --> RUF064.py:56:17 @@ -381,16 +365,14 @@ RUF064 [*] Non-octal mode 57 | os.chmod("foo", 0000) # Error | help: Replace with octal literal - -ℹ Safe fix -53 53 | os.fchmod(0, 493) # 0o755 -54 54 | -55 55 | # https://github.com/astral-sh/ruff/issues/19010 -56 |-os.chmod("foo", 000) # Error - 56 |+os.chmod("foo", 0o000) # Error -57 57 | os.chmod("foo", 0000) # Error -58 58 | -59 59 | os.chmod("foo", 0b0) # Error +53 | os.fchmod(0, 493) # 0o755 +54 | +55 | # https://github.com/astral-sh/ruff/issues/19010 + - os.chmod("foo", 000) # Error +56 + os.chmod("foo", 0o000) # Error +57 | os.chmod("foo", 0000) # Error +58 | +59 | os.chmod("foo", 0b0) # Error RUF064 [*] Non-octal mode --> RUF064.py:57:17 @@ -403,16 +385,14 @@ RUF064 [*] Non-octal mode 59 | os.chmod("foo", 0b0) # Error | help: Replace with octal literal - -ℹ Safe fix -54 54 | -55 55 | # https://github.com/astral-sh/ruff/issues/19010 -56 56 | os.chmod("foo", 000) # Error -57 |-os.chmod("foo", 0000) # Error - 57 |+os.chmod("foo", 0o0000) # Error -58 58 | -59 59 | os.chmod("foo", 0b0) # Error -60 60 | os.chmod("foo", 0x0) # Error +54 | +55 | # https://github.com/astral-sh/ruff/issues/19010 +56 | os.chmod("foo", 000) # Error + - os.chmod("foo", 0000) # Error +57 + os.chmod("foo", 0o0000) # Error +58 | +59 | os.chmod("foo", 0b0) # Error +60 | os.chmod("foo", 0x0) # Error RUF064 Non-octal mode --> RUF064.py:59:17 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap index 2041f3a696..d13c67ba1a 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_0.py.snap @@ -10,14 +10,12 @@ RUF101 [*] `RUF940` is a redirect to `RUF950` 3 | x = 2 # noqa: RUF940, RUF950 | help: Replace with `RUF950` - -ℹ Safe fix -1 |-x = 2 # noqa: RUF940 -2 1 | x = 2 # noqa: RUF950 - 2 |+x = 2 # noqa: RUF950 -3 3 | x = 2 # noqa: RUF940, RUF950 -4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 -5 5 | x = 2 # noqa: RUF940, RUF950, RUF940 + - x = 2 # noqa: RUF940 +1 | x = 2 # noqa: RUF950 +2 + x = 2 # noqa: RUF950 +3 | x = 2 # noqa: RUF940, RUF950 +4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 +5 | x = 2 # noqa: RUF940, RUF950, RUF940 RUF101 [*] `RUF940` is a redirect to `RUF950` --> RUF101_0.py:3:15 @@ -30,15 +28,13 @@ RUF101 [*] `RUF940` is a redirect to `RUF950` 5 | x = 2 # noqa: RUF940, RUF950, RUF940 | help: Replace with `RUF950` - -ℹ Safe fix -1 1 | x = 2 # noqa: RUF940 -2 2 | x = 2 # noqa: RUF950 -3 |-x = 2 # noqa: RUF940, RUF950 - 3 |+x = 2 # noqa: RUF950, RUF950 -4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 -5 5 | x = 2 # noqa: RUF940, RUF950, RUF940 -6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 +1 | x = 2 # noqa: RUF940 +2 | x = 2 # noqa: RUF950 + - x = 2 # noqa: RUF940, RUF950 +3 + x = 2 # noqa: RUF950, RUF950 +4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 +5 | x = 2 # noqa: RUF940, RUF950, RUF940 +6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 RUF101 [*] `RUF940` is a redirect to `RUF950` --> RUF101_0.py:4:23 @@ -51,15 +47,13 @@ RUF101 [*] `RUF940` is a redirect to `RUF950` 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 | help: Replace with `RUF950` - -ℹ Safe fix -1 1 | x = 2 # noqa: RUF940 -2 2 | x = 2 # noqa: RUF950 -3 3 | x = 2 # noqa: RUF940, RUF950 -4 |-x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 - 4 |+x = 2 # noqa: RUF950, RUF950, RUF950, RUF950, RUF950 -5 5 | x = 2 # noqa: RUF940, RUF950, RUF940 -6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 +1 | x = 2 # noqa: RUF940 +2 | x = 2 # noqa: RUF950 +3 | x = 2 # noqa: RUF940, RUF950 + - x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 +4 + x = 2 # noqa: RUF950, RUF950, RUF950, RUF950, RUF950 +5 | x = 2 # noqa: RUF940, RUF950, RUF940 +6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 RUF101 [*] `RUF940` is a redirect to `RUF950` --> RUF101_0.py:5:15 @@ -71,14 +65,12 @@ RUF101 [*] `RUF940` is a redirect to `RUF950` 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 | help: Replace with `RUF950` - -ℹ Safe fix -2 2 | x = 2 # noqa: RUF950 -3 3 | x = 2 # noqa: RUF940, RUF950 -4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 -5 |-x = 2 # noqa: RUF940, RUF950, RUF940 - 5 |+x = 2 # noqa: RUF950, RUF950, RUF940 -6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 +2 | x = 2 # noqa: RUF950 +3 | x = 2 # noqa: RUF940, RUF950 +4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 + - x = 2 # noqa: RUF940, RUF950, RUF940 +5 + x = 2 # noqa: RUF950, RUF950, RUF940 +6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 RUF101 [*] `RUF940` is a redirect to `RUF950` --> RUF101_0.py:5:31 @@ -90,14 +82,12 @@ RUF101 [*] `RUF940` is a redirect to `RUF950` 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 | help: Replace with `RUF950` - -ℹ Safe fix -2 2 | x = 2 # noqa: RUF950 -3 3 | x = 2 # noqa: RUF940, RUF950 -4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 -5 |-x = 2 # noqa: RUF940, RUF950, RUF940 - 5 |+x = 2 # noqa: RUF940, RUF950, RUF950 -6 6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 +2 | x = 2 # noqa: RUF950 +3 | x = 2 # noqa: RUF940, RUF950 +4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 + - x = 2 # noqa: RUF940, RUF950, RUF940 +5 + x = 2 # noqa: RUF940, RUF950, RUF950 +6 | x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 RUF101 [*] `RUF940` is a redirect to `RUF950` --> RUF101_0.py:6:15 @@ -108,13 +98,11 @@ RUF101 [*] `RUF940` is a redirect to `RUF950` | ^^^^^^ | help: Replace with `RUF950` - -ℹ Safe fix -3 3 | x = 2 # noqa: RUF940, RUF950 -4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 -5 5 | x = 2 # noqa: RUF940, RUF950, RUF940 -6 |-x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 - 6 |+x = 2 # noqa: RUF950, RUF950, RUF940, RUF950 +3 | x = 2 # noqa: RUF940, RUF950 +4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 +5 | x = 2 # noqa: RUF940, RUF950, RUF940 + - x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 +6 + x = 2 # noqa: RUF950, RUF950, RUF940, RUF950 RUF101 [*] `RUF940` is a redirect to `RUF950` --> RUF101_0.py:6:31 @@ -125,10 +113,8 @@ RUF101 [*] `RUF940` is a redirect to `RUF950` | ^^^^^^ | help: Replace with `RUF950` - -ℹ Safe fix -3 3 | x = 2 # noqa: RUF940, RUF950 -4 4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 -5 5 | x = 2 # noqa: RUF940, RUF950, RUF940 -6 |-x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 - 6 |+x = 2 # noqa: RUF940, RUF950, RUF950, RUF950 +3 | x = 2 # noqa: RUF940, RUF950 +4 | x = 2 # noqa: RUF950, RUF940, RUF950, RUF950, RUF950 +5 | x = 2 # noqa: RUF940, RUF950, RUF940 + - x = 2 # noqa: RUF940, RUF950, RUF940, RUF950 +6 + x = 2 # noqa: RUF940, RUF950, RUF950, RUF950 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap index 2f65f2f208..fad41bd8f2 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF101_RUF101_1.py.snap @@ -12,13 +12,11 @@ RUF101 [*] `TCH002` is a redirect to `TC002` 7 | from __future__ import annotations | help: Replace with `TC002` - -ℹ Safe fix -2 2 | -3 3 | RUF101 should trigger here because the TCH rules have been recoded to TC. -4 4 | """ -5 |-# ruff: noqa: TCH002 - 5 |+# ruff: noqa: TC002 -6 6 | -7 7 | from __future__ import annotations -8 8 | +2 | +3 | RUF101 should trigger here because the TCH rules have been recoded to TC. +4 | """ + - # ruff: noqa: TCH002 +5 + # ruff: noqa: TC002 +6 | +7 | from __future__ import annotations +8 | diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap index c29d27335f..0de2b9a2c8 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF102_RUF102.py.snap @@ -11,14 +11,12 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123 4 | import re # noqa: V123 | help: Remove the rule code - -ℹ Safe fix -1 1 | # Invalid code -2 |-import os # noqa: INVALID123 - 2 |+import os -3 3 | # External code -4 4 | import re # noqa: V123 -5 5 | # Valid noqa +1 | # Invalid code + - import os # noqa: INVALID123 +2 + import os +3 | # External code +4 | import re # noqa: V123 +5 | # Valid noqa RUF102 [*] Invalid rule code in `# noqa`: V123 --> RUF102.py:4:12 @@ -31,16 +29,14 @@ RUF102 [*] Invalid rule code in `# noqa`: V123 6 | import sys # noqa: E402 | help: Remove the rule code - -ℹ Safe fix -1 1 | # Invalid code -2 2 | import os # noqa: INVALID123 -3 3 | # External code -4 |-import re # noqa: V123 - 4 |+import re -5 5 | # Valid noqa -6 6 | import sys # noqa: E402 -7 7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 +1 | # Invalid code +2 | import os # noqa: INVALID123 +3 | # External code + - import re # noqa: V123 +4 + import re +5 | # Valid noqa +6 | import sys # noqa: E402 +7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 RUF102 [*] Invalid rule code in `# noqa`: INVALID456 --> RUF102.py:7:65 @@ -53,16 +49,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID456 9 | # Succeeding comment | help: Remove the rule code - -ℹ Safe fix -4 4 | import re # noqa: V123 -5 5 | # Valid noqa -6 6 | import sys # noqa: E402 -7 |-from functools import cache # Preceeding comment # noqa: F401, INVALID456 - 7 |+from functools import cache # Preceeding comment # noqa: F401 -8 8 | from itertools import product # Preceeding comment # noqa: INVALID789 -9 9 | # Succeeding comment -10 10 | import math # noqa: INVALID000 # Succeeding comment +4 | import re # noqa: V123 +5 | # Valid noqa +6 | import sys # noqa: E402 + - from functools import cache # Preceeding comment # noqa: F401, INVALID456 +7 + from functools import cache # Preceeding comment # noqa: F401 +8 | from itertools import product # Preceeding comment # noqa: INVALID789 +9 | # Succeeding comment +10 | import math # noqa: INVALID000 # Succeeding comment RUF102 [*] Invalid rule code in `# noqa`: INVALID789 --> RUF102.py:8:53 @@ -75,16 +69,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID789 10 | import math # noqa: INVALID000 # Succeeding comment | help: Remove the rule code - -ℹ Safe fix -5 5 | # Valid noqa -6 6 | import sys # noqa: E402 -7 7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 -8 |-from itertools import product # Preceeding comment # noqa: INVALID789 - 8 |+from itertools import product # Preceeding comment -9 9 | # Succeeding comment -10 10 | import math # noqa: INVALID000 # Succeeding comment -11 11 | # Mixed valid and invalid +5 | # Valid noqa +6 | import sys # noqa: E402 +7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 + - from itertools import product # Preceeding comment # noqa: INVALID789 +8 + from itertools import product # Preceeding comment +9 | # Succeeding comment +10 | import math # noqa: INVALID000 # Succeeding comment +11 | # Mixed valid and invalid RUF102 [*] Invalid rule code in `# noqa`: INVALID000 --> RUF102.py:10:13 @@ -97,16 +89,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID000 12 | from typing import List # noqa: F401, INVALID123 | help: Remove the rule code - -ℹ Safe fix -7 7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 -8 8 | from itertools import product # Preceeding comment # noqa: INVALID789 -9 9 | # Succeeding comment -10 |-import math # noqa: INVALID000 # Succeeding comment - 10 |+import math # Succeeding comment -11 11 | # Mixed valid and invalid -12 12 | from typing import List # noqa: F401, INVALID123 -13 13 | # Test for multiple invalid +7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 +8 | from itertools import product # Preceeding comment # noqa: INVALID789 +9 | # Succeeding comment + - import math # noqa: INVALID000 # Succeeding comment +10 + import math # Succeeding comment +11 | # Mixed valid and invalid +12 | from typing import List # noqa: F401, INVALID123 +13 | # Test for multiple invalid RUF102 [*] Invalid rule code in `# noqa`: INVALID123 --> RUF102.py:12:40 @@ -119,16 +109,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123 14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 | help: Remove the rule code - -ℹ Safe fix -9 9 | # Succeeding comment -10 10 | import math # noqa: INVALID000 # Succeeding comment -11 11 | # Mixed valid and invalid -12 |-from typing import List # noqa: F401, INVALID123 - 12 |+from typing import List # noqa: F401 -13 13 | # Test for multiple invalid -14 14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 -15 15 | # Test for preserving valid codes when fixing +9 | # Succeeding comment +10 | import math # noqa: INVALID000 # Succeeding comment +11 | # Mixed valid and invalid + - from typing import List # noqa: F401, INVALID123 +12 + from typing import List # noqa: F401 +13 | # Test for multiple invalid +14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +15 | # Test for preserving valid codes when fixing RUF102 [*] Invalid rule code in `# noqa`: INVALID100 --> RUF102.py:14:46 @@ -141,16 +129,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID100 16 | from itertools import chain # noqa: E402, INVALID300, F401 | help: Remove the rule code - -ℹ Safe fix -11 11 | # Mixed valid and invalid -12 12 | from typing import List # noqa: F401, INVALID123 -13 13 | # Test for multiple invalid -14 |-from collections import defaultdict # noqa: INVALID100, INVALID200, F401 - 14 |+from collections import defaultdict # noqa: INVALID200, F401 -15 15 | # Test for preserving valid codes when fixing -16 16 | from itertools import chain # noqa: E402, INVALID300, F401 -17 17 | # Test for mixed code types +11 | # Mixed valid and invalid +12 | from typing import List # noqa: F401, INVALID123 +13 | # Test for multiple invalid + - from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +14 + from collections import defaultdict # noqa: INVALID200, F401 +15 | # Test for preserving valid codes when fixing +16 | from itertools import chain # noqa: E402, INVALID300, F401 +17 | # Test for mixed code types RUF102 [*] Invalid rule code in `# noqa`: INVALID200 --> RUF102.py:14:58 @@ -163,16 +149,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID200 16 | from itertools import chain # noqa: E402, INVALID300, F401 | help: Remove the rule code - -ℹ Safe fix -11 11 | # Mixed valid and invalid -12 12 | from typing import List # noqa: F401, INVALID123 -13 13 | # Test for multiple invalid -14 |-from collections import defaultdict # noqa: INVALID100, INVALID200, F401 - 14 |+from collections import defaultdict # noqa: INVALID100, F401 -15 15 | # Test for preserving valid codes when fixing -16 16 | from itertools import chain # noqa: E402, INVALID300, F401 -17 17 | # Test for mixed code types +11 | # Mixed valid and invalid +12 | from typing import List # noqa: F401, INVALID123 +13 | # Test for multiple invalid + - from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +14 + from collections import defaultdict # noqa: INVALID100, F401 +15 | # Test for preserving valid codes when fixing +16 | from itertools import chain # noqa: E402, INVALID300, F401 +17 | # Test for mixed code types RUF102 [*] Invalid rule code in `# noqa`: INVALID300 --> RUF102.py:16:44 @@ -185,15 +169,13 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID300 18 | import json # noqa: E402, INVALID400, V100 | help: Remove the rule code - -ℹ Safe fix -13 13 | # Test for multiple invalid -14 14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 -15 15 | # Test for preserving valid codes when fixing -16 |-from itertools import chain # noqa: E402, INVALID300, F401 - 16 |+from itertools import chain # noqa: E402, F401 -17 17 | # Test for mixed code types -18 18 | import json # noqa: E402, INVALID400, V100 +13 | # Test for multiple invalid +14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +15 | # Test for preserving valid codes when fixing + - from itertools import chain # noqa: E402, INVALID300, F401 +16 + from itertools import chain # noqa: E402, F401 +17 | # Test for mixed code types +18 | import json # noqa: E402, INVALID400, V100 RUF102 [*] Invalid rule code in `# noqa`: INVALID400 --> RUF102.py:18:28 @@ -204,13 +186,11 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID400 | ^^^^^^^^^^ | help: Remove the rule code - -ℹ Safe fix -15 15 | # Test for preserving valid codes when fixing -16 16 | from itertools import chain # noqa: E402, INVALID300, F401 -17 17 | # Test for mixed code types -18 |-import json # noqa: E402, INVALID400, V100 - 18 |+import json # noqa: E402, V100 +15 | # Test for preserving valid codes when fixing +16 | from itertools import chain # noqa: E402, INVALID300, F401 +17 | # Test for mixed code types + - import json # noqa: E402, INVALID400, V100 +18 + import json # noqa: E402, V100 RUF102 [*] Invalid rule code in `# noqa`: V100 --> RUF102.py:18:40 @@ -221,10 +201,8 @@ RUF102 [*] Invalid rule code in `# noqa`: V100 | ^^^^ | help: Remove the rule code - -ℹ Safe fix -15 15 | # Test for preserving valid codes when fixing -16 16 | from itertools import chain # noqa: E402, INVALID300, F401 -17 17 | # Test for mixed code types -18 |-import json # noqa: E402, INVALID400, V100 - 18 |+import json # noqa: E402, INVALID400 +15 | # Test for preserving valid codes when fixing +16 | from itertools import chain # noqa: E402, INVALID300, F401 +17 | # Test for mixed code types + - import json # noqa: E402, INVALID400, V100 +18 + import json # noqa: E402, INVALID400 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap index 08859675d6..88a6a8f794 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_0.py.snap @@ -9,21 +9,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 21 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -17 18 | pass -18 19 | -19 20 | -20 |-def f(arg: int = None): # RUF013 - 21 |+def f(arg: int | None = None): # RUF013 -21 22 | pass -22 23 | -23 24 | +18 | pass +19 | +20 | + - def f(arg: int = None): # RUF013 +21 + def f(arg: int | None = None): # RUF013 +22 | pass +23 | +24 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:24:12 @@ -33,21 +32,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 25 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -21 22 | pass -22 23 | -23 24 | -24 |-def f(arg: str = None): # RUF013 - 25 |+def f(arg: str | None = None): # RUF013 -25 26 | pass -26 27 | -27 28 | +22 | pass +23 | +24 | + - def f(arg: str = None): # RUF013 +25 + def f(arg: str | None = None): # RUF013 +26 | pass +27 | +28 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:28:12 @@ -57,21 +55,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 29 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -25 26 | pass -26 27 | -27 28 | -28 |-def f(arg: Tuple[str] = None): # RUF013 - 29 |+def f(arg: Tuple[str] | None = None): # RUF013 -29 30 | pass -30 31 | -31 32 | +26 | pass +27 | +28 | + - def f(arg: Tuple[str] = None): # RUF013 +29 + def f(arg: Tuple[str] | None = None): # RUF013 +30 | pass +31 | +32 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:58:12 @@ -81,21 +78,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 59 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -55 56 | pass -56 57 | -57 58 | -58 |-def f(arg: Union = None): # RUF013 - 59 |+def f(arg: Union | None = None): # RUF013 -59 60 | pass -60 61 | -61 62 | +56 | pass +57 | +58 | + - def f(arg: Union = None): # RUF013 +59 + def f(arg: Union | None = None): # RUF013 +60 | pass +61 | +62 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:62:12 @@ -105,21 +101,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 63 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -59 60 | pass -60 61 | -61 62 | -62 |-def f(arg: Union[int] = None): # RUF013 - 63 |+def f(arg: Union[int] | None = None): # RUF013 -63 64 | pass -64 65 | -65 66 | +60 | pass +61 | +62 | + - def f(arg: Union[int] = None): # RUF013 +63 + def f(arg: Union[int] | None = None): # RUF013 +64 | pass +65 | +66 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:66:12 @@ -129,21 +124,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 67 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -63 64 | pass -64 65 | -65 66 | -66 |-def f(arg: Union[int, str] = None): # RUF013 - 67 |+def f(arg: Union[int, str] | None = None): # RUF013 -67 68 | pass -68 69 | -69 70 | +64 | pass +65 | +66 | + - def f(arg: Union[int, str] = None): # RUF013 +67 + def f(arg: Union[int, str] | None = None): # RUF013 +68 | pass +69 | +70 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:85:12 @@ -153,21 +147,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 86 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -82 83 | pass -83 84 | -84 85 | -85 |-def f(arg: int | float = None): # RUF013 - 86 |+def f(arg: int | float | None = None): # RUF013 -86 87 | pass -87 88 | -88 89 | +83 | pass +84 | +85 | + - def f(arg: int | float = None): # RUF013 +86 + def f(arg: int | float | None = None): # RUF013 +87 | pass +88 | +89 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:89:12 @@ -177,21 +170,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 90 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -86 87 | pass -87 88 | -88 89 | -89 |-def f(arg: int | float | str | bytes = None): # RUF013 - 90 |+def f(arg: int | float | str | bytes | None = None): # RUF013 -90 91 | pass -91 92 | -92 93 | +87 | pass +88 | +89 | + - def f(arg: int | float | str | bytes = None): # RUF013 +90 + def f(arg: int | float | str | bytes | None = None): # RUF013 +91 | pass +92 | +93 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:108:12 @@ -201,21 +193,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 109 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -105 106 | pass -106 107 | -107 108 | -108 |-def f(arg: Literal[1] = None): # RUF013 - 109 |+def f(arg: Literal[1] | None = None): # RUF013 -109 110 | pass -110 111 | -111 112 | +106 | pass +107 | +108 | + - def f(arg: Literal[1] = None): # RUF013 +109 + def f(arg: Literal[1] | None = None): # RUF013 +110 | pass +111 | +112 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:112:12 @@ -225,21 +216,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 113 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -109 110 | pass -110 111 | -111 112 | -112 |-def f(arg: Literal[1, "foo"] = None): # RUF013 - 113 |+def f(arg: Literal[1, "foo"] | None = None): # RUF013 -113 114 | pass -114 115 | -115 116 | +110 | pass +111 | +112 | + - def f(arg: Literal[1, "foo"] = None): # RUF013 +113 + def f(arg: Literal[1, "foo"] | None = None): # RUF013 +114 | pass +115 | +116 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:131:22 @@ -249,21 +239,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 132 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -128 129 | pass -129 130 | -130 131 | -131 |-def f(arg: Annotated[int, ...] = None): # RUF013 - 132 |+def f(arg: Annotated[int | None, ...] = None): # RUF013 -132 133 | pass -133 134 | -134 135 | +129 | pass +130 | +131 | + - def f(arg: Annotated[int, ...] = None): # RUF013 +132 + def f(arg: Annotated[int | None, ...] = None): # RUF013 +133 | pass +134 | +135 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:135:32 @@ -273,21 +262,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 136 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -132 133 | pass -133 134 | -134 135 | -135 |-def f(arg: Annotated[Annotated[int | str, ...], ...] = None): # RUF013 - 136 |+def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None): # RUF013 -136 137 | pass -137 138 | -138 139 | +133 | pass +134 | +135 | + - def f(arg: Annotated[Annotated[int | str, ...], ...] = None): # RUF013 +136 + def f(arg: Annotated[Annotated[int | str | None, ...], ...] = None): # RUF013 +137 | pass +138 | +139 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:151:11 @@ -299,21 +287,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 153 | arg3: Literal[1, 2, 3] = None, # RUF013 | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -148 149 | -149 150 | -150 151 | def f( -151 |- arg1: int = None, # RUF013 - 152 |+ arg1: int | None = None, # RUF013 -152 153 | arg2: Union[int, float] = None, # RUF013 -153 154 | arg3: Literal[1, 2, 3] = None, # RUF013 -154 155 | ): +149 | +150 | +151 | def f( + - arg1: int = None, # RUF013 +152 + arg1: int | None = None, # RUF013 +153 | arg2: Union[int, float] = None, # RUF013 +154 | arg3: Literal[1, 2, 3] = None, # RUF013 +155 | ): +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:152:11 @@ -326,21 +313,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 154 | ): | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -149 150 | -150 151 | def f( -151 152 | arg1: int = None, # RUF013 -152 |- arg2: Union[int, float] = None, # RUF013 - 153 |+ arg2: Union[int, float] | None = None, # RUF013 -153 154 | arg3: Literal[1, 2, 3] = None, # RUF013 -154 155 | ): -155 156 | pass +150 | +151 | def f( +152 | arg1: int = None, # RUF013 + - arg2: Union[int, float] = None, # RUF013 +153 + arg2: Union[int, float] | None = None, # RUF013 +154 | arg3: Literal[1, 2, 3] = None, # RUF013 +155 | ): +156 | pass +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:153:11 @@ -353,21 +339,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 155 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -150 151 | def f( -151 152 | arg1: int = None, # RUF013 -152 153 | arg2: Union[int, float] = None, # RUF013 -153 |- arg3: Literal[1, 2, 3] = None, # RUF013 - 154 |+ arg3: Literal[1, 2, 3] | None = None, # RUF013 -154 155 | ): -155 156 | pass -156 157 | +151 | def f( +152 | arg1: int = None, # RUF013 +153 | arg2: Union[int, float] = None, # RUF013 + - arg3: Literal[1, 2, 3] = None, # RUF013 +154 + arg3: Literal[1, 2, 3] | None = None, # RUF013 +155 | ): +156 | pass +157 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:181:12 @@ -377,21 +362,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 182 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -178 179 | pass -179 180 | -180 181 | -181 |-def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None): # RUF013 - 182 |+def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None): # RUF013 -182 183 | pass -183 184 | -184 185 | +179 | pass +180 | +181 | + - def f(arg: Union[Annotated[int, ...], Union[str, bytes]] = None): # RUF013 +182 + def f(arg: Union[Annotated[int, ...], Union[str, bytes]] | None = None): # RUF013 +183 | pass +184 | +185 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:188:13 @@ -401,16 +385,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 189 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -185 185 | # Quoted -186 186 | -187 187 | -188 |-def f(arg: "int" = None): # RUF013 - 188 |+def f(arg: "Optional[int]" = None): # RUF013 -189 189 | pass -190 190 | -191 191 | +185 | # Quoted +186 | +187 | + - def f(arg: "int" = None): # RUF013 +188 + def f(arg: "Optional[int]" = None): # RUF013 +189 | pass +190 | +191 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_0.py:192:13 @@ -420,16 +403,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 193 | pass | help: Convert to `Optional[T]` - -ℹ Unsafe fix -189 189 | pass -190 190 | -191 191 | -192 |-def f(arg: "str" = None): # RUF013 - 192 |+def f(arg: "Optional[str]" = None): # RUF013 -193 193 | pass -194 194 | -195 195 | +189 | pass +190 | +191 | + - def f(arg: "str" = None): # RUF013 +192 + def f(arg: "Optional[str]" = None): # RUF013 +193 | pass +194 | +195 | +note: This is an unsafe fix and may change runtime behavior RUF013 PEP 484 prohibits implicit `Optional` --> RUF013_0.py:196:12 @@ -448,18 +430,17 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 205 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable -2 3 | -3 4 | +1 + from __future__ import annotations +2 | from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable +3 | +4 | -------------------------------------------------------------------------------- -201 202 | pass -202 203 | -203 204 | -204 |-def f(arg: Union["int", "str"] = None): # RUF013 - 205 |+def f(arg: Union["int", "str"] | None = None): # RUF013 -205 206 | pass -206 207 | -207 208 | +202 | pass +203 | +204 | + - def f(arg: Union["int", "str"] = None): # RUF013 +205 + def f(arg: Union["int", "str"] | None = None): # RUF013 +206 | pass +207 | +208 | +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap index 753c4d86f3..dfcdf2c124 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_1.py.snap @@ -9,12 +9,11 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 5 | pass | help: Convert to `T | None` - -ℹ Unsafe fix -1 1 | # No `typing.Optional` import - 2 |+from __future__ import annotations -2 3 | -3 4 | -4 |-def f(arg: int = None): # RUF013 - 5 |+def f(arg: int | None = None): # RUF013 -5 6 | pass +1 | # No `typing.Optional` import +2 + from __future__ import annotations +3 | +4 | + - def f(arg: int = None): # RUF013 +5 + def f(arg: int | None = None): # RUF013 +6 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap index f02a76cb38..fc6c5e2f3e 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_3.py.snap @@ -9,17 +9,16 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 5 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | import typing -2 3 | -3 4 | -4 |-def f(arg: typing.List[str] = None): # RUF013 - 5 |+def f(arg: typing.List[str] | None = None): # RUF013 -5 6 | pass -6 7 | -7 8 | +1 + from __future__ import annotations +2 | import typing +3 | +4 | + - def f(arg: typing.List[str] = None): # RUF013 +5 + def f(arg: typing.List[str] | None = None): # RUF013 +6 | pass +7 | +8 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_3.py:22:12 @@ -29,21 +28,20 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 23 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | import typing -2 3 | -3 4 | +1 + from __future__ import annotations +2 | import typing +3 | +4 | -------------------------------------------------------------------------------- -19 20 | pass -20 21 | -21 22 | -22 |-def f(arg: typing.Union[int, str] = None): # RUF013 - 23 |+def f(arg: typing.Union[int, str] | None = None): # RUF013 -23 24 | pass -24 25 | -25 26 | +20 | pass +21 | +22 | + - def f(arg: typing.Union[int, str] = None): # RUF013 +23 + def f(arg: typing.Union[int, str] | None = None): # RUF013 +24 | pass +25 | +26 | +note: This is an unsafe fix and may change runtime behavior RUF013 [*] PEP 484 prohibits implicit `Optional` --> RUF013_3.py:29:12 @@ -53,16 +51,15 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` 30 | pass | help: Convert to `T | None` - -ℹ Unsafe fix - 1 |+from __future__ import annotations -1 2 | import typing -2 3 | -3 4 | +1 + from __future__ import annotations +2 | import typing +3 | +4 | -------------------------------------------------------------------------------- -26 27 | # Literal -27 28 | -28 29 | -29 |-def f(arg: typing.Literal[1, "foo", True] = None): # RUF013 - 30 |+def f(arg: typing.Literal[1, "foo", True] | None = None): # RUF013 -30 31 | pass +27 | # Literal +28 | +29 | + - def f(arg: typing.Literal[1, "foo", True] = None): # RUF013 +30 + def f(arg: typing.Literal[1, "foo", True] | None = None): # RUF013 +31 | pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap index f9bcd454d3..d1a4078a12 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__add_future_import_RUF013_4.py.snap @@ -8,19 +8,18 @@ RUF013 [*] PEP 484 prohibits implicit `Optional` | ^^^ | help: Convert to `T | None` - -ℹ Unsafe fix -1 1 | # https://github.com/astral-sh/ruff/issues/13833 - 2 |+from __future__ import annotations -2 3 | -3 4 | from typing import Optional -4 5 | +1 | # https://github.com/astral-sh/ruff/issues/13833 +2 + from __future__ import annotations +3 | +4 | from typing import Optional +5 | -------------------------------------------------------------------------------- -12 13 | def multiple_1(arg1: Optional, arg2: Optional = None): ... -13 14 | -14 15 | -15 |-def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ... - 16 |+def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ... -16 17 | -17 18 | -18 19 | def return_type(arg: Optional = None) -> Optional: ... +13 | def multiple_1(arg1: Optional, arg2: Optional = None): ... +14 | +15 | + - def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int = None): ... +16 + def multiple_2(arg1: Optional, arg2: Optional = None, arg3: int | None = None): ... +17 | +18 | +19 | def return_type(arg: Optional = None) -> Optional: ... +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap index 9c7eaadd88..d6c759ad67 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__custom_dummy_var_regexp_preset__RUF052_RUF052.py_1.snap @@ -11,18 +11,17 @@ RUF052 [*] Local dummy variable `_var` is accessed 93 | return _var | help: Remove leading underscores - -ℹ Unsafe fix -89 89 | -90 90 | class Class_: -91 91 | def fun(self): -92 |- _var = "method variable" # [RUF052] -93 |- return _var - 92 |+ var = "method variable" # [RUF052] - 93 |+ return var -94 94 | -95 95 | def fun(_var): # parameters are ignored -96 96 | return _var +89 | +90 | class Class_: +91 | def fun(self): + - _var = "method variable" # [RUF052] + - return _var +92 + var = "method variable" # [RUF052] +93 + return var +94 | +95 | def fun(_var): # parameters are ignored +96 | return _var +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_list` is accessed --> RUF052.py:99:5 @@ -33,18 +32,17 @@ RUF052 [*] Local dummy variable `_list` is accessed 100 | return _list | help: Prefer using trailing underscores to avoid shadowing a built-in - -ℹ Unsafe fix -96 96 | return _var -97 97 | -98 98 | def fun(): -99 |- _list = "built-in" # [RUF052] -100 |- return _list - 99 |+ list_ = "built-in" # [RUF052] - 100 |+ return list_ -101 101 | -102 102 | x = "global" -103 103 | +96 | return _var +97 | +98 | def fun(): + - _list = "built-in" # [RUF052] + - return _list +99 + list_ = "built-in" # [RUF052] +100 + return list_ +101 | +102 | x = "global" +103 | +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_x` is accessed --> RUF052.py:106:5 @@ -56,18 +54,17 @@ RUF052 [*] Local dummy variable `_x` is accessed 107 | return _x | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -103 103 | -104 104 | def fun(): -105 105 | global x -106 |- _x = "shadows global" # [RUF052] -107 |- return _x - 106 |+ x_ = "shadows global" # [RUF052] - 107 |+ return x_ -108 108 | -109 109 | def foo(): -110 110 | x = "outer" +103 | +104 | def fun(): +105 | global x + - _x = "shadows global" # [RUF052] + - return _x +106 + x_ = "shadows global" # [RUF052] +107 + return x_ +108 | +109 | def foo(): +110 | x = "outer" +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_x` is accessed --> RUF052.py:113:5 @@ -80,18 +77,17 @@ RUF052 [*] Local dummy variable `_x` is accessed 115 | bar() | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -110 110 | x = "outer" -111 111 | def bar(): -112 112 | nonlocal x -113 |- _x = "shadows nonlocal" # [RUF052] -114 |- return _x - 113 |+ x_ = "shadows nonlocal" # [RUF052] - 114 |+ return x_ -115 115 | bar() -116 116 | return x -117 117 | +110 | x = "outer" +111 | def bar(): +112 | nonlocal x + - _x = "shadows nonlocal" # [RUF052] + - return _x +113 + x_ = "shadows nonlocal" # [RUF052] +114 + return x_ +115 | bar() +116 | return x +117 | +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_x` is accessed --> RUF052.py:120:5 @@ -103,18 +99,17 @@ RUF052 [*] Local dummy variable `_x` is accessed 121 | return _x | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -117 117 | -118 118 | def fun(): -119 119 | x = "local" -120 |- _x = "shadows local" # [RUF052] -121 |- return _x - 120 |+ x_ = "shadows local" # [RUF052] - 121 |+ return x_ -122 122 | -123 123 | -124 124 | GLOBAL_1 = "global 1" +117 | +118 | def fun(): +119 | x = "local" + - _x = "shadows local" # [RUF052] + - return _x +120 + x_ = "shadows local" # [RUF052] +121 + return x_ +122 | +123 | +124 | GLOBAL_1 = "global 1" +note: This is an unsafe fix and may change runtime behavior RUF052 Local dummy variable `_GLOBAL_1` is accessed --> RUF052.py:128:5 @@ -169,25 +164,24 @@ RUF052 [*] Local dummy variable `_P` is accessed 155 | _NT = NamedTuple("_NT", [("foo", int)]) | help: Remove leading underscores - -ℹ Unsafe fix -150 150 | from enum import Enum -151 151 | from collections import namedtuple -152 152 | -153 |- _P = ParamSpec("_P") - 153 |+ P = ParamSpec("P") -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) +150 | from enum import Enum +151 | from collections import namedtuple +152 | + - _P = ParamSpec("_P") +153 + P = ParamSpec("P") +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) -------------------------------------------------------------------------------- -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_T` is accessed --> RUF052.py:154:5 @@ -199,25 +193,24 @@ RUF052 [*] Local dummy variable `_T` is accessed 156 | _E = Enum("_E", ["a", "b", "c"]) | help: Remove leading underscores - -ℹ Unsafe fix -151 151 | from collections import namedtuple -152 152 | -153 153 | _P = ParamSpec("_P") -154 |- _T = TypeVar(name="_T", covariant=True, bound=int|str) - 154 |+ T = TypeVar(name="T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +151 | from collections import namedtuple +152 | +153 | _P = ParamSpec("_P") + - _T = TypeVar(name="_T", covariant=True, bound=int|str) +154 + T = TypeVar(name="T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -------------------------------------------------------------------------------- -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NT` is accessed --> RUF052.py:155:5 @@ -230,24 +223,23 @@ RUF052 [*] Local dummy variable `_NT` is accessed 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) | help: Remove leading underscores - -ℹ Unsafe fix -152 152 | -153 153 | _P = ParamSpec("_P") -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 |- _NT = NamedTuple("_NT", [("foo", int)]) - 155 |+ NT = NamedTuple("NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +152 | +153 | _P = ParamSpec("_P") +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) + - _NT = NamedTuple("_NT", [("foo", int)]) +155 + NT = NamedTuple("NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_E` is accessed --> RUF052.py:156:5 @@ -260,23 +252,22 @@ RUF052 [*] Local dummy variable `_E` is accessed 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) | help: Remove leading underscores - -ℹ Unsafe fix -153 153 | _P = ParamSpec("_P") -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 |- _E = Enum("_E", ["a", "b", "c"]) - 156 |+ E = Enum("E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +153 | _P = ParamSpec("_P") +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) + - _E = Enum("_E", ["a", "b", "c"]) +156 + E = Enum("E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NT2` is accessed --> RUF052.py:157:5 @@ -289,22 +280,21 @@ RUF052 [*] Local dummy variable `_NT2` is accessed 159 | _DynamicClass = type("_DynamicClass", (), {}) | help: Remove leading underscores - -ℹ Unsafe fix -154 154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 |- _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) - 157 |+ NT2 = namedtuple("NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +154 | _T = TypeVar(name="_T", covariant=True, bound=int|str) +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) + - _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +157 + NT2 = namedtuple("NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, NT2, _NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NT3` is accessed --> RUF052.py:158:5 @@ -317,21 +307,20 @@ RUF052 [*] Local dummy variable `_NT3` is accessed 160 | _NotADynamicClass = type("_NotADynamicClass") | help: Remove leading underscores - -ℹ Unsafe fix -155 155 | _NT = NamedTuple("_NT", [("foo", int)]) -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 |- _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) - 158 |+ NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +155 | _NT = NamedTuple("_NT", [("foo", int)]) +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) + - _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +158 + NT3 = namedtuple(typename="NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, _NT2, NT3, _DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_DynamicClass` is accessed --> RUF052.py:159:5 @@ -343,20 +332,19 @@ RUF052 [*] Local dummy variable `_DynamicClass` is accessed 160 | _NotADynamicClass = type("_NotADynamicClass") | help: Remove leading underscores - -ℹ Unsafe fix -156 156 | _E = Enum("_E", ["a", "b", "c"]) -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 |- _DynamicClass = type("_DynamicClass", (), {}) - 159 |+ DynamicClass = type("DynamicClass", (), {}) -160 160 | _NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +156 | _E = Enum("_E", ["a", "b", "c"]) +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) + - _DynamicClass = type("_DynamicClass", (), {}) +159 + DynamicClass = type("DynamicClass", (), {}) +160 | _NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, _NT2, _NT3, DynamicClass, _NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed --> RUF052.py:160:5 @@ -369,19 +357,18 @@ RUF052 [*] Local dummy variable `_NotADynamicClass` is accessed 162 | print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) | help: Remove leading underscores - -ℹ Unsafe fix -157 157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) -158 158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) -159 159 | _DynamicClass = type("_DynamicClass", (), {}) -160 |- _NotADynamicClass = type("_NotADynamicClass") - 160 |+ NotADynamicClass = type("_NotADynamicClass") -161 161 | -162 |- print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) - 162 |+ print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass) -163 163 | -164 164 | # Do not emit diagnostic if parameter is private -165 165 | # even if it is later shadowed in the body of the function +157 | _NT2 = namedtuple("_NT2", ['x', 'y', 'z']) +158 | _NT3 = namedtuple(typename="_NT3", field_names=['x', 'y', 'z']) +159 | _DynamicClass = type("_DynamicClass", (), {}) + - _NotADynamicClass = type("_NotADynamicClass") +160 + NotADynamicClass = type("_NotADynamicClass") +161 | + - print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, _NotADynamicClass) +162 + print(_T, _P, _NT, _E, _NT2, _NT3, _DynamicClass, NotADynamicClass) +163 | +164 | # Do not emit diagnostic if parameter is private +165 | # even if it is later shadowed in the body of the function +note: This is an unsafe fix and may change runtime behavior RUF052 [*] Local dummy variable `_dummy_var` is accessed --> RUF052.py:182:5 @@ -393,21 +380,20 @@ RUF052 [*] Local dummy variable `_dummy_var` is accessed 184 | def bar(): | help: Prefer using trailing underscores to avoid shadowing a variable - -ℹ Unsafe fix -179 179 | -180 180 | -181 181 | def foo(): -182 |- _dummy_var = 42 - 182 |+ dummy_var_ = 42 -183 183 | -184 184 | def bar(): -185 185 | dummy_var = 43 -186 |- print(_dummy_var) - 186 |+ print(dummy_var_) -187 187 | -188 188 | -189 189 | def foo(): +179 | +180 | +181 | def foo(): + - _dummy_var = 42 +182 + dummy_var_ = 42 +183 | +184 | def bar(): +185 | dummy_var = 43 + - print(_dummy_var) +186 + print(dummy_var_) +187 | +188 | +189 | def foo(): +note: This is an unsafe fix and may change runtime behavior RUF052 Local dummy variable `_dummy_var` is accessed --> RUF052.py:192:5 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap index 81f24cd251..4c5525b8fa 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__invalid_rule_code_external_rules.snap @@ -11,14 +11,12 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123 4 | import re # noqa: V123 | help: Remove the rule code - -ℹ Safe fix -1 1 | # Invalid code -2 |-import os # noqa: INVALID123 - 2 |+import os -3 3 | # External code -4 4 | import re # noqa: V123 -5 5 | # Valid noqa +1 | # Invalid code + - import os # noqa: INVALID123 +2 + import os +3 | # External code +4 | import re # noqa: V123 +5 | # Valid noqa RUF102 [*] Invalid rule code in `# noqa`: INVALID456 --> RUF102.py:7:65 @@ -31,16 +29,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID456 9 | # Succeeding comment | help: Remove the rule code - -ℹ Safe fix -4 4 | import re # noqa: V123 -5 5 | # Valid noqa -6 6 | import sys # noqa: E402 -7 |-from functools import cache # Preceeding comment # noqa: F401, INVALID456 - 7 |+from functools import cache # Preceeding comment # noqa: F401 -8 8 | from itertools import product # Preceeding comment # noqa: INVALID789 -9 9 | # Succeeding comment -10 10 | import math # noqa: INVALID000 # Succeeding comment +4 | import re # noqa: V123 +5 | # Valid noqa +6 | import sys # noqa: E402 + - from functools import cache # Preceeding comment # noqa: F401, INVALID456 +7 + from functools import cache # Preceeding comment # noqa: F401 +8 | from itertools import product # Preceeding comment # noqa: INVALID789 +9 | # Succeeding comment +10 | import math # noqa: INVALID000 # Succeeding comment RUF102 [*] Invalid rule code in `# noqa`: INVALID789 --> RUF102.py:8:53 @@ -53,16 +49,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID789 10 | import math # noqa: INVALID000 # Succeeding comment | help: Remove the rule code - -ℹ Safe fix -5 5 | # Valid noqa -6 6 | import sys # noqa: E402 -7 7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 -8 |-from itertools import product # Preceeding comment # noqa: INVALID789 - 8 |+from itertools import product # Preceeding comment -9 9 | # Succeeding comment -10 10 | import math # noqa: INVALID000 # Succeeding comment -11 11 | # Mixed valid and invalid +5 | # Valid noqa +6 | import sys # noqa: E402 +7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 + - from itertools import product # Preceeding comment # noqa: INVALID789 +8 + from itertools import product # Preceeding comment +9 | # Succeeding comment +10 | import math # noqa: INVALID000 # Succeeding comment +11 | # Mixed valid and invalid RUF102 [*] Invalid rule code in `# noqa`: INVALID000 --> RUF102.py:10:13 @@ -75,16 +69,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID000 12 | from typing import List # noqa: F401, INVALID123 | help: Remove the rule code - -ℹ Safe fix -7 7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 -8 8 | from itertools import product # Preceeding comment # noqa: INVALID789 -9 9 | # Succeeding comment -10 |-import math # noqa: INVALID000 # Succeeding comment - 10 |+import math # Succeeding comment -11 11 | # Mixed valid and invalid -12 12 | from typing import List # noqa: F401, INVALID123 -13 13 | # Test for multiple invalid +7 | from functools import cache # Preceeding comment # noqa: F401, INVALID456 +8 | from itertools import product # Preceeding comment # noqa: INVALID789 +9 | # Succeeding comment + - import math # noqa: INVALID000 # Succeeding comment +10 + import math # Succeeding comment +11 | # Mixed valid and invalid +12 | from typing import List # noqa: F401, INVALID123 +13 | # Test for multiple invalid RUF102 [*] Invalid rule code in `# noqa`: INVALID123 --> RUF102.py:12:40 @@ -97,16 +89,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID123 14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 | help: Remove the rule code - -ℹ Safe fix -9 9 | # Succeeding comment -10 10 | import math # noqa: INVALID000 # Succeeding comment -11 11 | # Mixed valid and invalid -12 |-from typing import List # noqa: F401, INVALID123 - 12 |+from typing import List # noqa: F401 -13 13 | # Test for multiple invalid -14 14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 -15 15 | # Test for preserving valid codes when fixing +9 | # Succeeding comment +10 | import math # noqa: INVALID000 # Succeeding comment +11 | # Mixed valid and invalid + - from typing import List # noqa: F401, INVALID123 +12 + from typing import List # noqa: F401 +13 | # Test for multiple invalid +14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +15 | # Test for preserving valid codes when fixing RUF102 [*] Invalid rule code in `# noqa`: INVALID100 --> RUF102.py:14:46 @@ -119,16 +109,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID100 16 | from itertools import chain # noqa: E402, INVALID300, F401 | help: Remove the rule code - -ℹ Safe fix -11 11 | # Mixed valid and invalid -12 12 | from typing import List # noqa: F401, INVALID123 -13 13 | # Test for multiple invalid -14 |-from collections import defaultdict # noqa: INVALID100, INVALID200, F401 - 14 |+from collections import defaultdict # noqa: INVALID200, F401 -15 15 | # Test for preserving valid codes when fixing -16 16 | from itertools import chain # noqa: E402, INVALID300, F401 -17 17 | # Test for mixed code types +11 | # Mixed valid and invalid +12 | from typing import List # noqa: F401, INVALID123 +13 | # Test for multiple invalid + - from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +14 + from collections import defaultdict # noqa: INVALID200, F401 +15 | # Test for preserving valid codes when fixing +16 | from itertools import chain # noqa: E402, INVALID300, F401 +17 | # Test for mixed code types RUF102 [*] Invalid rule code in `# noqa`: INVALID200 --> RUF102.py:14:58 @@ -141,16 +129,14 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID200 16 | from itertools import chain # noqa: E402, INVALID300, F401 | help: Remove the rule code - -ℹ Safe fix -11 11 | # Mixed valid and invalid -12 12 | from typing import List # noqa: F401, INVALID123 -13 13 | # Test for multiple invalid -14 |-from collections import defaultdict # noqa: INVALID100, INVALID200, F401 - 14 |+from collections import defaultdict # noqa: INVALID100, F401 -15 15 | # Test for preserving valid codes when fixing -16 16 | from itertools import chain # noqa: E402, INVALID300, F401 -17 17 | # Test for mixed code types +11 | # Mixed valid and invalid +12 | from typing import List # noqa: F401, INVALID123 +13 | # Test for multiple invalid + - from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +14 + from collections import defaultdict # noqa: INVALID100, F401 +15 | # Test for preserving valid codes when fixing +16 | from itertools import chain # noqa: E402, INVALID300, F401 +17 | # Test for mixed code types RUF102 [*] Invalid rule code in `# noqa`: INVALID300 --> RUF102.py:16:44 @@ -163,15 +149,13 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID300 18 | import json # noqa: E402, INVALID400, V100 | help: Remove the rule code - -ℹ Safe fix -13 13 | # Test for multiple invalid -14 14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 -15 15 | # Test for preserving valid codes when fixing -16 |-from itertools import chain # noqa: E402, INVALID300, F401 - 16 |+from itertools import chain # noqa: E402, F401 -17 17 | # Test for mixed code types -18 18 | import json # noqa: E402, INVALID400, V100 +13 | # Test for multiple invalid +14 | from collections import defaultdict # noqa: INVALID100, INVALID200, F401 +15 | # Test for preserving valid codes when fixing + - from itertools import chain # noqa: E402, INVALID300, F401 +16 + from itertools import chain # noqa: E402, F401 +17 | # Test for mixed code types +18 | import json # noqa: E402, INVALID400, V100 RUF102 [*] Invalid rule code in `# noqa`: INVALID400 --> RUF102.py:18:28 @@ -182,10 +166,8 @@ RUF102 [*] Invalid rule code in `# noqa`: INVALID400 | ^^^^^^^^^^ | help: Remove the rule code - -ℹ Safe fix -15 15 | # Test for preserving valid codes when fixing -16 16 | from itertools import chain # noqa: E402, INVALID300, F401 -17 17 | # Test for mixed code types -18 |-import json # noqa: E402, INVALID400, V100 - 18 |+import json # noqa: E402, V100 +15 | # Test for preserving valid codes when fixing +16 | from itertools import chain # noqa: E402, INVALID300, F401 +17 | # Test for mixed code types + - import json # noqa: E402, INVALID400, V100 +18 + import json # noqa: E402, V100 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap index df2659be72..f26f83731b 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__no_remove_parentheses_starred_expr_py310.snap @@ -11,14 +11,12 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 4 | 1, | help: Remove parentheses - -ℹ Safe fix -1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} -2 |-d[(1,2)] - 2 |+d[1,2] -3 3 | d[( -4 4 | 1, -5 5 | 2 +1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} + - d[(1,2)] +2 + d[1,2] +3 | d[( +4 | 1, +5 | 2 RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:3:3 @@ -35,19 +33,17 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 8 | 1, | help: Remove parentheses - -ℹ Safe fix -1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} -2 2 | d[(1,2)] -3 |-d[( - 3 |+d[ -4 4 | 1, -5 5 | 2 -6 |-)] - 6 |+] -7 7 | d[ -8 8 | 1, -9 9 | 2 +1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"} +2 | d[(1,2)] + - d[( +3 + d[ +4 | 1, +5 | 2 + - )] +6 + ] +7 | d[ +8 | 1, +9 | 2 RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:11:3 @@ -60,16 +56,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 13 | d[(8,)] | help: Remove parentheses - -ℹ Safe fix -8 8 | 1, -9 9 | 2 -10 10 | ] -11 |-d[(2,4)] - 11 |+d[2,4] -12 12 | d[(5,6,7)] -13 13 | d[(8,)] -14 14 | d[tuple(1,2)] +8 | 1, +9 | 2 +10 | ] + - d[(2,4)] +11 + d[2,4] +12 | d[(5,6,7)] +13 | d[(8,)] +14 | d[tuple(1,2)] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:12:3 @@ -82,16 +76,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 14 | d[tuple(1,2)] | help: Remove parentheses - -ℹ Safe fix -9 9 | 2 -10 10 | ] -11 11 | d[(2,4)] -12 |-d[(5,6,7)] - 12 |+d[5,6,7] -13 13 | d[(8,)] -14 14 | d[tuple(1,2)] -15 15 | d[tuple(8)] +9 | 2 +10 | ] +11 | d[(2,4)] + - d[(5,6,7)] +12 + d[5,6,7] +13 | d[(8,)] +14 | d[tuple(1,2)] +15 | d[tuple(8)] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:13:3 @@ -104,16 +96,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 15 | d[tuple(8)] | help: Remove parentheses - -ℹ Safe fix -10 10 | ] -11 11 | d[(2,4)] -12 12 | d[(5,6,7)] -13 |-d[(8,)] - 13 |+d[8,] -14 14 | d[tuple(1,2)] -15 15 | d[tuple(8)] -16 16 | d[1,2] +10 | ] +11 | d[(2,4)] +12 | d[(5,6,7)] + - d[(8,)] +13 + d[8,] +14 | d[tuple(1,2)] +15 | d[tuple(8)] +16 | d[1,2] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:20:3 @@ -125,17 +115,15 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 21 | e[(1,2),(3,4)] | help: Remove parentheses - -ℹ Safe fix -17 17 | d[3,4] -18 18 | d[5,6,7] -19 19 | e = {((1,2),(3,4)):"a"} -20 |-e[((1,2),(3,4))] -21 20 | e[(1,2),(3,4)] - 21 |+e[(1,2),(3,4)] -22 22 | -23 23 | token_features[ -24 24 | (window_position, feature_name) +17 | d[3,4] +18 | d[5,6,7] +19 | e = {((1,2),(3,4)):"a"} + - e[((1,2),(3,4))] +20 | e[(1,2),(3,4)] +21 + e[(1,2),(3,4)] +22 | +23 | token_features[ +24 | (window_position, feature_name) RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:24:5 @@ -146,16 +134,14 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 25 | ] = self._extract_raw_features_from_token | help: Remove parentheses - -ℹ Safe fix -21 21 | e[(1,2),(3,4)] -22 22 | -23 23 | token_features[ -24 |- (window_position, feature_name) - 24 |+ window_position, feature_name -25 25 | ] = self._extract_raw_features_from_token -26 26 | -27 27 | d[1,] +21 | e[(1,2),(3,4)] +22 | +23 | token_features[ + - (window_position, feature_name) +24 + window_position, feature_name +25 | ] = self._extract_raw_features_from_token +26 | +27 | d[1,] RUF031 [*] Avoid parentheses for tuples in subscripts --> RUF031.py:28:3 @@ -167,13 +153,11 @@ RUF031 [*] Avoid parentheses for tuples in subscripts 30 | d[:,] # slices in the subscript lead to syntax error if parens are added | help: Remove parentheses - -ℹ Safe fix -25 25 | ] = self._extract_raw_features_from_token -26 26 | -27 27 | d[1,] -28 |-d[(1,)] - 28 |+d[1,] -29 29 | d[()] # empty tuples should be ignored -30 30 | d[:,] # slices in the subscript lead to syntax error if parens are added -31 31 | d[1,2,:] +25 | ] = self._extract_raw_features_from_token +26 | +27 | d[1,] + - d[(1,)] +28 + d[1,] +29 | d[()] # empty tuples should be ignored +30 | d[:,] # slices in the subscript lead to syntax error if parens are added +31 | d[1,2,:] diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap index b3933fe5ce..2c1fd76469 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__noqa.snap @@ -19,10 +19,9 @@ F841 [*] Local variable `I` is assigned to but never used | ^ | help: Remove assignment to unused variable `I` - -ℹ Unsafe fix -21 21 | def f(): -22 22 | # Neither of these are ignored and warning is -23 23 | # logged to user -24 |- I = 1 # noqa: E741.F841 - 24 |+ pass # noqa: E741.F841 +21 | def f(): +22 | # Neither of these are ignored and warning is +23 | # logged to user + - I = 1 # noqa: E741.F841 +24 + pass # noqa: E741.F841 +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap index b645294b6b..099f7c4c35 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap @@ -13,18 +13,16 @@ RUF031 [*] Use parentheses for tuples in subscripts 11 | d[(2,4)] | help: Parenthesize tuple - -ℹ Safe fix -5 5 | 2 -6 6 | )] -7 7 | d[ -8 |- 1, -9 |- 2 - 8 |+ (1, - 9 |+ 2) -10 10 | ] -11 11 | d[(2,4)] -12 12 | d[(5,6,7)] +5 | 2 +6 | )] +7 | d[ + - 1, + - 2 +8 + (1, +9 + 2) +10 | ] +11 | d[(2,4)] +12 | d[(5,6,7)] RUF031 [*] Use parentheses for tuples in subscripts --> RUF031_prefer_parens.py:16:3 @@ -37,16 +35,14 @@ RUF031 [*] Use parentheses for tuples in subscripts 18 | d[5,6,7] | help: Parenthesize tuple - -ℹ Safe fix -13 13 | d[(8,)] -14 14 | d[tuple(1,2)] -15 15 | d[tuple(8)] -16 |-d[1,2] - 16 |+d[(1,2)] -17 17 | d[3,4] -18 18 | d[5,6,7] -19 19 | e = {((1,2),(3,4)):"a"} +13 | d[(8,)] +14 | d[tuple(1,2)] +15 | d[tuple(8)] + - d[1,2] +16 + d[(1,2)] +17 | d[3,4] +18 | d[5,6,7] +19 | e = {((1,2),(3,4)):"a"} RUF031 [*] Use parentheses for tuples in subscripts --> RUF031_prefer_parens.py:17:3 @@ -59,16 +55,14 @@ RUF031 [*] Use parentheses for tuples in subscripts 19 | e = {((1,2),(3,4)):"a"} | help: Parenthesize tuple - -ℹ Safe fix -14 14 | d[tuple(1,2)] -15 15 | d[tuple(8)] -16 16 | d[1,2] -17 |-d[3,4] - 17 |+d[(3,4)] -18 18 | d[5,6,7] -19 19 | e = {((1,2),(3,4)):"a"} -20 20 | e[((1,2),(3,4))] +14 | d[tuple(1,2)] +15 | d[tuple(8)] +16 | d[1,2] + - d[3,4] +17 + d[(3,4)] +18 | d[5,6,7] +19 | e = {((1,2),(3,4)):"a"} +20 | e[((1,2),(3,4))] RUF031 [*] Use parentheses for tuples in subscripts --> RUF031_prefer_parens.py:18:3 @@ -81,16 +75,14 @@ RUF031 [*] Use parentheses for tuples in subscripts 20 | e[((1,2),(3,4))] | help: Parenthesize tuple - -ℹ Safe fix -15 15 | d[tuple(8)] -16 16 | d[1,2] -17 17 | d[3,4] -18 |-d[5,6,7] - 18 |+d[(5,6,7)] -19 19 | e = {((1,2),(3,4)):"a"} -20 20 | e[((1,2),(3,4))] -21 21 | e[(1,2),(3,4)] +15 | d[tuple(8)] +16 | d[1,2] +17 | d[3,4] + - d[5,6,7] +18 + d[(5,6,7)] +19 | e = {((1,2),(3,4)):"a"} +20 | e[((1,2),(3,4))] +21 | e[(1,2),(3,4)] RUF031 [*] Use parentheses for tuples in subscripts --> RUF031_prefer_parens.py:21:3 @@ -103,16 +95,14 @@ RUF031 [*] Use parentheses for tuples in subscripts 23 | token_features[ | help: Parenthesize tuple - -ℹ Safe fix -18 18 | d[5,6,7] -19 19 | e = {((1,2),(3,4)):"a"} -20 20 | e[((1,2),(3,4))] -21 |-e[(1,2),(3,4)] - 21 |+e[((1,2),(3,4))] -22 22 | -23 23 | token_features[ -24 24 | (window_position, feature_name) +18 | d[5,6,7] +19 | e = {((1,2),(3,4)):"a"} +20 | e[((1,2),(3,4))] + - e[(1,2),(3,4)] +21 + e[((1,2),(3,4))] +22 | +23 | token_features[ +24 | (window_position, feature_name) RUF031 [*] Use parentheses for tuples in subscripts --> RUF031_prefer_parens.py:26:3 @@ -125,14 +115,12 @@ RUF031 [*] Use parentheses for tuples in subscripts 28 | d[()] # empty tuples should be ignored | help: Parenthesize tuple - -ℹ Safe fix -23 23 | token_features[ -24 24 | (window_position, feature_name) -25 25 | ] = self._extract_raw_features_from_token -26 |-d[1,] -27 26 | d[(1,)] - 27 |+d[(1,)] -28 28 | d[()] # empty tuples should be ignored -29 29 | -30 30 | d[:,] # slices in the subscript lead to syntax error if parens are added +23 | token_features[ +24 | (window_position, feature_name) +25 | ] = self._extract_raw_features_from_token + - d[1,] +26 | d[(1,)] +27 + d[(1,)] +28 | d[()] # empty tuples should be ignored +29 | +30 | d[:,] # slices in the subscript lead to syntax error if parens are added diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap index 1717131599..b7ad058fab 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039.py.snap @@ -11,16 +11,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string 7 | re.finditer("dou\ble") | help: Replace with raw string - -ℹ Safe fix -2 2 | import regex -3 3 | -4 4 | # Errors -5 |-re.compile('single free-spacing', flags=re.X) - 5 |+re.compile(r'single free-spacing', flags=re.X) -6 6 | re.findall('si\ngle') -7 7 | re.finditer("dou\ble") -8 8 | re.fullmatch('''t\riple single''') +2 | import regex +3 | +4 | # Errors + - re.compile('single free-spacing', flags=re.X) +5 + re.compile(r'single free-spacing', flags=re.X) +6 | re.findall('si\ngle') +7 | re.finditer("dou\ble") +8 | re.fullmatch('''t\riple single''') RUF039 [*] First argument to `re.findall()` is not raw string --> RUF039.py:6:12 @@ -33,16 +31,15 @@ RUF039 [*] First argument to `re.findall()` is not raw string 8 | re.fullmatch('''t\riple single''') | help: Replace with raw string - -ℹ Unsafe fix -3 3 | -4 4 | # Errors -5 5 | re.compile('single free-spacing', flags=re.X) -6 |-re.findall('si\ngle') - 6 |+re.findall(r'si\ngle') -7 7 | re.finditer("dou\ble") -8 8 | re.fullmatch('''t\riple single''') -9 9 | re.match("""\triple double""") +3 | +4 | # Errors +5 | re.compile('single free-spacing', flags=re.X) + - re.findall('si\ngle') +6 + re.findall(r'si\ngle') +7 | re.finditer("dou\ble") +8 | re.fullmatch('''t\riple single''') +9 | re.match("""\triple double""") +note: This is an unsafe fix and may change runtime behavior RUF039 First argument to `re.finditer()` is not raw string --> RUF039.py:7:13 @@ -67,16 +64,15 @@ RUF039 [*] First argument to `re.fullmatch()` is not raw string 10 | re.search('two', 'args') | help: Replace with raw string - -ℹ Unsafe fix -5 5 | re.compile('single free-spacing', flags=re.X) -6 6 | re.findall('si\ngle') -7 7 | re.finditer("dou\ble") -8 |-re.fullmatch('''t\riple single''') - 8 |+re.fullmatch(r'''t\riple single''') -9 9 | re.match("""\triple double""") -10 10 | re.search('two', 'args') -11 11 | re.split("raw", r'second') +5 | re.compile('single free-spacing', flags=re.X) +6 | re.findall('si\ngle') +7 | re.finditer("dou\ble") + - re.fullmatch('''t\riple single''') +8 + re.fullmatch(r'''t\riple single''') +9 | re.match("""\triple double""") +10 | re.search('two', 'args') +11 | re.split("raw", r'second') +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.match()` is not raw string --> RUF039.py:9:10 @@ -89,16 +85,15 @@ RUF039 [*] First argument to `re.match()` is not raw string 11 | re.split("raw", r'second') | help: Replace with raw string - -ℹ Unsafe fix -6 6 | re.findall('si\ngle') -7 7 | re.finditer("dou\ble") -8 8 | re.fullmatch('''t\riple single''') -9 |-re.match("""\triple double""") - 9 |+re.match(r"""\triple double""") -10 10 | re.search('two', 'args') -11 11 | re.split("raw", r'second') -12 12 | re.sub(u'''nicode''', u"f(?i)rst") +6 | re.findall('si\ngle') +7 | re.finditer("dou\ble") +8 | re.fullmatch('''t\riple single''') + - re.match("""\triple double""") +9 + re.match(r"""\triple double""") +10 | re.search('two', 'args') +11 | re.split("raw", r'second') +12 | re.sub(u'''nicode''', u"f(?i)rst") +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.search()` is not raw string --> RUF039.py:10:11 @@ -111,16 +106,14 @@ RUF039 [*] First argument to `re.search()` is not raw string 12 | re.sub(u'''nicode''', u"f(?i)rst") | help: Replace with raw string - -ℹ Safe fix -7 7 | re.finditer("dou\ble") -8 8 | re.fullmatch('''t\riple single''') -9 9 | re.match("""\triple double""") -10 |-re.search('two', 'args') - 10 |+re.search(r'two', 'args') -11 11 | re.split("raw", r'second') -12 12 | re.sub(u'''nicode''', u"f(?i)rst") -13 13 | re.subn(b"""ytes are""", f"\u006e") +7 | re.finditer("dou\ble") +8 | re.fullmatch('''t\riple single''') +9 | re.match("""\triple double""") + - re.search('two', 'args') +10 + re.search(r'two', 'args') +11 | re.split("raw", r'second') +12 | re.sub(u'''nicode''', u"f(?i)rst") +13 | re.subn(b"""ytes are""", f"\u006e") RUF039 [*] First argument to `re.split()` is not raw string --> RUF039.py:11:10 @@ -133,16 +126,14 @@ RUF039 [*] First argument to `re.split()` is not raw string 13 | re.subn(b"""ytes are""", f"\u006e") | help: Replace with raw string - -ℹ Safe fix -8 8 | re.fullmatch('''t\riple single''') -9 9 | re.match("""\triple double""") -10 10 | re.search('two', 'args') -11 |-re.split("raw", r'second') - 11 |+re.split(r"raw", r'second') -12 12 | re.sub(u'''nicode''', u"f(?i)rst") -13 13 | re.subn(b"""ytes are""", f"\u006e") -14 14 | +8 | re.fullmatch('''t\riple single''') +9 | re.match("""\triple double""") +10 | re.search('two', 'args') + - re.split("raw", r'second') +11 + re.split(r"raw", r'second') +12 | re.sub(u'''nicode''', u"f(?i)rst") +13 | re.subn(b"""ytes are""", f"\u006e") +14 | RUF039 First argument to `re.sub()` is not raw string --> RUF039.py:12:8 @@ -166,16 +157,14 @@ RUF039 [*] First argument to `re.subn()` is not raw bytes literal 15 | regex.compile('single free-spacing', flags=regex.X) | help: Replace with raw bytes literal - -ℹ Safe fix -10 10 | re.search('two', 'args') -11 11 | re.split("raw", r'second') -12 12 | re.sub(u'''nicode''', u"f(?i)rst") -13 |-re.subn(b"""ytes are""", f"\u006e") - 13 |+re.subn(rb"""ytes are""", f"\u006e") -14 14 | -15 15 | regex.compile('single free-spacing', flags=regex.X) -16 16 | regex.findall('si\ngle') +10 | re.search('two', 'args') +11 | re.split("raw", r'second') +12 | re.sub(u'''nicode''', u"f(?i)rst") + - re.subn(b"""ytes are""", f"\u006e") +13 + re.subn(rb"""ytes are""", f"\u006e") +14 | +15 | regex.compile('single free-spacing', flags=regex.X) +16 | regex.findall('si\ngle') RUF039 [*] First argument to `regex.compile()` is not raw string --> RUF039.py:15:15 @@ -188,16 +177,14 @@ RUF039 [*] First argument to `regex.compile()` is not raw string 17 | regex.finditer("dou\ble") | help: Replace with raw string - -ℹ Safe fix -12 12 | re.sub(u'''nicode''', u"f(?i)rst") -13 13 | re.subn(b"""ytes are""", f"\u006e") -14 14 | -15 |-regex.compile('single free-spacing', flags=regex.X) - 15 |+regex.compile(r'single free-spacing', flags=regex.X) -16 16 | regex.findall('si\ngle') -17 17 | regex.finditer("dou\ble") -18 18 | regex.fullmatch('''t\riple single''') +12 | re.sub(u'''nicode''', u"f(?i)rst") +13 | re.subn(b"""ytes are""", f"\u006e") +14 | + - regex.compile('single free-spacing', flags=regex.X) +15 + regex.compile(r'single free-spacing', flags=regex.X) +16 | regex.findall('si\ngle') +17 | regex.finditer("dou\ble") +18 | regex.fullmatch('''t\riple single''') RUF039 [*] First argument to `regex.findall()` is not raw string --> RUF039.py:16:15 @@ -209,16 +196,15 @@ RUF039 [*] First argument to `regex.findall()` is not raw string 18 | regex.fullmatch('''t\riple single''') | help: Replace with raw string - -ℹ Unsafe fix -13 13 | re.subn(b"""ytes are""", f"\u006e") -14 14 | -15 15 | regex.compile('single free-spacing', flags=regex.X) -16 |-regex.findall('si\ngle') - 16 |+regex.findall(r'si\ngle') -17 17 | regex.finditer("dou\ble") -18 18 | regex.fullmatch('''t\riple single''') -19 19 | regex.match("""\triple double""") +13 | re.subn(b"""ytes are""", f"\u006e") +14 | +15 | regex.compile('single free-spacing', flags=regex.X) + - regex.findall('si\ngle') +16 + regex.findall(r'si\ngle') +17 | regex.finditer("dou\ble") +18 | regex.fullmatch('''t\riple single''') +19 | regex.match("""\triple double""") +note: This is an unsafe fix and may change runtime behavior RUF039 First argument to `regex.finditer()` is not raw string --> RUF039.py:17:16 @@ -243,16 +229,15 @@ RUF039 [*] First argument to `regex.fullmatch()` is not raw string 20 | regex.search('two', 'args') | help: Replace with raw string - -ℹ Unsafe fix -15 15 | regex.compile('single free-spacing', flags=regex.X) -16 16 | regex.findall('si\ngle') -17 17 | regex.finditer("dou\ble") -18 |-regex.fullmatch('''t\riple single''') - 18 |+regex.fullmatch(r'''t\riple single''') -19 19 | regex.match("""\triple double""") -20 20 | regex.search('two', 'args') -21 21 | regex.split("raw", r'second') +15 | regex.compile('single free-spacing', flags=regex.X) +16 | regex.findall('si\ngle') +17 | regex.finditer("dou\ble") + - regex.fullmatch('''t\riple single''') +18 + regex.fullmatch(r'''t\riple single''') +19 | regex.match("""\triple double""") +20 | regex.search('two', 'args') +21 | regex.split("raw", r'second') +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `regex.match()` is not raw string --> RUF039.py:19:13 @@ -265,16 +250,15 @@ RUF039 [*] First argument to `regex.match()` is not raw string 21 | regex.split("raw", r'second') | help: Replace with raw string - -ℹ Unsafe fix -16 16 | regex.findall('si\ngle') -17 17 | regex.finditer("dou\ble") -18 18 | regex.fullmatch('''t\riple single''') -19 |-regex.match("""\triple double""") - 19 |+regex.match(r"""\triple double""") -20 20 | regex.search('two', 'args') -21 21 | regex.split("raw", r'second') -22 22 | regex.sub(u'''nicode''', u"f(?i)rst") +16 | regex.findall('si\ngle') +17 | regex.finditer("dou\ble") +18 | regex.fullmatch('''t\riple single''') + - regex.match("""\triple double""") +19 + regex.match(r"""\triple double""") +20 | regex.search('two', 'args') +21 | regex.split("raw", r'second') +22 | regex.sub(u'''nicode''', u"f(?i)rst") +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `regex.search()` is not raw string --> RUF039.py:20:14 @@ -287,16 +271,14 @@ RUF039 [*] First argument to `regex.search()` is not raw string 22 | regex.sub(u'''nicode''', u"f(?i)rst") | help: Replace with raw string - -ℹ Safe fix -17 17 | regex.finditer("dou\ble") -18 18 | regex.fullmatch('''t\riple single''') -19 19 | regex.match("""\triple double""") -20 |-regex.search('two', 'args') - 20 |+regex.search(r'two', 'args') -21 21 | regex.split("raw", r'second') -22 22 | regex.sub(u'''nicode''', u"f(?i)rst") -23 23 | regex.subn(b"""ytes are""", f"\u006e") +17 | regex.finditer("dou\ble") +18 | regex.fullmatch('''t\riple single''') +19 | regex.match("""\triple double""") + - regex.search('two', 'args') +20 + regex.search(r'two', 'args') +21 | regex.split("raw", r'second') +22 | regex.sub(u'''nicode''', u"f(?i)rst") +23 | regex.subn(b"""ytes are""", f"\u006e") RUF039 [*] First argument to `regex.split()` is not raw string --> RUF039.py:21:13 @@ -309,16 +291,14 @@ RUF039 [*] First argument to `regex.split()` is not raw string 23 | regex.subn(b"""ytes are""", f"\u006e") | help: Replace with raw string - -ℹ Safe fix -18 18 | regex.fullmatch('''t\riple single''') -19 19 | regex.match("""\triple double""") -20 20 | regex.search('two', 'args') -21 |-regex.split("raw", r'second') - 21 |+regex.split(r"raw", r'second') -22 22 | regex.sub(u'''nicode''', u"f(?i)rst") -23 23 | regex.subn(b"""ytes are""", f"\u006e") -24 24 | +18 | regex.fullmatch('''t\riple single''') +19 | regex.match("""\triple double""") +20 | regex.search('two', 'args') + - regex.split("raw", r'second') +21 + regex.split(r"raw", r'second') +22 | regex.sub(u'''nicode''', u"f(?i)rst") +23 | regex.subn(b"""ytes are""", f"\u006e") +24 | RUF039 First argument to `regex.sub()` is not raw string --> RUF039.py:22:11 @@ -342,16 +322,14 @@ RUF039 [*] First argument to `regex.subn()` is not raw bytes literal 25 | regex.template("""(?m) | help: Replace with raw bytes literal - -ℹ Safe fix -20 20 | regex.search('two', 'args') -21 21 | regex.split("raw", r'second') -22 22 | regex.sub(u'''nicode''', u"f(?i)rst") -23 |-regex.subn(b"""ytes are""", f"\u006e") - 23 |+regex.subn(rb"""ytes are""", f"\u006e") -24 24 | -25 25 | regex.template("""(?m) -26 26 | (?:ulti)? +20 | regex.search('two', 'args') +21 | regex.split("raw", r'second') +22 | regex.sub(u'''nicode''', u"f(?i)rst") + - regex.subn(b"""ytes are""", f"\u006e") +23 + regex.subn(rb"""ytes are""", f"\u006e") +24 | +25 | regex.template("""(?m) +26 | (?:ulti)? RUF039 [*] First argument to `regex.template()` is not raw string --> RUF039.py:25:16 @@ -367,16 +345,14 @@ RUF039 [*] First argument to `regex.template()` is not raw string | |___^ | help: Replace with raw string - -ℹ Safe fix -22 22 | regex.sub(u'''nicode''', u"f(?i)rst") -23 23 | regex.subn(b"""ytes are""", f"\u006e") -24 24 | -25 |-regex.template("""(?m) - 25 |+regex.template(r"""(?m) -26 26 | (?:ulti)? -27 27 | (?=(? RUF039.py:59:12 @@ -388,16 +364,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 61 | re.compile("\"") # without fix | help: Replace with raw string - -ℹ Unsafe fix -56 56 | -57 57 | -58 58 | # https://github.com/astral-sh/ruff/issues/16713 -59 |-re.compile("\a\f\n\r\t\u27F2\U0001F0A1\v\x41") # with unsafe fix - 59 |+re.compile(r"\a\f\n\r\t\u27F2\U0001F0A1\v\x41") # with unsafe fix -60 60 | re.compile("\b") # without fix -61 61 | re.compile("\"") # without fix -62 62 | re.compile("\'") # without fix +56 | +57 | +58 | # https://github.com/astral-sh/ruff/issues/16713 + - re.compile("\a\f\n\r\t\u27F2\U0001F0A1\v\x41") # with unsafe fix +59 + re.compile(r"\a\f\n\r\t\u27F2\U0001F0A1\v\x41") # with unsafe fix +60 | re.compile("\b") # without fix +61 | re.compile("\"") # without fix +62 | re.compile("\'") # without fix +note: This is an unsafe fix and may change runtime behavior RUF039 First argument to `re.compile()` is not raw string --> RUF039.py:60:12 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap index 1ee8cf2707..a354539722 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF039_RUF039_concat.py.snap @@ -11,16 +11,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string 7 | ) | help: Replace with raw string - -ℹ Safe fix -2 2 | -3 3 | -4 4 | re.compile( -5 |- 'implicit' - 5 |+ r'implicit' -6 6 | 'concatenation' -7 7 | ) -8 8 | re.findall( +2 | +3 | +4 | re.compile( + - 'implicit' +5 + r'implicit' +6 | 'concatenation' +7 | ) +8 | re.findall( RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:6:5 @@ -33,16 +31,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string 8 | re.findall( | help: Replace with raw string - -ℹ Safe fix -3 3 | -4 4 | re.compile( -5 5 | 'implicit' -6 |- 'concatenation' - 6 |+ r'concatenation' -7 7 | ) -8 8 | re.findall( -9 9 | r''' +3 | +4 | re.compile( +5 | 'implicit' + - 'concatenation' +6 + r'concatenation' +7 | ) +8 | re.findall( +9 | r''' RUF039 [*] First argument to `re.findall()` is not raw string --> RUF039_concat.py:12:5 @@ -57,16 +53,14 @@ RUF039 [*] First argument to `re.findall()` is not raw string 16 | re.finditer( | help: Replace with raw string - -ℹ Safe fix -9 9 | r''' -10 10 | multiline -11 11 | ''' -12 |- """ - 12 |+ r""" -13 13 | concatenation -14 14 | """ -15 15 | ) +9 | r''' +10 | multiline +11 | ''' + - """ +12 + r""" +13 | concatenation +14 | """ +15 | ) RUF039 [*] First argument to `re.match()` is not raw bytes literal --> RUF039_concat.py:26:5 @@ -79,16 +73,14 @@ RUF039 [*] First argument to `re.match()` is not raw bytes literal 28 | ) | help: Replace with raw bytes literal - -ℹ Safe fix -23 23 | f'much?' -24 24 | ) -25 25 | re.match( -26 |- b'reak' - 26 |+ rb'reak' -27 27 | br'eak' -28 28 | ) -29 29 | re.search( +23 | f'much?' +24 | ) +25 | re.match( + - b'reak' +26 + rb'reak' +27 | br'eak' +28 | ) +29 | re.search( RUF039 First argument to `re.search()` is not raw string --> RUF039_concat.py:30:8 @@ -113,16 +105,14 @@ RUF039 [*] First argument to `re.search()` is not raw string 33 | re.split(''U"""w"""U'') | help: Replace with raw string - -ℹ Safe fix -28 28 | ) -29 29 | re.search( -30 30 | r''u'' -31 |- '''okay?''' - 31 |+ r'''okay?''' -32 32 | ) -33 33 | re.split(''U"""w"""U'') -34 34 | re.sub( +28 | ) +29 | re.search( +30 | r''u'' + - '''okay?''' +31 + r'''okay?''' +32 | ) +33 | re.split(''U"""w"""U'') +34 | re.sub( RUF039 [*] First argument to `re.split()` is not raw string --> RUF039_concat.py:33:10 @@ -135,16 +125,14 @@ RUF039 [*] First argument to `re.split()` is not raw string 35 | "I''m o" | help: Replace with raw string - -ℹ Safe fix -30 30 | r''u'' -31 31 | '''okay?''' -32 32 | ) -33 |-re.split(''U"""w"""U'') - 33 |+re.split(r''U"""w"""U'') -34 34 | re.sub( -35 35 | "I''m o" -36 36 | 'utta ideas' +30 | r''u'' +31 | '''okay?''' +32 | ) + - re.split(''U"""w"""U'') +33 + re.split(r''U"""w"""U'') +34 | re.sub( +35 | "I''m o" +36 | 'utta ideas' RUF039 First argument to `re.split()` is not raw string --> RUF039_concat.py:33:12 @@ -181,16 +169,14 @@ RUF039 [*] First argument to `re.sub()` is not raw string 37 | ) | help: Replace with raw string - -ℹ Safe fix -32 32 | ) -33 33 | re.split(''U"""w"""U'') -34 34 | re.sub( -35 |- "I''m o" - 35 |+ r"I''m o" -36 36 | 'utta ideas' -37 37 | ) -38 38 | re.subn("()"r' am I'"??") +32 | ) +33 | re.split(''U"""w"""U'') +34 | re.sub( + - "I''m o" +35 + r"I''m o" +36 | 'utta ideas' +37 | ) +38 | re.subn("()"r' am I'"??") RUF039 [*] First argument to `re.sub()` is not raw string --> RUF039_concat.py:36:5 @@ -203,16 +189,14 @@ RUF039 [*] First argument to `re.sub()` is not raw string 38 | re.subn("()"r' am I'"??") | help: Replace with raw string - -ℹ Safe fix -33 33 | re.split(''U"""w"""U'') -34 34 | re.sub( -35 35 | "I''m o" -36 |- 'utta ideas' - 36 |+ r'utta ideas' -37 37 | ) -38 38 | re.subn("()"r' am I'"??") -39 39 | +33 | re.split(''U"""w"""U'') +34 | re.sub( +35 | "I''m o" + - 'utta ideas' +36 + r'utta ideas' +37 | ) +38 | re.subn("()"r' am I'"??") +39 | RUF039 [*] First argument to `re.subn()` is not raw string --> RUF039_concat.py:38:9 @@ -223,16 +207,14 @@ RUF039 [*] First argument to `re.subn()` is not raw string | ^^^^ | help: Replace with raw string - -ℹ Safe fix -35 35 | "I''m o" -36 36 | 'utta ideas' -37 37 | ) -38 |-re.subn("()"r' am I'"??") - 38 |+re.subn(r"()"r' am I'"??") -39 39 | -40 40 | -41 41 | import regex +35 | "I''m o" +36 | 'utta ideas' +37 | ) + - re.subn("()"r' am I'"??") +38 + re.subn(r"()"r' am I'"??") +39 | +40 | +41 | import regex RUF039 [*] First argument to `re.subn()` is not raw string --> RUF039_concat.py:38:21 @@ -243,16 +225,14 @@ RUF039 [*] First argument to `re.subn()` is not raw string | ^^^^ | help: Replace with raw string - -ℹ Safe fix -35 35 | "I''m o" -36 36 | 'utta ideas' -37 37 | ) -38 |-re.subn("()"r' am I'"??") - 38 |+re.subn("()"r' am I'r"??") -39 39 | -40 40 | -41 41 | import regex +35 | "I''m o" +36 | 'utta ideas' +37 | ) + - re.subn("()"r' am I'"??") +38 + re.subn("()"r' am I'r"??") +39 | +40 | +41 | import regex RUF039 [*] First argument to `regex.compile()` is not raw string --> RUF039_concat.py:45:5 @@ -264,16 +244,14 @@ RUF039 [*] First argument to `regex.compile()` is not raw string 47 | ) | help: Replace with raw string - -ℹ Safe fix -42 42 | -43 43 | -44 44 | regex.compile( -45 |- 'implicit' - 45 |+ r'implicit' -46 46 | 'concatenation' -47 47 | ) -48 48 | regex.findall( +42 | +43 | +44 | regex.compile( + - 'implicit' +45 + r'implicit' +46 | 'concatenation' +47 | ) +48 | regex.findall( RUF039 [*] First argument to `regex.compile()` is not raw string --> RUF039_concat.py:46:5 @@ -286,16 +264,14 @@ RUF039 [*] First argument to `regex.compile()` is not raw string 48 | regex.findall( | help: Replace with raw string - -ℹ Safe fix -43 43 | -44 44 | regex.compile( -45 45 | 'implicit' -46 |- 'concatenation' - 46 |+ r'concatenation' -47 47 | ) -48 48 | regex.findall( -49 49 | r''' +43 | +44 | regex.compile( +45 | 'implicit' + - 'concatenation' +46 + r'concatenation' +47 | ) +48 | regex.findall( +49 | r''' RUF039 [*] First argument to `regex.findall()` is not raw string --> RUF039_concat.py:52:5 @@ -310,16 +286,14 @@ RUF039 [*] First argument to `regex.findall()` is not raw string 56 | regex.finditer( | help: Replace with raw string - -ℹ Safe fix -49 49 | r''' -50 50 | multiline -51 51 | ''' -52 |- """ - 52 |+ r""" -53 53 | concatenation -54 54 | """ -55 55 | ) +49 | r''' +50 | multiline +51 | ''' + - """ +52 + r""" +53 | concatenation +54 | """ +55 | ) RUF039 [*] First argument to `regex.match()` is not raw bytes literal --> RUF039_concat.py:66:5 @@ -332,16 +306,14 @@ RUF039 [*] First argument to `regex.match()` is not raw bytes literal 68 | ) | help: Replace with raw bytes literal - -ℹ Safe fix -63 63 | f'much?' -64 64 | ) -65 65 | regex.match( -66 |- b'reak' - 66 |+ rb'reak' -67 67 | br'eak' -68 68 | ) -69 69 | regex.search( +63 | f'much?' +64 | ) +65 | regex.match( + - b'reak' +66 + rb'reak' +67 | br'eak' +68 | ) +69 | regex.search( RUF039 First argument to `regex.search()` is not raw string --> RUF039_concat.py:70:8 @@ -366,16 +338,14 @@ RUF039 [*] First argument to `regex.search()` is not raw string 73 | regex.split(''U"""w"""U'') | help: Replace with raw string - -ℹ Safe fix -68 68 | ) -69 69 | regex.search( -70 70 | r''u'' -71 |- '''okay?''' - 71 |+ r'''okay?''' -72 72 | ) -73 73 | regex.split(''U"""w"""U'') -74 74 | regex.sub( +68 | ) +69 | regex.search( +70 | r''u'' + - '''okay?''' +71 + r'''okay?''' +72 | ) +73 | regex.split(''U"""w"""U'') +74 | regex.sub( RUF039 [*] First argument to `regex.split()` is not raw string --> RUF039_concat.py:73:13 @@ -388,16 +358,14 @@ RUF039 [*] First argument to `regex.split()` is not raw string 75 | "I''m o" | help: Replace with raw string - -ℹ Safe fix -70 70 | r''u'' -71 71 | '''okay?''' -72 72 | ) -73 |-regex.split(''U"""w"""U'') - 73 |+regex.split(r''U"""w"""U'') -74 74 | regex.sub( -75 75 | "I''m o" -76 76 | 'utta ideas' +70 | r''u'' +71 | '''okay?''' +72 | ) + - regex.split(''U"""w"""U'') +73 + regex.split(r''U"""w"""U'') +74 | regex.sub( +75 | "I''m o" +76 | 'utta ideas' RUF039 First argument to `regex.split()` is not raw string --> RUF039_concat.py:73:15 @@ -434,16 +402,14 @@ RUF039 [*] First argument to `regex.sub()` is not raw string 77 | ) | help: Replace with raw string - -ℹ Safe fix -72 72 | ) -73 73 | regex.split(''U"""w"""U'') -74 74 | regex.sub( -75 |- "I''m o" - 75 |+ r"I''m o" -76 76 | 'utta ideas' -77 77 | ) -78 78 | regex.subn("()"r' am I'"??") +72 | ) +73 | regex.split(''U"""w"""U'') +74 | regex.sub( + - "I''m o" +75 + r"I''m o" +76 | 'utta ideas' +77 | ) +78 | regex.subn("()"r' am I'"??") RUF039 [*] First argument to `regex.sub()` is not raw string --> RUF039_concat.py:76:5 @@ -456,16 +422,14 @@ RUF039 [*] First argument to `regex.sub()` is not raw string 78 | regex.subn("()"r' am I'"??") | help: Replace with raw string - -ℹ Safe fix -73 73 | regex.split(''U"""w"""U'') -74 74 | regex.sub( -75 75 | "I''m o" -76 |- 'utta ideas' - 76 |+ r'utta ideas' -77 77 | ) -78 78 | regex.subn("()"r' am I'"??") -79 79 | +73 | regex.split(''U"""w"""U'') +74 | regex.sub( +75 | "I''m o" + - 'utta ideas' +76 + r'utta ideas' +77 | ) +78 | regex.subn("()"r' am I'"??") +79 | RUF039 [*] First argument to `regex.subn()` is not raw string --> RUF039_concat.py:78:12 @@ -476,16 +440,14 @@ RUF039 [*] First argument to `regex.subn()` is not raw string | ^^^^ | help: Replace with raw string - -ℹ Safe fix -75 75 | "I''m o" -76 76 | 'utta ideas' -77 77 | ) -78 |-regex.subn("()"r' am I'"??") - 78 |+regex.subn(r"()"r' am I'"??") -79 79 | -80 80 | -81 81 | regex.template( +75 | "I''m o" +76 | 'utta ideas' +77 | ) + - regex.subn("()"r' am I'"??") +78 + regex.subn(r"()"r' am I'"??") +79 | +80 | +81 | regex.template( RUF039 [*] First argument to `regex.subn()` is not raw string --> RUF039_concat.py:78:24 @@ -496,16 +458,14 @@ RUF039 [*] First argument to `regex.subn()` is not raw string | ^^^^ | help: Replace with raw string - -ℹ Safe fix -75 75 | "I''m o" -76 76 | 'utta ideas' -77 77 | ) -78 |-regex.subn("()"r' am I'"??") - 78 |+regex.subn("()"r' am I'r"??") -79 79 | -80 80 | -81 81 | regex.template( +75 | "I''m o" +76 | 'utta ideas' +77 | ) + - regex.subn("()"r' am I'"??") +78 + regex.subn("()"r' am I'r"??") +79 | +80 | +81 | regex.template( RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:98:5 @@ -518,16 +478,14 @@ RUF039 [*] First argument to `re.compile()` is not raw string 100 | "\U0001F300-\U0001F5FF" # symbols & pictographs | help: Replace with raw string - -ℹ Safe fix -95 95 | -96 96 | # https://github.com/astral-sh/ruff/issues/16713 -97 97 | re.compile( -98 |- "[" - 98 |+ r"[" -99 99 | "\U0001F600-\U0001F64F" # emoticons -100 100 | "\U0001F300-\U0001F5FF" # symbols & pictographs -101 101 | "\U0001F680-\U0001F6FF" # transport & map symbols +95 | +96 | # https://github.com/astral-sh/ruff/issues/16713 +97 | re.compile( + - "[" +98 + r"[" +99 | "\U0001F600-\U0001F64F" # emoticons +100 | "\U0001F300-\U0001F5FF" # symbols & pictographs +101 | "\U0001F680-\U0001F6FF" # transport & map symbols RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:99:5 @@ -540,16 +498,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 101 | "\U0001F680-\U0001F6FF" # transport & map symbols | help: Replace with raw string - -ℹ Unsafe fix -96 96 | # https://github.com/astral-sh/ruff/issues/16713 -97 97 | re.compile( -98 98 | "[" -99 |- "\U0001F600-\U0001F64F" # emoticons - 99 |+ r"\U0001F600-\U0001F64F" # emoticons -100 100 | "\U0001F300-\U0001F5FF" # symbols & pictographs -101 101 | "\U0001F680-\U0001F6FF" # transport & map symbols -102 102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) +96 | # https://github.com/astral-sh/ruff/issues/16713 +97 | re.compile( +98 | "[" + - "\U0001F600-\U0001F64F" # emoticons +99 + r"\U0001F600-\U0001F64F" # emoticons +100 | "\U0001F300-\U0001F5FF" # symbols & pictographs +101 | "\U0001F680-\U0001F6FF" # transport & map symbols +102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:100:5 @@ -562,16 +519,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) | help: Replace with raw string - -ℹ Unsafe fix -97 97 | re.compile( -98 98 | "[" -99 99 | "\U0001F600-\U0001F64F" # emoticons -100 |- "\U0001F300-\U0001F5FF" # symbols & pictographs - 100 |+ r"\U0001F300-\U0001F5FF" # symbols & pictographs -101 101 | "\U0001F680-\U0001F6FF" # transport & map symbols -102 102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) -103 103 | "\U00002702-\U000027B0" +97 | re.compile( +98 | "[" +99 | "\U0001F600-\U0001F64F" # emoticons + - "\U0001F300-\U0001F5FF" # symbols & pictographs +100 + r"\U0001F300-\U0001F5FF" # symbols & pictographs +101 | "\U0001F680-\U0001F6FF" # transport & map symbols +102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) +103 | "\U00002702-\U000027B0" +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:101:5 @@ -584,16 +540,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 103 | "\U00002702-\U000027B0" | help: Replace with raw string - -ℹ Unsafe fix -98 98 | "[" -99 99 | "\U0001F600-\U0001F64F" # emoticons -100 100 | "\U0001F300-\U0001F5FF" # symbols & pictographs -101 |- "\U0001F680-\U0001F6FF" # transport & map symbols - 101 |+ r"\U0001F680-\U0001F6FF" # transport & map symbols -102 102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) -103 103 | "\U00002702-\U000027B0" -104 104 | "\U000024C2-\U0001F251" +98 | "[" +99 | "\U0001F600-\U0001F64F" # emoticons +100 | "\U0001F300-\U0001F5FF" # symbols & pictographs + - "\U0001F680-\U0001F6FF" # transport & map symbols +101 + r"\U0001F680-\U0001F6FF" # transport & map symbols +102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) +103 | "\U00002702-\U000027B0" +104 | "\U000024C2-\U0001F251" +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:102:5 @@ -606,16 +561,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 104 | "\U000024C2-\U0001F251" | help: Replace with raw string - -ℹ Unsafe fix -99 99 | "\U0001F600-\U0001F64F" # emoticons -100 100 | "\U0001F300-\U0001F5FF" # symbols & pictographs -101 101 | "\U0001F680-\U0001F6FF" # transport & map symbols -102 |- "\U0001F1E0-\U0001F1FF" # flags (iOS) - 102 |+ r"\U0001F1E0-\U0001F1FF" # flags (iOS) -103 103 | "\U00002702-\U000027B0" -104 104 | "\U000024C2-\U0001F251" -105 105 | "\u200d" # zero width joiner +99 | "\U0001F600-\U0001F64F" # emoticons +100 | "\U0001F300-\U0001F5FF" # symbols & pictographs +101 | "\U0001F680-\U0001F6FF" # transport & map symbols + - "\U0001F1E0-\U0001F1FF" # flags (iOS) +102 + r"\U0001F1E0-\U0001F1FF" # flags (iOS) +103 | "\U00002702-\U000027B0" +104 | "\U000024C2-\U0001F251" +105 | "\u200d" # zero width joiner +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:103:5 @@ -628,16 +582,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 105 | "\u200d" # zero width joiner | help: Replace with raw string - -ℹ Unsafe fix -100 100 | "\U0001F300-\U0001F5FF" # symbols & pictographs -101 101 | "\U0001F680-\U0001F6FF" # transport & map symbols -102 102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) -103 |- "\U00002702-\U000027B0" - 103 |+ r"\U00002702-\U000027B0" -104 104 | "\U000024C2-\U0001F251" -105 105 | "\u200d" # zero width joiner -106 106 | "\u200c" # zero width non-joiner +100 | "\U0001F300-\U0001F5FF" # symbols & pictographs +101 | "\U0001F680-\U0001F6FF" # transport & map symbols +102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) + - "\U00002702-\U000027B0" +103 + r"\U00002702-\U000027B0" +104 | "\U000024C2-\U0001F251" +105 | "\u200d" # zero width joiner +106 | "\u200c" # zero width non-joiner +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:104:5 @@ -650,16 +603,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 106 | "\u200c" # zero width non-joiner | help: Replace with raw string - -ℹ Unsafe fix -101 101 | "\U0001F680-\U0001F6FF" # transport & map symbols -102 102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) -103 103 | "\U00002702-\U000027B0" -104 |- "\U000024C2-\U0001F251" - 104 |+ r"\U000024C2-\U0001F251" -105 105 | "\u200d" # zero width joiner -106 106 | "\u200c" # zero width non-joiner -107 107 | "\\u200c" # must not be escaped in a raw string +101 | "\U0001F680-\U0001F6FF" # transport & map symbols +102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) +103 | "\U00002702-\U000027B0" + - "\U000024C2-\U0001F251" +104 + r"\U000024C2-\U0001F251" +105 | "\u200d" # zero width joiner +106 | "\u200c" # zero width non-joiner +107 | "\\u200c" # must not be escaped in a raw string +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:105:5 @@ -672,16 +624,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 107 | "\\u200c" # must not be escaped in a raw string | help: Replace with raw string - -ℹ Unsafe fix -102 102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) -103 103 | "\U00002702-\U000027B0" -104 104 | "\U000024C2-\U0001F251" -105 |- "\u200d" # zero width joiner - 105 |+ r"\u200d" # zero width joiner -106 106 | "\u200c" # zero width non-joiner -107 107 | "\\u200c" # must not be escaped in a raw string -108 108 | "]+", +102 | "\U0001F1E0-\U0001F1FF" # flags (iOS) +103 | "\U00002702-\U000027B0" +104 | "\U000024C2-\U0001F251" + - "\u200d" # zero width joiner +105 + r"\u200d" # zero width joiner +106 | "\u200c" # zero width non-joiner +107 | "\\u200c" # must not be escaped in a raw string +108 | "]+", +note: This is an unsafe fix and may change runtime behavior RUF039 [*] First argument to `re.compile()` is not raw string --> RUF039_concat.py:106:5 @@ -694,16 +645,15 @@ RUF039 [*] First argument to `re.compile()` is not raw string 108 | "]+", | help: Replace with raw string - -ℹ Unsafe fix -103 103 | "\U00002702-\U000027B0" -104 104 | "\U000024C2-\U0001F251" -105 105 | "\u200d" # zero width joiner -106 |- "\u200c" # zero width non-joiner - 106 |+ r"\u200c" # zero width non-joiner -107 107 | "\\u200c" # must not be escaped in a raw string -108 108 | "]+", -109 109 | flags=re.UNICODE, +103 | "\U00002702-\U000027B0" +104 | "\U000024C2-\U0001F251" +105 | "\u200d" # zero width joiner + - "\u200c" # zero width non-joiner +106 + r"\u200c" # zero width non-joiner +107 | "\\u200c" # must not be escaped in a raw string +108 | "]+", +109 | flags=re.UNICODE, +note: This is an unsafe fix and may change runtime behavior RUF039 First argument to `re.compile()` is not raw string --> RUF039_concat.py:107:5 @@ -728,12 +678,10 @@ RUF039 [*] First argument to `re.compile()` is not raw string 110 | ) | help: Replace with raw string - -ℹ Safe fix -105 105 | "\u200d" # zero width joiner -106 106 | "\u200c" # zero width non-joiner -107 107 | "\\u200c" # must not be escaped in a raw string -108 |- "]+", - 108 |+ r"]+", -109 109 | flags=re.UNICODE, -110 110 | ) +105 | "\u200d" # zero width joiner +106 | "\u200c" # zero width non-joiner +107 | "\\u200c" # must not be escaped in a raw string + - "]+", +108 + r"]+", +109 | flags=re.UNICODE, +110 | ) diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap index 7c6ff021da..c9a75f25c2 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_0.py.snap @@ -9,16 +9,14 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^ | help: Replace with `s.replace("abc", "")` - -ℹ Safe fix -3 3 | s = "str" -4 4 | -5 5 | # this should be replaced with `s.replace("abc", "")` -6 |-re.sub("abc", "", s) - 6 |+s.replace("abc", "") -7 7 | -8 8 | -9 9 | # this example, adapted from https://docs.python.org/3/library/re.html#re.sub, +3 | s = "str" +4 | +5 | # this should be replaced with `s.replace("abc", "")` + - re.sub("abc", "", s) +6 + s.replace("abc", "") +7 | +8 | +9 | # this example, adapted from https://docs.python.org/3/library/re.html#re.sub, RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:22:4 @@ -31,16 +29,14 @@ RUF055 [*] Plain string pattern passed to `re` function 24 | if m := re.match("abc", s): # this should *not* be replaced | help: Replace with `s.startswith("abc")` - -ℹ Safe fix -19 19 | -20 20 | # this one should be replaced with `s.startswith("abc")` because the Match is -21 21 | # used in an if context for its truth value -22 |-if re.match("abc", s): - 22 |+if s.startswith("abc"): -23 23 | pass -24 24 | if m := re.match("abc", s): # this should *not* be replaced -25 25 | pass +19 | +20 | # this one should be replaced with `s.startswith("abc")` because the Match is +21 | # used in an if context for its truth value + - if re.match("abc", s): +22 + if s.startswith("abc"): +23 | pass +24 | if m := re.match("abc", s): # this should *not* be replaced +25 | pass RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:29:4 @@ -52,16 +48,14 @@ RUF055 [*] Plain string pattern passed to `re` function 31 | re.search("abc", s) # this should not be replaced | help: Replace with `"abc" in s` - -ℹ Safe fix -26 26 | re.match("abc", s) # this should not be replaced because match returns a Match -27 27 | -28 28 | # this should be replaced with `"abc" in s` -29 |-if re.search("abc", s): - 29 |+if "abc" in s: -30 30 | pass -31 31 | re.search("abc", s) # this should not be replaced -32 32 | +26 | re.match("abc", s) # this should not be replaced because match returns a Match +27 | +28 | # this should be replaced with `"abc" in s` + - if re.search("abc", s): +29 + if "abc" in s: +30 | pass +31 | re.search("abc", s) # this should not be replaced +32 | RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:34:4 @@ -73,16 +67,14 @@ RUF055 [*] Plain string pattern passed to `re` function 36 | re.fullmatch("abc", s) # this should not be replaced | help: Replace with `s == "abc"` - -ℹ Safe fix -31 31 | re.search("abc", s) # this should not be replaced -32 32 | -33 33 | # this should be replaced with `"abc" == s` -34 |-if re.fullmatch("abc", s): - 34 |+if s == "abc": -35 35 | pass -36 36 | re.fullmatch("abc", s) # this should not be replaced -37 37 | +31 | re.search("abc", s) # this should not be replaced +32 | +33 | # this should be replaced with `"abc" == s` + - if re.fullmatch("abc", s): +34 + if s == "abc": +35 | pass +36 | re.fullmatch("abc", s) # this should not be replaced +37 | RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:39:1 @@ -94,16 +86,14 @@ RUF055 [*] Plain string pattern passed to `re` function 41 | # these currently should not be modified because the patterns contain regex | help: Replace with `s.split("abc")` - -ℹ Safe fix -36 36 | re.fullmatch("abc", s) # this should not be replaced -37 37 | -38 38 | # this should be replaced with `s.split("abc")` -39 |-re.split("abc", s) - 39 |+s.split("abc") -40 40 | -41 41 | # these currently should not be modified because the patterns contain regex -42 42 | # metacharacters +36 | re.fullmatch("abc", s) # this should not be replaced +37 | +38 | # this should be replaced with `s.split("abc")` + - re.split("abc", s) +39 + s.split("abc") +40 | +41 | # these currently should not be modified because the patterns contain regex +42 | # metacharacters RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:71:1 @@ -121,22 +111,21 @@ RUF055 [*] Plain string pattern passed to `re` function 79 | # A diagnostic should not be emitted for `sub` replacements with backreferences or | help: Replace with `s.replace("abc", "")` - -ℹ Unsafe fix -68 68 | re.split("abc", s, maxsplit=2) -69 69 | -70 70 | # this should trigger an unsafe fix because of the presence of comments -71 |-re.sub( -72 |- # pattern -73 |- "abc", -74 |- # repl -75 |- "", -76 |- s, # string -77 |-) - 71 |+s.replace("abc", "") -78 72 | -79 73 | # A diagnostic should not be emitted for `sub` replacements with backreferences or -80 74 | # most other ASCII escapes +68 | re.split("abc", s, maxsplit=2) +69 | +70 | # this should trigger an unsafe fix because of the presence of comments + - re.sub( + - # pattern + - "abc", + - # repl + - "", + - s, # string + - ) +71 + s.replace("abc", "") +72 | +73 | # A diagnostic should not be emitted for `sub` replacements with backreferences or +74 | # most other ASCII escapes +note: This is an unsafe fix and may change runtime behavior RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:89:1 @@ -149,16 +138,14 @@ RUF055 [*] Plain string pattern passed to `re` function 91 | re.sub(r"a", "\a", "a") | help: Replace with `"a".replace(r"a", "\n")` - -ℹ Safe fix -86 86 | # `re.sub(r"a", r"\n", some_string)` is fixed to `some_string.replace("a", "\n")` -87 87 | # *not* `some_string.replace("a", "\\n")`. -88 88 | # We currently emit diagnostics for some of these without fixing them. -89 |-re.sub(r"a", "\n", "a") - 89 |+"a".replace(r"a", "\n") -90 90 | re.sub(r"a", r"\n", "a") -91 91 | re.sub(r"a", "\a", "a") -92 92 | re.sub(r"a", r"\a", "a") +86 | # `re.sub(r"a", r"\n", some_string)` is fixed to `some_string.replace("a", "\n")` +87 | # *not* `some_string.replace("a", "\\n")`. +88 | # We currently emit diagnostics for some of these without fixing them. + - re.sub(r"a", "\n", "a") +89 + "a".replace(r"a", "\n") +90 | re.sub(r"a", r"\n", "a") +91 | re.sub(r"a", "\a", "a") +92 | re.sub(r"a", r"\a", "a") RUF055 Plain string pattern passed to `re` function --> RUF055_0.py:90:1 @@ -181,16 +168,14 @@ RUF055 [*] Plain string pattern passed to `re` function 92 | re.sub(r"a", r"\a", "a") | help: Replace with `"a".replace(r"a", "\x07")` - -ℹ Safe fix -88 88 | # We currently emit diagnostics for some of these without fixing them. -89 89 | re.sub(r"a", "\n", "a") -90 90 | re.sub(r"a", r"\n", "a") -91 |-re.sub(r"a", "\a", "a") - 91 |+"a".replace(r"a", "\x07") -92 92 | re.sub(r"a", r"\a", "a") -93 93 | -94 94 | re.sub(r"a", "\?", "a") +88 | # We currently emit diagnostics for some of these without fixing them. +89 | re.sub(r"a", "\n", "a") +90 | re.sub(r"a", r"\n", "a") + - re.sub(r"a", "\a", "a") +91 + "a".replace(r"a", "\x07") +92 | re.sub(r"a", r"\a", "a") +93 | +94 | re.sub(r"a", "\?", "a") RUF055 Plain string pattern passed to `re` function --> RUF055_0.py:92:1 @@ -213,16 +198,14 @@ RUF055 [*] Plain string pattern passed to `re` function 95 | re.sub(r"a", r"\?", "a") | help: Replace with `"a".replace(r"a", "\\?")` - -ℹ Safe fix -91 91 | re.sub(r"a", "\a", "a") -92 92 | re.sub(r"a", r"\a", "a") -93 93 | -94 |-re.sub(r"a", "\?", "a") - 94 |+"a".replace(r"a", "\\?") -95 95 | re.sub(r"a", r"\?", "a") -96 96 | -97 97 | # these double as tests for preserving raw string quoting style +91 | re.sub(r"a", "\a", "a") +92 | re.sub(r"a", r"\a", "a") +93 | + - re.sub(r"a", "\?", "a") +94 + "a".replace(r"a", "\\?") +95 | re.sub(r"a", r"\?", "a") +96 | +97 | # these double as tests for preserving raw string quoting style RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:95:1 @@ -234,16 +217,14 @@ RUF055 [*] Plain string pattern passed to `re` function 97 | # these double as tests for preserving raw string quoting style | help: Replace with `"a".replace(r"a", r"\?")` - -ℹ Safe fix -92 92 | re.sub(r"a", r"\a", "a") -93 93 | -94 94 | re.sub(r"a", "\?", "a") -95 |-re.sub(r"a", r"\?", "a") - 95 |+"a".replace(r"a", r"\?") -96 96 | -97 97 | # these double as tests for preserving raw string quoting style -98 98 | re.sub(r'abc', "", s) +92 | re.sub(r"a", r"\a", "a") +93 | +94 | re.sub(r"a", "\?", "a") + - re.sub(r"a", r"\?", "a") +95 + "a".replace(r"a", r"\?") +96 | +97 | # these double as tests for preserving raw string quoting style +98 | re.sub(r'abc', "", s) RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:98:1 @@ -255,15 +236,13 @@ RUF055 [*] Plain string pattern passed to `re` function 100 | re.sub(r'''abc''', "", s) | help: Replace with `s.replace(r'abc', "")` - -ℹ Safe fix -95 95 | re.sub(r"a", r"\?", "a") -96 96 | -97 97 | # these double as tests for preserving raw string quoting style -98 |-re.sub(r'abc', "", s) - 98 |+s.replace(r'abc', "") -99 99 | re.sub(r"""abc""", "", s) -100 100 | re.sub(r'''abc''', "", s) +95 | re.sub(r"a", r"\?", "a") +96 | +97 | # these double as tests for preserving raw string quoting style + - re.sub(r'abc', "", s) +98 + s.replace(r'abc', "") +99 | re.sub(r"""abc""", "", s) +100 | re.sub(r'''abc''', "", s) RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:99:1 @@ -275,14 +254,12 @@ RUF055 [*] Plain string pattern passed to `re` function 100 | re.sub(r'''abc''', "", s) | help: Replace with `s.replace(r"""abc""", "")` - -ℹ Safe fix -96 96 | -97 97 | # these double as tests for preserving raw string quoting style -98 98 | re.sub(r'abc', "", s) -99 |-re.sub(r"""abc""", "", s) - 99 |+s.replace(r"""abc""", "") -100 100 | re.sub(r'''abc''', "", s) +96 | +97 | # these double as tests for preserving raw string quoting style +98 | re.sub(r'abc', "", s) + - re.sub(r"""abc""", "", s) +99 + s.replace(r"""abc""", "") +100 | re.sub(r'''abc''', "", s) RUF055 [*] Plain string pattern passed to `re` function --> RUF055_0.py:100:1 @@ -293,10 +270,8 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `s.replace(r'''abc''', "")` - -ℹ Safe fix -97 97 | # these double as tests for preserving raw string quoting style -98 98 | re.sub(r'abc', "", s) -99 99 | re.sub(r"""abc""", "", s) -100 |-re.sub(r'''abc''', "", s) - 100 |+s.replace(r'''abc''', "") +97 | # these double as tests for preserving raw string quoting style +98 | re.sub(r'abc', "", s) +99 | re.sub(r"""abc""", "", s) + - re.sub(r'''abc''', "", s) +100 + s.replace(r'''abc''', "") diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap index 3fcd0eaaa2..44a1c811b6 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_1.py.snap @@ -12,16 +12,14 @@ RUF055 [*] Plain string pattern passed to `re` function 11 | # aliases are not followed, so this one should not trigger the rule | help: Replace with `haystack.replace(pat1, "")` - -ℹ Safe fix -6 6 | -7 7 | pat1 = "needle" -8 8 | -9 |-re.sub(pat1, "", haystack) - 9 |+haystack.replace(pat1, "") -10 10 | -11 11 | # aliases are not followed, so this one should not trigger the rule -12 12 | if pat4 := pat1: +6 | +7 | pat1 = "needle" +8 | + - re.sub(pat1, "", haystack) +9 + haystack.replace(pat1, "") +10 | +11 | # aliases are not followed, so this one should not trigger the rule +12 | if pat4 := pat1: RUF055 [*] Plain string pattern passed to `re` function --> RUF055_1.py:17:1 @@ -32,10 +30,8 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `haystack.replace(r"abc", repl)` - -ℹ Safe fix -14 14 | -15 15 | # also works for the `repl` argument in sub -16 16 | repl = "new" -17 |-re.sub(r"abc", repl, haystack) - 17 |+haystack.replace(r"abc", repl) +14 | +15 | # also works for the `repl` argument in sub +16 | repl = "new" + - re.sub(r"abc", repl, haystack) +17 + haystack.replace(r"abc", repl) diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap index 3c04d2be38..bccc67ba38 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_2.py.snap @@ -9,16 +9,14 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `"abc" not in s` - -ℹ Safe fix -4 4 | s = "str" -5 5 | -6 6 | # this should be replaced with `"abc" not in s` -7 |-re.search("abc", s) is None - 7 |+"abc" not in s -8 8 | -9 9 | -10 10 | # this should be replaced with `"abc" in s` +4 | s = "str" +5 | +6 | # this should be replaced with `"abc" not in s` + - re.search("abc", s) is None +7 + "abc" not in s +8 | +9 | +10 | # this should be replaced with `"abc" in s` RUF055 [*] Plain string pattern passed to `re` function --> RUF055_2.py:11:1 @@ -28,16 +26,14 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `"abc" in s` - -ℹ Safe fix -8 8 | -9 9 | -10 10 | # this should be replaced with `"abc" in s` -11 |-re.search("abc", s) is not None - 11 |+"abc" in s -12 12 | -13 13 | -14 14 | # this should be replaced with `not s.startswith("abc")` +8 | +9 | +10 | # this should be replaced with `"abc" in s` + - re.search("abc", s) is not None +11 + "abc" in s +12 | +13 | +14 | # this should be replaced with `not s.startswith("abc")` RUF055 [*] Plain string pattern passed to `re` function --> RUF055_2.py:15:1 @@ -47,16 +43,14 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `not s.startswith("abc")` - -ℹ Safe fix -12 12 | -13 13 | -14 14 | # this should be replaced with `not s.startswith("abc")` -15 |-re.match("abc", s) is None - 15 |+not s.startswith("abc") -16 16 | -17 17 | -18 18 | # this should be replaced with `s.startswith("abc")` +12 | +13 | +14 | # this should be replaced with `not s.startswith("abc")` + - re.match("abc", s) is None +15 + not s.startswith("abc") +16 | +17 | +18 | # this should be replaced with `s.startswith("abc")` RUF055 [*] Plain string pattern passed to `re` function --> RUF055_2.py:19:1 @@ -66,16 +60,14 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `s.startswith("abc")` - -ℹ Safe fix -16 16 | -17 17 | -18 18 | # this should be replaced with `s.startswith("abc")` -19 |-re.match("abc", s) is not None - 19 |+s.startswith("abc") -20 20 | -21 21 | -22 22 | # this should be replaced with `s != "abc"` +16 | +17 | +18 | # this should be replaced with `s.startswith("abc")` + - re.match("abc", s) is not None +19 + s.startswith("abc") +20 | +21 | +22 | # this should be replaced with `s != "abc"` RUF055 [*] Plain string pattern passed to `re` function --> RUF055_2.py:23:1 @@ -85,16 +77,14 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `s != "abc"` - -ℹ Safe fix -20 20 | -21 21 | -22 22 | # this should be replaced with `s != "abc"` -23 |-re.fullmatch("abc", s) is None - 23 |+s != "abc" -24 24 | -25 25 | -26 26 | # this should be replaced with `s == "abc"` +20 | +21 | +22 | # this should be replaced with `s != "abc"` + - re.fullmatch("abc", s) is None +23 + s != "abc" +24 | +25 | +26 | # this should be replaced with `s == "abc"` RUF055 [*] Plain string pattern passed to `re` function --> RUF055_2.py:27:1 @@ -104,16 +94,14 @@ RUF055 [*] Plain string pattern passed to `re` function | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `s == "abc"` - -ℹ Safe fix -24 24 | -25 25 | -26 26 | # this should be replaced with `s == "abc"` -27 |-re.fullmatch("abc", s) is not None - 27 |+s == "abc" -28 28 | -29 29 | -30 30 | # this should trigger an unsafe fix because of the presence of a comment within the +24 | +25 | +26 | # this should be replaced with `s == "abc"` + - re.fullmatch("abc", s) is not None +27 + s == "abc" +28 | +29 | +30 | # this should trigger an unsafe fix because of the presence of a comment within the RUF055 [*] Plain string pattern passed to `re` function --> RUF055_2.py:33:5 @@ -131,21 +119,20 @@ RUF055 [*] Plain string pattern passed to `re` function 40 | pass | help: Replace with `s != "a really really really really long string"` - -ℹ Unsafe fix -30 30 | # this should trigger an unsafe fix because of the presence of a comment within the -31 31 | # expression being replaced (which we'd lose) -32 32 | if ( -33 |- re.fullmatch( -34 |- "a really really really really long string", -35 |- s, -36 |- ) -37 |- # with a comment here -38 |- is None - 33 |+ s != "a really really really really long string" -39 34 | ): -40 35 | pass -41 36 | +30 | # this should trigger an unsafe fix because of the presence of a comment within the +31 | # expression being replaced (which we'd lose) +32 | if ( + - re.fullmatch( + - "a really really really really long string", + - s, + - ) + - # with a comment here + - is None +33 + s != "a really really really really long string" +34 | ): +35 | pass +36 | +note: This is an unsafe fix and may change runtime behavior RUF055 [*] Plain string pattern passed to `re` function --> RUF055_2.py:46:5 @@ -162,16 +149,14 @@ RUF055 [*] Plain string pattern passed to `re` function 52 | pass | help: Replace with `s != "a really really really really long string"` - -ℹ Safe fix -43 43 | # this should trigger a safe fix (comments are preserved given they're outside the -44 44 | # expression) -45 45 | if ( # leading -46 |- re.fullmatch( -47 |- "a really really really really long string", -48 |- s, -49 |- ) -50 |- is None # trailing - 46 |+ s != "a really really really really long string" # trailing -51 47 | ): -52 48 | pass +43 | # this should trigger a safe fix (comments are preserved given they're outside the +44 | # expression) +45 | if ( # leading + - re.fullmatch( + - "a really really really really long string", + - s, + - ) + - is None # trailing +46 + s != "a really really really really long string" # trailing +47 | ): +48 | pass diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap index f89aacd212..a9ce9ee638 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__RUF055_RUF055_3.py.snap @@ -11,16 +11,14 @@ RUF055 [*] Plain string pattern passed to `re` function 8 | # Should be replaced with `b_src.startswith(rb"abc")` | help: Replace with `b_src.replace(rb"x", b"y")` - -ℹ Safe fix -3 3 | b_src = b"abc" -4 4 | -5 5 | # Should be replaced with `b_src.replace(rb"x", b"y")` -6 |-re.sub(rb"x", b"y", b_src) - 6 |+b_src.replace(rb"x", b"y") -7 7 | -8 8 | # Should be replaced with `b_src.startswith(rb"abc")` -9 9 | if re.match(rb"abc", b_src): +3 | b_src = b"abc" +4 | +5 | # Should be replaced with `b_src.replace(rb"x", b"y")` + - re.sub(rb"x", b"y", b_src) +6 + b_src.replace(rb"x", b"y") +7 | +8 | # Should be replaced with `b_src.startswith(rb"abc")` +9 | if re.match(rb"abc", b_src): RUF055 [*] Plain string pattern passed to `re` function --> RUF055_3.py:9:4 @@ -31,16 +29,14 @@ RUF055 [*] Plain string pattern passed to `re` function 10 | pass | help: Replace with `b_src.startswith(rb"abc")` - -ℹ Safe fix -6 6 | re.sub(rb"x", b"y", b_src) -7 7 | -8 8 | # Should be replaced with `b_src.startswith(rb"abc")` -9 |-if re.match(rb"abc", b_src): - 9 |+if b_src.startswith(rb"abc"): -10 10 | pass -11 11 | -12 12 | # Should be replaced with `rb"x" in b_src` +6 | re.sub(rb"x", b"y", b_src) +7 | +8 | # Should be replaced with `b_src.startswith(rb"abc")` + - if re.match(rb"abc", b_src): +9 + if b_src.startswith(rb"abc"): +10 | pass +11 | +12 | # Should be replaced with `rb"x" in b_src` RUF055 [*] Plain string pattern passed to `re` function --> RUF055_3.py:13:4 @@ -51,16 +47,14 @@ RUF055 [*] Plain string pattern passed to `re` function 14 | pass | help: Replace with `rb"x" in b_src` - -ℹ Safe fix -10 10 | pass -11 11 | -12 12 | # Should be replaced with `rb"x" in b_src` -13 |-if re.search(rb"x", b_src): - 13 |+if rb"x" in b_src: -14 14 | pass -15 15 | -16 16 | # Should be replaced with `b_src.split(rb"abc")` +10 | pass +11 | +12 | # Should be replaced with `rb"x" in b_src` + - if re.search(rb"x", b_src): +13 + if rb"x" in b_src: +14 | pass +15 | +16 | # Should be replaced with `b_src.split(rb"abc")` RUF055 [*] Plain string pattern passed to `re` function --> RUF055_3.py:17:1 @@ -72,13 +66,11 @@ RUF055 [*] Plain string pattern passed to `re` function 19 | # Patterns containing metacharacters should NOT be replaced | help: Replace with `b_src.split(rb"abc")` - -ℹ Safe fix -14 14 | pass -15 15 | -16 16 | # Should be replaced with `b_src.split(rb"abc")` -17 |-re.split(rb"abc", b_src) - 17 |+b_src.split(rb"abc") -18 18 | -19 19 | # Patterns containing metacharacters should NOT be replaced -20 20 | re.sub(rb"ab[c]", b"", b_src) +14 | pass +15 | +16 | # Should be replaced with `b_src.split(rb"abc")` + - re.split(rb"abc", b_src) +17 + b_src.split(rb"abc") +18 | +19 | # Patterns containing metacharacters should NOT be replaced +20 | re.sub(rb"ab[c]", b"", b_src) diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap index 556b134748..eaedab82a3 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__preview__py38__RUF039_RUF039_py_version_sensitive.py.snap @@ -10,9 +10,8 @@ RUF039 [*] First argument to `re.compile()` is not raw string | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with raw string - -ℹ Unsafe fix -1 1 | import re -2 2 | -3 |-re.compile("\N{Partial Differential}") # with unsafe fix if python target is 3.8 or higher, else without fix - 3 |+re.compile(r"\N{Partial Differential}") # with unsafe fix if python target is 3.8 or higher, else without fix +1 | import re +2 | + - re.compile("\N{Partial Differential}") # with unsafe fix if python target is 3.8 or higher, else without fix +3 + re.compile(r"\N{Partial Differential}") # with unsafe fix if python target is 3.8 or higher, else without fix +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap index 8128f18880..955ff7c970 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__py314__RUF058_RUF058_2.py.snap @@ -11,16 +11,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable 7 | starmap(func, zip(a, b, c, strict=strict)) | help: Use `map` instead - -ℹ Safe fix -2 2 | import itertools -3 3 | -4 4 | # Errors in Python 3.14+ -5 |-starmap(func, zip(a, b, c, strict=True)) - 5 |+map(func, a, b, c, strict=True) -6 6 | starmap(func, zip(a, b, c, strict=False)) -7 7 | starmap(func, zip(a, b, c, strict=strict)) -8 8 | +2 | import itertools +3 | +4 | # Errors in Python 3.14+ + - starmap(func, zip(a, b, c, strict=True)) +5 + map(func, a, b, c, strict=True) +6 | starmap(func, zip(a, b, c, strict=False)) +7 | starmap(func, zip(a, b, c, strict=strict)) +8 | RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_2.py:6:1 @@ -32,16 +30,14 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable 7 | starmap(func, zip(a, b, c, strict=strict)) | help: Use `map` instead - -ℹ Safe fix -3 3 | -4 4 | # Errors in Python 3.14+ -5 5 | starmap(func, zip(a, b, c, strict=True)) -6 |-starmap(func, zip(a, b, c, strict=False)) - 6 |+map(func, a, b, c, strict=False) -7 7 | starmap(func, zip(a, b, c, strict=strict)) -8 8 | -9 9 | +3 | +4 | # Errors in Python 3.14+ +5 | starmap(func, zip(a, b, c, strict=True)) + - starmap(func, zip(a, b, c, strict=False)) +6 + map(func, a, b, c, strict=False) +7 | starmap(func, zip(a, b, c, strict=strict)) +8 | +9 | RUF058 [*] `itertools.starmap` called on `zip` iterable --> RUF058_2.py:7:1 @@ -52,13 +48,11 @@ RUF058 [*] `itertools.starmap` called on `zip` iterable | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Use `map` instead - -ℹ Safe fix -4 4 | # Errors in Python 3.14+ -5 5 | starmap(func, zip(a, b, c, strict=True)) -6 6 | starmap(func, zip(a, b, c, strict=False)) -7 |-starmap(func, zip(a, b, c, strict=strict)) - 7 |+map(func, a, b, c, strict=strict) -8 8 | -9 9 | -10 10 | # No errors +4 | # Errors in Python 3.14+ +5 | starmap(func, zip(a, b, c, strict=True)) +6 | starmap(func, zip(a, b, c, strict=False)) + - starmap(func, zip(a, b, c, strict=strict)) +7 + map(func, a, b, c, strict=strict) +8 | +9 | +10 | # No errors diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap index 7dae78024e..1da7089332 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0.snap @@ -10,16 +10,14 @@ RUF100 [*] Unused blanket `noqa` directive 10 | print(c) | help: Remove unused `noqa` directive - -ℹ Safe fix -6 6 | b = 2 # noqa: F841 -7 7 | -8 8 | # Invalid -9 |- c = 1 # noqa - 9 |+ c = 1 -10 10 | print(c) -11 11 | -12 12 | # Invalid +6 | b = 2 # noqa: F841 +7 | +8 | # Invalid + - c = 1 # noqa +9 + c = 1 +10 | print(c) +11 | +12 | # Invalid RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:13:12 @@ -31,16 +29,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 15 | # Invalid | help: Remove unused `noqa` directive - -ℹ Safe fix -10 10 | print(c) -11 11 | -12 12 | # Invalid -13 |- d = 1 # noqa: E501 - 13 |+ d = 1 -14 14 | -15 15 | # Invalid -16 16 | d = 1 # noqa: F841, E501 +10 | print(c) +11 | +12 | # Invalid + - d = 1 # noqa: E501 +13 + d = 1 +14 | +15 | # Invalid +16 | d = 1 # noqa: F841, E501 RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`) --> RUF100_0.py:16:12 @@ -52,16 +48,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`) 18 | # Invalid (and unimplemented or not enabled) | help: Remove unused `noqa` directive - -ℹ Safe fix -13 13 | d = 1 # noqa: E501 -14 14 | -15 15 | # Invalid -16 |- d = 1 # noqa: F841, E501 - 16 |+ d = 1 -17 17 | -18 18 | # Invalid (and unimplemented or not enabled) -19 19 | d = 1 # noqa: F841, W191, F821 +13 | d = 1 # noqa: E501 +14 | +15 | # Invalid + - d = 1 # noqa: F841, E501 +16 + d = 1 +17 | +18 | # Invalid (and unimplemented or not enabled) +19 | d = 1 # noqa: F841, W191, F821 RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`) --> RUF100_0.py:19:12 @@ -73,16 +67,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`) 21 | # Invalid (but external) | help: Remove unused `noqa` directive - -ℹ Safe fix -16 16 | d = 1 # noqa: F841, E501 -17 17 | -18 18 | # Invalid (and unimplemented or not enabled) -19 |- d = 1 # noqa: F841, W191, F821 - 19 |+ d = 1 -20 20 | -21 21 | # Invalid (but external) -22 22 | d = 1 # noqa: F841, V101 +16 | d = 1 # noqa: F841, E501 +17 | +18 | # Invalid (and unimplemented or not enabled) + - d = 1 # noqa: F841, W191, F821 +19 + d = 1 +20 | +21 | # Invalid (but external) +22 | d = 1 # noqa: F841, V101 RUF100 [*] Unused `noqa` directive (unused: `F841`) --> RUF100_0.py:22:12 @@ -94,16 +86,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`) 24 | # Invalid (but external) | help: Remove unused `noqa` directive - -ℹ Safe fix -19 19 | d = 1 # noqa: F841, W191, F821 -20 20 | -21 21 | # Invalid (but external) -22 |- d = 1 # noqa: F841, V101 - 22 |+ d = 1 # noqa: V101 -23 23 | -24 24 | # Invalid (but external) -25 25 | d = 1 # noqa: V500 +19 | d = 1 # noqa: F841, W191, F821 +20 | +21 | # Invalid (but external) + - d = 1 # noqa: F841, V101 +22 + d = 1 # noqa: V101 +23 | +24 | # Invalid (but external) +25 | d = 1 # noqa: V500 RUF100 [*] Unused `noqa` directive (unknown: `V500`) --> RUF100_0.py:25:12 @@ -115,16 +105,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `V500`) 27 | # fmt: off | help: Remove unused `noqa` directive - -ℹ Safe fix -22 22 | d = 1 # noqa: F841, V101 -23 23 | -24 24 | # Invalid (but external) -25 |- d = 1 # noqa: V500 - 25 |+ d = 1 -26 26 | -27 27 | # fmt: off -28 28 | # Invalid - no space before # +22 | d = 1 # noqa: F841, V101 +23 | +24 | # Invalid (but external) + - d = 1 # noqa: V500 +25 + d = 1 +26 | +27 | # fmt: off +28 | # Invalid - no space before # RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:29:12 @@ -137,16 +125,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 31 | # Invalid - many spaces before # | help: Remove unused `noqa` directive - -ℹ Safe fix -26 26 | -27 27 | # fmt: off -28 28 | # Invalid - no space before # -29 |- d = 1 # noqa: E501 - 29 |+ d = 1 -30 30 | -31 31 | # Invalid - many spaces before # -32 32 | d = 1 # noqa: E501 +26 | +27 | # fmt: off +28 | # Invalid - no space before # + - d = 1 # noqa: E501 +29 + d = 1 +30 | +31 | # Invalid - many spaces before # +32 | d = 1 # noqa: E501 F841 [*] Local variable `d` is assigned to but never used --> RUF100_0.py:32:5 @@ -157,15 +143,14 @@ F841 [*] Local variable `d` is assigned to but never used 33 | # fmt: on | help: Remove assignment to unused variable `d` - -ℹ Unsafe fix -29 29 | d = 1 # noqa: E501 -30 30 | -31 31 | # Invalid - many spaces before # -32 |- d = 1 # noqa: E501 -33 32 | # fmt: on -34 33 | -35 34 | +29 | d = 1 # noqa: E501 +30 | +31 | # Invalid - many spaces before # + - d = 1 # noqa: E501 +32 | # fmt: on +33 | +34 | +note: This is an unsafe fix and may change runtime behavior RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:32:12 @@ -176,16 +161,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 33 | # fmt: on | help: Remove unused `noqa` directive - -ℹ Safe fix -29 29 | d = 1 # noqa: E501 -30 30 | -31 31 | # Invalid - many spaces before # -32 |- d = 1 # noqa: E501 - 32 |+ d = 1 -33 33 | # fmt: on -34 34 | -35 35 | +29 | d = 1 # noqa: E501 +30 | +31 | # Invalid - many spaces before # + - d = 1 # noqa: E501 +32 + d = 1 +33 | # fmt: on +34 | +35 | RUF100 [*] Unused `noqa` directive (unused: `F841`) --> RUF100_0.py:58:6 @@ -197,16 +180,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`) 60 | # Invalid | help: Remove unused `noqa` directive - -ℹ Safe fix -55 55 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 -56 56 | -57 57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. -58 |-""" # noqa: E501, F841 - 58 |+""" # noqa: E501 -59 59 | -60 60 | # Invalid -61 61 | _ = """Lorem ipsum dolor sit amet. +55 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 +56 | +57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + - """ # noqa: E501, F841 +58 + """ # noqa: E501 +59 | +60 | # Invalid +61 | _ = """Lorem ipsum dolor sit amet. RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:66:6 @@ -218,16 +199,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 68 | # Invalid | help: Remove unused `noqa` directive - -ℹ Safe fix -63 63 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 -64 64 | -65 65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. -66 |-""" # noqa: E501 - 66 |+""" -67 67 | -68 68 | # Invalid -69 69 | _ = """Lorem ipsum dolor sit amet. +63 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 +64 | +65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. + - """ # noqa: E501 +66 + """ +67 | +68 | # Invalid +69 | _ = """Lorem ipsum dolor sit amet. RUF100 [*] Unused blanket `noqa` directive --> RUF100_0.py:74:6 @@ -239,16 +218,14 @@ RUF100 [*] Unused blanket `noqa` directive 76 | # Valid | help: Remove unused `noqa` directive - -ℹ Safe fix -71 71 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 -72 72 | -73 73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. -74 |-""" # noqa - 74 |+""" -75 75 | -76 76 | # Valid -77 77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment # noqa: E501 +71 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 +72 | +73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. + - """ # noqa +74 + """ +75 | +76 | # Valid +77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment # noqa: E501 F401 [*] `shelve` imported but unused --> RUF100_0.py:88:8 @@ -260,15 +237,13 @@ F401 [*] `shelve` imported but unused 89 | import sys # noqa: F401, RUF100 | help: Remove unused import: `shelve` - -ℹ Safe fix -85 85 | -86 86 | import collections # noqa -87 87 | import os # noqa: F401, RUF100 -88 |-import shelve # noqa: RUF100 -89 88 | import sys # noqa: F401, RUF100 -90 89 | -91 90 | print(sys.path) +85 | +86 | import collections # noqa +87 | import os # noqa: F401, RUF100 + - import shelve # noqa: RUF100 +88 | import sys # noqa: F401, RUF100 +89 | +90 | print(sys.path) E501 Line too long (89 > 88) --> RUF100_0.py:93:89 @@ -288,16 +263,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`) | ^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -90 90 | -91 91 | print(sys.path) -92 92 | -93 |-"shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" # noqa: F401 - 93 |+"shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" -94 94 | -95 95 | -96 96 | def f(): +90 | +91 | print(sys.path) +92 | + - "shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" # noqa: F401 +93 + "shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" +94 | +95 | +96 | def f(): RUF100 [*] Unused `noqa` directive (unknown: `E50`) --> RUF100_0.py:107:12 @@ -309,16 +282,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`) 108 | e = 1 # …noqa: E50 | help: Remove unused `noqa` directive - -ℹ Safe fix -104 104 | -105 105 | def f(): -106 106 | # Invalid - nonexistent error code with multibyte character -107 |- d = 1 # …noqa: F841, E50 - 107 |+ d = 1 # noqa: F841 -108 108 | e = 1 # …noqa: E50 -109 109 | -110 110 | +104 | +105 | def f(): +106 | # Invalid - nonexistent error code with multibyte character + - d = 1 # …noqa: F841, E50 +107 + d = 1 # noqa: F841 +108 | e = 1 # …noqa: E50 +109 | +110 | F841 [*] Local variable `e` is assigned to but never used --> RUF100_0.py:108:5 @@ -329,15 +300,14 @@ F841 [*] Local variable `e` is assigned to but never used | ^ | help: Remove assignment to unused variable `e` - -ℹ Unsafe fix -105 105 | def f(): -106 106 | # Invalid - nonexistent error code with multibyte character -107 107 | d = 1 # …noqa: F841, E50 -108 |- e = 1 # …noqa: E50 -109 108 | -110 109 | -111 110 | def f(): +105 | def f(): +106 | # Invalid - nonexistent error code with multibyte character +107 | d = 1 # …noqa: F841, E50 + - e = 1 # …noqa: E50 +108 | +109 | +110 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF100 [*] Unused `noqa` directive (unknown: `E50`) --> RUF100_0.py:108:12 @@ -348,16 +318,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`) | ^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -105 105 | def f(): -106 106 | # Invalid - nonexistent error code with multibyte character -107 107 | d = 1 # …noqa: F841, E50 -108 |- e = 1 # …noqa: E50 - 108 |+ e = 1 -109 109 | -110 110 | -111 111 | def f(): +105 | def f(): +106 | # Invalid - nonexistent error code with multibyte character +107 | d = 1 # …noqa: F841, E50 + - e = 1 # …noqa: E50 +108 + e = 1 +109 | +110 | +111 | def f(): RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`) --> RUF100_0.py:118:12 @@ -370,16 +338,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`) 120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 | help: Remove unused `noqa` directive - -ℹ Safe fix -115 115 | -116 116 | # Check duplicate code detection -117 117 | def f(): -118 |- x = 2 # noqa: F841, F841, X200 - 118 |+ x = 2 # noqa: F841 -119 119 | -120 120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 -121 121 | +115 | +116 | # Check duplicate code detection +117 | def f(): + - x = 2 # noqa: F841, F841, X200 +118 + x = 2 # noqa: F841 +119 | +120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 +121 | RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`) --> RUF100_0.py:120:19 @@ -392,16 +358,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`) 122 | z = 2 # noqa: F841 F841 F841, F841, F841 | help: Remove unused `noqa` directive - -ℹ Safe fix -117 117 | def f(): -118 118 | x = 2 # noqa: F841, F841, X200 -119 119 | -120 |- y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 - 120 |+ y = 2 == bar # noqa: SIM300, F841 -121 121 | -122 122 | z = 2 # noqa: F841 F841 F841, F841, F841 -123 123 | +117 | def f(): +118 | x = 2 # noqa: F841, F841, X200 +119 | + - y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 +120 + y = 2 == bar # noqa: SIM300, F841 +121 | +122 | z = 2 # noqa: F841 F841 F841, F841, F841 +123 | RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`) --> RUF100_0.py:122:12 @@ -414,16 +378,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`) 124 | return | help: Remove unused `noqa` directive - -ℹ Safe fix -119 119 | -120 120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 -121 121 | -122 |- z = 2 # noqa: F841 F841 F841, F841, F841 - 122 |+ z = 2 # noqa: F841 -123 123 | -124 124 | return -125 125 | +119 | +120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 +121 | + - z = 2 # noqa: F841 F841 F841, F841, F841 +122 + z = 2 # noqa: F841 +123 | +124 | return +125 | RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`) --> RUF100_0.py:129:20 @@ -436,15 +398,13 @@ RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`) 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 | help: Remove unused `noqa` directive - -ℹ Safe fix -126 126 | -127 127 | # Allow code redirects -128 128 | x = eval(command) # noqa: PGH001, S307 -129 |-x = eval(command) # noqa: S307, PGH001, S307, S307, S307 - 129 |+x = eval(command) # noqa: S307, PGH001 -130 130 | x = eval(command) # noqa: PGH001, S307, PGH001 -131 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 +126 | +127 | # Allow code redirects +128 | x = eval(command) # noqa: PGH001, S307 + - x = eval(command) # noqa: S307, PGH001, S307, S307, S307 +129 + x = eval(command) # noqa: S307, PGH001 +130 | x = eval(command) # noqa: PGH001, S307, PGH001 +131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`) --> RUF100_0.py:130:20 @@ -456,14 +416,12 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`) 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 | help: Remove unused `noqa` directive - -ℹ Safe fix -127 127 | # Allow code redirects -128 128 | x = eval(command) # noqa: PGH001, S307 -129 129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 -130 |-x = eval(command) # noqa: PGH001, S307, PGH001 - 130 |+x = eval(command) # noqa: PGH001, S307 -131 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 +127 | # Allow code redirects +128 | x = eval(command) # noqa: PGH001, S307 +129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 + - x = eval(command) # noqa: PGH001, S307, PGH001 +130 + x = eval(command) # noqa: PGH001, S307 +131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`) --> RUF100_0.py:131:20 @@ -474,10 +432,8 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -128 128 | x = eval(command) # noqa: PGH001, S307 -129 129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 -130 130 | x = eval(command) # noqa: PGH001, S307, PGH001 -131 |-x = eval(command) # noqa: PGH001, S307, PGH001, S307 - 131 |+x = eval(command) # noqa: PGH001, S307 +128 | x = eval(command) # noqa: PGH001, S307 +129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 +130 | x = eval(command) # noqa: PGH001, S307, PGH001 + - x = eval(command) # noqa: PGH001, S307, PGH001, S307 +131 + x = eval(command) # noqa: PGH001, S307 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap index 2b582730bc..4ff79c6ebc 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_0_prefix.snap @@ -10,16 +10,14 @@ RUF100 [*] Unused blanket `noqa` directive 10 | print(c) | help: Remove unused `noqa` directive - -ℹ Safe fix -6 6 | b = 2 # noqa: F841 -7 7 | -8 8 | # Invalid -9 |- c = 1 # noqa - 9 |+ c = 1 -10 10 | print(c) -11 11 | -12 12 | # Invalid +6 | b = 2 # noqa: F841 +7 | +8 | # Invalid + - c = 1 # noqa +9 + c = 1 +10 | print(c) +11 | +12 | # Invalid RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:13:12 @@ -31,16 +29,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 15 | # Invalid | help: Remove unused `noqa` directive - -ℹ Safe fix -10 10 | print(c) -11 11 | -12 12 | # Invalid -13 |- d = 1 # noqa: E501 - 13 |+ d = 1 -14 14 | -15 15 | # Invalid -16 16 | d = 1 # noqa: F841, E501 +10 | print(c) +11 | +12 | # Invalid + - d = 1 # noqa: E501 +13 + d = 1 +14 | +15 | # Invalid +16 | d = 1 # noqa: F841, E501 RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`) --> RUF100_0.py:16:12 @@ -52,16 +48,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `E501`) 18 | # Invalid (and unimplemented or not enabled) | help: Remove unused `noqa` directive - -ℹ Safe fix -13 13 | d = 1 # noqa: E501 -14 14 | -15 15 | # Invalid -16 |- d = 1 # noqa: F841, E501 - 16 |+ d = 1 -17 17 | -18 18 | # Invalid (and unimplemented or not enabled) -19 19 | d = 1 # noqa: F841, W191, F821 +13 | d = 1 # noqa: E501 +14 | +15 | # Invalid + - d = 1 # noqa: F841, E501 +16 + d = 1 +17 | +18 | # Invalid (and unimplemented or not enabled) +19 | d = 1 # noqa: F841, W191, F821 RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`) --> RUF100_0.py:19:12 @@ -73,16 +67,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`, `W191`; non-enabled: `F821`) 21 | # Invalid (but external) | help: Remove unused `noqa` directive - -ℹ Safe fix -16 16 | d = 1 # noqa: F841, E501 -17 17 | -18 18 | # Invalid (and unimplemented or not enabled) -19 |- d = 1 # noqa: F841, W191, F821 - 19 |+ d = 1 -20 20 | -21 21 | # Invalid (but external) -22 22 | d = 1 # noqa: F841, V101 +16 | d = 1 # noqa: F841, E501 +17 | +18 | # Invalid (and unimplemented or not enabled) + - d = 1 # noqa: F841, W191, F821 +19 + d = 1 +20 | +21 | # Invalid (but external) +22 | d = 1 # noqa: F841, V101 RUF100 [*] Unused `noqa` directive (unused: `F841`) --> RUF100_0.py:22:12 @@ -94,16 +86,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`) 24 | # Invalid (but external) | help: Remove unused `noqa` directive - -ℹ Safe fix -19 19 | d = 1 # noqa: F841, W191, F821 -20 20 | -21 21 | # Invalid (but external) -22 |- d = 1 # noqa: F841, V101 - 22 |+ d = 1 # noqa: V101 -23 23 | -24 24 | # Invalid (but external) -25 25 | d = 1 # noqa: V500 +19 | d = 1 # noqa: F841, W191, F821 +20 | +21 | # Invalid (but external) + - d = 1 # noqa: F841, V101 +22 + d = 1 # noqa: V101 +23 | +24 | # Invalid (but external) +25 | d = 1 # noqa: V500 RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:29:12 @@ -116,16 +106,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 31 | # Invalid - many spaces before # | help: Remove unused `noqa` directive - -ℹ Safe fix -26 26 | -27 27 | # fmt: off -28 28 | # Invalid - no space before # -29 |- d = 1 # noqa: E501 - 29 |+ d = 1 -30 30 | -31 31 | # Invalid - many spaces before # -32 32 | d = 1 # noqa: E501 +26 | +27 | # fmt: off +28 | # Invalid - no space before # + - d = 1 # noqa: E501 +29 + d = 1 +30 | +31 | # Invalid - many spaces before # +32 | d = 1 # noqa: E501 F841 [*] Local variable `d` is assigned to but never used --> RUF100_0.py:32:5 @@ -136,15 +124,14 @@ F841 [*] Local variable `d` is assigned to but never used 33 | # fmt: on | help: Remove assignment to unused variable `d` - -ℹ Unsafe fix -29 29 | d = 1 # noqa: E501 -30 30 | -31 31 | # Invalid - many spaces before # -32 |- d = 1 # noqa: E501 -33 32 | # fmt: on -34 33 | -35 34 | +29 | d = 1 # noqa: E501 +30 | +31 | # Invalid - many spaces before # + - d = 1 # noqa: E501 +32 | # fmt: on +33 | +34 | +note: This is an unsafe fix and may change runtime behavior RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:32:12 @@ -155,16 +142,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 33 | # fmt: on | help: Remove unused `noqa` directive - -ℹ Safe fix -29 29 | d = 1 # noqa: E501 -30 30 | -31 31 | # Invalid - many spaces before # -32 |- d = 1 # noqa: E501 - 32 |+ d = 1 -33 33 | # fmt: on -34 34 | -35 35 | +29 | d = 1 # noqa: E501 +30 | +31 | # Invalid - many spaces before # + - d = 1 # noqa: E501 +32 + d = 1 +33 | # fmt: on +34 | +35 | RUF100 [*] Unused `noqa` directive (unused: `F841`) --> RUF100_0.py:58:6 @@ -176,16 +161,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F841`) 60 | # Invalid | help: Remove unused `noqa` directive - -ℹ Safe fix -55 55 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 -56 56 | -57 57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. -58 |-""" # noqa: E501, F841 - 58 |+""" # noqa: E501 -59 59 | -60 60 | # Invalid -61 61 | _ = """Lorem ipsum dolor sit amet. +55 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 +56 | +57 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + - """ # noqa: E501, F841 +58 + """ # noqa: E501 +59 | +60 | # Invalid +61 | _ = """Lorem ipsum dolor sit amet. RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_0.py:66:6 @@ -197,16 +180,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 68 | # Invalid | help: Remove unused `noqa` directive - -ℹ Safe fix -63 63 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 -64 64 | -65 65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. -66 |-""" # noqa: E501 - 66 |+""" -67 67 | -68 68 | # Invalid -69 69 | _ = """Lorem ipsum dolor sit amet. +63 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 +64 | +65 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. + - """ # noqa: E501 +66 + """ +67 | +68 | # Invalid +69 | _ = """Lorem ipsum dolor sit amet. RUF100 [*] Unused blanket `noqa` directive --> RUF100_0.py:74:6 @@ -218,16 +199,14 @@ RUF100 [*] Unused blanket `noqa` directive 76 | # Valid | help: Remove unused `noqa` directive - -ℹ Safe fix -71 71 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 -72 72 | -73 73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. -74 |-""" # noqa - 74 |+""" -75 75 | -76 76 | # Valid -77 77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment # noqa: E501 +71 | https://github.com/PyCQA/pycodestyle/pull/258/files#diff-841c622497a8033d10152bfdfb15b20b92437ecdea21a260944ea86b77b51533 +72 | +73 | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor. + - """ # noqa +74 + """ +75 | +76 | # Valid +77 | # this is a veryyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy long comment # noqa: E501 F401 [*] `shelve` imported but unused --> RUF100_0.py:88:8 @@ -239,15 +218,13 @@ F401 [*] `shelve` imported but unused 89 | import sys # noqa: F401, RUF100 | help: Remove unused import: `shelve` - -ℹ Safe fix -85 85 | -86 86 | import collections # noqa -87 87 | import os # noqa: F401, RUF100 -88 |-import shelve # noqa: RUF100 -89 88 | import sys # noqa: F401, RUF100 -90 89 | -91 90 | print(sys.path) +85 | +86 | import collections # noqa +87 | import os # noqa: F401, RUF100 + - import shelve # noqa: RUF100 +88 | import sys # noqa: F401, RUF100 +89 | +90 | print(sys.path) E501 Line too long (89 > 88) --> RUF100_0.py:93:89 @@ -267,16 +244,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`) | ^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -90 90 | -91 91 | print(sys.path) -92 92 | -93 |-"shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" # noqa: F401 - 93 |+"shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" -94 94 | -95 95 | -96 96 | def f(): +90 | +91 | print(sys.path) +92 | + - "shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" # noqa: F401 +93 + "shape: (6,)\nSeries: '' [duration[μs]]\n[\n\t0µs\n\t1µs\n\t2µs\n\t3µs\n\t4µs\n\t5µs\n]" +94 | +95 | +96 | def f(): RUF100 [*] Unused `noqa` directive (unknown: `E50`) --> RUF100_0.py:107:12 @@ -288,16 +263,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`) 108 | e = 1 # …noqa: E50 | help: Remove unused `noqa` directive - -ℹ Safe fix -104 104 | -105 105 | def f(): -106 106 | # Invalid - nonexistent error code with multibyte character -107 |- d = 1 # …noqa: F841, E50 - 107 |+ d = 1 # noqa: F841 -108 108 | e = 1 # …noqa: E50 -109 109 | -110 110 | +104 | +105 | def f(): +106 | # Invalid - nonexistent error code with multibyte character + - d = 1 # …noqa: F841, E50 +107 + d = 1 # noqa: F841 +108 | e = 1 # …noqa: E50 +109 | +110 | F841 [*] Local variable `e` is assigned to but never used --> RUF100_0.py:108:5 @@ -308,15 +281,14 @@ F841 [*] Local variable `e` is assigned to but never used | ^ | help: Remove assignment to unused variable `e` - -ℹ Unsafe fix -105 105 | def f(): -106 106 | # Invalid - nonexistent error code with multibyte character -107 107 | d = 1 # …noqa: F841, E50 -108 |- e = 1 # …noqa: E50 -109 108 | -110 109 | -111 110 | def f(): +105 | def f(): +106 | # Invalid - nonexistent error code with multibyte character +107 | d = 1 # …noqa: F841, E50 + - e = 1 # …noqa: E50 +108 | +109 | +110 | def f(): +note: This is an unsafe fix and may change runtime behavior RUF100 [*] Unused `noqa` directive (unknown: `E50`) --> RUF100_0.py:108:12 @@ -327,16 +299,14 @@ RUF100 [*] Unused `noqa` directive (unknown: `E50`) | ^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -105 105 | def f(): -106 106 | # Invalid - nonexistent error code with multibyte character -107 107 | d = 1 # …noqa: F841, E50 -108 |- e = 1 # …noqa: E50 - 108 |+ e = 1 -109 109 | -110 110 | -111 111 | def f(): +105 | def f(): +106 | # Invalid - nonexistent error code with multibyte character +107 | d = 1 # …noqa: F841, E50 + - e = 1 # …noqa: E50 +108 + e = 1 +109 | +110 | +111 | def f(): RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`) --> RUF100_0.py:118:12 @@ -349,16 +319,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`; unknown: `X200`) 120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 | help: Remove unused `noqa` directive - -ℹ Safe fix -115 115 | -116 116 | # Check duplicate code detection -117 117 | def f(): -118 |- x = 2 # noqa: F841, F841, X200 - 118 |+ x = 2 # noqa: F841 -119 119 | -120 120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 -121 121 | +115 | +116 | # Check duplicate code detection +117 | def f(): + - x = 2 # noqa: F841, F841, X200 +118 + x = 2 # noqa: F841 +119 | +120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 +121 | RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`) --> RUF100_0.py:120:19 @@ -371,16 +339,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `SIM300`, `SIM300`) 122 | z = 2 # noqa: F841 F841 F841, F841, F841 | help: Remove unused `noqa` directive - -ℹ Safe fix -117 117 | def f(): -118 118 | x = 2 # noqa: F841, F841, X200 -119 119 | -120 |- y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 - 120 |+ y = 2 == bar # noqa: SIM300, F841 -121 121 | -122 122 | z = 2 # noqa: F841 F841 F841, F841, F841 -123 123 | +117 | def f(): +118 | x = 2 # noqa: F841, F841, X200 +119 | + - y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 +120 + y = 2 == bar # noqa: SIM300, F841 +121 | +122 | z = 2 # noqa: F841 F841 F841, F841, F841 +123 | RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`) --> RUF100_0.py:122:12 @@ -393,16 +359,14 @@ RUF100 [*] Unused `noqa` directive (duplicated: `F841`, `F841`, `F841`, `F841`) 124 | return | help: Remove unused `noqa` directive - -ℹ Safe fix -119 119 | -120 120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 -121 121 | -122 |- z = 2 # noqa: F841 F841 F841, F841, F841 - 122 |+ z = 2 # noqa: F841 -123 123 | -124 124 | return -125 125 | +119 | +120 | y = 2 == bar # noqa: SIM300, F841, SIM300, SIM300 +121 | + - z = 2 # noqa: F841 F841 F841, F841, F841 +122 + z = 2 # noqa: F841 +123 | +124 | return +125 | RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`) --> RUF100_0.py:129:20 @@ -415,15 +379,13 @@ RUF100 [*] Unused `noqa` directive (duplicated: `S307`, `S307`, `S307`) 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 | help: Remove unused `noqa` directive - -ℹ Safe fix -126 126 | -127 127 | # Allow code redirects -128 128 | x = eval(command) # noqa: PGH001, S307 -129 |-x = eval(command) # noqa: S307, PGH001, S307, S307, S307 - 129 |+x = eval(command) # noqa: S307, PGH001 -130 130 | x = eval(command) # noqa: PGH001, S307, PGH001 -131 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 +126 | +127 | # Allow code redirects +128 | x = eval(command) # noqa: PGH001, S307 + - x = eval(command) # noqa: S307, PGH001, S307, S307, S307 +129 + x = eval(command) # noqa: S307, PGH001 +130 | x = eval(command) # noqa: PGH001, S307, PGH001 +131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`) --> RUF100_0.py:130:20 @@ -435,14 +397,12 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`) 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 | help: Remove unused `noqa` directive - -ℹ Safe fix -127 127 | # Allow code redirects -128 128 | x = eval(command) # noqa: PGH001, S307 -129 129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 -130 |-x = eval(command) # noqa: PGH001, S307, PGH001 - 130 |+x = eval(command) # noqa: PGH001, S307 -131 131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 +127 | # Allow code redirects +128 | x = eval(command) # noqa: PGH001, S307 +129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 + - x = eval(command) # noqa: PGH001, S307, PGH001 +130 + x = eval(command) # noqa: PGH001, S307 +131 | x = eval(command) # noqa: PGH001, S307, PGH001, S307 RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`) --> RUF100_0.py:131:20 @@ -453,10 +413,8 @@ RUF100 [*] Unused `noqa` directive (duplicated: `PGH001`, `S307`) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -128 128 | x = eval(command) # noqa: PGH001, S307 -129 129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 -130 130 | x = eval(command) # noqa: PGH001, S307, PGH001 -131 |-x = eval(command) # noqa: PGH001, S307, PGH001, S307 - 131 |+x = eval(command) # noqa: PGH001, S307 +128 | x = eval(command) # noqa: PGH001, S307 +129 | x = eval(command) # noqa: S307, PGH001, S307, S307, S307 +130 | x = eval(command) # noqa: PGH001, S307, PGH001 + - x = eval(command) # noqa: PGH001, S307, PGH001, S307 +131 + x = eval(command) # noqa: PGH001, S307 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap index e08e0b0fb3..ebcef60b15 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_1.snap @@ -11,17 +11,15 @@ F401 [*] `typing.Union` imported but unused 38 | ) | help: Remove unused import: `typing.Union` - -ℹ Safe fix -34 34 | # This should ignore the first error. -35 35 | from typing import ( -36 36 | Mapping, # noqa: F401 -37 |- Union, -38 |- ) - 37 |+ ) -39 38 | -40 39 | -41 40 | def f(): +34 | # This should ignore the first error. +35 | from typing import ( +36 | Mapping, # noqa: F401 + - Union, + - ) +37 + ) +38 | +39 | +40 | def f(): RUF100 [*] Unused `noqa` directive (unused: `F401`) --> RUF100_1.py:52:20 @@ -33,16 +31,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`) 53 | ) | help: Remove unused `noqa` directive - -ℹ Safe fix -49 49 | def f(): -50 50 | # This should ignore the error, but the inner noqa should be marked as unused. -51 51 | from typing import ( # noqa: F401 -52 |- Optional, # noqa: F401 - 52 |+ Optional, -53 53 | ) -54 54 | -55 55 | +49 | def f(): +50 | # This should ignore the error, but the inner noqa should be marked as unused. +51 | from typing import ( # noqa: F401 + - Optional, # noqa: F401 +52 + Optional, +53 | ) +54 | +55 | RUF100 [*] Unused `noqa` directive (unused: `F401`) --> RUF100_1.py:59:20 @@ -54,16 +50,14 @@ RUF100 [*] Unused `noqa` directive (unused: `F401`) 60 | ) | help: Remove unused `noqa` directive - -ℹ Safe fix -56 56 | def f(): -57 57 | # This should ignore the error, but the inner noqa should be marked as unused. -58 58 | from typing import ( # noqa -59 |- Optional, # noqa: F401 - 59 |+ Optional, -60 60 | ) -61 61 | -62 62 | +56 | def f(): +57 | # This should ignore the error, but the inner noqa should be marked as unused. +58 | from typing import ( # noqa + - Optional, # noqa: F401 +59 + Optional, +60 | ) +61 | +62 | RUF100 [*] Unused `noqa` directive (non-enabled: `F501`) --> RUF100_1.py:66:16 @@ -75,16 +69,14 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F501`) 67 | ) | help: Remove unused `noqa` directive - -ℹ Safe fix -63 63 | def f(): -64 64 | # This should ignore the error, but mark F501 as unused. -65 65 | from typing import ( # noqa: F401 -66 |- Dict, # noqa: F501 - 66 |+ Dict, -67 67 | ) -68 68 | -69 69 | +63 | def f(): +64 | # This should ignore the error, but mark F501 as unused. +65 | from typing import ( # noqa: F401 + - Dict, # noqa: F501 +66 + Dict, +67 | ) +68 | +69 | RUF100 [*] Unused `noqa` directive (non-enabled: `F501`) --> RUF100_1.py:72:27 @@ -97,16 +89,14 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F501`) 74 | ) | help: Remove unused `noqa` directive - -ℹ Safe fix -69 69 | -70 70 | def f(): -71 71 | # This should ignore the error, but mark F501 as unused. -72 |- from typing import ( # noqa: F501 - 72 |+ from typing import ( -73 73 | Tuple, # noqa: F401 -74 74 | ) -75 75 | +69 | +70 | def f(): +71 | # This should ignore the error, but mark F501 as unused. + - from typing import ( # noqa: F501 +72 + from typing import ( +73 | Tuple, # noqa: F401 +74 | ) +75 | F401 [*] `typing.Awaitable` imported but unused --> RUF100_1.py:89:24 @@ -117,13 +107,11 @@ F401 [*] `typing.Awaitable` imported but unused | ^^^^^^^^^ | help: Remove unused import - -ℹ Safe fix -86 86 | -87 87 | def f(): -88 88 | # This should mark F501 as unused. -89 |- from typing import Awaitable, AwaitableGenerator # noqa: F501 - 89 |+ pass # noqa: F501 +86 | +87 | def f(): +88 | # This should mark F501 as unused. + - from typing import Awaitable, AwaitableGenerator # noqa: F501 +89 + pass # noqa: F501 F401 [*] `typing.AwaitableGenerator` imported but unused --> RUF100_1.py:89:35 @@ -134,13 +122,11 @@ F401 [*] `typing.AwaitableGenerator` imported but unused | ^^^^^^^^^^^^^^^^^^ | help: Remove unused import - -ℹ Safe fix -86 86 | -87 87 | def f(): -88 88 | # This should mark F501 as unused. -89 |- from typing import Awaitable, AwaitableGenerator # noqa: F501 - 89 |+ pass # noqa: F501 +86 | +87 | def f(): +88 | # This should mark F501 as unused. + - from typing import Awaitable, AwaitableGenerator # noqa: F501 +89 + pass # noqa: F501 RUF100 [*] Unused `noqa` directive (non-enabled: `F501`) --> RUF100_1.py:89:55 @@ -151,10 +137,8 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F501`) | ^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -86 86 | -87 87 | def f(): -88 88 | # This should mark F501 as unused. -89 |- from typing import Awaitable, AwaitableGenerator # noqa: F501 - 89 |+ from typing import Awaitable, AwaitableGenerator +86 | +87 | def f(): +88 | # This should mark F501 as unused. + - from typing import Awaitable, AwaitableGenerator # noqa: F501 +89 + from typing import Awaitable, AwaitableGenerator diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap index 01c4a00b32..788a7adb39 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_2.snap @@ -8,7 +8,5 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F401`) | ^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -1 |-import itertools # noqa: F401 - 1 |+import itertools + - import itertools # noqa: F401 +1 + import itertools diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap index 0f41808525..1b289a01e0 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_3.snap @@ -10,12 +10,10 @@ RUF100 [*] Unused blanket `noqa` directive 3 | print() # noqa | help: Remove unused `noqa` directive - -ℹ Safe fix -1 |-# noqa -2 1 | # noqa # comment -3 2 | print() # noqa -4 3 | print() # noqa # comment + - # noqa +1 | # noqa # comment +2 | print() # noqa +3 | print() # noqa # comment RUF100 [*] Unused blanket `noqa` directive --> RUF100_3.py:2:1 @@ -27,14 +25,12 @@ RUF100 [*] Unused blanket `noqa` directive 4 | print() # noqa # comment | help: Remove unused `noqa` directive - -ℹ Safe fix -1 1 | # noqa -2 |-# noqa # comment - 2 |+# comment -3 3 | print() # noqa -4 4 | print() # noqa # comment -5 5 | print() # noqa # comment +1 | # noqa + - # noqa # comment +2 + # comment +3 | print() # noqa +4 | print() # noqa # comment +5 | print() # noqa # comment RUF100 [*] Unused blanket `noqa` directive --> RUF100_3.py:3:10 @@ -47,15 +43,13 @@ RUF100 [*] Unused blanket `noqa` directive 5 | print() # noqa # comment | help: Remove unused `noqa` directive - -ℹ Safe fix -1 1 | # noqa -2 2 | # noqa # comment -3 |-print() # noqa - 3 |+print() -4 4 | print() # noqa # comment -5 5 | print() # noqa # comment -6 6 | print() # noqa comment +1 | # noqa +2 | # noqa # comment + - print() # noqa +3 + print() +4 | print() # noqa # comment +5 | print() # noqa # comment +6 | print() # noqa comment RUF100 [*] Unused blanket `noqa` directive --> RUF100_3.py:4:10 @@ -68,16 +62,14 @@ RUF100 [*] Unused blanket `noqa` directive 6 | print() # noqa comment | help: Remove unused `noqa` directive - -ℹ Safe fix -1 1 | # noqa -2 2 | # noqa # comment -3 3 | print() # noqa -4 |-print() # noqa # comment - 4 |+print() # comment -5 5 | print() # noqa # comment -6 6 | print() # noqa comment -7 7 | print() # noqa comment +1 | # noqa +2 | # noqa # comment +3 | print() # noqa + - print() # noqa # comment +4 + print() # comment +5 | print() # noqa # comment +6 | print() # noqa comment +7 | print() # noqa comment RUF100 [*] Unused blanket `noqa` directive --> RUF100_3.py:5:10 @@ -90,16 +82,14 @@ RUF100 [*] Unused blanket `noqa` directive 7 | print() # noqa comment | help: Remove unused `noqa` directive - -ℹ Safe fix -2 2 | # noqa # comment -3 3 | print() # noqa -4 4 | print() # noqa # comment -5 |-print() # noqa # comment - 5 |+print() # comment -6 6 | print() # noqa comment -7 7 | print() # noqa comment -8 8 | print(a) # noqa +2 | # noqa # comment +3 | print() # noqa +4 | print() # noqa # comment + - print() # noqa # comment +5 + print() # comment +6 | print() # noqa comment +7 | print() # noqa comment +8 | print(a) # noqa RUF100 [*] Unused blanket `noqa` directive --> RUF100_3.py:6:10 @@ -112,16 +102,14 @@ RUF100 [*] Unused blanket `noqa` directive 8 | print(a) # noqa | help: Remove unused `noqa` directive - -ℹ Safe fix -3 3 | print() # noqa -4 4 | print() # noqa # comment -5 5 | print() # noqa # comment -6 |-print() # noqa comment - 6 |+print() -7 7 | print() # noqa comment -8 8 | print(a) # noqa -9 9 | print(a) # noqa # comment +3 | print() # noqa +4 | print() # noqa # comment +5 | print() # noqa # comment + - print() # noqa comment +6 + print() +7 | print() # noqa comment +8 | print(a) # noqa +9 | print(a) # noqa # comment RUF100 [*] Unused blanket `noqa` directive --> RUF100_3.py:7:10 @@ -134,16 +122,14 @@ RUF100 [*] Unused blanket `noqa` directive 9 | print(a) # noqa # comment | help: Remove unused `noqa` directive - -ℹ Safe fix -4 4 | print() # noqa # comment -5 5 | print() # noqa # comment -6 6 | print() # noqa comment -7 |-print() # noqa comment - 7 |+print() -8 8 | print(a) # noqa -9 9 | print(a) # noqa # comment -10 10 | print(a) # noqa # comment +4 | print() # noqa # comment +5 | print() # noqa # comment +6 | print() # noqa comment + - print() # noqa comment +7 + print() +8 | print(a) # noqa +9 | print(a) # noqa # comment +10 | print(a) # noqa # comment RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) --> RUF100_3.py:14:1 @@ -156,15 +142,13 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) 16 | print() # noqa: E501, F821 | help: Remove unused `noqa` directive - -ℹ Safe fix -11 11 | print(a) # noqa comment -12 12 | print(a) # noqa comment -13 13 | -14 |-# noqa: E501, F821 -15 14 | # noqa: E501, F821 # comment -16 15 | print() # noqa: E501, F821 -17 16 | print() # noqa: E501, F821 # comment +11 | print(a) # noqa comment +12 | print(a) # noqa comment +13 | + - # noqa: E501, F821 +14 | # noqa: E501, F821 # comment +15 | print() # noqa: E501, F821 +16 | print() # noqa: E501, F821 # comment RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) --> RUF100_3.py:15:1 @@ -176,16 +160,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) 17 | print() # noqa: E501, F821 # comment | help: Remove unused `noqa` directive - -ℹ Safe fix -12 12 | print(a) # noqa comment -13 13 | -14 14 | # noqa: E501, F821 -15 |-# noqa: E501, F821 # comment - 15 |+# comment -16 16 | print() # noqa: E501, F821 -17 17 | print() # noqa: E501, F821 # comment -18 18 | print() # noqa: E501, F821 # comment +12 | print(a) # noqa comment +13 | +14 | # noqa: E501, F821 + - # noqa: E501, F821 # comment +15 + # comment +16 | print() # noqa: E501, F821 +17 | print() # noqa: E501, F821 # comment +18 | print() # noqa: E501, F821 # comment RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) --> RUF100_3.py:16:10 @@ -198,16 +180,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) 18 | print() # noqa: E501, F821 # comment | help: Remove unused `noqa` directive - -ℹ Safe fix -13 13 | -14 14 | # noqa: E501, F821 -15 15 | # noqa: E501, F821 # comment -16 |-print() # noqa: E501, F821 - 16 |+print() -17 17 | print() # noqa: E501, F821 # comment -18 18 | print() # noqa: E501, F821 # comment -19 19 | print() # noqa: E501, F821 comment +13 | +14 | # noqa: E501, F821 +15 | # noqa: E501, F821 # comment + - print() # noqa: E501, F821 +16 + print() +17 | print() # noqa: E501, F821 # comment +18 | print() # noqa: E501, F821 # comment +19 | print() # noqa: E501, F821 comment RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) --> RUF100_3.py:17:10 @@ -220,16 +200,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) 19 | print() # noqa: E501, F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -14 14 | # noqa: E501, F821 -15 15 | # noqa: E501, F821 # comment -16 16 | print() # noqa: E501, F821 -17 |-print() # noqa: E501, F821 # comment - 17 |+print() # comment -18 18 | print() # noqa: E501, F821 # comment -19 19 | print() # noqa: E501, F821 comment -20 20 | print() # noqa: E501, F821 comment +14 | # noqa: E501, F821 +15 | # noqa: E501, F821 # comment +16 | print() # noqa: E501, F821 + - print() # noqa: E501, F821 # comment +17 + print() # comment +18 | print() # noqa: E501, F821 # comment +19 | print() # noqa: E501, F821 comment +20 | print() # noqa: E501, F821 comment RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) --> RUF100_3.py:18:10 @@ -242,16 +220,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) 20 | print() # noqa: E501, F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -15 15 | # noqa: E501, F821 # comment -16 16 | print() # noqa: E501, F821 -17 17 | print() # noqa: E501, F821 # comment -18 |-print() # noqa: E501, F821 # comment - 18 |+print() # comment -19 19 | print() # noqa: E501, F821 comment -20 20 | print() # noqa: E501, F821 comment -21 21 | print(a) # noqa: E501, F821 +15 | # noqa: E501, F821 # comment +16 | print() # noqa: E501, F821 +17 | print() # noqa: E501, F821 # comment + - print() # noqa: E501, F821 # comment +18 + print() # comment +19 | print() # noqa: E501, F821 comment +20 | print() # noqa: E501, F821 comment +21 | print(a) # noqa: E501, F821 RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) --> RUF100_3.py:19:10 @@ -264,16 +240,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) 21 | print(a) # noqa: E501, F821 | help: Remove unused `noqa` directive - -ℹ Safe fix -16 16 | print() # noqa: E501, F821 -17 17 | print() # noqa: E501, F821 # comment -18 18 | print() # noqa: E501, F821 # comment -19 |-print() # noqa: E501, F821 comment - 19 |+print() -20 20 | print() # noqa: E501, F821 comment -21 21 | print(a) # noqa: E501, F821 -22 22 | print(a) # noqa: E501, F821 # comment +16 | print() # noqa: E501, F821 +17 | print() # noqa: E501, F821 # comment +18 | print() # noqa: E501, F821 # comment + - print() # noqa: E501, F821 comment +19 + print() +20 | print() # noqa: E501, F821 comment +21 | print(a) # noqa: E501, F821 +22 | print(a) # noqa: E501, F821 # comment RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) --> RUF100_3.py:20:10 @@ -286,16 +260,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`, `F821`) 22 | print(a) # noqa: E501, F821 # comment | help: Remove unused `noqa` directive - -ℹ Safe fix -17 17 | print() # noqa: E501, F821 # comment -18 18 | print() # noqa: E501, F821 # comment -19 19 | print() # noqa: E501, F821 comment -20 |-print() # noqa: E501, F821 comment - 20 |+print() -21 21 | print(a) # noqa: E501, F821 -22 22 | print(a) # noqa: E501, F821 # comment -23 23 | print(a) # noqa: E501, F821 # comment +17 | print() # noqa: E501, F821 # comment +18 | print() # noqa: E501, F821 # comment +19 | print() # noqa: E501, F821 comment + - print() # noqa: E501, F821 comment +20 + print() +21 | print(a) # noqa: E501, F821 +22 | print(a) # noqa: E501, F821 # comment +23 | print(a) # noqa: E501, F821 # comment RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:21:11 @@ -308,16 +280,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 23 | print(a) # noqa: E501, F821 # comment | help: Remove unused `noqa` directive - -ℹ Safe fix -18 18 | print() # noqa: E501, F821 # comment -19 19 | print() # noqa: E501, F821 comment -20 20 | print() # noqa: E501, F821 comment -21 |-print(a) # noqa: E501, F821 - 21 |+print(a) # noqa: F821 -22 22 | print(a) # noqa: E501, F821 # comment -23 23 | print(a) # noqa: E501, F821 # comment -24 24 | print(a) # noqa: E501, F821 comment +18 | print() # noqa: E501, F821 # comment +19 | print() # noqa: E501, F821 comment +20 | print() # noqa: E501, F821 comment + - print(a) # noqa: E501, F821 +21 + print(a) # noqa: F821 +22 | print(a) # noqa: E501, F821 # comment +23 | print(a) # noqa: E501, F821 # comment +24 | print(a) # noqa: E501, F821 comment RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:22:11 @@ -330,16 +300,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 24 | print(a) # noqa: E501, F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -19 19 | print() # noqa: E501, F821 comment -20 20 | print() # noqa: E501, F821 comment -21 21 | print(a) # noqa: E501, F821 -22 |-print(a) # noqa: E501, F821 # comment - 22 |+print(a) # noqa: F821 # comment -23 23 | print(a) # noqa: E501, F821 # comment -24 24 | print(a) # noqa: E501, F821 comment -25 25 | print(a) # noqa: E501, F821 comment +19 | print() # noqa: E501, F821 comment +20 | print() # noqa: E501, F821 comment +21 | print(a) # noqa: E501, F821 + - print(a) # noqa: E501, F821 # comment +22 + print(a) # noqa: F821 # comment +23 | print(a) # noqa: E501, F821 # comment +24 | print(a) # noqa: E501, F821 comment +25 | print(a) # noqa: E501, F821 comment RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:23:11 @@ -352,16 +320,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 25 | print(a) # noqa: E501, F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -20 20 | print() # noqa: E501, F821 comment -21 21 | print(a) # noqa: E501, F821 -22 22 | print(a) # noqa: E501, F821 # comment -23 |-print(a) # noqa: E501, F821 # comment - 23 |+print(a) # noqa: F821 # comment -24 24 | print(a) # noqa: E501, F821 comment -25 25 | print(a) # noqa: E501, F821 comment -26 26 | print(a) # noqa: E501,,F821 comment +20 | print() # noqa: E501, F821 comment +21 | print(a) # noqa: E501, F821 +22 | print(a) # noqa: E501, F821 # comment + - print(a) # noqa: E501, F821 # comment +23 + print(a) # noqa: F821 # comment +24 | print(a) # noqa: E501, F821 comment +25 | print(a) # noqa: E501, F821 comment +26 | print(a) # noqa: E501,,F821 comment RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:24:11 @@ -374,16 +340,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 26 | print(a) # noqa: E501,,F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -21 21 | print(a) # noqa: E501, F821 -22 22 | print(a) # noqa: E501, F821 # comment -23 23 | print(a) # noqa: E501, F821 # comment -24 |-print(a) # noqa: E501, F821 comment - 24 |+print(a) # noqa: F821 comment -25 25 | print(a) # noqa: E501, F821 comment -26 26 | print(a) # noqa: E501,,F821 comment -27 27 | print(a) # noqa: E501, ,F821 comment +21 | print(a) # noqa: E501, F821 +22 | print(a) # noqa: E501, F821 # comment +23 | print(a) # noqa: E501, F821 # comment + - print(a) # noqa: E501, F821 comment +24 + print(a) # noqa: F821 comment +25 | print(a) # noqa: E501, F821 comment +26 | print(a) # noqa: E501,,F821 comment +27 | print(a) # noqa: E501, ,F821 comment RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:25:11 @@ -396,16 +360,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 27 | print(a) # noqa: E501, ,F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -22 22 | print(a) # noqa: E501, F821 # comment -23 23 | print(a) # noqa: E501, F821 # comment -24 24 | print(a) # noqa: E501, F821 comment -25 |-print(a) # noqa: E501, F821 comment - 25 |+print(a) # noqa: F821 comment -26 26 | print(a) # noqa: E501,,F821 comment -27 27 | print(a) # noqa: E501, ,F821 comment -28 28 | print(a) # noqa: E501 F821 comment +22 | print(a) # noqa: E501, F821 # comment +23 | print(a) # noqa: E501, F821 # comment +24 | print(a) # noqa: E501, F821 comment + - print(a) # noqa: E501, F821 comment +25 + print(a) # noqa: F821 comment +26 | print(a) # noqa: E501,,F821 comment +27 | print(a) # noqa: E501, ,F821 comment +28 | print(a) # noqa: E501 F821 comment RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:26:11 @@ -418,16 +380,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 28 | print(a) # noqa: E501 F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -23 23 | print(a) # noqa: E501, F821 # comment -24 24 | print(a) # noqa: E501, F821 comment -25 25 | print(a) # noqa: E501, F821 comment -26 |-print(a) # noqa: E501,,F821 comment - 26 |+print(a) # noqa: F821 comment -27 27 | print(a) # noqa: E501, ,F821 comment -28 28 | print(a) # noqa: E501 F821 comment -29 29 | +23 | print(a) # noqa: E501, F821 # comment +24 | print(a) # noqa: E501, F821 comment +25 | print(a) # noqa: E501, F821 comment + - print(a) # noqa: E501,,F821 comment +26 + print(a) # noqa: F821 comment +27 | print(a) # noqa: E501, ,F821 comment +28 | print(a) # noqa: E501 F821 comment +29 | RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:27:11 @@ -439,16 +399,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 28 | print(a) # noqa: E501 F821 comment | help: Remove unused `noqa` directive - -ℹ Safe fix -24 24 | print(a) # noqa: E501, F821 comment -25 25 | print(a) # noqa: E501, F821 comment -26 26 | print(a) # noqa: E501,,F821 comment -27 |-print(a) # noqa: E501, ,F821 comment - 27 |+print(a) # noqa: F821 comment -28 28 | print(a) # noqa: E501 F821 comment -29 29 | -30 30 | print(a) # comment with unicode µ # noqa: E501 +24 | print(a) # noqa: E501, F821 comment +25 | print(a) # noqa: E501, F821 comment +26 | print(a) # noqa: E501,,F821 comment + - print(a) # noqa: E501, ,F821 comment +27 + print(a) # noqa: F821 comment +28 | print(a) # noqa: E501 F821 comment +29 | +30 | print(a) # comment with unicode µ # noqa: E501 RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:28:11 @@ -461,16 +419,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 30 | print(a) # comment with unicode µ # noqa: E501 | help: Remove unused `noqa` directive - -ℹ Safe fix -25 25 | print(a) # noqa: E501, F821 comment -26 26 | print(a) # noqa: E501,,F821 comment -27 27 | print(a) # noqa: E501, ,F821 comment -28 |-print(a) # noqa: E501 F821 comment - 28 |+print(a) # noqa: F821 comment -29 29 | -30 30 | print(a) # comment with unicode µ # noqa: E501 -31 31 | print(a) # comment with unicode µ # noqa: E501, F821 +25 | print(a) # noqa: E501, F821 comment +26 | print(a) # noqa: E501,,F821 comment +27 | print(a) # noqa: E501, ,F821 comment + - print(a) # noqa: E501 F821 comment +28 + print(a) # noqa: F821 comment +29 | +30 | print(a) # comment with unicode µ # noqa: E501 +31 | print(a) # comment with unicode µ # noqa: E501, F821 F821 Undefined name `a` --> RUF100_3.py:30:7 @@ -492,14 +448,12 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 31 | print(a) # comment with unicode µ # noqa: E501, F821 | help: Remove unused `noqa` directive - -ℹ Safe fix -27 27 | print(a) # noqa: E501, ,F821 comment -28 28 | print(a) # noqa: E501 F821 comment -29 29 | -30 |-print(a) # comment with unicode µ # noqa: E501 - 30 |+print(a) # comment with unicode µ -31 31 | print(a) # comment with unicode µ # noqa: E501, F821 +27 | print(a) # noqa: E501, ,F821 comment +28 | print(a) # noqa: E501 F821 comment +29 | + - print(a) # comment with unicode µ # noqa: E501 +30 + print(a) # comment with unicode µ +31 | print(a) # comment with unicode µ # noqa: E501, F821 RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_3.py:31:39 @@ -509,10 +463,8 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) | ^^^^^^^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -28 28 | print(a) # noqa: E501 F821 comment -29 29 | -30 30 | print(a) # comment with unicode µ # noqa: E501 -31 |-print(a) # comment with unicode µ # noqa: E501, F821 - 31 |+print(a) # comment with unicode µ # noqa: F821 +28 | print(a) # noqa: E501 F821 comment +29 | +30 | print(a) # comment with unicode µ # noqa: E501 + - print(a) # comment with unicode µ # noqa: E501, F821 +31 + print(a) # comment with unicode µ # noqa: F821 diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap index e86fb19ddb..ce43a6425c 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruf100_5.snap @@ -11,15 +11,14 @@ ERA001 Found commented-out code 8 | } | help: Remove commented-out code - -ℹ Display-only fix -4 4 | dictionary = { -5 5 | # "key1": 123, # noqa: ERA001 -6 6 | # "key2": 456, # noqa -7 |- # "key3": 789, -8 7 | } -9 8 | -10 9 | +4 | dictionary = { +5 | # "key1": 123, # noqa: ERA001 +6 | # "key2": 456, # noqa + - # "key3": 789, +7 | } +8 | +9 | +note: This is a display-only fix and is likely to be incorrect ERA001 Found commented-out code --> RUF100_5.py:11:1 @@ -30,15 +29,14 @@ ERA001 Found commented-out code 13 | def f(): | help: Remove commented-out code - -ℹ Display-only fix -8 8 | } -9 9 | -10 10 | -11 |-#import os # noqa: E501 -12 11 | -13 12 | def f(): -14 13 | data = 1 +8 | } +9 | +10 | + - #import os # noqa: E501 +11 | +12 | def f(): +13 | data = 1 +note: This is a display-only fix and is likely to be incorrect RUF100 [*] Unused `noqa` directive (unused: `E501`) --> RUF100_5.py:11:13 @@ -49,16 +47,14 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 13 | def f(): | help: Remove unused `noqa` directive - -ℹ Safe fix -8 8 | } -9 9 | -10 10 | -11 |-#import os # noqa: E501 - 11 |+#import os -12 12 | -13 13 | def f(): -14 14 | data = 1 +8 | } +9 | +10 | + - #import os # noqa: E501 +11 + #import os +12 | +13 | def f(): +14 | data = 1 RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`) --> RUF100_5.py:16:18 @@ -71,16 +67,14 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`) 18 | def f(): | help: Remove unused `noqa` directive - -ℹ Safe fix -13 13 | def f(): -14 14 | data = 1 -15 15 | # line below should autofix to `return data # fmt: skip` -16 |- return data # noqa: RET504 # fmt: skip - 16 |+ return data # fmt: skip -17 17 | -18 18 | def f(): -19 19 | data = 1 +13 | def f(): +14 | data = 1 +15 | # line below should autofix to `return data # fmt: skip` + - return data # noqa: RET504 # fmt: skip +16 + return data # fmt: skip +17 | +18 | def f(): +19 | data = 1 RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`) --> RUF100_5.py:21:18 @@ -91,10 +85,8 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `RET504`) | ^^^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -18 18 | def f(): -19 19 | data = 1 -20 20 | # line below should autofix to `return data` -21 |- return data # noqa: RET504 - intentional incorrect noqa, will be removed - 21 |+ return data +18 | def f(): +19 | data = 1 +20 | # line below should autofix to `return data` + - return data # noqa: RET504 - intentional incorrect noqa, will be removed +21 + return data diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap index 89f28d6aa6..8127b974c0 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_codes.snap @@ -9,10 +9,9 @@ F841 [*] Local variable `x` is assigned to but never used | ^ | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -5 5 | -6 6 | -7 7 | def f(): -8 |- x = 1 - 8 |+ pass +5 | +6 | +7 | def f(): + - x = 1 +8 + pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap index c51d812458..c1a52d4ea9 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused.snap @@ -8,7 +8,5 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `F841`) | ^^^^^^^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -1 |-# ruff: noqa: F841 -- intentional unused file directive; will be removed - 1 |+ + - # ruff: noqa: F841 -- intentional unused file directive; will be removed +1 + diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap index cf8ab449b9..79ec862b59 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_filedirective_unused_last_of_many.snap @@ -9,13 +9,11 @@ RUF100 [*] Unused `noqa` directive (unused: `E501`) 2 | # ruff: noqa: E701, F541 -- unused followed by used code | help: Remove unused `noqa` directive - -ℹ Safe fix -1 |-# flake8: noqa: F841, E501 -- used followed by unused code - 1 |+# flake8: noqa: F841 -- used followed by unused code -2 2 | # ruff: noqa: E701, F541 -- unused followed by used code -3 3 | -4 4 | + - # flake8: noqa: F841, E501 -- used followed by unused code +1 + # flake8: noqa: F841 -- used followed by unused code +2 | # ruff: noqa: E701, F541 -- unused followed by used code +3 | +4 | RUF100 [*] Unused `noqa` directive (non-enabled: `E701`) --> RUF100_7.py:2:1 @@ -25,11 +23,9 @@ RUF100 [*] Unused `noqa` directive (non-enabled: `E701`) | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: Remove unused `noqa` directive - -ℹ Safe fix -1 1 | # flake8: noqa: F841, E501 -- used followed by unused code -2 |-# ruff: noqa: E701, F541 -- unused followed by used code - 2 |+# ruff: noqa: F541 -- unused followed by used code -3 3 | -4 4 | -5 5 | def a(): +1 | # flake8: noqa: F841, E501 -- used followed by unused code + - # ruff: noqa: E701, F541 -- unused followed by used code +2 + # ruff: noqa: F541 -- unused followed by used code +3 | +4 | +5 | def a(): diff --git a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap index bcfd68f1b4..66c3a29c3c 100644 --- a/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap +++ b/crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__ruff_noqa_invalid.snap @@ -8,12 +8,10 @@ F401 [*] `os` imported but unused | ^^ | help: Remove unused import: `os` - -ℹ Safe fix -1 |-import os # ruff: noqa: F401 -2 1 | -3 2 | -4 3 | def f(): + - import os # ruff: noqa: F401 +1 | +2 | +3 | def f(): F841 [*] Local variable `x` is assigned to but never used --> ruff_noqa_invalid.py:5:5 @@ -23,10 +21,9 @@ F841 [*] Local variable `x` is assigned to but never used | ^ | help: Remove assignment to unused variable `x` - -ℹ Unsafe fix -2 2 | -3 3 | -4 4 | def f(): -5 |- x = 1 - 5 |+ pass +2 | +3 | +4 | def f(): + - x = 1 +5 + pass +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap index 8afdb7dffe..82b0baf37d 100644 --- a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap +++ b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__error-instead-of-exception_TRY400.py.snap @@ -12,16 +12,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` 15 | if True: | help: Replace with `exception` - -ℹ Safe fix -10 10 | try: -11 11 | a = 1 -12 12 | except Exception: -13 |- logging.error("Context message here") - 13 |+ logging.exception("Context message here") -14 14 | -15 15 | if True: -16 16 | logging.error("Context message here") +10 | try: +11 | a = 1 +12 | except Exception: + - logging.error("Context message here") +13 + logging.exception("Context message here") +14 | +15 | if True: +16 | logging.error("Context message here") TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:16:13 @@ -31,16 +29,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `exception` - -ℹ Safe fix -13 13 | logging.error("Context message here") -14 14 | -15 15 | if True: -16 |- logging.error("Context message here") - 16 |+ logging.exception("Context message here") -17 17 | -18 18 | -19 19 | def bad(): +13 | logging.error("Context message here") +14 | +15 | if True: + - logging.error("Context message here") +16 + logging.exception("Context message here") +17 | +18 | +19 | def bad(): TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:27:9 @@ -53,16 +49,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` 29 | if True: | help: Replace with `exception` - -ℹ Unsafe fix -24 24 | try: -25 25 | a = 1 -26 26 | except Exception: -27 |- logger.error("Context message here") - 27 |+ logger.exception("Context message here") -28 28 | -29 29 | if True: -30 30 | logger.error("Context message here") +24 | try: +25 | a = 1 +26 | except Exception: + - logger.error("Context message here") +27 + logger.exception("Context message here") +28 | +29 | if True: +30 | logger.error("Context message here") +note: This is an unsafe fix and may change runtime behavior TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:30:13 @@ -72,16 +67,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `exception` - -ℹ Unsafe fix -27 27 | logger.error("Context message here") -28 28 | -29 29 | if True: -30 |- logger.error("Context message here") - 30 |+ logger.exception("Context message here") -31 31 | -32 32 | -33 33 | def bad(): +27 | logger.error("Context message here") +28 | +29 | if True: + - logger.error("Context message here") +30 + logger.exception("Context message here") +31 | +32 | +33 | def bad(): +note: This is an unsafe fix and may change runtime behavior TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:37:9 @@ -94,16 +88,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` 39 | if True: | help: Replace with `exception` - -ℹ Unsafe fix -34 34 | try: -35 35 | a = 1 -36 36 | except Exception: -37 |- log.error("Context message here") - 37 |+ log.exception("Context message here") -38 38 | -39 39 | if True: -40 40 | log.error("Context message here") +34 | try: +35 | a = 1 +36 | except Exception: + - log.error("Context message here") +37 + log.exception("Context message here") +38 | +39 | if True: +40 | log.error("Context message here") +note: This is an unsafe fix and may change runtime behavior TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:40:13 @@ -113,16 +106,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `exception` - -ℹ Unsafe fix -37 37 | log.error("Context message here") -38 38 | -39 39 | if True: -40 |- log.error("Context message here") - 40 |+ log.exception("Context message here") -41 41 | -42 42 | -43 43 | def bad(): +37 | log.error("Context message here") +38 | +39 | if True: + - log.error("Context message here") +40 + log.exception("Context message here") +41 | +42 | +43 | def bad(): +note: This is an unsafe fix and may change runtime behavior TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:47:9 @@ -135,16 +127,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` 49 | if True: | help: Replace with `exception` - -ℹ Unsafe fix -44 44 | try: -45 45 | a = 1 -46 46 | except Exception: -47 |- self.logger.error("Context message here") - 47 |+ self.logger.exception("Context message here") -48 48 | -49 49 | if True: -50 50 | self.logger.error("Context message here") +44 | try: +45 | a = 1 +46 | except Exception: + - self.logger.error("Context message here") +47 + self.logger.exception("Context message here") +48 | +49 | if True: +50 | self.logger.error("Context message here") +note: This is an unsafe fix and may change runtime behavior TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:50:13 @@ -154,16 +145,15 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `exception` - -ℹ Unsafe fix -47 47 | self.logger.error("Context message here") -48 48 | -49 49 | if True: -50 |- self.logger.error("Context message here") - 50 |+ self.logger.exception("Context message here") -51 51 | -52 52 | -53 53 | def good(): +47 | self.logger.error("Context message here") +48 | +49 | if True: + - self.logger.error("Context message here") +50 + self.logger.exception("Context message here") +51 | +52 | +53 | def good(): +note: This is an unsafe fix and may change runtime behavior TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:100:9 @@ -176,16 +166,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` 102 | if True: | help: Replace with `exception` - -ℹ Safe fix -97 97 | try: -98 98 | a = 1 -99 99 | except Exception: -100 |- error("Context message here") - 100 |+ exception("Context message here") -101 101 | -102 102 | if True: -103 103 | error("Context message here") +97 | try: +98 | a = 1 +99 | except Exception: + - error("Context message here") +100 + exception("Context message here") +101 | +102 | if True: +103 | error("Context message here") TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:103:13 @@ -195,16 +183,14 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `exception` - -ℹ Safe fix -100 100 | error("Context message here") -101 101 | -102 102 | if True: -103 |- error("Context message here") - 103 |+ exception("Context message here") -104 104 | -105 105 | -106 106 | def good(): +100 | error("Context message here") +101 | +102 | if True: + - error("Context message here") +103 + exception("Context message here") +104 | +105 | +106 | def good(): TRY400 [*] Use `logging.exception` instead of `logging.error` --> TRY400.py:143:13 @@ -215,10 +201,8 @@ TRY400 [*] Use `logging.exception` instead of `logging.error` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Replace with `exception` - -ℹ Safe fix -140 140 | try: -141 141 | b = 2 -142 142 | except Exception: -143 |- error("Context message here") - 143 |+ exception("Context message here") +140 | try: +141 | b = 2 +142 | except Exception: + - error("Context message here") +143 + exception("Context message here") diff --git a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap index 59290aae78..35e96d834d 100644 --- a/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap +++ b/crates/ruff_linter/src/rules/tryceratops/snapshots/ruff_linter__rules__tryceratops__tests__verbose-raise_TRY201.py.snap @@ -10,16 +10,15 @@ TRY201 [*] Use `raise` without specifying exception name | ^ | help: Remove exception name - -ℹ Unsafe fix -17 17 | process() -18 18 | except MyException as e: -19 19 | logger.exception("process failed") -20 |- raise e - 20 |+ raise -21 21 | -22 22 | -23 23 | def good(): +17 | process() +18 | except MyException as e: +19 | logger.exception("process failed") + - raise e +20 + raise +21 | +22 | +23 | def good(): +note: This is an unsafe fix and may change runtime behavior TRY201 [*] Use `raise` without specifying exception name --> TRY201.py:63:19 @@ -30,16 +29,15 @@ TRY201 [*] Use `raise` without specifying exception name | ^ | help: Remove exception name - -ℹ Unsafe fix -60 60 | except MyException as e: -61 61 | logger.exception("process failed") -62 62 | if True: -63 |- raise e - 63 |+ raise -64 64 | -65 65 | -66 66 | def bad_that_needs_recursion_2(): +60 | except MyException as e: +61 | logger.exception("process failed") +62 | if True: + - raise e +63 + raise +64 | +65 | +66 | def bad_that_needs_recursion_2(): +note: This is an unsafe fix and may change runtime behavior TRY201 [*] Use `raise` without specifying exception name --> TRY201.py:74:23 @@ -49,10 +47,9 @@ TRY201 [*] Use `raise` without specifying exception name | ^ | help: Remove exception name - -ℹ Unsafe fix -71 71 | if True: -72 72 | -73 73 | def foo(): -74 |- raise e - 74 |+ raise +71 | if True: +72 | +73 | def foo(): + - raise e +74 + raise +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap index fffcf7e607..ab702311db 100644 --- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap +++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_extensions.snap @@ -10,15 +10,13 @@ PYI019 [*] Use `Self` instead of custom TypeVar `T` 8 | return cls | help: Replace TypeVar `T` with `Self` - -ℹ Safe fix -1 1 | -2 2 | from typing import TypeVar - 3 |+from typing_extensions import Self -3 4 | -4 5 | T = TypeVar("T", bound="_NiceReprEnum") -5 6 | -6 7 | class C: -7 |- def __new__(cls: type[T]) -> T: - 8 |+ def __new__(cls) -> Self: -8 9 | return cls +1 | +2 | from typing import TypeVar +3 + from typing_extensions import Self +4 | +5 | T = TypeVar("T", bound="_NiceReprEnum") +6 | +7 | class C: + - def __new__(cls: type[T]) -> T: +8 + def __new__(cls) -> Self: +9 | return cls diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap index ada2e840bd..73079e7eec 100644 --- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap +++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_with_extensions_disabled.snap @@ -10,15 +10,13 @@ PYI019 [*] Use `Self` instead of custom TypeVar `T` 8 | return cls | help: Replace TypeVar `T` with `Self` - -ℹ Safe fix -1 1 | -2 |-from typing import TypeVar - 2 |+from typing import TypeVar, Self -3 3 | -4 4 | T = TypeVar("T", bound="_NiceReprEnum") -5 5 | -6 6 | class C: -7 |- def __new__(cls: type[T]) -> T: - 7 |+ def __new__(cls) -> Self: -8 8 | return cls +1 | + - from typing import TypeVar +2 + from typing import TypeVar, Self +3 | +4 | T = TypeVar("T", bound="_NiceReprEnum") +5 | +6 | class C: + - def __new__(cls: type[T]) -> T: +7 + def __new__(cls) -> Self: +8 | return cls diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap index ada2e840bd..73079e7eec 100644 --- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap +++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__disabled_typing_extensions_pyi019_adds_typing_without_extensions_disabled.snap @@ -10,15 +10,13 @@ PYI019 [*] Use `Self` instead of custom TypeVar `T` 8 | return cls | help: Replace TypeVar `T` with `Self` - -ℹ Safe fix -1 1 | -2 |-from typing import TypeVar - 2 |+from typing import TypeVar, Self -3 3 | -4 4 | T = TypeVar("T", bound="_NiceReprEnum") -5 5 | -6 6 | class C: -7 |- def __new__(cls: type[T]) -> T: - 7 |+ def __new__(cls) -> Self: -8 8 | return cls +1 | + - from typing import TypeVar +2 + from typing import TypeVar, Self +3 | +4 | T = TypeVar("T", bound="_NiceReprEnum") +5 | +6 | class C: + - def __new__(cls: type[T]) -> T: +7 + def __new__(cls) -> Self: +8 | return cls diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap index 71e562fd01..acc1e8b711 100644 --- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap +++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__import_sorting.snap @@ -10,14 +10,12 @@ I001 [*] Import block is un-sorted or un-formatted | |___________^ | help: Organize imports - -ℹ Safe fix - ::: cell 1 - 1 |+import math - 2 |+import random -1 3 | from pathlib import Path -2 |-import random -3 |-import math + ::: cell 1 +1 + import math +2 + import random +3 | from pathlib import Path + - import random + - import math I001 [*] Import block is un-sorted or un-formatted --> isort.ipynb:cell 2:1:1 @@ -29,17 +27,15 @@ I001 [*] Import block is un-sorted or un-formatted 4 | def foo(): | help: Organize imports - -ℹ Safe fix - ::: cell 2 - 1 |+import collections -1 2 | from typing import Any -2 |-import collections - 3 |+ - 4 |+ -3 5 | # Newline should be added here -4 6 | def foo(): -5 7 | pass + ::: cell 2 +1 + import collections +2 | from typing import Any + - import collections +3 + +4 + +5 | # Newline should be added here +6 | def foo(): +7 | pass I001 [*] Import block is un-sorted or un-formatted --> isort.ipynb:cell 3:1:1 @@ -51,15 +47,13 @@ I001 [*] Import block is un-sorted or un-formatted 4 | %matplotlib \ | help: Organize imports - -ℹ Safe fix - ::: cell 3 - 1 |+import sys -1 2 | from pathlib import Path -2 |-import sys -3 3 | -4 4 | %matplotlib \ -5 5 | --inline + ::: cell 3 +1 + import sys +2 | from pathlib import Path + - import sys +3 | +4 | %matplotlib \ +5 | --inline I001 [*] Import block is un-sorted or un-formatted --> isort.ipynb:cell 3:7:1 @@ -71,12 +65,10 @@ I001 [*] Import block is un-sorted or un-formatted | |__________^ | help: Organize imports - -ℹ Safe fix - ::: cell 3 -4 4 | %matplotlib \ -5 5 | --inline -6 6 | - 7 |+import abc -7 8 | import math -8 |-import abc + ::: cell 3 +4 | %matplotlib \ +5 | --inline +6 | +7 + import abc +8 | import math + - import abc diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap index 95e166dfc5..8ca1d09a11 100644 --- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap +++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__ipy_escape_command.snap @@ -12,15 +12,13 @@ F401 [*] `os` imported but unused 7 | _ = math.pi | help: Remove unused import: `os` - -ℹ Safe fix - ::: cell 1 -2 2 | -3 3 | %matplotlib inline -4 4 | -5 |-import os -6 5 | -7 6 | _ = math.pi + ::: cell 1 +2 | +3 | %matplotlib inline +4 | + - import os +5 | +6 | _ = math.pi F401 [*] `sys` imported but unused --> ipy_escape_command.ipynb:cell 2:2:8 @@ -30,8 +28,6 @@ F401 [*] `sys` imported but unused | ^^^ | help: Remove unused import: `sys` - -ℹ Safe fix - ::: cell 2 -1 1 | %%timeit -2 |-import sys + ::: cell 2 +1 | %%timeit + - import sys diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap index e79da46867..03cd7b5a6d 100644 --- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap +++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__unused_variable.snap @@ -10,13 +10,12 @@ F841 [*] Local variable `foo1` is assigned to but never used 3 | foo2: list[str] = %matplotlib --list | help: Remove assignment to unused variable `foo1` - -ℹ Unsafe fix - ::: cell 1 -1 1 | def f(): -2 |- foo1 = %matplotlib --list - 2 |+ %matplotlib --list -3 3 | foo2: list[str] = %matplotlib --list + ::: cell 1 +1 | def f(): + - foo1 = %matplotlib --list +2 + %matplotlib --list +3 | foo2: list[str] = %matplotlib --list +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `foo2` is assigned to but never used --> unused_variable.ipynb:cell 1:3:5 @@ -27,13 +26,12 @@ F841 [*] Local variable `foo2` is assigned to but never used | ^^^^ | help: Remove assignment to unused variable `foo2` - -ℹ Unsafe fix - ::: cell 1 -1 1 | def f(): -2 2 | foo1 = %matplotlib --list -3 |- foo2: list[str] = %matplotlib --list - 3 |+ %matplotlib --list + ::: cell 1 +1 | def f(): +2 | foo1 = %matplotlib --list + - foo2: list[str] = %matplotlib --list +3 + %matplotlib --list +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `bar1` is assigned to but never used --> unused_variable.ipynb:cell 2:2:5 @@ -44,13 +42,12 @@ F841 [*] Local variable `bar1` is assigned to but never used 3 | bar2: str = !pwd | help: Remove assignment to unused variable `bar1` - -ℹ Unsafe fix - ::: cell 2 -1 1 | def f(): -2 |- bar1 = !pwd - 2 |+ !pwd -3 3 | bar2: str = !pwd + ::: cell 2 +1 | def f(): + - bar1 = !pwd +2 + !pwd +3 | bar2: str = !pwd +note: This is an unsafe fix and may change runtime behavior F841 [*] Local variable `bar2` is assigned to but never used --> unused_variable.ipynb:cell 2:3:5 @@ -61,10 +58,9 @@ F841 [*] Local variable `bar2` is assigned to but never used | ^^^^ | help: Remove assignment to unused variable `bar2` - -ℹ Unsafe fix - ::: cell 2 -1 1 | def f(): -2 2 | bar1 = !pwd -3 |- bar2: str = !pwd - 3 |+ !pwd + ::: cell 2 +1 | def f(): +2 | bar1 = !pwd + - bar2: str = !pwd +3 + !pwd +note: This is an unsafe fix and may change runtime behavior diff --git a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap index 72e92de07d..441f3f619d 100644 --- a/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap +++ b/crates/ruff_linter/src/snapshots/ruff_linter__linter__tests__vscode_language_id.snap @@ -10,9 +10,7 @@ F401 [*] `os` imported but unused 3 | print("hello world") | help: Remove unused import: `os` - -ℹ Safe fix - ::: cell 3 -1 |-import os -2 1 | -3 2 | print("hello world") + ::: cell 3 + - import os +1 | +2 | print("hello world")