summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMehraz Hossain Rumman <59512321+MehrazRumman@users.noreply.github.com>2025-11-06 04:05:54 +0600
committerGitHub <noreply@github.com>2025-11-05 17:05:54 -0500
commit125b63ca745bace1e098ed3c7362d59136f68a8b (patch)
treefed5b83d19295074a8bdedcf3b14b0373402e0c5
parentdfcc662cf8fd7f897ddcdfeaf5cb4ae6c963ebf8 (diff)
Fixed #36710 -- Fixed a regression in urlize for multipart domain names.
Thanks Mehraz Hossain Rumman for the report and Bruno Alla for the triage. Regression in a9fe98d5bd4212d069afe8316101984aadecfbb2.
-rw-r--r--django/utils/html.py1
-rw-r--r--tests/utils_tests/test_html.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/django/utils/html.py b/django/utils/html.py
index 734d7fbfb3..b04d6bc5ee 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -297,6 +297,7 @@ class Urlizer:
simple_url_re = _lazy_re_compile(r"^https?://\[?\w", re.IGNORECASE)
simple_url_2_re = _lazy_re_compile(
rf"^www\.|^(?!http)(?:{DomainNameValidator.hostname_re})"
+ rf"(?:{DomainNameValidator.domain_re})"
r"\.(com|edu|gov|int|mil|net|org)($|/.*)$",
re.IGNORECASE,
)
diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
index bf00d14496..b388d3ce52 100644
--- a/tests/utils_tests/test_html.py
+++ b/tests/utils_tests/test_html.py
@@ -455,6 +455,10 @@ class TestUtilsHtml(SimpleTestCase):
'<a href="mailto:idna-2008@%DE%89%DE%A8%DE%80%DE%A7%DE%83%DE%AA.ex'
'ample.mv">idna-2008@މިހާރު.example.mv</a>',
),
+ (
+ "host.djangoproject.com",
+ '<a href="https://host.djangoproject.com">host.djangoproject.com</a>',
+ ),
)
for value, output in tests:
with self.subTest(value=value):