revamped jinja2 import system. the behavior is less confusing now, but it's not backwards compatible. I like it though ;)

--HG--
branch : trunk

1 files changed, 11 insertions, 0 deletions

diff --git a/jinja2/optimizer.py b/jinja2/optimizer.py
index 4d7b9f5..c432b3b 100644
--- a/jinja2/optimizer.py
+++ b/jinja2/optimizer.py
@@ -173,6 +173,17 @@ class Optimizer(NodeTransformer):
             return node
         return result
 
+    def visit_Import(self, node, context):
+        rv = self.generic_visit(node, context)
+        context.undef(node.target)
+        return rv
+
+    def visit_FromImport(self, node, context):
+        rv = self.generic_visit(node, context)
+        for name in node.names:
+            context.undef(name)
+        return rv
+
     def fold(self, node, context):
         """Do constant folding."""
         node = self.generic_visit(node, context)