diff options
| author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2020-07-16 04:17:38 +0200 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-08-03 11:40:27 +0200 |
| commit | a4b7a48f71a059c7410ee3e97aa682361cf22799 (patch) | |
| tree | 9530900b05516aae06b6483781a5ebb818f322a0 /gnuradio-runtime/python | |
| parent | f25a97122d74ce8217efcdec807b4c338627ec06 (diff) | |
python: Remove unnecessary 'from __future__ import'
All of the removed `from __future__ import` were needed in older
versions of Python (mostly 2.5.x and below) but later became mandatory
in most versions of Python 3 hence are not necessary anymore.
More specifically, according to __future__.py[1]:
- unicode_literals is part of Python since versions 2.6.0 and 3.0.0;
- print_function is part of Python since versions 2.6.0 and 3.0.0;
- absolute_import is part of Python since versions 2.5.0 and 3.0.0;
- division is part of Python since versions 2.2.0 and 3.0.0;
Get rid of those unnecessary imports to slightly clean up the codebase.
[1] https://github.com/python/cpython/blob/master/Lib/__future__.py
Diffstat (limited to 'gnuradio-runtime/python')
37 files changed, 0 insertions, 59 deletions
diff --git a/gnuradio-runtime/python/gnuradio/__init__.py b/gnuradio-runtime/python/gnuradio/__init__.py index 28a493fa6b..ab3bbdbf19 100644 --- a/gnuradio-runtime/python/gnuradio/__init__.py +++ b/gnuradio-runtime/python/gnuradio/__init__.py @@ -7,7 +7,6 @@ While not primarily a simulation tool, GNU Radio does support development of sig GNU Radio is licensed under the GNU General Public License (GPL) version 3. All of the code is copyright of the Free Software Foundation. """ -from __future__ import unicode_literals # This file makes gnuradio a package # The docstring will be associated with the top level of the package. diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py b/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py index 2b98446ac9..e1fbf97337 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/GNURadioControlPortClient.py @@ -16,8 +16,6 @@ Remote Procedure Call (RPC) transports, the Apache Thrift middle-ware RPC is currently the only supported transport. """ -from __future__ import print_function -from __future__ import unicode_literals from gnuradio.ctrlport.RPCConnection import RPCMethods try: diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py index 5acd55ae6b..4afd1bd144 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py @@ -8,8 +8,6 @@ # # -from __future__ import print_function -from __future__ import unicode_literals from gnuradio import gr from gnuradio import blocks diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py b/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py index 707c2f8b1c..cfc8ce0734 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnection.py @@ -16,7 +16,6 @@ Args: options: result of command argument parsing (optparse.Values) """ -from __future__ import unicode_literals RPCMethods = {'thrift': 'Apache Thrift', #'ice': 'Zeroc ICE' diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnectionThrift.py b/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnectionThrift.py index 0cfe4aa793..dd9044a36c 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnectionThrift.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/RPCConnectionThrift.py @@ -8,7 +8,6 @@ # # -from __future__ import unicode_literals from thrift import Thrift from thrift.transport import TSocket from thrift.transport import TTransport diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py index 95a86575b9..5016fae9de 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals # # Copyright 2012 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx index 98ca42a2d9..3c807755db 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx @@ -8,8 +8,6 @@ # # -from __future__ import print_function - from argparse import ArgumentParser import sys, time, re, signal diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py index 60abb1e1f3..1310d9a28b 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py @@ -8,8 +8,6 @@ # # -from __future__ import print_function -from __future__ import unicode_literals import sys, subprocess, re, signal, time, atexit, os from gnuradio import gr diff --git a/gnuradio-runtime/python/gnuradio/eng_arg.py b/gnuradio-runtime/python/gnuradio/eng_arg.py index a2e127df80..cefc16e222 100644 --- a/gnuradio-runtime/python/gnuradio/eng_arg.py +++ b/gnuradio-runtime/python/gnuradio/eng_arg.py @@ -10,7 +10,6 @@ ''' Add support for engineering notation to argparse.ArgumentParser ''' -from __future__ import unicode_literals import argparse from gnuradio import eng_notation diff --git a/gnuradio-runtime/python/gnuradio/eng_notation.py b/gnuradio-runtime/python/gnuradio/eng_notation.py index 9a3fc11807..951f79862a 100644 --- a/gnuradio-runtime/python/gnuradio/eng_notation.py +++ b/gnuradio-runtime/python/gnuradio/eng_notation.py @@ -9,7 +9,6 @@ """ Display numbers as strings using engineering notation. """ -from __future__ import unicode_literals import six diff --git a/gnuradio-runtime/python/gnuradio/eng_option.py b/gnuradio-runtime/python/gnuradio/eng_option.py index 59bec54ee4..5e7043ecd9 100644 --- a/gnuradio-runtime/python/gnuradio/eng_option.py +++ b/gnuradio-runtime/python/gnuradio/eng_option.py @@ -8,8 +8,6 @@ # '''Add support for engineering notation to optparse.OptionParser''' -from __future__ import absolute_import -from __future__ import unicode_literals from copy import copy from optparse import Option, OptionValueError diff --git a/gnuradio-runtime/python/gnuradio/gr/__init__.py b/gnuradio-runtime/python/gnuradio/gr/__init__.py index 2217907222..747de108e2 100644 --- a/gnuradio-runtime/python/gnuradio/gr/__init__.py +++ b/gnuradio-runtime/python/gnuradio/gr/__init__.py @@ -12,8 +12,6 @@ """ Core contents. """ -from __future__ import absolute_import -from __future__ import unicode_literals # This is the main GNU Radio python module. # We pull the pybind output and the other modules into the gnuradio.gr namespace diff --git a/gnuradio-runtime/python/gnuradio/gr/exceptions.py b/gnuradio-runtime/python/gnuradio/gr/exceptions.py index a9588d73e7..5dec4a6301 100644 --- a/gnuradio-runtime/python/gnuradio/gr/exceptions.py +++ b/gnuradio-runtime/python/gnuradio/gr/exceptions.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # # Copyright 2004 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/gnuradio/gr/gateway.py b/gnuradio-runtime/python/gnuradio/gr/gateway.py index 615027b833..3be5e64eeb 100644 --- a/gnuradio-runtime/python/gnuradio/gr/gateway.py +++ b/gnuradio-runtime/python/gnuradio/gr/gateway.py @@ -7,8 +7,6 @@ # # -from __future__ import print_function -from __future__ import unicode_literals import numpy diff --git a/gnuradio-runtime/python/gnuradio/gr/hier_block2.py b/gnuradio-runtime/python/gnuradio/gr/hier_block2.py index ead607ba8a..79bdd5abfc 100644 --- a/gnuradio-runtime/python/gnuradio/gr/hier_block2.py +++ b/gnuradio-runtime/python/gnuradio/gr/hier_block2.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # # Copyright 2006,2007,2014 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/gnuradio/gr/packet_utils.py b/gnuradio-runtime/python/gnuradio/gr/packet_utils.py index 780e0460d1..fd7d424480 100644 --- a/gnuradio-runtime/python/gnuradio/gr/packet_utils.py +++ b/gnuradio-runtime/python/gnuradio/gr/packet_utils.py @@ -8,9 +8,6 @@ # # -from __future__ import print_function -from __future__ import division -from __future__ import unicode_literals from gnuradio import gr import pmt diff --git a/gnuradio-runtime/python/gnuradio/gr/pubsub.py b/gnuradio-runtime/python/gnuradio/gr/pubsub.py index fee527b39a..11f53d5597 100644 --- a/gnuradio-runtime/python/gnuradio/gr/pubsub.py +++ b/gnuradio-runtime/python/gnuradio/gr/pubsub.py @@ -14,8 +14,6 @@ Abstract GNU Radio publisher/subscriber interface This is a proof of concept implementation, will likely change significantly. """ -from __future__ import print_function -from __future__ import unicode_literals class pubsub(dict): def __init__(self): diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py b/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py index 79479c1b18..fcda8f7b53 100644 --- a/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py +++ b/gnuradio-runtime/python/gnuradio/gr/qa_prefs.py @@ -8,7 +8,6 @@ # # -from __future__ import print_function from gnuradio import gr, gr_unittest diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py index ae8237bc9c..d797f2d2ad 100644 --- a/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py +++ b/gnuradio-runtime/python/gnuradio/gr/qa_tag_utils.py @@ -8,7 +8,6 @@ # # -from __future__ import print_function from gnuradio import gr, gr_unittest diff --git a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py index 26fd62b864..9885d08cc4 100644 --- a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py +++ b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import pmt from . import gr_python as gr diff --git a/gnuradio-runtime/python/gnuradio/gr/top_block.py b/gnuradio-runtime/python/gnuradio/gr/top_block.py index 9523e4e91d..1389e5968a 100644 --- a/gnuradio-runtime/python/gnuradio/gr/top_block.py +++ b/gnuradio-runtime/python/gnuradio/gr/top_block.py @@ -7,8 +7,6 @@ # # -from __future__ import absolute_import -from __future__ import unicode_literals from .gr_python import (top_block_pb, top_block_wait_unlocked, top_block_run_unlocked, diff --git a/gnuradio-runtime/python/gnuradio/gr_unittest.py b/gnuradio-runtime/python/gnuradio/gr_unittest.py index e67d040fd5..f82355338e 100644 --- a/gnuradio-runtime/python/gnuradio/gr_unittest.py +++ b/gnuradio-runtime/python/gnuradio/gr_unittest.py @@ -10,9 +10,6 @@ """ GNU radio specific extension of unittest. """ -from __future__ import absolute_import -from __future__ import unicode_literals -from __future__ import division import unittest diff --git a/gnuradio-runtime/python/gnuradio/gru/__init__.py b/gnuradio-runtime/python/gnuradio/gru/__init__.py index 0948edb17f..d3418526a7 100644 --- a/gnuradio-runtime/python/gnuradio/gru/__init__.py +++ b/gnuradio-runtime/python/gnuradio/gru/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals # make this a package # Import gru stuff diff --git a/gnuradio-runtime/python/gnuradio/gru/daemon.py b/gnuradio-runtime/python/gnuradio/gru/daemon.py index 3c13cfef81..b4c927dfe4 100644 --- a/gnuradio-runtime/python/gnuradio/gru/daemon.py +++ b/gnuradio-runtime/python/gnuradio/gru/daemon.py @@ -7,8 +7,6 @@ # # -from __future__ import print_function -from __future__ import unicode_literals import os, sys, signal diff --git a/gnuradio-runtime/python/gnuradio/gru/freqz.py b/gnuradio-runtime/python/gnuradio/gru/freqz.py index 8ad5d8a422..0fc6c04561 100644 --- a/gnuradio-runtime/python/gnuradio/gru/freqz.py +++ b/gnuradio-runtime/python/gnuradio/gru/freqz.py @@ -40,8 +40,6 @@ # DAMAGE. # -from __future__ import division -from __future__ import unicode_literals __all__ = ['freqz'] import numpy diff --git a/gnuradio-runtime/python/gnuradio/gru/gnuplot_freqz.py b/gnuradio-runtime/python/gnuradio/gru/gnuplot_freqz.py index 791796fc61..cafb8fd2ef 100644 --- a/gnuradio-runtime/python/gnuradio/gru/gnuplot_freqz.py +++ b/gnuradio-runtime/python/gnuradio/gru/gnuplot_freqz.py @@ -8,8 +8,6 @@ # # -from __future__ import division -from __future__ import unicode_literals __all__ = ['gnuplot_freqz'] import tempfile diff --git a/gnuradio-runtime/python/gnuradio/gru/hexint.py b/gnuradio-runtime/python/gnuradio/gru/hexint.py index c1b46216f2..ad568b59a6 100644 --- a/gnuradio-runtime/python/gnuradio/gru/hexint.py +++ b/gnuradio-runtime/python/gnuradio/gru/hexint.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # # Copyright 2005 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/gnuradio/gru/listmisc.py b/gnuradio-runtime/python/gnuradio/gru/listmisc.py index b6380138e1..a504d3ba00 100644 --- a/gnuradio-runtime/python/gnuradio/gru/listmisc.py +++ b/gnuradio-runtime/python/gnuradio/gru/listmisc.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # # Copyright 2005 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/gnuradio/gru/mathmisc.py b/gnuradio-runtime/python/gnuradio/gru/mathmisc.py index d4619d4a28..2f6d97df31 100644 --- a/gnuradio-runtime/python/gnuradio/gru/mathmisc.py +++ b/gnuradio-runtime/python/gnuradio/gru/mathmisc.py @@ -1,5 +1,3 @@ -from __future__ import division -from __future__ import unicode_literals # # Copyright 2005 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py b/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py index 587e496bdd..31bebcf0df 100644 --- a/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py +++ b/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py @@ -28,7 +28,6 @@ To manually stop the runner, call stop() on the object. To determine if the runner has exited, call exited() on the object. """ -from __future__ import unicode_literals from gnuradio import gr import threading diff --git a/gnuradio-runtime/python/gnuradio/gru/os_read_exactly.py b/gnuradio-runtime/python/gnuradio/gru/os_read_exactly.py index 368b0f4d65..da04483388 100644 --- a/gnuradio-runtime/python/gnuradio/gru/os_read_exactly.py +++ b/gnuradio-runtime/python/gnuradio/gru/os_read_exactly.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # # Copyright 2005 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/gnuradio/gru/seq_with_cursor.py b/gnuradio-runtime/python/gnuradio/gru/seq_with_cursor.py index 82dd24b144..4d75e023ff 100644 --- a/gnuradio-runtime/python/gnuradio/gru/seq_with_cursor.py +++ b/gnuradio-runtime/python/gnuradio/gru/seq_with_cursor.py @@ -9,9 +9,6 @@ # misc utilities -from __future__ import absolute_import -from __future__ import division -from __future__ import unicode_literals import types diff --git a/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py index dc944f2e17..4408a13579 100644 --- a/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py +++ b/gnuradio-runtime/python/gnuradio/gru/socket_stuff.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # # Copyright 2005 Free Software Foundation, Inc. # diff --git a/gnuradio-runtime/python/pmt/__init__.py b/gnuradio-runtime/python/pmt/__init__.py index 9b3b6f5410..9b313330b0 100644 --- a/gnuradio-runtime/python/pmt/__init__.py +++ b/gnuradio-runtime/python/pmt/__init__.py @@ -27,8 +27,6 @@ bool, symbol (string), integer, real, complex, null, pair, list, vector, dict, uniform_vector, any (boost::any cast) ''' -from __future__ import absolute_import -from __future__ import unicode_literals import os diff --git a/gnuradio-runtime/python/pmt/pmt_to_python.py b/gnuradio-runtime/python/pmt/pmt_to_python.py index 425d68b6d1..b2777c7c4c 100644 --- a/gnuradio-runtime/python/pmt/pmt_to_python.py +++ b/gnuradio-runtime/python/pmt/pmt_to_python.py @@ -5,7 +5,6 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -from __future__ import unicode_literals from . import pmt_python as pmt import numpy diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py index b165c8cd1a..de5c08fbb8 100644 --- a/gnuradio-runtime/python/pmt/qa_pmt.py +++ b/gnuradio-runtime/python/pmt/qa_pmt.py @@ -8,7 +8,6 @@ # # -from __future__ import print_function import unittest import pmt diff --git a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py index 1885870f20..3fed489d8c 100644 --- a/gnuradio-runtime/python/pmt/qa_pmt_to_python.py +++ b/gnuradio-runtime/python/pmt/qa_pmt_to_python.py @@ -8,7 +8,6 @@ # # -from __future__ import absolute_import import unittest |