Use Py_TYPE() rather than thing->ob_type, for Python 3 portability

Based on part of a patch from Barry Warsaw.

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

13 files changed, 25 insertions, 25 deletions

diff --git a/_dbus_bindings/abstract.c b/_dbus_bindings/abstract.c
index 30def6e..4797ca5 100644
--- a/_dbus_bindings/abstract.c
+++ b/_dbus_bindings/abstract.c
@@ -201,12 +201,12 @@ DBusPythonInt_tp_repr(PyObject *self)
     if (!parent_repr) return NULL;
     if (variant_level > 0) {
         my_repr = PyString_FromFormat("%s(%s, variant_level=%ld)",
-                                      self->ob_type->tp_name,
+                                      Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr),
                                       variant_level);
     }
     else {
-        my_repr = PyString_FromFormat("%s(%s)", self->ob_type->tp_name,
+        my_repr = PyString_FromFormat("%s(%s)", Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr));
     }
     /* whether my_repr is NULL or not: */
@@ -313,12 +313,12 @@ DBusPythonFloat_tp_repr(PyObject *self)
     if (!parent_repr) return NULL;
     if (variant_level > 0) {
         my_repr = PyString_FromFormat("%s(%s, variant_level=%ld)",
-                                      self->ob_type->tp_name,
+                                      Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr),
                                       variant_level);
     }
     else {
-        my_repr = PyString_FromFormat("%s(%s)", self->ob_type->tp_name,
+        my_repr = PyString_FromFormat("%s(%s)", Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr));
     }
     /* whether my_repr is NULL or not: */
@@ -424,12 +424,12 @@ DBusPythonString_tp_repr(PyObject *self)
     Py_CLEAR(vl_obj);
     if (variant_level > 0) {
         my_repr = PyString_FromFormat("%s(%s, variant_level=%ld)",
-                                      self->ob_type->tp_name,
+                                      Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr),
                                       variant_level);
     }
     else {
-        my_repr = PyString_FromFormat("%s(%s)", self->ob_type->tp_name,
+        my_repr = PyString_FromFormat("%s(%s)", Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr));
     }
     /* whether my_repr is NULL or not: */
@@ -542,12 +542,12 @@ DBusPythonLong_tp_repr(PyObject *self)
     Py_CLEAR(vl_obj);
     if (variant_level) {
         my_repr = PyString_FromFormat("%s(%s, variant_level=%ld)",
-                                      self->ob_type->tp_name,
+                                      Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr),
                                       variant_level);
     }
     else {
-        my_repr = PyString_FromFormat("%s(%s)", self->ob_type->tp_name,
+        my_repr = PyString_FromFormat("%s(%s)", Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr));
     }
     /* whether my_repr is NULL or not: */
diff --git a/_dbus_bindings/bytes.c b/_dbus_bindings/bytes.c
index 5c76ec2..06d3d47 100644
--- a/_dbus_bindings/bytes.c
+++ b/_dbus_bindings/bytes.c
@@ -89,7 +89,7 @@ Byte_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs)
     else if (PyInt_Check(obj)) {
         long i = PyInt_AS_LONG(obj);
 
-        if (obj->ob_type == cls &&
+        if (Py_TYPE(obj) == cls &&
             ((DBusPyIntBase *)obj)->variant_level == variantness) {
             Py_INCREF(obj);
             return obj;
diff --git a/_dbus_bindings/conn.c b/_dbus_bindings/conn.c
index c90edf7..933cfdb 100644
--- a/_dbus_bindings/conn.c
+++ b/_dbus_bindings/conn.c
@@ -398,7 +398,7 @@ static void Connection_tp_dealloc(Connection *self)
 
     DBG("Connection at %p: freeing self", self);
     PyErr_Restore(et, ev, etb);
-    (self->ob_type->tp_free)((PyObject *)self);
+    (Py_TYPE(self)->tp_free)((PyObject *)self);
 }
 
 /* Connection type object =========================================== */
diff --git a/_dbus_bindings/containers.c b/_dbus_bindings/containers.c
index 7c4d535..9bb8ec9 100644
--- a/_dbus_bindings/containers.c
+++ b/_dbus_bindings/containers.c
@@ -525,14 +525,14 @@ Struct_tp_repr(PyObject *self)
     if (variant_level > 0) {
         my_repr = PyString_FromFormat("%s(%s, signature=%s, "
                                       "variant_level=%ld)",
-                                      self->ob_type->tp_name,
+                                      Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr),
                                       PyString_AS_STRING(sig_repr),
                                       variant_level);
     }
     else {
         my_repr = PyString_FromFormat("%s(%s, signature=%s)",
-                                      self->ob_type->tp_name,
+                                      Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr),
                                       PyString_AS_STRING(sig_repr));
     }
