summaryrefslogtreecommitdiff
path: root/python/progress.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2009-07-19 16:37:43 +0200
committerJulian Andres Klode <jak@debian.org>2009-07-19 16:37:43 +0200
commitcbfbbf0728df4d9f7d52685549eb529041184d82 (patch)
tree37eea6562ca5b3aa960d112e4e9e6c52f2b4e41e /python/progress.cc
parenta9cf6b4405a83bc0615cd313a8a7f1c23db3b402 (diff)
downloadpython-apt-cbfbbf0728df4d9f7d52685549eb529041184d82.tar.gz
python/progress.cc: Use PyObject_CallObject instead of PyEval_CallObject.
Diffstat (limited to 'python/progress.cc')
-rw-r--r--python/progress.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/python/progress.cc b/python/progress.cc
index 55ed13f9..2feba503 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -35,7 +35,7 @@ bool PyCallbackObj::RunSimpleCallback(const char* method_name,
Py_XDECREF(arglist);
return false;
}
- PyObject *result = PyEval_CallObject(method, arglist);
+ PyObject *result = PyObject_CallObject(method, arglist);
Py_XDECREF(arglist);
@@ -44,7 +44,6 @@ bool PyCallbackObj::RunSimpleCallback(const char* method_name,
std::cerr << "Error in function " << method_name << std::endl;
PyErr_Print();
PyErr_Clear();
-
return false;
}
if(res != NULL)
@@ -435,7 +434,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
PyObject *method = PyObject_GetAttrString(callbackInst, "fork");
std::cerr << "custom fork found" << std::endl;
PyObject *arglist = Py_BuildValue("()");
- PyObject *result = PyEval_CallObject(method, arglist);
+ PyObject *result = PyObject_CallObject(method, arglist);
Py_DECREF(arglist);
if (result == NULL) {
std::cerr << "fork method invalid" << std::endl;
@@ -484,7 +483,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
method = PyObject_GetAttrString(callbackInst, "waitChild");
//std::cerr << "custom waitChild found" << std::endl;
PyObject *arglist = Py_BuildValue("(i)",child_id);
- PyObject *result = PyEval_CallObject(method, arglist);
+ PyObject *result = PyObject_CallObject(method, arglist);
Py_DECREF(arglist);
if (result == NULL) {
std::cerr << "waitChild method invalid" << std::endl;