Changeset 19895 for issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp

Timestamp:

12/16/15 05:39:20 (9 years ago)

Author:

bdef

Message:

NEW:Adding directory to hold the python 3 implementation of the interface

File:

• issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp (modified) (5 diffs)

issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp ¶

@@ -24 +24 @@
         if      (PyFloat_Check(py_float))
                 dscalar=PyFloat_AsDouble(py_float);
-        else if (PyInt_Check(py_float))
-                dscalar=(double)PyInt_AsLong(py_float);
+        else if (PyLong_Check(py_float))
+                dscalar=(double)PyLong_AsLong(py_float);
         else if (PyLong_Check(py_float))
                 dscalar=PyLong_AsDouble(py_float);
@@ -47 +47 @@
 
         /*return internal value: */
-        if      (PyInt_Check(py_long))
-                iscalar=(int)PyInt_AsLong(py_long);
+        if      (PyLong_Check(py_long))
+                iscalar=(int)PyLong_AsLong(py_long);
         else if (PyLong_Check(py_long))
                 iscalar=(int)PyLong_AsLong(py_long);
@@ -74 +74 @@
         if      (PyBool_Check(py_boolean))
                 bscalar=(bool)PyLong_AsLong(py_boolean);
-        else if (PyInt_Check(py_boolean))
-                bscalar=(bool)PyInt_AsLong(py_boolean);
+        else if (PyLong_Check(py_boolean))
+                bscalar=(bool)PyLong_AsLong(py_boolean);
         else if (PyLong_Check(py_boolean))
                 bscalar=(bool)PyLong_AsLong(py_boolean);
@@ -724 +724 @@
         /*Fetch all options*/
         for (int i=istart; i<nrhs; i=i+2){
-                if (!PyString_Check(PyTuple_GetItem(py_tuple,(Py_ssize_t)i))) _error_("Argument " << i+1 << " must be name of option");
+                if (!PyUnicode_Check(PyTuple_GetItem(py_tuple,(Py_ssize_t)i))) _error_("Argument " << i+1 << " must be name of option");
 
                 FetchData(&name,PyTuple_GetItem(py_tuple,(Py_ssize_t)i));
@@ -750 +750 @@
         PyObject        *py_item     = NULL;
 
-        if (PyString_Check(py_list)){
+        if (PyUnicode_Check(py_list)){
                 FetchData(&contourname,py_list);
                 contours=ExpRead<double>(contourname);