From c6525a130cb6ff27ec751e289dd1827bc9d12b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 3 Feb 2015 12:58:22 +0100 Subject: [PATCH] [FIX] ir_attachment: avoid crashing when giving void files or URLs, guess_type does not accept False / void values. --- openerp/addons/base/ir/ir_attachment.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py index 425a4d27e0e..002e428acff 100644 --- a/openerp/addons/base/ir/ir_attachment.py +++ b/openerp/addons/base/ir/ir_attachment.py @@ -264,10 +264,10 @@ class ir_attachment(osv.osv): :return mime : string indicating the mimetype, or application/octet-stream by default """ mimetype = 'application/octet-stream' - if 'datas_fname' in values: - mimetype = mimetypes.guess_type(values.get('datas_fname'))[0] - if 'datas' in values: - mimetype = guess_mimetype(values.get('datas').decode('base64')) + if values.get('datas_fname'): + mimetype = mimetypes.guess_type(values['datas_fname'])[0] + if values.get('datas'): + mimetype = guess_mimetype(values['datas'].decode('base64')) return mimetype def _index(self, cr, uid, bin_data, datas_fname, file_type):