diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2019-03-10 19:46:23 +0100 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2019-03-10 19:49:39 +0100 |
commit | 4deae01fba7218d3e31cc008e390c392ea9a2238 (patch) | |
tree | d71a988f640e80a40768a102619a1baf7363a545 /src/integration-tests | |
parent | 8de3cc8ba8126cd2464a010526b94b8daf63718b (diff) | |
download | gnunet-4deae01fba7218d3e31cc008e390c392ea9a2238.tar.gz gnunet-4deae01fba7218d3e31cc008e390c392ea9a2238.zip |
Cleanup Python code: remove `import __future__`.
All of these only made Python 2 accept some Python 3 language idioms,
and the code is Python-3-only.
Diffstat (limited to 'src/integration-tests')
8 files changed, 7 insertions, 9 deletions
diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in index 83acb908f..000b8f99a 100644 --- a/src/integration-tests/gnunet_pyexpect.py.in +++ b/src/integration-tests/gnunet_pyexpect.py.in | |||
@@ -18,7 +18,7 @@ | |||
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | # | 19 | # |
20 | # Testcase for gnunet-peerinfo | 20 | # Testcase for gnunet-peerinfo |
21 | from __future__ import print_function | 21 | |
22 | from builtins import object | 22 | from builtins import object |
23 | import os | 23 | import os |
24 | import re | 24 | import re |
diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index c9342ecf0..667c3fff5 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in | |||
@@ -18,8 +18,7 @@ | |||
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | # | 19 | # |
20 | # Functions for integration testing | 20 | # Functions for integration testing |
21 | from __future__ import unicode_literals | 21 | |
22 | from __future__ import print_function | ||
23 | from builtins import object | 22 | from builtins import object |
24 | from builtins import str | 23 | from builtins import str |
25 | import os | 24 | import os |
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index f0de1c0cd..4b4b35629 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in | |||
@@ -18,7 +18,7 @@ | |||
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | # | 19 | # |
20 | # | 20 | # |
21 | from __future__ import print_function | 21 | |
22 | import signal | 22 | import signal |
23 | import sys | 23 | import sys |
24 | import os | 24 | import os |
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index b5d6dd518..0444cf249 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in | |||
@@ -25,7 +25,6 @@ | |||
25 | # Conditions for successful exit: | 25 | # Conditions for successful exit: |
26 | # Both peers have 2 connected peers in transport, core, topology, fs and dht | 26 | # Both peers have 2 connected peers in transport, core, topology, fs and dht |
27 | 27 | ||
28 | from __future__ import print_function | ||
29 | import sys | 28 | import sys |
30 | import signal | 29 | import signal |
31 | import os | 30 | import os |
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index a81c78540..737014e61 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in | |||
@@ -18,7 +18,7 @@ | |||
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | # | 19 | # |
20 | # | 20 | # |
21 | from __future__ import print_function | 21 | |
22 | import sys | 22 | import sys |
23 | import signal | 23 | import signal |
24 | import os | 24 | import os |
diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in index 601586f47..c3d5d8901 100755 --- a/src/integration-tests/test_integration_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_disconnect_nat.py.in | |||
@@ -18,7 +18,7 @@ | |||
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | # | 19 | # |
20 | # | 20 | # |
21 | from __future__ import print_function | 21 | |
22 | import sys | 22 | import sys |
23 | import signal | 23 | import signal |
24 | import os | 24 | import os |
diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in index e8abacd48..8c4193680 100755 --- a/src/integration-tests/test_integration_reconnect.py.in +++ b/src/integration-tests/test_integration_reconnect.py.in | |||
@@ -18,7 +18,7 @@ | |||
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | # | 19 | # |
20 | # | 20 | # |
21 | from __future__ import print_function | 21 | |
22 | import sys | 22 | import sys |
23 | import os | 23 | import os |
24 | import subprocess | 24 | import subprocess |
diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in index 61d2ea966..45626d50d 100755 --- a/src/integration-tests/test_integration_reconnect_nat.py.in +++ b/src/integration-tests/test_integration_reconnect_nat.py.in | |||
@@ -18,7 +18,7 @@ | |||
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | # | 19 | # |
20 | # | 20 | # |
21 | from __future__ import print_function | 21 | |
22 | import sys | 22 | import sys |
23 | import os | 23 | import os |
24 | import subprocess | 24 | import subprocess |