summaryrefslogtreecommitdiff
path: root/django/views/debug.py
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-11-20 05:17:15 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-11-20 05:17:15 +0000
commitb5feff39632e744bd63db7064b0056717a57288e (patch)
treeaac698d7386af278674709c0cca81243fc518e87 /django/views/debug.py
parent09f32294e8a6b9f65bca44c252f78a904e9c3515 (diff)
Fixed #842 -- 500 error view no longer breaks for local variable named 'items'. Thanks, rjwittams
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/views/debug.py')
-rw-r--r--django/views/debug.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/views/debug.py b/django/views/debug.py
index 0ddaa44a7f..4aece9443d 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -25,7 +25,7 @@ def technical_500_response(request, exc_type, exc_value, tb):
'filename' : filename,
'function' : function,
'lineno' : lineno,
- 'vars' : tb.tb_frame.f_locals,
+ 'vars' : tb.tb_frame.f_locals.items(),
'id' : id(tb),
'pre_context' : pre_context,
'context_line' : context_line,
@@ -253,7 +253,7 @@ TECHNICAL_500_TEMPLATE = """
</tr>
</thead>
<tbody>
- {% for var in frame.vars.items|dictsort:"0" %}
+ {% for var in frame.vars|dictsort:"0" %}
<tr>
<td>{{ var.0 }}</td>
<td class="code"><div>{{ var.1|pprint|escape }}</div></td>