From 3939a1237175be36cac1fe956724f9e8347b427a Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@fedoraproject.org>
Date: Oct 16 2007 17:03:22 +0000
Subject: fix marshalling of objects in xmlrpclib (python bug #1739842)


---

diff --git a/python-2.5-xmlrpclib-marshal-objects.patch b/python-2.5-xmlrpclib-marshal-objects.patch
new file mode 100644
index 0000000..6930b73
--- /dev/null
+++ b/python-2.5-xmlrpclib-marshal-objects.patch
@@ -0,0 +1,13 @@
+--- Python-2.5/Lib/xmlrpclib.py.orig	2007-04-10 10:29:14.000000000 -0400
++++ Python-2.5/Lib/xmlrpclib.py	2007-06-19 12:08:04.000000000 -0400
+@@ -630,6 +630,9 @@
+         try:
+             f = self.dispatch[type(value)]
+         except KeyError:
+-            raise TypeError, "cannot marshal %s objects" % type(value)
++            if isinstance(value, object):
++                self.dump_instance(value, write)
++            else:
++                raise TypeError, "cannot marshal %s objects" % type(value)
+         else:
+             f(self, value, write)
diff --git a/python.spec b/python.spec
index 9634415..bb43218 100644
--- a/python.spec
+++ b/python.spec
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -35,6 +35,7 @@ Patch4: python-2.5-cflags.patch
 Patch5: python-2.5.1-ctypes-exec-stack.patch
 Patch6: python-2.5.1-plural-fix.patch
 Patch7: python-2.5.1-sqlite-encoding.patch
+Patch8: python-2.5-xmlrpclib-marshal-objects.patch
 
 # upstreamed
 
@@ -165,6 +166,7 @@ user interface for Python programming.
 %patch5 -p1 -b .ctypesexec
 %patch6 -p1 -b .plural
 %patch7 -p1
+%patch8 -p1 -b .xmlrpc
 
 %patch50 -p1 -b .egginfo
 %patch60 -p1 -b .db46
@@ -425,6 +427,9 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Tue Oct 16 2007 Mike Bonnet <mikeb@redhat.com> - 2.5.1-12
+- fix marshalling of objects in xmlrpclib (python bug #1739842)
+
 * Fri Sep 14 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-11
 - fix encoding of sqlite .py files to work around weird encoding problem 
   in Turkish (#283331)