Mercurial > hg
comparison hgext/rebase.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 | d298805fb639 |
children | 563ea14c62d4 |
comparison
equal
deleted
inserted
replaced
25659:d60678a567a9 | 25660:328739ea70c3 |
---|---|
836 (' '.join(str(r) for r in sorted(skipped)) or None)) | 836 (' '.join(str(r) for r in sorted(skipped)) or None)) |
837 repo.ui.debug('rebase status resumed\n') | 837 repo.ui.debug('rebase status resumed\n') |
838 _setrebasesetvisibility(repo, state.keys()) | 838 _setrebasesetvisibility(repo, state.keys()) |
839 return (originalwd, target, state, skipped, | 839 return (originalwd, target, state, skipped, |
840 collapse, keep, keepbranches, external, activebookmark) | 840 collapse, keep, keepbranches, external, activebookmark) |
841 except IOError, err: | 841 except IOError as err: |
842 if err.errno != errno.ENOENT: | 842 if err.errno != errno.ENOENT: |
843 raise | 843 raise |
844 raise util.Abort(_('no rebase in progress')) | 844 raise util.Abort(_('no rebase in progress')) |
845 | 845 |
846 def needupdate(repo, state): | 846 def needupdate(repo, state): |