Ticket #17229: 17229.2.patch

docs/topics/i18n/timezones.txt

@@ -307 +307 @@
         Server time: {{ value }}
     {% endtimezone %}
 
-.. note::
-
-    In the second block, ``None`` resolves to the Python object ``None``
-    because it isn't defined in the template context, not because it's the
-    string ``None``.
-
 .. templatetag:: get_current_timezone
 
 get_current_timezone

docs/releases/1.5.txt

@@ -33 +33 @@
 What's new in Django 1.5
 ========================
 
+Minor features
+~~~~~~~~~~~~~~
+
+Django 1.5 also includes several smaller improvements worth noting:
+
+* The template engine now interprets ``True``, ``False`` and ``None`` as the
+  corresponding Python objects.
+
 Backwards incompatible changes in 1.5
 =====================================
 

docs/ref/templates/api.txt

@@ -111 +111 @@
     >>> t.render(c)
     "My name is Dolores."
 
+Variables and lookups
+~~~~~~~~~~~~~~~~~~~~~
+
 Variable names must consist of any letter (A-Z), any digit (0-9), an underscore
 (but they must not start with an underscore) or a dot.
 
@@ -225 +228 @@
      if your variable is not callable (allowing you to access attributes of
      the callable, for example).
 
-
 .. _invalid-template-variables:
 
 How invalid variables are handled
@@ -263 +265 @@
     in order to debug a specific template problem, then cleared
     once debugging is complete.
 
+Builtin variables
+~~~~~~~~~~~~~~~~~
+
+Every context contains ``True``, ``False`` and ``None``. As you would expect,
+these variables resolve to the corresponding Python objects.
+
+.. versionadded:: 1.5
+    Before Django 1.5, these variables weren't a special case, and they
+    resolved to ``None`` unless you defined them in the context.
+
 Playing with Context objects
 ----------------------------
 

tests/regressiontests/templates/tests.py

@@ -372 +372 @@
         with self.assertRaises(urlresolvers.NoReverseMatch):
             t.render(c)
 
-
-    @override_settings(DEBUG=True, TEMPLATE_DEBUG = True)
+    @override_settings(DEBUG=True, TEMPLATE_DEBUG=True)
     def test_no_wrapped_exception(self):
         """
         The template system doesn't wrap exceptions, but annotates them.
         Refs #16770
-
         """
         c = Context({"coconuts": lambda: 42 / 0})
         t = Template("{{ coconuts }}")
@@ -387 +385 @@
 
         self.assertEqual(cm.exception.django_template_source[1], (0, 14))
 
-
     def test_invalid_block_suggestion(self):
         # See #7876
         from django.template import Template, TemplateSyntaxError
@@ -610 +607 @@
             # Call methods returned from dictionary lookups
             'basic-syntax38': ('{{ var.callable }}', {"var": {"callable": lambda: "foo bar"}}, "foo bar"),
 
+            'builtins01': ('{{ True }}', {}, "True"),
+            'builtins02': ('{{ False }}', {}, "False"),
+            'builtins03': ('{{ None }}', {}, "None"),
+
             # List-index syntax allows a template to access a certain item of a subscriptable object.
             'list-index01': ("{{ var.1 }}", {"var": ["first item", "second item"]}, "second item"),
 

django/template/context.py

@@ -18 +18 @@
         self._reset_dicts(dict_)
 
     def _reset_dicts(self, value=None):
-        self.dicts = [value or {}]
+        builtins = {'True': True, 'False': False, 'None': None}
+        if value:
+            builtins.update(value)
+        self.dicts = [builtins]
 
     def __copy__(self):
         duplicate = copy(super(BaseContext, self))