diff --git a/util/koji-gc b/util/koji-gc index 085b2814..027aea70 100755 --- a/util/koji-gc +++ b/util/koji-gc @@ -200,7 +200,7 @@ def get_options(): if len(parts) < 2: continue options.key_aliases[parts[0].upper()] = parts[1] - except ValueError, e: + except ValueError as e: print(e) parser.error(_("Invalid key alias data in config: %s") % config.get('main','key_aliases')) @@ -375,9 +375,9 @@ def activate_session(session): session.krb_login(principal=options.principal, keytab=options.keytab, proxyuser=options.runas) else: session.krb_login(proxyuser=options.runas) - except krbV.Krb5Error, e: + except krbV.Krb5Error as e: error(_("Kerberos authentication failed: %s (%s)") % (e.args[1], e.args[0])) - except socket.error, e: + except socket.error as e: warn(_("Could not connect to Kerberos authentication service: '%s'") % e.args[1]) if not options.noauth and not session.logged_in: error(_("Error: unable to log in, no authentication methods available")) @@ -658,7 +658,7 @@ def handle_delete(just_salvage=False): session.untagBuildBypass(trashcan_tag, binfo['id']) try: session.deleteBuild(binfo['id']) - except (six.moves.xmlrpc_client.Fault, koji.GenericError), e: + except (six.moves.xmlrpc_client.Fault, koji.GenericError) as e: print("Warning: deletion failed: %s" % e) #server issue pass @@ -877,7 +877,7 @@ def handle_prune(): try: session.untagBuildBypass(taginfo['id'], entry['build_id'], force=bypass) untagged.setdefault(nvr, {})[tagname] = 1 - except (six.moves.xmlrpc_client.Fault, koji.GenericError), e: + except (six.moves.xmlrpc_client.Fault, koji.GenericError) as e: print("Warning: untag operation failed: %s" % e) pass # if action == 'keep' do nothing @@ -911,7 +911,7 @@ def handle_prune(): print("Deleting untagged build: %s" % nvr) try: session.deleteBuild(build_id, strict=False) - except (six.moves.xmlrpc_client.Fault, koji.GenericError), e: + except (six.moves.xmlrpc_client.Fault, koji.GenericError) as e: print("Warning: deletion failed: %s" % e) #server issue pass diff --git a/util/koji-shadow b/util/koji-shadow index 34fadaf0..9743a881 100755 --- a/util/koji-shadow +++ b/util/koji-shadow @@ -330,9 +330,9 @@ def activate_session(session): session.krb_login(principal=options.principal, keytab=options.keytab, proxyuser=options.runas) else: session.krb_login(proxyuser=options.runas) - except krbV.Krb5Error, e: + except krbV.Krb5Error as e: error(_("Kerberos authentication failed: '%s' (%s)") % (e.args[1], e.args[0])) - except socket.error, e: + except socket.error as e: warn(_("Could not connect to Kerberos authentication service: '%s'") % e.args[1]) if not options.noauth and not session.logged_in: error(_("Error: unable to log in")) diff --git a/util/kojira b/util/kojira index 9ae8a6c4..51ef84de 100755 --- a/util/kojira +++ b/util/kojira @@ -155,7 +155,7 @@ class ManagedRepo(object): #also check dir age. We do this because a repo can be created from an older event #and should not be removed based solely on that event's timestamp. mtime = os.stat(path).st_mtime - except OSError, e: + except OSError as e: if e.errno == 2: # No such file or directory, so the repo either never existed, # or has already been deleted, so allow it to be marked deleted. @@ -247,7 +247,7 @@ class RepoManager(object): prefix = "pid %i (%s)" % (pid, self.delete_pids.get(pid)) try: (childpid, status) = os.waitpid(pid, os.WNOHANG) - except OSError, e: + except OSError as e: if e.errno != errno.ECHILD: #should not happen raise @@ -282,7 +282,7 @@ class RepoManager(object): for pid in self.delete_pids: try: os.kill(pid, sig) - except OSError, e: + except OSError as e: if e.errno != errno.ESRCH: logger.error("Unable to kill process %s", pid) diff --git a/vm/kojivmd b/vm/kojivmd index fa83a032..7e1dc7fb 100755 --- a/vm/kojivmd +++ b/vm/kojivmd @@ -291,7 +291,7 @@ class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer): response = self._dispatch(method, params) response = (response,) response = six.moves.xmlrpc_client.dumps(response, methodresponse=1, allow_none=True) - except six.moves.xmlrpc_client.Fault, fault: + except six.moves.xmlrpc_client.Fault as fault: response = six.moves.xmlrpc_client.dumps(fault) except: # report exception back to server @@ -830,7 +830,7 @@ class VMExecTask(BaseTaskHandler): self.setupTaskServer() vm.create() self.logger.info('Started VM %s', clone_name) - except libvirt.libvirtError, e: + except libvirt.libvirtError as e: self.logger.error('error starting VM %s', clone_name, exc_info=True) raise koji.PreBuildError('error starting VM %s, error was: %s' % \ (clone_name, e)) @@ -1089,7 +1089,7 @@ if __name__ == "__main__": # authenticate using SSL client certificates session.ssl_login(options.cert, None, options.serverca) - except koji.AuthError, e: + except koji.AuthError as e: quit("Error: Unable to log in: %s" % e) except six.moves.xmlrpc_client.ProtocolError: quit("Error: Unable to connect to server %s" % (options.server)) @@ -1109,9 +1109,9 @@ if __name__ == "__main__": session.krb_login(principal=krb_principal, keytab=options.keytab, ccache=options.ccache) - except krbV.Krb5Error, e: + except krbV.Krb5Error as e: quit("Kerberos authentication failed: '%s' (%s)" % (e.args[1], e.args[0])) - except socket.error, e: + except socket.error as e: quit("Could not connect to Kerberos authentication service: '%s'" % e.args[1]) else: quit("No username/password supplied and Kerberos missing or not configured")