Consistently use the str type for identifier-like (ASCII) strings

Porting to Python 3 left these methods returning unicode, which is
arguably an API break in Python 2:

* Message.get_member
* Message.get_path_decomposed (array of unicode)
* Message.get_sender
* Message.get_destination
* Message.get_interface
* Message.get_error_name
* Server.get_address
* Server.get_id

Instead, make them return whatever the natural str type is (bytes in
Python 2, unicode in Python 3).

5 files changed, 12 insertions, 20 deletions

diff --git a/_dbus_bindings/bus.c b/_dbus_bindings/bus.c
index 9d28971..99d98c2 100644
--- a/_dbus_bindings/bus.c
+++ b/_dbus_bindings/bus.c
@@ -156,11 +156,7 @@ DBusPyConnection_GetUniqueName(Connection *self, PyObject *args UNUSED)
         return DBusPyException_SetString("This connection has no unique name "
                                          "yet");
     }
-#ifdef PY3
-    return PyUnicode_FromString(name);
-#else
-    return PyBytes_FromString(name);
-#endif
+    return NATIVESTR_FROMSTR(name);
 }
 
 PyObject *
diff --git a/_dbus_bindings/conn-methods.c b/_dbus_bindings/conn-methods.c
index f2ce887..a5390c5 100644
--- a/_dbus_bindings/conn-methods.c
+++ b/_dbus_bindings/conn-methods.c
@@ -976,11 +976,7 @@ Connection_list_exported_child_objects (Connection *self, PyObject *args,
         return NULL;
     }
     for (kid_ptr = kids; *kid_ptr; kid_ptr++) {
-#ifdef PY3
-        PyObject *tmp = PyUnicode_FromString(*kid_ptr);
-#else
-        PyObject *tmp = PyBytes_FromString(*kid_ptr);
-#endif
+        PyObject *tmp = NATIVESTR_FROMSTR(*kid_ptr);
 
         if (!tmp) {
             Py_CLEAR(ret);
diff --git a/_dbus_bindings/exceptions.c b/_dbus_bindings/exceptions.c
index e289e52..6721f5c 100644
--- a/_dbus_bindings/exceptions.c
+++ b/_dbus_bindings/exceptions.c
@@ -37,7 +37,7 @@ import_exception(void)
         return TRUE;
     }
 
-    name = PyUnicode_FromString("dbus.exceptions");
+    name = NATIVESTR_FROMSTR("dbus.exceptions");
     if (name == NULL) {
         return FALSE;
     }
@@ -81,7 +81,7 @@ DBusPyException_ConsumeError(DBusError *error)
     }
 
     if (error->name) {
-        PyObject *name = PyUnicode_FromString(error->name);
+        PyObject *name = NATIVESTR_FROMSTR(error->name);
         int ret;
 
         if (!name)
diff --git a/_dbus_bindings/message.c b/_dbus_bindings/message.c
index 149d9c4..32bb84a 100644
--- a/_dbus_bindings/message.c
+++ b/_dbus_bindings/message.c
@@ -462,7 +462,7 @@ Message_get_member(Message *self, PyObject *unused UNUSED)
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return PyUnicode_FromString(c_str);
+    return NATIVESTR_FROMSTR(c_str);
 }
 
 PyDoc_STRVAR(Message_has_member__doc__,
@@ -537,7 +537,7 @@ Message_get_path_decomposed(Message *self, PyObject *unused UNUSED)
         Py_RETURN_NONE;
     }
     for (ptr = paths; *ptr; ptr++) {
-        PyObject *str = PyUnicode_FromString(*ptr);
+        PyObject *str = NATIVESTR_FROMSTR(*ptr);
 
         if (!str) {
             Py_CLEAR(ret);
@@ -623,7 +623,7 @@ Message_get_sender(Message *self, PyObject *unused UNUSED)
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return PyUnicode_FromString(c_str);
+    return NATIVESTR_FROMSTR(c_str);
 }
 
 PyDoc_STRVAR(Message_has_sender__doc__,
@@ -669,7 +669,7 @@ Message_get_destination(Message *self, PyObject *unused UNUSED)
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return PyUnicode_FromString(c_str);
+    return NATIVESTR_FROMSTR(c_str);
 }
 
 PyDoc_STRVAR(Message_has_destination__doc__,
@@ -714,7 +714,7 @@ Message_get_interface(Message *self, PyObject *unused UNUSED)
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return PyUnicode_FromString(c_str);
+    return NATIVESTR_FROMSTR(c_str);
 }
 
 PyDoc_STRVAR(Message_has_interface__doc__,
@@ -759,7 +759,7 @@ Message_get_error_name(Message *self, PyObject *unused UNUSED)
     if (!c_str) {
         Py_RETURN_NONE;
     }
-    return PyUnicode_FromString(c_str);
+    return NATIVESTR_FROMSTR(c_str);
 }
 
 PyDoc_STRVAR(Message_set_error_name__doc__,
diff --git a/_dbus_bindings/server.c b/_dbus_bindings/server.c
index 781749d..cb489f6 100644
--- a/_dbus_bindings/server.c
+++ b/_dbus_bindings/server.c
@@ -482,7 +482,7 @@ Server_get_address(Server *self, PyObject *args UNUSED)
     address = dbus_server_get_address(self->server);
     Py_END_ALLOW_THREADS
 
-    return PyUnicode_FromString(address);
+    return NATIVESTR_FROMSTR(address);
 }
 
 PyDoc_STRVAR(Server_get_id__doc__,
@@ -499,7 +499,7 @@ Server_get_id(Server *self, PyObject *args UNUSED)
     id = dbus_server_get_id(self->server);
     Py_END_ALLOW_THREADS
 
-    return PyUnicode_FromString(id);
+    return NATIVESTR_FROMSTR(id);
 }
 
 PyDoc_STRVAR(Server_get_is_connected__doc__,