Commit 9f9a4cde authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Removed truncate_words and truncate_html_words.

parent e00d1b6d

django/utils/text.py

+0 −14
Original line number Diff line number Diff line
@@ -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

tests/regressiontests/utils/text.py

+0 −26
Original line number Diff line number Diff line
@@ -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')