Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/common.py @ 25660:328739ea70c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a111e460318a
children 46e2c57026bc
comparison
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
151 data = fp.read() 151 data = fp.read()
152 fp.close() 152 fp.close()
153 req.respond(HTTP_OK, ct, body=data) 153 req.respond(HTTP_OK, ct, body=data)
154 except TypeError: 154 except TypeError:
155 raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') 155 raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename')
156 except OSError, err: 156 except OSError as err:
157 if err.errno == errno.ENOENT: 157 if err.errno == errno.ENOENT:
158 raise ErrorResponse(HTTP_NOT_FOUND) 158 raise ErrorResponse(HTTP_NOT_FOUND)
159 else: 159 else:
160 raise ErrorResponse(HTTP_SERVER_ERROR, err.strerror) 160 raise ErrorResponse(HTTP_SERVER_ERROR, err.strerror)
161 161