python/acquire.cc: Adjust coding style.

There were two different coding styles in this file, which was a bit
confusing.

1 files changed, 234 insertions, 212 deletions

diff --git a/python/acquire.cc b/python/acquire.cc
index 1085d0a2..7c8c9eea 100644
--- a/python/acquire.cc
+++ b/python/acquire.cc
@@ -1,10 +1,26 @@
-// Description								/*{{{*/
-// $Id: acquire.cc,v 1.1 2003/06/03 03:03:23 mvo Exp $
-/* ######################################################################
-
-   Acquire - Wrapper for the acquire code
-
-   ##################################################################### */
+/* acquire.cc - Wrapper for pkgAcquire.
+ *
+ * Copyright 2004-2009 Canonical Ltd
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * Authors: Michael Vogt
+ *          Julian Andres Klode
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
 
 #include "generic.h"
 #include "apt_pkgmodule.h"
@@ -47,7 +63,7 @@ static PyObject *acquireworker_get_current_item(PyObject *self, void *closure)
     else {
         PyObject *PyItem = PyAcquireItem_FromCpp(worker->CurrentItem->Owner);
         PyObject *ret = PyAcquireItemDesc_FromCpp(worker->CurrentItem,false,
-                                                  PyItem);
+                        PyItem);
         Py_DECREF(PyItem);
         return ret;
     }
@@ -83,40 +99,39 @@ static PyGetSetDef acquireworker_getset[] = {
 };
 
 
-PyTypeObject PyAcquireWorker_Type =
-{
-   PyVarObject_HEAD_INIT(&PyType_Type, 0)
-   "apt_pkg.AcquireWorker",                // tp_name
-   sizeof(CppOwnedPyObject<pkgAcquire::Worker*>),// tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppOwnedDealloc<pkgAcquire::Worker*>, // tp_dealloc
-   0,                                   // tp_print
-   0,                                   // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   0,	                                // tp_as_mapping
-   0,                                   // tp_hash
-   0,                                   // tp_call
-   0,                                   // tp_str
-   0,                                   // tp_getattro
-   0,                                   // tp_setattro
-   0,                                   // tp_as_buffer
-   Py_TPFLAGS_DEFAULT|                // tp_flags
-   Py_TPFLAGS_HAVE_GC,
-   0,                 // tp_doc
-   CppOwnedTraverse<pkgAcquire::Worker*>, // tp_traverse
-   CppOwnedClear<pkgAcquire::Worker*>,    // tp_clear
-   0,                                    // tp_richcompare
-   0,                                    // tp_weaklistoffset
-   0,                                    // tp_iter
-   0,                                    // tp_iternext
-   0,                                    // tp_methods
-   0,                                    // tp_members
-   acquireworker_getset,                 // tp_getset
+PyTypeObject PyAcquireWorker_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.AcquireWorker",                // tp_name
+    sizeof(CppOwnedPyObject<pkgAcquire::Worker*>),// tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppOwnedDealloc<pkgAcquire::Worker*>, // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT|                  // tp_flags
+    Py_TPFLAGS_HAVE_GC,
+    0,                 // tp_doc
+    CppOwnedTraverse<pkgAcquire::Worker*>, // tp_traverse
+    CppOwnedClear<pkgAcquire::Worker*>,   // tp_clear
+    0,                                    // tp_richcompare
+    0,                                    // tp_weaklistoffset
+    0,                                    // tp_iter
+    0,                                    // tp_iternext
+    0,                                    // tp_methods
+    0,                                    // tp_members
+    acquireworker_getset,                 // tp_getset
 };
 
 static PyObject *acquireitemdesc_get_uri(PyObject *self, void *closure)
@@ -146,64 +161,64 @@ static PyObject *acquireitemdesc_get_owner(CppOwnedPyObject<pkgAcquire::ItemDesc
 }
 
 static PyGetSetDef acquireitemdesc_getset[] = {
-   {"uri",acquireitemdesc_get_uri,0,"The URI from which to download this item."},
-   {"description",acquireitemdesc_get_description},
-   {"shortdesc",acquireitemdesc_get_shortdesc},
-   {"owner",(getter)acquireitemdesc_get_owner},
-   {NULL}
+    {"uri",acquireitemdesc_get_uri,0,"The URI from which to download this item."},
+    {"description",acquireitemdesc_get_description},
+    {"shortdesc",acquireitemdesc_get_shortdesc},
+    {"owner",(getter)acquireitemdesc_get_owner},
+    {NULL}
 };
 
 static char *acquireitemdesc_doc =
     "Represent an AcquireItemDesc";
 
-PyTypeObject PyAcquireItemDesc_Type =
-{
-   PyVarObject_HEAD_INIT(&PyType_Type, 0)
-   "apt_pkg.AcquireItemDesc",                // tp_name
-   sizeof(CppOwnedPyObject<pkgAcquire::ItemDesc*>),// tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppOwnedDealloc<pkgAcquire::ItemDesc*>, // tp_dealloc
-   0,                                   // tp_print
-   0,                                   // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   0,	                                // tp_as_mapping
-   0,                                   // tp_hash
-   0,                                   // tp_call
-   0,                                   // tp_str
-   0,                                   // tp_getattro
-   0,                                   // tp_setattro
-   0,                                   // tp_as_buffer
-   (Py_TPFLAGS_DEFAULT |                // tp_flags
+PyTypeObject PyAcquireItemDesc_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.AcquireItemDesc",                // tp_name
+    sizeof(CppOwnedPyObject<pkgAcquire::ItemDesc*>),// tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppOwnedDealloc<pkgAcquire::ItemDesc*>, // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                 // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
     Py_TPFLAGS_HAVE_GC),
-   acquireitemdesc_doc,                 // tp_doc
-   CppOwnedTraverse<pkgAcquire::ItemDesc*>,// tp_traverse
-   CppOwnedClear<pkgAcquire::ItemDesc*>, // tp_clear
-   0,                                   // tp_richcompare
-   0,                                   // tp_weaklistoffset
-   0,                                   // tp_iter
-   0,                                   // tp_iternext
-   0,                                   // tp_methods
-   0,                                   // tp_members
-   acquireitemdesc_getset,              // tp_getset
-   0,                                   // tp_base
-   0,                                   // tp_dict
-   0,                                   // tp_descr_get
-   0,                                   // tp_descr_set
-   0,                                   // tp_dictoffset
-   0,                                   // tp_init
-   0,                                   // tp_alloc
-   0,                                   // tp_new
+    acquireitemdesc_doc,                 // tp_doc
+    CppOwnedTraverse<pkgAcquire::ItemDesc*>,// tp_traverse
+    CppOwnedClear<pkgAcquire::ItemDesc*>, // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    0,                                   // tp_methods
+    0,                                   // tp_members
+    acquireitemdesc_getset,              // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    0,                                   // tp_new
 };
 
 
 // Acquire
 
-PyObject *PyAcquire_GetItem(PyObject *self, pkgAcquire::Item *item) {
+PyObject *PyAcquire_GetItem(PyObject *self, pkgAcquire::Item *item)
+{
     PyAcquireItems &item_struct = ((PyAcquireObject *)self)->items[item];
     if (! item_struct.item) {
         item_struct.item = PyAcquireItem_FromCpp(item,false,self);
@@ -212,43 +227,44 @@ PyObject *PyAcquire_GetItem(PyObject *self, pkgAcquire::Item *item) {
     return item_struct.item;
 }
 
-PyObject *PyAcquire_GetItemDesc(PyObject *self, pkgAcquire::ItemDesc *item) {
+PyObject *PyAcquire_GetItemDesc(PyObject *self, pkgAcquire::ItemDesc *item)
+{
     PyAcquireItems &item_struct = ((PyAcquireObject *)self)->items[item->Owner];
     if (! item_struct.item)
         item_struct.item = PyAcquireItem_FromCpp(item->Owner,false,self);
     if (! item_struct.desc)
         item_struct.desc = PyAcquireItemDesc_FromCpp(item,false,
-                                                     item_struct.item);
+                           item_struct.item);
     Py_INCREF(item_struct.desc);
     return item_struct.desc;
 }
 
 static PyObject *PkgAcquireRun(PyObject *Self,PyObject *Args)
 {
-   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
 
-   int pulseInterval = 500000;
-   if (PyArg_ParseTuple(Args, "|i", &pulseInterval) == 0)
-      return 0;
+    int pulseInterval = 500000;
+    if (PyArg_ParseTuple(Args, "|i", &pulseInterval) == 0)
+        return 0;
 
-   pkgAcquire::RunResult run = fetcher->Run(pulseInterval);
+    pkgAcquire::RunResult run = fetcher->Run(pulseInterval);
 
-   return HandleErrors(Py_BuildValue("i",run));
+    return HandleErrors(Py_BuildValue("i",run));
 }
 
 static PyObject *PkgAcquireShutdown(PyObject *Self,PyObject *Args)
 {
-   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
 
-   if (PyArg_ParseTuple(Args, "") == 0)
-      return 0;
+    if (PyArg_ParseTuple(Args, "") == 0)
+        return 0;
 
-   fetcher->Shutdown();
+    fetcher->Shutdown();
 
-   // TODO: Delete all objects here
-   item_map &items = ((PyAcquireObject *)Self)->items;
-   for (item_map::iterator I = items.begin(); I != items.end(); I++) {
-       if ((*I).second.file)
+    // TODO: Delete all objects here
+    item_map &items = ((PyAcquireObject *)Self)->items;
+    for (item_map::iterator I = items.begin(); I != items.end(); I++) {
+        if ((*I).second.file)
             (*I).second.file->Object = NULL;
         if ((*I).second.item) {
             (*I).second.item->Object = NULL;
@@ -258,32 +274,34 @@ static PyObject *PkgAcquireShutdown(PyObject *Self,PyObject *Args)
             (*I).second.desc->Object = NULL;
             Py_DECREF((*I).second.desc);
         }
-   }
-   items.clear();
-   Py_INCREF(Py_None);
-   return HandleErrors(Py_None);
+    }
+    items.clear();
+    Py_INCREF(Py_None);
+    return HandleErrors(Py_None);
 }
 
-static PyMethodDef PkgAcquireMethods[] =
-{
-   {"run",PkgAcquireRun,METH_VARARGS,"Run the fetcher"},
-   {"shutdown",PkgAcquireShutdown, METH_VARARGS,"Shutdown the fetcher"},
-   #ifdef COMPAT_0_7
-   {"Run",PkgAcquireRun,METH_VARARGS,"Run the fetcher"},
-   {"Shutdown",PkgAcquireShutdown, METH_VARARGS,"Shutdown the fetcher"},
-   #endif
-   {}
+static PyMethodDef PkgAcquireMethods[] = {
+    {"run",PkgAcquireRun,METH_VARARGS,"Run the fetcher"},
+    {"shutdown",PkgAcquireShutdown, METH_VARARGS,"Shutdown the fetcher"},
+#ifdef COMPAT_0_7
+    {"Run",PkgAcquireRun,METH_VARARGS,"Run the fetcher"},
+    {"Shutdown",PkgAcquireShutdown, METH_VARARGS,"Shutdown the fetcher"},
+#endif
+    {}
 };
 
 #define fetcher (GetCpp<pkgAcquire*>(Self))
-static PyObject *PkgAcquireGetTotalNeeded(PyObject *Self,void*) {
-   return Py_BuildValue("d", fetcher->TotalNeeded());
+static PyObject *PkgAcquireGetTotalNeeded(PyObject *Self,void*)
+{
+    return Py_BuildValue("d", fetcher->TotalNeeded());
 }
-static PyObject *PkgAcquireGetFetchNeeded(PyObject *Self,void*) {
-   return Py_BuildValue("d", fetcher->FetchNeeded());
+static PyObject *PkgAcquireGetFetchNeeded(PyObject *Self,void*)
+{
+    return Py_BuildValue("d", fetcher->FetchNeeded());
 }
-static PyObject *PkgAcquireGetPartialPresent(PyObject *Self,void*) {
-      return Py_BuildValue("d", fetcher->PartialPresent());
+static PyObject *PkgAcquireGetPartialPresent(PyObject *Self,void*)
+{
+    return Py_BuildValue("d", fetcher->PartialPresent());
 }
 #undef fetcher
 
@@ -292,8 +310,8 @@ static PyObject *PkgAcquireGetWorkers(PyObject *self, void *closure)
     PyObject *List = PyList_New(0);
     pkgAcquire *Owner = GetCpp<pkgAcquire*>(self);
     CppOwnedPyObject<pkgAcquire::Worker*> *PyWorker = NULL;
-    for(pkgAcquire::Worker *Worker = Owner->WorkersBegin();
-        Worker != 0; Worker = Owner->WorkerStep(Worker)) {
+    for (pkgAcquire::Worker *Worker = Owner->WorkersBegin();
+            Worker != 0; Worker = Owner->WorkerStep(Worker)) {
         PyWorker = CppOwnedPyObject_NEW<pkgAcquire::Worker*>(self,&PyAcquireWorker_Type, Worker);
         PyWorker->NoDelete = true;
         PyList_Append(List, PyWorker);
@@ -303,27 +321,29 @@ static PyObject *PkgAcquireGetWorkers(PyObject *self, void *closure)
 }
 static PyObject *PkgAcquireGetItems(PyObject *Self,void*)
 {
-   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
-   PyObject *List = PyList_New(0);
-   PyObject *Obj;
-   for (pkgAcquire::ItemIterator I = fetcher->ItemsBegin();
-        I != fetcher->ItemsEnd(); I++)
-   {
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
+    PyObject *List = PyList_New(0);
+    PyObject *Obj;
+    for (pkgAcquire::ItemIterator I = fetcher->ItemsBegin();
+            I != fetcher->ItemsEnd(); I++) {
         Obj = PyAcquire_GetItem(Self, *I);
         PyList_Append(List,Obj);
         Py_DECREF(Obj);
-   }
-   return List;
+    }
+    return List;
 }
 // some constants
-static PyObject *PkgAcquireGetResultContinue(PyObject *Self,void*) {
-      return Py_BuildValue("i", pkgAcquire::Continue);
+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 *PkgAcquireGetResultFailed(PyObject *Self,void*)
+{
+    return Py_BuildValue("i", pkgAcquire::Failed);
 }
-static PyObject *PkgAcquireGetResultCancelled(PyObject *Self,void*) {
-      return Py_BuildValue("i", pkgAcquire::Cancelled);
+static PyObject *PkgAcquireGetResultCancelled(PyObject *Self,void*)
+{
+    return Py_BuildValue("i", pkgAcquire::Cancelled);
 }
 
 static PyGetSetDef PkgAcquireGetSet[] = {
@@ -335,7 +355,7 @@ static PyGetSetDef PkgAcquireGetSet[] = {
     {"result_continue",PkgAcquireGetResultContinue},
     {"result_failed",PkgAcquireGetResultFailed},
     {"total_needed",PkgAcquireGetTotalNeeded},
-    #ifdef COMPAT_0_7
+#ifdef COMPAT_0_7
     {"FetchNeeded",PkgAcquireGetFetchNeeded},
     {"Items",PkgAcquireGetItems},
     {"PartialPresent",PkgAcquireGetPartialPresent},
@@ -343,86 +363,88 @@ static PyGetSetDef PkgAcquireGetSet[] = {
     {"ResultContinue",PkgAcquireGetResultContinue},
     {"ResultFailed",PkgAcquireGetResultFailed},
     {"TotalNeeded",PkgAcquireGetTotalNeeded},
-    #endif
+#endif
     {}
 };
 
-static PyObject *PkgAcquireNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) {
-   pkgAcquire *fetcher;
-
-   PyObject *pyFetchProgressInst = NULL;
-   char *kwlist[] = {"progress", 0};
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"|O",kwlist,&pyFetchProgressInst) == 0)
-      return 0;
-
-   PyFetchProgress *progress = 0;
-   if (pyFetchProgressInst != NULL) {
-      // FIXME: memleak?
-      progress = new PyFetchProgress();
-      progress->setCallbackInst(pyFetchProgressInst);
-      fetcher = new pkgAcquire(progress);
-   } else {
-      fetcher = new pkgAcquire();
-   }
-
-   PyAcquireObject *FetcherObj = (PyAcquireObject *)
-	   CppPyObject_NEW<pkgAcquire*>(type, fetcher);
-
-   if (progress != 0)
-      progress->setPyAcquire(FetcherObj);
-   // prepare our map of items.
-   new (&FetcherObj->items) item_map();
-   new (&FetcherObj->workers) worker_map();
-   return FetcherObj;
+static PyObject *PkgAcquireNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
+{
+    pkgAcquire *fetcher;
+
+    PyObject *pyFetchProgressInst = NULL;
+    char *kwlist[] = {"progress", 0};
+    if (PyArg_ParseTupleAndKeywords(Args,kwds,"|O",kwlist,&pyFetchProgressInst) == 0)
+        return 0;
+
+    PyFetchProgress *progress = 0;
+    if (pyFetchProgressInst != NULL) {
+        // FIXME: memleak?
+        progress = new PyFetchProgress();
+        progress->setCallbackInst(pyFetchProgressInst);
+        fetcher = new pkgAcquire(progress);
+    }
+    else {
+        fetcher = new pkgAcquire();
+    }
+
+    PyAcquireObject *FetcherObj = (PyAcquireObject *)
+                                  CppPyObject_NEW<pkgAcquire*>(type, fetcher);
+
+    if (progress != 0)
+        progress->setPyAcquire(FetcherObj);
+    // prepare our map of items.
+    new (&FetcherObj->items) item_map();
+    new (&FetcherObj->workers) worker_map();
+    return FetcherObj;
 }
 
-static char *doc_PkgAcquire = "Acquire(progress) -> Acquire() object.\n\n"
+static char *doc_PkgAcquire =
+    "Acquire(progress: apt_pkg.AcquireProgress) -> Acquire() object.\n\n"
     "Create a new acquire object. The parameter *progress* can be used to\n"
-    "specify a apt.progress.FetchProgress() object, which will display the\n"
+    "specify an apt_pkg.AcquireProgress() object, which will display the\n"
     "progress of the fetching.";
 
-PyTypeObject PyAcquire_Type =
-{
-   PyVarObject_HEAD_INIT(&PyType_Type, 0)
-   "apt_pkg.Acquire",                   // tp_name
-   sizeof(PyAcquireObject),             // tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppDeallocPtr<pkgAcquire*>,          // tp_dealloc
-   0,                                   // tp_print
-   0,                                   // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   0,                                   // tp_as_mapping
-   0,                                   // tp_hash
-   0,                                   // tp_call
-   0,                                   // tp_str
-   0,                                   // tp_getattro
-   0,                                   // tp_setattro
-   0,                                   // tp_as_buffer
-   (Py_TPFLAGS_DEFAULT |                // tp_flags
+PyTypeObject PyAcquire_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.Acquire",                   // tp_name
+    sizeof(PyAcquireObject),             // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDeallocPtr<pkgAcquire*>,          // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
     Py_TPFLAGS_BASETYPE),
-   doc_PkgAcquire,                      // tp_doc
-   0,                                   // tp_traverse
-   0,                                   // tp_clear
-   0,                                   // tp_richcompare
-   0,                                   // tp_weaklistoffset
-   0,                                   // tp_iter
-   0,                                   // tp_iternext
-   PkgAcquireMethods,                   // tp_methods
-   0,                                   // tp_members
-   PkgAcquireGetSet,                    // tp_getset
-   0,                                   // tp_base
-   0,                                   // tp_dict
-   0,                                   // tp_descr_get
-   0,                                   // tp_descr_set
-   0,                                   // tp_dictoffset
-   0,                                   // tp_init
-   0,                                   // tp_alloc
-   PkgAcquireNew,                       // tp_new
+    doc_PkgAcquire,                      // tp_doc
+    0,                                   // tp_traverse
+    0,                                   // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    PkgAcquireMethods,                   // tp_methods
+    0,                                   // tp_members
+    PkgAcquireGetSet,                    // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    PkgAcquireNew,                       // tp_new
 };
 
 #ifdef COMPAT_0_7