Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #18169 -- NoReverseMatch not silenced if from block.super

  • Loading branch information...
commit 369b6fab25b55ceb363ba2a8cb7e0f1a88ef8f8d 1 parent 8490937
@akaariai akaariai authored
View
3  django/core/urlresolvers.py
@@ -75,8 +75,7 @@ class Resolver404(Http404):
pass
class NoReverseMatch(Exception):
- # Don't make this raise an error when used in a template.
- silent_variable_failure = True
+ pass
def get_callable(lookup_view, can_fail=False):
"""
View
6 docs/releases/1.6.txt
@@ -616,6 +616,12 @@ Miscellaneous
stored as ``null``. Previously, storing a ``blank`` value in a field which
did not allow ``null`` would cause a database exception at runtime.
+* If a :class:`~django.core.urlresolvers.NoReverseMatch` exception is risen
+ from a method when rendering a template it is not silenced. For example
+ {{ obj.view_href }} will cause template rendering to fail if view_href()
+ raises NoReverseMatch. There is no change to {% url %} tag, it causes
+ template rendering to fail like always when NoReverseMatch is risen.
+
Features deprecated in 1.6
==========================
View
3  tests/template_tests/templates/included_base.html
@@ -0,0 +1,3 @@
+{% block content %}
+ {% block error_here %}{% endblock %}
+{% endblock %}
View
11 tests/template_tests/templates/included_content.html
@@ -0,0 +1,11 @@
+{% extends "included_base.html" %}
+
+{% block content %}
+ content
+ {{ block.super }}
+{% endblock %}
+
+{% block error_here %}
+ error here
+ {% url "non_existing_url" %}
+{% endblock %}
View
9 tests/template_tests/tests.py
@@ -444,6 +444,15 @@ def test_ifchanged_render_once(self):
output = template.render(Context({}))
self.assertEqual(output, '1st time')
+ def test_super_errors(self):
+ """
+ Test behavior of the raise errors into included blocks.
+ See #18169
+ """
+ t = loader.get_template('included_content.html')
+ with self.assertRaises(urlresolvers.NoReverseMatch):
+ t.render(Context({}))
+
def test_templates(self):
template_tests = self.get_template_tests()
filter_tests = filters.get_filter_tests()
Please sign in to comment.
Something went wrong with that request. Please try again.