[FIX] tools: email TLDs can be longer than 6 chars
According to the RFC1034 https://tools.ietf.org/html/rfc1034 A TLD can use up to 63 octets. The regex checking that an email address is valid should there allow emails using a TLD with such a length. Besides, the use of TLD domains exceeding 6 characters is more and more common, nowadays. e.g. using a domain `.amsterdam` opw-660014
This commit is contained in:
parent
fc3c0b22f9
commit
7f29a23118
|
@ -603,10 +603,10 @@ def append_content_to_html(html, content, plaintext=True, preserve=False, contai
|
||||||
#----------------------------------------------------------
|
#----------------------------------------------------------
|
||||||
|
|
||||||
# matches any email in a body of text
|
# matches any email in a body of text
|
||||||
email_re = re.compile(r"""([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6})""", re.VERBOSE)
|
email_re = re.compile(r"""([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63})""", re.VERBOSE)
|
||||||
|
|
||||||
# matches a string containing only one email
|
# matches a string containing only one email
|
||||||
single_email_re = re.compile(r"""^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$""", re.VERBOSE)
|
single_email_re = re.compile(r"""^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$""", re.VERBOSE)
|
||||||
|
|
||||||
res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
|
res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
|
||||||
command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
|
command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
|
||||||
|
|
Loading…
Reference in New Issue