Py3: use bytes for Message payload and key

Author: edenhill

confluent_kafka/src/Producer.c

@@ -370,8 +370,8 @@ static PyMethodDef Producer_methods[] = {
 	  "message has been succesfully delivered or permanently fails delivery.\n"
 	  "\n"
 	  "  :param str topic: Topic to produce message to\n"
-	  "  :param str value: Message payload\n"
-	  "  :param str key: Message key\n"
+	  "  :param str|bytes value: Message payload\n"
+	  "  :param str|bytes key: Message key\n"
 	  "  :param int partition: Partition to produce to, elses uses the "
 	  "configured partitioner.\n"
 	  "  :param func on_delivery(err,msg): Delivery report callback to call "

confluent_kafka/src/confluent_kafka.c

@@ -339,12 +339,12 @@ static PyMethodDef Message_methods[] = {
 
 	{ "value", (PyCFunction)Message_value, METH_NOARGS,
 	  "  :returns: message value (payload) or None if not available.\n"
-	  "  :rtype: str or None\n"
+	  "  :rtype: str|bytes or None\n"
 	  "\n"
 	},
 	{ "key", (PyCFunction)Message_key, METH_NOARGS,
 	  "  :returns: message key or None if not available.\n"
-	  "  :rtype: str or None\n"
+	  "  :rtype: str|bytes or None\n"
 	  "\n"
 	},
 	{ "topic", (PyCFunction)Message_topic, METH_NOARGS,
@@ -486,10 +486,10 @@ PyObject *Message_new0 (const rd_kafka_message_t *rkm) {
 		self->topic = cfl_PyUnistr(
 			_FromString(rd_kafka_topic_name(rkm->rkt)));
 	if (rkm->payload)
-		self->value = cfl_PyUnistr(_FromStringAndSize(rkm->payload,
-							       rkm->len));
+		self->value = cfl_PyBin(_FromStringAndSize(rkm->payload,
+							   rkm->len));
 	if (rkm->key)
-		self->key = cfl_PyUnistr(
+		self->key = cfl_PyBin(
 			_FromStringAndSize(rkm->key, rkm->key_len));
 
 	self->partition = rkm->partition;

confluent_kafka/src/confluent_kafka.h

@@ -41,12 +41,12 @@
  *
  ****************************************************************************/
 
-#ifdef PY3
+#ifdef PY3 /* Python 3 */
 /**
  * @brief Binary type, use as cfl_PyBin(_X(A,B)) where _X() is the type-less
- *        suffix of a PyBinary/Str_X() function
+ *        suffix of a PyBytes/Str_X() function
 */
-#define cfl_PyBin(X)    PyBinary ## X
+#define cfl_PyBin(X)    PyBytes ## X
 
 /**
  * @brief Unicode type, same usage as PyBin()
@@ -62,7 +62,8 @@
  * @returns Unicode Python string object
  */
 #define cfl_PyObject_Unistr(X)  PyObject_Str(X)
-#else
+
+#else /* Python 2 */
 
 /* See comments above */
 #define cfl_PyBin(X)    PyString ## X