summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-01-03 21:35:54 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-01-03 21:35:54 (GMT)
commit753b79c0731dd867068bf31e29b28c390f5d24d3 (patch)
tree79e040fc5a15a27f5ecf08f6b7e38b11712c68b6
parentea320abcae63cadfbc5f57122822acff2bc27dd5 (diff)
downloadcpython-753b79c0731dd867068bf31e29b28c390f5d24d3.zip
cpython-753b79c0731dd867068bf31e29b28c390f5d24d3.tar.gz
cpython-753b79c0731dd867068bf31e29b28c390f5d24d3.tar.bz2
Issue #6031: improve serve_forever() description
-rw-r--r--Doc/library/socketserver.rst7
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