mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
Issue #12983: Bytes literals with invalid \x escape now raise a SyntaxError
and a full traceback including line number.
This commit is contained in:
commit
801d955f04
4 changed files with 51 additions and 9 deletions
18
Python/ast.c
18
Python/ast.c
|
@ -1829,20 +1829,24 @@ ast_for_atom(struct compiling *c, const node *n)
|
|||
case STRING: {
|
||||
PyObject *str = parsestrplus(c, n, &bytesmode);
|
||||
if (!str) {
|
||||
if (PyErr_ExceptionMatches(PyExc_UnicodeError)) {
|
||||
const char *errtype = NULL;
|
||||
if (PyErr_ExceptionMatches(PyExc_UnicodeError))
|
||||
errtype = "unicode error";
|
||||
else if (PyErr_ExceptionMatches(PyExc_ValueError))
|
||||
errtype = "value error";
|
||||
if (errtype) {
|
||||
char buf[128];
|
||||
PyObject *type, *value, *tback, *errstr;
|
||||
PyErr_Fetch(&type, &value, &tback);
|
||||
errstr = PyObject_Str(value);
|
||||
if (errstr) {
|
||||
char *s = "";
|
||||
char buf[128];
|
||||
s = _PyUnicode_AsString(errstr);
|
||||
PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
|
||||
ast_error(c, n, buf);
|
||||
char *s = _PyUnicode_AsString(errstr);
|
||||
PyOS_snprintf(buf, sizeof(buf), "(%s) %s", errtype, s);
|
||||
Py_DECREF(errstr);
|
||||
} else {
|
||||
ast_error(c, n, "(unicode error) unknown error");
|
||||
PyOS_snprintf(buf, sizeof(buf), "(%s) unknown error", errtype);
|
||||
}
|
||||
ast_error(c, n, buf);
|
||||
Py_DECREF(type);
|
||||
Py_DECREF(value);
|
||||
Py_XDECREF(tback);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue