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"
|
2008-10-09 20:37:48 -03:00
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
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
|
|
|
|
2008-10-09 20:37:48 -03:00
|
|
|
/* Method from Parser/tokenizer.c */
|
|
|
|
extern char * PyTokenizer_FindEncoding(int);
|
|
|
|
|
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[] = {
|
2010-05-09 13:14:21 -03:00
|
|
|
{"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 */
|
1990-12-20 11:06:42 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
2004-03-21 14:37:23 -04:00
|
|
|
tb_dealloc(PyTracebackObject *tb)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
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)
|
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
|
|
|
{
|
2010-05-09 13:14:21 -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
|
|
|
{
|
2010-05-09 13:14:21 -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 = {
|
2010-05-09 13:14:21 -03:00
|
|
|
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_reserved*/
|
|
|
|
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 */
|
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
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
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;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-22 15:47:25 -03:00
|
|
|
PyTraceBack_Here(PyFrameObject *frame)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
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;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
2010-06-17 20:23:37 -03:00
|
|
|
static PyObject *
|
|
|
|
_Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject *io)
|
2008-10-09 20:37:48 -03:00
|
|
|
{
|
2010-06-17 20:23:37 -03:00
|
|
|
Py_ssize_t i;
|
|
|
|
PyObject *binary;
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject *v;
|
2010-06-17 20:23:37 -03:00
|
|
|
Py_ssize_t npath;
|
2010-05-09 13:14:21 -03:00
|
|
|
size_t taillen;
|
|
|
|
PyObject *syspath;
|
2010-10-18 22:22:07 -03:00
|
|
|
PyObject *path;
|
2010-05-09 13:14:21 -03:00
|
|
|
const char* tail;
|
2010-10-18 22:22:07 -03:00
|
|
|
PyObject *filebytes;
|
2010-06-17 20:23:37 -03:00
|
|
|
const char* filepath;
|
2010-05-09 13:14:21 -03:00
|
|
|
Py_ssize_t len;
|
2010-10-18 22:22:07 -03:00
|
|
|
PyObject* result;
|
2010-05-09 13:14:21 -03:00
|
|
|
|
2010-10-18 22:22:07 -03:00
|
|
|
filebytes = PyUnicode_AsEncodedObject(filename,
|
|
|
|
Py_FileSystemDefaultEncoding, "surrogateescape");
|
|
|
|
if (filebytes == NULL) {
|
2010-06-17 20:23:37 -03:00
|
|
|
PyErr_Clear();
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-10-18 22:22:07 -03:00
|
|
|
filepath = PyBytes_AS_STRING(filebytes);
|
2010-06-17 20:23:37 -03:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
/* Search tail of filename in sys.path before giving up */
|
2010-06-17 20:23:37 -03:00
|
|
|
tail = strrchr(filepath, SEP);
|
2010-05-09 13:14:21 -03:00
|
|
|
if (tail == NULL)
|
2010-06-17 20:23:37 -03:00
|
|
|
tail = filepath;
|
2010-05-09 13:14:21 -03:00
|
|
|
else
|
|
|
|
tail++;
|
|
|
|
taillen = strlen(tail);
|
|
|
|
|
|
|
|
syspath = PySys_GetObject("path");
|
|
|
|
if (syspath == NULL || !PyList_Check(syspath))
|
2010-10-18 22:22:07 -03:00
|
|
|
goto error;
|
2010-06-17 20:23:37 -03:00
|
|
|
npath = PyList_Size(syspath);
|
2010-05-09 13:14:21 -03:00
|
|
|
|
|
|
|
for (i = 0; i < npath; i++) {
|
|
|
|
v = PyList_GetItem(syspath, i);
|
|
|
|
if (v == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!PyUnicode_Check(v))
|
|
|
|
continue;
|
2010-10-18 22:22:07 -03:00
|
|
|
|
|
|
|
path = PyUnicode_AsEncodedObject(v, Py_FileSystemDefaultEncoding,
|
|
|
|
"surrogateescape");
|
2010-06-17 20:23:37 -03:00
|
|
|
if (path == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
continue;
|
|
|
|
}
|
2010-10-18 22:22:07 -03:00
|
|
|
len = PyBytes_GET_SIZE(path);
|
|
|
|
if (len + 1 + (Py_ssize_t)taillen >= (Py_ssize_t)namelen - 1) {
|
|
|
|
Py_DECREF(path);
|
2010-05-09 13:14:21 -03:00
|
|
|
continue; /* Too long */
|
2010-10-18 22:22:07 -03:00
|
|
|
}
|
|
|
|
strcpy(namebuf, PyBytes_AS_STRING(path));
|
|
|
|
Py_DECREF(path);
|
2010-05-09 13:14:21 -03:00
|
|
|
if (strlen(namebuf) != len)
|
|
|
|
continue; /* v contains '\0' */
|
|
|
|
if (len > 0 && namebuf[len-1] != SEP)
|
|
|
|
namebuf[len++] = SEP;
|
|
|
|
strcpy(namebuf+len, tail);
|
2010-06-17 20:23:37 -03:00
|
|
|
|
|
|
|
binary = PyObject_CallMethod(io, "open", "ss", namebuf, "rb");
|
2010-10-18 22:22:07 -03:00
|
|
|
if (binary != NULL) {
|
|
|
|
result = binary;
|
|
|
|
goto finally;
|
|
|
|
}
|
2010-06-17 20:23:37 -03:00
|
|
|
PyErr_Clear();
|
2010-05-09 13:14:21 -03:00
|
|
|
}
|
2010-10-18 22:22:07 -03:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
error:
|
|
|
|
result = NULL;
|
|
|
|
finally:
|
|
|
|
Py_DECREF(filebytes);
|
|
|
|
return result;
|
2008-10-09 20:37:48 -03:00
|
|
|
}
|
|
|
|
|
Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62260 | gregory.p.smith | 2008-04-10 01:11:56 +0200 (Thu, 10 Apr 2008) | 2 lines
better diagnostics
........
r62261 | gregory.p.smith | 2008-04-10 01:16:37 +0200 (Thu, 10 Apr 2008) | 3 lines
Raise SystemError when size < 0 is passed into PyString_FromStringAndSize,
PyBytes_FromStringAndSize or PyUnicode_FromStringAndSize. [issue2587]
........
r62266 | neal.norwitz | 2008-04-10 07:46:39 +0200 (Thu, 10 Apr 2008) | 5 lines
Remove the test file before writing it in case there is no write permission.
This might help fix some of the failures on Windows box(es). It doesn't hurt
either way and ensure the tests are a little more self contained (ie have
less assumptions).
........
r62271 | gregory.p.smith | 2008-04-10 21:50:36 +0200 (Thu, 10 Apr 2008) | 2 lines
get rid of assert (size >= 0) now that an explicit if (size < 0) is in the code.
........
r62277 | andrew.kuchling | 2008-04-10 23:27:10 +0200 (Thu, 10 Apr 2008) | 1 line
Remove forward-looking statement
........
r62278 | andrew.kuchling | 2008-04-10 23:28:51 +0200 (Thu, 10 Apr 2008) | 1 line
Add punctuation
........
r62279 | andrew.kuchling | 2008-04-10 23:29:01 +0200 (Thu, 10 Apr 2008) | 1 line
Use issue directive
........
r62289 | thomas.heller | 2008-04-11 15:05:38 +0200 (Fri, 11 Apr 2008) | 3 lines
Move backwards compatibility macro to the correct place;
PyIndex_Check() was introduced in Python 2.5.
........
r62290 | thomas.heller | 2008-04-11 16:20:26 +0200 (Fri, 11 Apr 2008) | 2 lines
Performance improvements.
........
r62293 | christian.heimes | 2008-04-12 15:03:03 +0200 (Sat, 12 Apr 2008) | 2 lines
Applied patch #2617 from Frank Wierzbicki wit some extras from me
-J and -X are now reserved for Jython and non-standard arguments (e.g. IronPython). I've added some extra comments to make sure the reservation don't get missed in the future.
........
r62294 | georg.brandl | 2008-04-12 20:11:18 +0200 (Sat, 12 Apr 2008) | 2 lines
Use absolute path in sys.path.
........
r62295 | georg.brandl | 2008-04-12 20:36:09 +0200 (Sat, 12 Apr 2008) | 2 lines
#2615: small consistency update by Jeroen Ruigrok van der Werven.
........
r62296 | georg.brandl | 2008-04-12 21:00:20 +0200 (Sat, 12 Apr 2008) | 2 lines
Add Jeroen.
........
r62297 | georg.brandl | 2008-04-12 21:05:37 +0200 (Sat, 12 Apr 2008) | 2 lines
Don't offend snake lovers.
........
r62298 | gregory.p.smith | 2008-04-12 22:37:48 +0200 (Sat, 12 Apr 2008) | 2 lines
fix compiler warnings
........
r62302 | gregory.p.smith | 2008-04-13 00:24:04 +0200 (Sun, 13 Apr 2008) | 3 lines
socket.error inherits from IOError, it no longer needs listing in
the all_errors tuple.
........
r62303 | brett.cannon | 2008-04-13 01:44:07 +0200 (Sun, 13 Apr 2008) | 8 lines
Re-implement the 'warnings' module in C. This allows for usage of the
'warnings' code in places where it was previously not possible (e.g., the
parser). It could also potentially lead to a speed-up in interpreter start-up
if the C version of the code (_warnings) is imported over the use of the
Python version in key places.
Closes issue #1631171.
........
r62304 | gregory.p.smith | 2008-04-13 02:03:25 +0200 (Sun, 13 Apr 2008) | 3 lines
Adds a profile-opt target for easy compilation of a python binary using
gcc's profile guided optimization.
........
r62305 | brett.cannon | 2008-04-13 02:18:44 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix a bug in PySys_HasWarnOption() where it was not properly checking the
length of the list storing the warning options.
........
r62306 | brett.cannon | 2008-04-13 02:25:15 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix an accidental bug of an non-existent init function.
........
r62308 | andrew.kuchling | 2008-04-13 03:05:59 +0200 (Sun, 13 Apr 2008) | 1 line
Mention -J, -X
........
r62311 | benjamin.peterson | 2008-04-13 04:20:05 +0200 (Sun, 13 Apr 2008) | 2 lines
Give the "Interactive Interpreter Changes" section in 2.6 whatsnew a unique link name
........
r62313 | brett.cannon | 2008-04-13 04:42:36 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix test_warnings by making the state of things more consistent for each test
when it is run.
........
r62314 | skip.montanaro | 2008-04-13 05:17:30 +0200 (Sun, 13 Apr 2008) | 2 lines
spelling
........
r62315 | georg.brandl | 2008-04-13 09:07:44 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix markup.
........
r62319 | christian.heimes | 2008-04-13 11:30:17 +0200 (Sun, 13 Apr 2008) | 1 line
Fix compiler warning Include/warnings.h:19:28: warning: no newline at end of file
........
r62320 | christian.heimes | 2008-04-13 11:33:24 +0200 (Sun, 13 Apr 2008) | 1 line
Use PyString_InternFromString instead of PyString_FromString for static vars
........
r62321 | christian.heimes | 2008-04-13 11:37:05 +0200 (Sun, 13 Apr 2008) | 1 line
Added new files to the pcbuild files
........
2008-04-13 10:53:33 -03:00
|
|
|
int
|
2010-06-17 20:23:37 -03:00
|
|
|
_Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
int err = 0;
|
|
|
|
int fd;
|
|
|
|
int i;
|
|
|
|
char *found_encoding;
|
|
|
|
char *encoding;
|
2010-06-17 20:23:37 -03:00
|
|
|
PyObject *io;
|
|
|
|
PyObject *binary;
|
2010-05-09 13:14:21 -03:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *lineobj = NULL;
|
2010-10-14 18:17:39 -03:00
|
|
|
PyObject *res;
|
2010-05-09 13:14:21 -03:00
|
|
|
char buf[MAXPATHLEN+1];
|
|
|
|
Py_UNICODE *u, *p;
|
|
|
|
Py_ssize_t len;
|
|
|
|
|
|
|
|
/* open the file */
|
|
|
|
if (filename == NULL)
|
|
|
|
return 0;
|
2010-06-17 20:23:37 -03:00
|
|
|
|
|
|
|
io = PyImport_ImportModuleNoBlock("io");
|
|
|
|
if (io == NULL)
|
|
|
|
return -1;
|
|
|
|
binary = PyObject_CallMethod(io, "open", "Os", filename, "rb");
|
|
|
|
|
|
|
|
if (binary == NULL) {
|
|
|
|
binary = _Py_FindSourceFile(filename, buf, sizeof(buf), io);
|
|
|
|
if (binary == NULL) {
|
|
|
|
Py_DECREF(io);
|
2010-05-09 13:14:21 -03:00
|
|
|
return 0;
|
2010-06-17 20:23:37 -03:00
|
|
|
}
|
2010-05-09 13:14:21 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* use the right encoding to decode the file as unicode */
|
2010-06-17 20:23:37 -03:00
|
|
|
fd = PyObject_AsFileDescriptor(binary);
|
2010-05-09 13:14:21 -03:00
|
|
|
found_encoding = PyTokenizer_FindEncoding(fd);
|
2010-06-17 20:23:37 -03:00
|
|
|
encoding = (found_encoding != NULL) ? found_encoding : "utf-8";
|
2010-05-09 13:14:21 -03:00
|
|
|
lseek(fd, 0, 0); /* Reset position */
|
2010-06-17 20:23:37 -03:00
|
|
|
fob = PyObject_CallMethod(io, "TextIOWrapper", "Os", binary, encoding);
|
|
|
|
Py_DECREF(io);
|
|
|
|
Py_DECREF(binary);
|
2010-05-09 13:14:21 -03:00
|
|
|
PyMem_FREE(found_encoding);
|
2010-06-17 20:23:37 -03:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
if (fob == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get the line number lineno */
|
|
|
|
for (i = 0; i < lineno; i++) {
|
|
|
|
Py_XDECREF(lineobj);
|
|
|
|
lineobj = PyFile_GetLine(fob, -1);
|
|
|
|
if (!lineobj) {
|
|
|
|
err = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2010-10-14 18:17:39 -03:00
|
|
|
res = PyObject_CallMethod(fob, "close", "");
|
|
|
|
if (res)
|
|
|
|
Py_DECREF(res);
|
|
|
|
else
|
|
|
|
PyErr_Clear();
|
2010-05-09 13:14:21 -03:00
|
|
|
Py_DECREF(fob);
|
|
|
|
if (!lineobj || !PyUnicode_Check(lineobj)) {
|
|
|
|
Py_XDECREF(lineobj);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove the indentation of the line */
|
|
|
|
u = PyUnicode_AS_UNICODE(lineobj);
|
|
|
|
len = PyUnicode_GET_SIZE(lineobj);
|
|
|
|
for (p=u; *p == ' ' || *p == '\t' || *p == '\014'; p++)
|
|
|
|
len--;
|
|
|
|
if (u != p) {
|
|
|
|
PyObject *truncated;
|
|
|
|
truncated = PyUnicode_FromUnicode(p, len);
|
|
|
|
if (truncated) {
|
|
|
|
Py_DECREF(lineobj);
|
|
|
|
lineobj = truncated;
|
|
|
|
} else {
|
|
|
|
PyErr_Clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* finally display the line */
|
|
|
|
if (err == 0)
|
|
|
|
err = PyFile_WriteObject(lineobj, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(lineobj);
|
|
|
|
if (err == 0)
|
|
|
|
err = PyFile_WriteString("\n", f);
|
|
|
|
return err;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
1997-05-22 19:35:47 -03:00
|
|
|
static int
|
2010-06-17 20:23:37 -03:00
|
|
|
tb_displayline(PyObject *f, PyObject *filename, int lineno, PyObject *name)
|
Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62260 | gregory.p.smith | 2008-04-10 01:11:56 +0200 (Thu, 10 Apr 2008) | 2 lines
better diagnostics
........
r62261 | gregory.p.smith | 2008-04-10 01:16:37 +0200 (Thu, 10 Apr 2008) | 3 lines
Raise SystemError when size < 0 is passed into PyString_FromStringAndSize,
PyBytes_FromStringAndSize or PyUnicode_FromStringAndSize. [issue2587]
........
r62266 | neal.norwitz | 2008-04-10 07:46:39 +0200 (Thu, 10 Apr 2008) | 5 lines
Remove the test file before writing it in case there is no write permission.
This might help fix some of the failures on Windows box(es). It doesn't hurt
either way and ensure the tests are a little more self contained (ie have
less assumptions).
........
r62271 | gregory.p.smith | 2008-04-10 21:50:36 +0200 (Thu, 10 Apr 2008) | 2 lines
get rid of assert (size >= 0) now that an explicit if (size < 0) is in the code.
........
r62277 | andrew.kuchling | 2008-04-10 23:27:10 +0200 (Thu, 10 Apr 2008) | 1 line
Remove forward-looking statement
........
r62278 | andrew.kuchling | 2008-04-10 23:28:51 +0200 (Thu, 10 Apr 2008) | 1 line
Add punctuation
........
r62279 | andrew.kuchling | 2008-04-10 23:29:01 +0200 (Thu, 10 Apr 2008) | 1 line
Use issue directive
........
r62289 | thomas.heller | 2008-04-11 15:05:38 +0200 (Fri, 11 Apr 2008) | 3 lines
Move backwards compatibility macro to the correct place;
PyIndex_Check() was introduced in Python 2.5.
........
r62290 | thomas.heller | 2008-04-11 16:20:26 +0200 (Fri, 11 Apr 2008) | 2 lines
Performance improvements.
........
r62293 | christian.heimes | 2008-04-12 15:03:03 +0200 (Sat, 12 Apr 2008) | 2 lines
Applied patch #2617 from Frank Wierzbicki wit some extras from me
-J and -X are now reserved for Jython and non-standard arguments (e.g. IronPython). I've added some extra comments to make sure the reservation don't get missed in the future.
........
r62294 | georg.brandl | 2008-04-12 20:11:18 +0200 (Sat, 12 Apr 2008) | 2 lines
Use absolute path in sys.path.
........
r62295 | georg.brandl | 2008-04-12 20:36:09 +0200 (Sat, 12 Apr 2008) | 2 lines
#2615: small consistency update by Jeroen Ruigrok van der Werven.
........
r62296 | georg.brandl | 2008-04-12 21:00:20 +0200 (Sat, 12 Apr 2008) | 2 lines
Add Jeroen.
........
r62297 | georg.brandl | 2008-04-12 21:05:37 +0200 (Sat, 12 Apr 2008) | 2 lines
Don't offend snake lovers.
........
r62298 | gregory.p.smith | 2008-04-12 22:37:48 +0200 (Sat, 12 Apr 2008) | 2 lines
fix compiler warnings
........
r62302 | gregory.p.smith | 2008-04-13 00:24:04 +0200 (Sun, 13 Apr 2008) | 3 lines
socket.error inherits from IOError, it no longer needs listing in
the all_errors tuple.
........
r62303 | brett.cannon | 2008-04-13 01:44:07 +0200 (Sun, 13 Apr 2008) | 8 lines
Re-implement the 'warnings' module in C. This allows for usage of the
'warnings' code in places where it was previously not possible (e.g., the
parser). It could also potentially lead to a speed-up in interpreter start-up
if the C version of the code (_warnings) is imported over the use of the
Python version in key places.
Closes issue #1631171.
........
r62304 | gregory.p.smith | 2008-04-13 02:03:25 +0200 (Sun, 13 Apr 2008) | 3 lines
Adds a profile-opt target for easy compilation of a python binary using
gcc's profile guided optimization.
........
r62305 | brett.cannon | 2008-04-13 02:18:44 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix a bug in PySys_HasWarnOption() where it was not properly checking the
length of the list storing the warning options.
........
r62306 | brett.cannon | 2008-04-13 02:25:15 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix an accidental bug of an non-existent init function.
........
r62308 | andrew.kuchling | 2008-04-13 03:05:59 +0200 (Sun, 13 Apr 2008) | 1 line
Mention -J, -X
........
r62311 | benjamin.peterson | 2008-04-13 04:20:05 +0200 (Sun, 13 Apr 2008) | 2 lines
Give the "Interactive Interpreter Changes" section in 2.6 whatsnew a unique link name
........
r62313 | brett.cannon | 2008-04-13 04:42:36 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix test_warnings by making the state of things more consistent for each test
when it is run.
........
r62314 | skip.montanaro | 2008-04-13 05:17:30 +0200 (Sun, 13 Apr 2008) | 2 lines
spelling
........
r62315 | georg.brandl | 2008-04-13 09:07:44 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix markup.
........
r62319 | christian.heimes | 2008-04-13 11:30:17 +0200 (Sun, 13 Apr 2008) | 1 line
Fix compiler warning Include/warnings.h:19:28: warning: no newline at end of file
........
r62320 | christian.heimes | 2008-04-13 11:33:24 +0200 (Sun, 13 Apr 2008) | 1 line
Use PyString_InternFromString instead of PyString_FromString for static vars
........
r62321 | christian.heimes | 2008-04-13 11:37:05 +0200 (Sun, 13 Apr 2008) | 1 line
Added new files to the pcbuild files
........
2008-04-13 10:53:33 -03:00
|
|
|
{
|
2010-06-17 20:23:37 -03:00
|
|
|
int err;
|
|
|
|
PyObject *line;
|
Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62260 | gregory.p.smith | 2008-04-10 01:11:56 +0200 (Thu, 10 Apr 2008) | 2 lines
better diagnostics
........
r62261 | gregory.p.smith | 2008-04-10 01:16:37 +0200 (Thu, 10 Apr 2008) | 3 lines
Raise SystemError when size < 0 is passed into PyString_FromStringAndSize,
PyBytes_FromStringAndSize or PyUnicode_FromStringAndSize. [issue2587]
........
r62266 | neal.norwitz | 2008-04-10 07:46:39 +0200 (Thu, 10 Apr 2008) | 5 lines
Remove the test file before writing it in case there is no write permission.
This might help fix some of the failures on Windows box(es). It doesn't hurt
either way and ensure the tests are a little more self contained (ie have
less assumptions).
........
r62271 | gregory.p.smith | 2008-04-10 21:50:36 +0200 (Thu, 10 Apr 2008) | 2 lines
get rid of assert (size >= 0) now that an explicit if (size < 0) is in the code.
........
r62277 | andrew.kuchling | 2008-04-10 23:27:10 +0200 (Thu, 10 Apr 2008) | 1 line
Remove forward-looking statement
........
r62278 | andrew.kuchling | 2008-04-10 23:28:51 +0200 (Thu, 10 Apr 2008) | 1 line
Add punctuation
........
r62279 | andrew.kuchling | 2008-04-10 23:29:01 +0200 (Thu, 10 Apr 2008) | 1 line
Use issue directive
........
r62289 | thomas.heller | 2008-04-11 15:05:38 +0200 (Fri, 11 Apr 2008) | 3 lines
Move backwards compatibility macro to the correct place;
PyIndex_Check() was introduced in Python 2.5.
........
r62290 | thomas.heller | 2008-04-11 16:20:26 +0200 (Fri, 11 Apr 2008) | 2 lines
Performance improvements.
........
r62293 | christian.heimes | 2008-04-12 15:03:03 +0200 (Sat, 12 Apr 2008) | 2 lines
Applied patch #2617 from Frank Wierzbicki wit some extras from me
-J and -X are now reserved for Jython and non-standard arguments (e.g. IronPython). I've added some extra comments to make sure the reservation don't get missed in the future.
........
r62294 | georg.brandl | 2008-04-12 20:11:18 +0200 (Sat, 12 Apr 2008) | 2 lines
Use absolute path in sys.path.
........
r62295 | georg.brandl | 2008-04-12 20:36:09 +0200 (Sat, 12 Apr 2008) | 2 lines
#2615: small consistency update by Jeroen Ruigrok van der Werven.
........
r62296 | georg.brandl | 2008-04-12 21:00:20 +0200 (Sat, 12 Apr 2008) | 2 lines
Add Jeroen.
........
r62297 | georg.brandl | 2008-04-12 21:05:37 +0200 (Sat, 12 Apr 2008) | 2 lines
Don't offend snake lovers.
........
r62298 | gregory.p.smith | 2008-04-12 22:37:48 +0200 (Sat, 12 Apr 2008) | 2 lines
fix compiler warnings
........
r62302 | gregory.p.smith | 2008-04-13 00:24:04 +0200 (Sun, 13 Apr 2008) | 3 lines
socket.error inherits from IOError, it no longer needs listing in
the all_errors tuple.
........
r62303 | brett.cannon | 2008-04-13 01:44:07 +0200 (Sun, 13 Apr 2008) | 8 lines
Re-implement the 'warnings' module in C. This allows for usage of the
'warnings' code in places where it was previously not possible (e.g., the
parser). It could also potentially lead to a speed-up in interpreter start-up
if the C version of the code (_warnings) is imported over the use of the
Python version in key places.
Closes issue #1631171.
........
r62304 | gregory.p.smith | 2008-04-13 02:03:25 +0200 (Sun, 13 Apr 2008) | 3 lines
Adds a profile-opt target for easy compilation of a python binary using
gcc's profile guided optimization.
........
r62305 | brett.cannon | 2008-04-13 02:18:44 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix a bug in PySys_HasWarnOption() where it was not properly checking the
length of the list storing the warning options.
........
r62306 | brett.cannon | 2008-04-13 02:25:15 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix an accidental bug of an non-existent init function.
........
r62308 | andrew.kuchling | 2008-04-13 03:05:59 +0200 (Sun, 13 Apr 2008) | 1 line
Mention -J, -X
........
r62311 | benjamin.peterson | 2008-04-13 04:20:05 +0200 (Sun, 13 Apr 2008) | 2 lines
Give the "Interactive Interpreter Changes" section in 2.6 whatsnew a unique link name
........
r62313 | brett.cannon | 2008-04-13 04:42:36 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix test_warnings by making the state of things more consistent for each test
when it is run.
........
r62314 | skip.montanaro | 2008-04-13 05:17:30 +0200 (Sun, 13 Apr 2008) | 2 lines
spelling
........
r62315 | georg.brandl | 2008-04-13 09:07:44 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix markup.
........
r62319 | christian.heimes | 2008-04-13 11:30:17 +0200 (Sun, 13 Apr 2008) | 1 line
Fix compiler warning Include/warnings.h:19:28: warning: no newline at end of file
........
r62320 | christian.heimes | 2008-04-13 11:33:24 +0200 (Sun, 13 Apr 2008) | 1 line
Use PyString_InternFromString instead of PyString_FromString for static vars
........
r62321 | christian.heimes | 2008-04-13 11:37:05 +0200 (Sun, 13 Apr 2008) | 1 line
Added new files to the pcbuild files
........
2008-04-13 10:53:33 -03:00
|
|
|
|
2010-05-09 13:14:21 -03:00
|
|
|
if (filename == NULL || name == NULL)
|
|
|
|
return -1;
|
2010-06-17 20:23:37 -03:00
|
|
|
line = PyUnicode_FromFormat(" File \"%U\", line %d, in %U\n",
|
|
|
|
filename, lineno, name);
|
|
|
|
if (line == NULL)
|
|
|
|
return -1;
|
|
|
|
err = PyFile_WriteObject(line, f, Py_PRINT_RAW);
|
|
|
|
Py_DECREF(line);
|
2010-05-09 13:14:21 -03:00
|
|
|
if (err != 0)
|
|
|
|
return err;
|
|
|
|
return _Py_DisplaySourceLine(f, filename, lineno, 4);
|
Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62260 | gregory.p.smith | 2008-04-10 01:11:56 +0200 (Thu, 10 Apr 2008) | 2 lines
better diagnostics
........
r62261 | gregory.p.smith | 2008-04-10 01:16:37 +0200 (Thu, 10 Apr 2008) | 3 lines
Raise SystemError when size < 0 is passed into PyString_FromStringAndSize,
PyBytes_FromStringAndSize or PyUnicode_FromStringAndSize. [issue2587]
........
r62266 | neal.norwitz | 2008-04-10 07:46:39 +0200 (Thu, 10 Apr 2008) | 5 lines
Remove the test file before writing it in case there is no write permission.
This might help fix some of the failures on Windows box(es). It doesn't hurt
either way and ensure the tests are a little more self contained (ie have
less assumptions).
........
r62271 | gregory.p.smith | 2008-04-10 21:50:36 +0200 (Thu, 10 Apr 2008) | 2 lines
get rid of assert (size >= 0) now that an explicit if (size < 0) is in the code.
........
r62277 | andrew.kuchling | 2008-04-10 23:27:10 +0200 (Thu, 10 Apr 2008) | 1 line
Remove forward-looking statement
........
r62278 | andrew.kuchling | 2008-04-10 23:28:51 +0200 (Thu, 10 Apr 2008) | 1 line
Add punctuation
........
r62279 | andrew.kuchling | 2008-04-10 23:29:01 +0200 (Thu, 10 Apr 2008) | 1 line
Use issue directive
........
r62289 | thomas.heller | 2008-04-11 15:05:38 +0200 (Fri, 11 Apr 2008) | 3 lines
Move backwards compatibility macro to the correct place;
PyIndex_Check() was introduced in Python 2.5.
........
r62290 | thomas.heller | 2008-04-11 16:20:26 +0200 (Fri, 11 Apr 2008) | 2 lines
Performance improvements.
........
r62293 | christian.heimes | 2008-04-12 15:03:03 +0200 (Sat, 12 Apr 2008) | 2 lines
Applied patch #2617 from Frank Wierzbicki wit some extras from me
-J and -X are now reserved for Jython and non-standard arguments (e.g. IronPython). I've added some extra comments to make sure the reservation don't get missed in the future.
........
r62294 | georg.brandl | 2008-04-12 20:11:18 +0200 (Sat, 12 Apr 2008) | 2 lines
Use absolute path in sys.path.
........
r62295 | georg.brandl | 2008-04-12 20:36:09 +0200 (Sat, 12 Apr 2008) | 2 lines
#2615: small consistency update by Jeroen Ruigrok van der Werven.
........
r62296 | georg.brandl | 2008-04-12 21:00:20 +0200 (Sat, 12 Apr 2008) | 2 lines
Add Jeroen.
........
r62297 | georg.brandl | 2008-04-12 21:05:37 +0200 (Sat, 12 Apr 2008) | 2 lines
Don't offend snake lovers.
........
r62298 | gregory.p.smith | 2008-04-12 22:37:48 +0200 (Sat, 12 Apr 2008) | 2 lines
fix compiler warnings
........
r62302 | gregory.p.smith | 2008-04-13 00:24:04 +0200 (Sun, 13 Apr 2008) | 3 lines
socket.error inherits from IOError, it no longer needs listing in
the all_errors tuple.
........
r62303 | brett.cannon | 2008-04-13 01:44:07 +0200 (Sun, 13 Apr 2008) | 8 lines
Re-implement the 'warnings' module in C. This allows for usage of the
'warnings' code in places where it was previously not possible (e.g., the
parser). It could also potentially lead to a speed-up in interpreter start-up
if the C version of the code (_warnings) is imported over the use of the
Python version in key places.
Closes issue #1631171.
........
r62304 | gregory.p.smith | 2008-04-13 02:03:25 +0200 (Sun, 13 Apr 2008) | 3 lines
Adds a profile-opt target for easy compilation of a python binary using
gcc's profile guided optimization.
........
r62305 | brett.cannon | 2008-04-13 02:18:44 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix a bug in PySys_HasWarnOption() where it was not properly checking the
length of the list storing the warning options.
........
r62306 | brett.cannon | 2008-04-13 02:25:15 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix an accidental bug of an non-existent init function.
........
r62308 | andrew.kuchling | 2008-04-13 03:05:59 +0200 (Sun, 13 Apr 2008) | 1 line
Mention -J, -X
........
r62311 | benjamin.peterson | 2008-04-13 04:20:05 +0200 (Sun, 13 Apr 2008) | 2 lines
Give the "Interactive Interpreter Changes" section in 2.6 whatsnew a unique link name
........
r62313 | brett.cannon | 2008-04-13 04:42:36 +0200 (Sun, 13 Apr 2008) | 3 lines
Fix test_warnings by making the state of things more consistent for each test
when it is run.
........
r62314 | skip.montanaro | 2008-04-13 05:17:30 +0200 (Sun, 13 Apr 2008) | 2 lines
spelling
........
r62315 | georg.brandl | 2008-04-13 09:07:44 +0200 (Sun, 13 Apr 2008) | 2 lines
Fix markup.
........
r62319 | christian.heimes | 2008-04-13 11:30:17 +0200 (Sun, 13 Apr 2008) | 1 line
Fix compiler warning Include/warnings.h:19:28: warning: no newline at end of file
........
r62320 | christian.heimes | 2008-04-13 11:33:24 +0200 (Sun, 13 Apr 2008) | 1 line
Use PyString_InternFromString instead of PyString_FromString for static vars
........
r62321 | christian.heimes | 2008-04-13 11:37:05 +0200 (Sun, 13 Apr 2008) | 1 line
Added new files to the pcbuild files
........
2008-04-13 10:53:33 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
tb_printinternal(PyTracebackObject *tb, PyObject *f, long limit)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
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,
|
2010-06-17 20:23:37 -03:00
|
|
|
tb->tb_frame->f_code->co_filename,
|
|
|
|
tb->tb_lineno,
|
|
|
|
tb->tb_frame->f_code->co_name);
|
2010-05-09 13:14:21 -03:00
|
|
|
}
|
|
|
|
depth--;
|
|
|
|
tb = tb->tb_next;
|
|
|
|
if (err == 0)
|
|
|
|
err = PyErr_CheckSignals();
|
|
|
|
}
|
|
|
|
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
|
|
|
{
|
2010-05-09 13:14:21 -03:00
|
|
|
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;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|