summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2018-07-14 10:38:18 +0200
committerTim Graham <timograham@gmail.com>2018-07-20 10:44:30 -0400
commitb004bd62e83588fdb0e533fdeec993aec358281d (patch)
tree0752bdad31c3132e1eb96b0a10346b7c394a8910 /django/utils
parent861638a3074f289faf729d739edf6326332a484f (diff)
Fixed #29412 -- Stopped marking slugify() result as HTML safe.
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/text.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/django/utils/text.py b/django/utils/text.py
index 746a67ee00..e980f7170f 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -4,10 +4,7 @@ import unicodedata
from gzip import GzipFile
from io import BytesIO
-from django.utils.functional import (
- SimpleLazyObject, keep_lazy, keep_lazy_text, lazy,
-)
-from django.utils.safestring import SafeText, mark_safe
+from django.utils.functional import SimpleLazyObject, keep_lazy_text, lazy
from django.utils.translation import gettext as _, gettext_lazy, pgettext
@@ -399,7 +396,7 @@ def unescape_string_literal(s):
return s[1:-1].replace(r'\%s' % quote, quote).replace(r'\\', '\\')
-@keep_lazy(str, SafeText)
+@keep_lazy_text
def slugify(value, allow_unicode=False):
"""
Convert to ASCII if 'allow_unicode' is False. Convert spaces to hyphens.
@@ -412,7 +409,7 @@ def slugify(value, allow_unicode=False):
else:
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
value = re.sub(r'[^\w\s-]', '', value).strip().lower()
- return mark_safe(re.sub(r'[-\s]+', '-', value))
+ return re.sub(r'[-\s]+', '-', value)
def camel_case_to_spaces(value):