[GNUnet-SVN] [gnunet] branch master updated: fix fs/test_gnunet_fs_psd.py.in for python3

[gnunet]

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

xrs pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new b993ca621 fix fs/test_gnunet_fs_psd.py.in for python3
     new 99c6e18e6 Merge branch 'master' of ssh://gnunet.org/gnunet
b993ca621 is described below

commit b993ca621717d0a9958b4138a32fb1e3cef7f54c
Author: xrs <address@hidden>
AuthorDate: Sat Jun 23 16:58:37 2018 +0200

    fix fs/test_gnunet_fs_psd.py.in for python3
---
 src/fs/test_gnunet_fs_psd.py.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index 4c91c6327..906282200 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -32,10 +32,13 @@ except NameError:
         # Python 3.0 - 3.3
         from imp import reload
 
-# Force encoding to utf-8, as this test otherwise fails
-# on some systems (see #5094).
 reload(sys)
-sys.setdefaultencoding('utf8')
+
+# Force encoding to utf-8, as this test otherwise fails
+# on some systems (see #5094). In Python 3+ there is no attribute 
+# sys.setdefaultencoding anymore. 
+if (3 < sys.version_info[0]):
+    sys.setdefaultencoding('utf8')
 
 srcdir = "../.."
 gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")

-- 
To stop receiving notification emails like this one, please contact
address@hidden