Changeset 4045

Timestamp:

2 Apr 2009, 11:05:08 (16 years ago)

Author:

uli

Message:

Use external XML pickler for XML exports.

File:

• waeup/branches/ulif-rewrite/src/waeup/utils/importexport.py (modified) (4 diffs)

waeup/branches/ulif-rewrite/src/waeup/utils/importexport.py

@@ -3 +3 @@
 import grok
 import cPickle
+import zope.xmlpickle
 from cStringIO import StringIO
 from xml.dom.minidom import Document, getDOMImplementation
+from zope.interface import Interface
 from waeup.interfaces import IWAeUPObject, IWAeUPExporter, IWAeUPXMLExporter
 
@@ -22 +24 @@
 
 class Exporter(grok.Adapter):
-    """Export a WAeUP object.
+    """Export a WAeUP object as pickle.
 
     This all-purpose exporter exports attributes defined in schemata
@@ -39 +41 @@
         return filelike_obj
 
-
-
-ts_regexp = re.compile('^<((type)|(class)) (.*)>$')
-def getTypeString(obj):
-    type_str = str(type(obj))
-    m = ts_regexp.match(type_str).groups()
-    return (m[0], m[3][1:-1])
-    
-
-
 class XMLExporter(grok.Adapter):
     """Export a WAeUP object as XML.
 
-    This all-purpose exporter exports attributes defined in schemata
-    and contained objects (if the exported thing is a container).
+    This all-purpose exporter exports XML representations of pickable
+    objects.
     """
-    grok.context(IWAeUPObject)
+    grok.context(Interface)
     grok.provides(IWAeUPXMLExporter)
 
-    doc = None
-    
-    def getObjectNode(self, obj):
-        dotted_name = obj.__module__ + '.' + obj.__class__.__name__
-        node = self.doc.createElement('object')
-        node.setAttribute('type', dotted_name)
-        return node
-    
-    def _export(self, obj, parent=None):
-        if self.doc is None:
-            impl = getDOMImplementation()
-            self.doc = impl.createDocument(None, 'waeupdata', None)
-        if parent is None:
-            parent = self.doc.documentElement
-        
-        # Handle object meta data...
-        obj_node = self.getObjectNode(obj)
-        parent.appendChild(obj_node)
-        parent = obj_node
-
-        # Handle attributes...
-        for name in obj.__dict__:
-            if name.startswith('_'):
-                continue
-            val = unicode(getattr(obj, name))
-            type_type, type_name = getTypeString(getattr(obj, name))
-            if type_type not in ['type',]:
-                # XXX: if type_type == 'class', we should deliver an object.
-                continue
-            newnode = self.doc.createElement('attribute')
-            newnode.setAttribute('name', name)
-            newnode.setAttribute('type', type_name)
-            text = self.doc.createTextNode(val)
-            newnode.appendChild(text)
-            parent.appendChild(newnode)
-        return self.doc
-
-    def cleanUp(self):
-        if self.doc is not None:
-            self.doc.unlink()
-        self.doc = None
-        return
-
     def export(self, obj, filepath=None):
-        result = self._export(obj)
-        if filepath is None:
-            filelike_obj = StringIO()
-        else:
-            filelike_obj = open(filepath, 'wb')
-        filelike_obj.write(result.toxml(encoding='UTF-8'))
-        filelike_obj.seek(0)
-        self.cleanUp()
-        return filelike_obj
-
-    def exportPrettyXML(self, obj, filepath=None):
-        result = self._export(obj).toprettyxml(encoding='UTF-8')
+        pickled_obj = cPickle.dumps(obj)
+        result = zope.xmlpickle.toxml(pickled_obj)
         if filepath is None:
             filelike_obj = StringIO()
@@ -120 +59 @@
         filelike_obj.write(result)
         filelike_obj.seek(0)
-        self.cleanUp()
         return filelike_obj