Merge lp:~openerp-dev/openobject-addons/trunk-bug-921442-kjo into lp:openobject-addons

[Kuldeep Joshi(OpenERP)]

Encoding trouble in mail_message parsing and base_action_rule processin

[Jigar A. (ifixthat)]

First part of the bug which is "Parsing the rules (base_action_rule) breaks if the regexp or the name of the resource (model) has some non-string char". And Technically it is valid bug, we have reproduced the bug and I am adding step here for the same :

Test case :

- Install Module crm.
- Create 'Automated Action' under Settings/Customization/Automated Actions/Automated Actions for the model crm.lead.
   - Now Supply non-character (e.g. "ààààààà") string under following two field :
   - First field Under Conditions on Model Fields Section, 'Regex on Resource Name '
   - Second field Under Section 'Condition on Communication History' Regular Expression on Case History
- Now, When Automated action with non-character string will be trigger we will have traceback on server saying :
 File "/home/jam/rdtools/addons/trunk-calendar-phase2/base_action_rule/base_action_rule.py", line 372, in do_check
    ptrn = re.compile(str(reg_name))
    UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-6: ordinal not in range(128)
    2012-02-15 05:55:44,278 4176 ERROR ? openerp.netsvc: ascii
    ààààààà
   0
   7
    ordinal not in range(128)
(You can see the Video on Comment#13 on bug post for the same)

Thank You.

[Raphael Collet (OpenERP) (rco-openerp)]

Merged in lp:~openerp-dev/openobject-addons/trunk-bug-921442-nco

=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2011-12-27 09:27:00 +0000
+++ base_action_rule/base_action_rule.py	2012-02-09 11:20:26 +0000
@@ -28,6 +28,7 @@
 import re
 import time
 import tools
+from openerp.loglevels import ustr 
 
 
 def get_datetime(date_field):
@@ -369,8 +370,8 @@
         reg_name = action.regex_name
         result_name = True
         if reg_name:
-            ptrn = re.compile(str(reg_name))
-            _result = ptrn.search(str(obj.name))
+            ptrn = re.compile(ustr(reg_name))
+            _result = ptrn.search(ustr(obj.name))
             if not _result:
                 result_name = False
         regex_n = not reg_name or result_name

=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py	2011-12-20 15:29:31 +0000
+++ crm/crm_action_rule.py	2012-02-09 11:20:26 +0000
@@ -27,6 +27,7 @@
 from osv import osv
 
 import crm
+from openerp.loglevels import ustr 
 
 class base_action_rule(osv.osv):
     """ Base Action Rule """
@@ -73,9 +74,9 @@
         regex = action.regex_history
         if regex:
             res = False
-            ptrn = re.compile(str(regex))
+            ptrn = re.compile(ustr(regex))
             for history in obj.message_ids:
-                _result = ptrn.search(str(history.name))
+                _result = ptrn.search(ustr(history.subject))
                 if _result:
                     res = True
                     break