From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 4 May 2008 20:43:19 +0000 (+0200)
Subject: fixed a bug with filtered loops
X-Git-Tag: 2.0rc1~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0725640ebee04fdd7061aad54f73613500714ee;p=thirdparty%2Fjinja.git

fixed a bug with filtered loops

--HG--
branch : trunk
---

diff --git a/docs/_templates/genindex.html b/docs/_templates/genindex.html
index 9c09d0f5..e31a578d 100644
--- a/docs/_templates/genindex.html
+++ b/docs/_templates/genindex.html
@@ -12,7 +12,7 @@
   {% for key, entries in genindexentries %}
     <h2 id="{{ key }}">{{ key }}</h2>
     <table class="indextable"><tr>
-    {%- for column in entries|slice(2) %}{% if column %}
+    {%- for column in entries|slice(2) if column %}
       <td><dl>
       {%- for entryname, (links, subitems) in column %}
         <dt>{% if links %}<a href="{{ links[0] }}">{{ entryname|e }}</a>
@@ -29,7 +29,7 @@
         {%- endif -%}
       {%- endfor %}
       </dl></td>
-    {%- endif %}{% endfor %}
+    {%- endfor %}
     </tr></table>
   {% endfor %}
 
diff --git a/jinja2/parser.py b/jinja2/parser.py
index 05d2e329..5298061e 100644
--- a/jinja2/parser.py
+++ b/jinja2/parser.py
@@ -109,7 +109,7 @@ class Parser(object):
         self.stream.expect('name:in')
         iter = self.parse_tuple(no_condexpr=True)
         test = None
-        if self.stream.current.type is 'name:if':
+        if self.stream.current.test('name:if'):
             self.stream.next()
             test = self.parse_expression()
         body = self.parse_statements(('name:endfor', 'name:else'))