[GNUnet-SVN] [gnunet] branch master updated (8602fa51e -> dd926a1da)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 8602fa51e DESTDIR needed here
     new 07edbcab2 Fix #5243
     new 2bc8eb977 Merge branch 'master' of gnunet.org:gnunet
     new dd926a1da really fix #5243 -- it is fun to fix python2+3 for testsuite 
which will become irrelevant when in the future we only support 2.7 legacy and 
some range of 3.x

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/fs/test_gnunet_fs_psd.py.in | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index e3a8db141..4c91c6327 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -22,11 +22,15 @@ import subprocess
 import re
 import shutil
 try:
+    # Python 2.7
     reload
 except NameError:
-    # python3.4:
-    from importlib import reload
-
+    try:
+        # Python 3.4+:
+        from importlib import reload
+    except ImportError:
+        # Python 3.0 - 3.3
+        from imp import reload
 
 # Force encoding to utf-8, as this test otherwise fails
 # on some systems (see #5094).
@@ -53,6 +57,12 @@ elif os.name == 'nt':
     unindex = './gnunet-unindex.exe'
     search = './gnunet-search.exe'
 
+if "GNUNET_PREFIX" in os.environ:
+    pass
+else:
+    print("You need to export GNUNET_PREFIX")
+    sys.exit(1)
+    
 if os.name == "nt":
     shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), 
True)
 else:

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