From fc580da2e8afec23f3b316ea683d565eea1bd672 Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
Date: Mon, 23 Jul 2012 10:47:48 +0530
Subject: [PATCH] Correcting the imports for HTTPException

---
 tools/marvin/marvin/cloudstackConnection.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py
index b72e54c3c10..068d8284ebc 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -12,6 +12,7 @@
 # Automatically generated by addcopyright.py at 04/03/2012
 import urllib2
 import urllib
+import httplib
 import base64
 import hmac
 import hashlib
@@ -71,7 +72,7 @@ class cloudConnection(object):
                 self.logging.critical("failed to reach %s because of %s"%(self.mgtSvr, e.reason))
             elif hasattr(e, 'code'):
                 self.logging.critical("server returned %d error code"%e.code)
-        except HTTPException, h:
+        except httplib.HTTPException, h:
             self.logging.debug("encountered http Exception %s"%h.args)
             if self.retries > 0:
                 self.retries = self.retries - 1