2to3 -f except

diff --git a/clientbin/getNodes.py b/clientbin/getNodes.py
index d77bbbc..f2d39a2 100644 (file)
--- a/clientbin/getNodes.py
+++ b/clientbin/getNodes.py
@@ -82,6 +82,6 @@ def main():
 
 if __name__ == '__main__':
     try: main()
 
 if __name__ == '__main__':
     try: main()

-    except Exception, e:
+    except Exception as e:

         raise
         print e
         raise
         print e

diff --git a/clientbin/getRecord.py b/clientbin/getRecord.py
index e2be593..c88f193 100755 (executable)
--- a/clientbin/getRecord.py
+++ b/clientbin/getRecord.py
@@ -78,8 +78,8 @@ def main():
 
 if __name__ == '__main__':
     try: main()
 
 if __name__ == '__main__':
     try: main()

-    except ExpatError, e:
+    except ExpatError as e:

         print "RecordError.  Is your record valid XML?"
         print e
         print "RecordError.  Is your record valid XML?"
         print e

-    except Exception, e:
+    except Exception as e:

         print e
         print e

diff --git a/clientbin/setRecord.py b/clientbin/setRecord.py
index bd77606..aafd95c 100755 (executable)
--- a/clientbin/setRecord.py
+++ b/clientbin/setRecord.py
@@ -103,5 +103,5 @@ def main():
 
 if __name__ == '__main__':
     try: main()
 
 if __name__ == '__main__':
     try: main()

-    except Exception, e:
+    except Exception as e:

         print e
         print e

diff --git a/flashpolicy/sfa_flashpolicy.py b/flashpolicy/sfa_flashpolicy.py
index de98be1..1fe3f84 100644 (file)
--- a/flashpolicy/sfa_flashpolicy.py
+++ b/flashpolicy/sfa_flashpolicy.py
@@ -63,7 +63,7 @@ class policy_server(object):
         try:
             while True:
                 thread.start_new_thread(self.handle, self.sock.accept())
         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('Error accepting connection: %s' % (e[1],))
     def handle(self, conn, addr):
         addrstr = '%s:%s' % (addr[0],addr[1])


@@ -79,9 +79,9 @@ class policy_server(object):
                 self.log('Valid request received from %s' % (addrstr,))
                 conn.sendall(self.policy)
                 self.log('Sent policy file to %s' % (addrstr,))
                 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]))
             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
             self.log('Error handling connection from %s: %s' % (addrstr, e[1]))
     def log(self, str):
         print >>sys.stderr, str


@@ -105,7 +105,7 @@ def main():
         if opts.daemon:
             daemon()
         policy_server(opts.port, opts.path).run()
         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:
         print >> sys.stderr, e
         sys.exit(1)
     except KeyboardInterrupt:

diff --git a/sfa/client/manifolduploader.py b/sfa/client/manifolduploader.py
index c291a42..66874ba 100755 (executable)
--- a/sfa/client/manifolduploader.py
+++ b/sfa/client/manifolduploader.py
@@ -113,7 +113,7 @@ class ManifoldUploader:
             try:
                 self.logger.debug("Using new v2 method forward+annotation@%s %s"%(platform,message))
                 retcod2=manifold.forward (query, annotation)
             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}
                 # xxx we need a constant constant for UNKNOWN, how about using 1
                 MANIFOLD_UNKNOWN=1
                 retcod2={'code':MANIFOLD_UNKNOWN,'description':"%s"%e}


@@ -129,7 +129,7 @@ class ManifoldUploader:
             self.logger.debug("****** full retcod2")
             for (k,v) in retcod2.items(): self.logger.debug("**** %s: %s"%(k,v))
             return False
             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():
             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():

diff --git a/sfa/client/multiclient.py b/sfa/client/multiclient.py
index 28b5b15..6bdf2b2 100644 (file)
--- a/sfa/client/multiclient.py
+++ b/sfa/client/multiclient.py
@@ -17,7 +17,7 @@ def ThreadedMethod(callable, results, errors):
             def run(self):
                 try:
                     results.put(callable(*args, **kwds))
             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())
                     
                     logger.log_exc('MultiClient: Error in thread: ')
                     errors.put(traceback.format_exc())
                     

