Ticket #2016: fix2016.patch

django/template/__init__.py

@@ -848 +848 @@
             return ''
         return _render_value_in_context(output, context)
 
-def generic_tag_compiler(params, defaults, name, node_class, parser, token):
-    "Returns a template.Node subclass."
-    bits = token.split_contents()[1:]
+def match_number_of_arguments(bits, params, defaults, name):
     bmax = len(params)
     def_len = defaults and len(defaults) or 0
     bmin = bmax - def_len
@@ -860 +858 @@
         else:
             message = "%s takes between %s and %s arguments" % (name, bmin, bmax)
         raise TemplateSyntaxError(message)
+
+def generic_tag_compiler(params, defaults, name, node_class, parser, token):
+    "Returns a template.Node subclass."
+    bits = token.split_contents()[1:]
+    match_number_of_arguments(bits, params, defaults, name)
     return node_class(bits)
 
 class Library(object):
@@ -931 +934 @@
         self.tag(getattr(func, "_decorated_function", func).__name__, compile_func)
         return func
 
+    def object_tag(self, func):
+        params, xx, xxx, defaults = getargspec(func)
+
+        class ObjectNode(Node):
+            def __init__(self, vars_to_resolve, var_name):
+                self.vars_to_resolve = map(Variable, vars_to_resolve)
+                self.var_name = var_name
+
+            def render(self, context):
+                resolved_vars = [var.resolve(context) for var in self.vars_to_resolve]
+                obj = func(*resolved_vars)
+                context[self.var_name] = obj
+                return ''
+
+        def object_tag_compiler(params, defaults, name, node_class, parser, token):
+            bits = token.split_contents()[1:]
+
+            if len(bits) < 2 or bits[-2] != 'as':
+                raise TemplateSyntaxError("the next to last argument to %s must be 'as'" % name)
+
+            var_name, bits = bits[-1], bits[:-2]
+            match_number_of_arguments(bits, params, defaults, name)
+
+            return node_class(bits, var_name)
+
+        compile_func = curry(object_tag_compiler, params, defaults, getattr(func, "_decorated_function", func).__name__, ObjectNode)
+        compile_func.__doc__ = func.__doc__
+
+        self.tag(getattr(func, "_decorated_function", func).__name__, compile_func)
+
+        return func
+
     def inclusion_tag(self, file_name, context_class=Context, takes_context=False):
         def dec(func):
             params, xx, xxx, defaults = getargspec(func)

docs/howto/custom-template-tags.txt

@@ -858 +858 @@
 The difference here is that ``do_current_time()`` grabs the format string and
 the variable name, passing both to ``CurrentTimeNode3``.
 
+Shortcut for loading objects into template variables
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionadded: 1.2
+
+If you only need to retrieve and store an object in a template variable, it
+might seem cumbersome to write both a renderer and a compilation function
+for such an easy task.
+
+That is why Django provides yet another shortcut -- ``object_tag`` -- which
+makes it easy to write tags that loads objects into template variables.
+
+Its use is very similar to ``simple_tag`` in the way that it takes care of
+all the argument parsing for you, and only requires a single return value --
+the object you'd like to insert into the template variable.
+
+Example::
+
+    def get_latest_polls(max_num):
+        return Poll.objects.order_by('-pub_date')[:max_num]
+
+    register.object_tag(get_latest_polls)
+
+Or if you wish to use the Python 2.4 decorator syntax::
+
+    @register.object_tag
+    def get_latest_polls(max_num):
+        return Poll.objects.order_by('-pub_date')[:max_num]
+
+This tag returns the latest ``Poll``-objects, sorted by descending order, and
+limited by the value of ``max_num``. Its use in a template would look like
+this:
+
+.. code-block:: html+django
+
+    {% get_latest_polls 5 as latest_polls %}
+
+Which would retrieve the 5 latest polls and store them inside a template
+variable named "latest_polls".
+
+Note that the following syntax is *mandatory* for all object_tag's:
+
+.. code-block:: html+django
+
+    {% tag_name [args] as <var_name> %}
+
+Where ``args`` is the arguments for the templatetag ``tag_name``, and
+``var_name`` is the name of the template variable in which the returned object
+should be stored.
+
 Parsing until another block tag
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

new file tests/regressiontests/templates/object_tag.py

@@ +1 @@
+object_tag_tests = """
+>>> t = template.Template('{% load custom %}{% get_meaning_of_life as answer %}{{ answer }}')
+>>> t.render(template.Context())
+u"42"
+>>> t = template.Template('{% load custom %}{% get_mascot_with "awesomeness" "magical powers" as pony %}{{ pony }}')
+>>> t.render(template.Context())
+u"This mascot is filled with awesomeness and magical powers"
+>>> t = template.Template('{% load custom %}{% count "e" word as num %}{{ num }}')
+>>> t.render(template.Context({'word': 'beefcake'}))
+u"3"
+"""

tests/regressiontests/templates/templatetags/custom.py

@@ -9 +9 @@
 
 register.filter(trim)
 
+def get_meaning_of_life():
+    return 42
+register.object_tag(get_meaning_of_life)
+
+def get_mascot_with(power_one, power_two):
+    return 'This mascot is filled with %s and %s' % (power_one, power_two)
+register.object_tag(get_mascot_with)
+
+def count(char, word):
+    return word.count(char)
+register.object_tag(count)

tests/regressiontests/templates/tests.py

@@ -27 +27 @@
 from unicode import unicode_tests
 from nodelist import NodelistTest
 from smartif import *
+from object_tag import object_tag_tests
 
 try:
     from loaders import *
@@ -43 +44 @@
     'filter_parsing': filter_parsing,
     'variable_parsing': variable_parsing,
     'custom_filters': custom_filters,
+    'object_tag': object_tag_tests,
 }
 
 #################################