From: Brett Cannon <brett@python.org>
Date: Fri, 15 Apr 2022 19:32:56 +0000 (-0700)
Subject: gh-91217: deprecate nntplib (GH-91543)
X-Git-Tag: v3.11.0b1~355
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9e231de8551ab6d06c92dfa95033150e52d7f1f;p=thirdparty%2FPython%2Fcpython.git

gh-91217: deprecate nntplib (GH-91543)
---

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index ca76efc96371..b5b2a7648c55 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -875,6 +875,7 @@ Deprecated
   * :mod:`crypt`
   * :mod:`imghdr`
   * :mod:`msilib`
+  * :mod:`nntplib`
 
   (Contributed by Brett Cannon in :issue:`47061`.)
 
diff --git a/Lib/nntplib.py b/Lib/nntplib.py
index f6e746e7c95c..dddea059982b 100644
--- a/Lib/nntplib.py
+++ b/Lib/nntplib.py
@@ -68,6 +68,7 @@ import socket
 import collections
 import datetime
 import sys
+import warnings
 
 try:
     import ssl
@@ -85,6 +86,8 @@ __all__ = ["NNTP",
            "decode_header",
            ]
 
+warnings._deprecated(__name__, remove=(3, 13))
+
 # maximal line length when calling readline(). This is to prevent
 # reading arbitrary length lines. RFC 3977 limits NNTP line length to
 # 512 characters, including CRLF. We have selected 2048 just to be on
diff --git a/Lib/test/support/socket_helper.py b/Lib/test/support/socket_helper.py
index 0ee7a5d69a1b..754af181ec92 100644
--- a/Lib/test/support/socket_helper.py
+++ b/Lib/test/support/socket_helper.py
@@ -5,7 +5,7 @@ import unittest
 import sys
 
 from .. import support
-
+from . import warnings_helper
 
 HOST = "localhost"
 HOSTv4 = "127.0.0.1"
@@ -190,7 +190,7 @@ _NOT_SET = object()
 def transient_internet(resource_name, *, timeout=_NOT_SET, errnos=()):
     """Return a context manager that raises ResourceDenied when various issues
     with the internet connection manifest themselves as exceptions."""
-    import nntplib
+    nntplib = warnings_helper.import_deprecated("nntplib")
     import urllib.error
     if timeout is _NOT_SET:
         timeout = support.INTERNET_TIMEOUT
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 4f0592188f84..9812c0551935 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -5,13 +5,13 @@ import textwrap
 import unittest
 import functools
 import contextlib
-import nntplib
 import os.path
 import re
 import threading
 
 from test import support
-from test.support import socket_helper
+from test.support import socket_helper, warnings_helper
+nntplib = warnings_helper.import_deprecated("nntplib")
 from nntplib import NNTP, GroupInfo
 from unittest.mock import patch
 try:
diff --git a/Misc/NEWS.d/next/Library/2022-04-12-20-19-10.gh-issue-91217.acd4h9.rst b/Misc/NEWS.d/next/Library/2022-04-12-20-19-10.gh-issue-91217.acd4h9.rst
new file mode 100644
index 000000000000..4a74b9d08514
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-04-12-20-19-10.gh-issue-91217.acd4h9.rst
@@ -0,0 +1 @@
+Deprecate nntplib.