gh-107471: Fix Refleaks in test_import (gh-107569) · python/cpython@017f047 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 36.1k
• Star 77.2k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 017f047

Browse filesBrowse the repository at this point in the historyBrowse files

ericsnowcurrently

authored

gh-107471: Fix Refleaks in test_import (gh-107569)

gh-107184 introduced a refleak in test_import.SubinterpImportTests (specifically test_singlephase_check_with_setting_and_override and test_single_init_extension_compat). We fix it here by making sure _testsinglephase is removed from sys.modules whenever we clear the runtime's internal state for the module. The underlying problem is strictly contained in the internal function _PyImport_ClearExtension() (AKA _testinternalcapi.clear_extension()), which is only used in tests. (This also fixes an intermittent segfault introduced in the same place, in test_disallowed_reimport.)

1 parent bcdd307 commit 017f047
Copy full SHA for 017f047

2 files changed

+3-1Lines changed: 3 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/test/test_import
  • __init__.py
• Python
  • import.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_import/__init__.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_import/__init__.py

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -150,6 +150,7 @@ def _ready_to_import(name=None, source=""):
150	150	def restore__testsinglephase(*, _orig=_testsinglephase):
151	151	# We started with the module imported and want to restore
152	152	# it to its nominal state.
	153	+ sys.modules.pop('_testsinglephase', None)
153	154	_orig._clear_globals()
154	155	_testinternalcapi.clear_extension('_testsinglephase', _orig.__file__)
155	156	import _testsinglephase
@@ -2125,7 +2126,7 @@ def clean_up():
2125	2126	_interpreters.run_string(interpid, textwrap.dedent(f'''
2126	2127	name = {self.NAME!r}
2127	2128	if name in sys.modules:
2128		- sys.modules[name]._clear_globals()
	2129	+ sys.modules.pop(name)._clear_globals()
2129	2130	_testinternalcapi.clear_extension(name, {self.FILE!r})
2130	2131	'''))
2131	2132	_interpreters.destroy(interpid)

Collapse file

‎Python/import.c‎

Copy file name to clipboardExpand all lines: Python/import.c

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1073,6 +1073,7 @@ _extensions_cache_delete(PyObject *filename, PyObject *name)
1073	1073	However, this decref would be problematic if the module def were
1074	1074	dynamically allocated, it were the last ref, and this function
1075	1075	were called with an interpreter other than the def's owner. */
	1076	+ assert(_Py_IsImmortal(entry->value));
1076	1077	entry->value = NULL;
1077	1078
1078	1079	finally:

0 commit comments

Comments

0 (0)