Ticket #10043: widthratio-variable.diff

template/defaulttags.py

@@ -8 +8 @@
 except NameError:
     from django.utils.itercompat import reversed     # Python 2.3 fallback
 
-from django.template import Node, NodeList, Template, Context, Variable
+from django.template import Node, NodeList, Template, Context, Variable, FilterExpression
 from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END
 from django.template import get_library, Library, InvalidTemplateLibrary
 from django.conf import settings
@@ -396 +396 @@
         try:
             value = self.val_expr.resolve(context)
             maxvalue = self.max_expr.resolve(context)
+            if isinstance(self.max_width, FilterExpression):
+                self.max_width = self.max_width.resolve(context)
+            self.max_width = int(self.max_width)
         except VariableDoesNotExist:
             return ''
+        except ValueError:
+            raise TemplateSyntaxError("widthratio final argument must be an integer")
         try:
             value = float(value)
             maxvalue = float(maxvalue)
@@ -1103 +1108 @@
     if len(bits) != 4:
         raise TemplateSyntaxError("widthratio takes three arguments")
     tag, this_value_expr, max_value_expr, max_width = bits
-    try:
-        max_width = int(max_width)
-    except ValueError:
-        raise TemplateSyntaxError("widthratio final argument must be an integer")
+    
     return WidthRatioNode(parser.compile_filter(this_value_expr),
-                          parser.compile_filter(max_value_expr), max_width)
+                          parser.compile_filter(max_value_expr),
+                          parser.compile_filter(max_width))
 widthratio = register.tag(widthratio)
 
 #@register.tag