diff --git a/sfa/client/sfaserverproxy.py b/sfa/client/sfaserverproxy.py
index d326b3a..ca62ddf 100644 (file)
--- a/sfa/client/sfaserverproxy.py
+++ b/sfa/client/sfaserverproxy.py
@@ -27,7 +27,7 @@ class ExceptionUnmarshaller(xmlrpclib.Unmarshaller):
     def close(self):
         try:
             return xmlrpclib.Unmarshaller.close(self)
     def close(self):
         try:
             return xmlrpclib.Unmarshaller.close(self)

-        except xmlrpclib.Fault, e:
+        except xmlrpclib.Fault as e:

             raise ServerException(e.faultString)
 
 ##
             raise ServerException(e.faultString)
 
 ##

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
     

diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py
index 2a99b6f..b8aafcc 100644 (file)
--- a/sfa/managers/slice_manager.py
+++ b/sfa/managers/slice_manager.py
@@ -73,7 +73,7 @@ class SliceManager:
             stats_elements = rspec.xml.xpath('//statistics')
             for node in stats_elements:
                 node.getparent().remove(node)
             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):
             logger.warn("drop_slicemgr_stats failed: %s " % (str(e)))
     
     def add_slicemgr_stat(self, rspec, callname, aggname, elapsed, status, exc_info=None):


@@ -99,7 +99,7 @@ class SliceManager:
                     exc_frame = exc_tag.add_element("tb_frame", filename=str(item[0]), 
                                                     line=str(item[1]), func=str(item[2]), code=str(item[3]))
 
                     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):
             logger.warn("add_slicemgr_stat failed on  %s: %s" %(aggname, str(e)))
     
     def ListResources(self, api, creds, options):


@@ -117,7 +117,7 @@ class SliceManager:
                 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"}
                 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()}
     
                 api.logger.log_exc("ListResources failed at %s" %(server.url))
                 return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()}
     

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 2b65399..29681a0 100644 (file)
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -395,7 +395,7 @@ class OSAggregate:
                                                             meta=metadata, 
                                                             name=instance_name)
                     slivers.append(server)
                                                             meta=metadata, 
                                                             name=instance_name)
                     slivers.append(server)

-                except Exception, err:    
+                except Exception as err:    

                     logger.log_exc(err)                                
                            
         return slivers        
                     logger.log_exc(err)                                
                            
         return slivers        

diff --git a/sfa/openstack/security_group.py b/sfa/openstack/security_group.py
index 70e191e..6aced8c 100644 (file)
--- a/sfa/openstack/security_group.py
+++ b/sfa/openstack/security_group.py
@@ -9,7 +9,7 @@ class SecurityGroup:
     def create_security_group(self, name):
         try:
             self.client.security_groups.create(name=name, description=name)
     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
 
             logger.log_exc("Failed to add security group")
             raise
 


@@ -17,7 +17,7 @@ class SecurityGroup:
         try:
             security_group = self.client.security_groups.find(name=name)
             self.client.security_groups.delete(security_group.id)
         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")
 
 
             logger.log_exc("Failed to delete security group")
 
 


@@ -58,7 +58,7 @@ class SecurityGroup:
             group = self.client.security_groups.find(name=group_name)
             self.client.security_group_rules.create(group.id, \
                                 protocol, from_port, to_port,cidr_ip)
             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)
 
 
             logger.log_exc("Failed to add rule to group %s" % group_name)
 
 


@@ -81,6 +81,6 @@ class SecurityGroup:
             rule = self.client.security_group_rules.find(**filter)
             if rule:
                 self.client.security_group_rules.delete(rule)
             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) 
              
             logger.log_exc("Failed to remove rule from group %s" % group_name) 
              

