From: Nikita Sobolev <mail@sobolevn.me>
Date: Mon, 22 Jan 2024 13:36:29 +0000 (+0300)
Subject: gh-108303: Move `smtpd` to `test.support` (#114368)
X-Git-Tag: v3.13.0a4~387
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f5e7d739f56a75022dfe8fa24675b6c7b321ab5;p=thirdparty%2FPython%2Fcpython.git

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

Update test_logging.py and test_smtplib.py.
---

diff --git a/Lib/test/smtpd.py b/Lib/test/support/smtpd.py
similarity index 100%
rename from Lib/test/smtpd.py
rename to Lib/test/support/smtpd.py
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 0be269811842..908e242b85f5 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 f2e02dab1c3c..4c9fc14bd43f 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)