Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Synchronize with PyXML 1.79: 

73: Restore support for Python 2.1.
74: Factor the previous change differently
79: Conditionalize usage of PyTuple_Pack.
This commit is contained in:
Martin v. Löwis 2004-10-13 19:50:11 +00:00
parent 3e73a011d9
commit 9171f02132
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/pyexpat.c
View File

@ -338,7 +338,11 @@ trace_frame_exc(PyThreadState *tstate, PyFrameObject *f)
value = Py_None;
Py_INCREF(value);
}
#if PY_VERSION_HEX < 0x02040000
arg = Py_BuildValue("(OOO)", type, value, traceback);
#else
arg = PyTuple_Pack(3, type, value, traceback);
#endif
if (arg == NULL) {
PyErr_Restore(type, value, traceback);
return 0;
@ -936,7 +940,12 @@ readinst(char *buf, int buf_size, PyObject *meth)
PyTuple_SET_ITEM(arg, 0, bytes);
if ((str = PyObject_Call(meth, arg, NULL)) == NULL)
#if PY_VERSION_HEX < 0x02020000
str = PyObject_CallObject(meth, arg);
#else
str = PyObject_Call(meth, arg, NULL);
#endif
if (str == NULL)
goto finally;
/* XXX what to do if it returns a Unicode string? */