Fix imports so that XML import works with Python 2.1. The addition of

__all__ to the pickle module, and the import constraints that causes symbols
not listed in __all__ not to be imported by "import *", caused these modules
to break because some names were not acquired from the pickle module which
had been acquired before.

This patch adds the appropriate imports so that dependence on the pickle
module's implementation details is avoided.

lib/python/Shared/DC/xml/ppml.py

@@ -99,6 +99,8 @@ import tempfile
 import marshal
 import xyap
 
+mdumps = marshal.dumps
+mloads = marshal.loads
 
 xyap=xyap.xyap
 

lib/python/Shared/DC/xml/xyap.py

@@ -20,9 +20,12 @@ Oh well.
 """
 
 import string
+import xmllib
+
 from pickle import *
 from types import ListType
 
+
 class xyap:
     start_handlers={}
     end_handlers={}
@@ -63,7 +66,6 @@ class NoBlanks:
     def handle_data(self, data):
         if string.strip(data): self.append(data)
 
-import xmllib
 
 def struct(self, tag, data):
     r={}