Mercurial > genshi > mirror

diff 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
--- a/genshi/template/text.py
+++ b/genshi/template/text.py
@@ -128,7 +128,7 @@
     serializer = 'text'
 
     _DIRECTIVE_RE = r'((?<!\\)%s\s*(\w+)\s*(.*?)\s*%s|(?<!\\)%s.*?%s)'
-    _ESCAPE_RE = r'\\\n|\\(\\)|\\(%s)|\\(%s)'
+    _ESCAPE_RE = r'\\\n|\\\r\n|\\(\\)|\\(%s)|\\(%s)'
 
     def __init__(self, source, filepath=None, filename=None, loader=None,
                  encoding=None, lookup='strict', allow_exec=False,