mercurial/httppeer.py
233	Appears that encodevalueinheaders() takes bytes. I don't know which would be better to pass unicodes around or convert them at one place.
240	Perhaps this should be handled in urlencode() because it converts the output from str to bytes.

mercurial/httppeer.py
233	I'm going to go ahead and not mess with this until I hit some test coverage for it. I think we should probably just leave encodevalueinheaders() as bytes-in but make it native-str-out, but we'll see when we get there.
240	Turns out urlencode already copes with bytes input even on Python 3. A small victory.

mercurial/httppeer.py
240	Nice. So we have to concatenate bytes url and bytes qs, then covert the result to unicode.

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2299		Oct 1 2017, 12:43 PM	★	★
Diff 2	2720		Oct 14 2017, 2:52 AM	★	★
Diff 3	2737		Oct 14 2017, 10:49 AM	★	★
Diff 4	2738		Oct 14 2017, 4:16 PM	★	★
Diff 5	2752	rHG6db536bed7ecac3a892a7165e51212a21647719b	Oct 1 2017, 12:12 PM	★	★

Status	Author	Revision
Closed	durin42	D1080 hgweb: fix logging to use native strings as appropriate
Closed	durin42	D1079 hgweb: rewrite most obviously-native-strings to be native strings
Closed	durin42	D1078 hgweb: use native strings consistently for querystring parsing
Closed	durin42	D1077 hgweb: rewrite two X or Y and Z ad-hoc ternaries with Y if X else Z
Closed	durin42	D1076 hgweb: more native string treatment in query string parsing
Closed	durin42	D1075 httppeer: pass url to urllib as native str, not bytes
Closed	durin42	D891 cleanup: use urllibcompat for renamed methods on urllib request objects
Closed	durin42	D935 urllibcompat: move some adapters from pycompat to urllibcompat
Closed	durin42	D890 urllibcompat: new library to help abstract out some python3 urllib2 stuff
Closed	durin42	D889 url: use native strings for header values
Closed	durin42	D888 keepalive: python 3 portability tweaks
Closed	durin42	D1067 python3: use our bytes-only version of cgi.escape everywhere
Closed	durin42	D1066 url: add cgi.escape equivalent for bytestrings
Closed	durin42	D1065 python3: move from using func_name to __name__
Closed	durin42	D887 httppeer: use native strings for headers
Closed	durin42	D886 ui: convert to/from Optional[bytes] to Optional[str] in password manager
Closed	durin42	D885 httppasswordmgrdbproxy: specify exact arguments

Diff 2299

