Synchronize with PyXML 1.79:

73: Restore support for Python 2.1.
74: Factor the previous change differently
79: Conditionalize usage of PyTuple_Pack.

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index d5929b699655c417ec100b284beee391023d4b96..d359a7405c2fb813c5be80ad538394321f0247b2 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -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? */