Ticket #11461: template-dont-wrap-exception.diff

django/template/debug.py

@@ -69 +69 @@
     def render_node(self, node, context):
         try:
             result = node.render(context)
-        except TemplateSyntaxError, e:
+        except Exception, e:
             if not hasattr(e, 'source'):
                 e.source = node.source
             raise
-        except Exception, e:
-            from sys import exc_info
-            wrapped = TemplateSyntaxError(u'Caught an exception while rendering: %s' % force_unicode(e, errors='replace'))
-            wrapped.source = node.source
-            wrapped.exc_info = exc_info()
-            raise wrapped
         return result
 
 class DebugVariableNode(VariableNode):

tests/regressiontests/templates/tests.py

@@ -158 +158 @@
 
     def test_url_reverse_no_settings_module(self):
         # Regression test for #9005
-        from django.template import Template, Context, TemplateSyntaxError
+        from django.template import Template, Context
+        from django.core.urlresolvers import NoReverseMatch
 
         old_settings_module = settings.SETTINGS_MODULE
         old_template_debug = settings.TEMPLATE_DEBUG
@@ -170 +171 @@
         c = Context()
         try:
             rendered = t.render(c)
-        except TemplateSyntaxError, e:
+        except NoReverseMatch, e:
             # Assert that we are getting the template syntax error and not the
             # string encoding error.
-            self.assertEquals(e.args[0], "Caught an exception while rendering: Reverse for 'will_not_match' with arguments '()' and keyword arguments '{}' not found.")
+            self.assertEquals(e.args[0], "Reverse for 'will_not_match' with arguments '()' and keyword arguments '{}' not found.")
 
         settings.SETTINGS_MODULE = old_settings_module
         settings.TEMPLATE_DEBUG = old_template_debug