Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hgweb/hgwebdir_mod.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 | 89ce95f907bd |
| children | 06320fb11699 |
line wrap: on
line diff
--- a/mercurial/hgweb/hgwebdir_mod.py Tue Jun 23 22:38:21 2015 -0700 +++ b/mercurial/hgweb/hgwebdir_mod.py Tue Jun 23 22:20:08 2015 -0700 @@ -219,10 +219,10 @@ # ensure caller gets private copy of ui repo = hg.repository(self.ui.copy(), real) return hgweb(repo).run_wsgi(req) - except IOError, inst: + except IOError as inst: msg = inst.strerror raise ErrorResponse(HTTP_SERVER_ERROR, msg) - except error.RepoError, inst: + except error.RepoError as inst: raise ErrorResponse(HTTP_SERVER_ERROR, str(inst)) up = virtualrepo.rfind('/') @@ -240,7 +240,7 @@ req.respond(HTTP_NOT_FOUND, ctype) return tmpl("notfound", repo=virtual) - except ErrorResponse, err: + except ErrorResponse as err: req.respond(err, ctype) return tmpl('error', error=err.message or '') finally: @@ -336,7 +336,7 @@ u = self.ui.copy() try: u.readconfig(os.path.join(path, '.hg', 'hgrc')) - except Exception, e: + except Exception as e: u.warn(_('error reading %s/.hg/hgrc: %s\n') % (path, e)) continue def get(section, name, default=None):