Commit e51c7e4a authored by Tim Peters's avatar Tim Peters

Removed two pointless and obfuscating macros.

parent 13a31390
...@@ -42,10 +42,7 @@ tb_dealloc(tracebackobject *tb) ...@@ -42,10 +42,7 @@ tb_dealloc(tracebackobject *tb)
Py_TRASHCAN_SAFE_END(tb) Py_TRASHCAN_SAFE_END(tb)
} }
#define Tracebacktype PyTraceBack_Type PyTypeObject PyTraceBack_Type = {
#define is_tracebackobject PyTraceBack_Check
PyTypeObject Tracebacktype = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(&PyType_Type)
0, 0,
"traceback", "traceback",
...@@ -67,12 +64,12 @@ newtracebackobject(tracebackobject *next, PyFrameObject *frame, int lasti, ...@@ -67,12 +64,12 @@ newtracebackobject(tracebackobject *next, PyFrameObject *frame, int lasti,
int lineno) int lineno)
{ {
tracebackobject *tb; tracebackobject *tb;
if ((next != NULL && !is_tracebackobject(next)) || if ((next != NULL && !PyTraceBack_Check(next)) ||
frame == NULL || !PyFrame_Check(frame)) { frame == NULL || !PyFrame_Check(frame)) {
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return NULL; return NULL;
} }
tb = PyObject_NEW(tracebackobject, &Tracebacktype); tb = PyObject_NEW(tracebackobject, &PyTraceBack_Type);
if (tb != NULL) { if (tb != NULL) {
Py_XINCREF(next); Py_XINCREF(next);
tb->tb_next = next; tb->tb_next = next;
...@@ -223,7 +220,7 @@ PyTraceBack_Print(PyObject *v, PyObject *f) ...@@ -223,7 +220,7 @@ PyTraceBack_Print(PyObject *v, PyObject *f)
int limit = 1000; int limit = 1000;
if (v == NULL) if (v == NULL)
return 0; return 0;
if (!is_tracebackobject(v)) { if (!PyTraceBack_Check(v)) {
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment