svn+ssh://pythondev@svn.python.org/python/trunk ........ r64722 | georg.brandl | 2008-07-05 12:13:36 +0200 (Sat, 05 Jul 2008) | 4 lines #2663: support an *ignore* argument to shutil.copytree(). Patch by Tarek Ziade. This is a new feature, but Barry authorized adding it in the beta period. ........ r64729 | mark.dickinson | 2008-07-05 13:33:52 +0200 (Sat, 05 Jul 2008) | 5 lines Issue 3188: accept float('infinity') as well as float('inf'). This makes the float constructor behave in the same way as specified by various other language standards, including C99, IEEE 754r, and the IBM Decimal standard. ........ r64753 | gregory.p.smith | 2008-07-06 05:35:58 +0200 (Sun, 06 Jul 2008) | 4 lines - Issue #2862: Make int and float freelist management consistent with other freelists. Changes their CompactFreeList apis into ClearFreeList apis and calls them via gc.collect(). ........ r64845 | raymond.hettinger | 2008-07-10 16:03:19 +0200 (Thu, 10 Jul 2008) | 1 line Issue 3301: Bisect functions behaved badly when lo was negative. ........ r64846 | raymond.hettinger | 2008-07-10 16:34:57 +0200 (Thu, 10 Jul 2008) | 1 line Issue 3285: Fractions from_float() and from_decimal() accept Integral arguments. ........ r64849 | andrew.kuchling | 2008-07-10 16:43:31 +0200 (Thu, 10 Jul 2008) | 1 line Wording changes ........ r64871 | raymond.hettinger | 2008-07-11 14:00:21 +0200 (Fri, 11 Jul 2008) | 1 line Add cautionary note on the use of PySequence_Fast_ITEMS. ........ r64880 | amaury.forgeotdarc | 2008-07-11 23:28:25 +0200 (Fri, 11 Jul 2008) | 5 lines #3317 in zipfile module, restore the previous names of global variables: some applications relied on them. Also remove duplicated lines. ........ r64881 | amaury.forgeotdarc | 2008-07-11 23:45:06 +0200 (Fri, 11 Jul 2008) | 3 lines #3342: In tracebacks, printed source lines were not indented since r62555. #3343: Py_DisplaySourceLine should be a private function. Rename it to _Py_DisplaySourceLine. ........ r64882 | josiah.carlson | 2008-07-12 00:17:14 +0200 (Sat, 12 Jul 2008) | 2 lines Fix for the AttributeError in test_asynchat. ........ r64885 | josiah.carlson | 2008-07-12 01:26:59 +0200 (Sat, 12 Jul 2008) | 2 lines Fixed test for asyncore. ........ r64888 | matthias.klose | 2008-07-12 09:51:48 +0200 (Sat, 12 Jul 2008) | 2 lines - Fix bashisms in Tools/faqwiz/move-faqwiz.sh ........ r64897 | benjamin.peterson | 2008-07-12 22:16:19 +0200 (Sat, 12 Jul 2008) | 1 line fix various doc typos #3320 ........ r64900 | alexandre.vassalotti | 2008-07-13 00:06:53 +0200 (Sun, 13 Jul 2008) | 2 lines Fixed typo. ........ r64901 | benjamin.peterson | 2008-07-13 01:41:19 +0200 (Sun, 13 Jul 2008) | 1 line #1778443 robotparser fixes from Aristotelis Mikropoulos ........ r64915 | nick.coghlan | 2008-07-13 16:52:36 +0200 (Sun, 13 Jul 2008) | 1 line Fix issue 3221 by emitting a RuntimeWarning instead of raising SystemError when the parent module can't be found during an absolute import (likely due to non-PEP 361 aware code which sets a module level __package__ attribute) ........ r64926 | martin.v.loewis | 2008-07-13 22:31:49 +0200 (Sun, 13 Jul 2008) | 2 lines Add turtle into the module index. ........ r64927 | alexandre.vassalotti | 2008-07-13 22:42:44 +0200 (Sun, 13 Jul 2008) | 3 lines Issue #3274: Use a less common identifier for the temporary variable in Py_CLEAR(). ........ r64928 | andrew.kuchling | 2008-07-13 23:43:25 +0200 (Sun, 13 Jul 2008) | 1 line Re-word ........ r64929 | andrew.kuchling | 2008-07-13 23:43:52 +0200 (Sun, 13 Jul 2008) | 1 line Add various items; move ctypes items into a subsection of their own ........ r64938 | andrew.kuchling | 2008-07-14 02:35:32 +0200 (Mon, 14 Jul 2008) | 1 line Typo fixes ........ r64939 | andrew.kuchling | 2008-07-14 02:40:55 +0200 (Mon, 14 Jul 2008) | 1 line Typo fix ........ r64940 | andrew.kuchling | 2008-07-14 03:18:16 +0200 (Mon, 14 Jul 2008) | 1 line Typo fix ........ r64941 | andrew.kuchling | 2008-07-14 03:18:31 +0200 (Mon, 14 Jul 2008) | 1 line Expand the multiprocessing section ........ r64944 | gregory.p.smith | 2008-07-14 08:06:48 +0200 (Mon, 14 Jul 2008) | 7 lines Fix posix.fork1() / os.fork1() to only call PyOS_AfterFork() in the child process rather than both parent and child. Does anyone actually use fork1()? It appears to be a Solaris thing but if Python is built with pthreads on Solaris, fork1() and fork() should be the same. ........ r64961 | jesse.noller | 2008-07-15 15:47:33 +0200 (Tue, 15 Jul 2008) | 1 line multiprocessing/connection.py patch to remove fqdn oddness for issue 3270 ........ r64966 | nick.coghlan | 2008-07-15 17:40:22 +0200 (Tue, 15 Jul 2008) | 1 line Add missing NEWS entry for r64962 ........ r64973 | jesse.noller | 2008-07-15 20:29:18 +0200 (Tue, 15 Jul 2008) | 1 line Revert 3270 patch: self._address is in pretty widespread use, need to revisit ........
315 lines
7.3 KiB
C
315 lines
7.3 KiB
C
|
|
/* Traceback implementation */
|
|
|
|
#include "Python.h"
|
|
|
|
#include "code.h"
|
|
#include "frameobject.h"
|
|
#include "structmember.h"
|
|
#include "osdefs.h"
|
|
#include "traceback.h"
|
|
|
|
#define OFF(x) offsetof(PyTracebackObject, x)
|
|
|
|
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},
|
|
};
|
|
|
|
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},
|
|
{NULL} /* Sentinel */
|
|
};
|
|
|
|
static void
|
|
tb_dealloc(PyTracebackObject *tb)
|
|
{
|
|
PyObject_GC_UnTrack(tb);
|
|
Py_TRASHCAN_SAFE_BEGIN(tb)
|
|
Py_XDECREF(tb->tb_next);
|
|
Py_XDECREF(tb->tb_frame);
|
|
PyObject_GC_Del(tb);
|
|
Py_TRASHCAN_SAFE_END(tb)
|
|
}
|
|
|
|
static int
|
|
tb_traverse(PyTracebackObject *tb, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(tb->tb_next);
|
|
Py_VISIT(tb->tb_frame);
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
tb_clear(PyTracebackObject *tb)
|
|
{
|
|
Py_CLEAR(tb->tb_next);
|
|
Py_CLEAR(tb->tb_frame);
|
|
}
|
|
|
|
PyTypeObject PyTraceBack_Type = {
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
"traceback",
|
|
sizeof(PyTracebackObject),
|
|
0,
|
|
(destructor)tb_dealloc, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
0, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
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 */
|
|
tb_methods, /* tp_methods */
|
|
tb_memberlist, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
};
|
|
|
|
static PyTracebackObject *
|
|
newtracebackobject(PyTracebackObject *next, PyFrameObject *frame)
|
|
{
|
|
PyTracebackObject *tb;
|
|
if ((next != NULL && !PyTraceBack_Check(next)) ||
|
|
frame == NULL || !PyFrame_Check(frame)) {
|
|
PyErr_BadInternalCall();
|
|
return NULL;
|
|
}
|
|
tb = PyObject_GC_New(PyTracebackObject, &PyTraceBack_Type);
|
|
if (tb != NULL) {
|
|
Py_XINCREF(next);
|
|
tb->tb_next = next;
|
|
Py_XINCREF(frame);
|
|
tb->tb_frame = frame;
|
|
tb->tb_lasti = frame->f_lasti;
|
|
tb->tb_lineno = PyCode_Addr2Line(frame->f_code,
|
|
frame->f_lasti);
|
|
PyObject_GC_Track(tb);
|
|
}
|
|
return tb;
|
|
}
|
|
|
|
int
|
|
PyTraceBack_Here(PyFrameObject *frame)
|
|
{
|
|
PyThreadState *tstate = PyThreadState_GET();
|
|
PyTracebackObject *oldtb = (PyTracebackObject *) tstate->curexc_traceback;
|
|
PyTracebackObject *tb = newtracebackobject(oldtb, frame);
|
|
if (tb == NULL)
|
|
return -1;
|
|
tstate->curexc_traceback = (PyObject *)tb;
|
|
Py_XDECREF(oldtb);
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
_Py_DisplaySourceLine(PyObject *f, const char *filename, int lineno, int indent)
|
|
{
|
|
int err = 0;
|
|
FILE *xfp = NULL;
|
|
char linebuf[2000];
|
|
int i;
|
|
char namebuf[MAXPATHLEN+1];
|
|
|
|
if (filename == NULL)
|
|
return -1;
|
|
xfp = fopen(filename, "r" PY_STDIOTEXTMODE);
|
|
if (xfp == NULL) {
|
|
/* Search tail of filename in sys.path before giving up */
|
|
PyObject *path;
|
|
const char *tail = strrchr(filename, SEP);
|
|
if (tail == NULL)
|
|
tail = filename;
|
|
else
|
|
tail++;
|
|
path = PySys_GetObject("path");
|
|
if (path != NULL && PyList_Check(path)) {
|
|
Py_ssize_t _npath = PyList_Size(path);
|
|
int npath = Py_SAFE_DOWNCAST(_npath, Py_ssize_t, int);
|
|
size_t taillen = strlen(tail);
|
|
for (i = 0; i < npath; i++) {
|
|
PyObject *v = PyList_GetItem(path, i);
|
|
if (v == NULL) {
|
|
PyErr_Clear();
|
|
break;
|
|
}
|
|
if (PyBytes_Check(v)) {
|
|
size_t len;
|
|
len = PyBytes_GET_SIZE(v);
|
|
if (len + 1 + taillen >= MAXPATHLEN)
|
|
continue; /* Too long */
|
|
strcpy(namebuf, PyBytes_AsString(v));
|
|
if (strlen(namebuf) != len)
|
|
continue; /* v contains '\0' */
|
|
if (len > 0 && namebuf[len-1] != SEP)
|
|
namebuf[len++] = SEP;
|
|
strcpy(namebuf+len, tail);
|
|
xfp = fopen(namebuf, "r" PY_STDIOTEXTMODE);
|
|
if (xfp != NULL) {
|
|
filename = namebuf;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (xfp == NULL)
|
|
return err;
|
|
if (err != 0) {
|
|
fclose(xfp);
|
|
return err;
|
|
}
|
|
|
|
for (i = 0; i < lineno; i++) {
|
|
char* pLastChar = &linebuf[sizeof(linebuf)-2];
|
|
do {
|
|
*pLastChar = '\0';
|
|
if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, xfp, NULL) == NULL)
|
|
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');
|
|
}
|
|
if (i == lineno) {
|
|
char buf[11];
|
|
char *p = linebuf;
|
|
while (*p == ' ' || *p == '\t' || *p == '\014')
|
|
p++;
|
|
|
|
/* Write some spaces before the line */
|
|
strcpy(buf, " ");
|
|
assert (strlen(buf) == 10);
|
|
while (indent > 0) {
|
|
if(indent < 10)
|
|
buf[indent] = '\0';
|
|
err = PyFile_WriteString(buf, f);
|
|
if (err != 0)
|
|
break;
|
|
indent -= 10;
|
|
}
|
|
|
|
if (err == 0)
|
|
err = PyFile_WriteString(p, f);
|
|
if (err == 0 && strchr(p, '\n') == NULL)
|
|
err = PyFile_WriteString("\n", f);
|
|
}
|
|
fclose(xfp);
|
|
return err;
|
|
}
|
|
|
|
static int
|
|
tb_displayline(PyObject *f, const char *filename, int lineno, const char *name)
|
|
{
|
|
int err = 0;
|
|
char linebuf[2000];
|
|
|
|
if (filename == NULL || name == NULL)
|
|
return -1;
|
|
/* This is needed by Emacs' compile command */
|
|
#define FMT " File \"%.500s\", line %d, in %.500s\n"
|
|
PyOS_snprintf(linebuf, sizeof(linebuf), FMT, filename, lineno, name);
|
|
err = PyFile_WriteString(linebuf, f);
|
|
if (err != 0)
|
|
return err;
|
|
return _Py_DisplaySourceLine(f, filename, lineno, 4);
|
|
}
|
|
|
|
static int
|
|
tb_printinternal(PyTracebackObject *tb, PyObject *f, long limit)
|
|
{
|
|
int err = 0;
|
|
long depth = 0;
|
|
PyTracebackObject *tb1 = tb;
|
|
while (tb1 != NULL) {
|
|
depth++;
|
|
tb1 = tb1->tb_next;
|
|
}
|
|
while (tb != NULL && err == 0) {
|
|
if (depth <= limit) {
|
|
err = tb_displayline(f,
|
|
PyUnicode_AsString(
|
|
tb->tb_frame->f_code->co_filename),
|
|
tb->tb_lineno,
|
|
PyUnicode_AsString(tb->tb_frame->f_code->co_name));
|
|
}
|
|
depth--;
|
|
tb = tb->tb_next;
|
|
if (err == 0)
|
|
err = PyErr_CheckSignals();
|
|
}
|
|
return err;
|
|
}
|
|
|
|
#define PyTraceBack_LIMIT 1000
|
|
|
|
int
|
|
PyTraceBack_Print(PyObject *v, PyObject *f)
|
|
{
|
|
int err;
|
|
PyObject *limitv;
|
|
long limit = PyTraceBack_LIMIT;
|
|
|
|
if (v == NULL)
|
|
return 0;
|
|
if (!PyTraceBack_Check(v)) {
|
|
PyErr_BadInternalCall();
|
|
return -1;
|
|
}
|
|
limitv = PySys_GetObject("tracebacklimit");
|
|
if (limitv) {
|
|
PyObject *exc_type, *exc_value, *exc_tb;
|
|
|
|
PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
|
|
limit = PyLong_AsLong(limitv);
|
|
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);
|
|
}
|
|
err = PyFile_WriteString("Traceback (most recent call last):\n", f);
|
|
if (!err)
|
|
err = tb_printinternal((PyTracebackObject *)v, f, limit);
|
|
return err;
|
|
}
|