[GNUnet-SVN] [gnunet] branch master updated (8de3cc8ba -> 3d6ba937a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

htgoebel pushed a change to branch master
in repository gnunet.

    from 8de3cc8ba README +libjannson
     new 4deae01fb Cleanup Python code: remove `import __future__`.
     new 3d6ba937a Docs: Remove requirement for `python-future`.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README                                                             | 5 ++---
 contrib/packages/guix/guix-env-py2.scm                             | 1 -
 contrib/packages/guix/notest-guix-env.scm                          | 1 -
 contrib/scripts/find_typedefs.py                                   | 2 --
 contrib/scripts/gdb-iterate-dll.py                                 | 2 --
 contrib/scripts/gnunet-chk.py.in                                   | 2 --
 contrib/scripts/gnunet_janitor.py.in                               | 1 -
 contrib/scripts/gnunet_pyexpect.py.in                              | 2 +-
 contrib/scripts/pydiffer.py.in                                     | 2 +-
 contrib/scripts/pydmesg                                            | 2 --
 doc/handbook/chapters/installation.texi                            | 1 -
 src/arm/test_gnunet_arm.py.in                                      | 2 +-
 src/consensus/consensus-simulation.py.in                           | 5 -----
 src/dht/test_dht_tools.py.in                                       | 3 +--
 src/fs/test_gnunet_fs_psd.py.in                                    | 2 +-
 src/integration-tests/gnunet_pyexpect.py.in                        | 2 +-
 src/integration-tests/gnunet_testing.py.in                         | 3 +--
 src/integration-tests/test_integration_bootstrap_and_connect.py.in | 2 +-
 src/integration-tests/test_integration_clique.py.in                | 1 -
 src/integration-tests/test_integration_disconnect.py.in            | 2 +-
 src/integration-tests/test_integration_disconnect_nat.py.in        | 2 +-
 src/integration-tests/test_integration_reconnect.py.in             | 2 +-
 src/integration-tests/test_integration_reconnect_nat.py.in         | 2 +-
 src/revocation/test_local_revocation.py.in                         | 2 +-
 src/statistics/test_gnunet_statistics.py.in                        | 2 +-
 25 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/README b/README
index d56df7764..982d7241d 100644
--- a/README
+++ b/README
@@ -75,7 +75,6 @@ These are the dependencies for GNUnet's testsuite:
 - Posix Shell                       (for some tests)
 - Bash                              (for some tests[*4])
 - python             >= 3.7         (only python 3.7 is supported)
-- python-future      >= 3.7         (only python 3.7 is supported)
 - base tools
   - mostly:
     - which,
@@ -428,8 +427,8 @@ $ make install
 $ export $GNUNET_PREFIX=$SOMEWHERE
 $ make check
 
-Some of the testcases require python >= 3.7, and the python modules
-"python-future" (http://python-future.org/) and "pexpect" to be installed.
+Some of the testcases require python >= 3.7, and the python module
+"pexpect" to be installed.
 If any testcases fail to pass on your system, run
 "contrib/scripts/gnunet-bugreport" (in the repository) or "gnunet-bugreport"
 when you already have GNUnet installed and report its output together with
diff --git a/contrib/packages/guix/guix-env-py2.scm 
b/contrib/packages/guix/guix-env-py2.scm
index 6085f96a9..11e5451e2 100644
--- a/contrib/packages/guix/guix-env-py2.scm
+++ b/contrib/packages/guix/guix-env-py2.scm
@@ -102,7 +102,6 @@
          ("zlib" ,zlib)
          ("perl" ,perl)
          ("python-2" ,python-2) ; tests and gnunet-qr
-         ("python2-future" ,python2-future)
          ("jansson" ,jansson)
          ("nss" ,nss)
          ("glib" ,glib "bin")
diff --git a/contrib/packages/guix/notest-guix-env.scm 
b/contrib/packages/guix/notest-guix-env.scm
index ffb0ec889..1fafd961d 100644
--- a/contrib/packages/guix/notest-guix-env.scm
+++ b/contrib/packages/guix/notest-guix-env.scm
@@ -100,7 +100,6 @@
          ("zlib" ,zlib)
          ("perl" ,perl)
          ("python-2" ,python-2) ; tests and gnunet-qr
-         ("python2-future" ,python2-future)
          ("jansson" ,jansson)
          ("nss" ,nss)
          ("glib" ,glib "bin")
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 @@
 # XXX (F841): local variable 'li' is assigned to but never used
 
-from __future__ import print_function
-from __future__ import unicode_literals
 import os
 import re
 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 @@
-from __future__ import print_function
-from __future__ import unicode_literals
 from builtins import str
 from gdb import *
 
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 @@
 # Brief:   Computes GNUNET style Content Hash Key for a given file
 # Author:  Sree Harsha Totakura
 
-from __future__ import print_function
-from __future__ import division
 from builtins import str
 from builtins import range
 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 @@
 # gnunet janitor can be used by invoking `make' like this:
 # TESTS_ENVIRONMENT='${top_srcdir}/contrib/scripts/gnunet_janitor.py &&' make 
check
 
-from __future__ import print_function
 import os
 import re
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for gnunet-peerinfo
-from __future__ import print_function
+
 from builtins import object
 import os
 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 @@
 address@hidden@
-from __future__ import print_function
+
 import os
 import sys
 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 @@
 pydmesg: dmesg with human-readable timestamps
 """
 
-from __future__ import with_statement
-
 import re
 import subprocess
 import sys
diff --git a/doc/handbook/chapters/installation.texi 
b/doc/handbook/chapters/installation.texi
index e110edc61..b625687e1 100644
--- a/doc/handbook/chapters/installation.texi
+++ b/doc/handbook/chapters/installation.texi
@@ -90,7 +90,6 @@ These are the dependencies only required for certain features
 These are the test suite requirements:
 @itemize @bullet
 @item python3.7
address@hidden python3-7 future module
 @item gnunet (installation first)
 @item which(1)
 @item a shell (possibly Bash, maybe just POSIX sh)
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 @@
 address@hidden@
-from __future__ import print_function
+
 import os
 import sys
 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 @@
 #
 # SPDX-License-Identifier: AGPL3.0-or-later
 
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import division
 from builtins import str
 from builtins import range
 from past.utils import old_div
@@ -49,8 +46,6 @@ def simulate(k, n, verbose):
         print("we have", num_ghosts, "ghost peers")
         # n.b. all peers with idx<k are evil
     peers = list(range(n))
-    # py2-3 compatible, backwards.
-    # refer to http://python-future.org/compatible_idioms.html#xrange
     info = [1 << x for x in range(n)]
 
     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 @@
 #
 # The code does NOT depend on DHT routing or any actual P2P functionality.
 #
-from __future__ import print_function
-from __future__ import absolute_import
+
 import os
 import sys
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for file-sharing command-line tools (publish, search, download)
-from __future__ import print_function
+
 import sys
 import os
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for gnunet-peerinfo
-from __future__ import print_function
+
 from builtins import object
 import os
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Functions for integration testing
-from __future__ import unicode_literals
-from __future__ import print_function
+
 from builtins import object
 from builtins import str
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
+
 import signal
 import sys
 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 @@
 # Conditions for successful exit:
 # Both peers have 2 connected peers in transport, core, topology, fs and dht
 
-from __future__ import print_function
 import sys
 import signal
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
+
 import sys
 import signal
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
+
 import sys
 import signal
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
+
 import sys
 import os
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 #
-from __future__ import print_function
+
 import sys
 import os
 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 @@
 #    SPDX-License-Identifier: AGPL3.0-or-later
 #
 # Testcase for ego revocation
-from __future__ import print_function
+
 from builtins import str
 import sys
 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 @@
 address@hidden@
-from __future__ import print_function
+
 import os
 import sys
 import shutil

-- 
To stop receiving notification emails like this one, please contact
address@hidden