diff options
| -rwxr-xr-x | Lib/test/support/smtpd.py (renamed from Lib/test/smtpd.py) | 0 | ||||
| -rw-r--r-- | Lib/test/test_logging.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_smtplib.py | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Lib/test/smtpd.py b/Lib/test/support/smtpd.py index 6052232..6052232 100755 --- a/Lib/test/smtpd.py +++ b/Lib/test/support/smtpd.py diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 635dd7c..d1ec2d6 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -49,6 +49,7 @@ from test.support import socket_helper from test.support import threading_helper from test.support import warnings_helper from test.support import asyncore +from test.support import smtpd from test.support.logging_helper import TestHandler import textwrap import threading @@ -63,9 +64,6 @@ from urllib.parse import urlparse, parse_qs from socketserver import (ThreadingUDPServer, DatagramRequestHandler, ThreadingTCPServer, StreamRequestHandler) -with warnings.catch_warnings(): - from . import smtpd - try: import win32evtlog, win32evtlogutil, pywintypes except ImportError: diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py index b6d5b8c..4d8e143 100644 --- a/Lib/test/test_smtplib.py +++ b/Lib/test/test_smtplib.py @@ -22,10 +22,9 @@ from test.support import hashlib_helper from test.support import socket_helper from test.support import threading_helper from test.support import asyncore +from test.support import smtpd from unittest.mock import Mock -from . import smtpd - support.requires_working_socket(module=True) |