Show More
@@ -49,14 +49,14 b' class engine(object):' | |||
|
49 | 49 | self.cache = {} |
|
50 | 50 | self.parsecache = {} |
|
51 | 51 | |
|
52 | def process(self, t, map): | |
|
53 | '''Perform expansion. t is name of map element to expand. map contains | |
|
52 | def process(self, t, mapping): | |
|
53 | '''Perform expansion. t is name of map element to expand. mapping contains | |
|
54 | 54 | added elements for use during expansion. Is a generator.''' |
|
55 | 55 | if t not in self.parsecache: |
|
56 | 56 | tmpl = self.loader(t) |
|
57 | 57 | self.parsecache[t] = self._parse(tmpl) |
|
58 | 58 | parsed = self.parsecache[t] |
|
59 | iters = [self._process(parsed, map)] | |
|
59 | iters = [self._process(parsed, mapping)] | |
|
60 | 60 | while iters: |
|
61 | 61 | try: |
|
62 | 62 | item = iters[0].next() |
@@ -207,14 +207,14 b' class templater(object):' | |||
|
207 | 207 | (self.map[t][1], inst.args[1])) |
|
208 | 208 | return self.cache[t] |
|
209 | 209 | |
|
210 | def __call__(self, t, **map): | |
|
210 | def __call__(self, t, **mapping): | |
|
211 | 211 | ttype = t in self.map and self.map[t][0] or 'default' |
|
212 | 212 | proc = self.engines.get(ttype) |
|
213 | 213 | if proc is None: |
|
214 | 214 | proc = engines[ttype](self.load, self.filters, self.defaults) |
|
215 | 215 | self.engines[ttype] = proc |
|
216 | 216 | |
|
217 | stream = proc.process(t, map) | |
|
217 | stream = proc.process(t, mapping) | |
|
218 | 218 | if self.minchunk: |
|
219 | 219 | stream = util.increasingchunks(stream, min=self.minchunk, |
|
220 | 220 | max=self.maxchunk) |
General Comments 0
You need to be logged in to leave comments.
Login now