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

[MERGE] tools.literal_eval -> ast.literal_eval (as we drop python 2.5 support). 

bzr revid: vmt@openerp.com-20120118160153-o2nbgxwndhfh3yc0
This commit is contained in:
Vo Minh Thu 2012-01-18 17:01:53 +01:00
parent 5b57b7c5a9 a3c18f3173
commit 8ffac09200
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mail/mail_message.py
View File

@ -19,6 +19,7 @@
#
##############################################################################
import ast
import base64
import dateutil.parser
import email
@ -32,7 +33,6 @@ import tools
from osv import osv
from osv import fields
from tools.translate import _
from tools.safe_eval import literal_eval
_logger = logging.getLogger('mail')
@ -508,7 +508,7 @@ class mail_message(osv.osv):
object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
subtype=message.subtype,
subtype_alternative=subtype_alternative,
headers=message.headers and literal_eval(message.headers))
headers=message.headers and ast.literal_eval(message.headers))
res = ir_mail_server.send_email(cr, uid, msg,
mail_server_id=message.mail_server_id.id,
context=context)

4
addons/mail/wizard/mail_compose_message.py
View File

@ -19,13 +19,13 @@
#
##############################################################################
import ast
import re
import tools
from osv import osv
from osv import fields
from tools.safe_eval import safe_eval as eval
from tools.safe_eval import literal_eval
from tools.translate import _
from ..mail_message import to_email
@ -213,7 +213,7 @@ class mail_compose_message(osv.osv_memory):
else:
active_model = mail.model
active_model_pool = self.pool.get(active_model)
active_ids = active_model_pool.search(cr, uid, literal_eval(mail.filter_id.domain), context=literal_eval(mail.filter_id.context))
active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail.filter_id.domain), context=ast.literal_eval(mail.filter_id.context))
for active_id in active_ids:
subject = self.render_template(cr, uid, mail.subject, active_model, active_id)