diff options
| author | Guido van Rossum <guido@python.org> | 2007-10-15 02:52:41 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-10-15 02:52:41 (GMT) |
| commit | 00bc0e0a2d0b6c403a3c6ab96fa7d3398b5c751e (patch) | |
| tree | 34fda27260f18f813912d83a2cf060264a736190 /Python/pythonrun.c | |
| parent | cdadf242ba32f1b3ef55e74d2eeb021e62da8041 (diff) | |
| download | cpython-00bc0e0a2d0b6c403a3c6ab96fa7d3398b5c751e.zip cpython-00bc0e0a2d0b6c403a3c6ab96fa7d3398b5c751e.tar.gz cpython-00bc0e0a2d0b6c403a3c6ab96fa7d3398b5c751e.tar.bz2 | |
Patch #1272, by Christian Heimes and Alexandre Vassalotti.
Changes to make __file__ a proper Unicode object, using the default
filesystem encoding.
This is a bit tricky because the default filesystem encoding isn't
set by the time we import the first modules; at that point we fudge
things a bit. This is okay since __file__ isn't really used much
except for error reporting.
Tested on OSX and Linux only so far.
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index a37a3e4..4e239c9 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -867,7 +867,8 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit, return -1; d = PyModule_GetDict(m); if (PyDict_GetItemString(d, "__file__") == NULL) { - PyObject *f = PyString_FromString(filename); + PyObject *f; + f = PyUnicode_DecodeFSDefault(filename); if (f == NULL) return -1; if (PyDict_SetItemString(d, "__file__", f) < 0) { |