[tryton-debian-vcs] tryton-proteus branch upstream-3.6 updated. upstream/3.6.2-1-ge594d72

[Mathias Behrle]

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

commit e594d7251d48290359993f66121a5f5c0dd7e224
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jan 17 19:52:15 2016 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 8744ed6..d16ab95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.3 - 2016-01-11
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.2 - 2015-11-09
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 674c885..29bd825 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2015 Cédric Krier.
-Copyright (C) 2010-2015 B2CK SPRL.
+Copyright (C) 2010-2016 Cédric Krier.
+Copyright (C) 2010-2016 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 151d878..53e05a2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.6.2
+Version: 3.6.3
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 151d878..53e05a2 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.6.2
+Version: 3.6.3
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus/__init__.py b/proteus/__init__.py
index da0a551..5862a57 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "3.6.2"
+__version__ = "3.6.3"
 __all__ = ['Model', 'Wizard', 'Report']
 import sys
 try:
diff --git a/proteus/config.py b/proteus/config.py
index c80dc49..6a58069 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -56,7 +56,8 @@ xmlrpclib.Marshaller.dispatch[Decimal] = dump_decimal
 xmlrpclib.Marshaller.dispatch[datetime.date] = dump_date
 xmlrpclib.Marshaller.dispatch[datetime.time] = dump_time
 xmlrpclib.Marshaller.dispatch[datetime.timedelta] = dump_timedelta
-xmlrpclib.Marshaller.dispatch[bytes] = dump_bytes
+if bytes != str:
+    xmlrpclib.Marshaller.dispatch[bytes] = dump_bytes
 xmlrpclib.Marshaller.dispatch[bytearray] = dump_bytes
 
 
-- 
tryton-proteus