From 5f3f26c500dd4d12b46e9a1543e16286176f3ccf Mon Sep 17 00:00:00 2001 From: Alexander Lyabah Date: Sat, 17 Feb 2024 13:15:55 +0000 Subject: [PATCH 1/2] ModuleNotFoundError: No module named 'imp' #232 --- Exscript/logger.py | 7 +++++-- Exscript/protocols/dummy.py | 7 +++++-- Exscript/protocols/protocol.py | 7 +++++-- Exscript/protocols/telnet.py | 7 +++++-- Exscript/protocols/telnetlib.py | 7 +++++-- Exscript/servers/httpd.py | 7 +++++-- Exscript/util/collections.py | 7 +++++-- Exscript/util/file.py | 7 +++++-- Exscript/util/interact.py | 7 +++++-- Exscript/util/url.py | 7 +++++-- tests/Exscript/protocols/ProtocolTest.py | 7 +++++-- tests/Exscript/workqueue/JobTest.py | 8 ++++++-- tests/Exscript/workqueue/PipelineTest.py | 7 +++++-- 13 files changed, 66 insertions(+), 26 deletions(-) diff --git a/Exscript/logger.py b/Exscript/logger.py index e917f716..dd5a6fec 100644 --- a/Exscript/logger.py +++ b/Exscript/logger.py @@ -24,8 +24,11 @@ Logging to memory. """ from __future__ import print_function, absolute_import, unicode_literals -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass 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..24e20780 100644 --- a/Exscript/protocols/dummy.py +++ b/Exscript/protocols/dummy.py @@ -24,8 +24,11 @@ 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() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass 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..d86ec1ad 100644 --- a/Exscript/protocols/protocol.py +++ b/Exscript/protocols/protocol.py @@ -24,8 +24,11 @@ An abstract base class for all protocols. """ from __future__ import absolute_import, unicode_literals -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass from builtins import object import re import sys diff --git a/Exscript/protocols/telnet.py b/Exscript/protocols/telnet.py index 298adaea..36d71d49 100644 --- a/Exscript/protocols/telnet.py +++ b/Exscript/protocols/telnet.py @@ -24,8 +24,11 @@ The Telnet protocol. """ from __future__ import absolute_import, unicode_literals -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass 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..90acb1ee 100644 --- a/Exscript/protocols/telnetlib.py +++ b/Exscript/protocols/telnetlib.py @@ -57,8 +57,11 @@ """ from __future__ import print_function -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass 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..1c17abee 100644 --- a/Exscript/servers/httpd.py +++ b/Exscript/servers/httpd.py @@ -24,8 +24,11 @@ A threaded HTTP server with support for HTTP/Digest authentication. """ from __future__ import print_function -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass 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..81458aad 100644 --- a/Exscript/util/collections.py +++ b/Exscript/util/collections.py @@ -1,6 +1,9 @@ from __future__ import unicode_literals, absolute_import -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass 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..01b1c5fb 100644 --- a/Exscript/util/file.py +++ b/Exscript/util/file.py @@ -25,8 +25,11 @@ """ from __future__ import print_function, absolute_import from builtins import str -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass import sys import re import os diff --git a/Exscript/util/interact.py b/Exscript/util/interact.py index f13fba49..6e9c3cd0 100644 --- a/Exscript/util/interact.py +++ b/Exscript/util/interact.py @@ -24,8 +24,11 @@ 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() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass 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..01d5ba35 100644 --- a/Exscript/util/url.py +++ b/Exscript/util/url.py @@ -24,8 +24,11 @@ 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() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass from builtins import str from builtins import chr from builtins import range diff --git a/tests/Exscript/protocols/ProtocolTest.py b/tests/Exscript/protocols/ProtocolTest.py index c20445d1..e7714471 100644 --- a/tests/Exscript/protocols/ProtocolTest.py +++ b/tests/Exscript/protocols/ProtocolTest.py @@ -1,5 +1,8 @@ -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass from builtins import str import sys import unittest diff --git a/tests/Exscript/workqueue/JobTest.py b/tests/Exscript/workqueue/JobTest.py index ea39ebcf..54f1a87f 100644 --- a/tests/Exscript/workqueue/JobTest.py +++ b/tests/Exscript/workqueue/JobTest.py @@ -1,5 +1,9 @@ -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass +except Module import sys import unittest import re diff --git a/tests/Exscript/workqueue/PipelineTest.py b/tests/Exscript/workqueue/PipelineTest.py index 534467d8..e030bc30 100644 --- a/tests/Exscript/workqueue/PipelineTest.py +++ b/tests/Exscript/workqueue/PipelineTest.py @@ -1,5 +1,8 @@ -from future import standard_library -standard_library.install_aliases() +try: + from future import standard_library + standard_library.install_aliases() +except ModuleNotFoundError: + pass from builtins import next import sys import unittest From 678ec256d0b4922c8bfce3c686d5153c1869a101 Mon Sep 17 00:00:00 2001 From: Alexander Lyabah Date: Sun, 18 Feb 2024 10:40:03 +0000 Subject: [PATCH 2/2] fix typo --- Exscript/protocols/drivers/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Exscript/protocols/drivers/driver.py b/Exscript/protocols/drivers/driver.py index 2005d9f4..66104681 100644 --- a/Exscript/protocols/drivers/driver.py +++ b/Exscript/protocols/drivers/driver.py @@ -49,7 +49,7 @@ + _any_path + r'?' + r'[: ]?' + _any_path + r'?' - + r'(?:\(' + _filename + '\))?' + + r'(?:\(' + _filename + r'\))?' + r'[\]\-]?' + r'[#>%\$\]] ?' + _unprintable + r'*'