From 222a1e27d5a50e255dfacf5378225b9ec78dd124 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 8 Oct 2013 17:59:31 +0200 Subject: apt_pkg: Support paths supplied as bytes objects (See: #680971) We should be done now. DO NOT MERGE --- python/acquire-item.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'python/acquire-item.cc') diff --git a/python/acquire-item.cc b/python/acquire-item.cc index 53c3802b..5589a1f2 100644 --- a/python/acquire-item.cc +++ b/python/acquire-item.cc @@ -224,7 +224,8 @@ PyTypeObject PyAcquireItem_Type = { static PyObject *acquirefile_new(PyTypeObject *type, PyObject *Args, PyObject * kwds) { PyObject *pyfetcher; - char *uri, *md5, *descr, *shortDescr, *destDir, *destFile; + const char *uri, *md5, *descr, *shortDescr; + PyApt_Filename destDir, destFile; int size = 0; uri = md5 = descr = shortDescr = destDir = destFile = ""; @@ -232,9 +233,11 @@ static PyObject *acquirefile_new(PyTypeObject *type, PyObject *Args, PyObject * "destdir", "destfile", NULL }; - if (PyArg_ParseTupleAndKeywords(Args, kwds, "O!s|sissss", kwlist, + if (PyArg_ParseTupleAndKeywords(Args, kwds, "O!s|sissO&O&", kwlist, &PyAcquire_Type, &pyfetcher, &uri, &md5, - &size, &descr, &shortDescr, &destDir, &destFile) == 0) + &size, &descr, &shortDescr, + PyApt_Filename::Converter, &destDir, + PyApt_Filename::Converter, &destFile) == 0) return 0; pkgAcquire *fetcher = GetCpp(pyfetcher); -- cgit v1.2.3