diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-07 18:12:02 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-07 18:12:02 +0200 |
| commit | f5e7d53bcec4e0488656e0be0144b4b9a4ec8930 (patch) | |
| tree | 5b345b2bc4646525fc571f00cf6810e0adcee4c7 | |
| parent | c433498ef75c7aeaf59892a73835d29f5ab0ae0c (diff) | |
[IMP] tools.reference_re: support matching model name as well
bzr revid: odo@openerp.com-20120807161202-jav73f2kj86pzil4
| -rw-r--r-- | openerp/tools/misc.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 3aad91fb7b8..e90fadf0492 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -279,7 +279,11 @@ email_re = re.compile(r""" """, re.VERBOSE) res_re = re.compile(r"\[([0-9]+)\]", re.UNICODE) command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE) -reference_re = re.compile("<.*-open(?:object|erp)-(\\d+).*@(.*)>", re.UNICODE) + +# Updated in 7.0 to match the model name as well +# Typical form of references is <timestamp-openerp-record_id-model_name@domain> +# group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain +reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?.*@(.*)>", re.UNICODE) def html2plaintext(html, body_id=None, encoding='utf-8'): """ From an HTML text, convert the HTML to plain text. |