misc fixes

Author: rmorshea

docs/source/about/changelog.rst

@@ -45,6 +45,12 @@ Unreleased
   ``something if condition else html._()``. Now you can simply write
   ``something if condition else None``.
 
+**Deprecated**
+
+- :pull:`1171` - The ``Stop`` exception. Recent releases of ``anyio`` have made this
+  exception difficult to use since it now raises an ``ExceptionGroup``. This exception
+  was primarily used for internal testing purposes and so is now deprecated.
+
 
 v1.0.2
 ------

src/py/reactpy/reactpy/__init__.py

@@ -16,7 +16,6 @@
     use_state,
 )
 from reactpy.core.layout import Layout
-from reactpy.core.serve import Stop
 from reactpy.core.vdom import vdom
 from reactpy.utils import Ref, html_to_vdom, vdom_to_html
 

src/py/reactpy/reactpy/core/serve.py

@@ -3,6 +3,7 @@
 from collections.abc import Awaitable
 from logging import getLogger
 from typing import Callable
+from warnings import warn
 
 from anyio import create_task_group
 from anyio.abc import TaskGroup
@@ -24,7 +25,9 @@
 
 
 class Stop(BaseException):
-    """Stop serving changes and events
+    """Deprecated
+
+    Stop serving changes and events
 
     Raising this error will tell dispatchers to gracefully exit. Typically this is
     called by code running inside a layout to tell it to stop rendering.
@@ -42,7 +45,12 @@ async def serve_layout(
             async with create_task_group() as task_group:
                 task_group.start_soon(_single_outgoing_loop, layout, send)
                 task_group.start_soon(_single_incoming_loop, task_group, layout, recv)
-        except Stop:
+        except Stop:  # nocov
+            warn(
+                "The Stop exception is deprecated and will be removed in a future version",
+                UserWarning,
+                stacklevel=1,
+            )
             logger.info(f"Stopped serving {layout}")
 
 

src/py/reactpy/tests/test_core/test_serve.py

@@ -2,6 +2,7 @@
 from collections.abc import Sequence
 from typing import Any
 
+import pytest
 from jsonpointer import set_pointer
 
 import reactpy
@@ -17,6 +18,10 @@
 STATIC_EVENT_HANDLER = StaticEventHandler()
 
 
+class StopError(Exception):
+    """Stop the dispatcher"""
+
+
 def make_send_recv_callbacks(events_to_inject):
     changes = []
 
@@ -31,7 +36,7 @@ async def send(patch):
         changes.append(patch)
         sem.release()
         if not events_to_inject:
-            raise reactpy.Stop()
+            raise StopError()
 
     async def recv():
         await sem.acquire()
@@ -93,7 +98,8 @@ def Counter():
 async def test_dispatch():
     events, expected_model = make_events_and_expected_model()
     changes, send, recv = make_send_recv_callbacks(events)
-    await asyncio.wait_for(serve_layout(Layout(Counter()), send, recv), 1)
+    with pytest.raises(StopError):
+        await asyncio.wait_for(serve_layout(Layout(Counter()), send, recv), 1)
     assert_changes_produce_expected_model(changes, expected_model)