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 /Modules/posixmodule.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 'Modules/posixmodule.c')
| -rw-r--r-- | Modules/posixmodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 55af338..647ea3e 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5370,7 +5370,7 @@ posix_tempnam(PyObject *self, PyObject *args) #endif if (name == NULL) return PyErr_NoMemory(); - result = PyString_FromString(name); + result = PyUnicode_DecodeFSDefault(name); free(name); return result; } @@ -5428,7 +5428,7 @@ posix_tmpnam(PyObject *self, PyObject *noargs) Py_XDECREF(err); return NULL; } - return PyString_FromString(buffer); + return PyUnicode_DecodeFSDefault(buffer); } #endif |