diff options
| -rw-r--r-- | django/utils/text.py | 14 | ||||
| -rw-r--r-- | tests/regressiontests/utils/text.py | 26 |
2 files changed, 0 insertions, 40 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 diff --git a/tests/regressiontests/utils/text.py b/tests/regressiontests/utils/text.py index ebf67952f9..3465282c7f 100644 --- a/tests/regressiontests/utils/text.py +++ b/tests/regressiontests/utils/text.py @@ -8,8 +8,6 @@ from django.utils import text class TestUtilsText(SimpleTestCase): - # In Django 1.6 truncate_words() and truncate_html_words() will be removed - # so these tests will need to be adapted accordingly def test_truncate_chars(self): truncator = text.Truncator( 'The quick brown fox jumped over the lazy dog.' @@ -73,30 +71,6 @@ class TestUtilsText(SimpleTestCase): self.assertEqual('<p>The quick <a href="xyz.html"\n' 'id="mylink">brown...</a></p>', truncator.words(3, '...', html=True)) - def test_old_truncate_words(self): - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always") - self.assertEqual('The quick brown fox jumped over the lazy dog.', - text.truncate_words('The quick brown fox jumped over the lazy dog.', 10)) - self.assertEqual('The quick brown fox ...', - text.truncate_words('The quick brown fox jumped over the lazy dog.', 4)) - self.assertEqual('The quick brown fox ....', - text.truncate_words('The quick brown fox jumped over the lazy dog.', 4, '....')) - self.assertGreater(len(w), 0) - - def test_old_truncate_html_words(self): - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always") - self.assertEqual('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', - text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 10)) - self.assertEqual('<p><strong><em>The quick brown fox ...</em></strong></p>', - text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 4)) - self.assertEqual('<p><strong><em>The quick brown fox ....</em></strong></p>', - text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 4, '....')) - self.assertEqual('<p><strong><em>The quick brown fox</em></strong></p>', - text.truncate_html_words('<p><strong><em>The quick brown fox jumped over the lazy dog.</em></strong></p>', 4, None)) - self.assertGreater(len(w), 0) - def test_wrap(self): digits = '1234 67 9' self.assertEqual(text.wrap(digits, 100), '1234 67 9') |