summaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorNils Gillmann <ng0@n0.is>2018-06-14 18:51:13 +0000
committerNils Gillmann <ng0@n0.is>2018-06-14 18:51:13 +0000
commitdd926a1daf954cc8e67475f8916f69a9ccb4923c (patch)
treeb9f3d3239ec8d91f6ceaee580fbc648cb5643d21 /src/fs
parent2bc8eb9778631235aa868a2f9766e62c602fa0ce (diff)
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
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'src/fs')
-rwxr-xr-xsrc/fs/test_gnunet_fs_psd.py.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index 0e191d4a4..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).