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

annotate Python/traceback.c @ 47559:2925b568aacc

Merged revisions 63562,63570,63728,63734,63784,63788,63802,63817,63827,63839,63887,63975,63998 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63562 | martin.v.loewis | 2008-05-23 17:06:50 +0200 (Fri, 23 May 2008) | 2 lines Patch #1722225: Support QNX 6. ........ r63570 | trent.nelson | 2008-05-23 22:33:14 +0200 (Fri, 23 May 2008) | 1 line Introduce a user macro named $(externalsDir), which should point to the root directory of where all the external sources should live. Developers can change this value if their external sources live elsewhere. The default of '..\..' matches the current status quo. ........ r63728 | gregory.p.smith | 2008-05-26 23:16:34 +0200 (Mon, 26 May 2008) | 4 lines Fix issue2589: there was a potential integer overflow leading to memory corruption on esoteric platforms and incorrect behavior on normal platforms. ........ r63734 | gregory.p.smith | 2008-05-27 00:07:28 +0200 (Tue, 27 May 2008) | 3 lines Fix issue2588: Do not execute str[size-1] = '\0' when a 0 size is passed in. (The assert won't prevent this in non-debug builds). ........ r63784 | raymond.hettinger | 2008-05-29 10:38:23 +0200 (Thu, 29 May 2008) | 1 line Fix two typos. ........ r63788 | facundo.batista | 2008-05-29 18:39:26 +0200 (Thu, 29 May 2008) | 6 lines Fixed the semantic of timeout for socket.create_connection and all the upper level libraries that use it, including urllib2. Added and fixed some tests, and changed docs correspondingly. Thanks to John J Lee for the patch and the pusing, :) ........ r63802 | mark.dickinson | 2008-05-30 04:46:53 +0200 (Fri, 30 May 2008) | 2 lines Fix typo in testSum ........ r63817 | raymond.hettinger | 2008-05-30 20:20:50 +0200 (Fri, 30 May 2008) | 8 lines * Mark intermedidate computes values (hi, lo, yr) as volatile. * Expand comments. * Swap variable names in the sum_exact code so that x and y are consistently chosen as the larger and smaller magnitude values respectively. ........ r63827 | raymond.hettinger | 2008-05-31 05:24:31 +0200 (Sat, 31 May 2008) | 1 line Implement heapq in terms of less-than (to match list.sort()). ........ r63839 | gerhard.haering | 2008-05-31 23:33:27 +0200 (Sat, 31 May 2008) | 2 lines Fixed rowcount for SELECT statements. They're -1 now (again), for better DB-API 2.0 compliance. ........ r63887 | gregory.p.smith | 2008-06-02 06:05:52 +0200 (Mon, 02 Jun 2008) | 4 lines Fix issue 2782: be less strict about the format string type in strftime. Accept unicode and anything else ParseTuple "s#" can deal with. This matches the time.strftime behavior. ........ r63975 | neal.norwitz | 2008-06-06 06:47:01 +0200 (Fri, 06 Jun 2008) | 3 lines Aldo Cortesi confirmed this is still needed for OpenBSD 4.2 and 4.3. (I didn't regen configure, since I don't have a working autoconf.) ........ r63998 | raymond.hettinger | 2008-06-06 23:47:51 +0200 (Fri, 06 Jun 2008) | 1 line Issue 3501: Make heapq support both __le__ and __lt__. ........

