From 035a0ee4126b8dd6ceea33b656c2ae80711ee354 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 2 Nov 2015 12:53:33 +0100 Subject: [PATCH] [FIX] ir.attachment: no crash on missing file with bin_size=True When bin_size=True is passed, `os.path.getsize()` raises an OSError rather than IOError when the file cannot be found. --- openerp/addons/base/ir/ir_attachment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py index 6f0435735dd..44c76a8efbe 100644 --- a/openerp/addons/base/ir/ir_attachment.py +++ b/openerp/addons/base/ir/ir_attachment.py @@ -149,7 +149,7 @@ class ir_attachment(osv.osv): r = os.path.getsize(full_path) else: r = open(full_path,'rb').read().encode('base64') - except IOError: + except (IOError, OSError): _logger.info("_read_file reading %s", full_path, exc_info=True) return r