Kaydet (Commit) d5012d63 authored tarafından Vebjorn Ljosa's avatar Vebjorn Ljosa

Fixed #18644 -- Made urlize trim trailing period followed by parenthesis

üst 29132ebd
...@@ -13,7 +13,7 @@ from django.utils.functional import allow_lazy ...@@ -13,7 +13,7 @@ from django.utils.functional import allow_lazy
from django.utils.text import normalize_newlines from django.utils.text import normalize_newlines
# Configuration for urlize() function. # Configuration for urlize() function.
TRAILING_PUNCTUATION = ['.', ',', ':', ';'] TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)']
WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('&lt;', '&gt;')] WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('&lt;', '&gt;')]
# List of possible strings used for bullets in bulleted lists. # List of possible strings used for bullets in bulleted lists.
......
...@@ -297,6 +297,10 @@ class DefaultFiltersTests(TestCase): ...@@ -297,6 +297,10 @@ class DefaultFiltersTests(TestCase):
self.assertEqual(urlize('HTTPS://github.com/'), self.assertEqual(urlize('HTTPS://github.com/'),
'<a href="https://github.com/" rel="nofollow">HTTPS://github.com/</a>') '<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): def test_wordcount(self):
self.assertEqual(wordcount(''), 0) self.assertEqual(wordcount(''), 0)
self.assertEqual(wordcount('oneword'), 1) self.assertEqual(wordcount('oneword'), 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment