# HG changeset patch # User Yuya Nishihara # Date 2018-06-21 13:33:42 # Node ID 3813c6b7337c9aadac7a5ff5f03ae3ea3d61da9b # Parent 256581484c7fc93a721ee2fb0b240cb6d957f421 templater: remove redundant member variables from templater class We no longer need them since the engine is instantiated in __init__(). diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -863,17 +863,11 @@ class templater(object): self.cache may be updated later to register additional template fragments. """ - if filters is None: - filters = {} - if defaults is None: - defaults = {} - self._filters = templatefilters.filters.copy() - self._filters.update(filters) - self.defaults = defaults - self._resources = resources + allfilters = templatefilters.filters.copy() + if filters: + allfilters.update(filters) self._loader = loader(cache, aliases) - self._proc = engine(self._loader.load, self._filters, self.defaults, - self._resources) + self._proc = engine(self._loader.load, allfilters, defaults, resources) self._minchunk, self._maxchunk = minchunk, maxchunk @classmethod @@ -894,6 +888,15 @@ class templater(object): def cache(self): return self._loader.cache + # for highlight extension to insert one-time 'colorize' filter + @property + def _filters(self): + return self._proc._filters + + @property + def defaults(self): + return self._proc._defaults + def load(self, t): """Get parsed tree for the given template name. Use a local cache.""" return self._loader.load(t)