summaryrefslogtreecommitdiff
path: root/Lib/socketserver.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-10-09 11:16:26 -0400
committerBenjamin Peterson <benjamin@python.org>2012-10-09 11:16:26 -0400
commit455fa0a314b7f7edd0c8554b12a65267ff1e2e5b (patch)
treea4db0395d8674c1e3c4119f0edccf72307b34e49 /Lib/socketserver.py
parentb29614e047110f4d9af993a6cdec4e3fb7ef9738 (diff)
parent831893a68ec7114c1fc9c8e36b9159f5c1db50c7 (diff)
downloadcpython-git-455fa0a314b7f7edd0c8554b12a65267ff1e2e5b.tar.gz
merge heads
Diffstat (limited to 'Lib/socketserver.py')
-rw-r--r--Lib/socketserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 261e28e641..a21318d923 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -562,7 +562,7 @@ class ForkingMixIn:
self.collect_children()
def service_actions(self):
- """Collect the zombie child processes regularly in the ForkingMixin.
+ """Collect the zombie child processes regularly in the ForkingMixIn.
service_actions is called in the BaseServer's serve_forver loop.
"""