Merge branch 'master' of github.com:celery/kombu

zendesk · Nov 11, 2016 · 173b7a1 · 173b7a1
2 parents bf64bf0 + 32997b1
commit 173b7a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/userguide/consumers.rst b/docs/userguide/consumers.rst
@@ -18,7 +18,7 @@ drain events from all channels on that connection.
 
     Kombu since 3.0 will only accept json/binary or text messages by default,
     to allow deserialization of other formats you have to specify them
-    in the ``accept`` argument:
+    in the ``accept`` argument (in addition to setting the right content type for your messages):
 
     .. code-block:: python
 

diff --git a/examples/rpc-tut6/rpc_client.py b/examples/rpc-tut6/rpc_client.py
@@ -23,7 +23,7 @@ def call(self, n):
                 exchange='',
                 routing_key='rpc_queue',
                 declare=[self.callback_queue],
-                reply_to=self.callback_queue,
+                reply_to=self.callback_queue.name,
                 correlation_id=self.correlation_id,
             )
         with Consumer(self.connection,