This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D1104 peer: ensure command names are always ascii bytestrs
Closed	durin42	D1103 httppeer: always produce native str header keys and values
Closed	durin42	D1102 wireproto: use %d to encode int, not %s
Closed	durin42	D1101 wireproto: use a proper exception instead of `assert False`
Closed	durin42	D1100 wireproto: use listcomp instead of map()
Closed	durin42	D1099 dagutil: use a listcomp instead of a map()
Closed	durin42	D1092 peer: when collecting method names for batch calls, bytes-ify __name__
Closed	durin42	D1091 python3: replace im_{self,func} with __{self,func}__ globally
Closed	durin42	D1090 httppeer: extract content-type from headers using native str
Closed	durin42	D1089 httppeer: convert request url back to bytes before inspecting it
Closed	durin42	D1088 templater: explode if we try to emit a str
Closed	durin42	D1087 hgweb: fill in content-type and content-length as native strings
Closed	durin42	D1086 hgweb: mimetype guessing needs a unicode path
Closed	durin42	D1085 hgweb: set sent_headers attr as early as practical
Closed	durin42	D1084 hgweb: detect Python 3-era libraries and use modern attribute names
Closed	durin42	D1083 server: indent block that's about to get conditionalized

Diff 2795

mercurial/httppeer.py


	def encodevalueinheaders(value, header, limit):			def encodevalueinheaders(value, header, limit):
	"""Encode a string value into multiple HTTP headers.			"""Encode a string value into multiple HTTP headers.

	``value`` will be encoded into 1 or more HTTP headers with the names			``value`` will be encoded into 1 or more HTTP headers with the names
	``header-<N>`` where ``<N>`` is an integer starting at 1. Each header			``header-<N>`` where ``<N>`` is an integer starting at 1. Each header
	name + value will be at most ``limit`` bytes long.			name + value will be at most ``limit`` bytes long.

	Returns an iterable of 2-tuples consisting of header names and values.			Returns an iterable of 2-tuples consisting of header names and
				values as native strings.
	"""			"""
	fmt = header + '-%s'			# HTTP Headers are ASCII. Python 3 requires them to be unicodes,
	valuelen = limit - len(fmt % '000') - len(': \r\n')			# not bytes. This function always takes bytes in as arguments.
				fmt = pycompat.strurl(header) + r'-%s'
				# Note: it is NOT a bug that the last bit here is a bytestring
				# and not a unicode: we're just getting the encoded length anyway,
				# and using an r-string to make it portable between Python 2 and 3
				# doesn't work because then the \r is a literal backslash-r
				# instead of a carriage return.
				valuelen = limit - len(fmt % r'000') - len(': \r\n')
	result = []			result = []

	n = 0			n = 0
	for i in xrange(0, len(value), valuelen):			for i in xrange(0, len(value), valuelen):
	n += 1			n += 1
	result.append((fmt % str(n), value[i:i + valuelen]))			result.append((fmt % str(n), pycompat.strurl(value[i:i + valuelen])))

	return result			return result

	def _wraphttpresponse(resp):			def _wraphttpresponse(resp):
	"""Wrap an HTTPResponse with common error handlers.			"""Wrap an HTTPResponse with common error handlers.

	This ensures that any I/O from any consumer raises the appropriate			This ensures that any I/O from any consumer raises the appropriate
	error and messaging.			error and messaging.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2795		Oct 15 2017, 9:30 PM	★	★
Diff 2	2805	rHG67e9678efd98aa599167f644d1971d2243c322d5	Oct 15 2017, 12:03 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

httppeer: always produce native str header keys and valuesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2795

mercurial/httppeer.py

httppeer: always produce native str header keys and values
ClosedPublic

Revision Contents
Changeset List