[Erp5-report] r30506 - in /erp5/trunk/products: ERP5/tests/ ERP5Type/ ERP5Type/tests/ ERP5W...

[nobody at svn.erp5.org]

Author: jm
Date: Wed Nov 11 14:11:29 2009
New Revision: 30506

URL: http://svn.erp5.org?rev=30506&view=rev
Log:
Replace a few string exceptions (which are not supported anymore since Python 2.6)

Modified:
    erp5/trunk/products/ERP5/tests/testCalendar.py
    erp5/trunk/products/ERP5Type/CopySupport.py
    erp5/trunk/products/ERP5Type/XMLExportImport.py
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
    erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py

Modified: erp5/trunk/products/ERP5/tests/testCalendar.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testCalendar.py?rev=30506&r1=30505&r2=30506&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testCalendar.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testCalendar.py [utf8] Wed Nov 11 14:11:29 2009
@@ -682,8 +682,8 @@
     Test getCapacityAvailability
     """
     if not run: return
-    raise "NotImplementedYet"
-    
+    raise NotImplemented
+
     # Test that calendar group increase time availability
     sequence_list = SequenceList()
     sequence_string = '\

Modified: erp5/trunk/products/ERP5Type/CopySupport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/CopySupport.py?rev=30506&r1=30505&r2=30506&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/CopySupport.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/CopySupport.py [utf8] Wed Nov 11 14:11:29 2009
@@ -13,6 +13,7 @@
 ##############################################################################
 
 from OFS import Moniker
+from zExceptions import BadRequest
 from AccessControl import ClassSecurityInfo, getSecurityManager
 from AccessControl.Permission import Permission
 from OFS.ObjectManager import ObjectManager
@@ -225,7 +226,7 @@
           id = ob.id
           v=container._getOb(id, self)
           if v is self:
-              raise 'BadRequest', '%s does not exist' % ids[-1]
+              raise BadRequest('%s does not exist' % ids[-1])
           container._delObject(id)
           del uids[-1]
       if REQUEST is not None:

Modified: erp5/trunk/products/ERP5Type/XMLExportImport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/XMLExportImport.py?rev=30506&r1=30505&r2=30506&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/XMLExportImport.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/XMLExportImport.py [utf8] Wed Nov 11 14:11:29 2009
@@ -106,8 +106,8 @@
             data_encoded = standard_b64encode(content)
             block = SubElement(sub_object, 'block_data')
             block.text = data_encoded
-        else: 
-          raise "XMLExportImport failed, the data is undefined"
+        else:
+          raise ValueError("XMLExportImport failed, the data is undefined")
       elif prop_type in ('lines', 'tokens',):
         # Use CDATA node to not be taken into account by erp5diff 
         value = [word.decode('utf-8').encode('ascii','xmlcharrefreplace')\

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=30506&r1=30505&r2=30506&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Wed Nov 11 14:11:29 2009
@@ -849,17 +849,16 @@
             update_business_templates = os.environ.get('update_business_templates') is not None
             BusinessTemplate_getModifiedObject = aq_base(getattr(portal, 'BusinessTemplate_getModifiedObject', None))
 
-            # check that all bt5 exists, this permit to save time in case of
+            # check that all bt5 exist, this permit to save time in case of
             # missing bt
             missing_bt_list = []
-            from DateTime import DateTime
             for url, bt_title in business_template_list:
               # if the bt is not found, an error is raised
               if not portal.portal_templates.assertBtPathExists(url):
                 missing_bt_list.append(bt_title)
             if len(missing_bt_list):
-              raise "Some bt can't be found on your system : %r" % \
-                missing_bt_list
+              raise RuntimeError("Some BT can't be found on your system : %s"
+                                 % ', '.join(missing_bt_list))
 
             # Add some business templates
             for url, bt_title in business_template_list:

Modified: erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py?rev=30506&r1=30505&r2=30506&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Wizard/Tool/WizardTool.py [utf8] Wed Nov 11 14:11:29 2009
@@ -548,7 +548,7 @@
     server_buffer = server_response.get("server_buffer", None)
     if server_buffer is None:
       # server doesn't comform protocol which means a possible server error 
-      raise "Witch server configuration error."
+      raise ValueError("Witch server configuration error")
     bt5_filenames = server_buffer.get("filenames", [])
     portal_templates = getToolByName(portal, 'portal_templates')
     counter = 0