summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--django/template/base.py9
2 files changed, 10 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index d3cb3a62f7..ef1e4ea095 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -520,6 +520,7 @@ answer newbie questions, and generally made Django that much better:
Keith Bussell <kbussell@gmail.com>
Kenneth Love <kennethlove@gmail.com>
Kent Hauser <kent@khauser.net>
+ Keryn Knight <keryn@kerynknight.com>
Kevin Grinberg <kevin@kevingrinberg.com>
Kevin Kubasik <kevin@kubasik.net>
Kevin McConnell <kevin.mcconnell@gmail.com>
diff --git a/django/template/base.py b/django/template/base.py
index ed1bae3022..1446cc865e 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -981,6 +981,15 @@ class TextNode(Node):
def render(self, context):
return self.s
+ def render_annotated(self, context):
+ """
+ Return the given value.
+
+ The default implementation of this method handles exceptions raised
+ during rendering, which is not necessary for text nodes.
+ """
+ return self.s
+
def render_value_in_context(value, context):
"""