author	Georg Brandl <georg@python.org>
date	Tue, 10 Jun 2008 17:40:04 +0000
parents	23ab586c427a
children	2ee09afee126

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"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	11
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	12 #define OFF(x) offsetof(PyTracebackObject, x)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	13
42593 5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	14 static PyObject *
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	15 tb_dir(PyTracebackObject *self)
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	16 {
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	17 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	18 "tb_lasti", "tb_lineno");
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	19 }
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	20
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	21 static PyMethodDef tb_methods[] = {
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	22 {"__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	23 {NULL, NULL, 0, NULL},
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	24 };
5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	25
42537 74a3c6826683 Remove support for __members__ and __methods__. There still might be Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	26 static PyMemberDef tb_memberlist[] = {
74a3c6826683 Remove support for __members__ and __methods__. There still might be Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	27 {"tb_next", T_OBJECT, OFF(tb_next), READONLY},
74a3c6826683 Remove support for __members__ and __methods__. There still might be Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	28 {"tb_frame", T_OBJECT, OFF(tb_frame), READONLY},
74a3c6826683 Remove support for __members__ and __methods__. There still might be Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	29 {"tb_lasti", T_INT, OFF(tb_lasti), READONLY},
74a3c6826683 Remove support for __members__ and __methods__. There still might be Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	30 {"tb_lineno", T_INT, OFF(tb_lineno), READONLY},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	31 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	32 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	33
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	34 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	35 tb_dealloc(PyTracebackObject *tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	36 {
22650 2288c724fe2b Call PyObject_GC_UnTrack before putting an object on the list of trash. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21077 diff changeset	37 PyObject_GC_UnTrack(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	38 Py_TRASHCAN_SAFE_BEGIN(tb)
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	39 Py_XDECREF(tb->tb_next);
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	40 Py_XDECREF(tb->tb_frame);
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	41 PyObject_GC_Del(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	42 Py_TRASHCAN_SAFE_END(tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	43 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	44
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	45 static int
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	46 tb_traverse(PyTracebackObject tb, visitproc visit, void arg)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	47 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	48 Py_VISIT(tb->tb_next);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	49 Py_VISIT(tb->tb_frame);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	50 return 0;
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	51 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	52
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	53 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	54 tb_clear(PyTracebackObject *tb)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	55 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	56 Py_CLEAR(tb->tb_next);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	57 Py_CLEAR(tb->tb_frame);
20623 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
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	60 PyTypeObject PyTraceBack_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 40737 diff changeset	61 PyVarObject_HEAD_INIT(&PyType_Type, 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	62 "traceback",
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	63 sizeof(PyTracebackObject),
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	64 0,
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	65 (destructor)tb_dealloc, /tp_dealloc/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	66 0, /tp_print/
42591 9b02128521e2 Get rid of traceback.c:tb_getattr in favor of marking the members as READONLY. Collin Winter <collinw@gmail.com> parents: 42537 diff changeset	67 0, /tp_getattr/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	68 0, /tp_setattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	69 0, /tp_compare/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	70 0, /tp_repr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	71 0, /tp_as_number/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	72 0, /tp_as_sequence/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	73 0, /tp_as_mapping/
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	74 0, /* tp_hash */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	75 0, /* tp_call */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	76 0, /* tp_str */
42591 9b02128521e2 Get rid of traceback.c:tb_getattr in favor of marking the members as READONLY. Collin Winter <collinw@gmail.com> parents: 42537 diff changeset	77 PyObject_GenericGetAttr, /* tp_getattro */
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	78 0, /* tp_setattro */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	79 0, /* tp_as_buffer */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	80 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	81 0, /* tp_doc */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	82 (traverseproc)tb_traverse, /* tp_traverse */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	83 (inquiry)tb_clear, /* tp_clear */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	84 0, /* tp_richcompare */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	85 0, /* tp_weaklistoffset */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	86 0, /* tp_iter */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	87 0, /* tp_iternext */
42593 5391b5f8cd7a Bug #1772489: make dir() work on traceback objects again. Collin Winter <collinw@gmail.com> parents: 42591 diff changeset	88 tb_methods, /* tp_methods */
42591 9b02128521e2 Get rid of traceback.c:tb_getattr in favor of marking the members as READONLY. Collin Winter <collinw@gmail.com> parents: 42537 diff changeset	89 tb_memberlist, /* tp_members */
42537 74a3c6826683 Remove support for __members__ and __methods__. There still might be Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	90 0, /* tp_getset */
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	91 0, /* tp_base */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	92 0, /* tp_dict */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	93 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	94
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	95 static PyTracebackObject *
49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	96 newtracebackobject(PyTracebackObject next, PyFrameObject frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	97 {
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	98 PyTracebackObject *tb;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	99 if ((next != NULL && !PyTraceBack_Check(next)) \|\|
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	100 frame == NULL \|\| !PyFrame_Check(frame)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	101 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	102 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	103 }
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	104 tb = PyObject_GC_New(PyTracebackObject, &PyTraceBack_Type);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	105 if (tb != NULL) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	106 Py_XINCREF(next);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	107 tb->tb_next = next;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	108 Py_XINCREF(frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	109 tb->tb_frame = frame;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	110 tb->tb_lasti = frame->f_lasti;
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	111 tb->tb_lineno = PyCode_Addr2Line(frame->f_code,
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	112 frame->f_lasti);
22650 2288c724fe2b Call PyObject_GC_UnTrack before putting an object on the list of trash. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21077 diff changeset	113 PyObject_GC_Track(tb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	114 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	115 return tb;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	116 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	117
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	118 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	119 PyTraceBack_Here(PyFrameObject *frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	120 {
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	121 PyThreadState *tstate = PyThreadState_GET();
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	122 PyTracebackObject oldtb = (PyTracebackObject ) tstate->curexc_traceback;
49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	123 PyTracebackObject *tb = newtracebackobject(oldtb, frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	124 if (tb == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	125 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	126 tstate->curexc_traceback = (PyObject *)tb;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	127 Py_XDECREF(oldtb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	128 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	129 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	130
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	131 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	132 Py_DisplaySourceLine(PyObject f, const char filename, int lineno)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	133 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	134 int err = 0;
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	135 FILE *xfp = NULL;
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	136 char linebuf[2000];
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	137 int i;
44742 14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44157 diff changeset	138 char namebuf[MAXPATHLEN+1];
14d4104976fc Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44157 diff changeset	139
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	140 if (filename == NULL)
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	141 return -1;
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	142 /* This is needed by Emacs' compile command */
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	143 #define FMT " File \"%.500s\", line %d, in %.500s\n"
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	144 xfp = fopen(filename, "r" PY_STDIOTEXTMODE);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	145 if (xfp == NULL) {
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	146 /* Search tail of filename in sys.path before giving up */
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	147 PyObject *path;
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	148 const char *tail = strrchr(filename, SEP);
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	149 if (tail == NULL)
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	150 tail = filename;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	151 else
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	152 tail++;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	153 path = PySys_GetObject("path");
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	154 if (path != NULL && PyList_Check(path)) {
36521 30aef3ce2b26 Use Py_ssize_t to count the Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	155 Py_ssize_t _npath = PyList_Size(path);
30aef3ce2b26 Use Py_ssize_t to count the Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	156 int npath = Py_SAFE_DOWNCAST(_npath, Py_ssize_t, int);
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	157 size_t taillen = strlen(tail);
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	158 for (i = 0; i < npath; i++) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	159 PyObject *v = PyList_GetItem(path, i);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	160 if (v == NULL) {
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	161 PyErr_Clear();
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	162 break;
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	163 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	164 if (PyBytes_Check(v)) {
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	165 size_t len;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	166 len = PyBytes_GET_SIZE(v);
1909 0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	167 if (len + 1 + taillen >= MAXPATHLEN)
0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	168 continue; /* Too long */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46664 diff changeset	169 strcpy(namebuf, PyBytes_AsString(v));
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	170 if (strlen(namebuf) != len)
1909 0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	171 continue; /* v contains '\0' */
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	172 if (len > 0 && namebuf[len-1] != SEP)
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	173 namebuf[len++] = SEP;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	174 strcpy(namebuf+len, tail);
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	175 xfp = fopen(namebuf, "r" PY_STDIOTEXTMODE);
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	176 if (xfp != NULL) {
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	177 filename = namebuf;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	178 break;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	179 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	180 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	181 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	182 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	183 }
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	184
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	185 if (xfp == NULL)
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	186 return err;
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	187 if (err != 0) {
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	188 fclose(xfp);
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	189 return err;
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	190 }
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	191
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	192 for (i = 0; i < lineno; i++) {
11294 d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	193 char* pLastChar = &linebuf[sizeof(linebuf)-2];
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	194 do {
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	195 *pLastChar = '\0';
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	196 if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, xfp, NULL) == NULL)
11294 d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	197 break;
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	198 /* fgets read something; if it didn't get as
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	199 far as pLastChar, it must have found a newline
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	200 or hit the end of the file; if pLastChar is \n,
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	201 it obviously found a newline; else we haven't
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	202 yet seen a newline, so must continue */
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	203 } while (pLastChar != '\0' && pLastChar != '\n');
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	204 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	205 if (i == lineno) {
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	206 char *p = linebuf;
2811 07fc4fefb683 ignore control-l (parallelling change to tokenizer.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	207 while (p == ' ' \|\| p == '\t' \|\| *p == '\014')
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	208 p++;
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	209 err = PyFile_WriteString(p, f);
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	210 if (err == 0 && strchr(p, '\n') == NULL)
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	211 err = PyFile_WriteString("\n", f);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	212 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	213 fclose(xfp);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	214 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	215 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	216
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	217 static int
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 tb_displayline(PyObject f, const char filename, int lineno, const char *name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	219 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	220 int err = 0;
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	221 char linebuf[2000];
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	222
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	223 if (filename == NULL \|\| name == NULL)
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	224 return -1;
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	225 /* This is needed by Emacs' compile command */
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	226 #define FMT " File \"%.500s\", line %d, in %.500s\n"
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	227 PyOS_snprintf(linebuf, sizeof(linebuf), FMT, filename, lineno, name);
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	228 err = PyFile_WriteString(linebuf, f);
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	229 if (err != 0)
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	230 return err;
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	231 return Py_DisplaySourceLine(f, filename, lineno);
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	232 }
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	233
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	234 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	235 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	236 {
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	237 int err = 0;
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	238 long depth = 0;
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	239 PyTracebackObject *tb1 = tb;
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	240 while (tb1 != NULL) {
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	241 depth++;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	242 tb1 = tb1->tb_next;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	243 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	244 while (tb != NULL && err == 0) {
5046 658815230546 Get the line number from PyCode_Addr2Line instead of believing Guido van Rossum <guido@python.org> parents: 4503 diff changeset	245 if (depth <= limit) {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	246 err = tb_displayline(f,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 42593 diff changeset	247 PyUnicode_AsString(
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	248 tb->tb_frame->f_code->co_filename),
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	249 tb->tb_lineno,
43569 19319e70fc3e Patch #1272, by Christian Heimes and Alexandre Vassalotti. Guido van Rossum <guido@python.org> parents: 42593 diff changeset	250 PyUnicode_AsString(tb->tb_frame->f_code->co_name));
5046 658815230546 Get the line number from PyCode_Addr2Line instead of believing Guido van Rossum <guido@python.org> parents: 4503 diff changeset	251 }
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	252 depth--;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	253 tb = tb->tb_next;
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	254 if (err == 0)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	255 err = PyErr_CheckSignals();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	256 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	257 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	258 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	259
44157 565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	260 #define PyTraceBack_LIMIT 1000
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	261
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	262 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	263 PyTraceBack_Print(PyObject v, PyObject f)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	264 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	265 int err;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	266 PyObject *limitv;
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	267 long limit = PyTraceBack_LIMIT;
44157 565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	268
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	269 if (v == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	270 return 0;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	271 if (!PyTraceBack_Check(v)) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	272 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	273 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	274 }
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	275 limitv = PySys_GetObject("tracebacklimit");
44157 565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	276 if (limitv) {
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	277 PyObject exc_type, exc_value, *exc_tb;
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	278
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	279 PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43569 diff changeset	280 limit = PyLong_AsLong(limitv);
44157 565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	281 if (limit == -1 && PyErr_Occurred()) {
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	282 if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	283 limit = PyTraceBack_LIMIT;
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	284 }
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	285 else {
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	286 Py_XDECREF(exc_type);
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	287 Py_XDECREF(exc_value);
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	288 Py_XDECREF(exc_tb);
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	289 return 0;
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	290 }
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	291 }
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	292 else if (limit <= 0) {
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	293 limit = PyTraceBack_LIMIT;
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	294 }
565012d1123d Removed another occurrence of PyInt_ExactCheck() Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	295 PyErr_Restore(exc_type, exc_value, exc_tb);
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	296 }
12137 5b5581af951c Change traceback error message to "most recent call last" from Guido van Rossum <guido@python.org> parents: 11999 diff changeset	297 err = PyFile_WriteString("Traceback (most recent call last):\n", f);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	298 if (!err)
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	299 err = tb_printinternal((PyTracebackObject *)v, f, limit);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	300 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	301 }

Mercurial > cpython-lru_cache-weakref

annotate Python/traceback.c @ 47559:2925b568aacc