Mercurial > cpython-lru_cache-weakref
diff Python/pythonrun.c @ 62393:fa830371c724 3.1
Merged revisions 82059,82061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82059 | victor.stinner | 2010-06-18 01:08:50 +0200 (ven., 18 juin 2010) | 5 lines
Issue #6543: Write the traceback in the terminal encoding instead of utf-8.
Fix the encoding of the modules filename.
Reindent also traceback.h, just because I hate tabs :-)
........
r82061 | victor.stinner | 2010-06-18 01:17:37 +0200 (ven., 18 juin 2010) | 2 lines
Issue #6543: Mention the author of the patch, Amaury Forgeot d'Arc
........
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Thu, 17 Jun 2010 23:23:37 +0000 |
| parents | f83f201b1276 |
| children | 77c6f60a1b24 |
line wrap: on
line diff
--- a/Python/pythonrun.c Thu Jun 17 23:20:37 2010 +0000 +++ b/Python/pythonrun.c Thu Jun 17 23:23:37 2010 +0000 @@ -1160,7 +1160,7 @@ d = PyModule_GetDict(m); if (PyDict_GetItemString(d, "__file__") == NULL) { PyObject *f; - f = PyUnicode_DecodeFSDefault(filename); + f = PyUnicode_FromString(filename); if (f == NULL) return -1; if (PyDict_SetItemString(d, "__file__", f) < 0) {