diff options
| author | Gregory P. Smith <greg@krypto.org> | 2015-01-22 17:53:24 -0800 |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2015-01-22 17:53:24 -0800 |
| commit | f96f55a3d0202f625ddb021e4768f39a08594b1b (patch) | |
| tree | 5635e9e954272393a993fdaa3cf563e91f86f383 /Python/frozenmain.c | |
| parent | a442c1f64b48e61b2c1e8f8e4cf56858f3e9221c (diff) | |
| parent | 2e0399ab422ca2b0224c0bffcf7535c855789091 (diff) | |
| download | cpython-f96f55a3d0202f625ddb021e4768f39a08594b1b.tar.gz | |
Only pass -E to the child interpreter if our interpreter was running in that
mode. Explicitly remove the PYTHONFAULTHANDLER environment variable before
launching a child interpreter when its presence would impact the test (the
reason -E was being used in the first place).
This enables running the test in an environment where other Python environment variables must be set in order for things to run (such as using PYTHONHOME to
tell an embedded interpreter where it should think it lives).
Diffstat (limited to 'Python/frozenmain.c')
| -rw-r--r-- | Python/frozenmain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/frozenmain.c b/Python/frozenmain.c index 55d05fc26f..cb84ed5f24 100644 --- a/Python/frozenmain.c +++ b/Python/frozenmain.c @@ -52,7 +52,7 @@ Py_FrozenMain(int argc, char **argv) setlocale(LC_ALL, ""); for (i = 0; i < argc; i++) { - argv_copy[i] = _Py_char2wchar(argv[i], NULL); + argv_copy[i] = Py_DecodeLocale(argv[i], NULL); argv_copy2[i] = argv_copy[i]; if (!argv_copy[i]) { fprintf(stderr, "Unable to decode the command line argument #%i\n", |