clinic argument for socket.htons

python · corona10 · Nov 8, 2023 · Nov 2, 2023 · Nov 2, 2023 · Nov 3, 2023
commit 0f3ca4740e3604fd9847ef1ccf04a2d6602b4394
diff --git a/Modules/clinic/socketmodule.c.h b/Modules/clinic/socketmodule.c.h
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -6395,22 +6395,18 @@ PyDoc_STRVAR(ntohl_doc,
 Convert a 32-bit integer from network to host byte order.");
 
 
-static PyObject *
-socket_htons(PyObject *self, PyObject *arg)
-{
-    int x;
-
-    if (!PyLong_Check(arg)) {
-        return PyErr_Format(PyExc_TypeError,
-                            "expected int, %s found",
-                            Py_TYPE(arg)->tp_name);
-    }
+/*[clinic input]
+_socket.socket.htons
+    x: int
+    /
 
-    x = PyLong_AsInt(arg);
+Convert a 16-bit unsigned integer from host to network byte order.
+[clinic start generated code]*/
 
-    if (x == -1 && PyErr_Occurred()) {
-        return NULL;
-    }
+static PyObject *
+_socket_socket_htons_impl(PySocketSockObject *self, int x)
+/*[clinic end generated code: output=d785ee692312da47 input=053252d8416f4337]*/
+{
     if (x < 0) {
         PyErr_SetString(PyExc_OverflowError,
                         "htons: can't convert negative Python int to C "
@@ -6426,11 +6422,6 @@ socket_htons(PyObject *self, PyObject *arg)
     return PyLong_FromUnsignedLong(htons((unsigned short)x));
 }
 
-PyDoc_STRVAR(htons_doc,
-"htons(integer) -> integer\n\
-\n\
-Convert a 16-bit unsigned integer from host to network byte order.");
-
 
 static PyObject *
 socket_htonl(PyObject *self, PyObject *arg)
@@ -7227,8 +7218,7 @@ static PyMethodDef socket_methods[] = {
      METH_VARARGS, ntohs_doc},
     {"ntohl",                   socket_ntohl,
      METH_O, ntohl_doc},
-    {"htons",                   socket_htons,
-     METH_O, htons_doc},
+    _SOCKET_SOCKET_HTONS_METHODDEF
     {"htonl",                   socket_htonl,
      METH_O, htonl_doc},
     {"inet_aton",               socket_inet_aton,