git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2to3 -f except
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_eucalyptus.py
diff --git
a/sfa/managers/aggregate_manager_eucalyptus.py
b/sfa/managers/aggregate_manager_eucalyptus.py
index
b8c83d8
..
2356f33
100644
(file)
--- a/
sfa/managers/aggregate_manager_eucalyptus.py
+++ b/
sfa/managers/aggregate_manager_eucalyptus.py
@@
-79,7
+79,7
@@
class EucaInstance(SQLObject):
self.instance_id = instance.id
# If there is an error, destroy itself.
self.instance_id = instance.id
# If there is an error, destroy itself.
- except EC2ResponseError
,
ec2RespErr:
+ except EC2ResponseError
as
ec2RespErr:
errTree = ET.fromstring(ec2RespErr.body)
msg = errTree.find('.//Message')
logger.error(msg.text)
errTree = ET.fromstring(ec2RespErr.body)
msg = errTree.find('.//Message')
logger.error(msg.text)
@@
-524,7
+524,7
@@
class AggregateManagerEucalyptus:
instList.append(instInfoDict)
AggregateManagerEucalyptus.cloud['instances'] = instancesDict
instList.append(instInfoDict)
AggregateManagerEucalyptus.cloud['instances'] = instancesDict
- except EC2ResponseError
,
ec2RespErr:
+ except EC2ResponseError
as
ec2RespErr:
errTree = ET.fromstring(ec2RespErr.body)
errMsgE = errTree.find('.//Message')
logger.error(errMsgE.text)
errTree = ET.fromstring(ec2RespErr.body)
errMsgE = errTree.find('.//Message')
logger.error(errMsgE.text)
@@
-661,7
+661,7
@@
class AggregateManagerEucalyptus:
try:
os.makedirs(outdir)
try:
os.makedirs(outdir)
- except OSError
,
e:
+ except OSError
as
e:
if e.errno != errno.EEXIST:
raise
if e.errno != errno.EEXIST:
raise