From 58fdd15d5a70b0274ed5d4fc491700138aa51cdf Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:08:31 +0100 Subject: [PATCH] [3.12] gh-108303: Move `smtpd` to `test.support` (GH-114368) (#114427) gh-108303: Move `smtpd` to `test.support` (GH-114368) Update test_logging.py and test_smtplib.py. (cherry picked from commit 8f5e7d739f56a75022dfe8fa24675b6c7b321ab5) Co-authored-by: Nikita Sobolev --- Lib/test/{ => support}/smtpd.py | 0 Lib/test/test_logging.py | 4 +--- Lib/test/test_smtplib.py | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) rename Lib/test/{ => support}/smtpd.py (100%) 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 635dd7c26f6e..d1ec2d6cf7a7 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 b6d5b8c3d825..4d8e1438deb0 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) -- 2.47.3