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

annotate Python/traceback.c @ 58707:76cf60e2d005 legacy-trunk

normalize exceptions passed to the __exit__ method #7853 In Python 2.x, exceptions in finally blocks are not normalized. Since with statements are implemented using finally blocks, ceval.c had to be tweaked to distinguish between with finally blocks and normal ones. A test for the finalization of generators containing with statements was also added.

author	Benjamin Peterson <benjamin@python.org>
date	Fri, 05 Feb 2010 02:12:14 +0000
parents	8f6cf39c96dd
children	8e3b5fbc1e41

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
52221 fb80b281e05a Merged revisions 70463 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47933 diff changeset	14 static PyMemberDef tb_memberlist[] = {
55901 8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	15 {"tb_next", T_OBJECT, OFF(tb_next), READONLY},
8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	16 {"tb_frame", T_OBJECT, OFF(tb_frame), READONLY},
52221 fb80b281e05a Merged revisions 70463 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47933 diff changeset	17 {"tb_lasti", T_INT, OFF(tb_lasti), READONLY},
fb80b281e05a Merged revisions 70463 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47933 diff changeset	18 {"tb_lineno", T_INT, OFF(tb_lineno), READONLY},
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	19 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	20 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	21
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	22 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	23 tb_dealloc(PyTracebackObject *tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	24 {
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	25 PyObject_GC_UnTrack(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	26 Py_TRASHCAN_SAFE_BEGIN(tb)
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	27 Py_XDECREF(tb->tb_next);
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	28 Py_XDECREF(tb->tb_frame);
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	29 PyObject_GC_Del(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	30 Py_TRASHCAN_SAFE_END(tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	31 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	32
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	33 static int
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	34 tb_traverse(PyTracebackObject tb, visitproc visit, void arg)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	35 {
37756 7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	36 Py_VISIT(tb->tb_next);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	37 Py_VISIT(tb->tb_frame);
7b2e436a4a21 Use Py_VISIT in all tp_traverse methods, instead of traversing manually or Thomas Wouters <thomas@python.org> parents: 37748 diff changeset	38 return 0;
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	39 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	40
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	41 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	42 tb_clear(PyTracebackObject *tb)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	43 {
37748 d1547426ab61 Use Py_CLEAR instead of in-place DECREF/XDECREF or custom macros, for Thomas Wouters <thomas@python.org> parents: 37086 diff changeset	44 Py_CLEAR(tb->tb_next);
d1547426ab61 Use Py_CLEAR instead of in-place DECREF/XDECREF or custom macros, for Thomas Wouters <thomas@python.org> parents: 37086 diff changeset	45 Py_CLEAR(tb->tb_frame);
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	46 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	47
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	48 PyTypeObject PyTraceBack_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 40703 diff changeset	49 PyVarObject_HEAD_INIT(&PyType_Type, 0)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	50 "traceback",
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	51 sizeof(PyTracebackObject),
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	52 0,
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	53 (destructor)tb_dealloc, /tp_dealloc/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	54 0, /tp_print/
52221 fb80b281e05a Merged revisions 70463 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47933 diff changeset	55 0, /tp_getattr/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	56 0, /tp_setattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	57 0, /tp_compare/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	58 0, /tp_repr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	59 0, /tp_as_number/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	60 0, /tp_as_sequence/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	61 0, /tp_as_mapping/
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	62 0, /* tp_hash */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	63 0, /* tp_call */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	64 0, /* tp_str */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	65 0, /* tp_getattro */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	66 0, /* tp_setattro */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	67 0, /* tp_as_buffer */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	68 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	69 0, /* tp_doc */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	70 (traverseproc)tb_traverse, /* tp_traverse */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	71 (inquiry)tb_clear, /* tp_clear */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	72 0, /* tp_richcompare */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	73 0, /* tp_weaklistoffset */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	74 0, /* tp_iter */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	75 0, /* tp_iternext */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	76 0, /* tp_methods */
52221 fb80b281e05a Merged revisions 70463 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47933 diff changeset	77 tb_memberlist, /* tp_members */
55901 8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	78 0, /* tp_getset */
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	79 0, /* tp_base */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	80 0, /* tp_dict */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	81 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	82
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	83 static PyTracebackObject *
49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	84 newtracebackobject(PyTracebackObject next, PyFrameObject frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	85 {
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	86 PyTracebackObject *tb;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	87 if ((next != NULL && !PyTraceBack_Check(next)) \|\|
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	88 frame == NULL \|\| !PyFrame_Check(frame)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	89 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	90 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	91 }
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	92 tb = PyObject_GC_New(PyTracebackObject, &PyTraceBack_Type);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	93 if (tb != NULL) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	94 Py_XINCREF(next);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	95 tb->tb_next = next;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	96 Py_XINCREF(frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	97 tb->tb_frame = frame;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	98 tb->tb_lasti = frame->f_lasti;
53931 9ef683d41c9b Issue 5954, PyFrame_GetLineNumber: Jeffrey Yasskin <jyasskin@gmail.com> parents: 52221 diff changeset	99 tb->tb_lineno = PyFrame_GetLineNumber(frame);
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	100 PyObject_GC_Track(tb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	101 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	102 return tb;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	103 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	104
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	105 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	106 PyTraceBack_Here(PyFrameObject *frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	107 {
40703 df294bc5ce6e Make PyTraceBack_Here use the current thread, not the Martin v. Löwis <martin@v.loewis.de> parents: 37756 diff changeset	108 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	109 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	110 PyTracebackObject *tb = newtracebackobject(oldtb, frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	111 if (tb == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	112 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	113 tstate->curexc_traceback = (PyObject *)tb;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	114 Py_XDECREF(oldtb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	115 return 0;
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
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	118 int
47933 4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	119 _Py_DisplaySourceLine(PyObject f, const char filename, int lineno, int indent)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	120 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	121 int err = 0;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	122 FILE *xfp = NULL;
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	123 char linebuf[2000];
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	124 int i;
44739 a3bf0e24b91e Coverity issue CID #169 Christian Heimes <christian@cheimes.de> parents: 42333 diff changeset	125 char namebuf[MAXPATHLEN+1];
a3bf0e24b91e Coverity issue CID #169 Christian Heimes <christian@cheimes.de> parents: 42333 diff changeset	126
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	127 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	128 return -1;
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	129 /* 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	130 #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	131 xfp = fopen(filename, "r" PY_STDIOTEXTMODE);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	132 if (xfp == NULL) {
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	133 /* Search tail of filename in sys.path before giving up */
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	134 PyObject *path;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	135 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	136 if (tail == NULL)
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	137 tail = filename;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	138 else
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	139 tail++;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	140 path = PySys_GetObject("path");
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	141 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	142 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	143 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	144 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	145 for (i = 0; i < npath; i++) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	146 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	147 if (v == NULL) {
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	148 PyErr_Clear();
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	149 break;
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	150 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	151 if (PyString_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	152 size_t len;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	153 len = PyString_GET_SIZE(v);
1909 0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	154 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	155 continue; /* Too long */
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	156 strcpy(namebuf, PyString_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	157 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	158 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	159 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	160 namebuf[len++] = SEP;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	161 strcpy(namebuf+len, tail);
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	162 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	163 if (xfp != NULL) {
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	164 filename = namebuf;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	165 break;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	166 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	167 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	168 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	169 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	170 }
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	171
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	172 if (xfp == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	173 return err;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	174 if (err != 0) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	175 fclose(xfp);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	176 return err;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	177 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	178
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	179 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	180 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	181 do {
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	182 *pLastChar = '\0';
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	183 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	184 break;
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	185 /* 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	186 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	187 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	188 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	189 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	190 } while (pLastChar != '\0' && pLastChar != '\n');
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	191 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	192 if (i == lineno) {
47933 4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	193 char buf[11];
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	194 char *p = linebuf;
2811 07fc4fefb683 ignore control-l (parallelling change to tokenizer.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	195 while (p == ' ' \|\| p == '\t' \|\| *p == '\014')
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	196 p++;
47933 4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	197
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	198 /* Write some spaces before the line */
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	199 strcpy(buf, " ");
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	200 assert (strlen(buf) == 10);
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	201 while (indent > 0) {
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	202 if(indent < 10)
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	203 buf[indent] = '\0';
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	204 err = PyFile_WriteString(buf, f);
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	205 if (err != 0)
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	206 break;
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	207 indent -= 10;
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	208 }
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	209
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	210 if (err == 0)
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	211 err = PyFile_WriteString(p, f);
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	212 if (err == 0 && strchr(p, '\n') == NULL)
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	213 err = PyFile_WriteString("\n", f);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	214 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	215 fclose(xfp);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	216 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	217 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	218
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	219 static int
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	220 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	221 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	222 int err = 0;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	223 char linebuf[2000];
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	224
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	225 if (filename == NULL \|\| name == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	226 return -1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	227 /* This is needed by Emacs' compile command */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	228 #define FMT " File \"%.500s\", line %d, in %.500s\n"
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	229 PyOS_snprintf(linebuf, sizeof(linebuf), FMT, filename, lineno, name);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	230 err = PyFile_WriteString(linebuf, f);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	231 if (err != 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	232 return err;
47933 4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	233 return _Py_DisplaySourceLine(f, filename, lineno, 4);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	234 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	235
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	236 static int
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	237 tb_printinternal(PyTracebackObject tb, PyObject f, long limit)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	238 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	239 int err = 0;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	240 long depth = 0;
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	241 PyTracebackObject *tb1 = tb;
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	242 while (tb1 != NULL) {
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	243 depth++;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	244 tb1 = tb1->tb_next;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	245 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	246 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	247 if (depth <= limit) {
55901 8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	248 err = tb_displayline(f,
8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	249 PyString_AsString(
8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	250 tb->tb_frame->f_code->co_filename),
8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	251 tb->tb_lineno,
8f6cf39c96dd revert unintended changes Benjamin Peterson <benjamin@python.org> parents: 55900 diff changeset	252 PyString_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	253 }
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	254 depth--;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	255 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	256 if (err == 0)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	257 err = PyErr_CheckSignals();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	258 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	259 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	260 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	261
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;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: 44739 diff changeset	267 long limit = 1000;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	268 if (v == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	269 return 0;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	270 if (!PyTraceBack_Check(v)) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	271 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	272 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	273 }
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	274 limitv = PySys_GetObject("tracebacklimit");
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	275 if (limitv && PyInt_Check(limitv)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	276 limit = PyInt_AsLong(limitv);
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	277 if (limit <= 0)
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	278 return 0;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	279 }
12137 5b5581af951c Change traceback error message to "most recent call last" from Guido van Rossum <guido@python.org> parents: 11999 diff changeset	280 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	281 if (!err)
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	282 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	283 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	284 }

Mercurial > cpython-lru_cache-weakref

annotate Python/traceback.c @ 58707:76cf60e2d005 legacy-trunk