X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEM_Swig%2FParaMEDMEM.typemap;h=fa2a0ed98e312e5a855998368be84d836b5e5b89;hb=96d93eee4d12f6a31e6d48da5dd31f70fdac222c;hp=835475b5d1770f26603fdc540213758483457fb9;hpb=378cb2ebe08f8f4543ef632b2bd5f77fe180f978;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEM_Swig/ParaMEDMEM.typemap b/src/ParaMEDMEM_Swig/ParaMEDMEM.typemap old mode 100755 new mode 100644 index 835475b5d..fa2a0ed98 --- a/src/ParaMEDMEM_Swig/ParaMEDMEM.typemap +++ b/src/ParaMEDMEM_Swig/ParaMEDMEM.typemap @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -34,12 +34,17 @@ char** aStrs = (char **) malloc((aSize+1)*sizeof(char *)); for (i = 0; i < aSize; i++) { PyObject *s = PyList_GetItem($input,i); - if (!PyString_Check(s)) { + if (PyString_Check(s)) + aStrs[i] = PyString_AsString(s); +%#if PY_VERSION_HEX >= 0x03000000 + else if (PyUnicode_Check(s)) + aStrs[i] = PyUnicode_AsUTF8(s); +%#endif + else { free(aStrs); PyErr_SetString(PyExc_ValueError, "List items must be strings"); return NULL; } - aStrs[i] = PyString_AsString(s); } aStrs[i] = 0; $2 = &aStrs;