Permalink
Browse files

Fixed #19280 -- Raised an explicit exception for the old {% url %} sy…

…ntax.
  • Loading branch information...
aaugustin committed Nov 24, 2012
1 parent 690cac3 commit d26691958443a4b968fecba5510c37768153fafa
Showing with 24 additions and 1 deletion.
  1. +4 −0 django/template/defaulttags.py
  2. +10 −0 docs/ref/templates/builtins.txt
  3. +10 −1 tests/regressiontests/templates/tests.py
@@ -398,6 +398,10 @@ def render(self, context):
view_name = self.view_name.resolve(context)
+ if not view_name:
+ raise TemplateSyntaxError("'url' takes requires a non-empty first"

This comment has been minimized.

Show comment Hide comment
@charettes

charettes Nov 24, 2012

Member

Small typo: takes requires.

@charettes

charettes Nov 24, 2012

Member

Small typo: takes requires.

+ " argument. The syntax changed in Django 1.5, see the docs.")
+
# Try to look up the URL twice: once given the view name, and again
# relative to what we guess is the "main" app. If they both fail,
# re-raise the NoReverseMatch unless we're using the
@@ -1035,6 +1035,16 @@ This will follow the normal :ref:`namespaced URL resolution strategy
<topics-http-reversing-url-namespaces>`, including using any hints provided
by the context as to the current application.
+.. warning::
+
+ Don't forget to put quotes around the function path or pattern name!
+
+ .. versionchanged:: 1.5
+ The first paramater used not to be quoted, which was inconsistent with

This comment has been minimized.

Show comment Hide comment
@ramiro

ramiro Nov 24, 2012

Member

s/paramater/parameter/

@ramiro

ramiro Nov 24, 2012

Member

s/paramater/parameter/

+ other template tags. Since Django 1.5, it is evaluated according to
+ the usual rules: it can be a quoted string or a variable that will be
+ looked up in the context.
+
.. templatetag:: verbatim
verbatim
@@ -19,7 +19,8 @@
from urlparse import urljoin
from django import template
-from django.template import base as template_base, RequestContext, Template, Context
+from django.template import (base as template_base, Context, RequestContext,
+ Template, TemplateSyntaxError)
from django.core import urlresolvers
from django.template import loader
from django.template.loaders import app_directories, filesystem, cached
@@ -364,6 +365,14 @@ def test_url_reverse_no_settings_module(self):
with self.assertRaises(urlresolvers.NoReverseMatch):
t.render(c)
+ def test_url_explicit_exception_for_old_syntax(self):
+ # Regression test for #19280
+ t = Template('{% url path.to.view %}') # not quoted = old syntax
+ c = Context()
+ with self.assertRaisesRegexp(TemplateSyntaxError,
+ "The syntax changed in Django 1.5, see the docs."):
+ t.render(c)
+
@override_settings(DEBUG=True, TEMPLATE_DEBUG=True)
def test_no_wrapped_exception(self):
"""

0 comments on commit d266919

Please sign in to comment.