Skip to content

Commit 8f5e7d7

Browse files
authored
gh-108303: Move smtpd to test.support (#114368)
Update test_logging.py and test_smtplib.py.
1 parent c8351a6 commit 8f5e7d7

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed
File renamed without changes.

Lib/test/test_logging.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
from test.support import threading_helper
5050
from test.support import warnings_helper
5151
from test.support import asyncore
52+
from test.support import smtpd
5253
from test.support.logging_helper import TestHandler
5354
import textwrap
5455
import threading
@@ -63,9 +64,6 @@
6364
from socketserver import (ThreadingUDPServer, DatagramRequestHandler,
6465
ThreadingTCPServer, StreamRequestHandler)
6566

66-
with warnings.catch_warnings():
67-
from . import smtpd
68-
6967
try:
7068
import win32evtlog, win32evtlogutil, pywintypes
7169
except ImportError:

Lib/test/test_smtplib.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
from test.support import socket_helper
2323
from test.support import threading_helper
2424
from test.support import asyncore
25+
from test.support import smtpd
2526
from unittest.mock import Mock
2627

27-
from . import smtpd
28-
2928

3029
support.requires_working_socket(module=True)
3130

0 commit comments

Comments
 (0)