Merge debian-experimental.

1 files changed, 142 insertions, 47 deletions

diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index 5359ee6f..d34ba0d2 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -27,7 +27,7 @@ static PyObject *PkgRecordsLookup(PyObject *Self,PyObject *Args)
 
    PyObject *PkgFObj;
    long int Index;
-   if (PyArg_ParseTuple(Args,"(O!l)",&PackageFileType,&PkgFObj,&Index) == 0)
+   if (PyArg_ParseTuple(Args,"(O!l)",&PyPackageFile_Type,&PkgFObj,&Index) == 0)
       return 0;
 
    // Get the index and check to make sure it is reasonable
@@ -49,59 +49,128 @@ static PyObject *PkgRecordsLookup(PyObject *Self,PyObject *Args)
 
 static PyMethodDef PkgRecordsMethods[] =
 {
+   {"lookup",PkgRecordsLookup,METH_VARARGS,"Changes to a new package"},
+   #ifdef COMPAT_0_7
    {"Lookup",PkgRecordsLookup,METH_VARARGS,"Changes to a new package"},
+   #endif
    {}
 };
 
-static PyObject *PkgRecordsAttr(PyObject *Self,char *Name)
-{
+/**
+ * Get the PkgSrcRecordsStruct from a PyObject. If no package has been looked
+ * up, set an AttributeError using the given name.
+ */
+static inline PkgRecordsStruct &GetStruct(PyObject *Self,char *name) {
    PkgRecordsStruct &Struct = GetCpp<PkgRecordsStruct>(Self);
+   if (Struct.Last == 0)
+      PyErr_SetString(PyExc_AttributeError,name);
+   return Struct;
+}
 
-   if (Struct.Last != 0)
-   {
-      if (strcmp("FileName",Name) == 0)
-	 return CppPyString(Struct.Last->FileName());
-      else if (strcmp("MD5Hash",Name) == 0)
-	 return CppPyString(Struct.Last->MD5Hash());
-      else if (strcmp("SHA1Hash",Name) == 0)
-	 return CppPyString(Struct.Last->SHA1Hash());
-      else if (strcmp("SHA256Hash",Name) == 0)
-	 return CppPyString(Struct.Last->SHA256Hash());
-      else if (strcmp("SourcePkg",Name) == 0)
-	 return CppPyString(Struct.Last->SourcePkg());
-      else if (strcmp("SourceVer",Name) == 0)
-	 return CppPyString(Struct.Last->SourceVer());
-      else if (strcmp("Maintainer",Name) == 0)
-	 return CppPyString(Struct.Last->Maintainer());
-      else if (strcmp("ShortDesc",Name) == 0)
-	 return CppPyString(Struct.Last->ShortDesc());
-      else if (strcmp("LongDesc",Name) == 0)
-	 return CppPyString(Struct.Last->LongDesc());
-      else if (strcmp("Name",Name) == 0)
-	 return CppPyString(Struct.Last->Name());
-      else if (strcmp("Homepage",Name) == 0)
-	 return CppPyString(Struct.Last->Homepage());
-      else if (strcmp("Record", Name) == 0)
-      {
-	 const char *start, *stop;
-	 Struct.Last->GetRec(start, stop);
-	 return PyString_FromStringAndSize(start,stop-start);
-      }
-   }
+static PyObject *PkgRecordsGetFileName(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"FileName");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->FileName()) : 0;
+}
+static PyObject *PkgRecordsGetMD5Hash(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"MD5Hash");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->MD5Hash()) : 0;
+}
+static PyObject *PkgRecordsGetSHA1Hash(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SHA1Hash");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SHA1Hash()) : 0;
+}
+static PyObject *PkgRecordsGetSHA256Hash(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SHA256Hash");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SHA256Hash()) : 0;
+}
+static PyObject *PkgRecordsGetSourcePkg(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SourcePkg");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SourcePkg()) : 0;
+}
+static PyObject *PkgRecordsGetSourceVer(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SourceVer");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SourceVer()) : 0;
+}
+static PyObject *PkgRecordsGetMaintainer(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"Maintainer");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Maintainer()) : 0;
+}
+static PyObject *PkgRecordsGetShortDesc(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"ShortDesc");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->ShortDesc()) : 0;
+}
+static PyObject *PkgRecordsGetLongDesc(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"LongDesc");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->LongDesc()) : 0;
+}
+static PyObject *PkgRecordsGetName(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"Name");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Name()) : 0;
+}
+static PyObject *PkgRecordsGetHomepage(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"Homepage");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Homepage()) : 0;
+}
+static PyObject *PkgRecordsGetRecord(PyObject *Self,void*) {
+   const char *start, *stop;
+   PkgRecordsStruct &Struct = GetStruct(Self,"Record");
+   if (Struct.Last == 0)
+      return 0;
+   Struct.Last->GetRec(start, stop);
+   return PyString_FromStringAndSize(start,stop-start);
+}
+static PyGetSetDef PkgRecordsGetSet[] = {
+   {"filename",PkgRecordsGetFileName},
+   {"homepage",PkgRecordsGetHomepage},
+   {"long_desc",PkgRecordsGetLongDesc},
+   {"md5_hash",PkgRecordsGetMD5Hash},
+   {"maintainer",PkgRecordsGetMaintainer},
+   {"name",PkgRecordsGetName},
+   {"record",PkgRecordsGetRecord},
+   {"sha1_hash",PkgRecordsGetSHA1Hash},
+   {"sha256_hash",PkgRecordsGetSHA256Hash},
+   {"short_desc",PkgRecordsGetShortDesc},
+   {"source_pkg",PkgRecordsGetSourcePkg},
+   {"source_ver",PkgRecordsGetSourceVer},
+#ifdef COMPAT_0_7
+   {"FileName",PkgRecordsGetFileName},
+   {"Homepage",PkgRecordsGetHomepage},
+   {"LongDesc",PkgRecordsGetLongDesc},
+   {"MD5Hash",PkgRecordsGetMD5Hash},
+   {"Maintainer",PkgRecordsGetMaintainer},
+   {"Name",PkgRecordsGetName},
+   {"Record",PkgRecordsGetRecord},
+   {"SHA1Hash",PkgRecordsGetSHA1Hash},
+   {"SHA256Hash",PkgRecordsGetSHA256Hash},
+   {"ShortDesc",PkgRecordsGetShortDesc},
+   {"SourcePkg",PkgRecordsGetSourcePkg},
+   {"SourceVer",PkgRecordsGetSourceVer},
+#endif
+   {}
+};
+
+static PyObject *PkgRecordsNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
+{
+   PyObject *Owner;
+   char *kwlist[] = {"cache",0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyCache_Type,
+                                   &Owner) == 0)
+      return 0;
 
