Properly detect recursive structures. Adopted from patch #465298.
diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
index 9f96163..ea4f932 100644
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -490,6 +490,10 @@
raise TypeError, "cannot marshal recursive data structures"
self.memo[i] = None
+ def endcontainer(self, value):
+ if value:
+ del self.memo[id(value)]
+
def dump_array(self, value):
self.container(value)
write = self.write
@@ -497,6 +501,7 @@
for v in value:
self.__dump(v)
write("</data></array></value>\n")
+ self.endcontainer(value)
dispatch[TupleType] = dump_array
dispatch[ListType] = dump_array
@@ -513,6 +518,7 @@
self.__dump(v)
write("</member>\n")
write("</struct></value>\n")
+ self.endcontainer(value)
dispatch[DictType] = dump_struct
def dump_instance(self, value):