diff options
| author | Julian Andres Klode <jak@debian.org> | 2009-04-13 23:24:42 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2009-04-13 23:24:42 +0200 |
| commit | daaa814658b6d2b8e3e2437fcc625096c46395dd (patch) | |
| tree | 0d8cdb5018706bb2dcb11757a461a55eb5b6e931 /python/cdrom.cc | |
| parent | ae7f143f8162d10c7bd834e8877e42674fdb646f (diff) | |
| download | python-apt-daaa814658b6d2b8e3e2437fcc625096c46395dd.tar.gz | |
* python/cdrom.cc, python/depcache.cc: Use tp_methods for Cdrom, ProblemResolver, ActionGroup
Diffstat (limited to 'python/cdrom.cc')
| -rw-r--r-- | python/cdrom.cc | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/python/cdrom.cc b/python/cdrom.cc index 0831548e..1278d6b7 100644 --- a/python/cdrom.cc +++ b/python/cdrom.cc @@ -64,27 +64,17 @@ 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 + 0, // ob_size + "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 +82,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) |