Mercurial > hg
comparison hgext/eol.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 | 80c5b2666a96 |
children | ce26928cbe41 |
comparison
equal
deleted
inserted
replaced
25659:d60678a567a9 | 25660:328739ea70c3 |
---|---|
216 else: | 216 else: |
217 data = repo[node]['.hgeol'].data() | 217 data = repo[node]['.hgeol'].data() |
218 return eolfile(ui, repo.root, data) | 218 return eolfile(ui, repo.root, data) |
219 except (IOError, LookupError): | 219 except (IOError, LookupError): |
220 pass | 220 pass |
221 except error.ParseError, inst: | 221 except error.ParseError as inst: |
222 ui.warn(_("warning: ignoring .hgeol file due to parse error " | 222 ui.warn(_("warning: ignoring .hgeol file due to parse error " |
223 "at %s: %s\n") % (inst.args[1], inst.args[0])) | 223 "at %s: %s\n") % (inst.args[1], inst.args[0])) |
224 return None | 224 return None |
225 | 225 |
226 def _checkhook(ui, repo, node, headsonly): | 226 def _checkhook(ui, repo, node, headsonly): |