Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Lib/concurrent/interpreters/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,17 @@ def __del__(self):
def __reduce__(self):
return (type(self), (self._id,))

def _decref(self):
# gh-135729: Globals might be destroyed by the time this is called, so we
# need to keep references ourself
def _decref(self, *,
InterpreterNotFoundError=InterpreterNotFoundError,
_interp_decref=_interpreters.decref,
):
if not self._ownsref:
return
self._ownsref = False
try:
_interpreters.decref(self._id)
_interp_decref(self._id)
except InterpreterNotFoundError:
pass

Expand Down
15 changes: 15 additions & 0 deletions Lib/test/test_interpreters/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,21 @@ def test_pickle(self):
unpickled = pickle.loads(data)
self.assertEqual(unpickled, interp)

@support.requires_subprocess()
@force_not_colorized
def test_cleanup_in_repl(self):
# GH-135729: Using a subinterpreter in the REPL would lead to an unraisable
# exception during finalization
repl = script_helper.spawn_python("-i")
script = b"""if True:
from concurrent import interpreters
interpreters.create()
exit()"""
stdout, stderr = repl.communicate(script)
self.assertIsNone(stderr)
self.assertNotIn(b"Traceback", stdout)



class TestInterpreterIsRunning(TestBase):

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix unraisable exception during finalization when using
:mod:`concurrent.interpreters` in the REPL.
Loading