mirror of https://github.com/django/django.git
[1.5.x] Change exception type to reduce confusion.
TemplateSyntaxError is expected at compile time, not at run time.
Refs #19280.
Backport of 7644800
.
This commit is contained in:
parent
72231610b3
commit
37c54c27bd
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue