mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge heads.

Browse source
This commit is contained in:
Gregory P. Smith 2011-06-04 23:05:19 -07:00
commit d64b2bae9b
223 changed files with 11831 additions and 3529 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Modules/socketmodule.c
View file

@ -2782,6 +2782,7 @@ sock_sendto(PySocketSockObject *s, PyObject *args)
PyErr_Format(PyExc_TypeError,
"sendto() takes 2 or 3 arguments (%d given)",
arglen);
return NULL;
}
if (PyErr_Occurred())
return NULL;
@ -3144,7 +3145,7 @@ socket_gethostname(PyObject *self, PyObject *unused)
}
return PyErr_SetExcFromWindowsErr(PyExc_WindowsError, GetLastError());
}
return PyUnicode_FromUnicode(buf, size);
return PyUnicode_FromUnicode(buf, size);
#else
char buf[1024];
int res;
@ -4038,7 +4039,7 @@ socket_inet_ntop(PyObject *self, PyObject *args)
static PyObject *
socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs)
{
static char* kwnames[] = {"host", "port", "family", "type", "proto",
static char* kwnames[] = {"host", "port", "family", "type", "proto",
"flags", 0};
struct addrinfo hints, *res;
struct addrinfo *res0 = NULL;
@ -4053,7 +4054,7 @@ socket_getaddrinfo(PyObject *self, PyObject *args, PyObject* kwargs)
family = socktype = protocol = flags = 0;
family = AF_UNSPEC;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|iiii:getaddrinfo",
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|iiii:getaddrinfo",
kwnames, &hobj, &pobj, &family, &socktype,
&protocol, &flags)) {
return NULL;
@ -4289,7 +4290,7 @@ socket_if_nameindex(PyObject *self, PyObject *arg)
PyObject *list;
int i;
struct if_nameindex *ni;
ni = if_nameindex();
if (ni == NULL) {
PyErr_SetFromErrno(socket_error);