mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 02:04:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 82059,82061 via svnmerge from

Browse source 
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
........
This commit is contained in:
Victor Stinner 2010-06-17 23:23:37 +00:00
parent 9b16326e5d
commit 25bb0fdb67
6 changed files with 71 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Python/_warnings.c
View file

@ -282,8 +282,7 @@ show_warning(PyObject *filename, int lineno, PyObject *text, PyObject
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();
}