don't apply `urlize` to `@a@b`

diff --git a/CHANGES.rst b/CHANGES.rst
index 3955a32baf97f471784a47b762738e93f6d744c0..e31de857d3f6e939f9eb56d038efe159b633eab7 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -40,6 +40,7 @@ Unreleased
 -   ``PackageLoader`` shows a clearer error message when the package does not
     contain the templates directory. :issue:`1705`
 -   Improve annotations for methods returning copies. :pr:`1880`
+-   ``urlize`` does not add ``mailto:`` to values like `@a@b`. :pr:`1870`
 
 
 Version 3.1.4

diff --git a/src/jinja2/utils.py b/src/jinja2/utils.py
index d7149bc319fbc69896172ef3ffabf8c8bf20f071..7c922629a926c83c55476bd339f6dc32e48a9aec 100644 (file)
--- a/src/jinja2/utils.py
+++ b/src/jinja2/utils.py
@@ -333,6 +333,8 @@ def urlize(
         elif (
             "@" in middle
             and not middle.startswith("www.")
+            # ignore values like `@a@b`
+            and not middle.startswith("@")
             and ":" not in middle
             and _email_re.match(middle)
         ):

diff --git a/tests/test_utils.py b/tests/test_utils.py
index 86e0f0420fc70e59693cb9d62074041432fab50c..b50a6b4c6ab03fccef2f652ccc0b0c6de46db69a 100644 (file)
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -142,6 +142,14 @@ class TestEscapeUrlizeTarget:
             "http://example.org</a>"
         )
 
+    def test_urlize_mail_mastodon(self):
+        fr = "nabijaczleweli@nabijaczleweli.xyz\n@eater@cijber.social\n"
+        to = (
+            '<a href="mailto:nabijaczleweli@nabijaczleweli.xyz">'
+            "nabijaczleweli@nabijaczleweli.xyz</a>\n@eater@cijber.social\n"
+        )
+        assert urlize(fr) == to
+
 
 class TestLoremIpsum:
     def test_lorem_ipsum_markup(self):