Merge lp:~camptocamp/c2c-financial-addons/6.0-fix1003563 into lp:c2c-financial-addons/6.0

[Alexandre Fayolle - camptocamp]

fix lp:1003563

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Approved as well as the 6.1 version

review: Approve

=== modified file 'account_financial_report_webkit/report/webkit_parser_header_fix.py'
--- account_financial_report_webkit/report/webkit_parser_header_fix.py	2011-10-14 09:20:15 +0000
+++ account_financial_report_webkit/report/webkit_parser_header_fix.py	2012-07-24 14:39:22 +0000
@@ -34,6 +34,7 @@
 import netsvc
 import pooler
 import tools
+import logging
 import addons
 
 from mako.template import Template
@@ -44,6 +45,7 @@
 from report_webkit.webkit_report import mako_template
 from report_webkit.report_helper import WebKitHelper
 
+_logger = logging.getLogger('financial.reports.webkit')
 
 # Class used only as a workaround to bug :
 # http://code.google.com/p/wkhtmltopdf/issues/detail?id=656
@@ -69,6 +71,7 @@
 #            ],
 #        })
 
+
 class HeaderFooterTextWebKitParser(webkit_report.WebKitParser):
 
     def generate_pdf(self, comm_path, report_xml, header, footer, html_list, webkit_header=False):
@@ -76,10 +79,9 @@
         if not webkit_header:
             webkit_header = report_xml.webkit_header
         tmp_dir = tempfile.gettempdir()
-        out = report_xml.name+str(time.time())+'.pdf'
-        out = os.path.join(tmp_dir, out.replace(' ',''))
+        out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
         files = []
-        file_to_del = []
+        file_to_del = [out_filename]
         if comm_path:
             command = [comm_path]
         else:
@@ -114,24 +116,34 @@
             html_file.close()
             file_to_del.append(html_file.name)
             command.append(html_file.name)
-        command.append(out)
-        generate_command = ' '.join(command)
+        command.append(out_filename)
+        stderr_fd, stderr_path = tempfile.mkstemp(text=True)
+        file_to_del.append(stderr_path)
         try:
-            status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr
-            if status :
-                raise except_osv(
-                                _('Webkit raise an error' ),
-                                status
-                            )
-        except Exception:
-            for f_to_del in file_to_del :
-                os.unlink(f_to_del)
-
-        pdf = file(out, 'rb').read()
-        for f_to_del in file_to_del :
-            os.unlink(f_to_del)
-
-        os.unlink(out)
+            status = subprocess.call(command, stderr=stderr_fd)
+            os.close(stderr_fd) # force flush
+            stderr_fd = None    # avoid closing again in finally
+            fobj = open(stderr_path, 'r')
+            error_message = fobj.read()
+            fobj.close()
+            if not error_message:
+                error_message = _('No diagnosis message was provided')
+            else:
+                error_message = _('The following diagnosis message was provided:\n') + error_message
+            if status:
+                raise except_osv(_('Webkit error' ),
+                                 _("The command 'wkhtmltopdf' failed with error code = %s. Message: %s") % (status, error_message))
+            pdf_file = open(out_filename, 'rb')
+            pdf = pdf_file.read()
+            pdf_file.close()
+        finally:
+            if stderr_fd is not None:
+                os.close(stderr_fd)
+            for f_to_del in file_to_del:
+                try:
+                    os.unlink(f_to_del)
+                except (OSError, IOError), exc:
+                    _logger.error('cannot remove file %s: %s', f_to_del, exc)
         return pdf
 
     # override needed to keep the attachments' storing procedure