summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2012-08-18 09:41:06 -0700
committerAndrew Godwin <andrew@aeracode.org>2012-08-18 09:41:06 -0700
commitbf12c663d9c2e42d62baa9c7212a18ed2fdc1aa3 (patch)
tree4e11c5e0a67190644bb032a98b4855222a2da458
parent5b09fc8ad2b61331496a7ed2667960ba744c01aa (diff)
parente4984812cd54f7c5f27ccb754fc8ddadcb0693f9 (diff)
Merge pull request #289 from mjtamlyn/slugify-real-function
Fixed bug in 212b982 -- Removed duplicate code in removetags
-rw-r--r--django/template/defaultfilters.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index d8b0c3439a..1bfb627023 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -468,13 +468,8 @@ def safeseq(value):
@stringfilter
def removetags(value, tags):
"""Removes a space separated list of [X]HTML tags from the output."""
- tags = [re.escape(tag) for tag in tags.split()]
- tags_re = '(%s)' % '|'.join(tags)
- starttag_re = re.compile(r'<%s(/?>|(\s+[^>]*>))' % tags_re, re.U)
- endtag_re = re.compile('</%s>' % tags_re)
- value = starttag_re.sub('', value)
- value = endtag_re.sub('', value)
- return value
+ from django.utils.html import remove_tags
+ return remove_tags(value, tags)
@register.filter(is_safe=True)
@stringfilter