Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 3.2

This commit is contained in:
Sandro Tosi 2012-01-03 22:47:28 +01:00
parent 5c91242f88 753b79c073
commit 9b5626d52c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/socketserver.rst
View File

@ -153,8 +153,8 @@ Server Objects
.. method:: BaseServer.serve_forever(poll_interval=0.5)
Handle requests until an explicit :meth:`shutdown` request. Polls for
shutdown every *poll_interval* seconds. It also calls
Handle requests until an explicit :meth:`shutdown` request.
Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It also calls
:meth:`service_actions` which may be used by a subclass or Mixin to provide
various cleanup actions. For e.g. ForkingMixin class uses
:meth:`service_actions` to cleanup the zombie child processes.
@ -172,7 +172,7 @@ Server Objects
.. method:: BaseServer.shutdown()
Tells the :meth:`serve_forever` loop to stop and waits until it does.
Tell the :meth:`serve_forever` loop to stop and waits until it does.
.. attribute:: BaseServer.address_family