[tryton-debian-vcs] tryton-client branch upstream updated. upstream/3.6.1-1-g6dd82d2

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/3.6.1-1-g6dd82d2

commit 6dd82d27893b3c58a55adce4429d954b7f388a11
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 12:37:45 2015 +0200

    Adding upstream version 3.6.2.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 347267e..c6e0f2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.1 - 2015-05-19
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index eb5c5f6..af5290e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.1
+Version: 3.6.2
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index eb5c5f6..af5290e 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tryton
-Version: 3.6.1
+Version: 3.6.2
 Summary: Tryton client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton/__init__.py b/tryton/__init__.py
index 7d7e270..db5050e 100644
--- a/tryton/__init__.py
+++ b/tryton/__init__.py
@@ -1,3 +1,3 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "3.6.1"
+__version__ = "3.6.2"
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 11df775..dc27950 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -1445,7 +1445,7 @@ def resize_pixbuf(pixbuf, width, height):
 
 def _data2pixbuf(data):
     loader = gtk.gdk.PixbufLoader()
-    loader.write(data, len(data))
+    loader.write(bytes(data), len(data))
     loader.close()
     return loader.get_pixbuf()
 
diff --git a/tryton/common/datetime_.py b/tryton/common/datetime_.py
index a6765c6..b1507c4 100644
--- a/tryton/common/datetime_.py
+++ b/tryton/common/datetime_.py
@@ -106,6 +106,7 @@ class Date(gtk.Entry):
             self.__calendar.select_month(
                 self.__date.month - 1, self.__date.year)
             self.__calendar.select_day(self.__date.day)
+        self.__cal_popup.set_transient_for(self.get_toplevel())
         popup_position(self, self.__cal_popup)
         popup_show(self.__cal_popup)
 
diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 03178e2..7d30662 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -1314,8 +1314,9 @@ class Main(object):
             with open(filename, 'rb') as file_p:
                 data = file_p.read()
             host, port = url.rsplit(':', 1)
+            cast = bytearray if bytes == str else bytes
             rpcprogress = common.RPCProgress('db_exec', (host, int(port),
-                'restore', dbname, passwd, buffer(data), update))
+                'restore', dbname, passwd, cast(data), update))
             try:
                 res = rpcprogress.run(False)
             except TrytonServerError, exception:
-- 
tryton-client