Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/help.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 | 117b9a101f71 |
| children | 9de443515f1d |
comparison
equal
deleted
inserted
replaced
| 25659:d60678a567a9 | 25660:328739ea70c3 |
|---|---|
| 226 | 226 |
| 227 def helpcmd(name): | 227 def helpcmd(name): |
| 228 try: | 228 try: |
| 229 aliases, entry = cmdutil.findcmd(name, commands.table, | 229 aliases, entry = cmdutil.findcmd(name, commands.table, |
| 230 strict=unknowncmd) | 230 strict=unknowncmd) |
| 231 except error.AmbiguousCommand, inst: | 231 except error.AmbiguousCommand as inst: |
| 232 # py3k fix: except vars can't be used outside the scope of the | 232 # py3k fix: except vars can't be used outside the scope of the |
| 233 # except block, nor can be used inside a lambda. python issue4617 | 233 # except block, nor can be used inside a lambda. python issue4617 |
| 234 prefix = inst.args[0] | 234 prefix = inst.args[0] |
| 235 select = lambda c: c.lstrip('^').startswith(prefix) | 235 select = lambda c: c.lstrip('^').startswith(prefix) |
| 236 rst = helplist(select) | 236 rst = helplist(select) |