From 61772acb813391caf4c244f7044e263e0b13d84a Mon Sep 17 00:00:00 2001 From: An Long Date: Tue, 7 Jul 2026 08:36:26 +0900 Subject: [PATCH] gh-153068: Preserve cprofile enable errors (GH-153070) (cherry picked from commit dea93ce2a203a9b3aedf091faa6610d13d2b5aea) Co-authored-by: An Long --- Lib/test/test_profiling/test_tracing_profiler.py | 5 +++-- .../Library/2026-07-05-16-09-31.gh-issue-153068.huY9Jh.rst | 2 ++ Modules/_lsprof.c | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2026-07-05-16-09-31.gh-issue-153068.huY9Jh.rst diff --git a/Lib/test/test_profiling/test_tracing_profiler.py b/Lib/test/test_profiling/test_tracing_profiler.py index 3668e24e073ce4..e9f55613b6cfbb 100644 --- a/Lib/test/test_profiling/test_tracing_profiler.py +++ b/Lib/test/test_profiling/test_tracing_profiler.py @@ -118,8 +118,9 @@ def test_second_profiler(self): pr = self.profilerclass() pr2 = self.profilerclass() pr.enable() - self.assertRaises(ValueError, pr2.enable) - pr.disable() + self.addCleanup(pr.disable) + msg = f"tool {sys.monitoring.PROFILER_ID} is already in use" + self.assertRaisesRegex(ValueError, msg, pr2.enable) def test_throw(self): """ diff --git a/Misc/NEWS.d/next/Library/2026-07-05-16-09-31.gh-issue-153068.huY9Jh.rst b/Misc/NEWS.d/next/Library/2026-07-05-16-09-31.gh-issue-153068.huY9Jh.rst new file mode 100644 index 00000000000000..accf6e99cd6434 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-07-05-16-09-31.gh-issue-153068.huY9Jh.rst @@ -0,0 +1,2 @@ +Fix :meth:`!cProfile.Profile.enable` to no longer overwrite errors from +:mod:`sys.monitoring`. diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index 3d341a336ab22e..4e50ca64f59af2 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -821,7 +821,6 @@ _lsprof_Profiler_enable_impl(ProfilerObject *self, int subcalls, "use_tool_id", "is", self->tool_id, "cProfile"); if (check == NULL) { - PyErr_Format(PyExc_ValueError, "Another profiling tool is already active"); goto error; } Py_DECREF(check);