Ticket #15721: 15721.2.diff

django/template/context.py

@@ -14 +14 @@
     "pop() has been called more times than push()"
     pass
 
-class EmptyClass(object):
-    # No-op class which takes no args to its __init__ method, to help implement
-    # __copy__
-    pass
-
 class BaseContext(object):
     def __init__(self, dict_=None):
-        dict_ = dict_ or {}
-        self.dicts = [dict_]
+        self._reset_dicts(dict_)
+
+    def _reset_dicts(self, value=None):
+        self.dicts = [value or {}]
 
     def __copy__(self):
-        duplicate = EmptyClass()
-        duplicate.__class__ = self.__class__
-        duplicate.__dict__ = self.__dict__.copy()
-        duplicate.dicts = duplicate.dicts[:]
+        duplicate = copy(super(BaseContext, self))
+        duplicate.dicts = self.dicts[:]
         return duplicate
 
     def __repr__(self):
@@ -78 +73 @@
                 return d[key]
         return otherwise
 
+    def new(self, values=None):
+        """
+        Returns a new context with the same properties, but with only the
+        values given in 'values' stored.
+        """
+        new_context = copy(self)
+        new_context._reset_dicts(values)
+        return new_context
+
 class Context(BaseContext):
     "A stack container for variable context"
     def __init__(self, dict_=None, autoescape=True, current_app=None, use_l10n=None):
@@ -88 +92 @@
         super(Context, self).__init__(dict_)
 
     def __copy__(self):
-        duplicate = super(Context, self).__copy__()
+        duplicate = copy(super(Context, self))
         duplicate.render_context = copy(self.render_context)
         return duplicate
 
@@ -99 +103 @@
         self.dicts.append(other_dict)
         return other_dict
 
-    def new(self, values=None):
-        """
-        Returns a new Context with the same 'autoescape' value etc, but with
-        only the values given in 'values' stored.
-        """
-        return self.__class__(dict_=values, autoescape=self.autoescape,
-                              current_app=self.current_app, use_l10n=self.use_l10n)
-
 class RenderContext(BaseContext):
     """
     A stack container for storing Template state.

tests/regressiontests/templates/tests.py

@@ -1640 +1640 @@
         settings.INSTALLED_APPS = ('tagsegg',)
         t = template.Template(ttext)
 
+class RequestContextTests(BaseTemplateResponseTest):
+
+    def test_include_only(self):
+        # Regression test for #15721
+        templates = {
+            'child': Template('{{ var|default:"none" }}'),
+        }
+
+        # Register a custom template loader.
+        def test_template_loader(template_name, template_dirs=None):
+            "A custom template loader that loads the unit-test templates."
+            try:
+                return (templates[template_name] , "test:%s" % template_name)
+            except KeyError:
+                raise template.TemplateDoesNotExist(template_name)
+
+        old_template_loaders = loader.template_source_loaders
+        loader.template_source_loaders = [test_template_loader]
+        try:
+            ctx = RequestContext(self.factory.get('/'), {'var': 'parent'})
+            self.assertEqual(
+                template.Template('{% include "child" %}').render(ctx),
+                'parent'
+            )
+            self.assertEqual(
+                template.Template('{% include "child" only %}').render(ctx),
+                'none'
+            )
+        finally:
+            loader.template_source_loaders = old_template_loaders
+
 if __name__ == "__main__":
     unittest.main()