This is an archive of the discontinued Mercurial Phabricator instance.

mercurial/templater.py
1098	`pyflakes` is complaining about undefined symbols on Python 2. I'm not sure how to best handle this though. I'll leave this queued for now because it doesn't seem to be harming tests otherwise. But it may have impact for non-PyOxidizer Windows `py2exe` builds.

martinvonz added inline comments.Aug 6 2020, 1:11 AM

mercurial/templater.py
1098	Oops, sorry about that, I've only been running py3 tests lately. It's probably fine to simply catch the broader classes `ImportError` and `OSError`. I'll send a patch for that.

martinvonz mentioned this in D8902: templater: replace Py3-only exception types by super-types available in Py2.Aug 6 2020, 1:27 AM

martinvonz mentioned this in rHG6e6fe826ba69: templater: replace Py3-only exception types by super-types available in Py2.Aug 6 2020, 8:34 PM

Revision Contents
Changeset List

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

Commit	Parents	Author	Summary	Date
eb81e4655082	0bcda3fcd8ea	Martin von Zweigbergk		Aug 4 2020, 1:51 PM

Status	Author	Revision
Abandoned	martinvonz	D8809 templater: reuse check for both "map-cmdline.<name>" and "<name>"
Closed	martinvonz	D8857 packaging: delete unnecessary updating of `dirs` list
Closed	martinvonz	D8856 packaging: make "mercurial.defaultrc" a key in package_data
Closed	martinvonz	D8901 hgweb: enable reading styles from resources in frozen binaries
Closed	martinvonz	D8900 hgweb: rely on open_template()'s fallback to using templatedir()
Closed	martinvonz	D8899 hgweb: open mapfile using templater.open_template()
Closed	martinvonz	D8898 hgweb: simplify a constant-length list by converting to literal tuple
Closed	martinvonz	D8897 hgweb: remove some accesses to private member uimod._unset
Closed	martinvonz	D8896 templater: try to read %include in mapfiles from resources
Closed	martinvonz	D8895 templater: unroll loop over mapfile directories
Closed	martinvonz	D8894 templater: make open_template() read from resources if in frozen binary
Closed	martinvonz	D8893 templater: pass opened file-like object to templatespec
Closed	martinvonz	D8892 templater: replace templatepath() with function that also opens the file
Closed	martinvonz	D8891 templater: start passing resource to read from into _readmapfile()
Closed	martinvonz	D8890 templater: move stylemap() to hgweb_mod, since that's its only user
Closed	martinvonz	D8874 hgweb: simplify staticfile() now that we always pass it a single directory
Closed	martinvonz	D8858 packaging: include templates with their package as key in package_data
Closed	martinvonz	D8855 packaging: mark mercurial.templates and subdirs as packages
Closed	martinvonz	D8854 templates: add __init__.py files to templates/ dirs
Closed	martinvonz	D8853 templatespec: use new factory functions in hooklib
Closed	martinvonz	D8848 templatespec: use new factory functions in logcmdutil
Closed	martinvonz	D8847 templatespec: move check for non-unicode to lower-level function
Closed	martinvonz	D8846 templatespec: logcmdutil.templatespec() gets either template or mapfile
Closed	martinvonz	D8845 templatespec: create a factory function for each type there is
Closed	martinvonz	D8844 templater: stop accepting a single style to stylemap()
Closed	martinvonz	D8807 formatter: inline a variable assigned from `templater.templater.frommapfile`
Closed	martinvonz	D8806 templater: don't normalize path separators to '/' when interacting with OS
Closed	martinvonz	D8805 formatter: remove now-unnecessary check for file-ness
Closed	martinvonz	D8804 templater: make templatepath() not return directory paths
Closed	martinvonz	D8803 tests: show unusual error message for `hg log --style coal`
Closed	martinvonz	D8796 config: remove now-unused `abs` argument from `include` callback
Closed	martinvonz	D8795 config: re-calculate absolute %include path in `include` callback
Closed	martinvonz	D8794 subrepoutil: use relative path for looking up config `%include`s
Closed	martinvonz	D8793 config: remove now-unused support for "includepaths"
Closed	martinvonz	D8800 tests: add tests trying to use dir as style, as %include, and as __base__
Closed	martinvonz	D8802 tests: fix mistaken copy&paste from commit 4489e9a22763

Diff 22276

mercurial/templater.py


	def templatedir():			def templatedir():
	'''return the directory used for template files, or None.'''			'''return the directory used for template files, or None.'''
	path = os.path.normpath(os.path.join(resourceutil.datapath, b'templates'))			path = os.path.normpath(os.path.join(resourceutil.datapath, b'templates'))
	return path if os.path.isdir(path) else None			return path if os.path.isdir(path) else None


	def open_template(name):			def open_template(name):
	'''returns a file-like object for the given template, and its full path'''			'''returns a file-like object for the given template, and its full path

				If the name is a relative path and we're in a frozen binary, the template
				will be read from the mercurial.templates package instead. The returned path
				will then be the relative path.
				'''
	templatepath = templatedir()			templatepath = templatedir()
	if templatepath is not None or os.path.isabs(name):			if templatepath is not None or os.path.isabs(name):
	f = os.path.join(templatepath, name)			f = os.path.join(templatepath, name)
	try:			try:
	return f, open(f, mode='rb')			return f, open(f, mode='rb')
	except EnvironmentError:			except EnvironmentError:
	return None, None			return None, None
	else:			else:
	# TODO: read from resources here			name_parts = pycompat.sysstr(name).split('/')
				package_name = '.'.join(['mercurial', 'templates'] + name_parts[:-1])
				try:
				return (
				name,
				resourceutil.open_resource(package_name, name_parts[-1]),
				)
				except (ModuleNotFoundError, FileNotFoundError):
				indygregUnsubmitted Not Done `pyflakes` is complaining about undefined symbols on Python 2. I'm not sure how to best handle this though. I'll leave this queued for now because it doesn't seem to be harming tests otherwise. But it may have impact for non-PyOxidizer Windows `py2exe` builds. indygreg: `pyflakes` is complaining about undefined symbols on Python 2. I'm not sure how to best handle…
				martinvonzAuthorUnsubmitted Done Oops, sorry about that, I've only been running py3 tests lately. It's probably fine to simply catch the broader classes `ImportError` and `OSError`. I'll send a patch for that. martinvonz: Oops, sorry about that, I've only been running py3 tests lately. It's probably fine to simply…
	return None, None			return None, None

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22276		Aug 5 2020, 12:26 PM	★	★
Diff 2	22292	rHG3b27ed8e324ec01483fa8a36a652cf12b4af8ccb	Aug 4 2020, 1:51 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

templater: make open_template() read from resources if in frozen binaryClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22276

mercurial/templater.py

templater: make open_template() read from resources if in frozen binary
ClosedPublic

Revision Contents
Changeset List