odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] fix email regexp that was too restrictive 

bzr revid: fva@openerp.com-20121228123023-f81amw02iqnmgwxt
This commit is contained in:
Frédéric van der Essen 2012-12-28 13:30:23 +01:00
parent e3d2c92fc6 0eac2ff48e
commit 28d08ad901
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openerp/tools/mail.py
View File

@ -320,14 +320,12 @@ def append_content_to_html(html, content, plaintext=True, preserve=False, contai
# Emails
#----------------------------------------------------------
email_re = re.compile(r"""
([a-zA-Z][\w\.-]*[a-zA-Z0-9] # username part
@ # mandatory @ sign
[a-zA-Z0-9][\w\.-]* # domain must start with a letter ... Ged> why do we include a 0-9 then?
\.
[a-z]{2,3} # TLD
)
""", re.VERBOSE)
# 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)
# 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)
res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)