gh-108303: Move `smtpd` to `test.support` (#114368)

Update test_logging.py and test_smtplib.py.
This commit is contained in:
Nikita Sobolev 2024-01-22 16:36:29 +03:00 committed by GitHub
parent c8351a617b
commit 8f5e7d739f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 5 deletions

View File

@ -49,6 +49,7 @@ from test.support import socket_helper
from test.support import threading_helper from test.support import threading_helper
from test.support import warnings_helper from test.support import warnings_helper
from test.support import asyncore from test.support import asyncore
from test.support import smtpd
from test.support.logging_helper import TestHandler from test.support.logging_helper import TestHandler
import textwrap import textwrap
import threading import threading
@ -63,9 +64,6 @@ from urllib.parse import urlparse, parse_qs
from socketserver import (ThreadingUDPServer, DatagramRequestHandler, from socketserver import (ThreadingUDPServer, DatagramRequestHandler,
ThreadingTCPServer, StreamRequestHandler) ThreadingTCPServer, StreamRequestHandler)
with warnings.catch_warnings():
from . import smtpd
try: try:
import win32evtlog, win32evtlogutil, pywintypes import win32evtlog, win32evtlogutil, pywintypes
except ImportError: except ImportError:

View File

@ -22,10 +22,9 @@ from test.support import hashlib_helper
from test.support import socket_helper from test.support import socket_helper
from test.support import threading_helper from test.support import threading_helper
from test.support import asyncore from test.support import asyncore
from test.support import smtpd
from unittest.mock import Mock from unittest.mock import Mock
from . import smtpd
support.requires_working_socket(module=True) support.requires_working_socket(module=True)