added missing lineno, filename forward in jinja parser

--HG--
branch : trunk

diff --git a/jinja/filters.py b/jinja/filters.py
index f9199a6bc0f6fd66cba13be2914a72c42c6d8ea8..675f3109a9099c3e5e056af452fc6aafaf86f482 100644 (file)
--- a/jinja/filters.py
+++ b/jinja/filters.py
@@ -18,7 +18,7 @@ from jinja.datastructure import TemplateData
 from jinja.exceptions import FilterArgumentError, SecurityException
 
 
-_striptags_re = re.compile(r'(<!--.*?-->|<[^>]+>)')
+_striptags_re = re.compile(r'(<!--.*?-->|<[^>]*>)')
 
 
 def stringfilter(f):

diff --git a/jinja/parser.py b/jinja/parser.py
index c31c11b643d20caa72fd0f75f6323619fec5a600..dd7aa8263e2748b7865ce62459e4b49ba5f78201 100644 (file)
--- a/jinja/parser.py
+++ b/jinja/parser.py
@@ -510,7 +510,6 @@ class Parser(object):
                 op = self.stream.current.type
                 self.stream.next()
                 ops.append([op, self.parse_add_expression()])
-                lineno = self.stream.lineno
             elif self.stream.current.type == 'not' and \
                  self.stream.look().type == 'in':
                 self.stream.skip(2)
@@ -519,7 +518,7 @@ class Parser(object):
                 break
         if not ops:
             return expr
-        return nodes.CompareExpression(expr, ops)
+        return nodes.CompareExpression(expr, ops, lineno, self.filename)
 
     def parse_add_expression(self):
         """