summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
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