You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by pq...@apache.org on 2010/08/13 03:27:47 UTC
svn commit: r985063 - in /incubator/libcloud/trunk/libcloud/drivers:
elastichosts.py rackspace.py slicehost.py
Author: pquerna
Date: Fri Aug 13 01:27:47 2010
New Revision: 985063
URL: http://svn.apache.org/viewvc?rev=985063&view=rev
Log:
2->4 whitespace fixes, no functional changes.
Modified:
incubator/libcloud/trunk/libcloud/drivers/elastichosts.py
incubator/libcloud/trunk/libcloud/drivers/rackspace.py
incubator/libcloud/trunk/libcloud/drivers/slicehost.py
Modified: incubator/libcloud/trunk/libcloud/drivers/elastichosts.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/elastichosts.py?rev=985063&r1=985062&r2=985063&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/elastichosts.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/elastichosts.py Fri Aug 13 01:27:47 2010
@@ -185,8 +185,8 @@ class ElasticHostsResponse(Response):
try:
data = json.loads(self.body)
- except ValueError:
- raise ElasticHostsException('Could not parse body: %s')
+ except:
+ raise MalformedResponseError("Failed to parse JSON", body=self.body, driver=ElasticHostsBaseNodeDriver)
return data
Modified: incubator/libcloud/trunk/libcloud/drivers/rackspace.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/rackspace.py?rev=985063&r1=985062&r2=985063&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/rackspace.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/rackspace.py Fri Aug 13 01:27:47 2010
@@ -54,16 +54,16 @@ class RackspaceResponse(Response):
if not self.body:
return None
try:
- body = ET.XML(self.body)
+ body = ET.XML(self.body)
except:
- raise MalformedResponseError("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
+ raise MalformedResponseError("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
return body
def parse_error(self):
# TODO: fixup, Rackspace only uses response codes really!
try:
- body = ET.XML(self.body)
+ body = ET.XML(self.body)
except:
- raise MalformedResponseError("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
+ raise MalformedResponseError("Failed to parse XML", body=self.body, driver=RackspaceNodeDriver)
try:
text = "; ".join([ err.text or ''
for err in
Modified: incubator/libcloud/trunk/libcloud/drivers/slicehost.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/drivers/slicehost.py?rev=985063&r1=985062&r2=985063&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/drivers/slicehost.py (original)
+++ incubator/libcloud/trunk/libcloud/drivers/slicehost.py Fri Aug 13 01:27:47 2010
@@ -32,9 +32,9 @@ class SlicehostResponse(Response):
if not self.body or len(self.body) <= 1:
return None
try:
- body = ET.XML(self.body)
+ body = ET.XML(self.body)
except:
- raise MalformedResponseError("Failed to parse XML", body=self.body, driver=SlicehostNodeDriver)
+ raise MalformedResponseError("Failed to parse XML", body=self.body, driver=SlicehostNodeDriver)
return body
def parse_error(self):
@@ -42,9 +42,9 @@ class SlicehostResponse(Response):
raise InvalidCredsError(self.body)
try:
- body = ET.XML(self.body)
+ body = ET.XML(self.body)
except:
- raise MalformedResponseError("Failed to parse XML", body=self.body, driver=SlicehostNodeDriver)
+ raise MalformedResponseError("Failed to parse XML", body=self.body, driver=SlicehostNodeDriver)
try:
return "; ".join([ err.text
for err in