diff -r d60678a567a9 -r 328739ea70c3 mercurial/hgweb/hgwebdir_mod.py --- 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):