Skip to content
Open
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
17 changes: 15 additions & 2 deletions Lib/test/test_faulthandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,11 @@ def test_disable(self):

@skip_segfault_on_android
def test_dump_ext_modules(self):
# Don't filter stdlib module names: disable sys.stdlib_module_names
code = """
import faulthandler
import sys
# Don't filter stdlib module names
import math
sys.stdlib_module_names = frozenset()
faulthandler.enable()
faulthandler._sigsegv()
Expand All @@ -403,9 +404,21 @@ def test_dump_ext_modules(self):
if not match:
self.fail(f"Cannot find 'Extension modules:' in {stderr!r}")
modules = set(match.group(1).strip().split(', '))
for name in ('sys', 'faulthandler'):
for name in ('sys', 'faulthandler', 'math'):
self.assertIn(name, modules)

# Ignore "math.integer" sub-module if "math" package is
# in sys.stdlib_module_names
code = """
import faulthandler
import math.integer
faulthandler.enable()
faulthandler._sigsegv()
"""
stderr, exitcode = self.get_output(code)
stderr = '\n'.join(stderr)
self.assertNotIn('Extension modules:', stderr)

def test_is_enabled(self):
orig_stderr = sys.stderr
try:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
When :mod:`faulthandler` dumps the list of third-party extension modules,
ignore sub-modules of stdlib packages. Patch by Victor Stinner.
24 changes: 19 additions & 5 deletions Python/pylifecycle.c
Original file line number Diff line number Diff line change
Expand Up @@ -3393,11 +3393,25 @@ _Py_DumpExtensionModules(int fd, PyInterpreterState *interp)
Py_hash_t hash;
// if stdlib_module_names is not NULL, it is always a frozenset.
while (_PySet_NextEntry(stdlib_module_names, &i, &item, &hash)) {
if (PyUnicode_Check(item)
&& PyUnicode_Compare(key, item) == 0)
{
is_stdlib_ext = 1;
break;
if (!PyUnicode_Check(item)) {
continue;
}
Py_ssize_t len = PyUnicode_GET_LENGTH(item);
if (PyUnicode_Tailmatch(key, item, 0, len, -1) == 1) {
Py_ssize_t key_len = PyUnicode_GET_LENGTH(key);
if (key_len == len) {
is_stdlib_ext = 1;
break;
}
assert(key_len > len);

// Ignore sub-modules of stdlib packages. For example,
// ignore "math.integer" if key starts with "math.".
Py_UCS4 ch = PyUnicode_ReadChar(key, len);
if (ch == '.') {
is_stdlib_ext = 1;
break;
}
}
}
if (is_stdlib_ext) {
Expand Down
Loading