Ticket #12594: 12594.patch

django/core/handlers/base.py

@@ -174 +174 @@
             request_repr = "Request repr() unavailable"
         message = "%s\n\n%s" % (self._get_traceback(exc_info), request_repr)
         mail_admins(subject, message, fail_silently=True)
+        # If Http500 handler is not installed, re-raise last exception
+        if resolver.urlconf_module is None:
+            raise exc_info[1], None, exc_info[2]
         # Return an HttpResponse that displays a friendly error message.
         callback, param_dict = resolver.resolve500()
         return callback(request, **param_dict)

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -17 +17 @@
 import unittest
 
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404
 from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
 from django.shortcuts import redirect
@@ -303 +304 @@
         handler = (empty_view, {})
         self.assertEqual(self.callable_resolver.resolve404(), handler)
         self.assertEqual(self.callable_resolver.resolve500(), handler)
+
+
+class NoRootUrlConfTests(TestCase):
+    """Tests for handler404 and handler500 if urlconf is None"""
+    urls = None
+    
+    def test_no_handler_exception(self):
+        self.assertRaises(ImproperlyConfigured, self.client.get, '/test_client_regress/no_template_view/')
+
+class ResolverIsNoneResolutionTests(TestCase):
+    """Tests that handler404 and handler500 are properly raised if urlconf is None"""
+
+    urls = None
+
+    def setUp(self):
+        from django.core.urlresolvers import RegexURLResolver
+        urlconf = 'regressiontests.urlpatterns_reverse.urls_error_handlers'
+        self.normal_resolver = RegexURLResolver(r'^$', urlconf)
+        self.empty_resolver = RegexURLResolver(r'^$', None)
+
+    def test_handler_exceptions(self):
+        from views import empty_view
+        handler = (empty_view, {})
+
+        self.assertTrue(self.normal_resolver.urlconf_module is not None)
+        self.assertTrue(self.empty_resolver.urlconf_module is None)
+
+        self.assertEqual(self.normal_resolver.resolve404(), handler)
+        self.assertEqual(self.normal_resolver.resolve500(), handler)
+
+        #raises "AttributeError: 'NoneType' object has no attribute 'handler404'"
+        self.assertRaises(AttributeError, self.empty_resolver.resolve404)
+        #raises "AttributeError: 'NoneType' object has no attribute 'handler500'"
+        self.assertRaises(AttributeError, self.empty_resolver.resolve500)