Mercurial > cpython-lru_cache-weakref
diff Python/_warnings.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 | 3271af035d01 |
| children | 0991b40e895d 3c9232a684ae |
line wrap: on
line diff
--- a/Python/_warnings.c Thu Jun 17 23:20:37 2010 +0000 +++ b/Python/_warnings.c Thu Jun 17 23:23:37 2010 +0000 @@ -282,8 +282,7 @@ PyFile_WriteString("\n", f_stderr); } else - if (_Py_DisplaySourceLine(f_stderr, _PyUnicode_AsString(filename), - lineno, 2) < 0) + if (_Py_DisplaySourceLine(f_stderr, filename, lineno, 2) < 0) return; PyErr_Clear(); }