From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 9 Jan 2017 11:23:32 +0000 (+0100)
Subject: Merge branch '2.9-maintenance'
X-Git-Tag: 2.10~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99498320871a290f5799d4f96a7774fc8a34381e;p=thirdparty%2Fjinja.git

Merge branch '2.9-maintenance'
---

99498320871a290f5799d4f96a7774fc8a34381e
diff --cc jinja2/idtracking.py
index 276e3902,8479b72c..db60c443
--- a/jinja2/idtracking.py
+++ b/jinja2/idtracking.py
@@@ -169,13 -167,7 +169,11 @@@ class RootVisitor(NodeVisitor)
          for child in node.iter_child_nodes(exclude=('call',)):
              self.sym_visitor.visit(child)
  
 +    def visit_OverlayScope(self, node, **kwargs):
 +        for child in node.body:
 +            self.sym_visitor.visit(child)
 +
      def visit_For(self, node, for_branch='body', **kwargs):
-         if node.test is not None:
-             self.sym_visitor.visit(node.test)
          if for_branch == 'body':
              self.sym_visitor.visit(node.target, store_as_param=True)
              branch = node.body