Python examples updated to recent pika

Author: majek

python/README.md

@@ -5,14 +5,13 @@ tutorials](http://www.rabbitmq.com/getstarted.html).
 
 ## Requirements
 
-To run this code you need `pika` library version 0.5.2 (newer versions
-may not work). To install it run
+To run this code you need `pika` library version 0.9.4. To install it run
 
-    pip install -e git+http://github.com/tonyg/pika.git@v0.5.2#egg=pika-v0.5.2
+    pip install -e git+http://github.com/pika/pika.git@v0.9.4#egg=pika-v0.9.4
 
 or
 
-    easy_install pika==0.5.2
+    easy_install pika==0.9.4
 
 
 ## Code
@@ -34,3 +33,20 @@ or
     python receive_logs.py
     python emit_log.py
 
+
+[Tutorial four: Routing](http://www.rabbitmq.com/tutorial-four-python.html)
+
+    python receive_logs_direct.py
+    python emit_log_direct.py
+
+
+[Tutorial five: Topics](http://www.rabbitmq.com/tutorial-five-python.html)
+
+    python receive_logs_topic.py
+    python emit_log_topic.py
+
+
+[Tutorial six: RPC](http://www.rabbitmq.com/tutorial-six-python.html)
+
+    python rpc_server.py
+    python rpc_client.py

python/emit_log.py

@@ -2,7 +2,7 @@
 import pika
 import sys
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 

python/emit_log_direct.py

@@ -2,7 +2,7 @@
 import pika
 import sys
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 

python/emit_log_topic.py

@@ -2,7 +2,7 @@
 import pika
 import sys
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 

python/new_task.py

@@ -2,7 +2,7 @@
 import pika
 import sys
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 

python/receive.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import pika
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 
@@ -17,4 +17,4 @@ def callback(ch, method, properties, body):
                       queue='hello',
                       no_ack=True)
 
-pika.asyncore_loop()
+channel.start_consuming()

python/receive_logs.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python
 import pika
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 
 channel.exchange_declare(exchange='logs',
                          type='fanout')
 
 result = channel.queue_declare(exclusive=True)
-queue_name = result.queue
+queue_name = result.method.queue
 
 channel.queue_bind(exchange='logs',
                    queue=queue_name)
@@ -23,4 +23,4 @@ def callback(ch, method, properties, body):
                       queue=queue_name,
                       no_ack=True)
 
-pika.asyncore_loop()
+channel.start_consuming()

python/receive_logs_direct.py

@@ -2,15 +2,15 @@
 import pika
 import sys
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 
 channel.exchange_declare(exchange='direct_logs',
                          type='direct')
 
 result = channel.queue_declare(exclusive=True)
-queue_name = result.queue
+queue_name = result.method.queue
 
 severities = sys.argv[1:]
 if not severities:
@@ -31,4 +31,4 @@ def callback(ch, method, properties, body):
                       queue=queue_name,
                       no_ack=True)
 
-pika.asyncore_loop()
+channel.start_consuming()

python/receive_logs_topic.py

@@ -2,15 +2,15 @@
 import pika
 import sys
 
-connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+connection = pika.BlockingConnection(pika.ConnectionParameters(
         host='localhost'))
 channel = connection.channel()
 
 channel.exchange_declare(exchange='topic_logs',
                          type='topic')
 
 result = channel.queue_declare(exclusive=True)
-queue_name = result.queue
+queue_name = result.method.queue
 
 binding_keys = sys.argv[1:]
 if not binding_keys:
@@ -31,4 +31,4 @@ def callback(ch, method, properties, body):
                       queue=queue_name,
                       no_ack=True)
 
-pika.asyncore_loop()
+channel.start_consuming()

python/rpc_client.py

@@ -4,38 +4,33 @@
 
 class FibonacciClient(object):
     def __init__(self):
-        self.connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+        self.connection = pika.BlockingConnection(pika.ConnectionParameters(
                 host='localhost'))
 
         self.channel = self.connection.channel()
 
         result = self.channel.queue_declare(exclusive=True)
-        self.callback_queue = result.queue
+        self.callback_queue = result.method.queue
 
-        self.requests = {}
         self.channel.basic_consume(self.on_response, no_ack=True,
                                    queue=self.callback_queue)
 
     def on_response(self, ch, method, props, body):
-        corr_id = props.correlation_id
-        if corr_id in self.requests:
-            self.requests[corr_id] = body
+        if self.corr_id == props.correlation_id:
+            self.response = body
+            self.channel.stop_consuming()
 
     def call(self, n):
-        corr_id = str(uuid.uuid4())
-        self.requests[corr_id] = None
+        self.corr_id = str(uuid.uuid4())
         self.channel.basic_publish(exchange='',
                                    routing_key='rpc_queue',
                                    properties=pika.BasicProperties(
                                          reply_to = self.callback_queue,
-                                         correlation_id = corr_id,
+                                         correlation_id = self.corr_id,
                                          ),
                                    body=str(n))
-        while self.requests[corr_id] is None:
-            pika.asyncore_loop(count=1)
-        response = self.requests[corr_id]
-        del self.requests[corr_id]
-        return int(response)
+        self.channel.start_consuming()
+        return int(self.response)
 
 
 fibonacci_rpc = FibonacciClient()