* fixes in the acquire interface code (use CppPyObject with pkgAcquire* directly instead of using a PkgAcquireStruct)

4 files changed, 17 insertions, 26 deletions

diff --git a/python/acquire.cc b/python/acquire.cc
index 87f2717a..1bbed72a 100644
--- a/python/acquire.cc
+++ b/python/acquire.cc
@@ -8,7 +8,6 @@
 
 #include "generic.h"
 #include "apt_pkgmodule.h"
-#include "acquire.h"
 #include "progress.h"
 
 #include <apt-pkg/acquire-item.h>
@@ -93,25 +92,25 @@ PyTypeObject AcquireItemType =
 
 static PyObject *PkgAcquireRun(PyObject *Self,PyObject *Args)
 {   
-   PkgAcquireStruct &Struct = GetCpp<PkgAcquireStruct>(Self);
+   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
 
    if (PyArg_ParseTuple(Args, "") == 0) 
       return 0;
 
    //FIXME: add pulse interval here
-   pkgAcquire::RunResult run = Struct.fetcher.Run();
+   pkgAcquire::RunResult run = fetcher->Run();
 
    return HandleErrors(Py_BuildValue("i",run));
 }
 
 static PyObject *PkgAcquireShutdown(PyObject *Self,PyObject *Args)
 {   
-   PkgAcquireStruct &Struct = GetCpp<PkgAcquireStruct>(Self);
+   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
 
    if (PyArg_ParseTuple(Args, "") == 0) 
       return 0;
 
-   Struct.fetcher.Shutdown();
+   fetcher->Shutdown();
 
    Py_INCREF(Py_None);
    return HandleErrors(Py_None);   
@@ -126,19 +125,19 @@ static PyMethodDef PkgAcquireMethods[] =
 
 static PyObject *AcquireAttr(PyObject *Self,char *Name)
 {
-   PkgAcquireStruct &Struct = GetCpp<PkgAcquireStruct>(Self);
+   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
 
    if(strcmp("TotalNeeded",Name) == 0) 
-      return Py_BuildValue("l", Struct.fetcher.TotalNeeded());
+      return Py_BuildValue("l", fetcher->TotalNeeded());
    if(strcmp("FetchNeeded",Name) == 0) 
-      return Py_BuildValue("l", Struct.fetcher.FetchNeeded());
+      return Py_BuildValue("l", fetcher->FetchNeeded());
    if(strcmp("PartialPresent",Name) == 0) 
-      return Py_BuildValue("l", Struct.fetcher.PartialPresent());
+      return Py_BuildValue("l", fetcher->PartialPresent());
    if(strcmp("Items",Name) == 0) 
    {
       PyObject *List = PyList_New(0);
-      for (pkgAcquire::ItemIterator I = Struct.fetcher.ItemsBegin(); 
-	   I != Struct.fetcher.ItemsEnd(); I++)
+      for (pkgAcquire::ItemIterator I = fetcher->ItemsBegin(); 
+	   I != fetcher->ItemsEnd(); I++)
       {
 	 PyObject *Obj;
 	 Obj = CppOwnedPyObject_NEW<pkgAcquire::ItemIterator>(Self,&AcquireItemType,I);
@@ -167,10 +166,10 @@ PyTypeObject PkgAcquireType =
    PyObject_HEAD_INIT(&PyType_Type)
    0,			                // ob_size
    "Acquire",                          // tp_name
-   sizeof(CppOwnedPyObject<PkgAcquireStruct>),   // tp_basicsize
+   sizeof(CppPyObject<pkgAcquire*>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<PkgAcquireStruct>,        // tp_dealloc
+   CppDealloc<pkgAcquire*>,        // tp_dealloc
    0,                                   // tp_print
    AcquireAttr,                           // tp_getattr
    0,                                   // tp_setattr
@@ -199,8 +198,8 @@ PyObject *GetAcquire(PyObject *Self,PyObject *Args)
       fetcher = new pkgAcquire();
    }
 
-   CppOwnedPyObject<pkgAcquire> *FetcherObj =
-	   CppOwnedPyObject_NEW<pkgAcquire>(0,&PkgAcquireType, *fetcher);
+   CppPyObject<pkgAcquire*> *FetcherObj =
+	   CppPyObject_NEW<pkgAcquire*>(&PkgAcquireType, fetcher);
    
    return FetcherObj;
 }
diff --git a/python/acquire.h b/python/acquire.h
deleted file mode 100644
index 1afcfff3..00000000
--- a/python/acquire.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <apt-pkg/acquire-item.h>
-
-struct PkgAcquireStruct
-{
-   pkgAcquire fetcher;
-};
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc
index ce6d35a8..bcd4c45b 100644
--- a/python/pkgmanager.cc
+++ b/python/pkgmanager.cc
@@ -8,14 +8,13 @@
 
 #include "generic.h"
 #include "apt_pkgmodule.h"
-#include "acquire.h"
 #include "pkgrecords.h"
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
-
+#include <apt-pkg/acquire.h>
 #include <iostream>
 
 
@@ -30,11 +29,11 @@ static PyObject *PkgManagerGetArchives(PyObject *Self,PyObject *Args)
 			&PkgRecordsType, &recs) == 0) 
       return 0;
 
-   PkgAcquireStruct &s_fetcher = GetCpp<PkgAcquireStruct>(fetcher);
+   pkgAcquire *s_fetcher = GetCpp<pkgAcquire*>(fetcher);
    pkgSourceList *s_list = GetCpp<pkgSourceList*>(list);
    PkgRecordsStruct &s_records = GetCpp<PkgRecordsStruct>(recs);
 
-   bool res = pm->GetArchives(&s_fetcher.fetcher, s_list,
+   bool res = pm->GetArchives(s_fetcher, s_list,
 			      &s_records.Records);
 
    return HandleErrors(Py_BuildValue("b",res));
diff --git a/python/sourcelist.cc b/python/sourcelist.cc
index 2d65062c..4eed21a7 100644
--- a/python/sourcelist.cc
+++ b/python/sourcelist.cc
@@ -30,7 +30,6 @@ static PyObject *PkgSourceListFindIndex(PyObject *Self,PyObject *Args)
 static char *doc_PkgSourceListReadMainList = "xxx";
 static PyObject *PkgSourceListReadMainList(PyObject *Self,PyObject *Args)
 {
-   //   PkgSourceListStruct &Struct = GetCpp<PkgSourceListStruct>(Self);
    pkgSourceList *list = GetCpp<pkgSourceList*>(Self);
    bool res = list->ReadMainList();