rpms/python/F-12 python-2.6.2-fix-SocketServer.py-r73887.patch, NONE, 1.1 python.spec, 1.152, 1.153

[dmalcolm]

Author: dmalcolm

Update of /cvs/pkgs/rpms/python/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14852

Modified Files:
	python.spec 
Added Files:
	python-2.6.2-fix-SocketServer.py-r73887.patch 
Log Message:
- fix Lib/SocketServer.py to avoid trying to use non-existant keyword args
for os.waitpid (patch 52, rhbz:552404, Adrian Reber)


python-2.6.2-fix-SocketServer.py-r73887.patch:
 SocketServer.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-2.6.2-fix-SocketServer.py-r73887.patch ---
--- python/branches/release26-maint/Lib/SocketServer.py	2009/07/07 11:09:38	73886
+++ python/branches/release26-maint/Lib/SocketServer.py	2009/07/07 13:04:54	73887
@@ -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


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/F-12/python.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- python.spec	21 Aug 2009 15:34:49 -0000	1.152
+++ python.spec	8 Jan 2010 22:00:49 -0000	1.153
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -51,6 +51,11 @@ Patch51: python-2.6-distutils_rpm.patch
 
 # upstreamed
 
+# Patch Lib/SocketServer.py to avoid trying to use non-existant keyword args
+# for os.waitpid.  Upstream issue http://bugs.python.org/issue5814
+# patch taken from there.  RH bug 552504
+Patch52: python-2.6.2-fix-SocketServer.py-r73887.patch
+
 #Patch50: python-2.5-disable-egginfo.patch
 
 # new db version
@@ -227,6 +232,7 @@ code that uses more than just unittest a
 %patch16 -p1 -b .rpath
 
 %patch51 -p1 -b .brprpm
+%patch52 -p3
 
 %ifarch alpha ia64
 # 64bit, but not lib64 arches need this too...
@@ -538,6 +544,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Fri Jan  8 2010 David Malcolm <dmalcolm at redhat.com> - 2.6.2-3
+- fix Lib/SocketServer.py to avoid trying to use non-existant keyword args
+for os.waitpid (patch 52, rhbz:552404, Adrian Reber)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.6.2-2
 - rebuilt with new openssl