Commit 37c54c27 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[1.5.x] Change exception type to reduce confusion. 

TemplateSyntaxError is expected at compile time, not at run time.

Refs #19280.

Backport of 76448000.
parent 72231610

django/template/defaulttags.py

+2 −2
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ class URLNode(Node): 
        view_name = self.view_name.resolve(context)



        if not view_name:

            raise TemplateSyntaxError("'url' takes requires a non-empty first"

                " argument. The syntax changed in Django 1.5, see the docs.")

            raise NoReverseMatch("'url' requires a non-empty first 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,

tests/regressiontests/templates/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ except ImportError: # Python 2 


from django import template

from django.template import (base as template_base, Context, RequestContext,

    Template, TemplateSyntaxError)

    Template)

from django.core import urlresolvers

from django.template import loader

from django.template.loaders import app_directories, filesystem, cached
@@ -369,7 +369,7 @@ class Templates(TestCase): 
        # Regression test for #19280

        t = Template('{% url path.to.view %}')      # not quoted = old syntax

        c = Context()

        with self.assertRaisesRegexp(TemplateSyntaxError,

        with self.assertRaisesRegexp(urlresolvers.NoReverseMatch,

                "The syntax changed in Django 1.5, see the docs."):

            t.render(c)