comparison Modules/socketmodule.c @ 71865:49e9e34da512

#12725: merge with 3.2.
author Ezio Melotti <ezio.melotti@gmail.com>
date Sun, 14 Aug 2011 08:29:49 +0300
parents 940537b372e3 ab3432a81c26
children c64216addd7f
comparison
equal deleted inserted replaced
71862:0273d0734593 71865:49e9e34da512
1820 } 1820 }
1821 1821
1822 PyDoc_STRVAR(gettimeout_doc, 1822 PyDoc_STRVAR(gettimeout_doc,
1823 "gettimeout() -> timeout\n\ 1823 "gettimeout() -> timeout\n\
1824 \n\ 1824 \n\
1825 Returns the timeout in floating seconds associated with socket \n\ 1825 Returns the timeout in seconds (float) associated with socket \n\
1826 operations. A timeout of None indicates that timeouts on socket \n\ 1826 operations. A timeout of None indicates that timeouts on socket \n\
1827 operations are disabled."); 1827 operations are disabled.");
1828 1828
1829 /* s.setsockopt() method. 1829 /* s.setsockopt() method.
1830 With an integer third argument, sets an integer option. 1830 With an integer third argument, sets an integer option.
4245 } 4245 }
4246 4246
4247 PyDoc_STRVAR(getdefaulttimeout_doc, 4247 PyDoc_STRVAR(getdefaulttimeout_doc,
4248 "getdefaulttimeout() -> timeout\n\ 4248 "getdefaulttimeout() -> timeout\n\
4249 \n\ 4249 \n\
4250 Returns the default timeout in floating seconds for new socket objects.\n\ 4250 Returns the default timeout in seconds (float) for new socket objects.\n\
4251 A value of None indicates that new socket objects have no timeout.\n\ 4251 A value of None indicates that new socket objects have no timeout.\n\
4252 When the socket module is first imported, the default is None."); 4252 When the socket module is first imported, the default is None.");
4253 4253
4254 static PyObject * 4254 static PyObject *
4255 socket_setdefaulttimeout(PyObject *self, PyObject *arg) 4255 socket_setdefaulttimeout(PyObject *self, PyObject *arg)
4275 } 4275 }
4276 4276
4277 PyDoc_STRVAR(setdefaulttimeout_doc, 4277 PyDoc_STRVAR(setdefaulttimeout_doc,
4278 "setdefaulttimeout(timeout)\n\ 4278 "setdefaulttimeout(timeout)\n\
4279 \n\ 4279 \n\
4280 Set the default timeout in floating seconds for new socket objects.\n\ 4280 Set the default timeout in seconds (float) for new socket objects.\n\
4281 A value of None indicates that new socket objects have no timeout.\n\ 4281 A value of None indicates that new socket objects have no timeout.\n\
4282 When the socket module is first imported, the default is None."); 4282 When the socket module is first imported, the default is None.");
4283 4283
4284 #ifdef HAVE_IF_NAMEINDEX 4284 #ifdef HAVE_IF_NAMEINDEX
4285 /* Python API for getting interface indices and names */ 4285 /* Python API for getting interface indices and names */