Mercurial > genshi > mirror
comparison genshi/template/text.py @ 1030:c5c5cbadde37 stable-0.7.x
Merge r1255 from trunk (fix slash escaping of CRLF newlines).
| author | hodgestar |
|---|---|
| date | Wed, 19 Mar 2014 13:41:53 +0000 |
| parents | 59463031d904 |
| children |
comparison
equal
deleted
inserted
replaced
| 1028:4cbbf894c800 | 1030:c5c5cbadde37 |
|---|---|
| 126 ('choose', ChooseDirective), | 126 ('choose', ChooseDirective), |
| 127 ('with', WithDirective)] | 127 ('with', WithDirective)] |
| 128 serializer = 'text' | 128 serializer = 'text' |
| 129 | 129 |
| 130 _DIRECTIVE_RE = r'((?<!\\)%s\s*(\w+)\s*(.*?)\s*%s|(?<!\\)%s.*?%s)' | 130 _DIRECTIVE_RE = r'((?<!\\)%s\s*(\w+)\s*(.*?)\s*%s|(?<!\\)%s.*?%s)' |
| 131 _ESCAPE_RE = r'\\\n|\\(\\)|\\(%s)|\\(%s)' | 131 _ESCAPE_RE = r'\\\n|\\\r\n|\\(\\)|\\(%s)|\\(%s)' |
| 132 | 132 |
| 133 def __init__(self, source, filepath=None, filename=None, loader=None, | 133 def __init__(self, source, filepath=None, filename=None, loader=None, |
| 134 encoding=None, lookup='strict', allow_exec=False, | 134 encoding=None, lookup='strict', allow_exec=False, |
| 135 delims=('{%', '%}', '{#', '#}')): | 135 delims=('{%', '%}', '{#', '#}')): |
| 136 self.delimiters = delims | 136 self.delimiters = delims |