particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

python-modernize -f lib2to3.fixes.fix_except . -w

Browse source
This commit is contained in:
Tomas Kopecek 2017-10-31 16:03:37 +01:00
parent 2e0b962274
commit d6a5cdf987
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hub/kojihub.py
View file

@ -419,7 +419,7 @@ class Task(object):
# If the result is a Fault, then loads will raise it
# This is normally what we want to happen
result, method = xmlrpclib.loads(xml_result)
except xmlrpclib.Fault, fault:
except xmlrpclib.Fault as fault:
if raise_fault:
raise
# Note that you can't really return a fault over xmlrpc, except by
@ -8902,7 +8902,7 @@ class RootExports(object):
fn = get_upload_path(path, name, create=True, volume=volume)
try:
st = os.lstat(fn)
except OSError, e:
except OSError as e:
if e.errno == errno.ENOENT:
pass
else:
@ -8971,7 +8971,7 @@ class RootExports(object):
data = {}
try:
fd = os.open(fn, os.O_RDONLY)
except OSError, e:
except OSError as e:
if e.errno == errno.ENOENT:
return None
else:
@ -8979,7 +8979,7 @@ class RootExports(object):
try:
try:
fcntl.lockf(fd, fcntl.LOCK_SH|fcntl.LOCK_NB)
except IOError, e:
except IOError as e:
raise koji.LockError(e)
st = os.fstat(fd)
if not stat.S_ISREG(st.st_mode):
@ -10491,7 +10491,7 @@ class RootExports(object):
#handle older base64 encoded data
val = base64.decodestring(val)
data, method = xmlrpclib.loads(val)
except xmlrpclib.Fault, fault:
except xmlrpclib.Fault as fault:
data = fault
task[f] = data
yield task
@ -12593,7 +12593,7 @@ class HostExports(object):
logger.debug("os.link(%r, %r)", rpmpath, l_dst)
try:
os.link(rpmpath, l_dst)
except OSError, ose:
except OSError as ose:
if ose.errno == 18:
shutil.copy2(
rpmpath, os.path.join(archdir, bnplet, bnp))
@ -12690,7 +12690,7 @@ def handle_upload(environ):
try:
try:
fcntl.lockf(fd, fcntl.LOCK_EX|fcntl.LOCK_NB)
except IOError, e:
except IOError as e:
raise koji.LockError(e)
if offset == -1:
offset = os.lseek(fd, 0, 2)

4
hub/kojixmlrpc.py
View file

@ -229,7 +229,7 @@ class ModXMLRPCRequestHandler(object):
# wrap response in a singleton tuple
response = (response,)
response = dumps(response, methodresponse=1, marshaller=Marshaller)
except Fault, fault:
except Fault as fault:
self.traceback = True
response = dumps(fault, marshaller=Marshaller)
except:
@ -323,7 +323,7 @@ class ModXMLRPCRequestHandler(object):
for call in calls:
try:
result = self._dispatch(call['methodName'], call['params'])
except Fault, fault:
except Fault as fault:
results.append({'faultCode': fault.faultCode, 'faultString': fault.faultString})
except:
# transform unknown exceptions into XML-RPC Faults

12
koji/daemon.py
View file

@ -637,7 +637,7 @@ class TaskManager(object):
rootdir = "%s/root" % topdir
try:
st = os.lstat(rootdir)
except OSError, e:
except OSError as e:
if e.errno == errno.ENOENT:
rootdir = None
else:
@ -658,13 +658,13 @@ class TaskManager(object):
#also remove the config
try:
os.unlink(data['cfg'])
except OSError, e:
except OSError as e:
self.logger.warn("%s: can't remove config: %s" % (desc, e))
elif age > 120:
if rootdir:
try:
flist = os.listdir(rootdir)
except OSError, e:
except OSError as e:
self.logger.warn("%s: can't list rootdir: %s" % (desc, e))
continue
if flist:
@ -892,7 +892,7 @@ class TaskManager(object):
prefix = "Task %i (pid %i)" % (task_id, pid)
try:
(childpid, status) = os.waitpid(pid, os.WNOHANG)
except OSError, e:
except OSError as e:
#check errno
if e.errno != errno.ECHILD:
#should not happen
@ -933,7 +933,7 @@ class TaskManager(object):
try:
os.kill(pid, sig)
except OSError, e:
except OSError as e:
# process probably went away, we'll find out on the next iteration
self.logger.info('Error sending signal %i to %s (pid %i, taskID %i): %s' %
(sig, execname, pid, task_id, e))
@ -1222,7 +1222,7 @@ class TaskManager(object):
self.logger.info("RESPONSE: %r" % response)
self.session.host.closeTask(handler.id, response)
return
except koji.xmlrpcplus.Fault, fault:
except koji.xmlrpcplus.Fault as fault:
response = koji.xmlrpcplus.dumps(fault)
tb = ''.join(traceback.format_exception(*sys.exc_info())).replace(r"\n", "\n")
self.logger.warn("FAULT:\n%s" % tb)

4
koji/ssl/SSLConnection.py
View file

@ -106,7 +106,7 @@ class SSLConnection:
try:
sent = con.send(data, flags)
except SSL.SysCallError, e:
except SSL.SysCallError as e:
if e[0] == 32: # Broken Pipe
self.close()
sent = 0
@ -142,7 +142,7 @@ class SSLConnection:
return None
except SSL.WantReadError:
time.sleep(0.2)
except SSL.SysCallError, e:
except SSL.SysCallError as e:
if e.args == (-1, 'Unexpected EOF'):
break
raise

2
koji/tasks.py
View file

@ -233,7 +233,7 @@ class BaseTaskHandler(object):
continue
try:
self.session.getTaskResult(task)
except (koji.GenericError, xmlrpclib.Fault), task_error:
except (koji.GenericError, xmlrpclib.Fault) as task_error:
self.logger.info("task %s failed or was canceled" % task)
failed = True
break