innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #32866 -- Fixed trimming trailing punctuation from escaped string in urlize().

This commit is contained in:
Shipeng Feng 2021-07-07 17:19:33 +08:00 committed by GitHub
parent c51bf80d56
commit 68cc04887b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/utils/html.py
View File

@ -283,8 +283,9 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False):
middle_unescaped = html.unescape(middle) middle_unescaped = html.unescape(middle)
stripped = middle_unescaped.rstrip(TRAILING_PUNCTUATION_CHARS) stripped = middle_unescaped.rstrip(TRAILING_PUNCTUATION_CHARS)
if middle_unescaped != stripped: if middle_unescaped != stripped:
trail = middle[len(stripped):] + trail punctuation_count = len(middle_unescaped) - len(stripped)
middle = middle[:len(stripped) - len(middle_unescaped)] trail = middle[-punctuation_count:] + trail
middle = middle[:-punctuation_count]
trimmed_something = True trimmed_something = True
return lead, middle, trail return lead, middle, trail

4
tests/utils_tests/test_html.py
View File

@ -250,6 +250,10 @@ class TestUtilsHtml(SimpleTestCase):
'Search for google.com/?q=! and see.', 'Search for google.com/?q=! and see.',
'Search for <a href="http://google.com/?q=">google.com/?q=</a>! and see.' 'Search for <a href="http://google.com/?q=">google.com/?q=</a>! and see.'
), ),
(
'Search for google.com/?q=1&lt! and see.',
'Search for <a href="http://google.com/?q=1%3C">google.com/?q=1&lt</a>! and see.'
),
( (
lazystr('Search for google.com/?q=!'), lazystr('Search for google.com/?q=!'),
'Search for <a href="http://google.com/?q=">google.com/?q=</a>!' 'Search for <a href="http://google.com/?q=">google.com/?q=</a>!'