summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2010-03-05 18:58:47 +0000
committerKaren Tracey <kmtracey@gmail.com>2010-03-05 18:58:47 +0000
commitb5a2f64cbba38cb0ff814118b0abbee05253db58 (patch)
tree9719e9d3380bf38053c3fbb5d11e02bc5d837661 /django
parent1fedc0b9ebf8694036581cc4a75601c89a50c727 (diff)
[1.1.X] Fixed #12083: Ensured generating debug 404 page won't raise a key error. Thanks pigletto.
r12679 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/views/debug.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/views/debug.py b/django/views/debug.py
index 6da89ffcf5..a84e02207d 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -245,7 +245,7 @@ def technical_404_response(request, exception):
"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: