Ticket #15368: 15368_lp_solution.diff

django/template/context.py

@@ -19 +19 @@
         dict_ = dict_ or {}
         self.dicts = [dict_]
 
-    def __copy__(self):
-        duplicate = self._new()
-        duplicate.dicts = [dict_ for dict_ in self.dicts]
+    def copy(self):
+        duplicate = copy(self)
+        duplicate.dicts = self.dicts[:]
         return duplicate
 
     def __repr__(self):
@@ -31 +31 @@
         for d in reversed(self.dicts):
             yield d
 
-    def _new(self):
-        return self.__class__()
-
     def push(self):
         d = {}
         self.dicts.append(d)
@@ -83 +80 @@
         self.render_context = RenderContext()
         super(Context, self).__init__(dict_)
 
-    def __copy__(self):
-        duplicate = super(Context, self).__copy__()
+    def copy(self):
+        duplicate = super(Context, self).copy()
         duplicate.render_context = copy(self.render_context)
         return duplicate
 
-    def _new(self):
-        return self.__class__(autoescape=self.autoescape,
-                              current_app=self.current_app,
-                              use_l10n=self.use_l10n)
-
     def update(self, other_dict):
         "Pushes other_dict to the stack of dictionaries in the Context"
         if not hasattr(other_dict, '__getitem__'):
@@ -168 +160 @@
             processors = tuple(processors)
         for processor in get_standard_processors() + processors:
             self.update(processor(request))
-
-    def _new(self):
-        return self.__class__(request=HttpRequest(),
-                              current_app=self.current_app,
-                              use_l10n=self.use_l10n)

django/test/client.py

@@ -97 +97 @@
     of rendering.
     """
     store.setdefault('templates', []).append(template)
-    store.setdefault('context', ContextList()).append(copy(context))
+    store.setdefault('context', ContextList()).append(context.copy())
 
 def encode_multipart(boundary, data):
     """