[Erp5-report] r22886 - in /erp5/trunk/products/ERP5SyncML: ./ Conduit/

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Aug  6 10:59:06 2008
New Revision: 22886

URL: http://svn.erp5.org?rev=22886&view=rev
Log:
when raising ImportError for missing 4Suite library, print the exact package name

Modified:
    erp5/trunk/products/ERP5SyncML/Conduit/ERP5Conduit.py
    erp5/trunk/products/ERP5SyncML/ERP5SyncMLMobileServer.py
    erp5/trunk/products/ERP5SyncML/SynchronizationTool.py
    erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py

Modified: erp5/trunk/products/ERP5SyncML/Conduit/ERP5Conduit.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/Conduit/ERP5Conduit.py?rev=22886&r1=22885&r2=22886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/Conduit/ERP5Conduit.py (original)
+++ erp5/trunk/products/ERP5SyncML/Conduit/ERP5Conduit.py Wed Aug  6 10:59:06 2008
@@ -45,14 +45,14 @@
 try:
   from Ft.Xml.Domlette import Print, PrettyPrint
 except ImportError:
-  LOG('ERP5Conduit',0,"Can't import Print and PrettyPrint")
+  LOG('ERP5Conduit', INFO, "Can't import Print and PrettyPrint")
   class Print:
     def __init__(self, *args, **kw):
-      raise ImportError, "Sorry, it was not possible to import Ft library"
+      raise ImportError, '4Suite-XML is not installed'
 
   class PrettyPrint:
     def __init__(self, *args, **kw):
-      raise ImportError, "Sorry, it was not possible to import Ft library"
+      raise ImportError, '4Suite-XML is not installed'
 
 
 class ERP5Conduit(XMLSyncUtilsMixin):

Modified: erp5/trunk/products/ERP5SyncML/ERP5SyncMLMobileServer.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/ERP5SyncMLMobileServer.py?rev=22886&r1=22885&r2=22886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/ERP5SyncMLMobileServer.py (original)
+++ erp5/trunk/products/ERP5SyncML/ERP5SyncMLMobileServer.py Wed Aug  6 10:59:06 2008
@@ -13,11 +13,11 @@
 except ImportError:
   class Print:
     def __init__(self, *args, **kw):
-      raise ImportError, "Sorry, it was not possible to import Ft library"
+      raise ImportError, '4Suite-XML is not installed'
 
   class PrettyPrint:
     def __init__(self, *args, **kw):
-      raise ImportError, "Sorry, it was not possible to import Ft library"
+      raise ImportError, '4Suite-XML is not installed'
 
 
 class OptionParser(OptionParser):

Modified: erp5/trunk/products/ERP5SyncML/SynchronizationTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/SynchronizationTool.py?rev=22886&r1=22885&r2=22886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/SynchronizationTool.py (original)
+++ erp5/trunk/products/ERP5SyncML/SynchronizationTool.py Wed Aug  6 10:59:06 2008
@@ -41,7 +41,6 @@
 from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2
 from Subscription import Subscription
 from XMLSyncUtils import Parse
-#from Ft.Xml import Parse
 from Products.ERP5Type import Permissions
 from PublicationSynchronization import PublicationSynchronization
 from SubscriptionSynchronization import SubscriptionSynchronization

Modified: erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py?rev=22886&r1=22885&r2=22886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py (original)
+++ erp5/trunk/products/ERP5SyncML/XMLSyncUtils.py Wed Aug  6 10:59:06 2008
@@ -40,12 +40,12 @@
   LOG('XMLSyncUtils', INFO, "Can't import Parse")
   class Parse:
     def __init__(self, *args, **kw):
-      raise ImportError, "Sorry, it was not possible to import Ft library"
+      raise ImportError, '4Suite-XML is not installed'
 
 try:
-      from base64 import b16encode, b16decode
+  from base64 import b16encode, b16decode
 except ImportError:
-      from base64 import encodestring as b16encode, decodestring as b16decode
+  from base64 import encodestring as b16encode, decodestring as b16decode
 try:
   from Ft.Xml.Domlette import PrettyPrint
 except ImportError: