1991-02-19 08:39:46 -04:00
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
/* Traceback implementation */
|
|
|
|
|
1997-04-29 15:33:38 -03:00
|
|
|
#include "Python.h"
|
1990-12-20 11:06:42 -04:00
|
|
|
|
2005-10-20 16:59:25 -03:00
|
|
|
#include "code.h"
|
1990-12-20 11:06:42 -04:00
|
|
|
#include "frameobject.h"
|
|
|
|
#include "structmember.h"
|
1992-02-26 11:17:59 -04:00
|
|
|
#include "osdefs.h"
|
2004-03-21 14:37:23 -04:00
|
|
|
#include "traceback.h"
|
1990-12-20 11:06:42 -04:00
|
|
|
|
2004-03-21 14:37:23 -04:00
|
|
|
#define OFF(x) offsetof(PyTracebackObject, x)
|
1990-12-20 11:06:42 -04:00
|
|
|
|
2007-08-14 14:53:54 -03:00
|
|
|
static PyObject *
|
|
|
|
tb_dir(PyTracebackObject *self)
|
|
|
|
{
|
|
|
|
return Py_BuildValue("[ssss]", "tb_frame", "tb_next",
|
|
|
|
"tb_lasti", "tb_lineno");
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef tb_methods[] = {
|
|
|
|
{"__dir__", (PyCFunction)tb_dir, METH_NOARGS},
|
|
|
|
{NULL, NULL, 0, NULL},
|
|
|
|
};
|
|
|
|
|
2007-08-11 03:39:53 -03:00
|
|
|
static PyMemberDef tb_memberlist[] = {
|
|
|
|
{"tb_next", T_OBJECT, OFF(tb_next), READONLY},
|
|
|
|
{"tb_frame", T_OBJECT, OFF(tb_frame), READONLY},
|
|
|
|
{"tb_lasti", T_INT, OFF(tb_lasti), READONLY},
|
|
|
|
{"tb_lineno", T_INT, OFF(tb_lineno), READONLY},
|
1990-12-20 11:06:42 -04:00
|
|
|
{NULL} /* Sentinel */
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
2004-03-21 14:37:23 -04:00
|
|
|
tb_dealloc(PyTracebackObject *tb)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
2002-03-28 23:07:29 -04:00
|
|
|
PyObject_GC_UnTrack(tb);
|
2000-03-13 12:01:29 -04:00
|
|
|
Py_TRASHCAN_SAFE_BEGIN(tb)
|
1997-04-29 15:33:38 -03:00
|
|
|
Py_XDECREF(tb->tb_next);
|
|
|
|
Py_XDECREF(tb->tb_frame);
|
2001-10-22 19:17:41 -03:00
|
|
|
PyObject_GC_Del(tb);
|
2000-03-13 12:01:29 -04:00
|
|
|
Py_TRASHCAN_SAFE_END(tb)
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
2001-10-22 19:17:41 -03:00
|
|
|
static int
|
2004-03-21 14:37:23 -04:00
|
|
|
tb_traverse(PyTracebackObject *tb, visitproc visit, void *arg)
|
2001-10-22 19:17:41 -03:00
|
|
|
{
|
2006-04-21 07:40:58 -03:00
|
|
|
Py_VISIT(tb->tb_next);
|
|
|
|
Py_VISIT(tb->tb_frame);
|
|
|
|
return 0;
|
2001-10-22 19:17:41 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2004-03-21 14:37:23 -04:00
|
|
|
tb_clear(PyTracebackObject *tb)
|
2001-10-22 19:17:41 -03:00
|
|
|
{
|
2006-04-21 07:40:58 -03:00
|
|
|
Py_CLEAR(tb->tb_next);
|
|
|
|
Py_CLEAR(tb->tb_frame);
|
2001-10-22 19:17:41 -03:00
|
|
|
}
|
|
|
|
|
2001-10-22 16:34:09 -03:00
|
|
|
PyTypeObject PyTraceBack_Type = {
|
Merged revisions 56467-56482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56477 | martin.v.loewis | 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) | 11 lines
Merged revisions 56466-56476 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56476 | martin.v.loewis | 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) | 4 lines
PEP 3123: Provide forward compatibility with Python 3.0, while keeping
backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
PyVarObject_HEAD_INIT.
........
................
r56478 | martin.v.loewis | 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) | 2 lines
PEP 3123: Use proper C inheritance for PyObject.
................
r56479 | martin.v.loewis | 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) | 3 lines
Add longintrepr.h to Python.h, so that the compiler can
see that PyFalse is really some kind of PyObject*.
................
r56480 | martin.v.loewis | 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) | 2 lines
Qualify SHIFT, MASK, BASE.
................
r56482 | martin.v.loewis | 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) | 2 lines
Correctly refer to _ob_next.
................
2007-07-21 14:22:18 -03:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
1990-12-20 11:06:42 -04:00
|
|
|
"traceback",
|
2004-03-21 14:37:23 -04:00
|
|
|
sizeof(PyTracebackObject),
|
1990-12-20 11:06:42 -04:00
|
|
|
0,
|
1994-08-29 09:09:58 -03:00
|
|
|
(destructor)tb_dealloc, /*tp_dealloc*/
|
1990-12-20 11:06:42 -04:00
|
|
|
0, /*tp_print*/
|
2007-08-14 14:47:27 -03:00
|
|
|
0, /*tp_getattr*/
|
1990-12-20 11:06:42 -04:00
|
|
|
0, /*tp_setattr*/
|
|
|
|
0, /*tp_compare*/
|
|
|
|
0, /*tp_repr*/
|
|
|
|
0, /*tp_as_number*/
|
|
|
|
0, /*tp_as_sequence*/
|
|
|
|
0, /*tp_as_mapping*/
|
2001-10-22 19:17:41 -03:00
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
2007-08-14 14:47:27 -03:00
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
2001-10-22 19:17:41 -03:00
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
|
|
|
(traverseproc)tb_traverse, /* tp_traverse */
|
|
|
|
(inquiry)tb_clear, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
2007-08-14 14:53:54 -03:00
|
|
|
tb_methods, /* tp_methods */
|
2007-08-14 14:47:27 -03:00
|
|
|
tb_memberlist, /* tp_members */
|
2007-08-11 03:39:53 -03:00
|
|
|
0, /* tp_getset */
|
2001-10-22 19:17:41 -03:00
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
1990-12-20 11:06:42 -04:00
|
|
|
};
|
|
|
|
|
2004-03-21 14:37:23 -04:00
|
|
|
static PyTracebackObject *
|
|
|
|
newtracebackobject(PyTracebackObject *next, PyFrameObject *frame)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
2004-03-21 14:37:23 -04:00
|
|
|
PyTracebackObject *tb;
|
2001-10-22 16:34:09 -03:00
|
|
|
if ((next != NULL && !PyTraceBack_Check(next)) ||
|
1997-04-29 15:33:38 -03:00
|
|
|
frame == NULL || !PyFrame_Check(frame)) {
|
|
|
|
PyErr_BadInternalCall();
|
1990-12-20 11:06:42 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
2004-03-21 14:37:23 -04:00
|
|
|
tb = PyObject_GC_New(PyTracebackObject, &PyTraceBack_Type);
|
1990-12-20 11:06:42 -04:00
|
|
|
if (tb != NULL) {
|
1997-04-29 15:33:38 -03:00
|
|
|
Py_XINCREF(next);
|
1990-12-20 11:06:42 -04:00
|
|
|
tb->tb_next = next;
|
1997-04-29 15:33:38 -03:00
|
|
|
Py_XINCREF(frame);
|
1990-12-20 11:06:42 -04:00
|
|
|
tb->tb_frame = frame;
|
2002-08-15 11:59:02 -03:00
|
|
|
tb->tb_lasti = frame->f_lasti;
|
|
|
|
tb->tb_lineno = PyCode_Addr2Line(frame->f_code,
|
|
|
|
frame->f_lasti);
|
2002-03-28 23:07:29 -04:00
|
|
|
PyObject_GC_Track(tb);
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
return tb;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
PyTraceBack_Here(PyFrameObject *frame)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
Merged revisions 53451-53537 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53454 | brett.cannon | 2007-01-15 20:12:08 +0100 (Mon, 15 Jan 2007) | 3 lines
Add a note for strptime that just because strftime supports some extra
directive that is not documented that strptime will as well.
........
r53458 | vinay.sajip | 2007-01-16 10:50:07 +0100 (Tue, 16 Jan 2007) | 1 line
Updated rotating file handlers to use _open().
........
r53459 | marc-andre.lemburg | 2007-01-16 14:03:06 +0100 (Tue, 16 Jan 2007) | 2 lines
Add news items for the recent pybench and platform changes.
........
r53460 | sjoerd.mullender | 2007-01-16 17:42:38 +0100 (Tue, 16 Jan 2007) | 4 lines
Fixed ntpath.expandvars to not replace references to non-existing
variables with nothing. Also added tests.
This fixes bug #494589.
........
r53464 | neal.norwitz | 2007-01-17 07:23:51 +0100 (Wed, 17 Jan 2007) | 1 line
Give Calvin Spealman access for python-dev summaries.
........
r53465 | neal.norwitz | 2007-01-17 09:37:26 +0100 (Wed, 17 Jan 2007) | 1 line
Remove Calvin since he only has access to the website currently.
........
r53466 | thomas.heller | 2007-01-17 10:40:34 +0100 (Wed, 17 Jan 2007) | 2 lines
Replace C++ comments with C comments.
........
r53472 | andrew.kuchling | 2007-01-17 20:55:06 +0100 (Wed, 17 Jan 2007) | 1 line
[Part of bug #1599254] Add suggestion to Mailbox docs to use Maildir, and warn user to lock/unlock mailboxes when modifying them
........
r53475 | georg.brandl | 2007-01-17 22:09:04 +0100 (Wed, 17 Jan 2007) | 2 lines
Bug #1637967: missing //= operator in list.
........
r53477 | georg.brandl | 2007-01-17 22:19:58 +0100 (Wed, 17 Jan 2007) | 2 lines
Bug #1629125: fix wrong data type (int -> Py_ssize_t) in PyDict_Next docs.
........
r53481 | neal.norwitz | 2007-01-18 06:40:58 +0100 (Thu, 18 Jan 2007) | 1 line
Try reverting part of r53145 that seems to cause the Windows buildbots to fail in test_uu.UUFileTest.test_encode
........
r53482 | fred.drake | 2007-01-18 06:42:30 +0100 (Thu, 18 Jan 2007) | 1 line
add missing version entry
........
r53483 | neal.norwitz | 2007-01-18 07:20:55 +0100 (Thu, 18 Jan 2007) | 7 lines
This test doesn't pass on Windows. The cause seems to be that chmod
doesn't support the same funcationality as on Unix. I'm not sure if
this fix is the best (or if it will even work)--it's a test to see
if the buildbots start passing again.
It might be better to not even run this test if it's windows (or non-posix).
........
r53488 | neal.norwitz | 2007-01-19 06:53:33 +0100 (Fri, 19 Jan 2007) | 1 line
SF #1635217, Fix unbalanced paren
........
r53489 | martin.v.loewis | 2007-01-19 07:42:22 +0100 (Fri, 19 Jan 2007) | 3 lines
Prefix AST symbols with _Py_. Fixes #1637022.
Will backport.
........
r53497 | martin.v.loewis | 2007-01-19 19:01:38 +0100 (Fri, 19 Jan 2007) | 2 lines
Add UUIDs for 2.5.1 and 2.5.2
........
r53499 | raymond.hettinger | 2007-01-19 19:07:18 +0100 (Fri, 19 Jan 2007) | 1 line
SF# 1635892: Fix docs for betavariate's input parameters .
........
r53503 | martin.v.loewis | 2007-01-20 15:05:39 +0100 (Sat, 20 Jan 2007) | 2 lines
Merge 53501 and 53502 from 25 branch:
Add /GS- for AMD64 and Itanium builds where missing.
........
r53504 | walter.doerwald | 2007-01-20 18:28:31 +0100 (Sat, 20 Jan 2007) | 2 lines
Port test_resource.py to unittest.
........
r53505 | walter.doerwald | 2007-01-20 19:19:33 +0100 (Sat, 20 Jan 2007) | 2 lines
Add argument tests an calls of resource.getrusage().
........
r53506 | walter.doerwald | 2007-01-20 20:03:17 +0100 (Sat, 20 Jan 2007) | 2 lines
resource.RUSAGE_BOTH might not exist.
........
r53507 | walter.doerwald | 2007-01-21 00:07:28 +0100 (Sun, 21 Jan 2007) | 2 lines
Port test_new.py to unittest.
........
r53508 | martin.v.loewis | 2007-01-21 10:33:07 +0100 (Sun, 21 Jan 2007) | 2 lines
Patch #1610575: Add support for _Bool to struct.
........
r53509 | georg.brandl | 2007-01-21 11:28:43 +0100 (Sun, 21 Jan 2007) | 3 lines
Bug #1486663: don't reject keyword arguments for subclasses of builtin
types.
........
r53511 | georg.brandl | 2007-01-21 11:35:10 +0100 (Sun, 21 Jan 2007) | 2 lines
Patch #1627441: close sockets properly in urllib2.
........
r53517 | georg.brandl | 2007-01-22 20:40:21 +0100 (Mon, 22 Jan 2007) | 3 lines
Use new email module names (#1637162, #1637159, #1637157).
........
r53518 | andrew.kuchling | 2007-01-22 21:26:40 +0100 (Mon, 22 Jan 2007) | 1 line
Improve pattern used for mbox 'From' lines; add a simple test
........
r53519 | andrew.kuchling | 2007-01-22 21:27:50 +0100 (Mon, 22 Jan 2007) | 1 line
Make comment match the code
........
r53522 | georg.brandl | 2007-01-22 22:10:33 +0100 (Mon, 22 Jan 2007) | 2 lines
Bug #1249573: fix rfc822.parsedate not accepting a certain date format
........
r53524 | georg.brandl | 2007-01-22 22:23:41 +0100 (Mon, 22 Jan 2007) | 2 lines
Bug #1627316: handle error in condition/ignore pdb commands more gracefully.
........
r53526 | lars.gustaebel | 2007-01-23 12:17:33 +0100 (Tue, 23 Jan 2007) | 4 lines
Patch #1507247: tarfile.py: use current umask for intermediate
directories.
........
r53527 | thomas.wouters | 2007-01-23 14:42:00 +0100 (Tue, 23 Jan 2007) | 13 lines
SF patch #1630975: Fix crash when replacing sys.stdout in sitecustomize
When running the interpreter in an environment that would cause it to set
stdout/stderr/stdin's encoding, having a sitecustomize that would replace
them with something other than PyFile objects would crash the interpreter.
Fix it by simply ignoring the encoding-setting for non-files.
This could do with a test, but I can think of no maintainable and portable
way to test this bug, short of adding a sitecustomize.py to the buildsystem
and have it always run with it (hmmm....)
........
r53528 | thomas.wouters | 2007-01-23 14:50:49 +0100 (Tue, 23 Jan 2007) | 4 lines
Add news entry about last checkin (oops.)
........
r53531 | martin.v.loewis | 2007-01-23 22:11:47 +0100 (Tue, 23 Jan 2007) | 4 lines
Make PyTraceBack_Here use the current thread, not the
frame's thread state. Fixes #1579370.
Will backport.
........
r53535 | brett.cannon | 2007-01-24 00:21:22 +0100 (Wed, 24 Jan 2007) | 5 lines
Fix crasher for when an object's __del__ creates a new weakref to itself.
Patch only fixes new-style classes; classic classes still buggy.
Closes bug #1377858. Already backported.
........
r53536 | walter.doerwald | 2007-01-24 01:42:19 +0100 (Wed, 24 Jan 2007) | 2 lines
Port test_popen.py to unittest.
........
2007-02-01 14:02:27 -04:00
|
|
|
PyThreadState *tstate = PyThreadState_GET();
|
2004-03-21 14:37:23 -04:00
|
|
|
PyTracebackObject *oldtb = (PyTracebackObject *) tstate->curexc_traceback;
|
|
|
|
PyTracebackObject *tb = newtracebackobject(oldtb, frame);
|
1990-12-20 11:06:42 -04:00
|
|
|
if (tb == NULL)
|
|
|
|
return -1;
|
1997-05-05 17:56:21 -03:00
|
|
|
tstate->curexc_traceback = (PyObject *)tb;
|
|
|
|
Py_XDECREF(oldtb);
|
1990-12-20 11:06:42 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1997-05-22 19:35:47 -03:00
|
|
|
static int
|
2000-07-22 15:47:25 -03:00
|
|
|
tb_displayline(PyObject *f, char *filename, int lineno, char *name)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-05-22 19:35:47 -03:00
|
|
|
int err = 0;
|
1990-12-20 11:06:42 -04:00
|
|
|
FILE *xfp;
|
2001-11-27 16:30:42 -04:00
|
|
|
char linebuf[2000];
|
1990-12-20 11:06:42 -04:00
|
|
|
int i;
|
Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59987 | raymond.hettinger | 2008-01-15 21:52:42 +0100 (Tue, 15 Jan 2008) | 1 line
Refactor if/elif chain for clarity and speed. Remove dependency on subclasses having to implement _empty and _full.
........
r59988 | raymond.hettinger | 2008-01-15 22:22:47 +0100 (Tue, 15 Jan 2008) | 1 line
Fix-up half-written paragraph in the docs
........
r59989 | amaury.forgeotdarc | 2008-01-15 22:25:11 +0100 (Tue, 15 Jan 2008) | 3 lines
test_doctest fails since r59984.
Not sure if these are the correct values, but save_stdout has to be set before its usage...
........
r59992 | andrew.kuchling | 2008-01-16 01:32:03 +0100 (Wed, 16 Jan 2008) | 1 line
Docstring typos
........
r59993 | andrew.kuchling | 2008-01-16 04:17:25 +0100 (Wed, 16 Jan 2008) | 1 line
Add PEP 3141 section
........
r59998 | andrew.kuchling | 2008-01-16 14:01:51 +0100 (Wed, 16 Jan 2008) | 1 line
Markup fix
........
r59999 | georg.brandl | 2008-01-16 17:56:29 +0100 (Wed, 16 Jan 2008) | 2 lines
Fix MSDN library URL. (#1854)
........
r60006 | georg.brandl | 2008-01-16 21:27:56 +0100 (Wed, 16 Jan 2008) | 3 lines
Add Python-specific content to Doc dir. Update configuration file
to work with the newest Sphinx.
........
r60007 | georg.brandl | 2008-01-16 21:29:00 +0100 (Wed, 16 Jan 2008) | 2 lines
Doc build should work with 2.4 now.
........
r60009 | raymond.hettinger | 2008-01-17 00:38:16 +0100 (Thu, 17 Jan 2008) | 1 line
Minor wordsmithing.
........
r60010 | raymond.hettinger | 2008-01-17 00:40:45 +0100 (Thu, 17 Jan 2008) | 1 line
Add queues will alternative fetch orders (priority based and stack based).
........
r60011 | raymond.hettinger | 2008-01-17 00:49:35 +0100 (Thu, 17 Jan 2008) | 1 line
Add news entry.
........
r60013 | raymond.hettinger | 2008-01-17 04:02:14 +0100 (Thu, 17 Jan 2008) | 1 line
Make starmap() match its pure python definition and accept any itertable input (not just tuples).
........
r60015 | gregory.p.smith | 2008-01-17 08:43:20 +0100 (Thu, 17 Jan 2008) | 3 lines
Comply with RFC 3207.
Fixes issue 829951 - http://bugs.python.org/issue829951
........
r60018 | gregory.p.smith | 2008-01-17 09:03:17 +0100 (Thu, 17 Jan 2008) | 2 lines
entry for r60015
........
r60019 | raymond.hettinger | 2008-01-17 09:07:05 +0100 (Thu, 17 Jan 2008) | 1 line
Note versionadded.
........
r60020 | gregory.p.smith | 2008-01-17 09:35:49 +0100 (Thu, 17 Jan 2008) | 8 lines
Fixes (accepts patch) issue1339 - http://bugs.python.org/issue1339
- Factor out the duplication of EHLO/HELO in login() and sendmail() to
a new function, ehlo_or_helo_if_needed().
- Use ehlo_or_helo_if_needed() in starttls()
- Check for the starttls exception in starttls() in the same way as
login() checks for the auth extension.
Contributed by Bill Fenner.
........
r60021 | andrew.kuchling | 2008-01-17 13:00:15 +0100 (Thu, 17 Jan 2008) | 1 line
Revise 3141 section a bit; add some Windows items
........
r60022 | brett.cannon | 2008-01-17 19:45:10 +0100 (Thu, 17 Jan 2008) | 2 lines
Fix a function pointer declaration to silence the compiler.
........
r60024 | raymond.hettinger | 2008-01-17 20:31:38 +0100 (Thu, 17 Jan 2008) | 1 line
Issue #1861: Add read-only attribute listing upcoming events in the order they will be run.
........
r60025 | andrew.kuchling | 2008-01-17 20:49:24 +0100 (Thu, 17 Jan 2008) | 1 line
Correction from Jordan Lewis: halfdelay() uses tenths of a second, not milliseconds
........
r60026 | raymond.hettinger | 2008-01-17 23:27:49 +0100 (Thu, 17 Jan 2008) | 1 line
Add advice on choosing between scheduler and threading.Timer().
........
r60028 | christian.heimes | 2008-01-18 00:01:44 +0100 (Fri, 18 Jan 2008) | 2 lines
Updated new property syntax. An elaborate example for subclassing and the getter was missing.
Added comment about VS 2008 and PGO builds.
........
r60029 | raymond.hettinger | 2008-01-18 00:32:01 +0100 (Fri, 18 Jan 2008) | 1 line
Fix-up Timer() example.
........
r60030 | raymond.hettinger | 2008-01-18 00:56:56 +0100 (Fri, 18 Jan 2008) | 1 line
Fix markup
........
r60031 | raymond.hettinger | 2008-01-18 01:10:42 +0100 (Fri, 18 Jan 2008) | 1 line
clearcache() needs to remove the dict as well as clear it.
........
r60033 | andrew.kuchling | 2008-01-18 03:26:16 +0100 (Fri, 18 Jan 2008) | 1 line
Bump verson
........
r60034 | andrew.kuchling | 2008-01-18 03:42:52 +0100 (Fri, 18 Jan 2008) | 1 line
Typo fix
........
r60035 | christian.heimes | 2008-01-18 08:30:20 +0100 (Fri, 18 Jan 2008) | 3 lines
Coverity issue CID #197
var_decl: Declared variable "stm" without initializer
ninit_use_in_call: Using uninitialized value "stm" (field "stm".tm_zone uninitialized) in call to function "mktime"
........
r60036 | christian.heimes | 2008-01-18 08:45:30 +0100 (Fri, 18 Jan 2008) | 11 lines
Coverity issue CID #167
Event alloc_fn: Called allocation function "metacompile" [model]
Event var_assign: Assigned variable "gr" to storage returned from "metacompile"
gr = metacompile(n);
Event pass_arg: Variable "gr" not freed or pointed-to in function "maketables" [model]
g = maketables(gr);
translatelabels(g);
addfirstsets(g);
Event leaked_storage: Returned without freeing storage "gr"
return g;
........
r60038 | christian.heimes | 2008-01-18 09:04:57 +0100 (Fri, 18 Jan 2008) | 3 lines
Coverity issue CID #182
size_error: Allocating 1 bytes to pointer "children", which needs at least 4 bytes
........
r60041 | christian.heimes | 2008-01-18 09:47:59 +0100 (Fri, 18 Jan 2008) | 4 lines
Coverity issue CID #169
local_ptr_assign_local: Assigning address of stack variable "namebuf" to pointer "filename"
out_of_scope: Variable "namebuf" goes out of scope
use_invalid: Used "filename" pointing to out-of-scope variable "namebuf"
........
r60042 | christian.heimes | 2008-01-18 09:53:45 +0100 (Fri, 18 Jan 2008) | 2 lines
Coverity CID #168
leaked_storage: Returned without freeing storage "fp"
........
2008-01-18 05:56:22 -04:00
|
|
|
char namebuf[MAXPATHLEN+1];
|
|
|
|
|
1997-05-22 19:35:47 -03:00
|
|
|
if (filename == NULL || name == NULL)
|
|
|
|
return -1;
|
1994-08-29 09:09:58 -03:00
|
|
|
/* This is needed by Emacs' compile command */
|
2001-11-27 16:30:42 -04:00
|
|
|
#define FMT " File \"%.500s\", line %d, in %.500s\n"
|
2002-04-14 17:12:41 -03:00
|
|
|
xfp = fopen(filename, "r" PY_STDIOTEXTMODE);
|
1990-12-20 11:06:42 -04:00
|
|
|
if (xfp == NULL) {
|
1992-02-26 11:17:59 -04:00
|
|
|
/* Search tail of filename in sys.path before giving up */
|
1997-04-29 15:33:38 -03:00
|
|
|
PyObject *path;
|
1992-02-26 11:17:59 -04:00
|
|
|
char *tail = strrchr(filename, SEP);
|
|
|
|
if (tail == NULL)
|
|
|
|
tail = filename;
|
|
|
|
else
|
|
|
|
tail++;
|
1997-04-29 15:33:38 -03:00
|
|
|
path = PySys_GetObject("path");
|
|
|
|
if (path != NULL && PyList_Check(path)) {
|
2006-02-16 10:37:16 -04:00
|
|
|
Py_ssize_t _npath = PyList_Size(path);
|
|
|
|
int npath = Py_SAFE_DOWNCAST(_npath, Py_ssize_t, int);
|
2000-06-28 19:07:35 -03:00
|
|
|
size_t taillen = strlen(tail);
|
1992-02-26 11:17:59 -04:00
|
|
|
for (i = 0; i < npath; i++) {
|
1997-04-29 15:33:38 -03:00
|
|
|
PyObject *v = PyList_GetItem(path, i);
|
1997-05-22 19:35:47 -03:00
|
|
|
if (v == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
break;
|
|
|
|
}
|
1997-04-29 15:33:38 -03:00
|
|
|
if (PyString_Check(v)) {
|
2000-06-28 19:07:35 -03:00
|
|
|
size_t len;
|
2006-04-21 07:40:58 -03:00
|
|
|
len = PyString_GET_SIZE(v);
|
1994-09-29 06:38:04 -03:00
|
|
|
if (len + 1 + taillen >= MAXPATHLEN)
|
|
|
|
continue; /* Too long */
|
1997-04-29 15:33:38 -03:00
|
|
|
strcpy(namebuf, PyString_AsString(v));
|
2000-06-28 19:07:35 -03:00
|
|
|
if (strlen(namebuf) != len)
|
1994-09-29 06:38:04 -03:00
|
|
|
continue; /* v contains '\0' */
|
1992-02-26 11:17:59 -04:00
|
|
|
if (len > 0 && namebuf[len-1] != SEP)
|
|
|
|
namebuf[len++] = SEP;
|
|
|
|
strcpy(namebuf+len, tail);
|
2002-04-14 17:12:41 -03:00
|
|
|
xfp = fopen(namebuf, "r" PY_STDIOTEXTMODE);
|
1992-02-26 11:17:59 -04:00
|
|
|
if (xfp != NULL) {
|
|
|
|
filename = namebuf;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
2001-11-28 16:42:20 -04:00
|
|
|
PyOS_snprintf(linebuf, sizeof(linebuf), FMT, filename, lineno, name);
|
1997-05-22 19:35:47 -03:00
|
|
|
err = PyFile_WriteString(linebuf, f);
|
2006-03-07 11:39:21 -04:00
|
|
|
if (xfp == NULL)
|
1997-05-22 19:35:47 -03:00
|
|
|
return err;
|
2006-03-07 11:39:21 -04:00
|
|
|
else if (err != 0) {
|
|
|
|
fclose(xfp);
|
|
|
|
return err;
|
|
|
|
}
|
1990-12-20 11:06:42 -04:00
|
|
|
for (i = 0; i < lineno; i++) {
|
1999-09-18 17:49:39 -03:00
|
|
|
char* pLastChar = &linebuf[sizeof(linebuf)-2];
|
|
|
|
do {
|
|
|
|
*pLastChar = '\0';
|
2002-04-14 17:12:41 -03:00
|
|
|
if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, xfp, NULL) == NULL)
|
1999-09-18 17:49:39 -03:00
|
|
|
break;
|
|
|
|
/* fgets read *something*; if it didn't get as
|
|
|
|
far as pLastChar, it must have found a newline
|
|
|
|
or hit the end of the file; if pLastChar is \n,
|
|
|
|
it obviously found a newline; else we haven't
|
|
|
|
yet seen a newline, so must continue */
|
|
|
|
} while (*pLastChar != '\0' && *pLastChar != '\n');
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
if (i == lineno) {
|
1992-02-26 11:17:59 -04:00
|
|
|
char *p = linebuf;
|
1995-07-07 19:45:41 -03:00
|
|
|
while (*p == ' ' || *p == '\t' || *p == '\014')
|
1990-12-20 11:06:42 -04:00
|
|
|
p++;
|
1997-05-22 19:35:47 -03:00
|
|
|
err = PyFile_WriteString(" ", f);
|
|
|
|
if (err == 0) {
|
|
|
|
err = PyFile_WriteString(p, f);
|
|
|
|
if (err == 0 && strchr(p, '\n') == NULL)
|
|
|
|
err = PyFile_WriteString("\n", f);
|
|
|
|
}
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
fclose(xfp);
|
1997-05-22 19:35:47 -03:00
|
|
|
return err;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
1997-05-22 19:35:47 -03:00
|
|
|
static int
|
2004-03-21 14:37:23 -04:00
|
|
|
tb_printinternal(PyTracebackObject *tb, PyObject *f, int limit)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-05-22 19:35:47 -03:00
|
|
|
int err = 0;
|
1993-12-17 08:09:14 -04:00
|
|
|
int depth = 0;
|
2004-03-21 14:37:23 -04:00
|
|
|
PyTracebackObject *tb1 = tb;
|
1993-12-17 08:09:14 -04:00
|
|
|
while (tb1 != NULL) {
|
|
|
|
depth++;
|
|
|
|
tb1 = tb1->tb_next;
|
|
|
|
}
|
1997-05-22 19:35:47 -03:00
|
|
|
while (tb != NULL && err == 0) {
|
1997-01-24 00:02:55 -04:00
|
|
|
if (depth <= limit) {
|
1997-05-22 19:35:47 -03:00
|
|
|
err = tb_displayline(f,
|
2007-10-14 23:52:41 -03:00
|
|
|
PyUnicode_AsString(
|
1997-04-29 15:33:38 -03:00
|
|
|
tb->tb_frame->f_code->co_filename),
|
1994-08-29 09:09:58 -03:00
|
|
|
tb->tb_lineno,
|
2007-10-14 23:52:41 -03:00
|
|
|
PyUnicode_AsString(tb->tb_frame->f_code->co_name));
|
1997-01-24 00:02:55 -04:00
|
|
|
}
|
1993-12-17 08:09:14 -04:00
|
|
|
depth--;
|
1990-12-20 11:06:42 -04:00
|
|
|
tb = tb->tb_next;
|
1997-05-22 19:35:47 -03:00
|
|
|
if (err == 0)
|
|
|
|
err = PyErr_CheckSignals();
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
1997-05-22 19:35:47 -03:00
|
|
|
return err;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
2007-12-04 17:55:18 -04:00
|
|
|
#define PyTraceBack_LIMIT 1000
|
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
PyTraceBack_Print(PyObject *v, PyObject *f)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
1997-05-22 19:35:47 -03:00
|
|
|
int err;
|
1997-04-29 15:33:38 -03:00
|
|
|
PyObject *limitv;
|
2007-12-04 17:55:18 -04:00
|
|
|
int limit = PyTraceBack_LIMIT;
|
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
if (v == NULL)
|
|
|
|
return 0;
|
2001-10-22 16:34:09 -03:00
|
|
|
if (!PyTraceBack_Check(v)) {
|
1997-04-29 15:33:38 -03:00
|
|
|
PyErr_BadInternalCall();
|
1990-12-20 11:06:42 -04:00
|
|
|
return -1;
|
|
|
|
}
|
1997-04-29 15:33:38 -03:00
|
|
|
limitv = PySys_GetObject("tracebacklimit");
|
2007-12-04 17:55:18 -04:00
|
|
|
if (limitv) {
|
|
|
|
PyObject *exc_type, *exc_value, *exc_tb;
|
|
|
|
|
|
|
|
PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
|
2007-12-02 10:31:20 -04:00
|
|
|
limit = PyLong_AsLong(limitv);
|
2007-12-04 17:55:18 -04:00
|
|
|
if (limit == -1 && PyErr_Occurred()) {
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
|
|
|
|
limit = PyTraceBack_LIMIT;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_XDECREF(exc_type);
|
|
|
|
Py_XDECREF(exc_value);
|
|
|
|
Py_XDECREF(exc_tb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (limit <= 0) {
|
|
|
|
limit = PyTraceBack_LIMIT;
|
|
|
|
}
|
|
|
|
PyErr_Restore(exc_type, exc_value, exc_tb);
|
1993-12-17 08:09:14 -04:00
|
|
|
}
|
2000-03-30 20:39:23 -04:00
|
|
|
err = PyFile_WriteString("Traceback (most recent call last):\n", f);
|
1997-05-22 19:35:47 -03:00
|
|
|
if (!err)
|
2004-03-21 14:37:23 -04:00
|
|
|
err = tb_printinternal((PyTracebackObject *)v, f, limit);
|
1997-05-22 19:35:47 -03:00
|
|
|
return err;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|