Mercurial > hg
comparison mercurial/templater.py @ 10854:4036634560d6
templater: strip whitespace inside template methods
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 05 Apr 2010 15:25:08 -0500 |
| parents | b6f6d9fd53d6 |
| children | 62216faed067 |
comparison
equal
deleted
inserted
replaced
| 10853:b6f6d9fd53d6 | 10854:4036634560d6 |
|---|---|
| 137 expr = tmpl[pos + 1:n] | 137 expr = tmpl[pos + 1:n] |
| 138 pos = n + 1 | 138 pos = n + 1 |
| 139 | 139 |
| 140 if '%' in expr: | 140 if '%' in expr: |
| 141 key, t = expr.split('%') | 141 key, t = expr.split('%') |
| 142 parsed.append((self._format, (key, self._load(t)))) | 142 parsed.append((self._format, (key.strip(), |
| 143 self._load(t.strip())))) | |
| 143 elif '|' in expr: | 144 elif '|' in expr: |
| 144 parts = expr.split('|') | 145 parts = expr.split('|') |
| 145 val = parts[0] | 146 val = parts[0].strip() |
| 146 try: | 147 try: |
| 147 filters = [self._filters[f] for f in parts[1:]] | 148 filters = [self._filters[f.strip()] for f in parts[1:]] |
| 148 except KeyError, i: | 149 except KeyError, i: |
| 149 raise SyntaxError(_("unknown filter '%s'") % i[0]) | 150 raise SyntaxError(_("unknown filter '%s'") % i[0]) |
| 150 parsed.append((self._filter, (filters, val))) | 151 parsed.append((self._filter, (filters, val))) |
| 151 else: | 152 else: |
| 152 parsed.append((self._get, expr)) | 153 parsed.append((self._get, expr.strip())) |
| 153 | 154 |
| 154 return parsed | 155 return parsed |
| 155 | 156 |
| 156 def _process(self, parsed, mapping): | 157 def _process(self, parsed, mapping): |
| 157 '''Render a template. Returns a generator.''' | 158 '''Render a template. Returns a generator.''' |