From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 5 Jun 2010 12:37:32 +0000 (+0200)
Subject: Committed fix for raw testcase.
X-Git-Tag: 2.5.1~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac0c0d08e8d9fc20e416e04fac6da8b161da147b;p=jinja2.git

Committed fix for raw testcase.

--HG--
branch : trunk
---

diff --git a/jinja2/lexer.py b/jinja2/lexer.py
index 98d85d9..0d3f696 100644
--- a/jinja2/lexer.py
+++ b/jinja2/lexer.py
@@ -432,9 +432,10 @@ class Lexer(object):
             'root': [
                 # directives
                 (c('(.*?)(?:%s)' % '|'.join(
-                    [r'(?P<raw_begin>(?:\s*%s\-|%s)\s*raw\s*%s)' % (
+                    [r'(?P<raw_begin>(?:\s*%s\-|%s)\s*raw\s*(?:\-%s\s*|%s))' % (
                         e(environment.block_start_string),
                         e(environment.block_start_string),
+                        e(environment.block_end_string),
                         e(environment.block_end_string)
                     )] + [
                         r'(?P<%s_begin>\s*%s\-|%s)' % (n, r, r)