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/configuration.cc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'python/configuration.cc')

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