diff options
Diffstat (limited to 'django/utils/html.py')
| -rw-r--r-- | django/utils/html.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/django/utils/html.py b/django/utils/html.py index de515ef8e9..a5cb56ec9e 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -38,8 +38,8 @@ html_gunk_re = re.compile( r'(?:<br clear="all">|<i><\/i>|<b><\/b>|<em><\/em>|<strong><\/strong>|' '<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE) hard_coded_bullets_re = re.compile( - r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join(re.escape(x) - for x in DOTS), re.DOTALL) + r'((?:<p>(?:%s).*?[a-zA-Z].*?</p>\s*)+)' % '|'.join(re.escape(x) for x in DOTS), re.DOTALL +) trailing_empty_content_re = re.compile(r'(?:<p>(?: |\s|<br \/>)*?</p>\s*)+\Z') @@ -53,8 +53,10 @@ def escape(text): marked as such. This may result in double-escaping. If this is a concern, use conditional_escape() instead. """ - return mark_safe(force_text(text).replace('&', '&').replace('<', '<') - .replace('>', '>').replace('"', '"').replace("'", ''')) + return mark_safe( + force_text(text).replace('&', '&').replace('<', '<') + .replace('>', '>').replace('"', '"').replace("'", ''') + ) _js_escapes = { ord('\\'): '\\u005C', |