gh-88427: Deprecate socket.SocketType

Doc/deprecations/pending-removal-in-3.16.rst

@@ -8,6 +8,10 @@ Pending Removal in Python 3.16
 * :mod:`builtins`:
   ``~bool``, bitwise inversion on bool.
 
+* :mod:`socket`:
+  :class:`socket.SocketType`: use :class:`socket.socket` type instead.
+  (Contributed by James Roy in :gh:`88427`.)
+
 * :mod:`symtable`:
   Deprecate :meth:`symtable.Class.get_methods` due to the lack of interest.
   (Contributed by Bénédikt Tran in :gh:`119698`.)

Doc/library/socket.rst

@@ -909,6 +909,9 @@ The following functions all create :ref:`socket objects <socket-objects>`.
    This is a Python type object that represents the socket object type. It is the
    same as ``type(socket(...))``.
 
+   .. deprecated:: next
+      Use :class:`socket.socket` type instead.
+
 
 Other functions
 '''''''''''''''

Lib/socket.py

@@ -67,6 +67,11 @@
            "has_dualstack_ipv6", "AddressFamily", "SocketKind"]
 __all__.extend(os._get_exports_list(_socket))
 
+def __getattr__(name):
+    if name == "SocketType":
+        return _socket.socket
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
 # Set up the socket.AF_* socket.SOCK_* constants as members of IntEnums for
 # nicer string representations.
 # Note that _socket only knows about the integer values. The public interface

Misc/NEWS.d/next/Library/2024-11-01-20-09-53.gh-issue-88427.chYNT6.rst

@@ -0,0 +1 @@
+:attr:`!socket.SocketType` is now deprecated and planned to be removed in Python 3.16. Use :class:`socket.socket` instead.

Modules/socketmodule.c

@@ -5574,6 +5574,29 @@ static PyType_Spec sock_spec = {
     .slots = sock_slots,
 };
 
+static PyObject *
+socket_getattr(PyObject *self, PyObject *name)
+{
+    PyObject *sock_type = PyType_FromSpec(&sock_spec);
+    if (sock_type == NULL) {
+        return NULL;
+    }
+    const char *attrname = PyUnicode_AsUTF8(name);
+    if (attrname == NULL) {
+        Py_DECREF(sock_type);
+        return NULL;
+    }
+
+    if (!strcmp(attrname, "SocketType")) {
+        PyErr_Warn(PyExc_DeprecationWarning, "_socket.SocketType is deprecated and will be removed in Python 3.16. "
+                                             "Use socket.socket instead");
+        return sock_type;
+    }
+
+    PyErr_Format(PyExc_AttributeError, "module _socket has no attribute '%s'", attrname);
+    Py_DECREF(sock_type);
+    return NULL;
+}
 
 #ifdef HAVE_GETHOSTNAME
 /* Python interface to gethostname(). */
@@ -7179,6 +7202,7 @@ range of values.");
 /* List of functions exported by this module. */
 
 static PyMethodDef socket_methods[] = {
+    {"__getattr__", socket_getattr, METH_O, "Module __getattr__"},
 #ifdef HAVE_GETADDRINFO
     {"gethostbyname",           socket_gethostbyname,
      METH_VARARGS, gethostbyname_doc},