Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #28100: Refactor error messages, patch by Ivan Levkivskyi

This commit is contained in:
Christian Heimes 2016-09-23 20:26:30 +02:00
parent 6f3f3e5ca4
commit 517507c6d5
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Python/symtable.c
View File

@ -1282,14 +1282,12 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
VISIT_QUIT(st, 0);
if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) {
char* msg;
if (cur & DEF_ANNOT) {
msg = GLOBAL_ANNOT;
}
if (cur & DEF_LOCAL) {
msg = GLOBAL_AFTER_ASSIGN;
}
else {
if (cur & USE) {
msg = GLOBAL_AFTER_USE;
} else if (cur & DEF_ANNOT) {
msg = GLOBAL_ANNOT;
} else { /* DEF_LOCAL */
msg = GLOBAL_AFTER_ASSIGN;
}
PyErr_Format(PyExc_SyntaxError,
msg, name);
@ -1315,14 +1313,12 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
VISIT_QUIT(st, 0);
if (cur & (DEF_LOCAL | USE | DEF_ANNOT)) {
char* msg;
if (cur & DEF_ANNOT) {
msg = NONLOCAL_ANNOT;
}
if (cur & DEF_LOCAL) {
msg = NONLOCAL_AFTER_ASSIGN;
}
else {
if (cur & USE) {
msg = NONLOCAL_AFTER_USE;
} else if (cur & DEF_ANNOT) {
msg = NONLOCAL_ANNOT;
} else { /* DEF_LOCAL */
msg = NONLOCAL_AFTER_ASSIGN;
}
PyErr_Format(PyExc_SyntaxError, msg, name);
PyErr_SyntaxLocationObject(st->st_filename,