diff --git a/sfa/planetlab/topology.py b/sfa/planetlab/topology.py
index cd6036a..c05b198 100644 (file)
--- a/sfa/planetlab/topology.py
+++ b/sfa/planetlab/topology.py
@@ -25,6 +25,6 @@ class Topology(set):
                 tup = line.split()
                 if len(tup) > 1:
                     self.add((tup[0], tup[1]))    
                 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
             logger.log_exc("Could not find or load the configuration file: %s" % config_file)
             raise

diff --git a/sfa/server/modpython/SfaAggregateModPython.py b/sfa/server/modpython/SfaAggregateModPython.py
index 50f9f5f..5d38a55 100755 (executable)
--- a/sfa/server/modpython/SfaAggregateModPython.py
+++ b/sfa/server/modpython/SfaAggregateModPython.py
@@ -50,7 +50,7 @@ def handler(req):
 
         return apache.OK
 
 
         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
         # Log error in /var/log/httpd/(ssl_)?error_log
         logger.log_exc('%r'%err)
         return apache.HTTP_INTERNAL_SERVER_ERROR

diff --git a/sfa/server/modpython/SfaRegistryModPython.py b/sfa/server/modpython/SfaRegistryModPython.py
index 31d0812..6d17cd2 100755 (executable)
--- a/sfa/server/modpython/SfaRegistryModPython.py
+++ b/sfa/server/modpython/SfaRegistryModPython.py
@@ -50,7 +50,7 @@ def handler(req):
 
         return apache.OK
 
 
         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
         # Log error in /var/log/httpd/(ssl_)?error_log
         logger.log_exc('%r'%err)
         return apache.HTTP_INTERNAL_SERVER_ERROR

diff --git a/sfa/server/modpython/SfaSliceMgrModPython.py b/sfa/server/modpython/SfaSliceMgrModPython.py
index 61cb161..dcb8562 100755 (executable)
--- a/sfa/server/modpython/SfaSliceMgrModPython.py
+++ b/sfa/server/modpython/SfaSliceMgrModPython.py
@@ -50,7 +50,7 @@ def handler(req):
 
         return apache.OK
 
 
         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
         # Log error in /var/log/httpd/(ssl_)?error_log
         logger.log_exc('%r'%err)
         return apache.HTTP_INTERNAL_SERVER_ERROR

diff --git a/sfa/server/threadedserver.py b/sfa/server/threadedserver.py
index 7dfac7d..daf40e4 100644 (file)
--- a/sfa/server/threadedserver.py
+++ b/sfa/server/threadedserver.py
@@ -119,7 +119,7 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             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)
             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")
             # This should only happen if the module is buggy
             # internal error, report as HTTP server error
             logger.log_exc("server.do_POST")

diff --git a/sfa/server/xmlrpcapi.py b/sfa/server/xmlrpcapi.py
index 8b8bd78..167ac88 100644 (file)
--- a/sfa/server/xmlrpcapi.py
+++ b/sfa/server/xmlrpcapi.py
@@ -138,7 +138,7 @@ class XmlrpcApi:
                 method = method_map[method]
             methodresponse = True
             
                 method = method_map[method]
             methodresponse = True
             

-        except Exception, e:
+        except Exception as e:

             if SOAPpy is not None:
                 self.protocol = 'soap'
                 interface = SOAPpy
             if SOAPpy is not None:
                 self.protocol = 'soap'
                 interface = SOAPpy


@@ -151,10 +151,10 @@ class XmlrpcApi:
 
         try:
             result = self.call(source, method, *args)
 
         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") 
             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)
 
             self.logger.log_exc("XmlrpcApi.handle has caught Exception")
             result = SfaAPIError(fault)
 

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index ae2cc8d..37af67b 100644 (file)
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -191,7 +191,7 @@ class Signature(object):
 
         try:
             doc = parseString(self.xml)
 
         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]
             logger.log_exc ("Failed to parse credential, %s"%self.xml)
             raise
         sig = doc.getElementsByTagName("Signature")[0]


@@ -730,7 +730,7 @@ class Credential(object):
         doc = None
         try:
             doc = parseString(self.xml)
         doc = None
         try:
             doc = parseString(self.xml)

