Mercurial > public > mercurial-scm > hg
comparison mercurial/hook.py @ 25660:328739ea70c3
global: mass rewrite to use modern exception syntax
Python 2.6 introduced the "except type as instance" syntax, replacing
the "except type, instance" syntax that came before. Python 3 dropped
support for the latter syntax. Since we no longer support Python 2.4 or
2.5, we have no need to continue supporting the "except type, instance".
This patch mass rewrites the exception syntax to be Python 2.6+ and
Python 3 compatible.
This patch was produced by running `2to3 -f except -w -n .`.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 23 Jun 2015 22:20:08 -0700 |
| parents | 2cfb0bbf83a1 |
| children | d15b279ddade |
comparison
equal
deleted
inserted
replaced
| 25659:d60678a567a9 | 25660:328739ea70c3 |
|---|---|
| 78 # protocol when running through the command server | 78 # protocol when running through the command server |
| 79 old = sys.stdout, sys.stderr, sys.stdin | 79 old = sys.stdout, sys.stderr, sys.stdin |
| 80 sys.stdout, sys.stderr, sys.stdin = ui.fout, ui.ferr, ui.fin | 80 sys.stdout, sys.stderr, sys.stdin = ui.fout, ui.ferr, ui.fin |
| 81 | 81 |
| 82 r = obj(ui=ui, repo=repo, hooktype=name, **args) | 82 r = obj(ui=ui, repo=repo, hooktype=name, **args) |
| 83 except Exception, exc: | 83 except Exception as exc: |
| 84 if isinstance(exc, util.Abort): | 84 if isinstance(exc, util.Abort): |
| 85 ui.warn(_('error: %s hook failed: %s\n') % | 85 ui.warn(_('error: %s hook failed: %s\n') % |
| 86 (hname, exc.args[0])) | 86 (hname, exc.args[0])) |
| 87 else: | 87 else: |
| 88 ui.warn(_('error: %s hook raised an exception: ' | 88 ui.warn(_('error: %s hook raised an exception: ' |