Commit929afd1

and

authored

gh-131670: Fix crash inanext() when__anext__ is sync and raises (#131682)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>

1 parent5fef4ff commit929afd1Copy full SHA for 929afd1

File tree

+24

-0

lines changed

+24

-0

lines changed

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1169,6 +1169,26 @@ async def run():`
`1169`	`1169`
`1170`	`1170`	`self.loop.run_until_complete(run())`
`1171`	`1171`
	`1172`	`+deftest_sync_anext_raises_exception(self):`
	`1173`	`+# See: https://github.com/python/cpython/issues/131670`
	`1174`	`+msg='custom'`
	`1175`	`+forexc_typein [`
	`1176`	`+StopAsyncIteration,`
	`1177`	`+StopIteration,`
	`1178`	`+ValueError,`
	`1179`	`+Exception,`
	`1180`	`+ ]:`
	`1181`	`+exc=exc_type(msg)`
	`1182`	`+withself.subTest(exc=exc):`
	`1183`	`+classA:`
	`1184`	`+def__anext__(self):`
	`1185`	`+raiseexc`
	`1186`	`+`
	`1187`	`+withself.assertRaisesRegex(exc_type,msg):`
	`1188`	`+anext(A())`
	`1189`	`+withself.assertRaisesRegex(exc_type,msg):`
	`1190`	`+anext(A(),1)`
	`1191`	`+`
`1172`	`1192`	`deftest_async_gen_asyncio_anext_stopiteration(self):`
`1173`	`1193`	`asyncdeffoo():`
`1174`	`1194`	`try:`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix:func:`anext` failing on sync:meth:`~object.__anext__` raising an exception.

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1837,6 +1837,9 @@ builtin_anext_impl(PyObject module, PyObject aiterator,`
`1837`	`1837`	`}`
`1838`	`1838`
`1839`	`1839`	`awaitable= (*t->tp_as_async->am_anext)(aiterator);`
	`1840`	`+if (awaitable==NULL) {`
	`1841`	`+returnNULL;`
	`1842`	`+ }`
`1840`	`1843`	`if (default_value==NULL) {`
`1841`	`1844`	`returnawaitable;`
`1842`	`1845`	`}`

Comments

(0)