-        except ExpatError,e:
+        except ExpatError as e:

             raise CredentialNotVerifiable("Malformed credential")
         doc = parseString(self.xml)
         sigs = []
             raise CredentialNotVerifiable("Malformed credential")
         doc = parseString(self.xml)
         sigs = []


@@ -860,7 +860,7 @@ class Credential(object):
                     # or non PEM files
                     trusted_cert_objects.append(GID(filename=f))
                     ok_trusted_certs.append(f)
                     # 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
 
                     logger.error("Failed to load trusted cert from %s: %r"%( f, exc))
             trusted_certs = ok_trusted_certs
 

diff --git a/sfa/trust/credential_factory.py b/sfa/trust/credential_factory.py
index ef738af..a51673e 100644 (file)
--- a/sfa/trust/credential_factory.py
+++ b/sfa/trust/credential_factory.py
@@ -62,7 +62,7 @@ class CredentialFactory:
         if credFile:
             try:
                 credString = open(credFile).read()
         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
 
                 logger.info("Error opening credential file %s: %s" % credFile, e)
                 return None
 


@@ -72,7 +72,7 @@ class CredentialFactory:
             if credO.has_key('geni_value') and credO.has_key('geni_type'):
                 cred_type = credO['geni_type']
                 credString = credO['geni_value']
             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)
             # 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)


@@ -81,7 +81,7 @@ class CredentialFactory:
             try:
                 cred = Credential(string=credString)
                 return cred
             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)
                 if credFile:
                     msg = "credString started: %s" % credString[:50]
                     raise Exception("%s not a parsable SFA credential: %s. " % (credFile, e) + msg)


@@ -92,7 +92,7 @@ class CredentialFactory:
             try:
                 cred = ABACCredential(string=credString)
                 return cred
             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:
                 if credFile:
                     raise Exception("%s not a parsable ABAC credential: %s" % (credFile, e))
                 else:

diff --git a/sfa/trust/hierarchy.py b/sfa/trust/hierarchy.py
index 43b318e..5e76dbf 100644 (file)
--- a/sfa/trust/hierarchy.py
+++ b/sfa/trust/hierarchy.py
@@ -160,7 +160,8 @@ class Hierarchy:
         try:
             os.makedirs(directory)
         # if the path already exists then pass
         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
 
             if errno == 17:
                 pass
 

diff --git a/sfa/trust/speaksfor_util.py b/sfa/trust/speaksfor_util.py
index 9bad61d..20819c9 100644 (file)
--- a/sfa/trust/speaksfor_util.py
+++ b/sfa/trust/speaksfor_util.py
@@ -211,14 +211,14 @@ def verify_speaks_for(cred, tool_gid, speaking_for_urn,
         # User certificate must validate against trusted roots
         try:
             user_gid.verify_chain(trusted_roots)
         # 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)
             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
 
             return False, None, \
                 "Tool cert not trusted: %s" % e
 

diff --git a/sfa/util/method.py b/sfa/util/method.py
index 4e21170..1d3de57 100644 (file)
--- a/sfa/util/method.py
+++ b/sfa/util/method.py
@@ -203,7 +203,7 @@ class Method:
                 try:
                     self.type_check(name, value, item, args)
                     return
                 try:
                     self.type_check(name, value, item, args)
                     return

-                except SfaInvalidArgument, fault:
+                except SfaInvalidArgument as fault:

                     pass
             raise fault
 
                     pass
             raise fault
 

diff --git a/sfatables/commands/moo.py b/sfatables/commands/moo.py
index bd19a9d..a882854 100644 (file)
--- a/sfatables/commands/moo.py
+++ b/sfatables/commands/moo.py
@@ -122,7 +122,7 @@ class Command:
                 try:
                     self.type_check(name, value, item, args)
                     return
                 try:
                     self.type_check(name, value, item, args)
                     return

-                except SfaInvalidArgument, fault:
+                except SfaInvalidArgument as fault:

                     pass
             raise fault
 
                     pass
             raise fault