python-apt (0.7.90) experimental; urgency=low

* Introduce support for Python 3 (Closes: #523645)

* Support the 'in' operator (e.g. "k in d") in Configuration{,Ptr,Sub}
  objects (e.g. apt_pkg.Config) and in TagSections (apt_pkg.ParseSection())
* Replace support for file objects with a more generic support for any object
  providing a fileno() method and for file descriptors (integers).
* Add support for the Breaks fields
* Only create Package objects when they are requested, do not keep them in
  a dict. Saves 10MB for 25,000 packages on my machine.
* apt/package.py: Allow to set the candidate of a package (Closes: #523997)
  - Support assignments to the 'candidate' property of Package objects.
  - Initial patch by Sebastian Heinlein

 -- Julian Andres Klode <jak@debian.org> Wed, 15 Apr 2009 13:47:42 +0200

1 files changed, 20 insertions, 14 deletions

diff --git a/python/cdrom.cc b/python/cdrom.cc
index 0831548e..b3a38438 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -64,27 +64,19 @@ static PyMethodDef PkgCdromMethods[] =
 };
 
 
-static PyObject *CdromAttr(PyObject *Self,char *Name)
-{
-   PkgCdromStruct &Struct = GetCpp<PkgCdromStruct>(Self);
-
-   return Py_FindMethod(PkgCdromMethods,Self,Name);
-}
-
-
-
-
 PyTypeObject PkgCdromType =
 {
    PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "Cdrom",                          // tp_name
+   #if PY_MAJOR_VERSION < 3
+   0,                                   // ob_size
+   #endif
+   "Cdrom",                             // tp_name
    sizeof(CppOwnedPyObject<PkgCdromStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<PkgCdromStruct>,        // tp_dealloc
+   CppOwnedDealloc<PkgCdromStruct>,     // tp_dealloc
    0,                                   // tp_print
-   CdromAttr,                           // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
@@ -92,6 +84,20 @@ PyTypeObject PkgCdromType =
    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
+   "Cdrom Object",                      // tp_doc
+   0,                                   // tp_traverse
+   0,                                   // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgCdromMethods,                     // tp_methods
 };
 
 PyObject *GetCdrom(PyObject *Self,PyObject *Args)