handle strict_exception_groups=True by unwrapping user exceptions from within exceptiongroups

Author: jakkdl

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
         os: [ubuntu-latest]
         # latest pylint/astroid doesn't support 3.7
         # python3.7 is covered in build_and_test_old_deps
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12-dev']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13-dev']
 
     steps:
       - uses: actions/checkout@v3

requirements-dev-full.txt

@@ -1,15 +1,13 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --output-file=requirements-dev-full.txt requirements-dev.in requirements-extras.in setup.py
+#    pip-compile --output-file=requirements-dev-full.txt --resolver=backtracking requirements-dev.in requirements-extras.in setup.py
 #
 alabaster==0.7.13
     # via sphinx
 astroid==3.0.0
     # via pylint
-async-generator==1.10
-    # via trio
 attrs==22.2.0
     # via
     #   -r requirements-dev.in
@@ -30,21 +28,20 @@ charset-normalizer==3.1.0
 click==8.1.3
     # via pip-tools
 coverage[toml]==7.2.1
-    # via pytest-cov
+    # via
+    #   coverage
+    #   pytest-cov
 cryptography==39.0.2
-    # via trustme
+    # via
+    #   secretstorage
+    #   trustme
 dill==0.3.7
     # via pylint
 docutils==0.18.1
     # via
     #   readme-renderer
     #   sphinx
     #   sphinx-rtd-theme
-exceptiongroup==1.1.3 ; python_version < "3.11"
-    # via
-    #   pytest
-    #   trio
-    #   trio-websocket (setup.py)
 h11==0.14.0
     # via wsproto
 idna==3.4
@@ -57,16 +54,17 @@ imagesize==1.4.1
 importlib-metadata==6.0.0
     # via
     #   keyring
-    #   sphinx
     #   twine
-importlib-resources==6.1.0
-    # via keyring
 iniconfig==2.0.0
     # via pytest
 isort==5.11.5
     # via pylint
 jaraco-classes==3.2.3
     # via keyring
+jeepney==0.8.0
+    # via
+    #   keyring
+    #   secretstorage
 jinja2==3.1.2
     # via sphinx
 keyring==23.13.1
@@ -118,8 +116,6 @@ pytest-cov==4.0.0
     # via -r requirements-dev.in
 pytest-trio==0.8.0
     # via -r requirements-dev.in
-pytz==2023.3.post1
-    # via babel
 readme-renderer==37.3
     # via twine
 requests==2.28.2
@@ -133,6 +129,8 @@ rfc3986==2.0.0
     # via twine
 rich==13.3.2
     # via twine
+secretstorage==3.3.3
+    # via keyring
 six==1.16.0
     # via bleach
 sniffio==1.3.0
@@ -164,29 +162,16 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 sphinxcontrib-trio==1.1.2
     # via -r requirements-extras.in
-tomli==2.0.1
-    # via
-    #   build
-    #   coverage
-    #   pip-tools
-    #   pylint
-    #   pyproject-hooks
-    #   pytest
 tomlkit==0.11.6
     # via pylint
-trio==0.22.0
+trio==0.24.0
     # via
     #   pytest-trio
     #   trio-websocket (setup.py)
 trustme==0.9.0
     # via -r requirements-dev.in
 twine==4.0.2
     # via -r requirements-extras.in
-typing-extensions==4.8.0
-    # via
-    #   astroid
-    #   pylint
-    #   rich
 urllib3==1.26.15
     # via
     #   requests
@@ -198,9 +183,7 @@ wheel==0.38.4
 wsproto==1.2.0
     # via trio-websocket (setup.py)
 zipp==3.15.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements-dev.txt

@@ -1,82 +1,72 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --output-file=requirements-dev.txt requirements-dev.in setup.py
+#    pip-compile --output-file=requirements-dev.txt --resolver=backtracking requirements-dev.in setup.py
 #
-async-generator==1.10
-    # via trio
-attrs==22.2.0
+attrs==23.2.0
     # via
     #   -r requirements-dev.in
     #   outcome
     #   trio
-build==0.10.0
+build==1.2.1
     # via pip-tools
-cffi==1.15.1
+cffi==1.16.0
     # via cryptography
-click==8.1.3
+click==8.1.7
     # via pip-tools
-coverage[toml]==7.2.1
-    # via pytest-cov
-cryptography==41.0.4
-    # via trustme
-exceptiongroup==1.1.3 ; python_version < "3.11"
+coverage[toml]==7.5.3
     # via
-    #   pytest
-    #   trio
-    #   trio-websocket (setup.py)
+    #   coverage
+    #   pytest-cov
+cryptography==42.0.8
+    # via trustme
 h11==0.14.0
     # via wsproto
-idna==3.4
+idna==3.7
     # via
     #   trio
     #   trustme
 iniconfig==2.0.0
     # via pytest
-outcome==1.2.0
+outcome==1.3.0.post0
     # via
     #   pytest-trio
     #   trio
-packaging==23.0
+packaging==24.0
     # via
     #   build
     #   pytest
-pip-tools==6.14.0
+pip-tools==7.4.1
     # via -r requirements-dev.in
-pluggy==1.0.0
+pluggy==1.5.0
     # via pytest
-pycparser==2.21
+pycparser==2.22
     # via cffi
-pyproject-hooks==1.0.0
-    # via build
-pytest==7.4.2
+pyproject-hooks==1.1.0
+    # via
+    #   build
+    #   pip-tools
+pytest==8.2.2
     # via
     #   -r requirements-dev.in
     #   pytest-cov
     #   pytest-trio
-pytest-cov==4.0.0
+pytest-cov==5.0.0
     # via -r requirements-dev.in
 pytest-trio==0.8.0
     # via -r requirements-dev.in
-sniffio==1.3.0
+sniffio==1.3.1
     # via trio
 sortedcontainers==2.4.0
     # via trio
-tomli==2.0.1
-    # via
-    #   build
-    #   coverage
-    #   pip-tools
-    #   pyproject-hooks
-    #   pytest
-trio==0.22.0
+trio==0.25.1
     # via
     #   pytest-trio
     #   trio-websocket (setup.py)
-trustme==0.9.0
+trustme==1.1.0
     # via -r requirements-dev.in
-wheel==0.38.4
+wheel==0.43.0
     # via pip-tools
 wsproto==1.2.0
     # via trio-websocket (setup.py)

tests/test_connection.py

@@ -417,15 +417,15 @@ async def handler(request):
 
 
 @fail_after(1)
-async def test_handshake_exception_before_accept():
+async def test_handshake_exception_before_accept() -> None:
     ''' In #107, a request handler that throws an exception before finishing the
     handshake causes the task to hang. The proper behavior is to raise an
     exception to the nursery as soon as possible. '''
     async def handler(request):
         raise ValueError()
 
-    with pytest.raises(ValueError):
-        async with trio.open_nursery() as nursery:
+    with trio.testing.RaisesGroup(ValueError, strict=False):
+        async with trio.open_nursery(strict_exception_groups=True) as nursery:
             server = await nursery.start(serve_websocket, handler, HOST, 0,
                 None)
             async with open_websocket(HOST, server.port, RESOURCE,