diff options
| -rw-r--r-- | python/acquire.cc | 19 | ||||
| -rw-r--r-- | python/apt_pkgmodule.cc | 35 | ||||
| -rw-r--r-- | python/pkgmanager.cc | 24 |
3 files changed, 35 insertions, 43 deletions
diff --git a/python/acquire.cc b/python/acquire.cc index 7c8c9eea..ef8b10b6 100644 --- a/python/acquire.cc +++ b/python/acquire.cc @@ -332,36 +332,17 @@ static PyObject *PkgAcquireGetItems(PyObject *Self,void*) } return List; } -// some constants -static PyObject *PkgAcquireGetResultContinue(PyObject *Self,void*) -{ - return Py_BuildValue("i", pkgAcquire::Continue); -} -static PyObject *PkgAcquireGetResultFailed(PyObject *Self,void*) -{ - return Py_BuildValue("i", pkgAcquire::Failed); -} -static PyObject *PkgAcquireGetResultCancelled(PyObject *Self,void*) -{ - return Py_BuildValue("i", pkgAcquire::Cancelled); -} static PyGetSetDef PkgAcquireGetSet[] = { {"fetch_needed",PkgAcquireGetFetchNeeded}, {"items",PkgAcquireGetItems}, {"workers",PkgAcquireGetWorkers}, {"partial_present",PkgAcquireGetPartialPresent}, - {"result_cancelled",PkgAcquireGetResultCancelled}, - {"result_continue",PkgAcquireGetResultContinue}, - {"result_failed",PkgAcquireGetResultFailed}, {"total_needed",PkgAcquireGetTotalNeeded}, #ifdef COMPAT_0_7 {"FetchNeeded",PkgAcquireGetFetchNeeded}, {"Items",PkgAcquireGetItems}, {"PartialPresent",PkgAcquireGetPartialPresent}, - {"ResultCancelled",PkgAcquireGetResultCancelled}, - {"ResultContinue",PkgAcquireGetResultContinue}, - {"ResultFailed",PkgAcquireGetResultFailed}, {"TotalNeeded",PkgAcquireGetTotalNeeded}, #endif {} diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index 0a899efb..9e486a91 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -14,6 +14,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/acquire-item.h> +#include <apt-pkg/packagemanager.h> #include <apt-pkg/version.h> #include <apt-pkg/deblistparser.h> #include <apt-pkg/pkgcache.h> @@ -666,9 +667,41 @@ extern "C" void initapt_pkg() CharCharToList(TFRewriteSourceOrder)); - // AcquireItem Constants. + // Acquire constants. + // some constants + PyDict_SetItemString(PyAcquire_Type.tp_dict, "result_cancelled", + Py_BuildValue("i", pkgAcquire::Cancelled)); + PyDict_SetItemString(PyAcquire_Type.tp_dict, "result_continue", + Py_BuildValue("i", pkgAcquire::Continue)); + PyDict_SetItemString(PyAcquire_Type.tp_dict, "result_failed", + Py_BuildValue("i", pkgAcquire::Failed)); +#ifdef COMPAT_0_7 + PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultCancelled", + Py_BuildValue("i", pkgAcquire::Cancelled)); + PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultContinue", + Py_BuildValue("i", pkgAcquire::Continue)); + PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultFailed", + Py_BuildValue("i", pkgAcquire::Failed)); +#endif + // PackageManager constants + PyDict_SetItemString(PyPackageManager_Type.tp_dict, "result_completed", + Py_BuildValue("i", pkgPackageManager::Completed)); + PyDict_SetItemString(PyPackageManager_Type.tp_dict, "result_failed", + Py_BuildValue("i", pkgPackageManager::Failed)); + PyDict_SetItemString(PyPackageManager_Type.tp_dict, "result_incomplete", + Py_BuildValue("i", pkgPackageManager::Incomplete)); +#ifdef COMPAT_0_7 + PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultCompleted", + Py_BuildValue("i", pkgPackageManager::Completed)); + PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultFailed", + Py_BuildValue("i", pkgPackageManager::Failed)); + PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultIncomplete", + Py_BuildValue("i", pkgPackageManager::Incomplete)); +#endif + + // AcquireItem Constants. PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "stat_idle", Py_BuildValue("i", pkgAcquire::Item::StatIdle)); PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "stat_fetching", diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc index f4f84a2b..58f2aaec 100644 --- a/python/pkgmanager.cc +++ b/python/pkgmanager.cc @@ -109,28 +109,6 @@ static PyMethodDef PkgManagerMethods[] = }; -static PyObject *PkgManagerGetResultCompleted(PyObject *Self,void*) { - return Py_BuildValue("i", pkgPackageManager::Completed); -} -static PyObject *PkgManagerGetResultFailed(PyObject *Self,void*) { - return Py_BuildValue("i", pkgPackageManager::Failed); -} -static PyObject *PkgManagerGetResultIncomplete(PyObject *Self,void*) { - return Py_BuildValue("i", pkgPackageManager::Incomplete); -} - -static PyGetSetDef PkgManagerGetSet[] = { - {"result_completed",PkgManagerGetResultCompleted}, - {"result_failed",PkgManagerGetResultFailed}, - {"result_incomplete",PkgManagerGetResultIncomplete}, -#ifdef COMPAT_0_7 - {"ResultCompleted",PkgManagerGetResultCompleted}, - {"ResultFailed",PkgManagerGetResultFailed}, - {"ResultIncomplete",PkgManagerGetResultIncomplete}, -#endif - {} -}; - PyTypeObject PyPackageManager_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) @@ -164,7 +142,7 @@ PyTypeObject PyPackageManager_Type = 0, // tp_iternext PkgManagerMethods, // tp_methods 0, // tp_members - PkgManagerGetSet, // tp_getset + 0, // tp_getset 0, // tp_base 0, // tp_dict 0, // tp_descr_get |