Skip to content

Fix cpython bindings for python 3.10+ Py_ssize_t #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtburns-jpl merged 1 commit into from
Jan 4, 2023
Merged

Fix cpython bindings for python 3.10+ Py_ssize_t #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions components/isceobj/Util/denseoffsets/bindings/denseoffsetsmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@




#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "denseoffsetsmodule.h"
#include <cmath>
Expand Down Expand Up @@ -232,11 +232,12 @@ PyObject * setScaleFactorY_C(PyObject* self, PyObject* args)
PyObject * setDebugFlag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setDebugFlag_f(var,&varInt);
return Py_BuildValue("i", 0);
}
Expand Down
7 changes: 4 additions & 3 deletions components/isceobj/Util/estimateoffsets/bindings/estimateoffsetsmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@




#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "estimateoffsetsmodule.h"
#include <cmath>
Expand Down Expand Up @@ -433,11 +433,12 @@ PyObject * setSecondPRF_C(PyObject* self, PyObject* args)
PyObject * setDebugFlag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setDebugFlag_f(var,&varInt);
return Py_BuildValue("i", 0);
}
Expand Down
30 changes: 15 additions & 15 deletions components/iscesys/StdOE/bindings/StdOEmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "StdOE.h"
#include "StdOEmodule.h"
Expand Down Expand Up @@ -53,7 +53,7 @@ PyInit_StdOE()
PyObject * setStdErr_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -65,7 +65,7 @@ PyObject * setStdErr_C(PyObject* self, PyObject* args)
PyObject * setStdErrFileTag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -77,7 +77,7 @@ PyObject * setStdErrFileTag_C(PyObject* self, PyObject* args)
PyObject * setStdOutFileTag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -89,7 +89,7 @@ PyObject * setStdOutFileTag_C(PyObject* self, PyObject* args)
PyObject * setStdLogFileTag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -101,7 +101,7 @@ PyObject * setStdLogFileTag_C(PyObject* self, PyObject* args)
PyObject * setStdErrFile_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -113,7 +113,7 @@ PyObject * setStdErrFile_C(PyObject* self, PyObject* args)
PyObject * setStdOut_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -125,7 +125,7 @@ PyObject * setStdOut_C(PyObject* self, PyObject* args)
PyObject * setStdLogFile_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -137,7 +137,7 @@ PyObject * setStdLogFile_C(PyObject* self, PyObject* args)
PyObject * setStdOutFile_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -161,7 +161,7 @@ PyObject * getStdErr_C(PyObject* self, PyObject* args)
PyObject * writeStd_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -173,7 +173,7 @@ PyObject * writeStd_C(PyObject* self, PyObject* args)
PyObject * writeStdLog_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -185,7 +185,7 @@ PyObject * writeStdLog_C(PyObject* self, PyObject* args)
PyObject * writeStdOut_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -197,7 +197,7 @@ PyObject * writeStdOut_C(PyObject* self, PyObject* args)
PyObject * writeStdErr_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
{
return NULL;
Expand All @@ -209,9 +209,9 @@ PyObject * writeStdErr_C(PyObject* self, PyObject* args)
PyObject * writeStdFile_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
Py_ssize_t varInt;
char * var1;
int varInt1;
Py_ssize_t varInt1;
if(!PyArg_ParseTuple(args, "s#s#", &var ,&varInt,&var1,&varInt1))
{
return NULL;
Expand Down
9 changes: 5 additions & 4 deletions components/mroipac/ampcor/bindings/ampcormodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "ampcormodule.h"
#include <cmath>
Expand Down Expand Up @@ -44,12 +45,12 @@ PyInit_ampcor()
PyObject* setImageDatatype1_C(PyObject* self, PyObject* args)
{
char* type;
int len;
Py_ssize_t len;
if( !PyArg_ParseTuple(args,"s#",&type,&len) )
{
return NULL;
}
setImageDatatype1_f(type,len);
setImageDatatype1_f(type, Py_SAFE_DOWNCAST(len, Py_ssize_t, int));
return Py_BuildValue("i",0);
}

Expand Down Expand Up @@ -79,12 +80,12 @@ PyObject* setImageLength1_C(PyObject* self, PyObject* args)
PyObject* setImageDatatype2_C(PyObject* self, PyObject* args)
{
char* type;
int len;
Py_ssize_t len;
if( !PyArg_ParseTuple(args,"s#",&type,&len) )
{
return NULL;
}
setImageDatatype2_f(type,len);
setImageDatatype2_f(type, Py_SAFE_DOWNCAST(len, Py_ssize_t, int));
return Py_BuildValue("i",0);
}

Expand Down
17 changes: 10 additions & 7 deletions components/stdproc/stdproc/estamb/bindings/estambmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@




#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "estambmodule.h"
#include <cmath>
Expand Down Expand Up @@ -531,33 +531,36 @@ PyObject * setTransDat_C(PyObject* self, PyObject* args)
PyObject * setIQFlip_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setIQFlip_f(var,&varInt);
return Py_BuildValue("i", 0);
}
PyObject * setDeskewFlag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setDeskewFlag_f(var,&varInt);
return Py_BuildValue("i", 0);
}
PyObject * setSecondaryRangeMigrationFlag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setSecondaryRangeMigrationFlag_f(var,&varInt);
return Py_BuildValue("i", 0);
}
Expand Down
17 changes: 10 additions & 7 deletions components/stdproc/stdproc/formslc/bindings/formslcmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@




#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "formslcmodule.h"
#include <cmath>
Expand Down Expand Up @@ -561,35 +561,38 @@ PyObject * setTransDat_C(PyObject* self, PyObject* args)
PyObject * setIQFlip_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setIQFlip_f(var,&varInt);
return Py_BuildValue("i", 0);
}

PyObject * setDeskewFlag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setDeskewFlag_f(var,&varInt);
return Py_BuildValue("i", 0);
}

PyObject * setSecondaryRangeMigrationFlag_C(PyObject* self, PyObject* args)
{
char * var;
int varInt;
if(!PyArg_ParseTuple(args, "s#", &var ,&varInt))
Py_ssize_t varSize;
if(!PyArg_ParseTuple(args, "s#", &var, &varSize))
{
return NULL;
}
int varInt = Py_SAFE_DOWNCAST(varSize, Py_ssize_t, int);
setSecondaryRangeMigrationFlag_f(var,&varInt);
return Py_BuildValue("i", 0);
}
Expand Down
7 changes: 4 additions & 3 deletions contrib/demUtils/correct_geoid_i2_srtm/bindings/correct_geoid_i2_srtmmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@




#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "correct_geoid_i2_srtmmodule.h"
#include <cmath>
Expand Down Expand Up @@ -172,12 +172,13 @@ PyObject * setConversionType_C(PyObject* self, PyObject* args)
PyObject * setGeoidFilename_C(PyObject* self, PyObject* args)
{
char * varChar;
int var;
Py_ssize_t var;
if(!PyArg_ParseTuple(args, "s#", &varChar ,&var))
{
return NULL;
}
setGeoidFilename_f(varChar,&var);
int ivar = Py_SAFE_DOWNCAST(var, Py_ssize_t, int);
setGeoidFilename_f(varChar, &ivar);
return Py_BuildValue("i", 0);
}

Expand Down