Ticket #12083: patch_12083.diff

django/views/debug.py

@@ -245 +245 @@
     "Create a technical 404 error response. The exception should be the Http404."
     try:
         tried = exception.args[0]['tried']
-    except (IndexError, TypeError):
+    except (IndexError, TypeError, KeyError):
         tried = []
     else:
         if not tried:

tests/regressiontests/views/tests/debug.py

@@ -19 +19 @@
         response = self.client.post('/views/raises/', data)
         self.failUnless('file_data.txt' in response.content)
         self.failIf('haha' in response.content)
+
+    def test_404(self):
+        response = self.client.get('/views/raises404/')
+        self.assertEquals(response.status_code, 404)
+ No newline at end of file

tests/regressiontests/views/views.py

@@ -2 +2 @@
 
 from django.http import HttpResponse, HttpResponseRedirect
 from django import forms
-from django.views.debug import technical_500_response
+from django.views.debug import technical_500_response, technical_404_response
 from django.views.generic.create_update import create_object
+from django.core.urlresolvers import get_resolver
 
 from models import Article
 
@@ -37 +38 @@
     except Exception:
         return technical_500_response(request, *sys.exc_info())
 
+def raises404(request):
+    resolver = get_resolver(None)
+    try:
+        resolver.resolve('')
+    except Exception, e:
+        return technical_404_response(request, e)
+        
 def redirect(request):
     """
     Forces an HTTP redirect.

tests/regressiontests/views/urls.py

@@ -95 +95 @@
 
 # a view that raises an exception for the debug view
 urlpatterns += patterns('',
-    (r'^raises/$', views.raises)
+    (r'^raises/$', views.raises),
+    (r'^raises404/$', views.raises404)
 )