From 9de9f49cb6b98c9170d73fad08a1ee63edfb49fb Mon Sep 17 00:00:00 2001
From: Ask Solem <askh@opera.com>
Date: Mon, 15 Nov 2010 14:14:26 +0100
Subject: [PATCH] Pidbox: Don't declare when replying, also fix unicode with
 kwargs bug

---
 kombu/pidbox.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kombu/pidbox.py b/kombu/pidbox.py
index 4ec77999..20162bce 100644
--- a/kombu/pidbox.py
+++ b/kombu/pidbox.py
@@ -83,7 +83,9 @@ class Node(object):
             reply = {"error": repr(exc)}
 
         if reply_to:
-            self.reply({self.hostname: reply}, **reply_to)
+            self.reply({self.hostname: reply},
+                       exchange=reply_to["exchange"],
+                       routing_key=reply_to["routing_key"])
         return reply
 
     def handle(self, method, arguments={}):
@@ -179,7 +181,8 @@ class Mailbox(object):
                                           delivery_mode="transient",
                                           durable=False,
                                           auto_delete=True)
-            producer = Producer(chan, exchange=exchange)
+            producer = Producer(chan, exchange=exchange,
+                                      auto_declare=False)
             producer.publish(reply, routing_key=routing_key)
         finally:
             channel or chan.close()