From ae5476c64c4d688f7d5157ff439f26fb39860e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 12 Sep 2018 12:50:00 +0200
Subject: [PATCH] Encode string to write as binary and use file_write

issue7686
review68311002
---
 .../window/view_form/view/form_gtk/binary.py  |  2 ++
 .../window/view_form/view/list_gtk/widget.py  | 30 ++++++++-----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/tryton/gui/window/view_form/view/form_gtk/binary.py b/tryton/gui/window/view_form/view/form_gtk/binary.py
index b5a61176fb..cdd67aca4b 100644
--- a/tryton/gui/window/view_form/view/form_gtk/binary.py
+++ b/tryton/gui/window/view_form/view/form_gtk/binary.py
@@ -93,6 +93,8 @@ class BinaryMixin(Widget):
             data = self.field.get_data(self.record)
         else:
             data = self.field.get(self.record)
+        if isinstance(data, str):
+            data = data.encode('utf-8')
         return data
 
     def open_(self, widget=None):
diff --git a/tryton/gui/window/view_form/view/list_gtk/widget.py b/tryton/gui/window/view_form/view/list_gtk/widget.py
index f483747db3..6372804c95 100644
--- a/tryton/gui/window/view_form/view/list_gtk/widget.py
+++ b/tryton/gui/window/view_form/view/list_gtk/widget.py
@@ -2,7 +2,6 @@
 # this repository contains the full copyright notices and license terms.
 import datetime
 import os
-import tempfile
 import gtk
 import gettext
 import webbrowser
@@ -12,7 +11,7 @@ from functools import wraps, partial
 from tryton.gui.window.win_search import WinSearch
 from tryton.gui.window.win_form import WinForm
 from tryton.gui.window.view_form.screen import Screen
-from tryton.common import file_selection, file_open, slugify
+from tryton.common import file_selection, file_open, file_write
 import tryton.common as common
 from tryton.common.cellrendererbutton import CellRendererButton
 from tryton.common.cellrenderertext import CellRendererText, \
@@ -474,23 +473,12 @@ class Binary(GenericText):
     def open_binary(self, renderer, path):
         if not self.filename:
             return
-        dtemp = tempfile.mkdtemp(prefix='tryton_')
         record, field = self._get_record_field(path)
         filename_field = record.group.fields.get(self.filename)
         filename = filename_field.get(record)
         if not filename:
             return
-        root, ext = os.path.splitext(filename)
-        filename = ''.join([slugify(root), os.extsep, slugify(ext)])
-        file_path = os.path.join(dtemp, filename)
-        with open(file_path, 'wb') as fp:
-            if hasattr(field, 'get_data'):
-                data = field.get_data(record)
-            else:
-                data = field.get(record)
-            if isinstance(data, str):
-                data = data.encode('utf-8')
-            fp.write(data)
+        file_path = file_write(filename, self.get_data(record, field))
         root, type_ = os.path.splitext(filename)
         if type_:
             type_ = type_[1:]
@@ -506,10 +494,16 @@ class Binary(GenericText):
             action=gtk.FILE_CHOOSER_ACTION_SAVE)
         if filename:
             with open(filename, 'wb') as fp:
-                if hasattr(field, 'get_data'):
-                    fp.write(field.get_data(record))
-                else:
-                    fp.write(field.get(record))
+                fp.write(self.get_data(record, field))
+
+    def get_data(self, record, field):
+        if hasattr(field, 'get_data'):
+            data = field.get_data(record)
+        else:
+            data = field.get(record)
+        if isinstance(data, str):
+            data = data.encode('utf-8')
+        return data
 
     def clear_binary(self, renderer, path):
         record, field = self._get_record_field(path)