This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D3364 largefiles: opts appears to already be bytes in this instance
Closed	durin42	D3363 tests: port inline extensions in test-hook.t to py3
Closed	durin42	D3362 tests: manually print list in test-hook.t
Closed	durin42	D3361 hook: also use pprint on lists for stable output on py2/3
Closed	durin42	D3360 hook: use stringutil.pprint instead of reinventing it
Closed	durin42	D3359 stringutil: make b prefixes on string output optional
Closed	durin42	D3358 stringutil: teach pprint how to format None
Closed	durin42	D3357 tests: update inline extensions in test-bundle2-exchange.t to py3
Closed	durin42	D3356 wsgicgi: un-do some prior porting work that is now wrong
Closed	durin42	D3355 hgweb_mod: inform hgweb class about paths actually being bytes
Closed	durin42	D3354 hgweb: inform hgweb.hgweb() entrypoint that paths should be bytes
Closed	durin42	D3353 tests: port inline cgi script in test-largefiles.t to python 3
Closed	durin42	D3352 lfcommands: use %d on known-int in format string
Closed	durin42	D3351 py3: fix test-shelve.t on Python 3
Closed	durin42	D3350 tests: fix up a couple of minor bytes inconsistencies in run-tests.py
Closed	durin42	D3349 tests: make sure test-run-tests.t actually runs run-tests.py under Python 3
Closed	durin42	D3348 py3: another three passing
Closed	durin42	D3347 httppeer: work around API differences on urllib Request objects
Closed	durin42	D3346 httppeer: no matter what Python 3 might think, http headers are bytes
Closed	durin42	D3345 httppeer: fix debug prints to work on Python 3
Closed	durin42	D3344 url: some bytes/str cleanup where we interface with stdlib funcs
Closed	durin42	D3343 hgweb: these strings should be sysstrs, not bytes
Closed	durin42	D3342 tests: port inline extensions in test-http.t to Python 3

Diff 8339

mercurial/httppeer.py

	"""Send a prepared HTTP request.			"""Send a prepared HTTP request.

	Returns the response object.			Returns the response object.
	"""			"""
	if (ui.debugflag			if (ui.debugflag
	and ui.configbool('devel', 'debug.peer-request')):			and ui.configbool('devel', 'debug.peer-request')):
	dbg = ui.debug			dbg = ui.debug
	line = 'devel-peer-request: %s\n'			line = 'devel-peer-request: %s\n'
	dbg(line % '%s %s' % (req.get_method(), req.get_full_url()))			dbg(line % '%s %s' % (pycompat.bytesurl(req.get_method()),
				pycompat.bytesurl(req.get_full_url())))
	hgargssize = None			hgargssize = None

	for header, value in sorted(req.header_items()):			for header, value in sorted(req.header_items()):
	if header.startswith('X-hgarg-'):			if header.startswith('X-hgarg-'):
	if hgargssize is None:			if hgargssize is None:
	hgargssize = 0			hgargssize = 0
	hgargssize += len(value)			hgargssize += len(value)
	else:			else:
	raise			raise
	except httplib.HTTPException as inst:			except httplib.HTTPException as inst:
	ui.debug('http error requesting %s\n' %			ui.debug('http error requesting %s\n' %
	util.hidepassword(req.get_full_url()))			util.hidepassword(req.get_full_url()))
	ui.traceback()			ui.traceback()
	raise IOError(None, inst)			raise IOError(None, inst)
	finally:			finally:
	if ui.configbool('devel', 'debug.peer-request'):			if ui.configbool('devel', 'debug.peer-request'):
	dbg(line % ' finished in %.4f seconds (%s)'			dbg(line % ' finished in %.4f seconds (%d)'
	% (util.timer() - start, res.code))			% (util.timer() - start, res.code))

	# Insert error handlers for common I/O failures.			# Insert error handlers for common I/O failures.
	_wraphttpresponse(res)			_wraphttpresponse(res)

	return res			return res

	def parsev1commandresponse(ui, baseurl, requrl, qs, resp, compressible,			def parsev1commandresponse(ui, baseurl, requrl, qs, resp, compressible,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8222		Apr 14 2018, 12:31 AM	★	★
Diff 2	8339	rHGe10b695b9c41633f860f05886a4fb4de967a710b	Apr 13 2018, 9:06 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

httppeer: fix debug prints to work on Python 3ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 8339

mercurial/httppeer.py

httppeer: fix debug prints to work on Python 3
ClosedPublic

Revision Contents
Changeset List