[Zope-Checkins] CVS: Zope2 - xyap.py:1.4 ppml.py:1.14

fred@digicool.com fred@digicool.com
Fri, 1 Jun 2001 22:50:43 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/Shared/DC/xml
In directory korak.digicool.com:/tmp/cvs-serv28550

Modified Files:
	xyap.py ppml.py 
Log Message:

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.



--- Updated File xyap.py in package Zope2 --
--- xyap.py	2001/06/01 19:37:12	1.3
+++ xyap.py	2001/06/02 02:50:43	1.4
@@ -20,9 +20,12 @@
 """
 
 import string
+import xmllib
+
 from pickle import *
 from types import ListType
 
+
 class xyap:
     start_handlers={}
     end_handlers={}
@@ -63,7 +66,6 @@
     def handle_data(self, data):
         if string.strip(data): self.append(data)
 
-import xmllib
 
 def struct(self, tag, data):
     r={}

--- Updated File ppml.py in package Zope2 --
--- ppml.py	2001/06/01 19:39:44	1.13
+++ ppml.py	2001/06/02 02:50:43	1.14
@@ -99,6 +99,8 @@
 import marshal
 import xyap
 
+mdumps = marshal.dumps
+mloads = marshal.loads
 
 xyap=xyap.xyap