summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-10 19:46:23 +0100
committerHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-10 19:49:39 +0100
commit4deae01fba7218d3e31cc008e390c392ea9a2238 (patch)
treed71a988f640e80a40768a102619a1baf7363a545 /contrib
parent8de3cc8ba8126cd2464a010526b94b8daf63718b (diff)
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 'contrib')
-rw-r--r--contrib/scripts/find_typedefs.py2
-rw-r--r--contrib/scripts/gdb-iterate-dll.py2
-rwxr-xr-xcontrib/scripts/gnunet-chk.py.in2
-rw-r--r--contrib/scripts/gnunet_janitor.py.in1
-rw-r--r--contrib/scripts/gnunet_pyexpect.py.in2
-rw-r--r--contrib/scripts/pydiffer.py.in2
-rwxr-xr-xcontrib/scripts/pydmesg2
7 files changed, 2 insertions, 11 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 @@
# 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 @@
#!@PYTHON@
-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