Commite596740

and

authored

[3.13]gh-124858: fix happy eyeballs refcyles (GH-124859) (#124912)

gh-124858: fix happy eyeballs refcyles (GH-124859)(cherry picked from commitc066bf5)Co-authored-by: Thomas Grainger <tagrain@gmail.com>

1 parent77d7998 commite596740Copy full SHA for e596740

File tree

+32

-6

lines changed

+32

-6

lines changed

Lines changed: 12 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`importcollections.abc`
`18`	`18`	`importconcurrent.futures`
`19`	`19`	`importerrno`
`20`		`-importfunctools`
`21`	`20`	`importheapq`
`22`	`21`	`importitertools`
`23`	`22`	`importos`
`@@ -1140,11 +1139,18 @@ async def create_connection(`
`1140`	`1139`	`exceptOSError:`
`1141`	`1140`	`continue`
`1142`	`1141`	`else:# using happy eyeballs`
`1143`		`-sock,_,_=awaitstaggered.staggered_race(`
`1144`		`- (functools.partial(self._connect_sock,`
`1145`		`-exceptions,addrinfo,laddr_infos)`
`1146`		`-foraddrinfoininfos),`
`1147`		`-happy_eyeballs_delay,loop=self)`
	`1142`	`+sock= (awaitstaggered.staggered_race(`
	`1143`	`+ (`
	`1144`	`+# can't use functools.partial as it keeps a reference`
	`1145`	`+# to exceptions`
	`1146`	`+lambdaaddrinfo=addrinfo:self._connect_sock(`
	`1147`	`+exceptions,addrinfo,laddr_infos`
	`1148`	`+ )`
	`1149`	`+foraddrinfoininfos`
	`1150`	`+ ),`
	`1151`	`+happy_eyeballs_delay,`
	`1152`	`+loop=self,`
	`1153`	`+ ))[0]# can't use sock, _, _ as it keeks a reference to exceptions`
`1148`	`1154`
`1149`	`1155`	`ifsockisNone:`
`1150`	`1156`	`exceptions= [excforsubinexceptionsforexcinsub]`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ async def run_one_coro(ok_to_start, previous_failed) -> None:`
`144`	`144`	`raised.exception()`
`145`	`145`	`returnwinner_result,winner_index,exceptions`
`146`	`146`	`finally:`
	`147`	`+delexceptions`
`147`	`148`	`# Make sure no tasks are left running if we leave this function`
`148`	`149`	`fortinrunning_tasks:`
`149`	`150`	`t.cancel()`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1246,6 +1246,24 @@ async def handle_echo(reader, writer):`
`1246`	`1246`	`messages=self._basetest_unhandled_exceptions(handle_echo)`
`1247`	`1247`	`self.assertEqual(messages, [])`
`1248`	`1248`
	`1249`	`+deftest_open_connection_happy_eyeball_refcycles(self):`
	`1250`	`+port=socket_helper.find_unused_port()`
	`1251`	`+asyncdefmain():`
	`1252`	`+exc=None`
	`1253`	`+try:`
	`1254`	`+awaitasyncio.open_connection(`
	`1255`	`+host="localhost",`
	`1256`	`+port=port,`
	`1257`	`+happy_eyeballs_delay=0.25,`
	`1258`	`+ )`
	`1259`	`+ except*OSErrorasexcs:`
	`1260`	`+# can't use assertRaises because that clears frames`
	`1261`	`+exc=excs.exceptions[0]`
	`1262`	`+self.assertIsNotNone(exc)`
	`1263`	`+self.assertListEqual(gc.get_referrers(exc), [])`
	`1264`	`+`
	`1265`	`+asyncio.run(main())`
	`1266`	`+`
`1249`	`1267`
`1250`	`1268`	`if__name__=='__main__':`
`1251`	`1269`	`unittest.main()`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix reference cycles left in tracebacks in:func:`asyncio.open_connection` when used with ``happy_eyeballs_delay``

Comments

(0)