Mercurial > hg
changeset 25085:e05734cd7902
httppeer: use try/except/finally
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 15 May 2015 09:57:02 -0500 |
| parents | 7046c7e7fcb4 |
| children | 140c2d1e57e7 |
| files | mercurial/httppeer.py |
| diffstat | 1 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/httppeer.py Fri May 15 09:56:43 2015 -0500 +++ b/mercurial/httppeer.py Fri May 15 09:57:02 2015 -0500 @@ -198,16 +198,15 @@ headers = {'Content-Type': 'application/mercurial-0.1'} try: - try: - r = self._call(cmd, data=fp, headers=headers, **args) - vals = r.split('\n', 1) - if len(vals) < 2: - raise error.ResponseError(_("unexpected response:"), r) - return vals - except socket.error, err: - if err.args[0] in (errno.ECONNRESET, errno.EPIPE): - raise util.Abort(_('push failed: %s') % err.args[1]) - raise util.Abort(err.args[1]) + r = self._call(cmd, data=fp, headers=headers, **args) + vals = r.split('\n', 1) + if len(vals) < 2: + raise error.ResponseError(_("unexpected response:"), r) + return vals + except socket.error, err: + if err.args[0] in (errno.ECONNRESET, errno.EPIPE): + raise util.Abort(_('push failed: %s') % err.args[1]) + raise util.Abort(err.args[1]) finally: fp.close() os.unlink(tempname)