#7301: decode $PYTHONWARNINGS in the same way as argv, test non-ascii values

This commit is contained in:
Philip Jenvey 2010-04-14 03:01:39 +00:00
parent 9b82f990cb
commit e53de3dc4a
4 changed files with 55 additions and 17 deletions

View file

@ -14,8 +14,8 @@ wmain(int argc, wchar_t **argv)
return Py_Main(argc, argv);
}
#else
static wchar_t*
char2wchar(char* arg)
wchar_t*
_Py_char2wchar(char* arg)
{
wchar_t *res;
#ifdef HAVE_BROKEN_MBSTOWCS
@ -143,7 +143,7 @@ main(int argc, char **argv)
oldloc = strdup(setlocale(LC_ALL, NULL));
setlocale(LC_ALL, "");
for (i = 0; i < argc; i++) {
argv_copy2[i] = argv_copy[i] = char2wchar(argv[i]);
argv_copy2[i] = argv_copy[i] = _Py_char2wchar(argv[i]);
if (!argv_copy[i])
return 1;
}