diff options
author | Barry Warsaw <barry@python.org> | 2011-12-13 16:21:04 -0500 |
---|---|---|
committer | Barry Warsaw <barry@python.org> | 2011-12-13 16:21:04 -0500 |
commit | 4a26dab362e8ddd7a765f1249649408f62eb96e7 (patch) | |
tree | b21b1a211a19e75cbb35ee1fa8c409d71a183839 | |
parent | deccd695a43573d31183fe0e93316d306ce989f2 (diff) | |
download | dbus-python-4a26dab362e8ddd7a765f1249649408f62eb96e7.tar.gz |
Additional PyObject_HEAD_INIT -> PyVarObject_HEAD_INIT changes in preparation
for Python 3 support.
-rw-r--r-- | _dbus_bindings/abstract.c | 12 | ||||
-rw-r--r-- | _dbus_bindings/conn.c | 3 | ||||
-rw-r--r-- | _dbus_bindings/int.c | 3 | ||||
-rw-r--r-- | _dbus_bindings/libdbusconn.c | 3 | ||||
-rw-r--r-- | _dbus_bindings/message.c | 15 | ||||
-rw-r--r-- | _dbus_bindings/server.c | 3 |
6 files changed, 13 insertions, 26 deletions
diff --git a/_dbus_bindings/abstract.c b/_dbus_bindings/abstract.c index 4797ca5..6d77819 100644 --- a/_dbus_bindings/abstract.c +++ b/_dbus_bindings/abstract.c @@ -215,8 +215,7 @@ DBusPythonInt_tp_repr(PyObject *self) } PyTypeObject DBusPyIntBase_Type = { - PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type)) - 0, + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "_dbus_bindings._IntBase", sizeof(DBusPyIntBase), 0, @@ -327,8 +326,7 @@ DBusPythonFloat_tp_repr(PyObject *self) } PyTypeObject DBusPyFloatBase_Type = { - PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type)) - 0, + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "_dbus_bindings._FloatBase", sizeof(DBusPyFloatBase), 0, @@ -445,8 +443,7 @@ DBusPyStrBase_tp_dealloc(PyObject *self) } PyTypeObject DBusPyStrBase_Type = { - PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type)) - 0, + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "_dbus_bindings._StrBase", 0, 0, @@ -563,8 +560,7 @@ DBusPyLongBase_tp_dealloc(PyObject *self) } PyTypeObject DBusPyLongBase_Type = { - PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type)) - 0, + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "_dbus_bindings._LongBase", 0, 0, diff --git a/_dbus_bindings/conn.c b/_dbus_bindings/conn.c index 933cfdb..40f6cf5 100644 --- a/_dbus_bindings/conn.c +++ b/_dbus_bindings/conn.c @@ -404,8 +404,7 @@ static void Connection_tp_dealloc(Connection *self) /* Connection type object =========================================== */ PyTypeObject DBusPyConnection_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "_dbus_bindings.Connection", /*tp_name*/ sizeof(Connection), /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/_dbus_bindings/int.c b/_dbus_bindings/int.c index fbc4163..cc5efff 100644 --- a/_dbus_bindings/int.c +++ b/_dbus_bindings/int.c @@ -86,8 +86,7 @@ Boolean_tp_repr (PyObject *self) } PyTypeObject DBusPyBoolean_Type = { - PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type)) - 0, + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "dbus.Boolean", 0, 0, diff --git a/_dbus_bindings/libdbusconn.c b/_dbus_bindings/libdbusconn.c index f426650..e9401fe 100644 --- a/_dbus_bindings/libdbusconn.c +++ b/_dbus_bindings/libdbusconn.c @@ -77,8 +77,7 @@ DBusPyLibDBusConnection_tp_dealloc(Connection *self) } PyTypeObject DBusPyLibDBusConnection_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "_dbus_bindings._LibDBusConnection", sizeof(DBusPyLibDBusConnection), 0, /*tp_itemsize*/ diff --git a/_dbus_bindings/message.c b/_dbus_bindings/message.c index 1658acb..e10d888 100644 --- a/_dbus_bindings/message.c +++ b/_dbus_bindings/message.c @@ -808,8 +808,7 @@ static PyMethodDef Message_tp_methods[] = { }; static PyTypeObject MessageType = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "dbus.lowlevel.Message", /*tp_name*/ sizeof(Message), /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -850,8 +849,7 @@ static PyTypeObject MessageType = { }; static PyTypeObject MethodCallMessageType = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "dbus.lowlevel.MethodCallMessage", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -892,8 +890,7 @@ static PyTypeObject MethodCallMessageType = { }; static PyTypeObject MethodReturnMessageType = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "dbus.lowlevel.MethodReturnMessage", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -934,8 +931,7 @@ static PyTypeObject MethodReturnMessageType = { }; static PyTypeObject SignalMessageType = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "dbus.lowlevel.SignalMessage", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ @@ -976,8 +972,7 @@ static PyTypeObject SignalMessageType = { }; static PyTypeObject ErrorMessageType = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "dbus.lowlevel.ErrorMessage", /*tp_name*/ 0, /*tp_basicsize*/ 0, /*tp_itemsize*/ diff --git a/_dbus_bindings/server.c b/_dbus_bindings/server.c index f733990..48a1a2b 100644 --- a/_dbus_bindings/server.c +++ b/_dbus_bindings/server.c @@ -511,8 +511,7 @@ struct PyMethodDef DBusPyServer_tp_methods[] = { }; PyTypeObject DBusPyServer_Type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ + PyVarObject_HEAD_INIT(NULL, 0) "_dbus_bindings._Server",/*tp_name*/ sizeof(Server), /*tp_basicsize*/ 0, /*tp_itemsize*/ |