From d80afb469f75e2fd9260c4e73424a41d9a905ed2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 9 Jan 2014 11:30:40 +0100 Subject: [PATCH] [FIX] avoid crashing on fonts which reportlab can't load yet does not throw a TTFError on bzr revid: xmo@openerp.com-20140109103040-2i5prvhoag33ij1g --- openerp/addons/base/res/res_font.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_font.py b/openerp/addons/base/res/res_font.py index 306a8944783..b6264a830b6 100644 --- a/openerp/addons/base/res/res_font.py +++ b/openerp/addons/base/res/res_font.py @@ -81,7 +81,7 @@ class res_font(osv.Model): font = ttfonts.TTFontFile(font_path) _logger.debug("Found font %s at %s", font.name, font_path) found_fonts.append((font.familyName, font.name, font_path, font.styleName)) - except ttfonts.TTFError: + except Exception: _logger.warning("Could not register Font %s", font_path) for family, name, path, mode in found_fonts: @@ -112,4 +112,4 @@ class res_font(osv.Model): def clear_caches(self): """Force worker to resync at next report loading by setting an empty font list""" customfonts.CustomTTFonts = [] - return super(res_font, self).clear_caches() \ No newline at end of file + return super(res_font, self).clear_caches()