summaryrefslogtreecommitdiff
path: root/django/utils/text.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-12-24 23:29:24 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-12-29 21:59:07 +0100
commit9f9a4cdecdea16c202292e9dee2444827abfae3a (patch)
tree791ca8c7b27b11fc07caa05da29d6596dcaee0f4 /django/utils/text.py
parente00d1b6dc66524bf8d26c608e50e1e442a3bf5d0 (diff)
downloaddjango-9f9a4cdecdea16c202292e9dee2444827abfae3a.tar.gz
Removed truncate_words and truncate_html_words.
Diffstat (limited to 'django/utils/text.py')
-rw-r--r--django/utils/text.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/django/utils/text.py b/django/utils/text.py
index d75ca8dbca..6664b18249 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -209,20 +209,6 @@ class Truncator(SimpleLazyObject):
# Return string
return out
-def truncate_words(s, num, end_text='...'):
- warnings.warn('This function has been deprecated. Use the Truncator class '
- 'in django.utils.text instead.', category=DeprecationWarning)
- truncate = end_text and ' %s' % end_text or ''
- return Truncator(s).words(num, truncate=truncate)
-truncate_words = allow_lazy(truncate_words, six.text_type)
-
-def truncate_html_words(s, num, end_text='...'):
- warnings.warn('This function has been deprecated. Use the Truncator class '
- 'in django.utils.text instead.', category=DeprecationWarning)
- truncate = end_text and ' %s' % end_text or ''
- return Truncator(s).words(num, truncate=truncate, html=True)
-truncate_html_words = allow_lazy(truncate_html_words, six.text_type)
-
def get_valid_filename(s):
"""
Returns the given string converted to a string that can be used for a clean