Ticket #4540: django-4540.diff

django/template/__init__.py

@@ -122 +122 @@
 class TemplateEncodingError(Exception):
     pass
 
+class TemplateContextError(Exception):
+    pass
+
 class VariableDoesNotExist(Exception):
 
     def __init__(self, msg, params=()):
@@ -173 +176 @@
 
     def render(self, context):
         "Display stage -- can be called many times"
+        if (context == None or not isinstance(context,Context)):
+            raise TemplateContextError
         return self.nodelist.render(context)
 
 def compile_string(template_string, origin):

django/test/utils.py

@@ -5 +5 @@
 from django.core.management import call_command
 from django.dispatch import dispatcher
 from django.test import signals
-from django.template import Template
+from django.template import Template, Context, TemplateContextError
 from django.utils.translation import deactivate
 
 # The prefix to put on the default database name when creating
@@ -18 +18 @@
     that can be intercepted by the test system Client
     """
     dispatcher.send(signal=signals.template_rendered, sender=self, template=self, context=context)
+    if (context == None or not isinstance(context,Context)):
+        raise TemplateContextError
     return self.nodelist.render(context)
 
 class TestSMTPConnection(object):

tests/regressiontests/templates/tests.py

@@ -81 +81 @@
         return u'ŠĐĆŽćžšđ'.encode('utf-8')
 
 class Templates(unittest.TestCase):
+    def test_context_type(self):
+        t = template.Template("{% for val in values %}{{ val }}{% endfor %}")
+        h = {"values": [1, 2, 3], "a":1}
+        c = template.Context(h)
+        # Test1
+        t.original_render(c)
+        t.render(c)
+        # Test2
+        self.assertRaises(template.TemplateContextError, t.original_render, h)
+        self.assertRaises(template.TemplateContextError, t.render, h)
+        # Test4
+        t = template.Template("{{ val }}")
+        self.assertRaises(template.TemplateContextError, t.original_render, None)
+        self.assertRaises(template.TemplateContextError, t.render, None)
+        
     def test_loaders_security(self):
         def test_template_sources(path, template_dirs, expected_sources):
             # Fix expected sources so they are normcased and abspathed