Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace deprecated PyEval_CallObject with PyObject_CallObject

Browse Source
This commit is contained in:
Scott Talbert
2022-01-11 17:35:31 -05:00
parent 77fa6cf8cc
commit 6da0064551
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etg/listctrl.py
View File

@@ -82,7 +82,7 @@ def run():
PyObject* args = Py_BuildValue("(LL)", item1, item2); PyObject* args = Py_BuildValue("(LL)", item1, item2);
#endif #endif
PyObject* result = PyEval_CallObject(func, args); PyObject* result = PyObject_CallObject(func, args);
Py_DECREF(args); Py_DECREF(args);
if (result) { if (result) {
retval = wxPyInt_AsLong(result); retval = wxPyInt_AsLong(result);

2
samples/embedded/embedded.cpp
View File

@@ -276,7 +276,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
wxASSERT(arg != NULL); wxASSERT(arg != NULL);
PyObject* tuple = PyTuple_New(1); PyObject* tuple = PyTuple_New(1);
PyTuple_SET_ITEM(tuple, 0, arg); PyTuple_SET_ITEM(tuple, 0, arg);
result = PyEval_CallObject(func, tuple); result = PyObject_CallObject(func, tuple);
// Was there an exception? // Was there an exception?
if (! result) if (! result)

2
src/event_ex.cpp
View File

@@ -50,7 +50,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
// Call the event handler, passing the event object // Call the event handler, passing the event object
tuple = PyTuple_New(1); tuple = PyTuple_New(1);
PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg PyTuple_SET_ITEM(tuple, 0, arg); // steals ref to arg
result = PyEval_CallObject(func, tuple); result = PyObject_CallObject(func, tuple);
if ( result ) { if ( result ) {
Py_DECREF(result); // result is ignored, but we still need to decref it Py_DECREF(result); // result is ignored, but we still need to decref it
PyErr_Clear(); // Just in case... PyErr_Clear(); // Just in case...

6
src/stream_input.cpp
View File

@@ -84,7 +84,7 @@ protected:
wxPyThreadBlocker blocker; wxPyThreadBlocker blocker;
PyObject* arglist = Py_BuildValue("(i)", bufsize); PyObject* arglist = Py_BuildValue("(i)", bufsize);
PyObject* result = PyEval_CallObject(m_read, arglist); PyObject* result = PyObject_CallObject(m_read, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
size_t o = 0; size_t o = 0;
@@ -122,7 +122,7 @@ protected:
PyTuple_SET_ITEM(arglist, 1, wxPyInt_FromLong(mode)); PyTuple_SET_ITEM(arglist, 1, wxPyInt_FromLong(mode));
PyObject* result = PyEval_CallObject(m_seek, arglist); PyObject* result = PyObject_CallObject(m_seek, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
Py_XDECREF(result); Py_XDECREF(result);
return OnSysTell(); return OnSysTell();
@@ -132,7 +132,7 @@ protected:
{ {
wxPyThreadBlocker blocker; wxPyThreadBlocker blocker;
PyObject* arglist = Py_BuildValue("()"); PyObject* arglist = Py_BuildValue("()");
PyObject* result = PyEval_CallObject(m_tell, arglist); PyObject* result = PyObject_CallObject(m_tell, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
wxFileOffset o = 0; wxFileOffset o = 0;
if (result != NULL) { if (result != NULL) {

6
src/stream_output.cpp
View File

@@ -92,7 +92,7 @@ protected:
PyObject* arglist = PyTuple_New(1); PyObject* arglist = PyTuple_New(1);
PyTuple_SET_ITEM(arglist, 0, PyBytes_FromStringAndSize((char*)buffer, bufsize)); PyTuple_SET_ITEM(arglist, 0, PyBytes_FromStringAndSize((char*)buffer, bufsize));
PyObject* result = PyEval_CallObject(m_write, arglist); PyObject* result = PyObject_CallObject(m_write, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
if (result != NULL) if (result != NULL)
@@ -116,7 +116,7 @@ protected:
PyTuple_SET_ITEM(arglist, 1, wxPyInt_FromLong(mode)); PyTuple_SET_ITEM(arglist, 1, wxPyInt_FromLong(mode));
PyObject* result = PyEval_CallObject(m_seek, arglist); PyObject* result = PyObject_CallObject(m_seek, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
Py_XDECREF(result); Py_XDECREF(result);
return OnSysTell(); return OnSysTell();
@@ -126,7 +126,7 @@ protected:
{ {
wxPyThreadBlocker blocker; wxPyThreadBlocker blocker;
PyObject* arglist = Py_BuildValue("()"); PyObject* arglist = Py_BuildValue("()");
PyObject* result = PyEval_CallObject(m_tell, arglist); PyObject* result = PyObject_CallObject(m_tell, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
wxFileOffset o = 0; wxFileOffset o = 0;
if (result != NULL) { if (result != NULL) {