Revert "Support included blocks override"

This reverts commit 33aee12a29426987805420a410e13e0470a79cbf.

This fixes #243.

diff --git a/jinja2/compiler.py b/jinja2/compiler.py
index d9d7ef97fc841fb3566c409a697288232bd07c02..75a60b8d2d6b326d6248b64a0b74538316d4f82c 100644 (file)
--- a/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@ -949,16 +949,9 @@ class CodeGenerator(NodeVisitor):
             self.indent()
 
         if node.with_context:
-            self.writeline('include_context = template.new_context('
-                           'context.parent, True, locals())')
-            self.writeline('for name, context_blocks in context.'
-                           'blocks.%s():' % dict_item_iter)
-            self.indent()
-            self.writeline('include_context.blocks.setdefault('
-                           'name, [])[0:0] = context_blocks')
-            self.outdent()
             self.writeline('for event in template.root_render_func('
-                           'include_context):')
+                           'template.new_context(context.parent, True, '
+                           'locals())):')
         else:
             self.writeline('for event in template.module._body_stream:')
 

diff --git a/jinja2/testsuite/imports.py b/jinja2/testsuite/imports.py
index c3caeac3ebe1242e0eca46cd6f356d6fd5159fde..3db9008deb444ccd02fdb7aac44f0961c0e14000 100644 (file)
--- a/jinja2/testsuite/imports.py
+++ b/jinja2/testsuite/imports.py
@@ -121,22 +121,6 @@ class IncludesTestCase(JinjaTestCase):
         )))
         assert env.get_template("main").render() == "123"
 
-    def test_included_block_override(self):
-        env = Environment(loader=DictLoader(dict(
-            main="{% extends 'base' %}{% block b %}1337{% endblock %}",
-            base="{% include 'inc' %}",
-            inc="{% block b %}42{% endblock %}"
-        )))
-        assert env.get_template("main").render() == "1337"
-
-    def test_included_block_override_with_super(self):
-        env = Environment(loader=DictLoader(dict(
-            main="{% extends 'base' %}{% block b %}1337|{{ super() }}{% endblock %}",
-            base="{% include 'inc' %}",
-            inc="{% block b %}42{% endblock %}"
-        )))
-        assert env.get_template("main").render() == "1337|42"
-
     def test_unoptimized_scopes(self):
         t = test_env.from_string("""
             {% macro outer(o) %}