From e80500e7173387acc7a6b6be9d7424a4343ec036 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Thu, 25 Jun 2009 18:53:47 +0200
Subject: python: Use PyVarObject_HEAD_INIT() instead of PyObject_HEAD_INIT().

This is related to PEP 3123 and fixes some compiler warnings.
---
 python/depcache.cc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'python/depcache.cc')

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
-- 
cgit v1.2.3