From: A Tammy <openbsd.ports@aisha.cc>
Subject: [patch] net/py-anyio - try to make more compatible with trio version in ports
To: wenheping2000@hotmail.com, "ports@openbsd.org" <ports@openbsd.org>
Date: Sat, 24 Aug 2024 18:43:17 -0400

Hi,
 Our net/py-anyio port is quite behind and can't be updated due to
jupyter revdeps. So I am gonna try and fix some of the things to get it
working a tinier bit better with our current version of trio in the tree.

Attached is a patch which greatly improves test success.

Without the patch

> 431 failed, 901 passed, 11 skipped in 70.14s (0:01:10)

With the patch

> 111 failed, 1221 passed, 11 skipped in 50.23s


OK to patch?

diff --git a/net/py-anyio/Makefile b/net/py-anyio/Makefile
index 91187f55937..c5227224bc2 100644
--- a/net/py-anyio/Makefile
+++ b/net/py-anyio/Makefile
@@ -3,7 +3,7 @@ COMMENT =		async library on top of asyncio or trio
 MODPY_EGG_VERSION =	3.7.1
 DISTNAME =		anyio-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1

 CATEGORIES =		net

diff --git a/net/py-anyio/patches/patch-src_anyio__backends__trio_py
b/net/py-anyio/patches/patch-src_anyio__backends__trio_py
new file mode 100644
index 00000000000..834b8e819bd
--- /dev/null
+++ b/net/py-anyio/patches/patch-src_anyio__backends__trio_py
@@ -0,0 +1,21 @@
+Index: src/anyio/_backends/_trio.py
+--- src/anyio/_backends/_trio.py.orig
++++ src/anyio/_backends/_trio.py
+@@ -159,7 +159,7 @@ current_time = trio.current_time
+ #
+
+
+-class ExceptionGroup(BaseExceptionGroup, trio.MultiError):
++class ExceptionGroup(BaseExceptionGroup):
+     pass
+
+
+@@ -183,8 +183,6 @@ class TaskGroup(abc.TaskGroup):
+     ) -> bool | None:
+         try:
+             return await self._nursery_manager.__aexit__(exc_type,
exc_val, exc_tb)
+-        except trio.MultiError as exc:
+-            raise ExceptionGroup(exc.exceptions) from None
+         finally:
+             self._active = False
+