1.7.1dev: merge [17857] from 1.6-stable (fix for #13790)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17858 af82e41b-90c4-0310-8c96-b1721e28e2e2

trac/notification/mail.py

@@ -59,7 +59,7 @@
         r"[a-zA-Z0-9.'+_-]+" '@'
         # the domain name part (RFC:1035)
         r'(?:[a-zA-Z0-9_-]+\.)+'  # labels (but also allow '_')
-        r'[a-zA-Z](?:[-a-zA-Z\d]*[a-zA-Z\d])?'  # TLD
+        r'[a-zA-Z](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?'  # TLD
         )
 
 _mime_encoding_re = re.compile(r'=\?[^?]+\?[bq]\?[^?]+\?=', re.IGNORECASE)

trac/wiki/tests/wiki-tests.txt

@@ -429,6 +429,10 @@ trac+devel@another-site.fr,
 T_r+a-c1.23@yet_another-site.edu.au
 !not@an.email.com
 someone@louvre.museum-
+local@exa६ple.org (U+096c)
+local@example.or೬ (U+0cec)
+local@example.o６g (U+ff16)
+local@example.or𝟨 (U+1d7e8)
 ------------------------------
 <p>
 Author: <a class="mail-link" href="mailto:cboos@edgewall.org"><span class="icon"></span>mailto:cboos@edgewall.org</a>,
@@ -440,6 +444,10 @@ i.e. <a class="mail-link" href="mailto:cboos@edgewall.org"><span class="icon"></
 <a class="mail-link" href="mailto:T_r+a-c1.23@yet_another-site.edu.au"><span class="icon"></span>T_r+a-c1.23@yet_another-site.edu.au</a>
 not@an.email.com
 <a class="mail-link" href="mailto:someone@louvre.museum"><span class="icon"></span>someone@louvre.museum</a>-
+local@exa६ple.org (U+096c)
+<a class="mail-link" href="mailto:local@example.or"><span class="icon"></span>local@example.or</a>೬ (U+0cec)
+<a class="mail-link" href="mailto:local@example.o"><span class="icon"></span>local@example.o</a>６g (U+ff16)
+<a class="mail-link" href="mailto:local@example.or"><span class="icon"></span>local@example.or</a>𝟨 (U+1d7e8)
 </p>
 ------------------------------
 ============================== Arbitrary protocol Link