cpython-lru_cache-weakref: Python/traceback.c annotate

annotate Python/traceback.c @ 66978:aed2bbafa550 3.1

Blocked revisions 87324 via svnmerge ........ r87324 | r.david.murray | 2010-12-16 14:08:51 -0500 (Thu, 16 Dec 2010) | 9 lines #10719: restore messages generated on invalid compileall args Before the introduction of filename arguments to compileall it gave semi useful messages about not being able to 'list' names that weren't valid directories. This fix restores that behavior. In addition to the test for this case, the patch also adds a test for the default behavior of compileall when no arguments are provided, and fixes a bug in one of the previously added tests. ........

author	R. David Murray <rdmurray@bitdance.com>
date	Thu, 16 Dec 2010 19:10:16 +0000
parents	42b84d3188d1
children	3c9232a684ae

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Traceback implementation */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	3
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	4 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	5
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 31739 diff changeset	6 #include "code.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	7 #include "frameobject.h"
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "structmember.h"
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	9 #include "osdefs.h"
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	10 #include "traceback.h"
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	11 #ifdef HAVE_FCNTL_H
0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	12 #include <fcntl.h>
0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	13 #endif
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	14
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	15 #define OFF(x) offsetof(PyTracebackObject, x)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	16
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	17 /* Method from Parser/tokenizer.c */
0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	18 extern char * PyTokenizer_FindEncoding(int);
0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	19
42593 5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	20 static PyObject *
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	21 tb_dir(PyTracebackObject *self)
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	22 {
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	23 return Py_BuildValue("[ssss]", "tb_frame", "tb_next",
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	24 "tb_lasti", "tb_lineno");
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	25 }
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	26
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	27 static PyMethodDef tb_methods[] = {
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	28 {"__dir__", (PyCFunction)tb_dir, METH_NOARGS},
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	29 {NULL, NULL, 0, NULL},
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	30 };
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	31
42537 74a3c6826683 Remove support for __members__ and __methods__. There still might be Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	32 static PyMemberDef tb_memberlist[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	33 {"tb_next", T_OBJECT, OFF(tb_next), READONLY},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	34 {"tb_frame", T_OBJECT, OFF(tb_frame), READONLY},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	35 {"tb_lasti", T_INT, OFF(tb_lasti), READONLY},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	36 {"tb_lineno", T_INT, OFF(tb_lineno), READONLY},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	37 {NULL} /* Sentinel */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	38 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	39
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	40 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	41 tb_dealloc(PyTracebackObject *tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	42 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	43 PyObject_GC_UnTrack(tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	44 Py_TRASHCAN_SAFE_BEGIN(tb)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	45 Py_XDECREF(tb->tb_next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	46 Py_XDECREF(tb->tb_frame);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	47 PyObject_GC_Del(tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	48 Py_TRASHCAN_SAFE_END(tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	49 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	50
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	51 static int
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	52 tb_traverse(PyTracebackObject tb, visitproc visit, void arg)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	53 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	54 Py_VISIT(tb->tb_next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	55 Py_VISIT(tb->tb_frame);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	56 return 0;
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	57 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	58
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	59 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	60 tb_clear(PyTracebackObject *tb)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	61 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	62 Py_CLEAR(tb->tb_next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	63 Py_CLEAR(tb->tb_frame);
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	64 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	65
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	66 PyTypeObject PyTraceBack_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	67 PyVarObject_HEAD_INIT(&PyType_Type, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	68 "traceback",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	69 sizeof(PyTracebackObject),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	70 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	71 (destructor)tb_dealloc, /tp_dealloc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	72 0, /tp_print/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	73 0, /tp_getattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	74 0, /tp_setattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	75 0, /tp_reserved/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	76 0, /tp_repr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	77 0, /tp_as_number/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	78 0, /tp_as_sequence/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	79 0, /tp_as_mapping/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	80 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	81 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	82 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	83 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	84 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	85 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	86 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	87 0, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	88 (traverseproc)tb_traverse, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	89 (inquiry)tb_clear, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	90 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	91 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	92 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	93 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	94 tb_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	95 tb_memberlist, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	96 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	97 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	98 0, /* tp_dict */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	99 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	100
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	101 static PyTracebackObject *
49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	102 newtracebackobject(PyTracebackObject next, PyFrameObject frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	103 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	104 PyTracebackObject *tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	105 if ((next != NULL && !PyTraceBack_Check(next)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	106 frame == NULL \|\| !PyFrame_Check(frame)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	107 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	108 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	109 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	110 tb = PyObject_GC_New(PyTracebackObject, &PyTraceBack_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	111 if (tb != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	112 Py_XINCREF(next);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	113 tb->tb_next = next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	114 Py_XINCREF(frame);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	115 tb->tb_frame = frame;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	116 tb->tb_lasti = frame->f_lasti;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	117 tb->tb_lineno = PyCode_Addr2Line(frame->f_code,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	118 frame->f_lasti);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	119 PyObject_GC_Track(tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	120 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	121 return tb;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	122 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	123
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	124 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	125 PyTraceBack_Here(PyFrameObject *frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	126 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	127 PyThreadState *tstate = PyThreadState_GET();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	128 PyTracebackObject oldtb = (PyTracebackObject ) tstate->curexc_traceback;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	129 PyTracebackObject *tb = newtracebackobject(oldtb, frame);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	130 if (tb == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	131 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	132 tstate->curexc_traceback = (PyObject *)tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	133 Py_XDECREF(oldtb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	134 return 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	135 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	136
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	137 static PyObject *
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	138 _Py_FindSourceFile(PyObject filename, char namebuf, size_t namelen, PyObject *io)
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	139 {
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	140 Py_ssize_t i;
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	141 PyObject *binary;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	142 PyObject *v;
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	143 Py_ssize_t npath;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	144 size_t taillen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	145 PyObject *syspath;
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	146 PyObject *path;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	147 const char* tail;
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	148 PyObject *filebytes;
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	149 const char* filepath;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	150 Py_ssize_t len;
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	151 PyObject* result;
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	152
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	153 filebytes = PyUnicode_AsEncodedObject(filename,
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	154 Py_FileSystemDefaultEncoding, "surrogateescape");
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	155 if (filebytes == NULL) {
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	156 PyErr_Clear();
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	157 return NULL;
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	158 }
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	159 filepath = PyBytes_AS_STRING(filebytes);
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	160
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	161 /* Search tail of filename in sys.path before giving up */
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	162 tail = strrchr(filepath, SEP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	163 if (tail == NULL)
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	164 tail = filepath;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	165 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	166 tail++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	167 taillen = strlen(tail);
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	168
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	169 syspath = PySys_GetObject("path");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	170 if (syspath == NULL \|\| !PyList_Check(syspath))
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	171 goto error;
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	172 npath = PyList_Size(syspath);
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	173
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	174 for (i = 0; i < npath; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	175 v = PyList_GetItem(syspath, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	176 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	177 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	178 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	179 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	180 if (!PyUnicode_Check(v))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	181 continue;
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	182
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	183 path = PyUnicode_AsEncodedObject(v, Py_FileSystemDefaultEncoding,
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	184 "surrogateescape");
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	185 if (path == NULL) {
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	186 PyErr_Clear();
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	187 continue;
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	188 }
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	189 len = PyBytes_GET_SIZE(path);
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	190 if (len + 1 + (Py_ssize_t)taillen >= (Py_ssize_t)namelen - 1) {
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	191 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	192 continue; /* Too long */
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	193 }
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	194 strcpy(namebuf, PyBytes_AS_STRING(path));
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	195 Py_DECREF(path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	196 if (strlen(namebuf) != len)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	197 continue; /* v contains '\0' */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	198 if (len > 0 && namebuf[len-1] != SEP)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	199 namebuf[len++] = SEP;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	200 strcpy(namebuf+len, tail);
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	201
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	202 binary = PyObject_CallMethod(io, "open", "ss", namebuf, "rb");
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	203 if (binary != NULL) {
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	204 result = binary;
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	205 goto finally;
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	206 }
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	207 PyErr_Clear();
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	208 }
65536 42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	209 goto error;
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	210
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	211 error:
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	212 result = NULL;
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	213 finally:
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	214 Py_DECREF(filebytes);
42b84d3188d1 Recorded merge of revisions 85569-85570 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 65332 diff changeset	215 return result;
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	216 }
0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	217
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	218 int
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	219 _Py_DisplaySourceLine(PyObject f, PyObject filename, int lineno, int indent)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	220 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	221 int err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	222 int fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	223 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	224 char *found_encoding;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	225 char *encoding;
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	226 PyObject *io;
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	227 PyObject *binary;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	228 PyObject *fob = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	229 PyObject *lineobj = NULL;
65332 6296632ad2cb Merged revisions 85497 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	230 PyObject *res;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	231 char buf[MAXPATHLEN+1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	232 Py_UNICODE u, p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	233 Py_ssize_t len;
44742 14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44157 diff changeset	234
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	235 /* open the file */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	236 if (filename == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	237 return 0;
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	238
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	239 io = PyImport_ImportModuleNoBlock("io");
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	240 if (io == NULL)
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	241 return -1;
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	242 binary = PyObject_CallMethod(io, "open", "Os", filename, "rb");
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	243
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	244 if (binary == NULL) {
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	245 binary = _Py_FindSourceFile(filename, buf, sizeof(buf), io);
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	246 if (binary == NULL) {
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	247 Py_DECREF(io);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	248 return 0;
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	249 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	250 }
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	251
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	252 /* use the right encoding to decode the file as unicode */
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	253 fd = PyObject_AsFileDescriptor(binary);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	254 found_encoding = PyTokenizer_FindEncoding(fd);
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	255 encoding = (found_encoding != NULL) ? found_encoding : "utf-8";
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	256 lseek(fd, 0, 0); /* Reset position */
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	257 fob = PyObject_CallMethod(io, "TextIOWrapper", "Os", binary, encoding);
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	258 Py_DECREF(io);
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	259 Py_DECREF(binary);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	260 PyMem_FREE(found_encoding);
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	261
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	262 if (fob == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	263 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	264 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	265 }
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	266
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	267 /* get the line number lineno */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	268 for (i = 0; i < lineno; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	269 Py_XDECREF(lineobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	270 lineobj = PyFile_GetLine(fob, -1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	271 if (!lineobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	272 err = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	273 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	274 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	275 }
65332 6296632ad2cb Merged revisions 85497 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	276 res = PyObject_CallMethod(fob, "close", "");
6296632ad2cb Merged revisions 85497 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	277 if (res)
6296632ad2cb Merged revisions 85497 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	278 Py_DECREF(res);
6296632ad2cb Merged revisions 85497 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	279 else
6296632ad2cb Merged revisions 85497 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 62393 diff changeset	280 PyErr_Clear();
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	281 Py_DECREF(fob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	282 if (!lineobj \|\| !PyUnicode_Check(lineobj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	283 Py_XDECREF(lineobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	284 return err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	285 }
49484 0b7e023803fb Issues #2384 and #3975: Tracebacks were not correctly printed when the source file Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 48660 diff changeset	286
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	287 /* remove the indentation of the line */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	288 u = PyUnicode_AS_UNICODE(lineobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	289 len = PyUnicode_GET_SIZE(lineobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	290 for (p=u; p == ' ' \|\| p == '\t' \|\| *p == '\014'; p++)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	291 len--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	292 if (u != p) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	293 PyObject *truncated;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	294 truncated = PyUnicode_FromUnicode(p, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	295 if (truncated) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	296 Py_DECREF(lineobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	297 lineobj = truncated;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	298 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	299 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	300 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	301 }
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	302
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	303 /* Write some spaces before the line */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	304 strcpy(buf, " ");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	305 assert (strlen(buf) == 10);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	306 while (indent > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	307 if(indent < 10)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	308 buf[indent] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	309 err = PyFile_WriteString(buf, f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	310 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	311 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	312 indent -= 10;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	313 }
48474 2ee09afee126 implement chained exception tracebacks Benjamin Peterson <benjamin@python.org> parents: 47301 diff changeset	314
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	315 /* finally display the line */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	316 if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	317 err = PyFile_WriteObject(lineobj, f, Py_PRINT_RAW);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	318 Py_DECREF(lineobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	319 if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	320 err = PyFile_WriteString("\n", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	321 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	322 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	323
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	324 static int
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	325 tb_displayline(PyObject f, PyObject filename, int lineno, PyObject *name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	326 {
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	327 int err;
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	328 PyObject *line;
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	329
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	330 if (filename == NULL \|\| name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	331 return -1;
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	332 line = PyUnicode_FromFormat(" File \"%U\", line %d, in %U\n",
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	333 filename, lineno, name);
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	334 if (line == NULL)
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	335 return -1;
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	336 err = PyFile_WriteObject(line, f, Py_PRINT_RAW);
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	337 Py_DECREF(line);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	338 if (err != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	339 return err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	340 return _Py_DisplaySourceLine(f, filename, lineno, 4);
46430 47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	341 }
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	342
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	343 static int
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	344 tb_printinternal(PyTracebackObject tb, PyObject f, long limit)
47d9bbe10897 Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44742 diff changeset	345 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	346 int err = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	347 long depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	348 PyTracebackObject *tb1 = tb;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	349 while (tb1 != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	350 depth++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	351 tb1 = tb1->tb_next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	352 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	353 while (tb != NULL && err == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	354 if (depth <= limit) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	355 err = tb_displayline(f,
62393 fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	356 tb->tb_frame->f_code->co_filename,
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	357 tb->tb_lineno,
fa830371c724 Merged revisions 82059,82061 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 61467 diff changeset	358 tb->tb_frame->f_code->co_name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	359 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	360 depth--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	361 tb = tb->tb_next;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	362 if (err == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	363 err = PyErr_CheckSignals();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	364 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	365 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	366 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	367
44157 565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	368 #define PyTraceBack_LIMIT 1000
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	369
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	370 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	371 PyTraceBack_Print(PyObject v, PyObject f)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	372 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	373 int err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	374 PyObject *limitv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	375 long limit = PyTraceBack_LIMIT;
44157 565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	376
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	377 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	378 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	379 if (!PyTraceBack_Check(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	380 PyErr_BadInternalCall();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	381 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	382 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	383 limitv = PySys_GetObject("tracebacklimit");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	384 if (limitv) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	385 PyObject exc_type, exc_value, *exc_tb;
44157 565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	386
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	387 PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	388 limit = PyLong_AsLong(limitv);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	389 if (limit == -1 && PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	390 if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	391 limit = PyTraceBack_LIMIT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	392 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	393 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	394 Py_XDECREF(exc_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	395 Py_XDECREF(exc_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	396 Py_XDECREF(exc_tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	397 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	398 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	399 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	400 else if (limit <= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	401 limit = PyTraceBack_LIMIT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	402 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	403 PyErr_Restore(exc_type, exc_value, exc_tb);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	404 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	405 err = PyFile_WriteString("Traceback (most recent call last):\n", f);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	406 if (!err)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	407 err = tb_printinternal((PyTracebackObject *)v, f, limit);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	408 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	409 }

Mercurial > cpython-lru_cache-weakref

annotate Python/traceback.c @ 66978:aed2bbafa550 3.1