Commitf487008

authored

[3.14]gh-130522: Fix unraisable TypeError in threading at interpreter shutdown (GH-131537) (#137105)

Co-authored-by: Tyler Kennedy <tk@tkte.ch>Co-authored-by: Peter Bierma <zintensitydev@gmail.com>

1 parent134ca90 commitf487008Copy full SHA for f487008

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1993,6 +1993,23 @@ def modify_file():`
`1993`	`1993`	`t.start()`
`1994`	`1994`	`t.join()`
`1995`	`1995`
	`1996`	`+deftest_dummy_thread_on_interpreter_shutdown(self):`
	`1997`	+# GH-130522: When `threading` held a reference to itself and then a
	`1998`	`+# _DummyThread() object was created, destruction of the dummy thread`
	`1999`	`+# would emit an unraisable exception at shutdown, due to a lock being`
	`2000`	`+# destroyed.`
	`2001`	`+code="""if True:`
	`2002`	`+ import sys`
	`2003`	`+ import threading`
	`2004`	`+`
	`2005`	`+ threading.x = sys.modules[__name__]`
	`2006`	`+ x = threading._DummyThread()`
	`2007`	`+ """`
	`2008`	`+rc,out,err=assert_python_ok("-c",code)`
	`2009`	`+self.assertEqual(rc,0)`
	`2010`	`+self.assertEqual(out,b"")`
	`2011`	`+self.assertEqual(err,b"")`
	`2012`	`+`
`1996`	`2013`
`1997`	`2014`	`classThreadRunFail(threading.Thread):`
`1998`	`2015`	`defrun(self):`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1421,7 +1421,7 @@ def __init__(self, dummy_thread):`
`1421`	`1421`	`# the related _DummyThread will be kept forever!`
`1422`	`1422`	`_thread_local_info._track_dummy_thread_ref=self`
`1423`	`1423`
`1424`		`-def__del__(self):`
	`1424`	`+def__del__(self,_active_limbo_lock=_active_limbo_lock,_active=_active):`
`1425`	`1425`	`with_active_limbo_lock:`
`1426`	`1426`	`if_active.get(self._tident)isself._dummy_thread:`
`1427`	`1427`	`_active.pop(self._tident,None)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix unraisable:exc:`TypeError` raised during:term:`interpreter shutdown`
	`2`	+in the:mod:`threading` module.

Comments

(0)