-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[
flake8-async
] Fix false positives with multiple async with
items…
… (`ASYNC100`) (#12643) ## Summary Please see #12605 (comment) for a description of the issue. They way I fixed it is to get the *last* timeout item in the `with`, and if it's an `async with` and there are items after it, then don't trigger the lint. ## Test Plan Updated the fixture with some more cases.
- Loading branch information
Showing
4 changed files
with
126 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
...flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC100_ASYNC100.py.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,20 @@ | ||
--- | ||
source: crates/ruff_linter/src/rules/flake8_async/mod.rs | ||
--- | ||
ASYNC100.py:7:5: ASYNC100 A `with trio.fail_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:8:5: ASYNC100 A `with trio.fail_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
6 | async def func(): | ||
7 | async with trio.fail_after(): | ||
7 | async def func(): | ||
8 | with trio.fail_after(): | ||
| _____^ | ||
8 | | ... | ||
9 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:17:5: ASYNC100 A `with trio.move_on_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:18:5: ASYNC100 A `with trio.move_on_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
16 | async def func(): | ||
17 | async with trio.move_on_after(): | ||
17 | async def func(): | ||
18 | with trio.move_on_after(): | ||
| _____^ | ||
18 | | ... | ||
19 | | ... | ||
| |___________^ ASYNC100 | ||
| |
91 changes: 59 additions & 32 deletions
91
...ync/snapshots/ruff_linter__rules__flake8_async__tests__preview__ASYNC100_ASYNC100.py.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,74 +1,101 @@ | ||
--- | ||
source: crates/ruff_linter/src/rules/flake8_async/mod.rs | ||
--- | ||
ASYNC100.py:7:5: ASYNC100 A `with trio.fail_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:8:5: ASYNC100 A `with trio.fail_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
6 | async def func(): | ||
7 | async with trio.fail_after(): | ||
7 | async def func(): | ||
8 | with trio.fail_after(): | ||
| _____^ | ||
8 | | ... | ||
9 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:17:5: ASYNC100 A `with trio.move_on_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:18:5: ASYNC100 A `with trio.move_on_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
16 | async def func(): | ||
17 | async with trio.move_on_after(): | ||
17 | async def func(): | ||
18 | with trio.move_on_after(): | ||
| _____^ | ||
18 | | ... | ||
19 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:33:5: ASYNC100 A `with anyio.move_on_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:40:5: ASYNC100 A `with anyio.move_on_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
32 | async def func(): | ||
33 | async with anyio.move_on_after(delay=0.2): | ||
39 | async def func(): | ||
40 | with anyio.move_on_after(delay=0.2): | ||
| _____^ | ||
34 | | ... | ||
41 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:38:5: ASYNC100 A `with anyio.fail_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:45:5: ASYNC100 A `with anyio.fail_after(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
37 | async def func(): | ||
38 | async with anyio.fail_after(): | ||
44 | async def func(): | ||
45 | with anyio.fail_after(): | ||
| _____^ | ||
39 | | ... | ||
46 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:43:5: ASYNC100 A `with anyio.CancelScope(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:50:5: ASYNC100 A `with anyio.CancelScope(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
42 | async def func(): | ||
43 | async with anyio.CancelScope(): | ||
49 | async def func(): | ||
50 | with anyio.CancelScope(): | ||
| _____^ | ||
44 | | ... | ||
51 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:48:5: ASYNC100 A `with anyio.CancelScope(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:55:5: ASYNC100 A `with anyio.CancelScope(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
47 | async def func(): | ||
48 | async with anyio.CancelScope(): | ||
54 | async def func(): | ||
55 | with anyio.CancelScope(), nullcontext(): | ||
| _____^ | ||
49 | | ... | ||
56 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:53:5: ASYNC100 A `with asyncio.timeout(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:60:5: ASYNC100 A `with anyio.CancelScope(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
52 | async def func(): | ||
53 | async with asyncio.timeout(delay=0.2): | ||
59 | async def func(): | ||
60 | with nullcontext(), anyio.CancelScope(): | ||
| _____^ | ||
54 | | ... | ||
61 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:58:5: ASYNC100 A `with asyncio.timeout_at(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
ASYNC100.py:65:5: ASYNC100 A `with asyncio.timeout(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
57 | async def func(): | ||
58 | async with asyncio.timeout_at(when=0.2): | ||
64 | async def func(): | ||
65 | async with asyncio.timeout(delay=0.2): | ||
| _____^ | ||
59 | | ... | ||
66 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:70:5: ASYNC100 A `with asyncio.timeout_at(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
69 | async def func(): | ||
70 | async with asyncio.timeout_at(when=0.2): | ||
| _____^ | ||
71 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:80:5: ASYNC100 A `with asyncio.timeout(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
79 | async def func(): | ||
80 | async with asyncio.timeout(delay=0.2), asyncio.TaskGroup(), asyncio.timeout(delay=0.2): | ||
| _____^ | ||
81 | | ... | ||
| |___________^ ASYNC100 | ||
| | ||
|
||
ASYNC100.py:90:5: ASYNC100 A `with asyncio.timeout(...):` context does not contain any `await` statements. This makes it pointless, as the timeout can only be triggered by a checkpoint. | ||
| | ||
89 | async def func(): | ||
90 | async with asyncio.timeout(delay=0.2), asyncio.timeout(delay=0.2): | ||
| _____^ | ||
91 | | ... | ||
| |___________^ ASYNC100 | ||
| |