You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/07/30 12:07:19 UTC
[7/16] git commit: Correcting the imports for HTTPException
Correcting the imports for HTTPException
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ed113ca8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ed113ca8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ed113ca8
Branch: refs/heads/master
Commit: ed113ca8445199a6adc246d3cbd5a249bb4b190e
Parents: 9af88ad
Author: Prasanna Santhanam <Pr...@citrix.com>
Authored: Mon Jul 23 10:47:48 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 30 15:32:34 2012 +0530
----------------------------------------------------------------------
tools/marvin/marvin/cloudstackConnection.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ed113ca8/tools/marvin/marvin/cloudstackConnection.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py
index 37919c0..d70c192 100644
--- a/tools/marvin/marvin/cloudstackConnection.py
+++ b/tools/marvin/marvin/cloudstackConnection.py
@@ -17,6 +17,7 @@
import urllib2
import urllib
+import httplib
import base64
import hmac
import hashlib
@@ -76,7 +77,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