Mercurial > cpython-lru_cache-weakref

diff Lib/SocketServer.py @ 55149:fa080c4f539a 2.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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. ........
author R. David Murray <rdmurray@bitdance.com>
date Tue, 07 Jul 2009 13:04:54 +0000
parents ba1fa511b72d
children ea43f7f6e84c da6871b9d884
line wrap: on
line diff
--- a/Lib/SocketServer.py	Tue Jul 07 11:09:07 2009 +0000
+++ b/Lib/SocketServer.py	Tue Jul 07 13:04:54 2009 +0000
@@ -487,7 +487,7 @@
             # 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