Mercurial > hg
changeset 10847:90f4367535a5
templater: map -> mapping
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 05 Apr 2010 15:25:08 -0500 |
| parents | 594140b1e12d |
| children | 01346cea5485 |
| files | mercurial/templater.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templater.py Mon Apr 05 15:25:08 2010 -0500 +++ b/mercurial/templater.py Mon Apr 05 15:25:08 2010 -0500 @@ -49,14 +49,14 @@ self.cache = {} self.parsecache = {} - def process(self, t, map): - '''Perform expansion. t is name of map element to expand. map contains + def process(self, t, mapping): + '''Perform expansion. t is name of map element to expand. mapping contains added elements for use during expansion. Is a generator.''' if t not in self.parsecache: tmpl = self.loader(t) self.parsecache[t] = self._parse(tmpl) parsed = self.parsecache[t] - iters = [self._process(parsed, map)] + iters = [self._process(parsed, mapping)] while iters: try: item = iters[0].next() @@ -207,14 +207,14 @@ (self.map[t][1], inst.args[1])) return self.cache[t] - def __call__(self, t, **map): + def __call__(self, t, **mapping): ttype = t in self.map and self.map[t][0] or 'default' proc = self.engines.get(ttype) if proc is None: proc = engines[ttype](self.load, self.filters, self.defaults) self.engines[ttype] = proc - stream = proc.process(t, map) + stream = proc.process(t, mapping) if self.minchunk: stream = util.increasingchunks(stream, min=self.minchunk, max=self.maxchunk)