diff --git a/_dbus_bindings/dbus_bindings-internal.h b/_dbus_bindings/dbus_bindings-internal.h
index b8a8820..fd2efb6 100644
--- a/_dbus_bindings/dbus_bindings-internal.h
+++ b/_dbus_bindings/dbus_bindings-internal.h
@@ -48,7 +48,7 @@ static inline int type##_Check (PyObject *o) \
 } \
 static inline int type##_CheckExact (PyObject *o) \
 { \
-    return ((o)->ob_type == &type##_Type); \
+    return (Py_TYPE(o) == &type##_Type); \
 }
 
 PyMODINIT_FUNC init_dbus_bindings(void);
@@ -203,7 +203,7 @@ void _dbus_py_dbg_dump_message(DBusMessage *);
 
 #   define TRACE(self) do { fprintf(stderr, "TRACE: <%s at %p> in %s, " \
                                     "%d refs\n", \
-                                    self->ob_type->tp_name, \
+                                    Py_TYPE(self)->tp_name, \
                                     self, __func__, \
                                     self->ob_refcnt); } while (0)
 #   define DBG(format, ...) fprintf(stderr, "DEBUG: " format "\n",\
diff --git a/_dbus_bindings/int.c b/_dbus_bindings/int.c
index f49d50a..07fa928 100644
--- a/_dbus_bindings/int.c
+++ b/_dbus_bindings/int.c
@@ -76,12 +76,12 @@ Boolean_tp_repr (PyObject *self)
     long variant_level = ((DBusPyIntBase *)self)->variant_level;
     if (variant_level > 0) {
         return PyString_FromFormat("%s(%s, variant_level=%ld)",
-                                   self->ob_type->tp_name,
+                                   Py_TYPE(self)->tp_name,
                                    PyInt_AsLong(self) ? "True" : "False",
                                    variant_level);
     }
     return PyString_FromFormat("%s(%s)",
-                               self->ob_type->tp_name,
+                               Py_TYPE(self)->tp_name,
                                PyInt_AsLong(self) ? "True" : "False");
 }
 
diff --git a/_dbus_bindings/libdbusconn.c b/_dbus_bindings/libdbusconn.c
index 0c87078..f426650 100644
--- a/_dbus_bindings/libdbusconn.c
+++ b/_dbus_bindings/libdbusconn.c
@@ -73,7 +73,7 @@ DBusPyLibDBusConnection_tp_dealloc(Connection *self)
     }
 
     PyErr_Restore(et, ev, etb);
-    (self->ob_type->tp_free)((PyObject *) self);
+    (Py_TYPE(self)->tp_free)((PyObject *) self);
 }
 
 PyTypeObject DBusPyLibDBusConnection_Type = {
diff --git a/_dbus_bindings/message-append.c b/_dbus_bindings/message-append.c
index af4a94c..3debc09 100644
--- a/_dbus_bindings/message-append.c
+++ b/_dbus_bindings/message-append.c
@@ -360,7 +360,7 @@ _signature_string_from_pyobject(PyObject *obj, long *variant_level_ptr)
     else {
         PyErr_Format(PyExc_TypeError, "Don't know how which D-Bus type "
                      "to use to encode type \"%s\"",
-                     obj->ob_type->tp_name);
+                     Py_TYPE(obj)->tp_name);
         return NULL;
     }
 }
