--- a/contrib/simplemerge Wed Feb 10 22:44:28 2016 +0900
+++ b/contrib/simplemerge Wed Feb 10 22:44:29 2016 +0900
@@ -47,7 +47,7 @@
opts = {}
try:
args = fancyopts.fancyopts(sys.argv[1:], options, opts)
- except fancyopts.getopt.GetoptError, e:
+ except fancyopts.getopt.GetoptError as e:
raise ParseError(e)
if opts['help']:
showhelp()
@@ -55,11 +55,11 @@
if len(args) != 3:
raise ParseError(_('wrong number of arguments'))
sys.exit(simplemerge.simplemerge(ui.ui(), *args, **opts))
-except ParseError, e:
+except ParseError as e:
sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
showhelp()
sys.exit(1)
-except error.Abort, e:
+except error.Abort as e:
sys.stderr.write("abort: %s\n" % e)
sys.exit(255)
except KeyboardInterrupt: