add support for 'old' tuple output
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8583 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
c716bf093e
commit
5a42618968
1 changed files with 24 additions and 0 deletions
|
|
@ -130,6 +130,7 @@ SWIG_Py_Void(void)
|
|||
|
||||
SWIGINTERN PyObject*
|
||||
SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
|
||||
#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
|
||||
if (!result) {
|
||||
result = obj;
|
||||
} else if (result == Py_None) {
|
||||
|
|
@ -145,6 +146,29 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
|
|||
Py_DECREF(obj);
|
||||
}
|
||||
return result;
|
||||
#else
|
||||
PyObject* o2;
|
||||
PyObject* o3;
|
||||
if (!result) {
|
||||
result = obj;
|
||||
} else if (result == Py_None) {
|
||||
Py_DECREF(result);
|
||||
result = obj;
|
||||
} else {
|
||||
if (!PyTuple_Check(result)) {
|
||||
o2 = result;
|
||||
result = PyTuple_New(1);
|
||||
PyTuple_SET_ITEM(result, 0, o2);
|
||||
}
|
||||
o3 = PyTuple_New(1);
|
||||
PyTuple_SET_ITEM(o3, 0, obj);
|
||||
o2 = result;
|
||||
result = PySequence_Concat(o2, o3);
|
||||
Py_DECREF(o2);
|
||||
Py_DECREF(o3);
|
||||
}
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
|
||||
SWIGINTERN int
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue