Ticket #6346: url_patch.2.diff

django/template/defaulttags.py

@@ -356 +356 @@
 
     def render(self, context):
         from django.core.urlresolvers import reverse, NoReverseMatch
-        args = [arg.resolve(context) for arg in self.args]
-        kwargs = dict([(smart_str(k,'ascii'), v.resolve(context))
-                       for k, v in self.kwargs.items()])
+        args = []
+        for arg in self.args:
+            if arg[0] in ["'", '"'] and arg[0] == arg[-1]:
+                arg = arg[1:-1]
+            else:
+                try:
+                    arg = Variable(arg).resolve(context)
+                except VariableDoesNotExist:
+                    pass
+            args.append(arg)
+        kwargs = {}
+        for k, v in self.kwargs.items():
+            if v[0] in ["'", '"'] and v[0] == v[-1]:
+                v = v[1:-1]
+            else:
+                try:
+                    v = Variable(v).resolve(context)
+                except VariableDoesNotExist:
+                    pass
+            kwargs[smart_str(k,'ascii')] = v
         try:
             return reverse(self.view_name, args=args, kwargs=kwargs)
         except NoReverseMatch:
@@ -367 +384 @@
                 return reverse(project_name + '.' + self.view_name,
                                args=args, kwargs=kwargs)
             except NoReverseMatch:
-                return ''
+                if settings.TEMPLATE_DEBUG:
+                    raise
+                else:
+                    return ''
 
 class WidthRatioNode(Node):
     def __init__(self, val_expr, max_expr, max_width):
@@ -1047 +1067 @@
             if '=' in arg:
                 k, v = arg.split('=', 1)
                 k = k.strip()
-                kwargs[k] = parser.compile_filter(v)
+                kwargs[k] = v
             else:
-                args.append(parser.compile_filter(arg))
+                args.append(arg)
     return URLNode(bits[1], args, kwargs)
 url = register.tag(url)