diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-07-07 13:04:54 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-07-07 13:04:54 (GMT) |
| commit | 92647d98dbbde339ada984b157f0e0d1d6f95fea (patch) | |
| tree | 938d6b4359760938f6dd99ea1b8ed94895368c7b | |
| parent | 48c435cf2c420b592e27738b47219019e302b8d3 (diff) | |
| download | cpython-92647d98dbbde339ada984b157f0e0d1d6f95fea.zip cpython-92647d98dbbde339ada984b157f0e0d1d6f95fea.tar.gz cpython-92647d98dbbde339ada984b157f0e0d1d6f95fea.tar.bz2 | |
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.
........
| -rw-r--r-- | Lib/SocketServer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index 2c41fbb..f01cb5f 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 |