make ruff happy

rmorshea · rmorshea · commit 8f0ffae54641 · 2023-05-31T02:07:48.000-06:00
diff --git a/docs/source/_exts/build_custom_js.py b/docs/source/_exts/build_custom_js.py
@@ -8,5 +8,5 @@
 
 
 def setup(app: Sphinx) -> None:
-    subprocess.run("npm install", cwd=CUSTOM_JS_DIR, shell=True)
-    subprocess.run("npm run build", cwd=CUSTOM_JS_DIR, shell=True)
+    subprocess.run("npm install", cwd=CUSTOM_JS_DIR, shell=True)  # noqa S607
+    subprocess.run("npm run build", cwd=CUSTOM_JS_DIR, shell=True)  # noqa S607
diff --git a/docs/source/guides/managing-state/sharing-component-state/_examples/filterable_list/main.py b/docs/source/guides/managing-state/sharing-component-state/_examples/filterable_list/main.py
@@ -34,9 +34,8 @@ def Table(value, set_value):
         tr = html.tr(name, descr, value)
         if not value:
             rows.append(tr)
-        else:
-            if value.lower() in row["name"].lower():
-                rows.append(tr)
+        elif value.lower() in row["name"].lower():
+            rows.append(tr)
         headers = html.tr(html.td(html.b("name")), html.td(html.b("description")))
     table = html.table(html.thead(headers), html.tbody(rows))
     return table
diff --git a/docs/source/reference/_examples/pigeon_maps.py b/docs/source/reference/_examples/pigeon_maps.py
@@ -12,7 +12,7 @@ def MapWithMarkers():
         Marker(
             {
                 "anchor": anchor,
-                "onClick": lambda: remove_marker_anchor(anchor),
+                "onClick": lambda event, a=anchor: remove_marker_anchor(a),
             },
             key=str(anchor),
         )
