From b47bcfd36a753d330be0a9f4202b68dd3a549fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?= Date: Mon, 14 Aug 2023 11:43:50 +0200 Subject: [PATCH 1/2] Remove future from dependencies --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e9ff894..8fccbbb 100755 --- a/setup.py +++ b/setup.py @@ -53,5 +53,5 @@ }, include_package_data=True, package_data={'textfsm': ['../testdata/*']}, - install_requires=['six', 'future'], + install_requires=['six'], ) From 9787713eadb3a8df576d772be4a9a88f3b6ac601 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 18 Dec 2023 12:21:41 +0100 Subject: [PATCH 2/2] Remove imports from __future__ --- tests/clitable_test.py | 5 ----- tests/copyable_regex_object_test.py | 5 ----- tests/terminal_test.py | 5 ----- tests/textfsm_test.py | 4 ---- tests/texttable_test.py | 5 ----- textfsm/clitable.py | 4 ---- textfsm/parser.py | 5 ----- textfsm/terminal.py | 5 ----- textfsm/texttable.py | 5 ----- 9 files changed, 43 deletions(-) diff --git a/tests/clitable_test.py b/tests/clitable_test.py index 1190b71..5b9effc 100755 --- a/tests/clitable_test.py +++ b/tests/clitable_test.py @@ -16,11 +16,6 @@ """Unittest for clitable script.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import copy import os import re diff --git a/tests/copyable_regex_object_test.py b/tests/copyable_regex_object_test.py index 33860a1..7135d20 100755 --- a/tests/copyable_regex_object_test.py +++ b/tests/copyable_regex_object_test.py @@ -16,11 +16,6 @@ """Tests for copyable_regex_object.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import copy import unittest diff --git a/tests/terminal_test.py b/tests/terminal_test.py index d9162a3..f7becb4 100755 --- a/tests/terminal_test.py +++ b/tests/terminal_test.py @@ -17,11 +17,6 @@ """Unittest for terminal module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from builtins import range from builtins import object import sys diff --git a/tests/textfsm_test.py b/tests/textfsm_test.py index 39e9b50..0ccf152 100755 --- a/tests/textfsm_test.py +++ b/tests/textfsm_test.py @@ -16,10 +16,6 @@ # permissions and limitations under the License. """Unittest for textfsm module.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from builtins import str import unittest diff --git a/tests/texttable_test.py b/tests/texttable_test.py index 57ae384..3d63f1b 100755 --- a/tests/texttable_test.py +++ b/tests/texttable_test.py @@ -16,11 +16,6 @@ """Unittest for text table.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from builtins import range import unittest from io import StringIO diff --git a/textfsm/clitable.py b/textfsm/clitable.py index 3ad1ee2..731b6af 100755 --- a/textfsm/clitable.py +++ b/textfsm/clitable.py @@ -24,10 +24,6 @@ Is the glue between an automated command scraping program (such as RANCID) and the TextFSM output parser. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import copy import os diff --git a/textfsm/parser.py b/textfsm/parser.py index 46c5404..9422dbf 100755 --- a/textfsm/parser.py +++ b/textfsm/parser.py @@ -24,11 +24,6 @@ parse a specific type of text input, returning a record of values for each input entity. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import getopt import inspect diff --git a/textfsm/terminal.py b/textfsm/terminal.py index 3bbb5f2..5ffa5e5 100755 --- a/textfsm/terminal.py +++ b/textfsm/terminal.py @@ -17,11 +17,6 @@ """Simple terminal related routines.""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - try: # Import fails on Windows machines. import fcntl diff --git a/textfsm/texttable.py b/textfsm/texttable.py index 1bce5cd..82340f1 100755 --- a/textfsm/texttable.py +++ b/textfsm/texttable.py @@ -23,11 +23,6 @@ formats such as CSV and variable sized and justified rows. """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import copy from functools import cmp_to_key import textwrap