summaryrefslogtreecommitdiff
path: root/_dbus_bindings/containers.c
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-12-14 13:36:39 -0500
committerBarry Warsaw <barry@python.org>2011-12-14 13:36:39 -0500
commit71f4481c1876785572170ef68d5624ed23f91333 (patch)
tree5b7fc38bdbf9294242acb736a3b3125e4eb9ce23 /_dbus_bindings/containers.c
parentca7a705663adbac2e781d10c13fc98a5444ef646 (diff)
In preparation for Python 3 support, use the Python 2 PyBytes aliases for the
PyString API. This makes the code compilable in Python 2.x (x >= 6) and Python 3.
Diffstat (limited to '_dbus_bindings/containers.c')
-rw-r--r--_dbus_bindings/containers.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/_dbus_bindings/containers.c b/_dbus_bindings/containers.c
index bc07f12..f74476c 100644
--- a/_dbus_bindings/containers.c
+++ b/_dbus_bindings/containers.c
@@ -166,7 +166,7 @@ Array_tp_init (DBusPyArray *self, PyObject *args, PyObject *kwargs)
}
if (signature != Py_None) {
- const char *c_str = PyString_AS_STRING(signature);
+ const char *c_str = PyBytes_AS_STRING(signature);
if (!dbus_signature_validate_single(c_str, NULL)) {
Py_CLEAR(signature);
@@ -372,7 +372,7 @@ Dict_tp_init(DBusPyDict *self, PyObject *args, PyObject *kwargs)
}
if (signature != Py_None) {
- const char *c_str = PyString_AS_STRING(signature);
+ const char *c_str = PyBytes_AS_STRING(signature);
switch (c_str[0]) {
case DBUS_TYPE_BYTE:
@@ -646,7 +646,7 @@ Struct_tp_getattro(PyObject *obj, PyObject *name)
{
PyObject *key, *value;
- if (PyString_Check(name)) {
+ if (PyBytes_Check(name)) {
Py_INCREF(name);
}
else if (PyUnicode_Check(name)) {
@@ -660,7 +660,7 @@ Struct_tp_getattro(PyObject *obj, PyObject *name)
return NULL;
}
- if (strcmp(PyString_AS_STRING(name), "signature")) {
+ if (strcmp(PyBytes_AS_STRING(name), "signature")) {
value = dbus_py_variant_level_getattro(obj, name);
Py_CLEAR(name);
return value;