This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2448

httppeer: explicitly catch urlerr.httperror and re-raise
ClosedPublic

Authored by durin42 on Feb 26 2018, 1:02 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGefebfa9b4cab: httppeer: explicitly catch urlerr.httperror and re-raise
Summary

On Python 3 it seems urllib.error.HTTPError doesn't set the .args
field of the exception to have any contents, which then breaks our
socket.error catch. This works around that issue.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Feb 26 2018, 1:02 AM
Closed by commit rHGefebfa9b4cab: httppeer: explicitly catch urlerr.httperror and re-raise (authored by durin42). · Explain WhyFeb 26 2018, 8:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/httppeer.py (5 lines)

Diff 6120

mercurial/httppeer.py

headers = {r'Content-Type': r'application/mercurial-0.1'} headers = {r'Content-Type': r'application/mercurial-0.1'}
try: try:
r = self._call(cmd, data=fp, headers=headers, **args) r = self._call(cmd, data=fp, headers=headers, **args)
vals = r.split('\n', 1) vals = r.split('\n', 1)
if len(vals) < 2: if len(vals) < 2:
raise error.ResponseError(_("unexpected response:"), r) raise error.ResponseError(_("unexpected response:"), r)
return vals return vals
except urlerr.httperror:
# Catch and re-raise these so we don't try and treat them
# like generic socket errors. They lack any values in
# .args on Python 3 which breaks our socket.error block.
raise
except socket.error as err: except socket.error as err:
if err.args[0] in (errno.ECONNRESET, errno.EPIPE): if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
raise error.Abort(_('push failed: %s') % err.args[1]) raise error.Abort(_('push failed: %s') % err.args[1])
raise error.Abort(err.args[1]) raise error.Abort(err.args[1])
finally: finally:
fp.close() fp.close()
os.unlink(tempname) os.unlink(tempname)