[Python-checkins] r68143 - in python/branches/py3k: Misc/NEWS Modules/main.c
amaury.forgeotdarc
python-checkins at python.org
Fri Jan 2 00:05:36 CET 2009
Author: amaury.forgeotdarc
Date: Fri Jan 2 00:05:36 2009
New Revision: 68143
Log:
#4747: on Windows, starting a module with a non-ascii filename would print a useless "SyntaxError: None"
when the script contains a "# coding:" declaration.
The Python API expects char* to be utf-8 encoded. wcstombs should be avoided here.
Reviewed by Benjamin. Will backport to 3.0
Modified:
python/branches/py3k/Misc/NEWS
python/branches/py3k/Modules/main.c
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Jan 2 00:05:36 2009
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #4747: When the terminal does not use utf-8, executing a script with
+ non-ascii characters in its name could fail with a "SyntaxError: None" error.
+
- Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
file with `bytes' filename on Windows.
Modified: python/branches/py3k/Modules/main.c
==============================================================================
--- python/branches/py3k/Modules/main.c (original)
+++ python/branches/py3k/Modules/main.c Fri Jan 2 00:05:36 2009
@@ -600,18 +600,21 @@
}
if (sts==-1) {
- char cfilename[PATH_MAX];
+ PyObject *filenameObj = NULL;
char *p_cfilename = "<stdin>";
if (filename) {
- size_t r = wcstombs(cfilename, filename, PATH_MAX);
- p_cfilename = cfilename;
- if (r == (size_t)-1 || r >= PATH_MAX)
+ filenameObj = PyUnicode_FromWideChar(
+ filename, wcslen(filename));
+ if (filenameObj != NULL)
+ p_cfilename = _PyUnicode_AsString(filenameObj);
+ else
p_cfilename = "<decoding error>";
}
sts = PyRun_AnyFileExFlags(
fp,
p_cfilename,
filename != NULL, &cf) != 0;
+ Py_XDECREF(filenameObj);
}
}
More information about the Python-checkins
mailing list