Change cmod | remove getattr in socket.py

Author: rruuaanng

Lib/socket.py

@@ -67,13 +67,6 @@
            "has_dualstack_ipv6", "AddressFamily", "SocketKind"]
 __all__.extend(os._get_exports_list(_socket))
 
-def __getattr__(name):
-    if name == "SocketType":
-        import warnings
-        warnings._deprecated(name, remove=(3, 16))
-        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.

Modules/socketmodule.c

@@ -5579,16 +5579,17 @@ socket_getattr(PyObject *self, PyObject *name)
 {
     const char *attrname = PyUnicode_AsUTF8(name);
     PyObject *sock_type = PyType_FromSpec(&sock_spec);
-    if (sock_type == NULL) {
+    if (attrname == NULL || sock_type == NULL) {
         return NULL;
     }
 
     if (!strcmp(attrname, "SocketType")) {
-        PyErr_Warn(PyExc_DeprecationWarning, "Use socket.socket type instead");
+        PyErr_Warn(PyExc_DeprecationWarning, "It will be removed in 3.16. "
+                                             "Use socket.socket type instead");
         return sock_type;
     }
 
-    PyErr_Format(PyExc_AttributeError, "module _socket has no attribute %s", attrname);
+    PyErr_Format(PyExc_AttributeError, "module _socket has no attribute '%s'", attrname);
     return NULL;
 }