diff options
Diffstat (limited to 'python/pkgmanager.cc')
| -rw-r--r-- | python/pkgmanager.cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc index 9a5d0e5b..05f033f3 100644 --- a/python/pkgmanager.cc +++ b/python/pkgmanager.cc @@ -191,7 +191,7 @@ class PyPkgManager : public pkgDPkgPM { StatusFd)); } virtual void Reset() { - CppPyRef(PyObject_CallMethod(pyinst, "reset", NULL)); + Py_XDECREF(PyObject_CallMethod(pyinst, "reset", NULL)); } public: @@ -225,23 +225,14 @@ static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) return PkgManagerObj; } -#ifdef COMPAT_0_7 -PyObject *GetPkgManager(PyObject *Self,PyObject *Args) -{ - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is " - "deprecated. Please see apt_pkg.PackageManager() for the " - "replacement.", 1); - return PkgManagerNew(&PyPackageManager2_Type,Args,0); -} -#endif static PyObject *PkgManagerInstall(PyObject *Self,PyObject *Args) { PyPkgManager *pm = GetCpp<PyPkgManager*>(Self); PyObject *pkg; - const char *file; + PyApt_Filename file; - if (PyArg_ParseTuple(Args, "O!s", &PyPackage_Type,&pkg, &file) == 0) + if (PyArg_ParseTuple(Args, "O!O&", &PyPackage_Type,&pkg, PyApt_Filename::Converter, &file) == 0) return 0; return HandleErrors(PyBool_FromLong(pm->callInstall(PyPackage_ToCpp(pkg), file))); |