From d9bb7128fe7bc565a2dbbd1e89bb0345711b46f6 Mon Sep 17 00:00:00 2001 From: David Hoffman Date: Mon, 13 Oct 2014 18:15:36 -0400 Subject: [1.7.x] Fixed #23558 -- documented slugify limitations Backport of 03467368db from master --- django/template/defaultfilters.py | 6 +++--- django/utils/text.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'django') diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index 9ae5c1f735..9f46770c85 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -232,9 +232,9 @@ def make_list(value): @stringfilter def slugify(value): """ - Converts to lowercase, removes non-word characters (alphanumerics and - underscores) and converts spaces to hyphens. Also strips leading and - trailing whitespace. + Converts to ASCII. Converts spaces to hyphens. Removes characters that + aren't alphanumerics, underscores, or hyphens. Converts to lowercase. + Also strips leading and trailing whitespace. """ return _slugify(value) diff --git a/django/utils/text.py b/django/utils/text.py index df6e1d0c46..34535d6455 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -435,9 +435,9 @@ unescape_string_literal = allow_lazy(unescape_string_literal) def slugify(value): """ - Converts to lowercase, removes non-word characters (alphanumerics and - underscores) and converts spaces to hyphens. Also strips leading and - trailing whitespace. + Converts to ASCII. Converts spaces to hyphens. Removes characters that + aren't alphanumerics, underscores, or hyphens. Converts to lowercase. + Also strips leading and trailing whitespace. """ value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii') value = re.sub('[^\w\s-]', '', value).strip().lower() -- cgit v1.3