fixed a bug with filtered loops

--HG--
branch : trunk

diff --git a/docs/_templates/genindex.html b/docs/_templates/genindex.html
index 9c09d0f5b5e8d94db8e9f41ab82781188e49bd52..e31a578d906aabb967c904a73c8b9a361ce7b234 100644 (file)
--- 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 05d2e3293d31d4d6bb73bb1c8027d40c7c7a62a0..5298061ef57a7c4dd6d30e7a54832fc58e0f7a68 100644 (file)
--- 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'))