python: Use PyVarObject_HEAD_INIT() instead of PyObject_HEAD_INIT().

This is related to PEP 3123 and fixes some compiler warnings.

16 files changed, 34 insertions, 121 deletions

diff --git a/python/acquire.cc b/python/acquire.cc
index a36012bc..6c6c2ea4 100644
--- a/python/acquire.cc
+++ b/python/acquire.cc
@@ -105,10 +105,7 @@ static PyObject *AcquireItemRepr(PyObject *Self)
 
 PyTypeObject AcquireItemType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.AcquireItem",         // tp_name
    sizeof(CppOwnedPyObject<pkgAcquire::ItemIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -267,10 +264,7 @@ static char *doc_PkgAcquire = "Acquire(progress) -> Acquire() object.\n\n"
 
 PyTypeObject PkgAcquireType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Acquire",                   // tp_name
    sizeof(CppPyObject<pkgAcquire*>),    // tp_basicsize
    0,                                   // tp_itemsize
@@ -360,11 +354,8 @@ static char *doc_PkgAcquireFile =
 
 PyTypeObject PkgAcquireFileType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
-   "apt_pkg.AcquireFile",                   // tp_name
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.AcquireFile",                // tp_name
    sizeof(CppOwnedPyObject<pkgAcqFile*>),// tp_basicsize
    0,                                   // tp_itemsize
    // Methods
diff --git a/python/cache.cc b/python/cache.cc
index 0f5e27eb..a571788f 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -299,10 +299,7 @@ static char *doc_PkgCache = "Cache([progress]) -> Cache() object.\n\n"
 static PyMappingMethods CacheMap = {0,CacheMapOp,0};
 PyTypeObject PkgCacheType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Cache",                     // tp_name
    sizeof(CppOwnedPyObject<pkgCache *>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -349,10 +346,7 @@ PyTypeObject PkgCacheType =
 // ---------------------------------------------------------------------
 PyTypeObject PkgCacheFileType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "pkgCacheFile",                      // tp_name
    sizeof(CppOwnedPyObject<pkgCacheFile*>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -425,10 +419,7 @@ static PySequenceMethods PkgListSeq =
 
 PyTypeObject PkgListType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageList",               // tp_name
    sizeof(CppOwnedPyObject<PkgListStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -550,10 +541,7 @@ static PyObject *PackageRepr(PyObject *Self)
 
 PyTypeObject PackageType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Package",                 // tp_name
    sizeof(CppOwnedPyObject<pkgCache::PkgIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -641,10 +629,7 @@ static PyObject *DescriptionRepr(PyObject *Self)
 
 PyTypeObject DescriptionType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Description",               // tp_name
    sizeof(CppOwnedPyObject<pkgCache::DescIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -904,10 +889,7 @@ static PyGetSetDef VersionGetSet[] = {
 
 PyTypeObject VersionType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Version",                   // tp_name
    sizeof(CppOwnedPyObject<pkgCache::VerIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -1068,10 +1050,7 @@ static PyGetSetDef PackageFileGetSet[] = {
 };
 
 PyTypeObject PackageFileType = {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                                    // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageFile",                                // tp_name
    sizeof(CppOwnedPyObject<pkgCache::PkgFileIterator>),  // tp_basicsize
    0,                                                    // tp_itemsize
@@ -1243,10 +1222,7 @@ static PyGetSetDef DependencyGetSet[] = {
 
 PyTypeObject DependencyType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Dependency",                // tp_name
    sizeof(CppOwnedPyObject<pkgCache::DepIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -1331,10 +1307,7 @@ static PySequenceMethods RDepListSeq =
 
 PyTypeObject RDepListType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.DependencyList",             // tp_name
    sizeof(CppOwnedPyObject<RDepListStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/cdrom.cc b/python/cdrom.cc
index e2651670..492afd90 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -85,10 +85,7 @@ static PyObject *PkgCdromNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 
 PyTypeObject PkgCdromType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Cdrom",                     // tp_name
    sizeof(CppOwnedPyObject<PkgCdromStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/configuration.cc b/python/configuration.cc
index 9ef5967b..07f55957 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -503,10 +503,7 @@ static PySequenceMethods ConfigurationSeq = {0,0,0,0,0,0,0,CnfContains,0,0};
 static PyMappingMethods ConfigurationMap = {0,CnfMap,CnfMapSet};
 PyTypeObject ConfigurationType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.Configuration",             // tp_name
    sizeof(CppPyObject<Configuration>),  // tp_basicsize
    0,                                   // tp_itemsize
@@ -550,10 +547,7 @@ PyTypeObject ConfigurationType =
 
 PyTypeObject ConfigurationPtrType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ConfigurationPtr",          // tp_name
    sizeof(CppPyObject<Configuration *>),  // tp_basicsize
    0,                                   // tp_itemsize
@@ -589,10 +583,7 @@ PyTypeObject ConfigurationPtrType =
 
 PyTypeObject ConfigurationSubType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ConfigurationSub",     // tp_name
    sizeof(SubConfiguration),            // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/depcache.cc b/python/depcache.cc
index 9c0c9a6f..2ce7a595 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -667,10 +667,7 @@ static char *doc_PkgDepCache = "DepCache(cache) -> DepCache() object\n\n"
     "The parameter *cache* refers to an apt_pkg.Cache() object.";
 PyTypeObject PkgDepCacheType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.DepCache",                  // tp_name
    sizeof(CppOwnedPyObject<pkgDepCache *>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -858,10 +855,7 @@ static PyMethodDef PkgProblemResolverMethods[] =
 
 PyTypeObject PkgProblemResolverType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ProblemResolver",                       // tp_name
    sizeof(CppOwnedPyObject<pkgProblemResolver *>),   // tp_basicsize
    0,                                   // tp_itemsize
@@ -977,10 +971,7 @@ static char *doc_PkgActionGroup = "ActionGroup(depcache)\n\n"
 
 PyTypeObject PkgActionGroupType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.ActionGroup",               // tp_name
    sizeof(CppOwnedPyObject<pkgDepCache::ActionGroup*>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/generic.h b/python/generic.h
index 182b1b53..118917cb 100644
--- a/python/generic.h
+++ b/python/generic.h
@@ -63,6 +63,7 @@ typedef int Py_ssize_t;
 #define PyBytes_Check PyString_Check
 #define PyBytes_AsString PyString_AsString
 #define PyBytes_AsStringAndSize PyString_AsStringAndSize
+#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
 #endif
 #endif
 
diff --git a/python/hashstring.cc b/python/hashstring.cc
index 23212a4b..6f70ac7e 100644
--- a/python/hashstring.cc
+++ b/python/hashstring.cc
@@ -95,10 +95,7 @@ static char *HashString_doc =
     "   HashString('MD5Sum', '6cc1b6e6655e3555ac47e5b5fe26d04e')\n\n"
     "Valid options for 'type' are: MD5Sum, SHA1, SHA256.";
 PyTypeObject PyHashString_Type = {
-    PyObject_HEAD_INIT(&PyType_Type)
-#if PY_MAJOR_VERSION < 3
-    0,                                 // ob_size
-#endif
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
     "apt_pkg.HashString",              // tp_name
     sizeof(CppPyObject<HashString*>),  // tp_basicsize
     0,                                 // tp_itemsize
diff --git a/python/indexfile.cc b/python/indexfile.cc
index 73f76ce6..5b526b87 100644
--- a/python/indexfile.cc
+++ b/python/indexfile.cc
@@ -90,10 +90,7 @@ static PyGetSetDef PackageIndexFileGetSet[] = {
 
 PyTypeObject PackageIndexFileType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageIndexFile",          // tp_name
    sizeof(CppOwnedPyObject<pkgIndexFile*>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/indexrecords.cc b/python/indexrecords.cc
index fcb2b85d..588cf883 100644
--- a/python/indexrecords.cc
+++ b/python/indexrecords.cc
@@ -81,10 +81,7 @@ static PyMethodDef IndexRecords_Methods[] = {
 static char *IndexRecords_doc = "IndexRecords()\n\n"
     "Representation of a release file.";
 PyTypeObject PyIndexRecords_Type = {
-    PyObject_HEAD_INIT(&PyType_Type)
-#if PY_MAJOR_VERSION < 3
-    0,                                   // ob_size
-#endif
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
     "apt_pkg.IndexRecords",              // tp_name
     sizeof(CppPyObject<indexRecords*>),  // tp_basicsize
     0,                                   // tp_itemsize
diff --git a/python/metaindex.cc b/python/metaindex.cc
index b5d194b4..87b1e59a 100644
--- a/python/metaindex.cc
+++ b/python/metaindex.cc
@@ -72,10 +72,7 @@ static PyObject *MetaIndexRepr(PyObject *Self)
 
 PyTypeObject MetaIndexType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                      // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.MetaIndex",                    // tp_name
    sizeof(CppOwnedPyObject<metaIndex*>),   // tp_basicsize
    0,                                      // tp_itemsize
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc
index 668f7cfc..9e9cc32d 100644
--- a/python/pkgmanager.cc
+++ b/python/pkgmanager.cc
@@ -133,10 +133,7 @@ static PyGetSetDef PkgManagerGetSet[] = {
 
 PyTypeObject PkgManagerType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageManager",           // tp_name
    sizeof(CppPyObject<pkgPackageManager*>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index 4a3c80db..886bdb58 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -163,10 +163,7 @@ static PyObject *PkgRecordsNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 
 PyTypeObject PkgRecordsType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.PackageRecords",                          // tp_name
    sizeof(CppOwnedPyObject<PkgRecordsStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 9707dce2..187050b7 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -204,10 +204,7 @@ static PyObject *PkgSrcRecordsNew(PyTypeObject *type,PyObject *args,PyObject *kw
 
 PyTypeObject PkgSrcRecordsType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.SourceRecords",     // tp_name
    sizeof(CppPyObject<PkgSrcRecordsStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/policy.cc b/python/policy.cc
index 5150af91..91ed5454 100644
--- a/python/policy.cc
+++ b/python/policy.cc
@@ -143,10 +143,7 @@ static char *Policy_doc = "Policy(cache)\n\n"
     "may be some cases where a special policy class is needed.";
 
 PyTypeObject PyPolicy_Type = {
-    PyObject_HEAD_INIT(&PyType_Type)
-#if PY_MAJOR_VERSION < 3
-    0,                                   // ob_size
-#endif
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
     "apt_pkg.Policy",                    // tp_name
     sizeof(CppOwnedPyObject<pkgPolicy*>),// tp_basicsize
     0,                                   // tp_itemsize
diff --git a/python/sourcelist.cc b/python/sourcelist.cc
index 2cf5eea9..0820d5bf 100644
--- a/python/sourcelist.cc
+++ b/python/sourcelist.cc
@@ -115,10 +115,7 @@ static PyObject *PkgSourceListNew(PyTypeObject *type,PyObject *args,PyObject *kw
 
 PyTypeObject PkgSourceListType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,			                // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.SourceList",                          // tp_name
    sizeof(CppPyObject<pkgSourceList*>),   // tp_basicsize
    0,                                   // tp_itemsize
diff --git a/python/tag.cc b/python/tag.cc
index 1ad0a465..2b71517d 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -175,6 +175,7 @@ static PyObject *TagSecKeys(PyObject *Self,PyObject *Args)
    return List;
 }
 
+#if PY_MAJOR_VERSION < 3
 static char *doc_Exists = "Exists(Name) -> integer";
 static PyObject *TagSecExists(PyObject *Self,PyObject *Args)
 {
@@ -188,6 +189,7 @@ static PyObject *TagSecExists(PyObject *Self,PyObject *Args)
       return Py_BuildValue("i",0);
    return Py_BuildValue("i",1);
 }
+#endif
 
 static int TagSecContains(PyObject *Self,PyObject *Arg)
 {
@@ -436,10 +438,7 @@ static char *doc_TagSec = "TagSection(text) -> Create a new object.\n\n"
    "to the functions provided by the C++ class (e.g. Find)";
 PyTypeObject TagSecType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.TagSection",                // tp_name
    sizeof(TagSecData),                  // tp_basicsize
    0,                                   // tp_itemsize
@@ -525,10 +524,7 @@ static char *doc_TagFile = "TagFile(file) -> TagFile() object. \n\n"
 // Type for a Tag File
 PyTypeObject TagFileType =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   #if PY_MAJOR_VERSION < 3
-   0,                                   // ob_size
-   #endif
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "apt_pkg.TagFile",                   // tp_name
    sizeof(TagFileData),                 // tp_basicsize
    0,                                   // tp_itemsize