_queue_declare() should return queue name as string not bytes

Author: matusvalo

Modules/_librabbitmq/connection.c

@@ -1654,8 +1654,7 @@ PyRabbitMQ_Connection_queue_declare(PyRabbitMQ_Connection *self,
         goto bail;
 
     if ((ret = PyTuple_New(3)) == NULL) goto bail;
-    PyTuple_SET_ITEM(ret, 0, PyBytes_FromStringAndSize(ok->queue.bytes,
-                                                        (Py_ssize_t)ok->queue.len));
+    PyTuple_SET_ITEM(ret, 0, PySTRING_FROM_AMQBYTES(ok->queue));
     PyTuple_SET_ITEM(ret, 1, PyInt_FromLong((long)ok->message_count));
     PyTuple_SET_ITEM(ret, 2, PyInt_FromLong((long)ok->consumer_count));
     return ret;

Modules/_librabbitmq/connection.h

@@ -89,10 +89,10 @@ buffer_toMemoryView(char *buf, Py_ssize_t buf_len) {
 
 #if PY_MAJOR_VERSION == 2
 #  define PySTRING_FROM_AMQBYTES(member)                                        \
-        PyString_FromStringAndSize(member.bytes, (Py_ssize_t)member.len);
+        PyString_FromStringAndSize((member).bytes, (Py_ssize_t)(member).len)
 #else
 #  define PySTRING_FROM_AMQBYTES(member)                                        \
-        PyUnicode_FromStringAndSize(member.bytes, (Py_ssize_t)member.len);
+        PyUnicode_FromStringAndSize((member).bytes, (Py_ssize_t)(member).len)
 #endif