Ticket #1105: simple_tag_with_context_r1764.diff

django/core/template/__init__.py

@@ -858 +858 @@
-        self.tag(func.__name__, compile_func)
-        return func
-
+    def simple_tag_with_context(self,func):
+        (params, xx, xxx, defaults) = getargspec(func)
+
+        class SimpleWithContextNode(Node):
+            def __init__(self, vars_to_resolve):
+                self.vars_to_resolve = vars_to_resolve
+
+            def render(self, context):
+                resolved_vars = [resolve_variable(var, context) for var in self.vars_to_resolve]
+                rendered = func(context, *resolved_vars)
+                return rendered or ''
+
+        compile_func = curry(generic_tag_compiler, params[1:], defaults, func.__name__, SimpleWithContextNode)
+        compile_func.__doc__ = func.__doc__
+        self.tag(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)