From dd49269c7db008b2567f50cb03c4d3d9b321daa1 Mon Sep 17 00:00:00 2001 From: Arthur Koziel Date: Mon, 13 Sep 2010 00:04:27 +0000 Subject: [soc2010/app-loading] merged trunk git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13818 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/views/debug.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'django/views/debug.py') diff --git a/django/views/debug.py b/django/views/debug.py index 6604bd3dae..7050ea38fb 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -12,7 +12,7 @@ from django.utils.importlib import import_module from django.utils.encoding import smart_unicode, smart_str -HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD|PROFANITIES_LIST') +HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD|PROFANITIES_LIST|SIGNATURE') def linebreak_iter(template_source): yield 0 @@ -412,7 +412,7 @@ TECHNICAL_500_TEMPLATE = """

{{ exception_type }} at {{ request.path_info|escape }}

- 
{{ exception_value|escape }}
+ 
{{ exception_value|force_escape }}
@@ -432,7 +432,7 @@ TECHNICAL_500_TEMPLATE = """ - + @@ -459,7 +459,7 @@ TECHNICAL_500_TEMPLATE = """ {% if unicode_hint %}

Unicode error hint

-

The string that could not be encoded/decoded was: {{ unicode_hint|escape }}

+

The string that could not be encoded/decoded was: {{ unicode_hint|force_escape }}

{% endif %} {% if template_does_not_exist %} @@ -532,8 +532,8 @@ TECHNICAL_500_TEMPLATE = """ {% for var in frame.vars|dictsort:"0" %} - - + + {% endfor %} @@ -582,7 +582,7 @@ Traceback: {% if frame.context_line %} {{ frame.lineno }}. {{ frame.context_line|escape }}{% endif %} {% endfor %} Exception Type: {{ exception_type|escape }} at {{ request.path_info|escape }} -Exception Value: {{ exception_value|escape }} +Exception Value: {{ exception_value|force_escape }}

@@ -778,7 +778,12 @@ TECHNICAL_404_TEMPLATE = """

    {% for pattern in urlpatterns %} -
  1. {{ pattern }}
    2. +
  2. + {% for pat in pattern %} + {{ pat.regex.pattern }} + {% if forloop.last and pat.name %}[name='{{ pat.name }}']{% endif %} + {% endfor %} +
    3. {% endfor %}

The current URL, {{ request_path|escape }}, didn't match any of these.

-- cgit v1.3
Request Method:
Exception Value:
{{ exception_value|escape }}
{{ exception_value|force_escape }}
Exception Location:
{{ var.0|escape }}
{{ var.1|pprint|escape }}
{{ var.0|force_escape }}
{{ var.1|pprint|force_escape }}