commit 25d004ee607999ee4f380c9a0e26dec50074c624
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Sun Aug 9 15:03:14 2015 +0200
Catch exceptions as to be py3 compatible
pkgdb2client/cli.py | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/pkgdb2client/cli.py b/pkgdb2client/cli.py
index 181d353..baf0992 100644
--- a/pkgdb2client/cli.py
+++ b/pkgdb2client/cli.py
@@ -160,18 +160,18 @@ def get_last_build(packagename, tag):
tag = tag + "-updates"
try:
_get_last_build(packagename, tag)
- except Exception, err:
- print err
+ except Exception as err:
+ print(err)
tag = tag + "-testing"
try:
_get_last_build(packagename, tag)
- except Exception, err:
- print err
+ except Exception as err:
+ print(err)
else:
try:
_get_last_build(packagename, tag)
- except Exception, err:
- print err
+ except Exception as err:
+ print(err)
def setup_parser():
@@ -846,8 +846,8 @@ def main():
# Parse the commandline
try:
arg = parser.parse_args()
- except argparse.ArgumentTypeError, err:
- print "\nError: {0}".format(err)
+ except argparse.ArgumentTypeError as err:
+ print("\nError: {0}".format(err))
return 2
if arg.nocolor:
@@ -896,32 +896,32 @@ def main():
except KeyboardInterrupt:
print("\nInterrupted by user.")
return_code = 1
- except ServerError, err:
+ except ServerError as err:
LOG.debug('ServerError')
print('{0}'.format(err))
return_code = 3
- except ActionError, err:
+ except ActionError as err:
LOG.debug('ActionError')
print('{0}'.format(err.message))
return_code = 7
- except argparse.ArgumentError, err:
+ except argparse.ArgumentError as err:
LOG.debug('ArgparseError')
print('{0}'.format(err.message))
return_code = 9
- except AppError, err:
+ except AppError as err:
LOG.debug('AppError')
print('{0}: {1}'.format(err.name, err.message))
return_code = 4
- except PkgDBException, err:
+ except PkgDBException as err:
LOG.debug('PkgDBException')
print('{0}'.format(err))
return_code = 8
- except ValueError, err:
- print 'Error: {0}'.format(err)
- print 'Did you log in?'
+ except ValueError as err:
+ print('Error: {0}'.format(err))
+ print('Did you log in?')
return_code = 6
- except Exception, err:
- print 'Error: {0}'.format(err)
+ except Exception as err:
+ print('Error: {0}'.format(err))
logging.exception("Generic error catched:")
return_code = 5
Show replies by date