[Python-checkins] r73887 - in python/branches/release26-maint: Lib/SocketServer.py

[r.david.murray]

Author: r.david.murray
Date: Tue Jul  7 15:04:54 2009
New Revision: 73887

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/SocketServer.py

Modified: python/branches/release26-maint/Lib/SocketServer.py
==============================================================================
--- python/branches/release26-maint/Lib/SocketServer.py	(original)
+++ python/branches/release26-maint/Lib/SocketServer.py	Tue Jul  7 15:04:54 2009
@@ -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