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"
|
2017-09-08 02:51:28 -03:00
|
|
|
#include "internal/pystate.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"
|
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
|
|
|
|
2015-04-01 13:38:01 -03:00
|
|
|
#define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
|
2012-07-30 08:08:58 -03:00
|
|
|
#define MAX_STRING_LENGTH 500
|
2011-03-30 20:31:06 -03:00
|
|
|
#define MAX_FRAME_DEPTH 100
|
|
|
|
#define MAX_NTHREADS 100
|
|
|
|
|
2011-04-04 20:48:03 -03:00
|
|
|
/* Function from Parser/tokenizer.c */
|
|
|
|
extern char * PyTokenizer_FindEncodingFilename(int, PyObject *);
|
2008-10-09 20:37:48 -03:00
|
|
|
|
2013-11-07 18:07:29 -04:00
|
|
|
_Py_IDENTIFIER(TextIOWrapper);
|
|
|
|
_Py_IDENTIFIER(close);
|
|
|
|
_Py_IDENTIFIER(open);
|
|
|
|
_Py_IDENTIFIER(path);
|
|
|
|
|
2018-01-07 09:30:18 -04:00
|
|
|
/*[clinic input]
|
|
|
|
class TracebackType "PyTracebackObject *" "&PyTraceback_Type"
|
|
|
|
[clinic start generated code]*/
|
|
|
|
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=928fa06c10151120]*/
|
|
|
|
|
|
|
|
#include "clinic/traceback.c.h"
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tb_create_raw(PyTracebackObject *next, PyFrameObject *frame, int lasti,
|
|
|
|
int lineno)
|
|
|
|
{
|
|
|
|
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 = lasti;
|
|
|
|
tb->tb_lineno = lineno;
|
|
|
|
PyObject_GC_Track(tb);
|
|
|
|
}
|
|
|
|
return (PyObject *)tb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*[clinic input]
|
|
|
|
@classmethod
|
|
|
|
TracebackType.__new__ as tb_new
|
|
|
|
|
|
|
|
tb_next: object
|
|
|
|
tb_frame: object(type='PyFrameObject *', subclass_of='&PyFrame_Type')
|
|
|
|
tb_lasti: int
|
|
|
|
tb_lineno: int
|
|
|
|
|
|
|
|
Create a new traceback object.
|
|
|
|
[clinic start generated code]*/
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tb_new_impl(PyTypeObject *type, PyObject *tb_next, PyFrameObject *tb_frame,
|
|
|
|
int tb_lasti, int tb_lineno)
|
|
|
|
/*[clinic end generated code: output=fa077debd72d861a input=01cbe8ec8783fca7]*/
|
|
|
|
{
|
|
|
|
if (tb_next == Py_None) {
|
|
|
|
tb_next = NULL;
|
|
|
|
} else if (!PyTraceBack_Check(tb_next)) {
|
|
|
|
return PyErr_Format(PyExc_TypeError,
|
|
|
|
"expected traceback object or None, got '%s'",
|
|
|
|
Py_TYPE(tb_next)->tp_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
return tb_create_raw((PyTracebackObject *)tb_next, tb_frame, tb_lasti,
|
|
|
|
tb_lineno);
|
|
|
|
}
|
|
|
|
|
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");
|
|
|
|
}
|
|
|
|
|
2018-01-07 09:30:18 -04:00
|
|
|
static PyObject *
|
|
|
|
tb_next_get(PyTracebackObject *self, void *Py_UNUSED(_))
|
|
|
|
{
|
|
|
|
PyObject* ret = (PyObject*)self->tb_next;
|
|
|
|
if (!ret) {
|
|
|
|
ret = Py_None;
|
|
|
|
}
|
|
|
|
Py_INCREF(ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
tb_next_set(PyTracebackObject *self, PyObject *new_next, void *Py_UNUSED(_))
|
|
|
|
{
|
|
|
|
if (!new_next) {
|
|
|
|
PyErr_Format(PyExc_TypeError, "can't delete tb_next attribute");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We accept None or a traceback object, and map None -> NULL (inverse of
|
|
|
|
tb_next_get) */
|
|
|
|
if (new_next == Py_None) {
|
|
|
|
new_next = NULL;
|
|
|
|
} else if (!PyTraceBack_Check(new_next)) {
|
|
|
|
PyErr_Format(PyExc_TypeError,
|
|
|
|
"expected traceback object, got '%s'",
|
|
|
|
Py_TYPE(new_next)->tp_name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for loops */
|
|
|
|
PyTracebackObject *cursor = (PyTracebackObject *)new_next;
|
|
|
|
while (cursor) {
|
|
|
|
if (cursor == self) {
|
|
|
|
PyErr_Format(PyExc_ValueError, "traceback loop detected");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
cursor = cursor->tb_next;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyObject *old_next = (PyObject*)self->tb_next;
|
|
|
|
Py_XINCREF(new_next);
|
|
|
|
self->tb_next = (PyTracebackObject *)new_next;
|
|
|
|
Py_XDECREF(old_next);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-14 14:53:54 -03:00
|
|
|
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 12:52:27 -03:00
|
|
|
{"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
|
|
|
};
|
|
|
|
|
2018-01-07 09:30:18 -04:00
|
|
|
static PyGetSetDef tb_getsetters[] = {
|
|
|
|
{"tb_next", (getter)tb_next_get, (setter)tb_next_set, NULL, NULL},
|
|
|
|
{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 12:52:27 -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 12:52:27 -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 12:52:27 -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 12:52:27 -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 */
|
2018-01-07 09:30:18 -04:00
|
|
|
tb_new__doc__, /* tp_doc */
|
2010-05-09 12:52:27 -03:00
|
|
|
(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 */
|
2018-01-07 09:30:18 -04:00
|
|
|
tb_getsetters, /* tp_getset */
|
2010-05-09 12:52:27 -03:00
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
2018-01-07 09:30:18 -04:00
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
tb_new, /* tp_new */
|
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
|
|
|
{
|
2016-10-18 07:23:18 -03:00
|
|
|
PyObject *exc, *val, *tb, *newtb;
|
|
|
|
PyErr_Fetch(&exc, &val, &tb);
|
2018-01-07 09:30:18 -04:00
|
|
|
newtb = tb_create_raw((PyTracebackObject *)tb, frame, frame->f_lasti,
|
|
|
|
PyFrame_GetLineNumber(frame));
|
2016-10-18 07:23:18 -03:00
|
|
|
if (newtb == NULL) {
|
|
|
|
_PyErr_ChainExceptions(exc, val, tb);
|
2010-05-09 12:52:27 -03:00
|
|
|
return -1;
|
2016-10-18 07:23:18 -03:00
|
|
|
}
|
|
|
|
PyErr_Restore(exc, val, newtb);
|
|
|
|
Py_XDECREF(tb);
|
2010-05-09 12:52:27 -03:00
|
|
|
return 0;
|
1990-12-20 11:06:42 -04:00
|
|
|
}
|
|
|
|
|
2014-10-08 15:00:09 -03:00
|
|
|
/* Insert a frame into the traceback for (funcname, filename, lineno). */
|
2015-06-21 09:59:46 -03:00
|
|
|
void _PyTraceback_Add(const char *funcname, const char *filename, int lineno)
|
2014-10-08 15:00:09 -03:00
|
|
|
{
|
2016-10-18 07:23:18 -03:00
|
|
|
PyObject *globals;
|
|
|
|
PyCodeObject *code;
|
|
|
|
PyFrameObject *frame;
|
|
|
|
PyObject *exc, *val, *tb;
|
2014-10-08 15:00:09 -03:00
|
|
|
|
|
|
|
/* Save and clear the current exception. Python functions must not be
|
|
|
|
called with an exception set. Calling Python functions happens when
|
|
|
|
the codec of the filesystem encoding is implemented in pure Python. */
|
2016-10-18 07:23:18 -03:00
|
|
|
PyErr_Fetch(&exc, &val, &tb);
|
2014-10-08 15:00:09 -03:00
|
|
|
|
|
|
|
globals = PyDict_New();
|
|
|
|
if (!globals)
|
2016-10-18 07:23:18 -03:00
|
|
|
goto error;
|
2014-10-08 15:00:09 -03:00
|
|
|
code = PyCode_NewEmpty(filename, funcname, lineno);
|
2016-10-18 07:23:18 -03:00
|
|
|
if (!code) {
|
|
|
|
Py_DECREF(globals);
|
|
|
|
goto error;
|
|
|
|
}
|
2014-10-08 15:00:09 -03:00
|
|
|
frame = PyFrame_New(PyThreadState_Get(), code, globals, NULL);
|
2016-10-18 07:23:18 -03:00
|
|
|
Py_DECREF(globals);
|
|
|
|
Py_DECREF(code);
|
2014-10-08 15:00:09 -03:00
|
|
|
if (!frame)
|
2016-10-18 07:23:18 -03:00
|
|
|
goto error;
|
2014-10-08 15:00:09 -03:00
|
|
|
frame->f_lineno = lineno;
|
|
|
|
|
2016-10-18 07:23:18 -03:00
|
|
|
PyErr_Restore(exc, val, tb);
|
2014-10-08 15:00:09 -03:00
|
|
|
PyTraceBack_Here(frame);
|
2016-10-18 07:23:18 -03:00
|
|
|
Py_DECREF(frame);
|
|
|
|
return;
|
2014-10-08 15:00:09 -03:00
|
|
|
|
2016-10-18 07:23:18 -03:00
|
|
|
error:
|
|
|
|
_PyErr_ChainExceptions(exc, val, tb);
|
2014-10-08 15:00:09 -03:00
|
|
|
}
|
|
|
|
|
2010-06-17 20:08:50 -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:08:50 -03:00
|
|
|
Py_ssize_t i;
|
|
|
|
PyObject *binary;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *v;
|
2010-06-17 20:08:50 -03:00
|
|
|
Py_ssize_t npath;
|
2010-05-09 12:52:27 -03:00
|
|
|
size_t taillen;
|
|
|
|
PyObject *syspath;
|
2010-10-16 10:14:10 -03:00
|
|
|
PyObject *path;
|
2010-05-09 12:52:27 -03:00
|
|
|
const char* tail;
|
2010-10-16 10:14:10 -03:00
|
|
|
PyObject *filebytes;
|
2010-06-17 20:08:50 -03:00
|
|
|
const char* filepath;
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_ssize_t len;
|
2010-10-16 10:14:10 -03:00
|
|
|
PyObject* result;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
2010-10-16 10:14:10 -03:00
|
|
|
filebytes = PyUnicode_EncodeFSDefault(filename);
|
|
|
|
if (filebytes == NULL) {
|
2010-06-17 20:08:50 -03:00
|
|
|
PyErr_Clear();
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-10-16 10:14:10 -03:00
|
|
|
filepath = PyBytes_AS_STRING(filebytes);
|
2010-06-17 20:08:50 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Search tail of filename in sys.path before giving up */
|
2010-06-17 20:08:50 -03:00
|
|
|
tail = strrchr(filepath, SEP);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (tail == NULL)
|
2010-06-17 20:08:50 -03:00
|
|
|
tail = filepath;
|
2010-05-09 12:52:27 -03:00
|
|
|
else
|
|
|
|
tail++;
|
|
|
|
taillen = strlen(tail);
|
|
|
|
|
2013-11-07 18:07:29 -04:00
|
|
|
syspath = _PySys_GetObjectId(&PyId_path);
|
2010-05-09 12:52:27 -03:00
|
|
|
if (syspath == NULL || !PyList_Check(syspath))
|
2010-10-16 10:14:10 -03:00
|
|
|
goto error;
|
2010-06-17 20:08:50 -03:00
|
|
|
npath = PyList_Size(syspath);
|
2010-05-09 12:52:27 -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-16 10:14:10 -03:00
|
|
|
path = PyUnicode_EncodeFSDefault(v);
|
2010-06-17 20:08:50 -03:00
|
|
|
if (path == NULL) {
|
|
|
|
PyErr_Clear();
|
|
|
|
continue;
|
|
|
|
}
|
2010-10-16 10:14:10 -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 12:52:27 -03:00
|
|
|
continue; /* Too long */
|
2010-10-16 10:14:10 -03:00
|
|
|
}
|
|
|
|
strcpy(namebuf, PyBytes_AS_STRING(path));
|
|
|
|
Py_DECREF(path);
|
2014-08-15 18:30:40 -03:00
|
|
|
if (strlen(namebuf) != (size_t)len)
|
2010-05-09 12:52:27 -03:00
|
|
|
continue; /* v contains '\0' */
|
|
|
|
if (len > 0 && namebuf[len-1] != SEP)
|
|
|
|
namebuf[len++] = SEP;
|
|
|
|
strcpy(namebuf+len, tail);
|
2010-06-17 20:08:50 -03:00
|
|
|
|
2011-10-09 05:38:36 -03:00
|
|
|
binary = _PyObject_CallMethodId(io, &PyId_open, "ss", namebuf, "rb");
|
2010-10-16 10:14:10 -03:00
|
|
|
if (binary != NULL) {
|
|
|
|
result = binary;
|
|
|
|
goto finally;
|
|
|
|
}
|
2010-06-17 20:08:50 -03:00
|
|
|
PyErr_Clear();
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2010-10-16 10:14:10 -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:08:50 -03:00
|
|
|
_Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
|
1990-12-20 11:06:42 -04:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int err = 0;
|
|
|
|
int fd;
|
|
|
|
int i;
|
|
|
|
char *found_encoding;
|
|
|
|
char *encoding;
|
2010-06-17 20:08:50 -03:00
|
|
|
PyObject *io;
|
|
|
|
PyObject *binary;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *fob = NULL;
|
|
|
|
PyObject *lineobj = NULL;
|
2010-10-14 18:15:17 -03:00
|
|
|
PyObject *res;
|
2010-05-09 12:52:27 -03:00
|
|
|
char buf[MAXPATHLEN+1];
|
2011-09-28 02:41:54 -03:00
|
|
|
int kind;
|
|
|
|
void *data;
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
/* open the file */
|
|
|
|
if (filename == NULL)
|
|
|
|
return 0;
|
2010-06-17 20:08:50 -03:00
|
|
|
|
|
|
|
io = PyImport_ImportModuleNoBlock("io");
|
|
|
|
if (io == NULL)
|
|
|
|
return -1;
|
2011-10-09 05:38:36 -03:00
|
|
|
binary = _PyObject_CallMethodId(io, &PyId_open, "Os", filename, "rb");
|
2010-06-17 20:08:50 -03:00
|
|
|
|
|
|
|
if (binary == NULL) {
|
2013-07-15 19:32:14 -03:00
|
|
|
PyErr_Clear();
|
|
|
|
|
2010-06-17 20:08:50 -03:00
|
|
|
binary = _Py_FindSourceFile(filename, buf, sizeof(buf), io);
|
|
|
|
if (binary == NULL) {
|
|
|
|
Py_DECREF(io);
|
2013-07-15 19:32:14 -03:00
|
|
|
return -1;
|
2010-06-17 20:08:50 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* use the right encoding to decode the file as unicode */
|
2010-06-17 20:08:50 -03:00
|
|
|
fd = PyObject_AsFileDescriptor(binary);
|
2013-07-20 20:53:10 -03:00
|
|
|
if (fd < 0) {
|
|
|
|
Py_DECREF(io);
|
|
|
|
Py_DECREF(binary);
|
2013-07-21 17:26:13 -03:00
|
|
|
return 0;
|
2013-07-20 20:53:10 -03:00
|
|
|
}
|
2011-04-04 20:48:03 -03:00
|
|
|
found_encoding = PyTokenizer_FindEncodingFilename(fd, filename);
|
2013-12-19 08:39:32 -04:00
|
|
|
if (found_encoding == NULL)
|
|
|
|
PyErr_Clear();
|
2010-06-17 20:08:50 -03:00
|
|
|
encoding = (found_encoding != NULL) ? found_encoding : "utf-8";
|
2013-07-20 21:12:35 -03:00
|
|
|
/* Reset position */
|
|
|
|
if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
|
|
|
|
Py_DECREF(io);
|
|
|
|
Py_DECREF(binary);
|
|
|
|
PyMem_FREE(found_encoding);
|
2013-07-21 17:26:13 -03:00
|
|
|
return 0;
|
2013-07-20 21:12:35 -03:00
|
|
|
}
|
2011-10-09 05:38:36 -03:00
|
|
|
fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding);
|
2010-06-17 20:08:50 -03:00
|
|
|
Py_DECREF(io);
|
2010-05-09 12:52:27 -03:00
|
|
|
PyMem_FREE(found_encoding);
|
2010-06-17 20:08:50 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (fob == NULL) {
|
|
|
|
PyErr_Clear();
|
2015-03-24 22:25:25 -03:00
|
|
|
|
2016-09-05 22:16:01 -03:00
|
|
|
res = _PyObject_CallMethodId(binary, &PyId_close, NULL);
|
2015-03-24 22:25:25 -03:00
|
|
|
Py_DECREF(binary);
|
|
|
|
if (res)
|
|
|
|
Py_DECREF(res);
|
|
|
|
else
|
|
|
|
PyErr_Clear();
|
2010-05-09 12:52:27 -03:00
|
|
|
return 0;
|
|
|
|
}
|
2015-03-24 22:25:25 -03:00
|
|
|
Py_DECREF(binary);
|
2010-05-09 12:52:27 -03:00
|
|
|
|
|
|
|
/* get the line number lineno */
|
|
|
|
for (i = 0; i < lineno; i++) {
|
|
|
|
Py_XDECREF(lineobj);
|
|
|
|
lineobj = PyFile_GetLine(fob, -1);
|
|
|
|
if (!lineobj) {
|
2014-10-30 06:17:27 -03:00
|
|
|
PyErr_Clear();
|
2010-05-09 12:52:27 -03:00
|
|
|
err = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-09-05 22:16:01 -03:00
|
|
|
res = _PyObject_CallMethodId(fob, &PyId_close, NULL);
|
2010-10-14 18:15:17 -03:00
|
|
|
if (res)
|
|
|
|
Py_DECREF(res);
|
|
|
|
else
|
|
|
|
PyErr_Clear();
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(fob);
|
|
|
|
if (!lineobj || !PyUnicode_Check(lineobj)) {
|
|
|
|
Py_XDECREF(lineobj);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove the indentation of the line */
|
2011-09-28 02:41:54 -03:00
|
|
|
kind = PyUnicode_KIND(lineobj);
|
|
|
|
data = PyUnicode_DATA(lineobj);
|
|
|
|
for (i=0; i < PyUnicode_GET_LENGTH(lineobj); i++) {
|
|
|
|
Py_UCS4 ch = PyUnicode_READ(kind, data, i);
|
|
|
|
if (ch != ' ' && ch != '\t' && ch != '\014')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i) {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *truncated;
|
2011-09-28 02:41:54 -03:00
|
|
|
truncated = PyUnicode_Substring(lineobj, i, PyUnicode_GET_LENGTH(lineobj));
|
2010-05-09 12:52:27 -03:00
|
|
|
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) {
|
2013-07-21 17:29:37 -03:00
|
|
|
if (indent < 10)
|
2010-05-09 12:52:27 -03:00
|
|
|
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:08:50 -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:08:50 -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 12:52:27 -03:00
|
|
|
if (filename == NULL || name == NULL)
|
|
|
|
return -1;
|
2010-06-17 20:08:50 -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 12:52:27 -03:00
|
|
|
if (err != 0)
|
|
|
|
return err;
|
2012-07-19 18:02:03 -03:00
|
|
|
/* ignore errors since we can't report them, can we? */
|
|
|
|
if (_Py_DisplaySourceLine(f, filename, lineno, 4))
|
|
|
|
PyErr_Clear();
|
|
|
|
return err;
|
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
|
|
|
}
|
|
|
|
|
2018-09-10 13:00:08 -03:00
|
|
|
static const int TB_RECURSIVE_CUTOFF = 3; // Also hardcoded in traceback.py.
|
|
|
|
|
2017-11-15 11:38:52 -04:00
|
|
|
static int
|
|
|
|
tb_print_line_repeated(PyObject *f, long cnt)
|
|
|
|
{
|
2018-09-10 13:00:08 -03:00
|
|
|
cnt -= TB_RECURSIVE_CUTOFF;
|
2017-11-15 11:38:52 -04:00
|
|
|
PyObject *line = PyUnicode_FromFormat(
|
2018-09-10 13:00:08 -03:00
|
|
|
(cnt > 1)
|
|
|
|
? " [Previous line repeated %ld more times]\n"
|
|
|
|
: " [Previous line repeated %ld more time]\n",
|
|
|
|
cnt);
|
2017-11-15 11:38:52 -04:00
|
|
|
if (line == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
2018-09-10 13:00:08 -03:00
|
|
|
int err = PyFile_WriteObject(line, f, Py_PRINT_RAW);
|
2017-11-15 11:38:52 -04:00
|
|
|
Py_DECREF(line);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
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 12:52:27 -03:00
|
|
|
int err = 0;
|
2017-11-15 11:38:52 -04:00
|
|
|
Py_ssize_t depth = 0;
|
2016-08-15 00:11:34 -03:00
|
|
|
PyObject *last_file = NULL;
|
|
|
|
int last_line = -1;
|
|
|
|
PyObject *last_name = NULL;
|
|
|
|
long cnt = 0;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyTracebackObject *tb1 = tb;
|
|
|
|
while (tb1 != NULL) {
|
|
|
|
depth++;
|
|
|
|
tb1 = tb1->tb_next;
|
|
|
|
}
|
2017-11-15 11:38:52 -04:00
|
|
|
while (tb != NULL && depth > limit) {
|
|
|
|
depth--;
|
|
|
|
tb = tb->tb_next;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
while (tb != NULL && err == 0) {
|
2018-09-10 13:00:08 -03:00
|
|
|
if (last_file == NULL ||
|
|
|
|
tb->tb_frame->f_code->co_filename != last_file ||
|
|
|
|
last_line == -1 || tb->tb_lineno != last_line ||
|
|
|
|
last_name == NULL || tb->tb_frame->f_code->co_name != last_name) {
|
|
|
|
if (cnt > TB_RECURSIVE_CUTOFF) {
|
2017-11-15 11:38:52 -04:00
|
|
|
err = tb_print_line_repeated(f, cnt);
|
|
|
|
}
|
|
|
|
last_file = tb->tb_frame->f_code->co_filename;
|
|
|
|
last_line = tb->tb_lineno;
|
|
|
|
last_name = tb->tb_frame->f_code->co_name;
|
|
|
|
cnt = 0;
|
|
|
|
}
|
2018-09-10 13:00:08 -03:00
|
|
|
cnt++;
|
|
|
|
if (err == 0 && cnt <= TB_RECURSIVE_CUTOFF) {
|
2017-11-15 11:38:52 -04:00
|
|
|
err = tb_displayline(f,
|
|
|
|
tb->tb_frame->f_code->co_filename,
|
|
|
|
tb->tb_lineno,
|
|
|
|
tb->tb_frame->f_code->co_name);
|
|
|
|
if (err == 0) {
|
|
|
|
err = PyErr_CheckSignals();
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
tb = tb->tb_next;
|
|
|
|
}
|
2018-09-10 13:00:08 -03:00
|
|
|
if (err == 0 && cnt > TB_RECURSIVE_CUTOFF) {
|
2017-11-15 11:38:52 -04:00
|
|
|
err = tb_print_line_repeated(f, cnt);
|
2016-08-15 00:11:34 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -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
|
|
|
{
|
2010-05-09 12:52:27 -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");
|
2017-11-15 11:38:52 -04:00
|
|
|
if (limitv && PyLong_Check(limitv)) {
|
|
|
|
int overflow;
|
|
|
|
limit = PyLong_AsLongAndOverflow(limitv, &overflow);
|
|
|
|
if (overflow > 0) {
|
|
|
|
limit = LONG_MAX;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
else if (limit <= 0) {
|
2017-11-15 11:38:52 -04:00
|
|
|
return 0;
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
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
|
|
|
}
|
2011-03-30 20:31:06 -03:00
|
|
|
|
|
|
|
/* Reverse a string. For example, "abcd" becomes "dcba".
|
|
|
|
|
|
|
|
This function is signal safe. */
|
|
|
|
|
2016-03-15 17:49:37 -03:00
|
|
|
void
|
|
|
|
_Py_DumpDecimal(int fd, unsigned long value)
|
2011-03-30 20:31:06 -03:00
|
|
|
{
|
2016-03-15 17:49:37 -03:00
|
|
|
/* maximum number of characters required for output of %lld or %p.
|
|
|
|
We need at most ceil(log10(256)*SIZEOF_LONG_LONG) digits,
|
|
|
|
plus 1 for the null byte. 53/22 is an upper bound for log10(256). */
|
|
|
|
char buffer[1 + (sizeof(unsigned long)*53-1) / 22 + 1];
|
|
|
|
char *ptr, *end;
|
|
|
|
|
|
|
|
end = &buffer[Py_ARRAY_LENGTH(buffer) - 1];
|
|
|
|
ptr = end;
|
|
|
|
*ptr = '\0';
|
2011-03-30 20:31:06 -03:00
|
|
|
do {
|
2016-03-15 17:49:37 -03:00
|
|
|
--ptr;
|
|
|
|
assert(ptr >= buffer);
|
|
|
|
*ptr = '0' + (value % 10);
|
2011-03-30 20:31:06 -03:00
|
|
|
value /= 10;
|
|
|
|
} while (value);
|
2016-03-15 17:49:37 -03:00
|
|
|
|
|
|
|
_Py_write_noraise(fd, ptr, end - ptr);
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
|
|
|
|
2013-10-20 22:21:02 -03:00
|
|
|
/* Format an integer in range [0; 0xffffffff] to hexadecimal of 'width' digits,
|
2011-03-30 20:31:06 -03:00
|
|
|
and write it into the file fd.
|
|
|
|
|
|
|
|
This function is signal safe. */
|
|
|
|
|
2016-03-23 06:32:26 -03:00
|
|
|
void
|
|
|
|
_Py_DumpHexadecimal(int fd, unsigned long value, Py_ssize_t width)
|
2011-03-30 20:31:06 -03:00
|
|
|
{
|
2016-03-16 05:43:14 -03:00
|
|
|
char buffer[sizeof(unsigned long) * 2 + 1], *ptr, *end;
|
|
|
|
const Py_ssize_t size = Py_ARRAY_LENGTH(buffer) - 1;
|
2016-03-15 17:49:37 -03:00
|
|
|
|
|
|
|
if (width > size)
|
|
|
|
width = size;
|
2016-03-23 06:32:26 -03:00
|
|
|
/* it's ok if width is negative */
|
2016-03-15 17:49:37 -03:00
|
|
|
|
2016-03-16 05:43:14 -03:00
|
|
|
end = &buffer[size];
|
2016-03-15 17:49:37 -03:00
|
|
|
ptr = end;
|
|
|
|
*ptr = '\0';
|
2011-03-30 20:31:06 -03:00
|
|
|
do {
|
2016-03-15 17:49:37 -03:00
|
|
|
--ptr;
|
|
|
|
assert(ptr >= buffer);
|
|
|
|
*ptr = Py_hexdigits[value & 15];
|
2011-03-30 20:31:06 -03:00
|
|
|
value >>= 4;
|
2016-03-15 17:49:37 -03:00
|
|
|
} while ((end - ptr) < width || value);
|
2011-03-30 20:31:06 -03:00
|
|
|
|
2016-03-15 17:49:37 -03:00
|
|
|
_Py_write_noraise(fd, ptr, end - ptr);
|
|
|
|
}
|
2011-03-30 20:31:06 -03:00
|
|
|
|
2016-03-15 17:49:37 -03:00
|
|
|
void
|
|
|
|
_Py_DumpASCII(int fd, PyObject *text)
|
2011-03-30 20:31:06 -03:00
|
|
|
{
|
2011-09-28 02:41:54 -03:00
|
|
|
PyASCIIObject *ascii = (PyASCIIObject *)text;
|
2011-03-30 20:31:06 -03:00
|
|
|
Py_ssize_t i, size;
|
|
|
|
int truncated;
|
2011-09-28 02:41:54 -03:00
|
|
|
int kind;
|
2011-10-05 17:44:12 -03:00
|
|
|
void *data = NULL;
|
|
|
|
wchar_t *wstr = NULL;
|
2011-09-28 02:41:54 -03:00
|
|
|
Py_UCS4 ch;
|
|
|
|
|
2016-03-15 17:49:37 -03:00
|
|
|
if (!PyUnicode_Check(text))
|
|
|
|
return;
|
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
size = ascii->length;
|
|
|
|
kind = ascii->state.kind;
|
2016-03-23 12:10:07 -03:00
|
|
|
if (kind == PyUnicode_WCHAR_KIND) {
|
|
|
|
wstr = ((PyASCIIObject *)text)->wstr;
|
|
|
|
if (wstr == NULL)
|
|
|
|
return;
|
|
|
|
size = ((PyCompactUnicodeObject *)text)->wstr_length;
|
|
|
|
}
|
|
|
|
else if (ascii->state.compact) {
|
2011-09-28 02:41:54 -03:00
|
|
|
if (ascii->state.ascii)
|
|
|
|
data = ((PyASCIIObject*)text) + 1;
|
|
|
|
else
|
|
|
|
data = ((PyCompactUnicodeObject*)text) + 1;
|
|
|
|
}
|
2016-03-23 12:10:07 -03:00
|
|
|
else {
|
2011-09-28 02:41:54 -03:00
|
|
|
data = ((PyUnicodeObject *)text)->data.any;
|
|
|
|
if (data == NULL)
|
|
|
|
return;
|
|
|
|
}
|
2011-03-30 20:31:06 -03:00
|
|
|
|
|
|
|
if (MAX_STRING_LENGTH < size) {
|
|
|
|
size = MAX_STRING_LENGTH;
|
|
|
|
truncated = 1;
|
|
|
|
}
|
2016-03-15 17:49:37 -03:00
|
|
|
else {
|
2011-03-30 20:31:06 -03:00
|
|
|
truncated = 0;
|
2016-03-15 17:49:37 -03:00
|
|
|
}
|
2011-03-30 20:31:06 -03:00
|
|
|
|
2011-09-28 02:41:54 -03:00
|
|
|
for (i=0; i < size; i++) {
|
2011-10-05 17:44:12 -03:00
|
|
|
if (kind != PyUnicode_WCHAR_KIND)
|
|
|
|
ch = PyUnicode_READ(kind, data, i);
|
|
|
|
else
|
|
|
|
ch = wstr[i];
|
2014-10-03 09:18:09 -03:00
|
|
|
if (' ' <= ch && ch <= 126) {
|
|
|
|
/* printable ASCII character */
|
2011-09-28 02:41:54 -03:00
|
|
|
char c = (char)ch;
|
2015-04-01 13:38:01 -03:00
|
|
|
_Py_write_noraise(fd, &c, 1);
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
2014-10-03 09:18:09 -03:00
|
|
|
else if (ch <= 0xff) {
|
2011-03-30 20:31:06 -03:00
|
|
|
PUTS(fd, "\\x");
|
2016-03-23 06:32:26 -03:00
|
|
|
_Py_DumpHexadecimal(fd, ch, 2);
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
2014-10-03 09:18:09 -03:00
|
|
|
else if (ch <= 0xffff) {
|
2011-03-30 20:31:06 -03:00
|
|
|
PUTS(fd, "\\u");
|
2016-03-23 06:32:26 -03:00
|
|
|
_Py_DumpHexadecimal(fd, ch, 4);
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
PUTS(fd, "\\U");
|
2016-03-23 06:32:26 -03:00
|
|
|
_Py_DumpHexadecimal(fd, ch, 8);
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
|
|
|
}
|
2016-03-15 17:49:37 -03:00
|
|
|
if (truncated) {
|
2011-03-30 20:31:06 -03:00
|
|
|
PUTS(fd, "...");
|
2016-03-15 17:49:37 -03:00
|
|
|
}
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write a frame into the file fd: "File "xxx", line xxx in xxx".
|
|
|
|
|
|
|
|
This function is signal safe. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
dump_frame(int fd, PyFrameObject *frame)
|
|
|
|
{
|
|
|
|
PyCodeObject *code;
|
|
|
|
int lineno;
|
|
|
|
|
|
|
|
code = frame->f_code;
|
|
|
|
PUTS(fd, " File ");
|
|
|
|
if (code != NULL && code->co_filename != NULL
|
|
|
|
&& PyUnicode_Check(code->co_filename))
|
|
|
|
{
|
2015-04-01 13:38:01 -03:00
|
|
|
PUTS(fd, "\"");
|
2016-03-15 17:49:37 -03:00
|
|
|
_Py_DumpASCII(fd, code->co_filename);
|
2015-04-01 13:38:01 -03:00
|
|
|
PUTS(fd, "\"");
|
2011-03-30 20:31:06 -03:00
|
|
|
} else {
|
|
|
|
PUTS(fd, "???");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PyFrame_GetLineNumber() was introduced in Python 2.7.0 and 3.2.0 */
|
2011-09-28 02:41:54 -03:00
|
|
|
lineno = PyCode_Addr2Line(code, frame->f_lasti);
|
2011-03-30 20:31:06 -03:00
|
|
|
PUTS(fd, ", line ");
|
2016-03-15 17:49:37 -03:00
|
|
|
if (lineno >= 0) {
|
|
|
|
_Py_DumpDecimal(fd, (unsigned long)lineno);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PUTS(fd, "???");
|
|
|
|
}
|
2011-03-30 20:31:06 -03:00
|
|
|
PUTS(fd, " in ");
|
|
|
|
|
|
|
|
if (code != NULL && code->co_name != NULL
|
2016-03-15 17:49:37 -03:00
|
|
|
&& PyUnicode_Check(code->co_name)) {
|
|
|
|
_Py_DumpASCII(fd, code->co_name);
|
|
|
|
}
|
|
|
|
else {
|
2011-03-30 20:31:06 -03:00
|
|
|
PUTS(fd, "???");
|
2016-03-15 17:49:37 -03:00
|
|
|
}
|
2011-03-30 20:31:06 -03:00
|
|
|
|
2015-04-01 13:38:01 -03:00
|
|
|
PUTS(fd, "\n");
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
|
|
|
|
2011-04-01 10:34:01 -03:00
|
|
|
static void
|
2011-03-30 20:31:06 -03:00
|
|
|
dump_traceback(int fd, PyThreadState *tstate, int write_header)
|
|
|
|
{
|
|
|
|
PyFrameObject *frame;
|
|
|
|
unsigned int depth;
|
|
|
|
|
2011-04-01 10:34:01 -03:00
|
|
|
if (write_header)
|
2013-10-20 22:21:02 -03:00
|
|
|
PUTS(fd, "Stack (most recent call first):\n");
|
2011-04-01 10:34:01 -03:00
|
|
|
|
2011-03-30 20:31:06 -03:00
|
|
|
frame = _PyThreadState_GetFrame(tstate);
|
|
|
|
if (frame == NULL)
|
2011-04-01 10:34:01 -03:00
|
|
|
return;
|
2011-03-30 20:31:06 -03:00
|
|
|
|
|
|
|
depth = 0;
|
|
|
|
while (frame != NULL) {
|
|
|
|
if (MAX_FRAME_DEPTH <= depth) {
|
|
|
|
PUTS(fd, " ...\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!PyFrame_Check(frame))
|
|
|
|
break;
|
|
|
|
dump_frame(fd, frame);
|
|
|
|
frame = frame->f_back;
|
|
|
|
depth++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-01 13:38:01 -03:00
|
|
|
/* Dump the traceback of a Python thread into fd. Use write() to write the
|
|
|
|
traceback and retry if write() is interrupted by a signal (failed with
|
|
|
|
EINTR), but don't call the Python signal handler.
|
|
|
|
|
|
|
|
The caller is responsible to call PyErr_CheckSignals() to call Python signal
|
|
|
|
handlers if signals were received. */
|
2011-04-01 10:34:01 -03:00
|
|
|
void
|
2011-03-30 20:31:06 -03:00
|
|
|
_Py_DumpTraceback(int fd, PyThreadState *tstate)
|
|
|
|
{
|
2011-04-01 10:34:01 -03:00
|
|
|
dump_traceback(fd, tstate, 1);
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write the thread identifier into the file 'fd': "Current thread 0xHHHH:\" if
|
|
|
|
is_current is true, "Thread 0xHHHH:\n" otherwise.
|
|
|
|
|
|
|
|
This function is signal safe. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
write_thread_id(int fd, PyThreadState *tstate, int is_current)
|
|
|
|
{
|
|
|
|
if (is_current)
|
|
|
|
PUTS(fd, "Current thread 0x");
|
|
|
|
else
|
|
|
|
PUTS(fd, "Thread 0x");
|
2016-03-23 06:32:26 -03:00
|
|
|
_Py_DumpHexadecimal(fd,
|
2017-03-23 10:48:39 -03:00
|
|
|
tstate->thread_id,
|
2016-03-23 06:32:26 -03:00
|
|
|
sizeof(unsigned long) * 2);
|
2013-10-20 22:21:02 -03:00
|
|
|
PUTS(fd, " (most recent call first):\n");
|
2011-03-30 20:31:06 -03:00
|
|
|
}
|
|
|
|
|
2015-04-01 13:38:01 -03:00
|
|
|
/* Dump the traceback of all Python threads into fd. Use write() to write the
|
|
|
|
traceback and retry if write() is interrupted by a signal (failed with
|
|
|
|
EINTR), but don't call the Python signal handler.
|
|
|
|
|
|
|
|
The caller is responsible to call PyErr_CheckSignals() to call Python signal
|
|
|
|
handlers if signals were received. */
|
2011-03-30 20:31:06 -03:00
|
|
|
const char*
|
|
|
|
_Py_DumpTracebackThreads(int fd, PyInterpreterState *interp,
|
2016-03-16 18:45:24 -03:00
|
|
|
PyThreadState *current_tstate)
|
2011-03-30 20:31:06 -03:00
|
|
|
{
|
|
|
|
PyThreadState *tstate;
|
|
|
|
unsigned int nthreads;
|
|
|
|
|
2016-03-16 18:45:24 -03:00
|
|
|
if (current_tstate == NULL) {
|
|
|
|
/* _Py_DumpTracebackThreads() is called from signal handlers by
|
|
|
|
faulthandler.
|
|
|
|
|
|
|
|
SIGSEGV, SIGFPE, SIGABRT, SIGBUS and SIGILL are synchronous signals
|
|
|
|
and are thus delivered to the thread that caused the fault. Get the
|
|
|
|
Python thread state of the current thread.
|
|
|
|
|
|
|
|
PyThreadState_Get() doesn't give the state of the thread that caused
|
|
|
|
the fault if the thread released the GIL, and so this function
|
2017-10-06 07:41:34 -03:00
|
|
|
cannot be used. Read the thread specific storage (TSS) instead: call
|
2016-03-16 18:45:24 -03:00
|
|
|
PyGILState_GetThisThreadState(). */
|
|
|
|
current_tstate = PyGILState_GetThisThreadState();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (interp == NULL) {
|
|
|
|
if (current_tstate == NULL) {
|
|
|
|
interp = _PyGILState_GetInterpreterStateUnsafe();
|
|
|
|
if (interp == NULL) {
|
|
|
|
/* We need the interpreter state to get Python threads */
|
|
|
|
return "unable to get the interpreter state";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
interp = current_tstate->interp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert(interp != NULL);
|
|
|
|
|
2011-03-30 20:31:06 -03:00
|
|
|
/* Get the current interpreter from the current thread */
|
|
|
|
tstate = PyInterpreterState_ThreadHead(interp);
|
|
|
|
if (tstate == NULL)
|
|
|
|
return "unable to get the thread head state";
|
|
|
|
|
|
|
|
/* Dump the traceback of each thread */
|
|
|
|
tstate = PyInterpreterState_ThreadHead(interp);
|
|
|
|
nthreads = 0;
|
2015-04-12 01:26:27 -03:00
|
|
|
_Py_BEGIN_SUPPRESS_IPH
|
2011-03-30 20:31:06 -03:00
|
|
|
do
|
|
|
|
{
|
|
|
|
if (nthreads != 0)
|
2015-04-01 13:38:01 -03:00
|
|
|
PUTS(fd, "\n");
|
2011-03-30 20:31:06 -03:00
|
|
|
if (nthreads >= MAX_NTHREADS) {
|
|
|
|
PUTS(fd, "...\n");
|
|
|
|
break;
|
|
|
|
}
|
2016-03-16 18:45:24 -03:00
|
|
|
write_thread_id(fd, tstate, tstate == current_tstate);
|
2011-03-30 20:31:06 -03:00
|
|
|
dump_traceback(fd, tstate, 0);
|
|
|
|
tstate = PyThreadState_Next(tstate);
|
|
|
|
nthreads++;
|
|
|
|
} while (tstate != NULL);
|
2015-04-12 01:26:27 -03:00
|
|
|
_Py_END_SUPPRESS_IPH
|
2011-03-30 20:31:06 -03:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|