Change exception syntax to be more modern and hopefully fix buildbot issue in the process
This commit is contained in:
parent
5d61cbf008
commit
9415976d17
|
@ -93,7 +93,7 @@ if not os.path.exists(filename):
|
|||
|
||||
try:
|
||||
z = zipfile.ZipFile(filename, "r")
|
||||
except Exception, ex:
|
||||
except Exception as ex:
|
||||
sys.stderr.write('Failed to open zip file: %s\n' % str(ex))
|
||||
sys.exit(1)
|
||||
|
||||
|
@ -129,7 +129,7 @@ try:
|
|||
|
||||
zf.close()
|
||||
z.close()
|
||||
except Exception, ex:
|
||||
except Exception as ex:
|
||||
sys.stderr.write('Failed to unzip package: %s\n' % str(ex))
|
||||
sys.exit(1)
|
||||
|
||||
|
@ -139,6 +139,6 @@ try:
|
|||
if get_platform(f) == platform and get_branch(f) == branch:
|
||||
if f != packagename:
|
||||
os.remove(os.path.join(directory, f))
|
||||
except Exception, ex:
|
||||
except Exception as ex:
|
||||
sys.stderr.write('Failed to remove old packages: %s\n' % str(ex))
|
||||
sys.exit(1)
|
||||
|
|
|
@ -133,7 +133,7 @@ else:
|
|||
z.write("{}.zip".format(builder))
|
||||
z.close()
|
||||
sys.exit(retcode)
|
||||
except Exception, ex:
|
||||
except Exception as ex:
|
||||
sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
|
||||
sys.exit(1)
|
||||
|
||||
|
@ -149,7 +149,7 @@ if os.path.exists(release_dir):
|
|||
# create release package
|
||||
try:
|
||||
subprocess.call(['make', 'package_archive'])
|
||||
except Exception, ex:
|
||||
except Exception as ex:
|
||||
sys.stderr.write('Make package release failed' + str(ex) + '\n')
|
||||
sys.exit(1)
|
||||
|
||||
|
@ -180,6 +180,6 @@ try:
|
|||
z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)
|
||||
z.write(filepath, arcname=file)
|
||||
z.close()
|
||||
except Exception, ex:
|
||||
except Exception as ex:
|
||||
sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
|
||||
sys.exit(1)
|
||||
|
|
Loading…
Reference in New Issue