Merge lp:~camptocamp/openobject-addons/bug_6349 into lp:openobject-addons

[Nicolas Bessi - Camptocamp]

Fix of bug 904363

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

The orginal code would check for the existance of the file, which the new version does not do : tools.file_open raises an IOError exception if the path is not found, I think the code should check for that exception.

The "if template_file:" test will always be true, as there is no way that tools.file_open can return something evaluating to False (as said above, it will fail with an exception).

review: Needs Fixing (abstain)

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

+1 on the comment of Alexandre above

review: Needs Fixing

Unmerged revisions

6349. By Nicolas Bessi - Camptocamp on 2012-01-16

[FIX] bug no 904363

=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py	2012-01-09 20:13:53 +0000
+++ report_webkit/webkit_report.py	2012-01-16 13:44:25 +0000
@@ -36,6 +36,7 @@
 import tempfile
 import time
 import logging
+import tools
 
 from mako.template import Template
 from mako.lookup import TemplateLookup
@@ -214,8 +215,10 @@
 
         if report_xml.report_file :
             path = addons.get_module_resource(report_xml.report_file)
-            if os.path.exists(path) :
-                template = file(path).read()
+            # we do this in order to support zip report modules seems deprecated in trunk
+            template_file = tools.file_open(path) # with syntax would be nice
+            if template_file:
+                template = template_file.read()
         if not template and report_xml.report_webkit_data :
             template =  report_xml.report_webkit_data
         if not template :