Merge lp:~florent.x/openobject-addons/trunk-1290820-report_webkit into lp:openobject-addons

[Florent]

Fixes bug #1290820

The temporary HTML files become thread-safe.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Thanks for the fix.

Deprecated by:
https://code.launchpad.net/~camptocamp/openobject-addons/7.0-fix-1319095/+merge/219399

So I mark it as disapprove

Regards

Nicolas

review: Disapprove

Unmerged revisions

9197. By Florent on 2014-03-11

[FIX] report_webkit: use thread-safe names for temporary HTML files.

=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py	2013-10-27 12:31:04 +0000
+++ report_webkit/webkit_report.py	2014-03-11 12:45:10 +0000
@@ -35,6 +35,7 @@
 import sys
 from openerp import report
 import tempfile
+import thread
 import time
 import logging
 
@@ -157,6 +158,7 @@
             webkit_header = report_xml.webkit_header
         tmp_dir = tempfile.gettempdir()
         out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
+        timestamp = '%x.%x' % (thread.get_ident(), 1e7 * time.time())
         file_to_del = [out_filename]
         if comm_path:
             command = [comm_path]
@@ -169,7 +171,7 @@
         if header :
             head_file = file( os.path.join(
                                   tmp_dir,
-                                  str(time.time()) + '.head.html'
+                                  timestamp + '.head.html'
                                  ),
                                 'w'
                             )
@@ -180,7 +182,7 @@
         if footer :
             foot_file = file(  os.path.join(
                                   tmp_dir,
-                                  str(time.time()) + '.foot.html'
+                                  timestamp + '.foot.html'
                                  ),
                                 'w'
                             )
@@ -203,7 +205,7 @@
             command.extend(['--page-size', str(webkit_header.format).replace(',', '.')])
         count = 0
         for html in html_list :
-            html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
+            html_file = file(os.path.join(tmp_dir, timestamp + str(count) +'.body.html'), 'w')
             count += 1
             html_file.write(html.encode('utf-8'))
             html_file.close()