encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-25 07:50:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up auto-escaping.

Browse Source
This commit is contained in:
Tom Christie 2012-01-28 14:38:06 +00:00
parent bbfa404e46
commit 22ee89f0f3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
djangorestframework/templates/renderer.html
View File

@ -50,7 +50,7 @@
<div class='content-main'> <div class='content-main'>
<h1>{{ name }}</h1> <h1>{{ name }}</h1>
<p>{% autoescape off %}{{ description }}{% endautoescape %}</p> <p>{{ description }}</p>
<div class='module'> <div class='module'>
<pre><b>{{ response.status }} {{ response.status_text }}</b>{% autoescape off %} <pre><b>{{ response.status }} {{ response.status_text }}</b>{% autoescape off %}
{% for key, val in response.headers.items %}<b>{{ key }}:</b> {{ val|urlize_quoted_links }} {% for key, val in response.headers.items %}<b>{{ key }}:</b> {{ val|urlize_quoted_links }}

4
djangorestframework/templates/renderer.txt
View File

@ -1,8 +1,8 @@
{{ name }} {% autoescape off %}{{ name }}
{{ description }} {{ description }}
{% autoescape off %}HTTP/1.0 {{ response.status }} {{ response.status_text }} HTTP/1.0 {{ response.status }} {{ response.status_text }}
{% for key, val in response.headers.items %}{{ key }}: {{ val }} {% for key, val in response.headers.items %}{{ key }}: {{ val }}
{% endfor %} {% endfor %}
{{ content }}{% endautoescape %} {{ content }}{% endautoescape %}

7
djangorestframework/views.py
View File

@ -36,6 +36,7 @@ def _remove_trailing_string(content, trailing):
return content[:-len(trailing)] return content[:-len(trailing)]
return content return content
def _remove_leading_indent(content): def _remove_leading_indent(content):
""" """
Remove leading indent from a block of text. Remove leading indent from a block of text.
@ -50,6 +51,7 @@ def _remove_leading_indent(content):
return re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) return re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content)
return content return content
def _camelcase_to_spaces(content): def _camelcase_to_spaces(content):
""" """
Translate 'CamelCaseNames' to 'Camel Case Names'. Translate 'CamelCaseNames' to 'Camel Case Names'.
@ -161,9 +163,10 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView):
def markup_description(self, description): def markup_description(self, description):
if apply_markdown: if apply_markdown:
return apply_markdown(description) description = apply_markdown(description)
else: else:
return mark_safe(escape(description).replace('\n', '<br />')) description = escape(description).replace('\n', '<br />')
return mark_safe(description)
def http_method_not_allowed(self, request, *args, **kwargs): def http_method_not_allowed(self, request, *args, **kwargs):
""" """