From 179d980dffc03e1ee0449954eed40b1d5489f6e0 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 3 Nov 2010 14:59:35 -0700
Subject: make sure context keys are not unicode so they can be passed as
 kwargs

---
 nova/rpc.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nova/rpc.py b/nova/rpc.py
index 895820cd0..05eaa0f99 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -262,6 +262,9 @@ def _unpack_context(msg):
     """Unpack context from msg."""
     context_dict = {}
     for key in list(msg.keys()):
+        # NOTE(vish): Some versions of python don't like unicode keys
+        #             in kwargs.
+        key = str(key)
         if key.startswith('_context_'):
             value = msg.pop(key)
             context_dict[key[9:]] = value
-- 
cgit 


From 23463610cb180253697b500f11f01e686b20c1e8 Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Wed, 3 Nov 2010 15:50:24 -0700
Subject: Fix for bug #640400, enables the exclusive flag on the temporary
 queues.

---
 nova/rpc.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/rpc.py b/nova/rpc.py
index 895820cd0..14fe010ac 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -206,6 +206,7 @@ class DirectConsumer(Consumer):
         self.routing_key = msg_id
         self.exchange = msg_id
         self.auto_delete = True
+        self.exclusive = True
         super(DirectConsumer, self).__init__(connection=connection)
 
 
-- 
cgit