From 90eaf27f8518d8eccb6ade60024dcae163dd9fbf Mon Sep 17 00:00:00 2001
From: Ask Solem <askh@opera.com>
Date: Tue, 20 Jul 2010 16:14:45 +0200
Subject: [PATCH] Carrot compat interface now working with celery

---
 kombu/compat.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/kombu/compat.py b/kombu/compat.py
index a4f088cf..ea1bfe28 100644
--- a/kombu/compat.py
+++ b/kombu/compat.py
@@ -18,7 +18,7 @@ def entry_to_binding(queue, **options):
     e_auto_delete = options.get("exchange_auto_delete") or \
                         options.get("auto_delete")
     q_durable = options.get("queue_durable") or options.get("durable")
-    q_auto_delete = options.get("queue_auto_delete") or
+    q_auto_delete = options.get("queue_auto_delete") or \
                         options.get("auto_delete")
     e_arguments = options.get("exchange_arguments")
     q_arguments = options.get("queue_arguments")
@@ -29,7 +29,7 @@ def entry_to_binding(queue, **options):
                                routing_key=options.get("routing_key"),
                                durable=e_durable,
                                auto_delete=e_auto_delete,
-                               arguments=e_arguments,
+                               arguments=e_arguments)
     return entity.Binding(queue,
                           exchange=exchange,
                           routing_key=binding_key,
@@ -72,7 +72,7 @@ class Publisher(messaging.Producer):
         super(Publisher, self).__init__(self.backend, self.exchange,
                 **kwargs)
 
-    def send(*args, **kwargs):
+    def send(self, *args, **kwargs):
         return self.publish(*args, **kwargs)
 
     def close(self):
@@ -183,7 +183,7 @@ class _CSet(messaging.Consumer):
         super(_CSet, self).__init__(self.backend, *args, **kwargs)
 
     def iterconsume(self):
-        raise iterconsume(self.connection, self)
+        return iterconsume(self.connection, self)
 
     def add_consumer_from_dict(self, queue, **options):
         self.bindings.append(entry_to_binding(queue, **options))
@@ -197,12 +197,13 @@ class _CSet(messaging.Consumer):
 
 
 def ConsumerSet(connection, from_dict=None, consumers=None,
-        callbacks=None, **options):
+        callbacks=None, **kwargs):
 
     bindings = []
-    for consumer in consumers:
-        bindings.extend(consumer.bindings)
-    for queue, options in from_dict.items():
-        bindings.append(entry_to_binding(queue, **options))
+    if consumers:
+        map(bindings.extend, consumer.bindings)
+    if from_dict:
+        for queue_name, queue_options in from_dict.items():
+            bindings.append(entry_to_binding(queue_name, **queue_options))
 
-    return _CSet(connection, bindings, **options)
+    return _CSet(connection, bindings, **kwargs)