innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Removed duplicate lines in slugify().

This commit is contained in:
Jon Dufresne 2017-04-10 05:12:37 -07:00 committed by Tim Graham
parent eac396a5d0
commit b906c3db63
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/utils/text.py
View File

@ -412,9 +412,8 @@ def slugify(value, allow_unicode=False):
value = force_text(value) value = force_text(value)
if allow_unicode: if allow_unicode:
value = unicodedata.normalize('NFKC', value) value = unicodedata.normalize('NFKC', value)
value = re.sub(r'[^\w\s-]', '', value).strip().lower() else:
return mark_safe(re.sub(r'[-\s]+', '-', value)) value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
value = re.sub(r'[^\w\s-]', '', value).strip().lower() value = re.sub(r'[^\w\s-]', '', value).strip().lower()
return mark_safe(re.sub(r'[-\s]+', '-', value)) return mark_safe(re.sub(r'[-\s]+', '-', value))