diff options
author | ng0 <ng0@n0.is> | 2018-03-03 16:31:19 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2018-03-03 16:31:19 +0000 |
commit | 4db4adc0774b995901c2999a3556abb5b224f647 (patch) | |
tree | 844b7499a627daf3e2844f90f7a4b95e914c68c3 /src/fs/test_gnunet_fs_psd.py.in | |
parent | 9f1edb2c382042236786a87fcdcfe308833c15d2 (diff) | |
download | gnunet-4db4adc0774b995901c2999a3556abb5b224f647.tar.gz gnunet-4db4adc0774b995901c2999a3556abb5b224f647.zip |
src/fs/test_gnunet_fs_psd.py.in: Use py2 and py3.4+ compatible import
Diffstat (limited to 'src/fs/test_gnunet_fs_psd.py.in')
-rwxr-xr-x | src/fs/test_gnunet_fs_psd.py.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index 87fcf1130..601797c82 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in | |||
@@ -1,6 +1,6 @@ | |||
1 | #!@PYTHON@ | 1 | #!@PYTHON@ |
2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
3 | # (C) 2010 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |
5 | # GNUnet is free software; you can redistribute it and/or modify | 5 | # GNUnet is free software; you can redistribute it and/or modify |
6 | # it under the terms of the GNU General Public License as published | 6 | # it under the terms of the GNU General Public License as published |
@@ -23,6 +23,11 @@ import os | |||
23 | import subprocess | 23 | import subprocess |
24 | import re | 24 | import re |
25 | import shutil | 25 | import shutil |
26 | try: | ||
27 | reload | ||
28 | except NameError: | ||
29 | # python3.4: | ||
30 | from importlib import reload | ||
26 | 31 | ||
27 | # Force encoding to utf-8, as this test otherwise fails | 32 | # Force encoding to utf-8, as this test otherwise fails |
28 | # on some systems (see #5094). | 33 | # on some systems (see #5094). |