diff --git a/_dbus_bindings/message-get-args.c b/_dbus_bindings/message-get-args.c
index 032d530..fef2a45 100644
--- a/_dbus_bindings/message-get-args.c
+++ b/_dbus_bindings/message-get-args.c
@@ -94,7 +94,7 @@ _message_iter_append_all_to_list(DBusMessageIter *iter, PyObject *list,
 #ifdef USING_DBG
         fprintf(stderr, "DBG/%ld: appending to list: %p == ", (long)getpid(), item);
         PyObject_Print(item, stderr, 0);
-        fprintf(stderr, " of type %p\n", item->ob_type);
+        fprintf(stderr, " of type %p\n", Py_TYPE(item));
 #endif
         ret = PyList_Append(list, item);
         Py_CLEAR(item);
diff --git a/_dbus_bindings/message.c b/_dbus_bindings/message.c
index 5aed54d..1658acb 100644
--- a/_dbus_bindings/message.c
+++ b/_dbus_bindings/message.c
@@ -32,7 +32,7 @@ static PyTypeObject MethodReturnMessageType, MethodCallMessageType;
 
 static inline int Message_Check(PyObject *o)
 {
-    return (o->ob_type == &MessageType)
+    return (Py_TYPE(o) == &MessageType)
             || PyObject_IsInstance(o, (PyObject *)&MessageType);
 }
 
@@ -53,7 +53,7 @@ static void Message_tp_dealloc(Message *self)
     if (self->msg) {
         dbus_message_unref(self->msg);
     }
-    self->ob_type->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 static PyObject *
diff --git a/_dbus_bindings/pending-call.c b/_dbus_bindings/pending-call.c
index aac2af8..88747be 100644
--- a/_dbus_bindings/pending-call.c
+++ b/_dbus_bindings/pending-call.c
@@ -34,7 +34,7 @@ static PyTypeObject PendingCallType;
 
 static inline int PendingCall_Check (PyObject *o)
 {
-    return (o->ob_type == &PendingCallType)
+    return (Py_TYPE(o) == &PendingCallType)
             || PyObject_IsInstance(o, (PyObject *)&PendingCallType);
 }
 
diff --git a/_dbus_bindings/server.c b/_dbus_bindings/server.c
index a575fc0..f733990 100644
--- a/_dbus_bindings/server.c
+++ b/_dbus_bindings/server.c
@@ -429,7 +429,7 @@ static void Server_tp_dealloc(Server *self)
 
     DBG("Server at %p: freeing self", self);
     PyErr_Restore(et, ev, etb);
-    (self->ob_type->tp_free)((PyObject *)self);
+    (Py_TYPE(self)->tp_free)((PyObject *)self);
 }
 
 PyDoc_STRVAR(Server_disconnect__doc__,
diff --git a/_dbus_bindings/string.c b/_dbus_bindings/string.c
index 03f966c..a2f8537 100644
--- a/_dbus_bindings/string.c
+++ b/_dbus_bindings/string.c
@@ -276,12 +276,12 @@ String_tp_repr(PyObject *self)
     }
     if (((DBusPyString *)self)->variant_level > 0) {
         my_repr = PyString_FromFormat("%s(%s, variant_level=%ld)",
-                                      self->ob_type->tp_name,
+                                      Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr),
                                       ((DBusPyString *)self)->variant_level);
     }
     else {
-        my_repr = PyString_FromFormat("%s(%s)", self->ob_type->tp_name,
+        my_repr = PyString_FromFormat("%s(%s)", Py_TYPE(self)->tp_name,
                                       PyString_AS_STRING(parent_repr));
     }
     /* whether my_repr is NULL or not: */