[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2
sandro.tosi
python-checkins at python.org
Tue Jan 3 22:48:51 CET 2012
http://hg.python.org/cpython/rev/4c243c8ecd10
changeset: 74247:4c243c8ecd10
parent: 74244:f38182db6c7a
parent: 74246:4a30d36a9c69
user: Sandro Tosi <sandro.tosi at gmail.com>
date: Tue Jan 03 22:47:28 2012 +0100
summary:
merge with 3.2
files:
Doc/library/socketserver.rst | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -153,8 +153,8 @@
.. 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 @@
.. 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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list