diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-17 23:23:37 +0000 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-17 23:23:37 +0000 |
| commit | 25bb0fdb67d03a47ee2193219fa0af2f191d4568 (patch) | |
| tree | be67ba53efbffa6755a1dce8ec340a0bba2f9453 /Include | |
| parent | 9b16326e5d0a640bc78bbc357edb1f6455fd9a6b (diff) | |
| download | cpython-git-25bb0fdb67d03a47ee2193219fa0af2f191d4568.tar.gz | |
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
........
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/traceback.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Include/traceback.h b/Include/traceback.h index e7943dae96..fc0c586b89 100644 --- a/Include/traceback.h +++ b/Include/traceback.h @@ -10,16 +10,16 @@ struct _frame; /* Traceback interface */ typedef struct _traceback { - PyObject_HEAD - struct _traceback *tb_next; - struct _frame *tb_frame; - int tb_lasti; - int tb_lineno; + PyObject_HEAD + struct _traceback *tb_next; + struct _frame *tb_frame; + int tb_lasti; + int tb_lineno; } PyTracebackObject; PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *); PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *); -PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, const char *, int, int); +PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int); /* Reveal traceback type so we can typecheck traceback objects */ PyAPI_DATA(PyTypeObject) PyTraceBack_Type; |