Skip to content

Commit a533180

Browse files
committed
clinic argument for socket.if_nametoindex
1 parent 6ccd817 commit a533180

File tree

2 files changed

+47
-12
lines changed

2 files changed

+47
-12
lines changed

Modules/clinic/socketmodule.c.h

Lines changed: 36 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/socketmodule.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7044,18 +7044,23 @@ PyDoc_STRVAR(if_nameindex_doc,
70447044
\n\
70457045
Returns a list of network interface information (index, name) tuples.");
70467046

7047+
/*[clinic input]
7048+
_socket.socket.if_nametoindex
7049+
oname: object(converter="PyUnicode_FSConverter")
7050+
/
7051+
7052+
Returns the interface index corresponding to the interface name if_name.
7053+
[clinic start generated code]*/
7054+
70477055
static PyObject *
7048-
socket_if_nametoindex(PyObject *self, PyObject *args)
7056+
_socket_socket_if_nametoindex_impl(PySocketSockObject *self, PyObject *oname)
7057+
/*[clinic end generated code: output=f7fc00511a309a8e input=662688054482cd46]*/
70497058
{
7050-
PyObject *oname;
70517059
#ifdef MS_WINDOWS
70527060
NET_IFINDEX index;
70537061
#else
70547062
unsigned long index;
70557063
#endif
7056-
if (!PyArg_ParseTuple(args, "O&:if_nametoindex",
7057-
PyUnicode_FSConverter, &oname))
7058-
return NULL;
70597064

70607065
index = if_nametoindex(PyBytes_AS_STRING(oname));
70617066
Py_DECREF(oname);
@@ -7068,10 +7073,6 @@ socket_if_nametoindex(PyObject *self, PyObject *args)
70687073
return PyLong_FromUnsignedLong(index);
70697074
}
70707075

7071-
PyDoc_STRVAR(if_nametoindex_doc,
7072-
"if_nametoindex(if_name)\n\
7073-
\n\
7074-
Returns the interface index corresponding to the interface name if_name.");
70757076

70767077
static PyObject *
70777078
socket_if_indextoname(PyObject *self, PyObject *arg)
@@ -7241,8 +7242,7 @@ static PyMethodDef socket_methods[] = {
72417242
#if defined(HAVE_IF_NAMEINDEX) || defined(MS_WINDOWS)
72427243
{"if_nameindex", socket_if_nameindex,
72437244
METH_NOARGS, if_nameindex_doc},
7244-
{"if_nametoindex", socket_if_nametoindex,
7245-
METH_VARARGS, if_nametoindex_doc},
7245+
_SOCKET_SOCKET_IF_NAMETOINDEX_METHODDEF
72467246
{"if_indextoname", socket_if_indextoname,
72477247
METH_O, if_indextoname_doc},
72487248
#endif

0 commit comments

Comments
 (0)