p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed unneeded escape filter in templates where autoescaping is enabled.

This commit is contained in:
Tim Graham 2017-08-01 10:52:29 -04:00 committed by GitHub
parent 53d2534b38
commit 8df7681d0e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/templates/admin/delete_confirmation.html
View File

@ -13,7 +13,7 @@
<div class="breadcrumbs"> <div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a> &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst|escape }}</a> &rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
&rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a> &rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a>
&rsaquo; {% trans 'Delete' %} &rsaquo; {% trans 'Delete' %}
</div> </div>

6
django/views/templates/technical_404.html
View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Page not found at {{ request.path_info|escape }}</title> <title>Page not found at {{ request.path_info }}</title>
<meta name="robots" content="NONE,NOARCHIVE"> <meta name="robots" content="NONE,NOARCHIVE">
<style type="text/css"> <style type="text/css">
html * { padding:0; margin:0; } html * { padding:0; margin:0; }
@ -32,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<th>Request URL:</th> <th>Request URL:</th>
<td>{{ request.build_absolute_uri|escape }}</td> <td>{{ request.build_absolute_uri }}</td>
</tr> </tr>
{% if raising_view_name %} {% if raising_view_name %}
<tr> <tr>
@ -60,7 +60,7 @@
</ol> </ol>
<p> <p>
{% if request_path %} {% if request_path %}
The current path, <code>{{ request_path|escape }}</code>,{% else %} The current path, <code>{{ request_path }}</code>,{% else %}
The empty path{% endif %} didn't match any of these. The empty path{% endif %} didn't match any of these.
</p> </p>
{% else %} {% else %}

20
django/views/templates/technical_500.html
View File

@ -4,7 +4,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="robots" content="NONE,NOARCHIVE"> <meta name="robots" content="NONE,NOARCHIVE">
<title>{% if exception_type %}{{ exception_type }}{% else %}Report{% endif %} <title>{% if exception_type %}{{ exception_type }}{% else %}Report{% endif %}
{% if request %} at {{ request.path_info|escape }}{% endif %}</title> {% if request %} at {{ request.path_info }}{% endif %}</title>
<style type="text/css"> <style type="text/css">
html * { padding:0; margin:0; } html * { padding:0; margin:0; }
body * { padding:10px 20px; } body * { padding:10px 20px; }
@ -106,7 +106,7 @@
<body> <body>
<div id="summary"> <div id="summary">
<h1>{% if exception_type %}{{ exception_type }}{% else %}Report{% endif %} <h1>{% if exception_type %}{{ exception_type }}{% else %}Report{% endif %}
{% if request %} at {{ request.path_info|escape }}{% endif %}</h1> {% if request %} at {{ request.path_info }}{% endif %}</h1>
<pre class="exception_value">{% if exception_value %}{{ exception_value|force_escape }}{% else %}No exception message supplied{% endif %}</pre> <pre class="exception_value">{% if exception_value %}{{ exception_value|force_escape }}{% else %}No exception message supplied{% endif %}</pre>
<table class="meta"> <table class="meta">
{% if request %} {% if request %}
@ -116,7 +116,7 @@
</tr> </tr>
<tr> <tr>
<th>Request URL:</th> <th>Request URL:</th>
<td>{{ request.get_raw_uri|escape }}</td> <td>{{ request.get_raw_uri }}</td>
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr>
@ -138,12 +138,12 @@
{% if lastframe %} {% if lastframe %}
<tr> <tr>
<th>Exception Location:</th> <th>Exception Location:</th>
<td>{{ lastframe.filename|escape }} in {{ lastframe.function|escape }}, line {{ lastframe.lineno }}</td> <td>{{ lastframe.filename }} in {{ lastframe.function }}, line {{ lastframe.lineno }}</td>
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr>
<th>Python Executable:</th> <th>Python Executable:</th>
<td>{{ sys_executable|escape }}</td> <td>{{ sys_executable }}</td>
</tr> </tr>
<tr> <tr>
<th>Python Version:</th> <th>Python Version:</th>
@ -285,7 +285,7 @@
<div id="pastebinTraceback" class="pastebin"> <div id="pastebinTraceback" class="pastebin">
<input type="hidden" name="language" value="PythonConsole"> <input type="hidden" name="language" value="PythonConsole">
<input type="hidden" name="title" <input type="hidden" name="title"
value="{{ exception_type|escape }}{% if request %} at {{ request.path_info|escape }}{% endif %}"> value="{{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %}">
<input type="hidden" name="source" value="Django Dpaste Agent"> <input type="hidden" name="source" value="Django Dpaste Agent">
<input type="hidden" name="poster" value="Django"> <input type="hidden" name="poster" value="Django">
<textarea name="content" id="traceback_area" cols="140" rows="25"> <textarea name="content" id="traceback_area" cols="140" rows="25">
@ -293,7 +293,7 @@ Environment:
{% if request %} {% if request %}
Request Method: {{ request.META.REQUEST_METHOD }} Request Method: {{ request.META.REQUEST_METHOD }}
Request URL: {{ request.get_raw_uri|escape }} Request URL: {{ request.get_raw_uri }}
{% endif %} {% endif %}
Django Version: {{ django_version_info }} Django Version: {{ django_version_info }}
Python Version: {{ sys_version_info }} Python Version: {{ sys_version_info }}
@ -322,10 +322,10 @@ The above exception ({{ frame.exc_cause }}) was the direct cause of the followin
{% else %} {% else %}
During handling of the above exception ({{ frame.exc_cause }}), another exception occurred: During handling of the above exception ({{ frame.exc_cause }}), another exception occurred:
{% endif %}{% endif %}{% endifchanged %} {% endif %}{% endif %}{% endifchanged %}
File "{{ frame.filename|escape }}" in {{ frame.function|escape }} File "{{ frame.filename }}" in {{ frame.function }}
{% if frame.context_line %} {{ frame.lineno }}. {{ frame.context_line|escape }}{% endif %}{% endfor %} {% if frame.context_line %} {{ frame.lineno }}. {{ frame.context_line }}{% endif %}{% endfor %}
Exception Type: {{ exception_type|escape }}{% if request %} at {{ request.path_info|escape }}{% endif %} Exception Type: {{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %}
Exception Value: {{ exception_value|force_escape }} Exception Value: {{ exception_value|force_escape }}
</textarea> </textarea>
<br><br> <br><br>