summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2008-01-05 04:32:22 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2008-01-05 04:32:22 (GMT)
commit43b15097ccdb8cbfaf03a8705730cd5d7ab413fd (patch)
treefd7b864e1cb715324831cc21a211a6c42fca541d
parent4c3eda3a847c927bc1594de70b2bf9d27975c8ba (diff)
downloadcpython-43b15097ccdb8cbfaf03a8705730cd5d7ab413fd.zip
cpython-43b15097ccdb8cbfaf03a8705730cd5d7ab413fd.tar.gz
cpython-43b15097ccdb8cbfaf03a8705730cd5d7ab413fd.tar.bz2
Interpreter wasn't displaying the location of a SyntaxError
Issue1692
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/pythonrun.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 1dbba8c..22c4f86 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.0a3?
Core and Builtins
-----------------
+- Issue #1692: Interpreter was not displaying location of SyntaxError
+
- Improve some exception messages when Windows fails to load an extension
module. Now we get for example '%1 is not a valid Win32 application' instead
of 'error code 193'. Also use Unicode strings to deal with non-English
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f95ea83..faacb44 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1103,7 +1103,7 @@ parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
goto finally;
if (v == Py_None)
*filename = NULL;
- else if (! (*filename = PyString_AsString(v)))
+ else if (! (*filename = PyUnicode_AsString(v)))
goto finally;
Py_DECREF(v);