From: R. David Murray <rdmurray@bitdance.com>
Date: Tue, 7 Jul 2009 13:04:54 +0000 (+0000)
Subject: Merged revisions 69927 via svnmerge from
X-Git-Tag: v2.6.3rc1~163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92647d98dbbde339ada984b157f0e0d1d6f95fea;p=python

Merged revisions 69927 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69927 | neil.schemenauer | 2009-02-23 23:23:25 -0500 (Mon, 23 Feb 2009) | 1 line

  Fix call to os.waitpid, it does not take keyword args.
........
---

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 2c41fbb6dc..f01cb5f2cc 100644
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -487,7 +487,7 @@ class ForkingMixIn:
             # libraries that expect to be able to wait for their own
             # children.
             try:
-                pid, status = os.waitpid(0, options=0)
+                pid, status = os.waitpid(0, 0)
             except os.error:
                 pid = None
             if pid not in self.active_children: continue