summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-12-09 16:17:56 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-12-09 16:17:56 +0100
commit49519328b4988bf89c11d50191cdee8e9bec3aaa (patch)
tree587837892bf3cd153904961748fbac4838c16f58 /django
parent8248d1402982041490b5d6bb45514ffdba0e18d3 (diff)
Fixed #19392 -- Improved error for old-style url tags with dashes.
Thanks dloewenherz for the report.
Diffstat (limited to 'django')
-rw-r--r--django/template/defaulttags.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 45f4c1dbb1..aca2f41f2d 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -1262,7 +1262,12 @@ def url(parser, token):
if len(bits) < 2:
raise TemplateSyntaxError("'%s' takes at least one argument"
" (path to a view)" % bits[0])
- viewname = parser.compile_filter(bits[1])
+ try:
+ viewname = parser.compile_filter(bits[1])
+ except TemplateSyntaxError as exc:
+ exc.args = (exc.args[0] + ". "
+ "The syntax of 'url' changed in Django 1.5, see the docs."),
+ raise
args = []
kwargs = {}
asvar = None