mercurial/httppeer.py

	else:			else:
	if isinstance(data, basestring):			if isinstance(data, basestring):
	i = io.BytesIO(data)			i = io.BytesIO(data)
	i.length = len(data)			i.length = len(data)
	data = i			data = i
	argsio = io.BytesIO(strargs)			argsio = io.BytesIO(strargs)
	argsio.length = len(strargs)			argsio.length = len(strargs)
	data = _multifile(argsio, data)			data = _multifile(argsio, data)
	headers['X-HgArgs-Post'] = len(strargs)			headers[r'X-HgArgs-Post'] = len(strargs)
	else:			else:
	if len(args) > 0:			if len(args) > 0:
	httpheader = self.capable('httpheader')			httpheader = self.capable('httpheader')
	if httpheader:			if httpheader:
	headersize = int(httpheader.split(',', 1)[0])			headersize = int(httpheader.split(',', 1)[0])
	if headersize > 0:			if headersize > 0:
	# The headers can typically carry more data than the URL.			# The headers can typically carry more data than the URL.
	encargs = urlreq.urlencode(sorted(args.items()))			encargs = urlreq.urlencode(sorted(args.items()))
	for header, value in encodevalueinheaders(encargs, 'X-HgArg',			for header, value in encodevalueinheaders(encargs, r'X-HgArg',
				yujaUnsubmitted Done Appears that encodevalueinheaders() takes bytes. I don't know which would be better to pass unicodes around or convert them at one place. yuja: Appears that encodevalueinheaders() takes bytes. I don't know which would be better to pass…
				durin42AuthorUnsubmitted Not Done I'm going to go ahead and not mess with this until I hit some test coverage for it. I think we should probably just leave encodevalueinheaders() as bytes-in but make it native-str-out, but we'll see when we get there. durin42: I'm going to go ahead and not mess with this until I hit some test coverage for it. I think we…
	headersize):			headersize):
	headers[header] = value			headers[header] = value
	varyheaders.append(header)			varyheaders.append(header)
	else:			else:
	q += sorted(args.items())			q += sorted(args.items())
	qs = '?%s' % urlreq.urlencode(q)			qs = '?%s' % urlreq.urlencode([
	cu = "%s%s" % (self._url, qs)			(pycompat.strurl(qq[0]), pycompat.strurl(qq[1])) for qq in q])
				yujaUnsubmitted Done Perhaps this should be handled in urlencode() because it converts the output from str to bytes. yuja: Perhaps this should be handled in urlencode() because it converts the output from str to bytes.
				durin42AuthorUnsubmitted Not Done Turns out urlencode already copes with bytes input even on Python 3. A small victory. durin42: Turns out urlencode already copes with bytes input even on Python 3. A small victory.
				yujaUnsubmitted Done Nice. So we have to concatenate bytes url and bytes qs, then covert the result to unicode. yuja: Nice. So we have to concatenate bytes url and bytes qs, then covert the result to unicode.
				cu = r"%s%s" % (pycompat.strurl(self._url), qs)
	size = 0			size = 0
	if util.safehasattr(data, 'length'):			if util.safehasattr(data, 'length'):
	size = data.length			size = data.length
	elif data is not None:			elif data is not None:
	size = len(data)			size = len(data)
	if size and self.ui.configbool('ui', 'usehttp2'):			if size and self.ui.configbool('ui', 'usehttp2'):
	headers['Expect'] = '100-Continue'			headers[r'Expect'] = r'100-Continue'
	headers['X-HgHttp2'] = '1'			headers[r'X-HgHttp2'] = r'1'
	if data is not None and 'Content-Type' not in headers:			if data is not None and r'Content-Type' not in headers:
	headers['Content-Type'] = 'application/mercurial-0.1'			headers[r'Content-Type'] = r'application/mercurial-0.1'

	# Tell the server we accept application/mercurial-0.2 and multiple			# Tell the server we accept application/mercurial-0.2 and multiple
	# compression formats if the server is capable of emitting those			# compression formats if the server is capable of emitting those
	# payloads.			# payloads.
	protoparams = []			protoparams = []

	mediatypes = set()			mediatypes = set()
	if self._caps is not None:			if self._caps is not None:
	protoheaders = encodevalueinheaders(' '.join(protoparams),			protoheaders = encodevalueinheaders(' '.join(protoparams),
	'X-HgProto',			'X-HgProto',
	headersize or 1024)			headersize or 1024)
	for header, value in protoheaders:			for header, value in protoheaders:
	headers[header] = value			headers[header] = value
	varyheaders.append(header)			varyheaders.append(header)

	if varyheaders:			if varyheaders:
	headers['Vary'] = ','.join(varyheaders)			headers[r'Vary'] = r','.join(varyheaders)

	req = self._requestbuilder(cu, data, headers)			req = self._requestbuilder(cu, data, headers)

	if data is not None:			if data is not None:
	self.ui.debug("sending %s bytes\n" % size)			self.ui.debug("sending %s bytes\n" % size)
	req.add_unredirected_header('Content-Length', '%d' % size)			req.add_unredirected_header('Content-Length', '%d' % size)
	try:			try:
	resp = self._urlopener.open(req)			resp = self._urlopener.open(req)

This is an archive of the discontinued Mercurial Phabricator instance.

httppeer: use native strings for headers
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 2299

mercurial/httppeer.py

This is an archive of the discontinued Mercurial Phabricator instance.

httppeer: use native strings for headersClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2299

mercurial/httppeer.py

httppeer: use native strings for headers
ClosedPublic

Revision Contents
Changeset List