From 1bb1d3168b813e050df757ff40cdaf2feab45fdb Mon Sep 17 00:00:00 2001 From: LarryBrid Date: Thu, 3 Jul 2014 16:37:56 -0400 Subject: Updated urlize regex following a93ee5112d4 Prevent urlize from turning some.organization, an.intern etc. into urls. Refs #22941. --- django/utils/html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/utils/html.py') diff --git a/django/utils/html.py b/django/utils/html.py index 1ab27b4461..38fe90d1a9 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -25,7 +25,7 @@ DOTS = ['·', '*', '\u2022', '•', '•', '•'] unencoded_ampersands_re = re.compile(r'&(?!(\w+|#\d+);)') word_split_re = re.compile(r'(\s+)') simple_url_re = re.compile(r'^https?://\[?\w', re.IGNORECASE) -simple_url_2_re = re.compile(r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)(.*)$', re.IGNORECASE) +simple_url_2_re = re.compile(r'^www\.|^(?!http)\w[^@]+\.(com|edu|gov|int|mil|net|org)($|/.*)$', re.IGNORECASE) simple_email_re = re.compile(r'^\S+@\S+\.\S+$') link_target_attribute_re = re.compile(r'(]*?)target=[^\s>]+') html_gunk_re = re.compile(r'(?:
|<\/i>|<\/b>|<\/em>|<\/strong>|<\/?smallcaps>|<\/?uppercase>)', re.IGNORECASE) -- cgit v1.3