Fixes and more tests

Author: Zac-HD

flake8_trio.py

@@ -127,6 +127,10 @@ def __lt__(self, other: Any) -> bool:
     def __eq__(self, other: Any) -> bool:
         return isinstance(other, Error) and self.cmp() == other.cmp()
 
+    def __repr__(self) -> str:
+        trailer = "".join(f", {x!r}" for x in self.args)
+        return f"<{self.code} error at {self.line}:{self.col}{trailer}>"
+
 
 checkpoint_node_types = (ast.Await, ast.AsyncFor, ast.AsyncWith)
 cancel_scope_names = (
@@ -806,12 +810,13 @@ def iter_guaranteed_once(iterable: ast.expr) -> bool:
 )
 
 
-def is_nursery_call(node: ast.AST, name: str) -> bool:
+def is_nursery_call(node: ast.AST, name: str) -> bool:  # pragma: no cover
     assert name in ("start", "start_soon")
     if isinstance(node, ast.Attribute):
-        if not isinstance(node.value, ast.Name):
-            return is_nursery_call(node.value, name)  # might be self.nursery.start()
-        return node.value.id.endswith("nursery") and node.attr == "start"
+        if isinstance(node.value, ast.Name):
+            return node.attr == name and node.value.id.endswith("nursery")
+        if isinstance(node.value, ast.Attribute):
+            return node.attr == name and node.value.attr.endswith("nursery")
     return False
 
 
@@ -827,8 +832,17 @@ def visit(self, node: ast.AST):
         self.node_stack.pop()
 
     def visit_Call(self, node: ast.Call):
-        if is_nursery_call(node.func, "start") and (
-            len(self.node_stack) < 2 or not isinstance(self.node_stack[-2], ast.Await)
+        if (
+            isinstance(node.func, ast.Attribute)
+            and isinstance(node.func.value, ast.Name)
+            and (
+                (node.func.value.id == "trio" and node.func.attr in trio_async_funcs)
+                or is_nursery_call(node.func, "start")
+            )
+            and (
+                len(self.node_stack) < 2
+                or not isinstance(self.node_stack[-2], ast.Await)
+            )
         ):
             assert isinstance(node.func, ast.Attribute)
             self.error("TRIO105", node, node.func.attr)
@@ -1179,7 +1193,7 @@ def __init__(self, *args: Any, **kwargs: Any):
     def visit_AsyncFunctionDef(self, node: ast.AsyncFunctionDef):
         outer = self.aenter
 
-        self.aenter = (node.name == "__aenter__" and len(node.args.args) == 1) or any(
+        self.aenter = node.name == "__aenter__" or any(
             _get_identifier(d) == "asynccontextmanager" for d in node.decorator_list
         )
 

tests/test_flake8_trio.py

@@ -159,7 +159,12 @@ def read_file(test_file: str):
 
 def assert_expected_errors(plugin: Plugin, include: Iterable[str], *expected: Error):
     # initialize default option values
-    om = OptionManager(version="", plugin_versions="", parents=[])
+    om = OptionManager(
+        version="",
+        plugin_versions="",
+        parents=[],
+        formatter_names=["default"],  # type: ignore
+    )
     plugin.add_options(om)
     plugin.parse_options(om.parse_args(args=[""]))
 
@@ -361,16 +366,21 @@ def test_107_permutations():
 def test_113_options():
     # check that no errors are given by default
     plugin = read_file("trio113.py")
-    om = OptionManager(version="", plugin_versions="", parents=[])
+    om = OptionManager(
+        version="",
+        plugin_versions="",
+        parents=[],
+        formatter_names=["default"],  # type: ignore
+    )
     plugin.add_options(om)
     plugin.parse_options(om.parse_args(args=["--startable-in-context-manager=''"]))
-    assert not sorted(e for e in plugin.run() if e.code == "TRIO113")
+    default = {repr(e) for e in plugin.run() if e.code == "TRIO113"}
 
     # and that the expected errors are given if we empty it and then extend it
-    arg = "--startable-in-context-manager='custom_startable_function'"
+    arg = "--startable-in-context-manager=custom_startable_function"
     plugin.parse_options(om.parse_args(args=[arg]))
-    errors = sorted(e for e in plugin.run() if e.code == "TRIO113")
-    assert errors == [Error("TRIO113", 58, 8)]
+    errors = {repr(e) for e in plugin.run() if e.code == "TRIO113"} - default
+    assert errors == {repr(Error("TRIO113", 58, 8))}
 
 
 @pytest.mark.fuzz

tests/trio113.py

@@ -66,6 +66,8 @@ async def __aenter__(_a_parameter_not_named_self):
 # might be monkeypatched onto an instance, count this as an error too
 async def __aenter__():
     nursery.start_soon(trio.run_process)  # error: 4
+    nursery.start_soon()  # broken code, but our analysis shouldn't crash
+    nursery.cancel_scope.cancel()
 
 
 # this only takes a single parameter ... right? :P