diff options
author | Marcel Hellkamp <marc@gsites.de> | 2012-02-11 19:42:43 +0100 |
---|---|---|
committer | Marcel Hellkamp <marc@gsites.de> | 2012-02-11 19:43:51 +0100 |
commit | a7245cab8d39af3bd54a3428bc06bc7b5f0c5898 (patch) | |
tree | 10adff6d213ea75961237cfd260adc8e67306695 | |
parent | 41a9d6b3c16032758d983f54795877c5bda22869 (diff) | |
download | bottle-a7245cab8d39af3bd54a3428bc06bc7b5f0c5898.tar.gz |
fix: Subtile bug in stpl parser. '.%' was recognized as code line.
-rwxr-xr-x | bottle.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2694,11 +2694,12 @@ class SimpleTemplate(BaseTemplate): lineno += 1 line = line if isinstance(line, unicode)\ else unicode(line, encoding=self.encoding) + sline = line.lstrip() if lineno <= 2: m = re.search(r"%.*coding[:=]\s*([-\w\.]+)", line) if m: self.encoding = m.group(1) if m: line = line.replace('coding','coding (removed)') - if line.strip()[:2].count('%') == 1: + if sline and sline[0] == '%' and sline[:2] != '%%': line = line.split('%',1)[1].lstrip() # Full line following the % cline = self.split_comment(line).strip() cmd = re.split(r'[^a-zA-Z0-9_]', cline)[0] |