diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2004-10-13 19:50:11 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2004-10-13 19:50:11 (GMT) |
| commit | 9171f0213247c51229cbdfcf06df36378558c96e (patch) | |
| tree | b2ea7693afdb6c7058a2ec547145a70ee69df66a /Modules | |
| parent | 3e73a011d9c04b3460c05c2d026d2d8964b79cf3 (diff) | |
| download | cpython-9171f0213247c51229cbdfcf06df36378558c96e.zip cpython-9171f0213247c51229cbdfcf06df36378558c96e.tar.gz cpython-9171f0213247c51229cbdfcf06df36378558c96e.tar.bz2 | |
Synchronize with PyXML 1.79:
73: Restore support for Python 2.1.
74: Factor the previous change differently
79: Conditionalize usage of PyTuple_Pack.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/pyexpat.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index d5929b6..d359a74 100644 --- 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? */ |