diff options
| author | Georg Brandl <georg@python.org> | 2009-01-03 23:58:58 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-01-03 23:58:58 +0000 |
| commit | 88006d78902191b407a616033b369a5fc1717af1 (patch) | |
| tree | e0e84c55c186a97c1287d0245b209e1f41bb2efe | |
| parent | 2673a50ac98a567aec6f8e3f2861690dcdd1df74 (diff) | |
| download | cpython-git-88006d78902191b407a616033b369a5fc1717af1.tar.gz | |
Merged revisions 68175 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r68175 | martin.v.loewis | 2009-01-02 21:47:48 +0100 (Fri, 02 Jan 2009) | 13 lines
Merged revisions 68172-68173 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fr, 02 Jan 2009) | 2 lines
Issue #4075: Use OutputDebugStringW in Py_FatalError.
........
r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fr, 02 Jan 2009) | 2 lines
Issue #4051: Prevent conflict of UNICODE macros in cPickle.
........
................
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/pythonrun.c | 20 |
2 files changed, 19 insertions, 3 deletions
@@ -20,6 +20,8 @@ Core and Builtins print elapsed times, not only when some objects are uncollectable / unreachable. Original patch by Neil Schemenauer. +- Issue #4075: Use OutputDebugStringW in Py_FatalError. + - 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. diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 04dabc5c78..a3cce33bed 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -23,6 +23,8 @@ #include <signal.h> #endif +#include "malloc.h" /* for alloca */ + #ifdef HAVE_LANGINFO_H #include <locale.h> #include <langinfo.h> @@ -1918,9 +1920,21 @@ Py_FatalError(const char *msg) PyErr_Print(); } #ifdef MS_WINDOWS - OutputDebugString("Fatal Python error: "); - OutputDebugString(msg); - OutputDebugString("\n"); + { + size_t len = strlen(msg); + WCHAR* buffer; + size_t i; + + /* Convert the message to wchar_t. This uses a simple one-to-one + conversion, assuming that the this error message actually uses ASCII + only. If this ceases to be true, we will have to convert. */ + buffer = alloca( (len+1) * (sizeof *buffer)); + for( i=0; i<=len; ++i) + buffer[i] = msg[i]; + OutputDebugStringW(L"Fatal Python error: "); + OutputDebugStringW(buffer); + OutputDebugStringW(L"\n"); + } #ifdef _DEBUG DebugBreak(); #endif |