bpo-40275: Avoid importing socket in test.support (GH-19603)
* Move socket related functions from test.support to socket_helper.
* Import socket, nntplib and urllib.error lazily in transient_internet().
* Remove importing multiprocess.
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 91aa771..7645666 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -1,4 +1,5 @@
from test import support
+from test.support import socket_helper
from contextlib import contextmanager
import imaplib
@@ -82,7 +83,7 @@
pass
# This is the exception that should be raised.
- expected_errnos = support.get_socket_conn_refused_errs()
+ expected_errnos = socket_helper.get_socket_conn_refused_errs()
with self.assertRaises(OSError) as cm:
imaplib.IMAP4()
self.assertIn(cm.exception.errno, expected_errnos)
@@ -210,7 +211,7 @@
raise
self.addCleanup(self._cleanup)
- self.server = self.server_class((support.HOST, 0), imap_handler)
+ self.server = self.server_class((socket_helper.HOST, 0), imap_handler)
self.thread = threading.Thread(
name=self._testMethodName+'-server',
target=self.server.serve_forever,
@@ -600,7 +601,7 @@
@contextmanager
def reaped_server(self, hdlr):
- server, thread = self.make_server((support.HOST, 0), hdlr)
+ server, thread = self.make_server((socket_helper.HOST, 0), hdlr)
try:
yield server
finally: