diff options
author | Nils Gillmann <ng0@n0.is> | 2018-06-14 18:51:13 +0000 |
---|---|---|
committer | Nils Gillmann <ng0@n0.is> | 2018-06-14 18:51:13 +0000 |
commit | dd926a1daf954cc8e67475f8916f69a9ccb4923c (patch) | |
tree | b9f3d3239ec8d91f6ceaee580fbc648cb5643d21 /src/fs | |
parent | 2bc8eb9778631235aa868a2f9766e62c602fa0ce (diff) | |
download | gnunet-dd926a1daf954cc8e67475f8916f69a9ccb4923c.tar.gz gnunet-dd926a1daf954cc8e67475f8916f69a9ccb4923c.zip |
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-x | src/fs/test_gnunet_fs_psd.py.in | 10 |
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 | |||
22 | import re | 22 | import re |
23 | import shutil | 23 | import shutil |
24 | try: | 24 | try: |
25 | # Python 2.7 | ||
25 | reload | 26 | reload |
26 | except NameError: | 27 | except NameError: |
27 | # python3.4: | 28 | try: |
28 | from importlib import reload | 29 | # Python 3.4+: |
29 | 30 | from importlib import reload | |
31 | except ImportError: | ||
32 | # Python 3.0 - 3.3 | ||
33 | from imp import reload | ||
30 | 34 | ||
31 | # Force encoding to utf-8, as this test otherwise fails | 35 | # Force encoding to utf-8, as this test otherwise fails |
32 | # on some systems (see #5094). | 36 | # on some systems (see #5094). |