Commit 59d99772 authored by Florian Apolloner's avatar Florian Apolloner
Browse files

Merge pull request #216 from ljosa/ticket_18644 

Fixed #18644 -- Made urlize trim trailing period followed by parenthesis
parents 51a01013 d5012d63

django/utils/html.py

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



# Configuration for urlize() function.

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

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

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



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

tests/regressiontests/defaultfilters/tests.py

+4 −0
Original line number Diff line number Diff line
@@ -298,6 +298,10 @@ class DefaultFiltersTests(TestCase): 
        self.assertEqual(urlize('HTTPS://github.com/'),

            '<a href="https://github.com/" rel="nofollow">HTTPS://github.com/</a>')



        # Check urlize trims trailing period when followed by parenthesis - see #18644

        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>.)')



    def test_wordcount(self):

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

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