From a2cf8a6f6038062cf343322acdbde66456b73dfb Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Mon, 26 Jul 2010 23:28:59 -0400
Subject: [PATCH] Fixes bug#610140.  Thanks to Vish and Muharem for the patch

---
 nova/tests/api_unittest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py
index e5e2afe263a1..45ae50b2e795 100644
--- a/nova/tests/api_unittest.py
+++ b/nova/tests/api_unittest.py
@@ -43,7 +43,11 @@ def boto_to_tornado(method, path, headers, data, host, connection=None):
 
     connection should be a FakeTornadoHttpConnection instance
     """
-    headers = httpserver.HTTPHeaders()
+    try:
+        headers = httpserver.HTTPHeaders()
+    except AttributeError:
+        from tornado import httputil
+        headers = httputil.HTTPHeaders()
     for k, v in headers.iteritems():
         headers[k] = v