[python-hdf5storage] 07/12: Fixed bug in Python2 where str.decode does not use a keyword for the encoding.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag 0.1.1
in repository python-hdf5storage.

commit 303772474e247f2f9ce6e9bfdd80ee8589857fcb
Author: Freja Nordsiek <fnordsie at gmail.com>
Date:   Fri Mar 7 18:40:59 2014 -0500

    Fixed bug in Python2 where str.decode does not use a keyword for the encoding.
---
 hdf5storage/utilities.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hdf5storage/utilities.py b/hdf5storage/utilities.py
index dbe5d8f..f16c4d0 100644
--- a/hdf5storage/utilities.py
+++ b/hdf5storage/utilities.py
@@ -231,8 +231,8 @@ def convert_to_str(data):
                 return data.flatten.tostring().decode('UTF-32',
                                                       errors='replace')
             else:
-                return data.encode('UTF-32').decode( \
-                    encoding='UTF-32', errors='replace')
+                return data.encode('UTF-32').decode('UTF-32', \
+                    errors='replace')
 
     if isinstance(data, bytes):
         return data.decode('ASCII')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-hdf5storage.git