diff --git a/pyproject.toml b/pyproject.toml
@@ -39,7 +39,8 @@ select = [
   "C",
   "DTZ",
   "E",
-  "EM",
+  # error message linting is overkill
+  # "EM",
   "F",
   # TODO: turn this on later
   # "FBT",
@@ -63,14 +64,22 @@ select = [
 ignore = [
   # TODO: turn this on later
   "N802", "N806",  # allow TitleCase functions/variables
+  # We're not any cryptography
+  "S311",
+  # For loop variable re-assignment seems like an uncommon mistake
+  "PLW2901",
   # Let Black deal with line-length
   "E501",
+  # Allow args/attrs to shadow built-ins
+  "A002", "A003",
   # Allow unused args (useful for documenting what the parameter is for later)
-  "ARG001", "ARG005",
+  "ARG001", "ARG002", "ARG005",
   # Allow non-abstract empty methods in abstract base classes
   "B027",
   # Allow boolean positional values in function calls, like `dict.get(... True)`
   "FBT003",
+  # If we're making an explicit comparison to a falsy value it was probably intentional
+  "PLC1901",
   # Ignore checks for possible passwords
   "S105", "S106", "S107",
   # Ignore complexity
diff --git a/scripts/live_docs.py b/scripts/live_docs.py
@@ -86,8 +86,8 @@ def main():
     ignore_handler = _get_ignore_handler(args)
     server.watch(srcdir, builder, ignore=ignore_handler)
     for dirpath in args.additional_watched_dirs:
-        dirpath = os.path.realpath(dirpath)
-        server.watch(dirpath, builder, ignore=ignore_handler)
+        real_dirpath = os.path.realpath(dirpath)
+        server.watch(real_dirpath, builder, ignore=ignore_handler)
     server.watch(outdir, ignore=ignore_handler)
 
     if not args.no_initial_build:
diff --git a/scripts/run_docs.py b/scripts/run_docs.py
@@ -5,13 +5,13 @@
 # to import docs
 sys.path.insert(0, os.getcwd())
 
-from docs.app import make_app
+from docs.app import make_app  # noqa: E402
 
 app = make_app()
 
 if __name__ == "__main__":
     app.run(
-        host="0.0.0.0",
+        host="0.0.0.0",  # noqa: S104
         port=int(os.environ.get("PORT", 5000)),
         workers=int(os.environ.get("WEB_CONCURRENCY", 1)),
         debug=bool(int(os.environ.get("DEBUG", "0"))),
diff --git a/src/py/reactpy/reactpy/_console/ast_utils.py b/src/py/reactpy/reactpy/_console/ast_utils.py
@@ -129,7 +129,7 @@ def find_element_constructor_usages(
                     node.args.insert(1, maybe_attr_dict_node)
                 else:
                     continue
-            elif len(node.args) >= 2:
+            elif len(node.args) >= 2:  # noqa: PLR2004
                 maybe_attr_dict_node = node.args[1]
         elif hasattr(html, name):
             if len(node.args) == 0:
diff --git a/src/py/reactpy/reactpy/_warnings.py b/src/py/reactpy/reactpy/_warnings.py
@@ -13,7 +13,7 @@ def warn(*args: Any, **kwargs: Any) -> Any:
 
 
 if TYPE_CHECKING:
-    warn = _warn
+    warn = _warn  # noqa F811
 
 
 def _frame_depth_in_module() -> int:
diff --git a/src/py/reactpy/reactpy/backend/default.py b/src/py/reactpy/reactpy/backend/default.py
@@ -50,7 +50,7 @@ async def serve_development_app(
 
 def _default_implementation() -> BackendImplementation[Any]:
     """Get the first available server implementation"""
-    global _DEFAULT_IMPLEMENTATION
+    global _DEFAULT_IMPLEMENTATION  # noqa PLW0603
 
     if _DEFAULT_IMPLEMENTATION is not None:
         return _DEFAULT_IMPLEMENTATION
@@ -60,7 +60,7 @@ def _default_implementation() -> BackendImplementation[Any]:
     except StopIteration:  # pragma: no cover
         logger.debug("Backend implementation import failed", exc_info=exc_info())
         msg = "No built-in server implementation installed."
-        raise RuntimeError(msg)
+        raise RuntimeError(msg) from None
     else:
         _DEFAULT_IMPLEMENTATION = implementation
         return implementation
diff --git a/src/py/reactpy/reactpy/backend/flask.py b/src/py/reactpy/reactpy/backend/flask.py
@@ -256,7 +256,9 @@ async def main() -> None:
 
     dispatch_thread_info_created.wait()
     dispatch_thread_info = cast(_DispatcherThreadInfo, dispatch_thread_info_ref.current)
-    assert dispatch_thread_info is not None
+
+    if dispatch_thread_info is None:
+        raise RuntimeError("Failed to create dispatcher thread")
 
     stop = ThreadEvent()
 
diff --git a/src/py/reactpy/reactpy/core/_f_back.py b/src/py/reactpy/reactpy/core/_f_back.py
@@ -9,7 +9,8 @@ def f_module_name(index: int = 0) -> str:
     if frame is None:
         return ""  # pragma: no cover
     name = frame.f_globals.get("__name__", "")
-    assert isinstance(name, str), "Expected module name to be a string"
+    if not isinstance(name, str):
+        raise TypeError("Expected module name to be a string")
     return name
 
 
diff --git a/src/py/reactpy/reactpy/core/hooks.py b/src/py/reactpy/reactpy/core/hooks.py
@@ -246,13 +246,13 @@ def use_context(context: Context[_Type]) -> _Type:
     provider = hook.get_context_provider(context)
 
     if provider is None:
-        # force type checker to realize this is just a normal function
-        assert isinstance(context, FunctionType), f"{context} is not a Context"
-        # __kwdefault__ can be None if no kwarg only parameters exist
-        assert context.__kwdefaults__ is not None, f"{context} has no 'value' kwarg"
-        # lastly check that 'value' kwarg exists
-        assert "value" in context.__kwdefaults__, f"{context} has no 'value' kwarg"
-        # then we can safely access the context's default value
+        # same assertions but with normal exceptions
+        if not isinstance(context, FunctionType):
+            raise TypeError(f"{context} is not a Context")
+        if context.__kwdefaults__ is None:
+            raise TypeError(f"{context} has no 'value' kwarg")
+        if "value" not in context.__kwdefaults__:
+            raise TypeError(f"{context} has no 'value' kwarg")
         return cast(_Type, context.__kwdefaults__["value"])
 
     return provider._value
@@ -455,7 +455,7 @@ class _Memo(Generic[_Type]):
 
     def empty(self) -> bool:
         try:
-            self.value
+            self.value  # noqa: B018
         except AttributeError:
             return True
         else:
@@ -708,8 +708,8 @@ def set_current(self) -> None:
 
     def unset_current(self) -> None:
         """Unset this hook as the active hook in this thread"""
-        # this assertion should never fail - primarilly useful for debug
-        assert _hook_stack.get().pop() is self
+        if _hook_stack.get().pop() is not self:
+            raise RuntimeError("Hook stack is in an invalid state")
 
     def _schedule_render(self) -> None:
         try:
diff --git a/src/py/reactpy/reactpy/core/layout.py b/src/py/reactpy/reactpy/core/layout.py
@@ -318,21 +318,20 @@ def _render_model_children(
                         index,
                         key,
                     )
+                elif old_child_state.is_component_state:
+                    self._unmount_model_states([old_child_state])
+                    new_child_state = _make_element_model_state(
+                        new_state,
+                        index,
+                        key,
+                    )
+                    old_child_state = None
                 else:
-                    if old_child_state.is_component_state:
-                        self._unmount_model_states([old_child_state])
-                        new_child_state = _make_element_model_state(
-                            new_state,
-                            index,
-                            key,
-                        )
-                        old_child_state = None
-                    else:
-                        new_child_state = _update_element_model_state(
-                            old_child_state,
-                            new_state,
-                            index,
-                        )
+                    new_child_state = _update_element_model_state(
+                        old_child_state,
+                        new_state,
+                        index,
+                    )
                 self._render_model(exit_stack, old_child_state, new_child_state, child)
                 new_state.append_child(new_child_state.model.current)
                 new_state.children_by_key[key] = new_child_state
@@ -595,7 +594,8 @@ def is_component_state(self) -> bool:
     @property
     def parent(self) -> _ModelState:
         parent = self._parent_ref()
-        assert parent is not None, "detached model state"
+        if parent is None:
+            raise RuntimeError("detached model state")
         return parent
 
     def append_child(self, child: Any) -> None:
diff --git a/src/py/reactpy/reactpy/core/serve.py b/src/py/reactpy/reactpy/core/serve.py
@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from asyncio import create_task
 from collections.abc import Awaitable
 from logging import getLogger
 from typing import Callable
 
 from anyio import create_task_group
+from anyio.abc import TaskGroup
 
 from reactpy.core.types import LayoutEventMessage, LayoutType, LayoutUpdateMessage
 
@@ -40,7 +40,7 @@ async def serve_layout(
         try:
             async with create_task_group() as task_group:
                 task_group.start_soon(_single_outgoing_loop, layout, send)
-                task_group.start_soon(_single_incoming_loop, layout, recv)
+                task_group.start_soon(_single_incoming_loop, task_group, layout, recv)
         except Stop:
             logger.info(f"Stopped serving {layout}")
 
@@ -53,9 +53,11 @@ async def _single_outgoing_loop(
 
 
 async def _single_incoming_loop(
-    layout: LayoutType[LayoutUpdateMessage, LayoutEventMessage], recv: RecvCoroutine
+    task_group: TaskGroup,
+    layout: LayoutType[LayoutUpdateMessage, LayoutEventMessage],
+    recv: RecvCoroutine,
 ) -> None:
     while True:
         # We need to fire and forget here so that we avoid waiting on the completion
         # of this event handler before receiving and running the next one.
-        create_task(layout.deliver(await recv()))
+        task_group.start_soon(layout.deliver, await recv())
diff --git a/src/py/reactpy/reactpy/testing/common.py b/src/py/reactpy/reactpy/testing/common.py
@@ -141,7 +141,8 @@ def capture(self, render_function: Callable[..., Any]) -> Callable[..., Any]:
         @wraps(render_function)
         def wrapper(*args: Any, **kwargs: Any) -> Any:
             self = self_ref()
-            assert self is not None, "Hook catcher has been garbage collected"
+            if self is None:
+                raise RuntimeError("Hook catcher has been garbage collected")
 
             hook = current_hook()
             if self.index_by_kwarg is not None:
diff --git a/src/py/reactpy/reactpy/utils.py b/src/py/reactpy/reactpy/utils.py
@@ -214,7 +214,7 @@ def _mutate_vdom(vdom: VdomDict) -> None:
         and isinstance(vdom["attributes"]["style"], str)
     ):
         # Convince type checker that it's safe to mutate attributes
-        assert isinstance(vdom["attributes"], dict)
+        assert isinstance(vdom["attributes"], dict)  # noqa: S101
 
         # Convert style attribute from str -> dict with camelCase keys
         vdom["attributes"]["style"] = {
@@ -291,9 +291,8 @@ def _vdom_attr_to_html_str(key: str, value: Any) -> tuple[str, str]:
     ):
         key = _CAMEL_CASE_SUB_PATTERN.sub("-", key)
 
-    assert not callable(
-        value
-    ), f"Could not convert callable attribute {key}={value} to HTML"
+    if callable(value):
+        raise TypeError(f"Cannot convert callable attribute {key}={value} to HTML")
 
     # Again, we lower the attribute name only to normalize - HTML is case-insensitive:
     # http://w3c.github.io/html-reference/documents.html#case-insensitivity
diff --git a/src/py/reactpy/reactpy/web/utils.py b/src/py/reactpy/reactpy/web/utils.py
@@ -56,7 +56,7 @@ def resolve_module_exports_from_url(
         return set()
 
     try:
-        text = requests.get(url).text
+        text = requests.get(url, timeout=5).text
     except requests.exceptions.ConnectionError as error:
         reason = "" if error is None else " - {error.errno}"
         logger.warning("Did not resolve exports for url " + url + reason)
diff --git a/src/py/reactpy/setup.py b/src/py/reactpy/setup.py
diff --git a/src/py/reactpy/tests/test__option.py b/src/py/reactpy/tests/test__option.py
diff --git a/src/py/reactpy/tests/test_core/test_hooks.py b/src/py/reactpy/tests/test_core/test_hooks.py
diff --git a/src/py/reactpy/tests/test_core/test_layout.py b/src/py/reactpy/tests/test_core/test_layout.py
diff --git a/src/py/reactpy/tests/test_core/test_serve.py b/src/py/reactpy/tests/test_core/test_serve.py
diff --git a/src/py/reactpy/tests/test_utils.py b/src/py/reactpy/tests/test_utils.py
diff --git a/tasks.py b/tasks.py

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ def MapWithMarkers():`
`12`	`12`	`Marker(`
`13`	`13`	`{`
`14`	`14`	`"anchor": anchor,`
`15`		`- "onClick": lambda: remove_marker_anchor(anchor),`
	`15`	`+ "onClick": lambda event, a=anchor: remove_marker_anchor(a),`
`16`	`16`	`},`
`17`	`17`	`key=str(anchor),`
`18`	`18`	`)`