Skip to content

gh-93243: Make smtpd private before porting its users #93246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 19 commits into from
Aug 6, 2022
Merged

gh-93243: Make smtpd private before porting its users #93246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
021e85c
gh-93243: Make smtpd private to port its users
arhadthedev May 26, 2022
ed21b2b
Merge branch 'main' into privatize-smtpd
arhadthedev Jun 4, 2022
18a5615
Move smtpd to its only user for further porting to asyncio
arhadthedev Jun 4, 2022
6f2c565
Point test_logging to the new smtpd location too
arhadthedev Jun 4, 2022
f5aee16
Remove smptd from standalone module lists
arhadthedev Jun 4, 2022
c7cb1e3
Update Doc/whatsnew/3.12.rst
arhadthedev Jun 4, 2022
8180429
Update Doc/whatsnew/3.12.rst
arhadthedev Jun 4, 2022
b70bf5a
Address the review of AA-Turner (using suggestion batching)
arhadthedev Jun 4, 2022
4054ac2
Remove non-working :mod:
arhadthedev Jun 4, 2022
eb6ad56
Update Doc/whatsnew/3.12.rst
arhadthedev Jun 4, 2022
133735a
Address @brettcannon's review
arhadthedev Jun 8, 2022
38fd57b
Merge branch 'main' into privatize-smtpd
arhadthedev Jun 23, 2022
1f839b9
Merge branch 'main' into privatize-smtpd
arhadthedev Jun 24, 2022
d8f4b0c
Merge remote-tracking branch 'gold/main' into privatize-smtpd
arhadthedev Jul 5, 2022
0bc83a6
Merge branch 'main' into privatize-smtpd
arhadthedev Jul 23, 2022
7423617
Merge branch 'main' into privatize-smtpd
arhadthedev Aug 4, 2022
815cb7c
Address the Barry's review
arhadthedev Aug 4, 2022
e351af3
Update 3.12.rst
warsaw Aug 4, 2022
1d157ec
Update 3.12.rst
warsaw Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address @brettcannon's review
  • Loading branch information
@arhadthedev
arhadthedev committed Jun 8, 2022
commit 133735a71e26885c05c32a44c0fd94de1171684e
17 changes: 4 additions & 13 deletions Lib/test/smtpd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,16 @@
import time
import socket
import collections
from warnings import _deprecated, warn
from test.support.import_helper import import_module
from warnings import warn
from email._header_value_parser import get_addr_spec, get_angle_addr

__all__ = [
"SMTPChannel", "SMTPServer", "DebuggingServer", "PureProxy",
]

_DEPRECATION_MSG = ('The {name} module is deprecated and unmaintained and will '
'be removed in Python {remove}. Please see aiosmtpd '
'(https://aiosmtpd.readthedocs.io/) for the recommended '
'replacement.')
_deprecated(__name__, _DEPRECATION_MSG, remove=(3, 12))


# These are imported after the above warning so that users get the correct
# deprecation warning.
import asyncore
import asynchat

asyncore = import_module('asyncore', deprecated=True)
asynchat = import_module('asynchat', deprecated=True)

program = sys.argv[0]
__version__ = 'Python SMTP proxy version 0.3'
Expand Down
4 changes: 1 addition & 3 deletions Lib/test/test_smtplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
from test.support import warnings_helper
from unittest.mock import Mock

from warnings import catch_warnings
with catch_warnings():
from . import smtpd
from . import smtpd

asyncore = warnings_helper.import_deprecated('asyncore')

Expand Down