summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-02-10 15:43:25 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-02-10 15:43:25 (GMT)
commitb8cbba5877df478966092ce069b6cedea8487c53 (patch)
treede7fcae85c654a604265ef9f73e50c6583ad05b1 /Python
parent419d9a83d5688940b3dbb410029080ad7f2f71a8 (diff)
parent801d955f04d46994ac5bc7270fea86a7703c5192 (diff)
downloadcpython-b8cbba5877df478966092ce069b6cedea8487c53.zip
cpython-b8cbba5877df478966092ce069b6cedea8487c53.tar.gz
cpython-b8cbba5877df478966092ce069b6cedea8487c53.tar.bz2
Issue #12983: Bytes literals with invalid \x escape now raise a SyntaxError
and a full traceback including line number.
Diffstat (limited to 'Python')
-rw-r--r--Python/ast.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/Python/ast.c b/Python/ast.c
index f0a3917..aa72cdb 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1843,20 +1843,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);