Commit b5feff39 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

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
parent 09f32294

django/views/debug.py

+2 −2
Original line number Diff line number Diff line
@@ -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>