mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.12] gh-108303: Move smtpd to test.support (GH-114368) (#114427)

Browse source 
gh-108303: Move `smtpd` to `test.support` (GH-114368)

Update test_logging.py and test_smtplib.py.
(cherry picked from commit 8f5e7d739f)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
This commit is contained in:
Miss Islington (bot) 2024-01-22 15:08:31 +01:00 • committed by GitHub
parent 7da1750225
commit 58fdd15d5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Lib/test/smtpd.py → Lib/test/support/smtpd.py
View file

4
Lib/test/test_logging.py
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:

3
Lib/test/test_smtplib.py
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)