Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.13] gh-139640: Fix swallowing syntax warnings in different modules (GH-139755) (GH-140119)

Browse source 
Revert GH-131993.

Fix swallowing some syntax warnings in different modules if they accidentally
have the same message and are emitted from the same line.

Fix duplicated warnings in the "finally" block.

(cherry picked from commit 279db6bede)
This commit is contained in:
Serhiy Storchaka 2025-10-14 18:46:11 +03:00 • committed by GitHub
parent c5ec267311
commit 92f7965cf6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 63 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/compile.c
View file

@ -291,6 +291,7 @@ struct compiler {
bool c_save_nested_seqs; /* if true, construct recursive instruction sequences
* (including instructions for nested code objects)
*/
int c_disable_warning;
};
#define INSTR_SEQUENCE(C) ((C)->u->u_instr_sequence)
@ -1437,6 +1438,9 @@ compiler_push_fblock(struct compiler *c, location loc,
f->fb_loc = loc;
f->fb_exit = exit;
f->fb_datum = datum;
if (t == FINALLY_END) {
c->c_disable_warning++;
}
return SUCCESS;
}
@ -1448,6 +1452,9 @@ compiler_pop_fblock(struct compiler *c, enum fblocktype t, jump_target_label blo
u->u_nfblocks--;
assert(u->u_fblock[u->u_nfblocks].fb_type == t);
assert(SAME_LABEL(u->u_fblock[u->u_nfblocks].fb_block, block_label));
if (t == FINALLY_END) {
c->c_disable_warning--;
}
}
static int
@ -6609,6 +6616,9 @@ static int
compiler_warn(struct compiler *c, location loc,
const char *format, ...)
{
if (c->c_disable_warning) {
return SUCCESS;
}
va_list vargs;
va_start(vargs, format);
PyObject *msg = PyUnicode_FromFormatV(format, vargs);
@ -6616,8 +6626,8 @@ compiler_warn(struct compiler *c, location loc,
if (msg == NULL) {
return ERROR;
}
if (_PyErr_WarnExplicitObjectWithContext(PyExc_SyntaxWarning, msg,
c->c_filename, loc.lineno) < 0)
if (PyErr_WarnExplicitObject(PyExc_SyntaxWarning, msg,
c->c_filename, loc.lineno, NULL, NULL) < 0)
{
if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
/* Replace the SyntaxWarning exception with a SyntaxError