Merge pull request #417 from LLNL/bug-mcm86-05sep24-python-overwrite2

Fix for python 2 or python 3
LLNL · Sep 11, 2024 · 3c9c530 · 3c9c530
1 parent f9d5898
commit 3c9c530
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/tools/python/pydbfile.cpp b/tools/python/pydbfile.cpp
@@ -551,7 +551,7 @@ static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
         }
 
         PyObject *item = PySequence_GetItem(pydata, 0);
-        if (PyUnicode_Check(item) && PyUnicode_GET_SIZE(item)==1)
+        if (PyString_Check(item) && PyString_Size(item)==1)
             dtype = DB_CHAR;
         else if (PyInt_Check(item))
             dtype = DB_INT;
@@ -639,12 +639,12 @@ static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
             {
                 case DB_CHAR:
                 {
-                    if (!PyUnicode_Check(item) || PyUnicode_GET_SIZE(item)>1)
+                    if (!PyString_Check(item) || PyString_Size(item)>1)
                     {
                         PyErr_SetString(PyExc_TypeError, "Data is not a single DB_CHAR");
                         goto fail_exit;
                     }
-                    *p = *(PyUnicode_AS_DATA(item));
+                    *p = *(PyString_AsString(item));
                     break;
                 }
                 case DB_SHORT:
@@ -655,7 +655,7 @@ static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
                         goto fail_exit;
                     }
                     short *ps = (short*)p;
-                    *ps = (short) PyInt_AsLong(item);
+                    *ps = (short) PyLong_AsLong(item);
                     break;
                 }
                 case DB_INT:
@@ -666,7 +666,7 @@ static PyObject *DBfile_DBWrite(PyObject *self, PyObject *args)
                         goto fail_exit;
                     }
                     int *pi = (int*)p;
-                    *pi = (int) PyInt_AsLong(item);
+                    *pi = (int) PyLong_AsLong(item);
                     break;
                 }
                 case DB_LONG:

diff --git a/tools/python/pysilo.h b/tools/python/pysilo.h
@@ -92,13 +92,11 @@ void SiloErrorFunc(const char *errString);
     #define PyInt_FromLong PyLong_FromLong
     #define PyInt_AS_LONG PyLong_AS_LONG
     #define PyInt_Check PyLong_Check
-#endif
-
-#if PY_VERSION_GE(3,0,0)
     #define PyString_FromString PyUnicode_FromString
     #define PyString_Check PyUnicode_Check
     #define PyString_FromStringAndSize PyUnicode_FromStringAndSize
     #define PyString_AsString PyUnicode_AsUTF8
+    #define PyString_Size PyUnicode_GetLength
 #endif