https://github.com/python/cpython/commit/100c7ab00ab66a8c0d54582f35e38d8eb691743c
commit: 100c7ab00ab66a8c0d54582f35e38d8eb691743c
branch: main
author: Kirill Podoprigora <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-05-16T20:27:59Z
summary:
gh-119049: Fix incorrect display of warning which is constructed by C API
(GH-119063)
The source line was not displayed if the warnings module had not yet
been imported.
files:
A Misc/NEWS.d/next/Core and
Builtins/2024-05-16-23-02-03.gh-issue-119049.qpd_S-.rst
M Lib/test/test_capi/test_exceptions.py
M Modules/_testcapimodule.c
M Python/_warnings.c
diff --git a/Lib/test/test_capi/test_exceptions.py
b/Lib/test/test_capi/test_exceptions.py
index 1d158e3586e98d..c475b6d78d0c56 100644
--- a/Lib/test/test_capi/test_exceptions.py
+++ b/Lib/test/test_capi/test_exceptions.py
@@ -3,11 +3,12 @@
import re
import sys
import unittest
+import textwrap
from test import support
from test.support import import_helper
from test.support.os_helper import TESTFN, TESTFN_UNDECODABLE
-from test.support.script_helper import assert_python_failure
+from test.support.script_helper import assert_python_failure, assert_python_ok
from test.support.testcase import ExceptionIsLikeMixin
from .test_misc import decode_stderr
@@ -68,6 +69,47 @@ def test_exc_info(self):
else:
self.assertTrue(False)
+ def test_warn_with_stacklevel(self):
+ code = textwrap.dedent('''\
+ import _testcapi
+
+ def foo():
+ _testcapi.function_set_warning()
+
+ foo() # line 6
+
+
+ foo() # line 9
+ ''')
+ proc = assert_python_ok("-c", code)
+ warnings = proc.err.splitlines()
+ self.assertEqual(warnings, [
+ b'<string>:6: RuntimeWarning: Testing PyErr_WarnEx',
+ b' foo() # line 6',
+ b'<string>:9: RuntimeWarning: Testing PyErr_WarnEx',
+ b' foo() # line 9',
+ ])
+
+ def test_warn_during_finalization(self):
+ code = textwrap.dedent('''\
+ import _testcapi
+
+ class Foo:
+ def foo(self):
+ _testcapi.function_set_warning()
+ def __del__(self):
+ self.foo()
+
+ ref = Foo()
+ ''')
+ proc = assert_python_ok("-c", code)
+ warnings = proc.err.splitlines()
+ # Due to the finalization of the interpreter, the source will be
ommited
+ # because the ``warnings`` module cannot be imported at this time
+ self.assertEqual(warnings, [
+ b'<string>:7: RuntimeWarning: Testing PyErr_WarnEx',
+ ])
+
class Test_FatalError(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Core and
Builtins/2024-05-16-23-02-03.gh-issue-119049.qpd_S-.rst b/Misc/NEWS.d/next/Core
and Builtins/2024-05-16-23-02-03.gh-issue-119049.qpd_S-.rst
new file mode 100644
index 00000000000000..1d7aad8d1e5be6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and
Builtins/2024-05-16-23-02-03.gh-issue-119049.qpd_S-.rst
@@ -0,0 +1,2 @@
+Fix displaying the source line for warnings created by the C API if the
+:mod:`warnings` module had not yet been imported.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index ff31724c0e9ff9..f99ebf0dde4f9e 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -3303,6 +3303,15 @@ test_reftracer(PyObject *ob, PyObject
*Py_UNUSED(ignored))
return NULL;
}
+static PyObject *
+function_set_warning(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
+{
+ if (PyErr_WarnEx(PyExc_RuntimeWarning, "Testing PyErr_WarnEx", 2)) {
+ return NULL;
+ }
+ Py_RETURN_NONE;
+}
+
static PyMethodDef TestMethods[] = {
{"set_errno", set_errno, METH_VARARGS},
{"test_config", test_config, METH_NOARGS},
@@ -3444,6 +3453,7 @@ static PyMethodDef TestMethods[] = {
{"function_set_closure", function_set_closure, METH_VARARGS, NULL},
{"check_pyimport_addmodule", check_pyimport_addmodule, METH_VARARGS},
{"test_weakref_capi", test_weakref_capi, METH_NOARGS},
+ {"function_set_warning", function_set_warning, METH_NOARGS},
{NULL, NULL} /* sentinel */
};
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 793cbc657f3184..17404d33c1cc9b 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -569,10 +569,9 @@ call_show_warning(PyThreadState *tstate, PyObject
*category,
PyObject *show_fn, *msg, *res, *warnmsg_cls = NULL;
PyInterpreterState *interp = tstate->interp;
- /* If the source parameter is set, try to get the Python implementation.
- The Python implementation is able to log the traceback where the source
+ /* The Python implementation is able to log the traceback where the source
was allocated, whereas the C implementation doesn't. */
- show_fn = GET_WARNINGS_ATTR(interp, _showwarnmsg, source != NULL);
+ show_fn = GET_WARNINGS_ATTR(interp, _showwarnmsg, 1);
if (show_fn == NULL) {
if (PyErr_Occurred())
return -1;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
