Ticket #1199: ticket-1199.patch

django/template/__init__.py

@@ -438 +438 @@
  (?:%(filter_sep)s
      (?P<filter_name>\w+)
          (?:%(arg_sep)s
+           (?P<args>
              (?:
-              %(i18n_open)s"(?P<i18n_arg>%(str)s)"%(i18n_close)s|
-              "(?P<constant_arg>%(str)s)"|
-              (?P<var_arg>[%(var_chars)s]+)
+              %(i18n_open)s"%(str)s"%(i18n_close)s|
+              "%(str)s"|
+              [%(var_chars)s]+
              )
+             (?:
+              ,%(i18n_open)s"%(str)s"%(i18n_close)s|
+              ,"%(str)s"|
+              ,[%(var_chars)s]+
+             )*
+           )
          )?
  )""" % {
     'str': r"""[^"\\]*(?:\\.[^"\\]*)*""",
@@ -456 +463 @@
 filter_raw_string = filter_raw_string.replace("\n", "").replace(" ", "")
 filter_re = re.compile(filter_raw_string, re.UNICODE)
 
+arg_raw_string = r"""
+%(i18n_open)s"(?P<i18n_arg>%(str)s)"%(i18n_close)s|
+"(?P<constant_arg>%(str)s)"|
+(?P<var_arg>[%(var_chars)s]+)""" % {
+    'str': r"""[^"\\]*(?:\\.[^"\\]*)*""",
+    'var_chars': "\w\." ,
+    'i18n_open' : re.escape("_("),
+    'i18n_close' : re.escape(")"),
+  }
+
+arg_raw_string = arg_raw_string.replace("\n", "").replace(" ", "")
+arg_re = re.compile(arg_raw_string, re.UNICODE)
+
 class FilterExpression(object):
     """
     Parses a variable token and its optional filters (all as a single string),
@@ -497 +517 @@
             else:
                 filter_name = match.group("filter_name")
                 args = []
-                constant_arg, i18n_arg, var_arg = match.group("constant_arg", "i18n_arg", "var_arg")
-                if i18n_arg:
-                    args.append((False, _(i18n_arg.replace(r'\"', '"'))))
-                elif constant_arg is not None:
-                    args.append((False, constant_arg.replace(r'\"', '"')))
-                elif var_arg:
-                    args.append((True, Variable(var_arg)))
+                arg_group = match.group("args")
+                if arg_group:
+                    for arg_match in arg_re.finditer(arg_group):
+                        constant_arg, i18n_arg, var_arg = arg_match.group("constant_arg", "i18n_arg", "var_arg")
+                        if i18n_arg:
+                            args.append((False, _(i18n_arg.replace(r'\"', '"'))))
+                        elif constant_arg is not None:
+                            args.append((False, constant_arg.replace(r'\"', '"')))
+                        elif var_arg:
+                            args.append((True, Variable(var_arg)))
                 filter_func = parser.find_filter(filter_name)
                 self.args_check(filter_name,filter_func, args)
                 filters.append( (filter_func,args))

tests/regressiontests/templates/tests.py

@@ -45 +45 @@
 
 register.tag("echo", do_echo)
 
+def multi_args(inp, arg1, const1, const2, i18n): 
+    return u"%s %s %s %s %s" % (inp, arg1, const1, const2, i18n)
+
+register.filter("multi_args", multi_args)
+
 template.libraries['django.templatetags.testtags'] = register
 
 #####################################
@@ -359 +364 @@
 
             # Numbers as filter arguments should work
             'filter-syntax19': ('{{ var|truncatewords:1 }}', {"var": "hello world"}, "hello ..."),
+            
+            # Filters can accept multiple arguments 
+            'filter-syntax20': ('{% load testtags %}{{ var1|multi_args:var2,",",12,_("bar")}}', {'var1': 99, 'var2': 'foo'}, "99 foo , 12 bar"),
 
             ### COMMENT SYNTAX ########################################################
             'comment-syntax01': ("{# this is hidden #}hello", {}, "hello"),