# HG changeset patch
# User hodgestar
# Date 1395236513 0
# Node ID c5c5cbadde37df1ee6f1a0dbc9107ac45f3e54df
# Parent  4cbbf894c800880f508671ad0d7cf68b3131a073
Merge r1255 from trunk (fix slash escaping of CRLF newlines).

diff --git a/genshi/template/tests/text.py b/genshi/template/tests/text.py
--- a/genshi/template/tests/text.py
+++ b/genshi/template/tests/text.py
@@ -171,6 +171,19 @@
   * 2
 """, tmpl.generate(items=range(3)).render(encoding=None))
 
+    def test_empty_lines1_with_crlf(self):
+        tmpl = NewTextTemplate('Your items:\r\n'
+'\r\n'
+'{% for item in items %}\\\r\n'
+'  * ${item}\r\n'
+'{% end %}')
+
+        self.assertEqual('Your items:\r\n'
+'\r\n'
+'  * 0\r\n'
+'  * 1\r\n'
+'  * 2\r\n', tmpl.generate(items=range(3)).render(encoding=None))
+
     def test_empty_lines2(self):
         tmpl = NewTextTemplate("""Your items:
 
@@ -188,6 +201,22 @@
 
 """, tmpl.generate(items=range(3)).render(encoding=None))
 
+    def test_empty_lines2_with_crlf(self):
+        tmpl = NewTextTemplate('Your items:\r\n'
+'\r\n'
+'{% for item in items %}\\\r\n'
+'  * ${item}\r\n'
+'\r\n'
+'{% end %}')
+        self.assertEqual('Your items:\r\n'
+'\r\n'
+'  * 0\r\n'
+'\r\n'
+'  * 1\r\n'
+'\r\n'
+'  * 2\r\n'
+'\r\n', tmpl.generate(items=range(3)).render(encoding=None))
+
     def test_exec_with_trailing_space(self):
         """
         Verify that a code block with trailing space does not cause a syntax
diff --git a/genshi/template/text.py b/genshi/template/text.py
--- 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,