if __name__ == '__main__':
try: main()
- except Exception, e:
+ except Exception as e:
raise
print e
if __name__ == '__main__':
try: main()
- except ExpatError, e:
+ except ExpatError as e:
print "RecordError. Is your record valid XML?"
print e
- except Exception, e:
+ except Exception as e:
print e
if __name__ == '__main__':
try: main()
- except Exception, e:
+ except Exception as e:
print e
try:
while True:
thread.start_new_thread(self.handle, self.sock.accept())
- except socket.error, e:
+ except socket.error as e:
self.log('Error accepting connection: %s' % (e[1],))
def handle(self, conn, addr):
addrstr = '%s:%s' % (addr[0],addr[1])
self.log('Valid request received from %s' % (addrstr,))
conn.sendall(self.policy)
self.log('Sent policy file to %s' % (addrstr,))
- except socket.error, e:
+ except socket.error as e:
self.log('Error handling connection from %s: %s' % (addrstr, e[1]))
- except Exception, e:
+ except Exception as e:
self.log('Error handling connection from %s: %s' % (addrstr, e[1]))
def log(self, str):
print >>sys.stderr, str
if opts.daemon:
daemon()
policy_server(opts.port, opts.path).run()
- except Exception, e:
+ except Exception as e:
print >> sys.stderr, e
sys.exit(1)
except KeyboardInterrupt:
try:
self.logger.debug("Using new v2 method forward+annotation@%s %s"%(platform,message))
retcod2=manifold.forward (query, annotation)
- except Exception,e:
+ except Exception as e:
# xxx we need a constant constant for UNKNOWN, how about using 1
MANIFOLD_UNKNOWN=1
retcod2={'code':MANIFOLD_UNKNOWN,'description':"%s"%e}
self.logger.debug("****** full retcod2")
for (k,v) in retcod2.items(): self.logger.debug("**** %s: %s"%(k,v))
return False
- except Exception, e:
+ except Exception as e:
if message: self.logger.error("Could not upload %s %s"%(message,e))
else: self.logger.error("Could not upload credential %s"%e)
if self.logger.debugEnabled():
def run(self):
try:
results.put(callable(*args, **kwds))
- except Exception, e:
+ except Exception as e:
logger.log_exc('MultiClient: Error in thread: ')
errors.put(traceback.format_exc())
def close(self):
try:
return xmlrpclib.Unmarshaller.close(self)
- except xmlrpclib.Fault, e:
+ except xmlrpclib.Fault as e:
raise ServerException(e.faultString)
##
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)
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)
try:
os.makedirs(outdir)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.EEXIST:
raise
stats_elements = rspec.xml.xpath('//statistics')
for node in stats_elements:
node.getparent().remove(node)
- except Exception, e:
+ except Exception as e:
logger.warn("drop_slicemgr_stats failed: %s " % (str(e)))
def add_slicemgr_stat(self, rspec, callname, aggname, elapsed, status, exc_info=None):
exc_frame = exc_tag.add_element("tb_frame", filename=str(item[0]),
line=str(item[1]), func=str(item[2]), code=str(item[3]))
- except Exception, e:
+ except Exception as e:
logger.warn("add_slicemgr_stat failed on %s: %s" %(aggname, str(e)))
def ListResources(self, api, creds, options):
forward_options['geni_rspec_version'] = options.get('geni_rspec_version')
result = server.ListResources(credential, forward_options)
return {"aggregate": aggregate, "result": result, "elapsed": time.time()-tStart, "status": "success"}
- except Exception, e:
+ except Exception as e:
api.logger.log_exc("ListResources failed at %s" %(server.url))
return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()}
meta=metadata,
name=instance_name)
slivers.append(server)
- except Exception, err:
+ except Exception as err:
logger.log_exc(err)
return slivers
def create_security_group(self, name):
try:
self.client.security_groups.create(name=name, description=name)
- except Exception, ex:
+ except Exception as ex:
logger.log_exc("Failed to add security group")
raise
try:
security_group = self.client.security_groups.find(name=name)
self.client.security_groups.delete(security_group.id)
- except Exception, ex:
+ except Exception as ex:
logger.log_exc("Failed to delete security group")
group = self.client.security_groups.find(name=group_name)
self.client.security_group_rules.create(group.id, \
protocol, from_port, to_port,cidr_ip)
- except Exception, ex:
+ except Exception as ex:
logger.log_exc("Failed to add rule to group %s" % group_name)
rule = self.client.security_group_rules.find(**filter)
if rule:
self.client.security_group_rules.delete(rule)
- except Exception, ex:
+ except Exception as ex:
logger.log_exc("Failed to remove rule from group %s" % group_name)
tup = line.split()
if len(tup) > 1:
self.add((tup[0], tup[1]))
- except Exception, e:
+ except Exception as e:
logger.log_exc("Could not find or load the configuration file: %s" % config_file)
raise
return apache.OK
- except Exception, err:
+ except Exception as err:
# Log error in /var/log/httpd/(ssl_)?error_log
logger.log_exc('%r'%err)
return apache.HTTP_INTERNAL_SERVER_ERROR
return apache.OK
- except Exception, err:
+ except Exception as err:
# Log error in /var/log/httpd/(ssl_)?error_log
logger.log_exc('%r'%err)
return apache.HTTP_INTERNAL_SERVER_ERROR
return apache.OK
- except Exception, err:
+ except Exception as err:
# Log error in /var/log/httpd/(ssl_)?error_log
logger.log_exc('%r'%err)
return apache.HTTP_INTERNAL_SERVER_ERROR
remote_addr = (remote_ip, remote_port) = self.connection.getpeername()
self.api.remote_addr = remote_addr
response = self.api.handle(remote_addr, request, self.server.method_map)
- except Exception, fault:
+ except Exception as fault:
# This should only happen if the module is buggy
# internal error, report as HTTP server error
logger.log_exc("server.do_POST")
method = method_map[method]
methodresponse = True
- except Exception, e:
+ except Exception as e:
if SOAPpy is not None:
self.protocol = 'soap'
interface = SOAPpy
try:
result = self.call(source, method, *args)
- except SfaFault, fault:
+ except SfaFault as fault:
result = fault
self.logger.log_exc("XmlrpcApi.handle has caught Exception")
- except Exception, fault:
+ except Exception as fault:
self.logger.log_exc("XmlrpcApi.handle has caught Exception")
result = SfaAPIError(fault)
try:
doc = parseString(self.xml)
- except ExpatError,e:
+ except ExpatError as e:
logger.log_exc ("Failed to parse credential, %s"%self.xml)
raise
sig = doc.getElementsByTagName("Signature")[0]
doc = None
try:
doc = parseString(self.xml)
- except ExpatError,e:
+ except ExpatError as e:
raise CredentialNotVerifiable("Malformed credential")
doc = parseString(self.xml)
sigs = []
# or non PEM files
trusted_cert_objects.append(GID(filename=f))
ok_trusted_certs.append(f)
- except Exception, exc:
+ except Exception as exc:
logger.error("Failed to load trusted cert from %s: %r"%( f, exc))
trusted_certs = ok_trusted_certs
if credFile:
try:
credString = open(credFile).read()
- except Exception, e:
+ except Exception as e:
logger.info("Error opening credential file %s: %s" % credFile, e)
return None
if credO.has_key('geni_value') and credO.has_key('geni_type'):
cred_type = credO['geni_type']
credString = credO['geni_value']
- except Exception, e:
+ except Exception as e:
# It wasn't a struct. So the credString is XML. Pull the type directly from the string
logger.debug("Credential string not JSON: %s" % e)
cred_type = CredentialFactory.getType(credString)
try:
cred = Credential(string=credString)
return cred
- except Exception, e:
+ except Exception as e:
if credFile:
msg = "credString started: %s" % credString[:50]
raise Exception("%s not a parsable SFA credential: %s. " % (credFile, e) + msg)
try:
cred = ABACCredential(string=credString)
return cred
- except Exception, e:
+ except Exception as e:
if credFile:
raise Exception("%s not a parsable ABAC credential: %s" % (credFile, e))
else:
try:
os.makedirs(directory)
# if the path already exists then pass
- except OSError, (errno, strerr):
+ except OSError as xxx_todo_changeme:
+ (errno, strerr) = xxx_todo_changeme.args
if errno == 17:
pass
# User certificate must validate against trusted roots
try:
user_gid.verify_chain(trusted_roots)
- except Exception, e:
+ except Exception as e:
return False, None, \
"Cred signer (user) cert not trusted: %s" % e
# Tool certificate must validate against trusted roots
try:
tool_gid.verify_chain(trusted_roots)
- except Exception, e:
+ except Exception as e:
return False, None, \
"Tool cert not trusted: %s" % e
try:
self.type_check(name, value, item, args)
return
- except SfaInvalidArgument, fault:
+ except SfaInvalidArgument as fault:
pass
raise fault
try:
self.type_check(name, value, item, args)
return
- except SfaInvalidArgument, fault:
+ except SfaInvalidArgument as fault:
pass
raise fault