diff options
| author | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-06-22 16:56:04 +0000 |
|---|---|---|
| committer | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-06-22 16:56:04 +0000 |
| commit | 0cb8e31823b2e9f05c4ae868c19f5f38e78a5f2e (patch) | |
| tree | ac6cc6152cbb5fe1968dc399bc1716f29cd41165 /django/test/utils.py | |
| parent | 829b25833a8e8ee6ce1fecdcd0733ededebe065b (diff) | |
boulder-oracle-sprint: Merged to [5511]archive/attic/boulder-oracle-sprint
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/test/utils.py')
| -rw-r--r-- | django/test/utils.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/django/test/utils.py b/django/test/utils.py index 66fb2e66e2..46de1a896c 100644 --- a/django/test/utils.py +++ b/django/test/utils.py @@ -11,21 +11,12 @@ from django.template import Template TEST_DATABASE_PREFIX = 'test_' def instrumented_test_render(self, context): - """ - An instrumented Template render method, providing a signal that can be - intercepted by the test system Client. + """An instrumented Template render method, providing a signal + that can be intercepted by the test system Client + """ dispatcher.send(signal=signals.template_rendered, sender=self, template=self, context=context) return self.nodelist.render(context) - -def instrumented_test_iter_render(self, context): - """ - An instrumented Template iter_render method, providing a signal that can be - intercepted by the test system Client. - """ - for chunk in self.nodelist.iter_render(context): - yield chunk - dispatcher.send(signal=signals.template_rendered, sender=self, template=self, context=context) class TestSMTPConnection(object): """A substitute SMTP connection for use during test sessions. @@ -53,9 +44,7 @@ def setup_test_environment(): """ Template.original_render = Template.render - Template.original_iter_render = Template.iter_render Template.render = instrumented_test_render - Template.iter_render = instrumented_test_render mail.original_SMTPConnection = mail.SMTPConnection mail.SMTPConnection = TestSMTPConnection @@ -70,8 +59,7 @@ def teardown_test_environment(): """ Template.render = Template.original_render - Template.iter_render = Template.original_iter_render - del Template.original_render, Template.original_iter_render + del Template.original_render mail.SMTPConnection = mail.original_SMTPConnection del mail.original_SMTPConnection |