p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #33245 -- Minor edits to django.utils.html.urlize() changes. 

Follow up to ad81b606a2.
This commit is contained in:
tim-mccurrach 2021-11-03 07:14:50 +00:00 committed by GitHub
parent 9f3bd9dfc4
commit 1f9874d4ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/utils/html.py
View File

@ -264,7 +264,7 @@ class Urlizer:
]) ])
def handle_word( def handle_word(
self, word, safe_input, trim_url_limit=None, nofollow=False, autoescape=False, self, word, *, safe_input, trim_url_limit=None, nofollow=False, autoescape=False,
): ):
if '.' in word or '@' in word or ':' in word: if '.' in word or '@' in word or ':' in word:
# lead: Punctuation trimmed from the beginning of the word. # lead: Punctuation trimmed from the beginning of the word.
@ -288,7 +288,7 @@ class Urlizer:
nofollow_attr = '' nofollow_attr = ''
# Make link. # Make link.
if url: if url:
trimmed = self.trim_url(middle, trim_url_limit=trim_url_limit) trimmed = self.trim_url(middle, limit=trim_url_limit)
if autoescape and not safe_input: if autoescape and not safe_input:
lead, trail = escape(lead), escape(trail) lead, trail = escape(lead), escape(trail)
trimmed = escape(trimmed) trimmed = escape(trimmed)
@ -309,10 +309,10 @@ class Urlizer:
return escape(word) return escape(word)
return word return word
def trim_url(self, x, trim_url_limit): def trim_url(self, x, *, limit):
if trim_url_limit is None or len(x) <= trim_url_limit: if limit is None or len(x) <= limit:
return x return x
return '%s…' % x[:max(0, trim_url_limit - 1)] return '%s…' % x[:max(0, limit - 1)]
def trim_punctuation(self, word): def trim_punctuation(self, word):
""" """