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 | |
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.
21 files changed, 14 insertions, 31 deletions
diff --git a/contrib/scripts/find_typedefs.py b/contrib/scripts/find_typedefs.py index b344cee2b..804eae235 100644 --- a/contrib/scripts/find_typedefs.py +++ b/contrib/scripts/find_typedefs.py | |||
@@ -1,7 +1,5 @@ | |||
1 | # XXX (F841): local variable 'li' is assigned to but never used | 1 | # XXX (F841): local variable 'li' is assigned to but never used |
2 | 2 | ||
3 | from __future__ import print_function | ||
4 | from __future__ import unicode_literals | ||
5 | import os | 3 | import os |
6 | import re | 4 | import re |
7 | import sys | 5 | import sys |
diff --git a/contrib/scripts/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py index 388ef6e11..9e6478e9f 100644 --- a/contrib/scripts/gdb-iterate-dll.py +++ b/contrib/scripts/gdb-iterate-dll.py | |||
@@ -1,5 +1,3 @@ | |||
1 | from __future__ import print_function | ||
2 | from __future__ import unicode_literals | ||
3 | from builtins import str | 1 | from builtins import str |
4 | from gdb import * | 2 | from gdb import * |
5 | 3 | ||
diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index 1f5a0726c..ab0bc635f 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in | |||
@@ -21,8 +21,6 @@ | |||
21 | # Brief: Computes GNUNET style Content Hash Key for a given file | 21 | # Brief: Computes GNUNET style Content Hash Key for a given file |
22 | # Author: Sree Harsha Totakura | 22 | # Author: Sree Harsha Totakura |
23 | 23 | ||
24 | from __future__ import print_function | ||
25 | from __future__ import division | ||
26 | from builtins import str | 24 | from builtins import str |
27 | from builtins import range | 25 | from builtins import range |
28 | from past.utils import old_div | 26 | from past.utils import old_div |
diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in index 4ae9ad124..79e32fb90 100644 --- a/contrib/scripts/gnunet_janitor.py.in +++ b/contrib/scripts/gnunet_janitor.py.in | |||
@@ -22,7 +22,6 @@ | |||
22 | # gnunet janitor can be used by invoking `make' like this: | 22 | # gnunet janitor can be used by invoking `make' like this: |
23 | # TESTS_ENVIRONMENT='${top_srcdir}/contrib/scripts/gnunet_janitor.py &&' make check | 23 | # TESTS_ENVIRONMENT='${top_srcdir}/contrib/scripts/gnunet_janitor.py &&' make check |
24 | 24 | ||
25 | from __future__ import print_function | ||
26 | import os | 25 | import os |
27 | import re | 26 | import re |
28 | import subprocess | 27 | import subprocess |
diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in index 4202da8d0..9611fc0ae 100644 --- a/contrib/scripts/gnunet_pyexpect.py.in +++ b/contrib/scripts/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/contrib/scripts/pydiffer.py.in b/contrib/scripts/pydiffer.py.in index 1dbe856db..35d9ffa35 100644 --- a/contrib/scripts/pydiffer.py.in +++ b/contrib/scripts/pydiffer.py.in | |||
@@ -1,5 +1,5 @@ | |||
1 | #!@PYTHON@ | 1 | #!@PYTHON@ |
2 | from __future__ import print_function | 2 | |
3 | import os | 3 | import os |
4 | import sys | 4 | import sys |
5 | import difflib | 5 | import difflib |
diff --git a/contrib/scripts/pydmesg b/contrib/scripts/pydmesg index d60e08fe3..9b21359f0 100755 --- a/contrib/scripts/pydmesg +++ b/contrib/scripts/pydmesg | |||
@@ -8,8 +8,6 @@ | |||
8 | pydmesg: dmesg with human-readable timestamps | 8 | pydmesg: dmesg with human-readable timestamps |
9 | """ | 9 | """ |
10 | 10 | ||
11 | from __future__ import with_statement | ||
12 | |||
13 | import re | 11 | import re |
14 | import subprocess | 12 | import subprocess |
15 | import sys | 13 | import sys |
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in index 10bb58a9c..1d067b5d9 100644 --- a/src/arm/test_gnunet_arm.py.in +++ b/src/arm/test_gnunet_arm.py.in | |||
@@ -1,5 +1,5 @@ | |||
1 | #!@PYTHON@ | 1 | #!@PYTHON@ |
2 | from __future__ import print_function | 2 | |
3 | import os | 3 | import os |
4 | import sys | 4 | import sys |
5 | import shutil | 5 | import shutil |
diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in index 161015d00..23639b195 100644 --- a/src/consensus/consensus-simulation.py.in +++ b/src/consensus/consensus-simulation.py.in | |||
@@ -17,9 +17,6 @@ | |||
17 | # | 17 | # |
18 | # SPDX-License-Identifier: AGPL3.0-or-later | 18 | # SPDX-License-Identifier: AGPL3.0-or-later |
19 | 19 | ||
20 | from __future__ import absolute_import | ||
21 | from __future__ import print_function | ||
22 | from __future__ import division | ||
23 | from builtins import str | 20 | from builtins import str |
24 | from builtins import range | 21 | from builtins import range |
25 | from past.utils import old_div | 22 | from past.utils import old_div |
@@ -49,8 +46,6 @@ def simulate(k, n, verbose): | |||
49 | print("we have", num_ghosts, "ghost peers") | 46 | print("we have", num_ghosts, "ghost peers") |
50 | # n.b. all peers with idx<k are evil | 47 | # n.b. all peers with idx<k are evil |
51 | peers = list(range(n)) | 48 | peers = list(range(n)) |
52 | # py2-3 compatible, backwards. | ||
53 | # refer to http://python-future.org/compatible_idioms.html#xrange | ||
54 | info = [1 << x for x in range(n)] | 49 | info = [1 << x for x in range(n)] |
55 | 50 | ||
56 | def done_p(): | 51 | def done_p(): |
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in index 38a9f9622..2d9379a42 100644 --- a/src/dht/test_dht_tools.py.in +++ b/src/dht/test_dht_tools.py.in | |||
@@ -11,8 +11,7 @@ | |||
11 | # | 11 | # |
12 | # The code does NOT depend on DHT routing or any actual P2P functionality. | 12 | # The code does NOT depend on DHT routing or any actual P2P functionality. |
13 | # | 13 | # |
14 | from __future__ import print_function | 14 | |
15 | from __future__ import absolute_import | ||
16 | import os | 15 | import os |
17 | import sys | 16 | import sys |
18 | import shutil | 17 | import shutil |
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index d5a036c28..a1e4db9d5 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.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 file-sharing command-line tools (publish, search, download) | 20 | # Testcase for file-sharing command-line tools (publish, search, download) |
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/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 |
diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in index 5caa616ca..979a55d83 100644 --- a/src/revocation/test_local_revocation.py.in +++ b/src/revocation/test_local_revocation.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 ego revocation | 20 | # Testcase for ego revocation |
21 | from __future__ import print_function | 21 | |
22 | from builtins import str | 22 | from builtins import str |
23 | import sys | 23 | import sys |
24 | import os | 24 | import os |
diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in index 64e66f238..b14dc9d9e 100644 --- a/src/statistics/test_gnunet_statistics.py.in +++ b/src/statistics/test_gnunet_statistics.py.in | |||
@@ -1,5 +1,5 @@ | |||
1 | #!@PYTHON@ | 1 | #!@PYTHON@ |
2 | from __future__ import print_function | 2 | |
3 | import os | 3 | import os |
4 | import sys | 4 | import sys |
5 | import shutil | 5 | import shutil |