revert previous change until we have a nice rpm

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14482 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5SyncML/PublicationSynchronization.py

@@ -29,7 +29,8 @@
 import smtplib # to send emails
 from Publication import Publication,Subscriber
 from Subscription import Signature
-from Ft.Xml import Parse
+from xml.dom.ext.reader.Sax2 import FromXmlStream, FromXml
+from xml.dom.minidom import parse, parseString
 from XMLSyncUtils import XMLSyncUtils
 from Conduit.ERP5Conduit import ERP5Conduit
 from Products.CMFCore.utils import getToolByName
@@ -220,7 +221,7 @@ class PublicationSynchronization(XMLSyncUtils):
 
     if xml_client is not None:
       if isinstance(xml_client, str) or isinstance(xml_client, unicode):
-        xml_client = Parse(xml_client)
+        xml_client = parseString(xml_client)
       first_node = xml_client.childNodes[0]
 
       if first_node.nodeName != "SyncML":

product/ERP5SyncML/SubscriptionSynchronization.py

@@ -28,7 +28,9 @@
 
 import smtplib # to send emails
 from Subscription import Subscription,Signature
-from Ft.Xml import Parse
+from xml.dom.ext.reader.Sax2 import FromXmlStream, FromXml
+from xml.dom.minidom import parse, parseString
+from xml.dom.ext import PrettyPrint
 from XMLSyncUtils import XMLSyncUtils
 import commands
 from Conduit.ERP5Conduit import ERP5Conduit
@@ -97,7 +99,7 @@ class SubscriptionSynchronization(XMLSyncUtils):
     else:
       xml_client = msg
       if isinstance(xml_client, str) or isinstance(xml_client, unicode):
-        xml_client = Parse(xml_client)
+        xml_client = parseString(xml_client)
         next_status = self.getNextSyncBodyStatus(xml_client, None)
         #LOG('readResponse, next status :',0,next_status)
         if next_status is not None:

product/ERP5SyncML/SynchronizationTool.py

@@ -40,7 +40,8 @@ from Products.ERP5SyncML import Conduit
 from Publication import Publication,Subscriber
 from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2
 from Subscription import Subscription,Signature
-from Ft.Xml import Parse
+from xml.dom.ext.reader.Sax2 import FromXmlStream, FromXml
+from xml.dom.minidom import parse, parseString
 from Products.ERP5Type import Permissions
 from PublicationSynchronization import PublicationSynchronization
 from SubscriptionSynchronization import SubscriptionSynchronization
@@ -49,6 +50,7 @@ from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
 from AccessControl.User import UnrestrictedUser
 from Acquisition import aq_base
+from xml.parsers.expat import ExpatError # parseString error
 import urllib
 import urllib2
 import socket
@@ -972,7 +974,7 @@ class SynchronizationTool( SubscriptionSynchronization,
         commands.getstatusoutput('rm -f /tmp/%s.gz.gpg' % filename)
       # Get the target and then find the corresponding publication or
       # Subscription
-      xml = Parse(text)
+      xml = parseString(text)
       #XXX this function is not very optimized and should be improved
       url = self.getTarget(xml)
       for publication in self.getPublicationList():