diff options
| author | Vebjorn Ljosa <vebjorn@ljosa.com> | 2012-07-17 10:38:04 -0400 |
|---|---|---|
| committer | Vebjorn Ljosa <vebjorn@ljosa.com> | 2012-07-17 12:44:02 -0400 |
| commit | d5012d6371e804fc0427112cc1ceacbe8a059c4f (patch) | |
| tree | 2c45c00d95a207ce7ff2881998361adec0673bc2 | |
| parent | 29132ebdef0e0b9c09e456b05f0e6a22f1106a4f (diff) | |
Fixed #18644 -- Made urlize trim trailing period followed by parenthesis
| -rw-r--r-- | django/utils/html.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/defaultfilters/tests.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/django/utils/html.py b/django/utils/html.py index 390c45dcec..6a47bfc869 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -13,7 +13,7 @@ from django.utils.functional import allow_lazy from django.utils.text import normalize_newlines # Configuration for urlize() function. -TRAILING_PUNCTUATION = ['.', ',', ':', ';'] +TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)'] WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('<', '>')] # List of possible strings used for bullets in bulleted lists. diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/regressiontests/defaultfilters/tests.py index ffa0a01132..d08bcf0fd9 100644 --- a/tests/regressiontests/defaultfilters/tests.py +++ b/tests/regressiontests/defaultfilters/tests.py @@ -297,6 +297,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) |