Merge pull request #1303 from pika/pika-1255

Fix tornado consumer example

docs/examples/tornado_consumer.rst

@@ -4,9 +4,10 @@ The following example implements a consumer using the :class:`Tornado adapter <p
 
 consumer.py::
 
-    from pika import adapters
-    import pika
     import logging
+    import pika
+    from pika import adapters
+    from pika.adapters.tornado_connection import TornadoConnection
     from pika.exchange_type import ExchangeType
 
     LOG_FORMAT = ('%(levelname) -10s %(asctime)s %(name) -30s %(funcName) '
@@ -54,8 +55,10 @@ consumer.py::
 
             """
             LOGGER.info('Connecting to %s', self._url)
-            return adapters.tornado_connection.TornadoConnection(pika.URLParameters(self._url),
-                                                                 self.on_connection_open)
+            return TornadoConnection(
+                pika.URLParameters(self._url),
+                self.on_connection_open,
+            )
 
         def close_connection(self):
             """This method closes the connection to RabbitMQ."""
@@ -85,7 +88,7 @@ consumer.py::
                 self._connection.ioloop.stop()
             else:
                 LOGGER.warning('Connection closed, reopening in 5 seconds: %s',
-                               reason)
+                            reason)
                 self._connection.ioloop.call_later(5, self.reconnect)
 
         def on_connection_open(self, unused_connection):
@@ -155,9 +158,11 @@ consumer.py::
 
             """
             LOGGER.info('Declaring exchange %s', exchange_name)
-            self._channel.exchange_declare(self.on_exchange_declareok,
-                                           exchange_name,
-                                           self.EXCHANGE_TYPE)
+            self._channel.exchange_declare(
+                callback=self.on_exchange_declareok,
+                exchange=exchange_name,
+                exchange_type=self.EXCHANGE_TYPE,
+            )
 
         def on_exchange_declareok(self, unused_frame):
             """Invoked by pika when RabbitMQ has finished the Exchange.Declare RPC
@@ -178,8 +183,10 @@ consumer.py::
 
             """
             LOGGER.info('Declaring queue %s', queue_name)
-            self._channel.queue_declare(self.on_queue_declareok,
-                                        queue_name)
+            self._channel.queue_declare(
+                queue=queue_name,
+                callback=self.on_queue_declareok,
+            )
 
         def on_queue_declareok(self, method_frame):
             """Method invoked by pika when the Queue.Declare RPC call made in
@@ -193,8 +200,12 @@ consumer.py::
             """
             LOGGER.info('Binding %s to %s with %s',
                         self.EXCHANGE, self.QUEUE, self.ROUTING_KEY)
-            self._channel.queue_bind(self.on_bindok, self.QUEUE,
-                                     self.EXCHANGE, self.ROUTING_KEY)
+            self._channel.queue_bind(
+                queue=self.QUEUE,
+                exchange=self.EXCHANGE,
+                routing_key=self.ROUTING_KEY,
+                callback=self.on_bindok,
+            )
 
         def add_on_cancel_callback(self):
             """Add a callback that will be invoked if RabbitMQ cancels the consumer
@@ -278,8 +289,10 @@ consumer.py::
             """
             LOGGER.info('Issuing consumer related RPC commands')
             self.add_on_cancel_callback()
-            self._consumer_tag = self._channel.basic_consume(self.on_message,
-                                                             self.QUEUE)
+            self._consumer_tag = self._channel.basic_consume(
+                on_message_callback=self.on_message,
+                queue=self.QUEUE,
+            )
 
         def on_bindok(self, unused_frame):
             """Invoked by pika when the Queue.Bind method has completed. At this
@@ -346,4 +359,3 @@ consumer.py::
 
     if __name__ == '__main__':
         main()
-