Skip to content

Commit 846468d

Browse files
committed
Switch from PyEval_CallObject to PyObject_Call
python/cpython#105107 Remove deprecate PyEval_CallObject() function. > There are replacement functions like PyObject_Call() and PyObject_CallFunction() which exist since Python 3.0 at least and so is backward compatible.
1 parent c4fe827 commit 846468d

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎tensorflow/python/eager/pywrap_tfe_src.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ class PyVSpace : public tensorflow::eager::VSpace<PyObject, PyBackwardFunction,
13191319
}
13201320
PyObject* arglist =
13211321
Py_BuildValue("(O)", reinterpret_cast<PyObject*>(tensor));
1322-
PyObject* result = PyEval_CallObject(num_elements_, arglist);
1322+
PyObject* result = PyObject_Call(num_elements_, arglist, nullptr);
13231323
Py_DECREF(arglist);
13241324
if (result == nullptr) {
13251325
// The caller detects whether a python exception has been raised.
@@ -1342,7 +1342,7 @@ class PyVSpace : public tensorflow::eager::VSpace<PyObject, PyBackwardFunction,
13421342
}
13431343
PyObject* arglist = Py_BuildValue("(O)", list);
13441344
CHECK(arglist != nullptr);
1345-
PyObject* result = PyEval_CallObject(aggregate_fn_, arglist);
1345+
PyObject* result = PyObject_Call(aggregate_fn_, arglist, nullptr);
13461346
Py_DECREF(arglist);
13471347
Py_DECREF(list);
13481348
return result;
@@ -1359,7 +1359,7 @@ class PyVSpace : public tensorflow::eager::VSpace<PyObject, PyBackwardFunction,
13591359
return nullptr;
13601360
}
13611361
PyObject* arg_list = Py_BuildValue("OO", shape, dtype);
1362-
PyObject* result = PyEval_CallObject(ones_fn_, arg_list);
1362+
PyObject* result = PyObject_Call(ones_fn_, arg_list, nullptr);
13631363
Py_DECREF(arg_list);
13641364
return result;
13651365
}
@@ -1383,7 +1383,7 @@ class PyVSpace : public tensorflow::eager::VSpace<PyObject, PyBackwardFunction,
13831383
return nullptr;
13841384
}
13851385
PyObject* arg_list = Py_BuildValue("OO", shape, dtype);
1386-
PyObject* result = PyEval_CallObject(zeros_fn_, arg_list);
1386+
PyObject* result = PyObject_Call(zeros_fn_, arg_list, nullptr);
13871387
Py_DECREF(arg_list);
13881388
return result;
13891389
}
@@ -1397,7 +1397,7 @@ class PyVSpace : public tensorflow::eager::VSpace<PyObject, PyBackwardFunction,
13971397

13981398
PyObject* GraphShape(PyObject* tensor) const {
13991399
PyObject* arg_list = Py_BuildValue("(O)", tensor);
1400-
PyObject* result = PyEval_CallObject(graph_shape_fn_, arg_list);
1400+
PyObject* result = PyObject_Call(graph_shape_fn_, arg_list, nullptr);
14011401
Py_DECREF(arg_list);
14021402
return result;
14031403
}

‎tensorflow/python/lib/core/py_func.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ Status DoCallPyFunc(PyCall* call, bool* out_log_on_error) {
214214
CHECK(args);
215215

216216
// Invokes the trampoline.
217-
PyObject* result = PyEval_CallObject(trampoline, args);
217+
PyObject* result = PyObject_Call(trampoline, args, nullptr);
218218
Py_DECREF(args);
219219
Status s = OkStatus();
220220
if (result == nullptr) {

0 commit comments

Comments
 (0)