This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1088

templater: explode if we try to emit a str
ClosedPublic

Authored by durin42 on Oct 15 2017, 12:57 AM.

Download Raw Diff

Details

Reviewers

yuja

Group Reviewers

hg-reviewers

Commits

rHGb13c95919ff5: templater: explode if we try to emit a str

Summary

Without this if branch, we infinitely recurse in _flatten, which is
very confusing. Something in an hgweb template is trying to write out
a string instead of a bytes on Python 3, and this at least makes it
crash politely.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 15 2017, 12:57 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 15 2017, 12:57 AM

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

durin42 added a child revision: D1089: httppeer: convert request url back to bytes before inspecting it.Oct 15 2017, 12:57 AM

yuja accepted this revision.Oct 15 2017, 9:20 AM

This revision is now accepted and ready to land.Oct 15 2017, 9:20 AM

Closed by commit rHGb13c95919ff5: templater: explode if we try to emit a str (authored by durin42). · Explain WhyOct 15 2017, 9:27 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

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 2768

mercurial/templater.py


	stringify = templatefilters.stringify			stringify = templatefilters.stringify

	def _flatten(thing):			def _flatten(thing):
	'''yield a single stream from a possibly nested set of iterators'''			'''yield a single stream from a possibly nested set of iterators'''
	thing = templatekw.unwraphybrid(thing)			thing = templatekw.unwraphybrid(thing)
	if isinstance(thing, bytes):			if isinstance(thing, bytes):
	yield thing			yield thing
				elif isinstance(thing, str):
				# We can only hit this on Python 3, and it's here to guard
				# against infinite recursion.
				raise error.ProgrammingError('Mercurial IO including templates is done'
				' with bytes, not strings')
	elif thing is None:			elif thing is None:
	pass			pass
	elif not util.safehasattr(thing, '__iter__'):			elif not util.safehasattr(thing, '__iter__'):
	yield pycompat.bytestr(thing)			yield pycompat.bytestr(thing)
	else:			else:
	for i in thing:			for i in thing:
	i = templatekw.unwraphybrid(i)			i = templatekw.unwraphybrid(i)
	if isinstance(i, bytes):			if isinstance(i, bytes):

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2768		Oct 15 2017, 12:57 AM	★	★
Diff 2	2778	rHGb13c95919ff5ad253153c676671a5a08421ad1e0	Oct 14 2017, 11:30 AM	★	★