diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-08-18 17:47:21 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-08-18 17:51:16 +0200 |
| commit | afc1bd7ab87268b33a8b44b3238f562cdaf2a72f (patch) | |
| tree | 6b434993c1e4113f8a1c724f7e05a6e6e22873c0 /django/utils | |
| parent | de3ad8bb2d14ccf878121b96e6e0359dd8b1f9d5 (diff) | |
[py3] Made 212b9826bd Python 3-friendly
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/html.py | 12 | ||||
| -rw-r--r-- | django/utils/text.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/django/utils/html.py b/django/utils/html.py index 13954ce195..0ee789ebb5 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -126,13 +126,13 @@ strip_tags = allow_lazy(strip_tags) def remove_tags(html, tags): """Returns the given HTML with given tags removed.""" tags = [re.escape(tag) for tag in tags.split()] - tags_re = u'(%s)' % u'|'.join(tags) - starttag_re = re.compile(ur'<%s(/?>|(\s+[^>]*>))' % tags_re, re.U) - endtag_re = re.compile(u'</%s>' % tags_re) - html = starttag_re.sub(u'', html) - html = endtag_re.sub(u'', html) + tags_re = '(%s)' % '|'.join(tags) + starttag_re = re.compile(r'<%s(/?>|(\s+[^>]*>))' % tags_re, re.U) + endtag_re = re.compile('</%s>' % tags_re) + html = starttag_re.sub('', html) + html = endtag_re.sub('', html) return html -remove_tags = allow_lazy(remove_tags, unicode) +remove_tags = allow_lazy(remove_tags, six.text_type) def strip_spaces_between_tags(value): """Returns the given HTML with spaces between tags removed.""" diff --git a/django/utils/text.py b/django/utils/text.py index cbafab0032..ca79a24f7c 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -391,7 +391,7 @@ def slugify(value): underscores) and converts spaces to hyphens. Also strips leading and trailing whitespace. """ - value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore') - value = unicode(re.sub('[^\w\s-]', '', value).strip().lower()) + value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii') + value = re.sub('[^\w\s-]', '', value).strip().lower() return mark_safe(re.sub('[-\s]+', '-', value)) -slugify = allow_lazy(slugify, unicode) +slugify = allow_lazy(slugify, six.text_type) |