Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fix broken tests due to changes in r15591 by updating the tes…

…t store_rendered_templates signal handler.

Backport of r15600 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 39b8a1f7ed49de3a1a32bd842de6e2b92a4bb8b6 1 parent 3db9383
Chris Beaven SmileyChris authored
Showing with 31 additions and 2 deletions.
  1. +25 −0 django/template/context.py
  2. +6 −2 django/test/client.py
25 django/template/context.py
View
@@ -1,5 +1,7 @@
+from copy import copy
from django.core.exceptions import ImproperlyConfigured
from django.utils.importlib import import_module
+from django.http import HttpRequest
# Cache of actual callables.
_standard_context_processors = None
@@ -17,6 +19,11 @@ def __init__(self, dict_=None):
dict_ = dict_ or {}
self.dicts = [dict_]
+ def __copy__(self):
+ duplicate = self._new()
+ duplicate.dicts = [dict_ for dict_ in self.dicts]
+ return duplicate
+
def __repr__(self):
return repr(self.dicts)
@@ -24,6 +31,9 @@ def __iter__(self):
for d in reversed(self.dicts):
yield d
+ def _new(self):
+ return self.__class__()
+
def push(self):
d = {}
self.dicts.append(d)
@@ -72,6 +82,16 @@ def __init__(self, dict_=None, autoescape=True, current_app=None):
self.render_context = RenderContext()
super(Context, self).__init__(dict_)
+ 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):
"Like dict.update(). Pushes an entire dictionary's keys and values onto the context."
if not hasattr(other_dict, '__getitem__'):
@@ -147,3 +167,8 @@ def __init__(self, request, dict=None, processors=None, current_app=None):
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)
8 django/test/client.py
View
@@ -4,6 +4,7 @@
import os
import re
import mimetypes
+from copy import copy
try:
from cStringIO import StringIO
except ImportError:
@@ -92,9 +93,12 @@ def __call__(self, environ):
def store_rendered_templates(store, signal, sender, template, context, **kwargs):
"""
Stores templates and contexts that are rendered.
+
+ The context is copied so that it is an accurate representation at the time
+ of rendering.
"""
- store.setdefault('template', []).append(template)
- store.setdefault('context', ContextList()).append(context)
+ store.setdefault('templates', []).append(template)
+ store.setdefault('context', ContextList()).append(copy(context))
def encode_multipart(boundary, data):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.