jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Python 3.2 portability fixes

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12663 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-05-13 06:01:07 +00:00
commit d2dd14e628
2 changed files with 71 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Doc/Manual/Varargs.html
View file

@ -466,16 +466,29 @@ like this:
for (i = 0; i < 10; i++) args[i] = 0; for (i = 0; i < 10; i++) args[i] = 0;
argc = PyTuple_Size(varargs); argc = PyTuple_Size(varargs);
if (argc > 10) { if (argc > 10) {
PyErr_SetString(PyExc_ValueError,"Too many arguments"); PyErr_SetString(PyExc_ValueError, "Too many arguments");
return NULL; return NULL;
} }
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
PyObject *o = PyTuple_GetItem(varargs,i); PyObject *pyobj = PyTuple_GetItem(varargs, i);
if (!PyString_Check(o)) { char *str = 0;
PyErr_SetString(PyExc_ValueError,"Expected a string"); %#if PY_VERSION_HEX>=0x03000000
PyObject *pystr;
if (!PyUnicode_Check(pyobj)) {
PyErr_SetString(PyExc_ValueError, "Expected a string");
return NULL; return NULL;
} }
args[i] = PyString_AsString(o); pystr = PyUnicode_AsUTF8String(pyobj);
str = PyBytes_AsString(pystr);
Py_XDECREF(pystr);
%#else
if (!PyString_Check(pyobj)) {
PyErr_SetString(PyExc_ValueError, "Expected a string");
return NULL;
}
str = PyString_AsString(pyobj);
%#endif
args[i] = str;
} }
$1 = (void *) args; $1 = (void *) args;
} }

31
Examples/test-suite/python_varargs_typemap.i
View file

@ -4,22 +4,38 @@
* chapter of the SWIG manual. * chapter of the SWIG manual.
*/ */
%{
%}
%typemap(in) (...)(char *args[10]) { %typemap(in) (...)(char *args[10]) {
int i; int i;
int argc; int argc;
for (i = 0; i < 10; i++) args[i] = 0; for (i = 0; i < 10; i++) args[i] = 0;
argc = PyTuple_Size(varargs); argc = PyTuple_Size(varargs);
if (argc > 10) { if (argc > 10) {
PyErr_SetString(PyExc_ValueError,"Too many arguments"); PyErr_SetString(PyExc_ValueError, "Too many arguments");
return NULL; return NULL;
} }
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
PyObject *o = PyTuple_GetItem(varargs,i); PyObject *pyobj = PyTuple_GetItem(varargs, i);
if (!PyString_Check(o)) { char *str = 0;
PyErr_SetString(PyExc_ValueError,"Expected a string"); %#if PY_VERSION_HEX>=0x03000000
PyObject *pystr;
if (!PyUnicode_Check(pyobj)) {
PyErr_SetString(PyExc_ValueError, "Expected a string");
return NULL; return NULL;
} }
args[i] = PyString_AsString(o); pystr = PyUnicode_AsUTF8String(pyobj);
str = PyBytes_AsString(pystr);
Py_XDECREF(pystr);
%#else
if (!PyString_Check(pyobj)) {
PyErr_SetString(PyExc_ValueError, "Expected a string");
return NULL;
}
str = PyString_AsString(pyobj);
%#endif
args[i] = str;
} }
$1 = (void *) args; $1 = (void *) args;
} }
@ -41,3 +57,8 @@ char* testfunc (int arg1, double arg2, ...)
return c; return c;
} }
} }
%inline %{
char *doublecheck(char *inputval) { return inputval; }
%}