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.

Download Raw Diff

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

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 26 2018, 1:02 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 26 2018, 1:02 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D2449: wireproto: use %d to encode an int, not a %s.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

			Path	Packages
M			mercurial/httppeer.py (5 lines)

Status	Author	Revision
Closed	durin42	D2451 py3: whitelist test-push-http.t as passing
Closed	durin42	D2450 util: handle fileno() on Python 3 throwing io.UnsupportedOperation
Closed	durin42	D2449 wireproto: use %d to encode an int, not a %s
Closed	durin42	D2448 httppeer: explicitly catch urlerr.httperror and re-raise
Closed	durin42	D2447 hgweb: pass exception message to builtin Exception ctor as sysstr
Closed	durin42	D2446 bundle2: part id is an int, use %d to make it bytes
Closed	durin42	D2445 bundle2: **strkwargs love on various kwargs constructions
Closed	durin42	D2444 http: drop custom http client logic
Closed	durin42	D2443 statichttprepo: move HTTPRangeHandler from byterange and delete the latter
Closed	durin42	D2442 filemerge: do what the context __bytes__ does, but locally
Closed	durin42	D2441 py3: convert known-int values to bytes using %d
Closed	durin42	D2440 py3: hunt down str(exception) instances and use util.forcebytestr
Closed	durin42	D2439 py3: whitelist another nine passing tests
Closed	durin42	D2438 util: use pycompat.bytestr() on repr() in date parse abort
Closed	durin42	D2437 subrepo: use util.forcebytestr() instead of str() on exception
Closed	durin42	D2436 tests: add missing b prefixes in test-commit.t
Closed	durin42	D2435 commitextras: fix on Python 3 by using sysstrs for __dict__ ops
Closed	durin42	D2434 util: use pycompat.bytestr() instead of str()

Diff 6103

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)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6103		Feb 26 2018, 1:02 AM	★	★
Diff 2	6120	rHGefebfa9b4cab1bf5c0e8eeb31c636d746712fa84	Feb 26 2018, 12:50 AM	★	★