commit 8a672512e7275985b8bc4be24b470c99a1be79ec
author Armin Ronacher <armin.ronacher@active-4.com> Mon Apr 05 18:43:07 2010 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> Mon Apr 05 18:43:07 2010 +0200
tree 86350d2478ff24596b0dfec99b1be63659b58bbf
parent 752ba7f0d9831fb79cde22c1ceb678f79b16adce

Fixed a scoping bug that caused the immutable scoping rule to be ignored
in a few edge cases.  This clauses #376.

--HG--
branch : trunk

jinja2/compiler.py

diff --git a/jinja2/compiler.py b/jinja2/compiler.py
index 117bd8c..0d608a3 100644
--- a/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@ -293,8 +293,7 @@
         self.visit(node.test)
         real_identifiers = self.identifiers
 
-        old_names = real_identifiers.declared | \
-                    real_identifiers.declared_locally | \
+        old_names = real_identifiers.declared_locally | \
                     real_identifiers.declared_parameter
 
         def inner_visit(nodes):
@@ -315,7 +314,8 @@
 
         # the differences between the two branches are also pulled as
         # undeclared variables
-        real_identifiers.undeclared.update(body.symmetric_difference(else_))
+        real_identifiers.undeclared.update(body.symmetric_difference(else_) -
+                                           real_identifiers.declared)
 
         # remember those that are declared.
         real_identifiers.declared_locally.update(body | else_)