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/_ctypes | |
| 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/_ctypes')
| -rw-r--r-- | Modules/_ctypes/callbacks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index a1a0e0d..385add4 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -34,9 +34,9 @@ void _AddTraceback(char *funcname, char *filename, int lineno) PyCodeObject *py_code = 0; PyFrameObject *py_frame = 0; - py_srcfile = PyString_FromString(filename); + py_srcfile = PyUnicode_DecodeFSDefault(filename); if (!py_srcfile) goto bad; - py_funcname = PyString_FromString(funcname); + py_funcname = PyUnicode_FromString(funcname); if (!py_funcname) goto bad; py_globals = PyDict_New(); if (!py_globals) goto bad; |