Commit 95dcf56f authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

[1.0.X] Fixed #9577 --Fixed URL display in the debug template. 

Patch from Thomas Güttler.

Backport of r10534 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6d5f811c

django/views/debug.py

+3 −5
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ class ExceptionReporter: 
            'frames': frames,

            'lastframe': frames[-1],

            'request': self.request,

            'request_protocol': self.request.is_secure() and "https" or "http",

            'settings': get_safe_settings(),

            'sys_executable': sys.executable,

            'sys_version_info': '%d.%d.%d' % sys.version_info[0:3],
@@ -258,7 +257,6 @@ def technical_404_response(request, exception): 
        'urlpatterns': tried,

        'reason': smart_str(exception, errors='replace'),

        'request': request,

        'request_protocol': request.is_secure() and "https" or "http",

        'settings': get_safe_settings(),

    })

    return HttpResponseNotFound(t.render(c), mimetype='text/html')
@@ -397,7 +395,7 @@ TECHNICAL_500_TEMPLATE = """ 
    </tr>

    <tr>

      <th>Request URL:</th>

      <td>{{ request_protocol }}://{{ request.META.HTTP_HOST }}{{ request.path_info|escape }}</td>

      <td>{{ request.build_absolute_uri|escape }}</td>

    </tr>

    <tr>

      <th>Exception Type:</th>
@@ -527,7 +525,7 @@ TECHNICAL_500_TEMPLATE = """ 
Environment:



Request Method: {{ request.META.REQUEST_METHOD }}

Request URL: {{ request_protocol }}://{{ request.META.HTTP_HOST }}{{ request.path_info|escape }}

Request URL: {{ request.build_absolute_uri|escape }}

Django Version: {{ django_version_info }}

Python Version: {{ sys_version_info }}

Installed Applications:
@@ -717,7 +715,7 @@ TECHNICAL_404_TEMPLATE = """ 
      </tr>

      <tr>

        <th>Request URL:</th>

      <td>{{ request_protocol }}://{{ request.META.HTTP_HOST }}{{ request.path_info|escape }}</td>

      <td>{{ request.build_absolute_uri|escape }}</td>

      </tr>

    </table>

  </div>