From 4db4adc0774b995901c2999a3556abb5b224f647 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 3 Mar 2018 16:31:19 +0000 Subject: src/fs/test_gnunet_fs_psd.py.in: Use py2 and py3.4+ compatible import --- src/fs/test_gnunet_fs_psd.py.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 @@ #!@PYTHON@ # This file is part of GNUnet. -# (C) 2010 Christian Grothoff (and other contributing authors) +# (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published @@ -23,6 +23,11 @@ import os import subprocess import re import shutil +try: + reload +except NameError: + # python3.4: + from importlib import reload # Force encoding to utf-8, as this test otherwise fails # on some systems (see #5094). -- cgit v1.2.3