diff --git a/Exscript/logger.py b/Exscript/logger.py index e917f716..ca004dc6 100644 --- a/Exscript/logger.py +++ b/Exscript/logger.py @@ -24,8 +24,6 @@ Logging to memory. """ from __future__ import print_function, absolute_import, unicode_literals -from future import standard_library -standard_library.install_aliases() from builtins import filter from builtins import str from builtins import object diff --git a/Exscript/protocols/dummy.py b/Exscript/protocols/dummy.py index dfda0c28..70bef498 100644 --- a/Exscript/protocols/dummy.py +++ b/Exscript/protocols/dummy.py @@ -24,8 +24,6 @@ A client that talks to a :class:`Exscript.emulators.VirtualDevice`. """ from __future__ import absolute_import, unicode_literals -from future import standard_library -standard_library.install_aliases() from builtins import str from ..emulators import VirtualDevice from .protocol import Protocol diff --git a/Exscript/protocols/protocol.py b/Exscript/protocols/protocol.py index e4de3da1..b3a23eae 100644 --- a/Exscript/protocols/protocol.py +++ b/Exscript/protocols/protocol.py @@ -24,8 +24,6 @@ An abstract base class for all protocols. """ from __future__ import absolute_import, unicode_literals -from future import standard_library -standard_library.install_aliases() from builtins import object import re import sys diff --git a/Exscript/protocols/telnet.py b/Exscript/protocols/telnet.py index 298adaea..7a162c04 100644 --- a/Exscript/protocols/telnet.py +++ b/Exscript/protocols/telnet.py @@ -24,8 +24,6 @@ The Telnet protocol. """ from __future__ import absolute_import, unicode_literals -from future import standard_library -standard_library.install_aliases() from ..util.tty import get_terminal_size from . import telnetlib from .protocol import Protocol diff --git a/Exscript/protocols/telnetlib.py b/Exscript/protocols/telnetlib.py index 63301a11..59e06065 100644 --- a/Exscript/protocols/telnetlib.py +++ b/Exscript/protocols/telnetlib.py @@ -57,8 +57,6 @@ """ from __future__ import print_function -from future import standard_library -standard_library.install_aliases() from builtins import chr from builtins import bytes from builtins import range diff --git a/Exscript/servers/httpd.py b/Exscript/servers/httpd.py index b7f10e0c..57740655 100644 --- a/Exscript/servers/httpd.py +++ b/Exscript/servers/httpd.py @@ -24,8 +24,6 @@ A threaded HTTP server with support for HTTP/Digest authentication. """ from __future__ import print_function -from future import standard_library -standard_library.install_aliases() import sys import time import urllib.request, urllib.parse, urllib.error diff --git a/Exscript/util/collections.py b/Exscript/util/collections.py index fbf37982..4083a0e2 100644 --- a/Exscript/util/collections.py +++ b/Exscript/util/collections.py @@ -1,6 +1,4 @@ from __future__ import unicode_literals, absolute_import -from future import standard_library -standard_library.install_aliases() from builtins import str from builtins import chr from builtins import range diff --git a/Exscript/util/file.py b/Exscript/util/file.py index f7db3a39..adb5964c 100644 --- a/Exscript/util/file.py +++ b/Exscript/util/file.py @@ -25,8 +25,6 @@ """ from __future__ import print_function, absolute_import from builtins import str -from future import standard_library -standard_library.install_aliases() import sys import re import os diff --git a/Exscript/util/interact.py b/Exscript/util/interact.py index f13fba49..96ede12e 100644 --- a/Exscript/util/interact.py +++ b/Exscript/util/interact.py @@ -24,8 +24,6 @@ Tools for interacting with the user on the command line. """ from __future__ import print_function, absolute_import -from future import standard_library -standard_library.install_aliases() from builtins import input from builtins import str from builtins import object diff --git a/Exscript/util/url.py b/Exscript/util/url.py index 5074ea04..cca25e2d 100644 --- a/Exscript/util/url.py +++ b/Exscript/util/url.py @@ -24,8 +24,6 @@ Working with URLs (as used in URL formatted hostnames). """ from __future__ import unicode_literals, absolute_import -from future import standard_library -standard_library.install_aliases() from builtins import str from builtins import chr from builtins import range diff --git a/requirements.txt b/requirements.txt index 04239758..62539913 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -future configparser pycryptodomex paramiko>=1.17 diff --git a/setup.py b/setup.py index ff20fe19..424e4982 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ package_data = {}, packages = find_packages(), scripts = ['scripts/exscript', 'scripts/otp'], - install_requires = ['future', 'configparser', 'paramiko', 'pycryptodomex'], + install_requires = ['configparser', 'paramiko', 'pycryptodomex'], extras_require = {}, keywords = ' '.join(['exscript', 'telnet', diff --git a/tests/Exscript/protocols/ProtocolTest.py b/tests/Exscript/protocols/ProtocolTest.py index c20445d1..fd7239f6 100644 --- a/tests/Exscript/protocols/ProtocolTest.py +++ b/tests/Exscript/protocols/ProtocolTest.py @@ -1,5 +1,3 @@ -from future import standard_library -standard_library.install_aliases() from builtins import str import sys import unittest diff --git a/tests/Exscript/workqueue/JobTest.py b/tests/Exscript/workqueue/JobTest.py index ea39ebcf..5fdc952f 100644 --- a/tests/Exscript/workqueue/JobTest.py +++ b/tests/Exscript/workqueue/JobTest.py @@ -1,5 +1,3 @@ -from future import standard_library -standard_library.install_aliases() import sys import unittest import re diff --git a/tests/Exscript/workqueue/PipelineTest.py b/tests/Exscript/workqueue/PipelineTest.py index 534467d8..ac5d3760 100644 --- a/tests/Exscript/workqueue/PipelineTest.py +++ b/tests/Exscript/workqueue/PipelineTest.py @@ -1,5 +1,3 @@ -from future import standard_library -standard_library.install_aliases() from builtins import next import sys import unittest diff --git a/tox.ini b/tox.ini index 3a68f4a2..65910f63 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,6 @@ envlist = py27, py34 changedir = tests/Exscript commands = {envpython} ./run_suite.py 1 deps = - future configparser paramiko pycrypto