Commit 7f75460f authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Fixed #19070 -- urlize filter no longer raises exceptions on 2.7 

Thanks to claudep for the patch.
parent 146ed13a

django/utils/html.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ from django.utils.text import normalize_newlines 


# Configuration for urlize() function.

TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)']

WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('&lt;', '&gt;')]

WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('&lt;', '&gt;')]



# List of possible strings used for bullets in bulleted lists.

DOTS = ['&middot;', '*', '\u2022', '&#149;', '&bull;', '&#8226;']

tests/regressiontests/defaultfilters/tests.py

+6 −1
Original line number Diff line number Diff line
@@ -306,6 +306,11 @@ class DefaultFiltersTests(TestCase): 
        self.assertEqual(urlize('(Go to http://www.example.com/foo.)'),

            '(Go to <a href="http://www.example.com/foo" rel="nofollow">http://www.example.com/foo</a>.)')



        # Check urlize doesn't crash when square bracket is appended to url (#19070)

        self.assertEqual(urlize('[see www.example.com]'),

            '[see <a href="http://www.example.com" rel="nofollow">www.example.com</a>]' )





    def test_wordcount(self):

        self.assertEqual(wordcount(''), 0)

        self.assertEqual(wordcount('oneword'), 1)