Author: kmtracey
Date: 2010-03-05 12:58:47 -0600 (Fri, 05 Mar 2010)
New Revision: 12680
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/views/debug.py
django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
django/branches/releases/1.1.X/tests/regressiontests/views/views.py
Log:
[1.1.X] Fixed #12083: Ensured generating debug 404 page won't raise a key
error. Thanks pigletto.
r12679 from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12448,12457,12461-12464,12467,12473,12475,12490,12492,12497-12498,12502,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12581,12584,12616,12621-12622,12631,12648,12650,12652,12659,12661,12676
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12448,12457,12461-12464,12467,12473,12475,12490,12492,12497-12498,12502,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12581,12584,12616,12621-12622,12631,12648,12650,12652,12659,12661,12676,12679
Modified: django/branches/releases/1.1.X/django/views/debug.py
===================================================================
--- django/branches/releases/1.1.X/django/views/debug.py 2010-03-05
18:53:07 UTC (rev 12679)
+++ django/branches/releases/1.1.X/django/views/debug.py 2010-03-05
18:58:47 UTC (rev 12680)
@@ -245,7 +245,7 @@
"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:
Modified:
django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
2010-03-05 18:53:07 UTC (rev 12679)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/tests/debug.py
2010-03-05 18:58:47 UTC (rev 12680)
@@ -19,3 +19,7 @@
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)
Modified: django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
2010-03-05 18:53:07 UTC (rev 12679)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/urls.py
2010-03-05 18:58:47 UTC (rev 12680)
@@ -95,7 +95,8 @@
# a view that raises an exception for the debug view
urlpatterns += patterns('',
- (r'^raises/$', views.raises)
+ (r'^raises/$', views.raises),
+ (r'^raises404/$', views.raises404),
)
# rediriects, both temporary and permanent, with non-ASCII targets
Modified: django/branches/releases/1.1.X/tests/regressiontests/views/views.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/views/views.py
2010-03-05 18:53:07 UTC (rev 12679)
+++ django/branches/releases/1.1.X/tests/regressiontests/views/views.py
2010-03-05 18:58:47 UTC (rev 12680)
@@ -4,6 +4,7 @@
from django import forms
from django.views.debug import technical_500_response
from django.views.generic.create_update import create_object
+from django.core.urlresolvers import get_resolver
from models import Article
@@ -12,7 +13,6 @@
"""Dummy index page"""
return HttpResponse('<html><body>Dummy page</body></html>')
-
def custom_create(request):
"""
Calls create_object generic view with a custom form class.
@@ -37,6 +37,10 @@
except Exception:
return technical_500_response(request, *sys.exc_info())
+def raises404(request):
+ resolver = get_resolver(None)
+ resolver.resolve('')
+
def redirect(request):
"""
Forces an HTTP redirect.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
