diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-03 21:49:56 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-03 21:49:56 (GMT) |
| commit | 4f616af086701d799ec8c5d06b8ec0e6a3717766 (patch) | |
| tree | 0245a06c9b9319d60f8dc79621a29c9b1ef76ef0 | |
| parent | 8f85f907e3d72b192b9b073e5505075635720282 (diff) | |
| parent | 753b79c0731dd867068bf31e29b28c390f5d24d3 (diff) | |
| download | cpython-4f616af086701d799ec8c5d06b8ec0e6a3717766.zip cpython-4f616af086701d799ec8c5d06b8ec0e6a3717766.tar.gz cpython-4f616af086701d799ec8c5d06b8ec0e6a3717766.tar.bz2 | |
Merge
| -rw-r--r-- | Doc/library/socketserver.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst index 366dac4..34bcce0 100644 --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@ -153,13 +153,14 @@ 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. + Handle requests until an explicit :meth:`shutdown` request. + Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. + If you need to do periodic tasks, do them in another thread. .. 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 wait until it does. .. attribute:: BaseServer.address_family |