summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
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 730c576..1b5fa6c 100644
--- a/Python/ast.c
+++ b/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);
706'>bug_3602706 Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.
summaryrefslogtreecommitdiffstats
path: root/doc
ModeNameSize
-rw-r--r--AddErrInfo.37019logstatsplain
-rw-r--r--Alloc.31585logstatsplain
-rw-r--r--AllowExc.31421logstatsplain
-rw-r--r--AppInit.32811logstatsplain
-rw-r--r--AssocData.33585logstatsplain
-rw-r--r--Async.36326logstatsplain
-rw-r--r--BackgdErr.32324logstatsplain
-rw-r--r--Backslash.31327logstatsplain
-rw-r--r--BoolObj.33105logstatsplain
-rw-r--r--CallDel.32219logstatsplain
-rw-r--r--CmdCmplt.31030logstatsplain
-rw-r--r--Concat.31773logstatsplain
-rw-r--r--CrtChannel.323298logstatsplain
-rw-r--r--CrtChnlHdlr.33794logstatsplain
-rw-r--r--CrtCloseHdlr.31859logstatsplain
-rw-r--r--CrtCommand.36365logstatsplain
-rw-r--r--CrtFileHdlr.33617logstatsplain
-rw-r--r--CrtInterp.36087logstatsplain
-rw-r--r--CrtMathFnc.33626logstatsplain
-rw-r--r--CrtObjCmd.310846logstatsplain
-rw-r--r--CrtSlave.39741logstatsplain
-rw-r--r--CrtTimerHdlr.32867logstatsplain
-rw-r--r--CrtTrace.34557logstatsplain
-rw-r--r--DString.35805logstatsplain
-rw-r--r--DetachPids.32518logstatsplain
-rw-r--r--DoOneEvent.34179logstatsplain
-rw-r--r--DoWhenIdle.33397logstatsplain
-rw-r--r--DoubleObj.32914logstatsplain
-rw-r--r--Eval.34486logstatsplain
-rw-r--r--EvalObj.33492logstatsplain