Skip to content

Commit 94810a6

Browse files
committed
rename Flake8TrioVisitor to Flake8AsyncVisitor
1 parent f42a832 commit 94810a6

16 files changed

+57
-53
lines changed

flake8_trio/runner.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from libcst import Module
2727

2828
from .base import Error, Options
29-
from .visitors.flake8triovisitor import Flake8TrioVisitor, Flake8TrioVisitor_cst
29+
from .visitors.flake8triovisitor import Flake8AsyncVisitor, Flake8AsyncVisitor_cst
3030

3131

3232
@dataclass
@@ -73,7 +73,7 @@ def visit(self, node: ast.AST):
7373
"""Visit a node."""
7474
# tracks the subclasses that, from this node on, iterated through it's subfields
7575
# we need to remember it so we can restore it at the end of the function.
76-
novisit: set[Flake8TrioVisitor] = set()
76+
novisit: set[Flake8AsyncVisitor] = set()
7777

7878
method = "visit_" + node.__class__.__name__
7979

@@ -122,14 +122,14 @@ def __init__(self, options: Options, module: Module):
122122

123123
# Could possibly enable/disable utility visitors here, if visitors declared
124124
# dependencies
125-
self.utility_visitors: tuple[Flake8TrioVisitor_cst, ...] = tuple(
125+
self.utility_visitors: tuple[Flake8AsyncVisitor_cst, ...] = tuple(
126126
v(self.state) for v in utility_visitors
127127
)
128128

129129
# sort the error classes to get predictable behaviour when multiple autofixers
130130
# are enabled
131131
sorted_error_classes_cst = sorted(ERROR_CLASSES_CST, key=lambda x: x.__name__)
132-
self.visitors: tuple[Flake8TrioVisitor_cst, ...] = tuple(
132+
self.visitors: tuple[Flake8AsyncVisitor_cst, ...] = tuple(
133133
v(self.state)
134134
for v in sorted_error_classes_cst
135135
if self.selected(v.error_codes)

flake8_trio/visitors/__init__.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from typing import TYPE_CHECKING
1111

1212
if TYPE_CHECKING:
13-
from .flake8triovisitor import Flake8TrioVisitor, Flake8TrioVisitor_cst
13+
from .flake8triovisitor import Flake8AsyncVisitor, Flake8AsyncVisitor_cst
1414

1515
__all__ = [
1616
"ERROR_CLASSES",
@@ -19,11 +19,11 @@
1919
"utility_visitors",
2020
"utility_visitors_cst",
2121
]
22-
ERROR_CLASSES: set[type[Flake8TrioVisitor]] = set()
23-
ERROR_CLASSES_CST: set[type[Flake8TrioVisitor_cst]] = set()
22+
ERROR_CLASSES: set[type[Flake8AsyncVisitor]] = set()
23+
ERROR_CLASSES_CST: set[type[Flake8AsyncVisitor_cst]] = set()
2424
default_disabled_error_codes: list[str] = []
25-
utility_visitors: set[type[Flake8TrioVisitor]] = set()
26-
utility_visitors_cst: set[type[Flake8TrioVisitor_cst]] = set()
25+
utility_visitors: set[type[Flake8AsyncVisitor]] = set()
26+
utility_visitors_cst: set[type[Flake8AsyncVisitor_cst]] = set()
2727

2828
# Import all visitors so their decorators run, filling the above containers
2929
# This has to be done at the end to avoid circular imports

flake8_trio/visitors/flake8triovisitor.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
ERROR_CODE_LEN = 8
2525

2626

27-
class Flake8TrioVisitor(ast.NodeVisitor, ABC):
27+
class Flake8AsyncVisitor(ast.NodeVisitor, ABC):
2828
# abstract attribute by not providing a value
2929
error_codes: Mapping[str, str]
3030

@@ -39,7 +39,7 @@ def __init__(self, shared_state: SharedState):
3939

4040
# mark variables that shouldn't be saved/loaded in self.get_state
4141
self.nocopy = {
42-
"_Flake8TrioVisitor__state",
42+
"_Flake8AsyncVisitor__state",
4343
"error_codes",
4444
"nocopy",
4545
"novisit",
@@ -158,7 +158,7 @@ def add_library(self, name: str) -> None:
158158
self.__state.library = (*self.__state.library, name)
159159

160160

161-
class Flake8TrioVisitor_cst(cst.CSTTransformer, ABC):
161+
class Flake8AsyncVisitor_cst(cst.CSTTransformer, ABC):
162162
# abstract attribute by not providing a value
163163
error_codes: Mapping[str, str]
164164
METADATA_DEPENDENCIES = (PositionProvider,)

flake8_trio/visitors/helpers.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@
2525
if TYPE_CHECKING:
2626
from collections.abc import Iterable, Iterator, Sequence
2727

28-
from .flake8triovisitor import Flake8TrioVisitor, Flake8TrioVisitor_cst, HasLineCol
28+
from .flake8triovisitor import (
29+
Flake8AsyncVisitor,
30+
Flake8AsyncVisitor_cst,
31+
HasLineCol,
32+
)
2933

30-
T = TypeVar("T", bound=Flake8TrioVisitor)
31-
T_CST = TypeVar("T_CST", bound=Flake8TrioVisitor_cst)
34+
T = TypeVar("T", bound=Flake8AsyncVisitor)
35+
T_CST = TypeVar("T_CST", bound=Flake8AsyncVisitor_cst)
3236
T_EITHER = TypeVar(
33-
"T_EITHER", bound=Union[Flake8TrioVisitor, Flake8TrioVisitor_cst]
37+
"T_EITHER", bound=Union[Flake8AsyncVisitor, Flake8AsyncVisitor_cst]
3438
)
3539

3640

flake8_trio/visitors/visitor100.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import libcst as cst
1414
import libcst.matchers as m
1515

16-
from .flake8triovisitor import Flake8TrioVisitor_cst
16+
from .flake8triovisitor import Flake8AsyncVisitor_cst
1717
from .helpers import (
1818
AttributeCall,
1919
error_class_cst,
@@ -26,7 +26,7 @@
2626

2727

2828
@error_class_cst
29-
class Visitor100_libcst(Flake8TrioVisitor_cst):
29+
class Visitor100_libcst(Flake8AsyncVisitor_cst):
3030
error_codes: Mapping[str, str] = {
3131
"ASYNC100": (
3232
"{0}.{1} context contains no checkpoints, remove the context or add"

flake8_trio/visitors/visitor101.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from typing import TYPE_CHECKING, Any
1010

11-
from .flake8triovisitor import Flake8TrioVisitor_cst
11+
from .flake8triovisitor import Flake8AsyncVisitor_cst
1212
from .helpers import (
1313
cancel_scope_names,
1414
error_class_cst,
@@ -23,7 +23,7 @@
2323

2424

2525
@error_class_cst
26-
class Visitor101(Flake8TrioVisitor_cst):
26+
class Visitor101(Flake8AsyncVisitor_cst):
2727
error_codes: Mapping[str, str] = {
2828
"ASYNC101": (
2929
"`yield` inside a nursery or cancel scope is only safe when implementing "

flake8_trio/visitors/visitor102.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
from typing import TYPE_CHECKING, Any
1010

1111
from ..base import Statement
12-
from .flake8triovisitor import Flake8TrioVisitor
12+
from .flake8triovisitor import Flake8AsyncVisitor
1313
from .helpers import cancel_scope_names, critical_except, error_class, get_matching_call
1414

1515
if TYPE_CHECKING:
1616
from collections.abc import Mapping
1717

1818

1919
@error_class
20-
class Visitor102(Flake8TrioVisitor):
20+
class Visitor102(Flake8AsyncVisitor):
2121
error_codes: Mapping[str, str] = {
2222
"ASYNC102": (
2323
"await inside {0.name} on line {0.lineno} must have shielded cancel "

flake8_trio/visitors/visitor103_104.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import ast
1212
from typing import TYPE_CHECKING, Any
1313

14-
from .flake8triovisitor import Flake8TrioVisitor
14+
from .flake8triovisitor import Flake8AsyncVisitor
1515
from .helpers import critical_except, error_class, iter_guaranteed_once
1616

1717
if TYPE_CHECKING:
@@ -36,7 +36,7 @@
3636

3737

3838
@error_class
39-
class Visitor103_104(Flake8TrioVisitor):
39+
class Visitor103_104(Flake8AsyncVisitor):
4040
error_codes: Mapping[str, str] = _error_codes
4141

4242
def __init__(self, *args: Any, **kwargs: Any):

flake8_trio/visitors/visitor105.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import ast
66
from typing import TYPE_CHECKING, Any
77

8-
from .flake8triovisitor import Flake8TrioVisitor
8+
from .flake8triovisitor import Flake8AsyncVisitor
99
from .helpers import error_class
1010

1111
if TYPE_CHECKING:
@@ -42,7 +42,7 @@
4242

4343

4444
@error_class
45-
class Visitor105(Flake8TrioVisitor):
45+
class Visitor105(Flake8AsyncVisitor):
4646
error_codes: Mapping[str, str] = {
4747
"ASYNC105": "{0} async {1} must be immediately awaited.",
4848
}

flake8_trio/visitors/visitor111.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
import ast
66
from typing import TYPE_CHECKING, Any, NamedTuple
77

8-
from .flake8triovisitor import Flake8TrioVisitor
8+
from .flake8triovisitor import Flake8AsyncVisitor
99
from .helpers import error_class, get_matching_call
1010

1111
if TYPE_CHECKING:
1212
from collections.abc import Mapping
1313

1414

1515
@error_class
16-
class Visitor111(Flake8TrioVisitor):
16+
class Visitor111(Flake8AsyncVisitor):
1717
error_codes: Mapping[str, str] = {
1818
"ASYNC111": (
1919
"variable {2} is usable within the context manager on line {0}, but that "

flake8_trio/visitors/visitor118.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
import re
1111
from typing import TYPE_CHECKING
1212

13-
from .flake8triovisitor import Flake8TrioVisitor
13+
from .flake8triovisitor import Flake8AsyncVisitor
1414
from .helpers import error_class
1515

1616
if TYPE_CHECKING:
1717
from collections.abc import Mapping
1818

1919

2020
@error_class
21-
class Visitor118(Flake8TrioVisitor):
21+
class Visitor118(Flake8AsyncVisitor):
2222
error_codes: Mapping[str, str] = {
2323
"ASYNC118": (
2424
"Don't assign the value of `anyio.get_cancelled_exc_class()` to a variable,"

flake8_trio/visitors/visitor2xx.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
import re
1515
from typing import TYPE_CHECKING, Any
1616

17-
from .flake8triovisitor import Flake8TrioVisitor
17+
from .flake8triovisitor import Flake8AsyncVisitor
1818
from .helpers import error_class, fnmatch_qualified_name, get_matching_call
1919

2020
if TYPE_CHECKING:
2121
from collections.abc import Mapping
2222

2323

2424
@error_class
25-
class Visitor200(Flake8TrioVisitor):
25+
class Visitor200(Flake8AsyncVisitor):
2626
error_codes: Mapping[str, str] = {
2727
"ASYNC200": (
2828
"User-configured blocking sync call {0} in async function, consider "

flake8_trio/visitors/visitor91x.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from libcst.metadata import PositionProvider
1717

1818
from ..base import Statement
19-
from .flake8triovisitor import Flake8TrioVisitor_cst
19+
from .flake8triovisitor import Flake8AsyncVisitor_cst
2020
from .helpers import (
2121
disabled_by_default,
2222
error_class_cst,
@@ -226,7 +226,7 @@ def leave_Yield(
226226

227227
@error_class_cst
228228
@disabled_by_default
229-
class Visitor91X(Flake8TrioVisitor_cst, CommonVisitors):
229+
class Visitor91X(Flake8AsyncVisitor_cst, CommonVisitors):
230230
error_codes: Mapping[str, str] = {
231231
"ASYNC910": (
232232
"{0} from async function with no guaranteed checkpoint or exception "

flake8_trio/visitors/visitor_utility.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import libcst.matchers as m
1111
from libcst.metadata import PositionProvider
1212

13-
from .flake8triovisitor import Flake8TrioVisitor, Flake8TrioVisitor_cst
13+
from .flake8triovisitor import Flake8AsyncVisitor, Flake8AsyncVisitor_cst
1414
from .helpers import utility_visitor, utility_visitor_cst
1515

1616
if TYPE_CHECKING:
@@ -21,7 +21,7 @@
2121

2222

2323
@utility_visitor
24-
class VisitorTypeTracker(Flake8TrioVisitor):
24+
class VisitorTypeTracker(Flake8AsyncVisitor):
2525
def visit_AsyncFunctionDef(
2626
self, node: ast.AsyncFunctionDef | ast.FunctionDef | ast.Lambda
2727
):
@@ -101,15 +101,15 @@ def visit_With(self, node: ast.With | ast.AsyncWith):
101101

102102

103103
@utility_visitor
104-
class VisitorAwaitModifier(Flake8TrioVisitor):
104+
class VisitorAwaitModifier(Flake8AsyncVisitor):
105105
def visit_Await(self, node: ast.Await):
106106
if isinstance(node.value, ast.Call):
107107
# add attribute to indicate it's awaited
108108
setattr(node.value, "awaited", True) # noqa: B010
109109

110110

111111
@utility_visitor
112-
class VisitorLibraryHandler(Flake8TrioVisitor):
112+
class VisitorLibraryHandler(Flake8AsyncVisitor):
113113
def __init__(self, *args: Any, **kwargs: Any):
114114
super().__init__(*args, **kwargs)
115115
# check whether library we're working towards has been explicitly
@@ -126,7 +126,7 @@ def visit_Import(self, node: ast.Import):
126126

127127

128128
@utility_visitor_cst
129-
class VisitorLibraryHandler_cst(Flake8TrioVisitor_cst):
129+
class VisitorLibraryHandler_cst(Flake8AsyncVisitor_cst):
130130
def __init__(self, *args: Any, **kwargs: Any):
131131
super().__init__(*args, **kwargs)
132132
# check whether library we're working towards has been explicitly
@@ -172,7 +172,7 @@ def _find_noqa(physical_line: str) -> Match[str] | None:
172172

173173

174174
@utility_visitor_cst
175-
class NoqaHandler(Flake8TrioVisitor_cst):
175+
class NoqaHandler(Flake8AsyncVisitor_cst):
176176
def visit_Comment(self, node: cst.Comment):
177177
noqa_match = _find_noqa(node.value)
178178
if noqa_match is None:

0 commit comments

Comments
 (0)