-   return Py_FindMethod(PkgRecordsMethods,Self,Name);
+   return HandleErrors(CppOwnedPyObject_NEW<PkgRecordsStruct>(Owner,type,
+							      GetCpp<pkgCache *>(Owner)));
 }
-PyTypeObject PkgRecordsType =
+
+PyTypeObject PyPackageRecords_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgRecords",                          // tp_name
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.PackageRecords",                          // tp_name
    sizeof(CppOwnedPyObject<PkgRecordsStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
    CppOwnedDealloc<PkgRecordsStruct>,   // tp_dealloc
    0,                                   // tp_print
-   PkgRecordsAttr,                      // tp_getattr
+   0,                                    // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
@@ -109,17 +178,43 @@ PyTypeObject PkgRecordsType =
    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 |
+    Py_TPFLAGS_HAVE_GC),
+   "Records Object",                    // tp_doc
+   CppOwnedTraverse<PkgRecordsStruct>,  // tp_traverse
+   CppOwnedClear<PkgRecordsStruct>,     // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgRecordsMethods,                   // tp_methods
+   0,                                   // tp_members
+   PkgRecordsGetSet,                    // 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
+   PkgRecordsNew,                       // tp_new
 };
 
 									/*}}}*/
 
+
+#ifdef COMPAT_0_7
 PyObject *GetPkgRecords(PyObject *Self,PyObject *Args)
 {
-   PyObject *Owner;
-   if (PyArg_ParseTuple(Args,"O!",&PkgCacheType,&Owner) == 0)
-      return 0;
-
-   return HandleErrors(CppOwnedPyObject_NEW<PkgRecordsStruct>(Owner,&PkgRecordsType,
-							      GetCpp<pkgCache *>(Owner)));
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgRecords() is "
+                 "deprecated. Please see apt_pkg.Records() for the "
+                 "replacement.", 1);
+    return PkgRecordsNew(&PyPackageRecords_Type,Args,0);
 }
-
+#endif