[Python-checkins] r56441 - in python/trunk: Lib/test/test_parser.py Python/ast.c
guido.van.rossum
python-checkins at python.org
Wed Jul 18 19:19:14 CEST 2007
Author: guido.van.rossum
Date: Wed Jul 18 19:19:14 2007
New Revision: 56441
Modified:
python/trunk/Lib/test/test_parser.py
python/trunk/Python/ast.c
Log:
SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
(Slightly tweaked for style and refcounts.)
Modified: python/trunk/Lib/test/test_parser.py
==============================================================================
--- python/trunk/Lib/test/test_parser.py (original)
+++ python/trunk/Lib/test/test_parser.py Wed Jul 18 19:19:14 2007
@@ -474,6 +474,12 @@
st = parser.suite('1 = 3 + 4')
self.assertRaises(SyntaxError, parser.compilest, st)
+ def test_compile_badunicode(self):
+ st = parser.suite('a = u"\U12345678"')
+ self.assertRaises(SyntaxError, parser.compilest, st)
+ st = parser.suite('a = u"\u1"')
+ self.assertRaises(SyntaxError, parser.compilest, st)
+
def test_main():
test_support.run_unittest(
RoundtripLegalSyntaxTestCase,
Modified: python/trunk/Python/ast.c
==============================================================================
--- python/trunk/Python/ast.c (original)
+++ python/trunk/Python/ast.c Wed Jul 18 19:19:14 2007
@@ -1243,9 +1243,26 @@
c->c_arena);
case STRING: {
PyObject *str = parsestrplus(c, n);
- if (!str)
+ if (!str) {
+ if (PyErr_ExceptionMatches(PyExc_UnicodeError)){
+ PyObject *type, *value, *tback, *errstr;
+ PyErr_Fetch(&type, &value, &tback);
+ errstr = ((PyUnicodeErrorObject *)value)->reason;
+ if (errstr) {
+ char *s = "";
+ char buf[128];
+ s = PyString_AsString(errstr);
+ PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
+ ast_error(n, buf);
+ } else {
+ ast_error(n, "(unicode error) unknown error");
+ }
+ Py_DECREF(type);
+ Py_DECREF(value);
+ Py_XDECREF(tback);
+ }
return NULL;
-
+ }
PyArena_AddPyObject(c->c_arena, str);
return Str(str, LINENO(n), n->n_col_offset, c->c_arena);
}
More information about the Python-checkins
mailing list