diff options
| author | Barry Warsaw <barry@python.org> | 2011-12-13 16:50:38 -0500 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2011-12-13 16:50:38 -0500 |
| commit | 033a0f2890495053fd6474d6f52d4a6e9c32cca1 (patch) | |
| tree | ca18349cd7ca8d7a87970c2cad2f1adb5991ab9a | |
| parent | 4a26dab362e8ddd7a765f1249649408f62eb96e7 (diff) | |
| download | dbus-python-033a0f2890495053fd6474d6f52d4a6e9c32cca1.tar.gz | |
- Add a few missing Py_TYPE() changes for Python 3 compatibility.
- De-tabbify a few instances that "make check" complains about.
| -rw-r--r-- | _dbus_bindings/bytes.c | 2 | ||||
| -rw-r--r-- | _dbus_bindings/containers.c | 8 | ||||
| -rw-r--r-- | _dbus_bindings/message-append.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/_dbus_bindings/bytes.c b/_dbus_bindings/bytes.c index d59e70b..e06dcd1 100644 --- a/_dbus_bindings/bytes.c +++ b/_dbus_bindings/bytes.c @@ -127,7 +127,7 @@ Byte_tp_str(PyObject *self) } PyTypeObject DBusPyByte_Type = { - PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) + PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0) "dbus.Byte", 0, 0, diff --git a/_dbus_bindings/containers.c b/_dbus_bindings/containers.c index a9278f4..c9df288 100644 --- a/_dbus_bindings/containers.c +++ b/_dbus_bindings/containers.c @@ -94,14 +94,14 @@ Array_tp_repr(DBusPyArray *self) if (variant_level > 0) { my_repr = PyString_FromFormat("%s(%s, signature=%s, " "variant_level=%ld)", - self->super.ob_type->tp_name, + Py_TYPE(&self->super)->tp_name, PyString_AS_STRING(parent_repr), PyString_AS_STRING(sig_repr), variant_level); } else { my_repr = PyString_FromFormat("%s(%s, signature=%s)", - self->super.ob_type->tp_name, + Py_TYPE(&self->super)->tp_name, PyString_AS_STRING(parent_repr), PyString_AS_STRING(sig_repr)); } @@ -301,14 +301,14 @@ Dict_tp_repr(DBusPyDict *self) if (variant_level > 0) { my_repr = PyString_FromFormat("%s(%s, signature=%s, " "variant_level=%ld)", - self->super.ob_type->tp_name, + Py_TYPE(&self->super)->tp_name, PyString_AS_STRING(parent_repr), PyString_AS_STRING(sig_repr), variant_level); } else { my_repr = PyString_FromFormat("%s(%s, signature=%s)", - self->super.ob_type->tp_name, + Py_TYPE(&self->super)->tp_name, PyString_AS_STRING(parent_repr), PyString_AS_STRING(sig_repr)); } diff --git a/_dbus_bindings/message-append.c b/_dbus_bindings/message-append.c index 9f8c3c7..32adb51 100644 --- a/_dbus_bindings/message-append.c +++ b/_dbus_bindings/message-append.c @@ -546,7 +546,7 @@ _message_iter_append_unixfd(DBusMessageIter *appender, PyObject *obj) if (PyInt_Check(obj)) { fd = PyInt_AsLong(obj); } else if (PyObject_IsInstance(obj, (PyObject*) &DBusPyUnixFd_Type)) { - fd = dbus_py_unix_fd_get_fd(obj); + fd = dbus_py_unix_fd_get_fd(obj); } else { return -1; } |