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

41
Doc/Manual/Varargs.html
View file

@ -461,23 +461,36 @@ like this:
<div class="code"> <div class="code">
<pre> <pre>
%typemap(in) (...)(char *args[10]) { %typemap(in) (...)(char *args[10]) {
int i; int i;
int argc; int argc;
for (i = 0; i &lt; 10; i++) args[i] = 0; for (i = 0; i &lt; 10; i++) args[i] = 0;
argc = PyTuple_Size(varargs); argc = PyTuple_Size(varargs);
if (argc &gt; 10) { if (argc &gt; 10) {
PyErr_SetString(PyExc_ValueError,"Too many arguments"); PyErr_SetString(PyExc_ValueError, "Too many arguments");
return NULL;
}
for (i = 0; i &lt; argc; i++) {
PyObject *pyobj = PyTuple_GetItem(varargs, i);
char *str = 0;
%#if PY_VERSION_HEX&gt;=0x03000000
PyObject *pystr;
if (!PyUnicode_Check(pyobj)) {
PyErr_SetString(PyExc_ValueError, "Expected a string");
return NULL; return NULL;
} }
for (i = 0; i &lt; argc; i++) { pystr = PyUnicode_AsUTF8String(pyobj);
PyObject *o = PyTuple_GetItem(varargs,i); str = PyBytes_AsString(pystr);
if (!PyString_Check(o)) { Py_XDECREF(pystr);
PyErr_SetString(PyExc_ValueError,"Expected a string"); %#else
return NULL; if (!PyString_Check(pyobj)) {
} PyErr_SetString(PyExc_ValueError, "Expected a string");
args[i] = PyString_AsString(o); return NULL;
} }
$1 = (void *) args; str = PyString_AsString(pyobj);
%#endif
args[i] = str;
}
$1 = (void *) args;
} }
</pre> </pre>
</div> </div>

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

@ -4,40 +4,61 @@
* 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;
}
for (i = 0; i < argc; i++) {
PyObject *pyobj = PyTuple_GetItem(varargs, i);
char *str = 0;
%#if PY_VERSION_HEX>=0x03000000
PyObject *pystr;
if (!PyUnicode_Check(pyobj)) {
PyErr_SetString(PyExc_ValueError, "Expected a string");
return NULL; return NULL;
} }
for (i = 0; i < argc; i++) { pystr = PyUnicode_AsUTF8String(pyobj);
PyObject *o = PyTuple_GetItem(varargs,i); str = PyBytes_AsString(pystr);
if (!PyString_Check(o)) { Py_XDECREF(pystr);
PyErr_SetString(PyExc_ValueError,"Expected a string"); %#else
return NULL; if (!PyString_Check(pyobj)) {
} PyErr_SetString(PyExc_ValueError, "Expected a string");
args[i] = PyString_AsString(o); return NULL;
} }
$1 = (void *) args; str = PyString_AsString(pyobj);
%#endif
args[i] = str;
}
$1 = (void *) args;
} }
%feature("action") testfunc { %feature("action") testfunc {
char **args = (char **) arg3; char **args = (char **) arg3;
result = testfunc(arg1, arg2, args[0], args[1], args[2], args[3], args[4], result = testfunc(arg1, arg2, args[0], args[1], args[2], args[3], args[4],
args[5],args[6],args[7],args[8],args[9], NULL); args[5],args[6],args[7],args[8],args[9], NULL);
} }
%inline { %inline {
char* testfunc (int arg1, double arg2, ...) char* testfunc (int arg1, double arg2, ...)
{ {
va_list ap; va_list ap;
char *c; char *c;
va_start(ap, arg2); va_start(ap, arg2);
c = va_arg(ap, char*); c = va_arg(ap, char*);
va_end(ap); va_end(ap);
return c; return c;
} }
} }
%inline %{
char *doublecheck(char *inputval) { return inputval; }
%}