Mercurial > genshi > mirror
comparison genshi/template/tests/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 | 59a4949b4a39 |
| children |
comparison
equal
deleted
inserted
replaced
| 1028:4cbbf894c800 | 1030:c5c5cbadde37 |
|---|---|
| 169 * 0 | 169 * 0 |
| 170 * 1 | 170 * 1 |
| 171 * 2 | 171 * 2 |
| 172 """, tmpl.generate(items=range(3)).render(encoding=None)) | 172 """, tmpl.generate(items=range(3)).render(encoding=None)) |
| 173 | 173 |
| 174 def test_empty_lines1_with_crlf(self): | |
| 175 tmpl = NewTextTemplate('Your items:\r\n' | |
| 176 '\r\n' | |
| 177 '{% for item in items %}\\\r\n' | |
| 178 ' * ${item}\r\n' | |
| 179 '{% end %}') | |
| 180 | |
| 181 self.assertEqual('Your items:\r\n' | |
| 182 '\r\n' | |
| 183 ' * 0\r\n' | |
| 184 ' * 1\r\n' | |
| 185 ' * 2\r\n', tmpl.generate(items=range(3)).render(encoding=None)) | |
| 186 | |
| 174 def test_empty_lines2(self): | 187 def test_empty_lines2(self): |
| 175 tmpl = NewTextTemplate("""Your items: | 188 tmpl = NewTextTemplate("""Your items: |
| 176 | 189 |
| 177 {% for item in items %}\ | 190 {% for item in items %}\ |
| 178 * ${item} | 191 * ${item} |
| 185 * 1 | 198 * 1 |
| 186 | 199 |
| 187 * 2 | 200 * 2 |
| 188 | 201 |
| 189 """, tmpl.generate(items=range(3)).render(encoding=None)) | 202 """, tmpl.generate(items=range(3)).render(encoding=None)) |
| 203 | |
| 204 def test_empty_lines2_with_crlf(self): | |
| 205 tmpl = NewTextTemplate('Your items:\r\n' | |
| 206 '\r\n' | |
| 207 '{% for item in items %}\\\r\n' | |
| 208 ' * ${item}\r\n' | |
| 209 '\r\n' | |
| 210 '{% end %}') | |
| 211 self.assertEqual('Your items:\r\n' | |
| 212 '\r\n' | |
| 213 ' * 0\r\n' | |
| 214 '\r\n' | |
| 215 ' * 1\r\n' | |
| 216 '\r\n' | |
| 217 ' * 2\r\n' | |
| 218 '\r\n', tmpl.generate(items=range(3)).render(encoding=None)) | |
| 190 | 219 |
| 191 def test_exec_with_trailing_space(self): | 220 def test_exec_with_trailing_space(self): |
| 192 """ | 221 """ |
| 193 Verify that a code block with trailing space does not cause a syntax | 222 Verify that a code block with trailing space does not cause a syntax |
| 194 error (see ticket #127). | 223 error (see ticket #127). |