diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2012-01-03 21:47:28 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2012-01-03 21:47:28 (GMT) |
| commit | 9b5626d52c6b8eed3fab84555fea18b44eecac72 (patch) | |
| tree | 73bfa62342f39a94a6d6bd059a4f77e28fc32b1f /Doc/library/socketserver.rst | |
| parent | 5c91242f881f4496034c4b452d5fcc74f66206c8 (diff) | |
| parent | 753b79c0731dd867068bf31e29b28c390f5d24d3 (diff) | |
| download | cpython-9b5626d52c6b8eed3fab84555fea18b44eecac72.zip cpython-9b5626d52c6b8eed3fab84555fea18b44eecac72.tar.gz cpython-9b5626d52c6b8eed3fab84555fea18b44eecac72.tar.bz2 | |
merge with 3.2
Diffstat (limited to 'Doc/library/socketserver.rst')
| -rw-r--r-- | Doc/library/socketserver.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 497e3ee..091af03 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -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 |