Use PyVarObject_HEAD_INIT to initialize types

Part of a patch for Python 3 compatibility.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

9 files changed, 21 insertions, 42 deletions

diff --git a/_dbus_bindings/bytes.c b/_dbus_bindings/bytes.c
index 06d3d47..d59e70b 100644
--- a/_dbus_bindings/bytes.c
+++ b/_dbus_bindings/bytes.c
@@ -127,8 +127,7 @@ Byte_tp_str(PyObject *self)
 }
 
 PyTypeObject DBusPyByte_Type = {
-        PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-        0,
+	PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
         "dbus.Byte",
         0,
         0,
@@ -194,8 +193,7 @@ PyDoc_STRVAR(ByteArray_tp_doc,
 );
 
 PyTypeObject DBusPyByteArray_Type = {
-        PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-        0,
+        PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
         "dbus.ByteArray",
         0,
         0,
diff --git a/_dbus_bindings/containers.c b/_dbus_bindings/containers.c
index 9bb8ec9..a9278f4 100644
--- a/_dbus_bindings/containers.c
+++ b/_dbus_bindings/containers.c
@@ -195,8 +195,7 @@ Array_tp_init (DBusPyArray *self, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyArray_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Array",
     sizeof(DBusPyArray),
     0,
@@ -431,8 +430,7 @@ Dict_tp_init(DBusPyDict *self, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyDict_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Dictionary",
     sizeof(DBusPyDict),
     0,
@@ -686,8 +684,7 @@ Struct_tp_getattro(PyObject *obj, PyObject *name)
 }
 
 PyTypeObject DBusPyStruct_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Struct",
     0,
     0,
diff --git a/_dbus_bindings/float.c b/_dbus_bindings/float.c
index 734c4ab..9ea8413 100644
--- a/_dbus_bindings/float.c
+++ b/_dbus_bindings/float.c
@@ -40,8 +40,7 @@ PyDoc_STRVAR(Float_tp_doc,
 #endif
 
 PyTypeObject DBusPyDouble_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Double",
     0,
     0,
@@ -84,8 +83,7 @@ PyTypeObject DBusPyDouble_Type = {
 #ifdef WITH_DBUS_FLOAT32
 
 PyTypeObject DBusPyFloat_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Float",
     0,
     0,
diff --git a/_dbus_bindings/int.c b/_dbus_bindings/int.c
index 07fa928..fbc4163 100644
--- a/_dbus_bindings/int.c
+++ b/_dbus_bindings/int.c
@@ -175,8 +175,7 @@ Int16_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyInt16_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Int16",
     0,
     0,
@@ -265,8 +264,7 @@ UInt16_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyUInt16_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.UInt16",
     0,
     0,
@@ -354,8 +352,7 @@ Int32_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyInt32_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Int32",
     0,
     0,
@@ -456,8 +453,7 @@ UInt32_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyUInt32_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.UInt32",
     0,
     0,
@@ -567,8 +563,7 @@ Int64_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyInt64_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Int64",
     0,
     0,
@@ -674,8 +669,7 @@ UInt64_tp_new (PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyUInt64_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.UInt64",
     0,
     0,
diff --git a/_dbus_bindings/mainloop.c b/_dbus_bindings/mainloop.c
index 710f474..367ae0e 100644
--- a/_dbus_bindings/mainloop.c
+++ b/_dbus_bindings/mainloop.c
@@ -59,8 +59,7 @@ static void NativeMainLoop_tp_dealloc(NativeMainLoop *self)
 }
 
 static PyTypeObject NativeMainLoop_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.mainloop.NativeMainLoop",
     sizeof(NativeMainLoop),
     0,
diff --git a/_dbus_bindings/pending-call.c b/_dbus_bindings/pending-call.c
index 88747be..469c997 100644
--- a/_dbus_bindings/pending-call.c
+++ b/_dbus_bindings/pending-call.c
@@ -233,8 +233,7 @@ static PyMethodDef PendingCall_tp_methods[] = {
 };
 
 static PyTypeObject PendingCallType = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.lowlevel.PendingCall",
     sizeof(PendingCall),
     0,
diff --git a/_dbus_bindings/signature.c b/_dbus_bindings/signature.c
index 28fa7a1..75fe154 100644
--- a/_dbus_bindings/signature.c
+++ b/_dbus_bindings/signature.c
@@ -97,8 +97,7 @@ SignatureIter_tp_iter(PyObject *self)
 }
 
 static PyTypeObject SignatureIterType = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "_dbus_bindings._SignatureIter",
     sizeof(SignatureIter),
     0,
@@ -175,8 +174,7 @@ Signature_tp_new (PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPySignature_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.Signature",
     0,
     0,
diff --git a/_dbus_bindings/string.c b/_dbus_bindings/string.c
index a2f8537..bdc94ec 100644
--- a/_dbus_bindings/string.c
+++ b/_dbus_bindings/string.c
@@ -82,8 +82,7 @@ UTF8String_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyUTF8String_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.UTF8String",
     0,
     0,
@@ -161,8 +160,7 @@ ObjectPath_tp_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
 }
 
 PyTypeObject DBusPyObjectPath_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.ObjectPath",
     0,
     0,
@@ -290,8 +288,7 @@ String_tp_repr(PyObject *self)
 }
 
 PyTypeObject DBusPyString_Type = {
-    PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
-    0,
+    PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
     "dbus.String",
     sizeof(DBusPyString),
     0,
diff --git a/_dbus_bindings/unixfd.c b/_dbus_bindings/unixfd.c
index 6e515f7..3d6bc11 100644
--- a/_dbus_bindings/unixfd.c
+++ b/_dbus_bindings/unixfd.c
@@ -159,8 +159,7 @@ static PyMethodDef UnixFd_methods[] = {
 };
 
 PyTypeObject DBusPyUnixFd_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "dbus.UnixFd",
     sizeof(UnixFdObject),
     0,