Migrate to python3 style for raise and import

See merge request nexedi/erp5!1362

bt5/erp5_accounting/DocumentTemplateItem/portal_components/document.erp5.BalanceTransaction.py

@@ -44,24 +44,24 @@ class InventoryKey(UserDict):
     self.data.update(kw)
 
   def clear(self):
-    raise TypeError, 'InventoryKey are immutable'
+    raise TypeError('InventoryKey are immutable')
 
   def pop(self, keys, *args):
-    raise TypeError, 'InventoryKey are immutable'
+    raise TypeError('InventoryKey are immutable')
 
   def update(self, dict=None, **kwargs): # pylint: disable=redefined-builtin
-    raise TypeError, 'InventoryKey are immutable'
+    raise TypeError('InventoryKey are immutable')
 
   def __delitem__(self, key):
-    raise TypeError, 'InventoryKey are immutable'
+    raise TypeError('InventoryKey are immutable')
 
   def __setitem__(self, key, item):
-    raise TypeError, 'InventoryKey are immutable'
+    raise TypeError('InventoryKey are immutable')
 
   def setdefault(self, key, failobj=None):
     if key in self.data:
       return self.data[key]
-    raise TypeError, 'InventoryKey are immutable'
+    raise TypeError('InventoryKey are immutable')
 
   def __hash__(self):
     return hash(tuple(self.items()))
@@ -162,7 +162,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
     for movement in self._getGroupByNodeMovementList():
       node_uid = movement.getDestinationUid()
       if not node_uid:
-        raise ValueError, "No destination uid for %s" % movement
+        raise ValueError("No destination uid for %s" % movement)
       resource_uid = movement.getResourceUid()
 
       stock_list = current_stock.setdefault(
@@ -188,7 +188,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
     for movement in self._getGroupByMirrorSectionMovementList():
       node_uid = movement.getDestinationUid()
       if not node_uid:
-        raise ValueError, "No destination uid for %s" % movement
+        raise ValueError("No destination uid for %s" % movement)
       mirror_section_uid = movement.getSourceSectionUid()
       resource_uid = movement.getResourceUid()
 
@@ -219,7 +219,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
     for movement in self._getGroupByPaymentMovementList():
       node_uid = movement.getDestinationUid()
       if not node_uid:
-        raise ValueError, "No destination uid for %s" % movement
+        raise ValueError("No destination uid for %s" % movement)
       payment_uid = movement.getDestinationPaymentUid()
       resource_uid = movement.getResourceUid()
 
@@ -258,7 +258,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
     for movement in self._getGroupByNodeMovementList():
       node_uid = movement.getDestinationUid()
       if not node_uid:
-        raise ValueError, "No destination uid for %s" % movement
+        raise ValueError("No destination uid for %s" % movement)
       section_uid = movement.getDestinationSectionUid()
 
       stock_list = new_stock.setdefault(
@@ -280,7 +280,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
     for movement in self._getGroupByMirrorSectionMovementList():
       node_uid = movement.getDestinationUid()
       if not node_uid:
-        raise ValueError, "No destination uid for %s" % movement
+        raise ValueError("No destination uid for %s" % movement)
       section_uid = movement.getDestinationSectionUid()
       mirror_section_uid = movement.getSourceSectionUid()
 
@@ -305,7 +305,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
     for movement in self._getGroupByPaymentMovementList():
       node_uid = movement.getDestinationUid()
       if not node_uid:
-        raise ValueError, "No destination uid for %s" % movement
+        raise ValueError("No destination uid for %s" % movement)
       section_uid = movement.getDestinationSectionUid()
       payment_uid = movement.getDestinationPaymentUid()
 

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/script_checkDates.py

@@ -10,7 +10,7 @@ start_date = closing_period.getStartDate()
 stop_date = closing_period.getStopDate()
 
 if start_date > stop_date:
-  raise ValidationFailed, translateString("Start date is after stop date.")
+  raise ValidationFailed(translateString("Start date is after stop date."))
 
 period_list = [
     x
@@ -23,9 +23,9 @@ period_list = [
 
 for period in period_list:
   if start_date <= period.getStopDate() and not stop_date <= period.getStartDate():
-    raise ValidationFailed, translateString(
+    raise ValidationFailed(translateString(
         "${date} is already in an open accounting period.",
-        mapping={'date': start_date})
+        mapping={'date': start_date}))
 
 previous_period = next(
     iter(
@@ -39,9 +39,9 @@ previous_period = next(
 )
 if previous_period is not None:
   if (start_date - previous_period.getStopDate()) > 1.9:
-    raise ValidationFailed, translateString(
+    raise ValidationFailed(translateString(
         "Last opened period ends on ${last_openned_date},"+
         " this period starts on ${this_period_start_date}."+
         " Accounting Periods must be consecutive.",
           mapping = { 'last_openned_date': previous_period.getStopDate(),
-                      'this_period_start_date': start_date } )
+                      'this_period_start_date': start_date } ))

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/script_checkTransactionsState.py

@@ -34,7 +34,7 @@ while section.getPortalType() == period.getPortalType():
 
 section_category = section.getGroup(base=True)
 if not section_category:
-  raise ValidationFailed, translateString("This Organisation must be member of a Group")
+  raise ValidationFailed(translateString("This Organisation must be member of a Group"))
 
 
 # XXX copy and paste from AccountingPeriod_createBalanceTransaction !
@@ -81,5 +81,5 @@ movement_list = portal.portal_simulation.getMovementHistoryList(
       limit=1)
 
 if movement_list:
-  raise ValidationFailed, translateString(
-    "All Accounting Transactions for this organisation during the period have to be closed first.")
+  raise ValidationFailed(translateString(
+    "All Accounting Transactions for this organisation during the period have to be closed first."))

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/script_validateTransactionLines.py

@@ -32,21 +32,21 @@ for line in transaction_lines:
     ):
 
     if account is not None and account.getValidationState() != 'validated':
-      raise ValidationFailed, translateString(
+      raise ValidationFailed(translateString(
           "Account ${account_title} is not validated.",
-           mapping=dict(account_title=account.Account_getFormattedTitle()))
+           mapping=dict(account_title=account.Account_getFormattedTitle())))
       
     if third_party is not None and\
         third_party.getValidationState() in invalid_state_list:
-      raise ValidationFailed, translateString(
+      raise ValidationFailed(translateString(
           "Third party ${third_party_name} is invalid.",
-           mapping=dict(third_party_name=third_party.getTitle()))
+           mapping=dict(third_party_name=third_party.getTitle())))
       
     if bank_account is not None:
       if bank_account.getValidationState() in invalid_state_list:
-        raise ValidationFailed, translateString(
+        raise ValidationFailed(translateString(
             "Bank Account ${bank_account_reference} is invalid.",
-             mapping=dict(bank_account_reference=bank_account.getReference()))
+             mapping=dict(bank_account_reference=bank_account.getReference())))
       
       if account is not None and account.isMemberOf('account_type/asset/cash/bank'):
         # also check that currencies are consistent if we use this quantity for
@@ -54,11 +54,11 @@ for line in transaction_lines:
         bank_account_currency = bank_account.getProperty('price_currency')
         if bank_account_currency is not None and \
               bank_account_currency != line.getResource():
-          raise ValidationFailed, translateString(
+          raise ValidationFailed(translateString(
             "Bank Account ${bank_account_reference} "
             "uses ${bank_account_currency} as default currency.",
             mapping=dict(bank_account_reference=bank_account.getReference(),
-                         bank_account_currency=bank_account.getPriceCurrencyReference()))
+                         bank_account_currency=bank_account.getPriceCurrencyReference())))
 
   source_currency = None
   source_section = line.getSourceSectionValue()

bt5/erp5_accounting_l10n_in/SkinTemplateItem/portal_skins/erp5_accounting_l10n_in/AccountModule_getTrialBalanceReportSectionList.py

@@ -18,7 +18,7 @@ show_parent_accounts = request.get('show_parent_accounts', False)
 # flat_mode is a boolean that indicate wether we should use a report tree
 #   or a flat list of all accounts.
 if request.get('tree_mode', False):
-  raise 'Tree mode no longer supported'
+  raise ValueError('Tree mode no longer supported')
 
 result = []
 params = {

bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoice_postGeneration.py

@@ -2,7 +2,7 @@
 the new Invoice.
 """
 if related_simulation_movement_path_list is None:
-  raise RuntimeError, 'related_simulation_movement_path_list is missing. Update ERP5 Product.'
+  raise RuntimeError('related_simulation_movement_path_list is missing. Update ERP5 Product.')
 
 invoice = context
 

bt5/erp5_apparel/TestTemplateItem/portal_components/test.erp5.testProductionOrderApparel.py

@@ -327,8 +327,8 @@ class TestProductionOrderApparelMixin(TestOrderMixin):
         LOG('object.getQuantity()',0,object.getQuantity())
         LOG('object.__dict__',0,object.__dict__)
         LOG('object.getDeliveryValue().getQuantity()',0,object.getDeliveryValue().getQuantity())
-        raise AssertionError, "Attribute: %s, Value: %s, Result: %s" %\
-                    (attribute, value, getattr(object, attribute)())
+        raise AssertionError("Attribute: %s, Value: %s, Result: %s"
+                    % (attribute, value, getattr(object, attribute)()))
 
   def stepCheckProductionSimulation(self, sequence=None, sequence_list=None,
                                     **kw):

bt5/erp5_archive/ToolComponentTemplateItem/portal_components/tool.erp5.ArchiveTool.py

@@ -116,7 +116,7 @@ class ArchiveTool(BaseTool):
     """
     # First check parameter for destination catalog
     if destination_archive_id == archive_id:
-      raise ValueError, "Archive and destination archive can't be the same"
+      raise ValueError("Archive and destination archive can't be the same")
     portal_catalog =self.portal_catalog
     # Guess connection id from current catalog
     source_catalog = portal_catalog.getSQLCatalog()
@@ -126,7 +126,7 @@ class ArchiveTool(BaseTool):
     source_deferred_connection_id = source_catalog.getConnectionId(deferred=True)
 
     if source_connection_id is None or source_deferred_connection_id is None:
-      raise ValueError, "Unable to determine connection id for the current catalog"
+      raise ValueError("Unable to determine connection id for the current catalog")
 
     # Get destination property from archive
     destination_archive_id = destination_archive_id.split(' - ')[0]
@@ -144,25 +144,25 @@ class ArchiveTool(BaseTool):
 
     # Check we don't use same connection id for source and destination
     if destination_sql_catalog_id == source_catalog_id:
-      raise ValueError, "Destination and source catalog can't be the same"
+      raise ValueError("Destination and source catalog can't be the same")
     if destination_connection_id == source_connection_id:
-      raise ValueError, "Destination and source connection can't be the same"
+      raise ValueError("Destination and source connection can't be the same")
     if destination_deferred_connection_id == source_deferred_connection_id:
-      raise ValueError, "Destination and source deferred connection can't be the same"
+      raise ValueError("Destination and source deferred connection can't be the same")
     # Same for source and archive
     if archive_sql_catalog_id == source_catalog_id:
-      raise ValueError, "Archive and source catalog can't be the same"
+      raise ValueError("Archive and source catalog can't be the same")
     if archive_connection_id == source_connection_id:
-      raise ValueError, "Archive and source connection can't be the same"
+      raise ValueError("Archive and source connection can't be the same")
     if archive_deferred_connection_id == source_deferred_connection_id:
-      raise ValueError, "Archive and source deferred connection can't be the same"
+      raise ValueError("Archive and source deferred connection can't be the same")
     # Same for destination and archive
     if archive_sql_catalog_id == destination_sql_catalog_id:
-      raise ValueError, "Archive and destination catalog can't be the same"
+      raise ValueError("Archive and destination catalog can't be the same")
     if archive_connection_id == destination_connection_id:
-      raise ValueError, "Archive and destination connection can't be the same"
+      raise ValueError("Archive and destination connection can't be the same")
     if archive_deferred_connection_id == destination_deferred_connection_id:
-      raise ValueError, "Archive and destination deferred connection can't be the same"
+      raise ValueError("Archive and destination deferred connection can't be the same")
 
     # Update connection id in destination and archive catalog if asked
     destination_sql_catalog = getattr(portal_catalog, destination_sql_catalog_id)

bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_inventory_workflow/script_validateConsistency.py

@@ -8,17 +8,17 @@ start_date = inventory.getStartDate()
 if start_date is None:
   text = "Sorry, you must define the inventory date"
   message = Message(domain='ui', message=text)
-  raise ValidationFailed, message
+  raise ValidationFailed(message)
 
 # Make sure the node is defined
 node = inventory.getDestination()
 if node is None:
   text = "Sorry, you must define the inventory warehouse"
   message = Message(domain='ui', message=text)
-  raise ValidationFailed, message
+  raise ValidationFailed(message)
 
 
 # use of the constraint
 error_list = inventory.checkConsistency()
 if len(error_list) > 0:
-  raise ValidationFailed, (error_list[0].getTranslatedMessage(),)
+  raise ValidationFailed(error_list[0].getTranslatedMessage())

bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/script_checkArchive.py

@@ -11,7 +11,7 @@ catalog_id = archive.getCatalogId()
 
 if "deferred" not in archive.getDeferredConnectionId():
   msg = Message(domain='ui', message='Deferred connection ID choose is not a deferred connection.')
-  raise ValidationFailed, (msg,)
+  raise ValidationFailed(msg)
 
 def sort_max_date(a, b):
   return cmp(a.getStopDateRangeMax(), b.getStopDateRangeMax())
@@ -32,7 +32,7 @@ if archive.getStopDateRangeMax() is not None:
         break
     if previous_archive.getStopDateRangeMax().Date() != min_stop_date:
       msg = Message(domain='ui', message='Archive are not contiguous.')
-      raise ValidationFailed, (msg,)
+      raise ValidationFailed(msg)
 else:
   previous_archive_list = [x.getObject() for x in archive.portal_catalog(portal_type="Archive",
                                                                          validation_state='ready')]
@@ -47,7 +47,7 @@ else:
         break
     if previous_archive.getStopDateRangeMax().Date() != min_stop_date:
       msg = Message(domain='ui', message='Archive are not contiguous.')
-      raise ValidationFailed, (msg,)
+      raise ValidationFailed(msg)
 
 
 # Check the catalog
@@ -57,4 +57,4 @@ previous_archive_list = [x.getObject() for x in archive.portal_catalog(portal_ty
 for arch in previous_archive_list:
   if arch.getCatalogId() == catalog_id and arch is not previous_archive:
     msg = Message(domain='ui', message='Use of a former catalog is prohibited.')
-    raise ValidationFailed, (msg,)
+    raise ValidationFailed(msg)

bt5/erp5_barcode/ExtensionTemplateItem/portal_components/extension.erp5.Barcode.py

@@ -66,7 +66,7 @@ def printBarcodeSheet(self, sheet_number=1, input_list=[], test=False):
     ps2pdf_command = '%s %s %s' % (ps2pdf, ps_file_path, new_pdf_file_path)
     ret = os.system(ps2pdf_command)
     if ret != 0:
-      raise RuntimeError, 'PS Conversion Failed'
+      raise RuntimeError('PS Conversion Failed')
     file = open(new_pdf_file_path, 'rb')
     result = file.read()
     file_size = len(result)
@@ -93,7 +93,7 @@ def printBarcodeSheet(self, sheet_number=1, input_list=[], test=False):
   text_command = 'echo "%s" > %s' % (input_list, new_txt_file_path)
   ret = os.system(text_command)
   if ret != 0:
-    raise RuntimeError, 'File Creation Failed'
+    raise RuntimeError('File Creation Failed')
 
   if horizontal_padding not in ('', None) and vertical_padding not in ('', None):
     margin = '%sx%s' % (horizontal_padding, vertical_padding)
@@ -139,7 +139,7 @@ def printBarcodeSheet(self, sheet_number=1, input_list=[], test=False):
   barcode_command += ' -o %s ' %(new_ps_file_path)
   ret = os.system(barcode_command)
   if ret != 0:
-    raise RuntimeError, 'Barcode PS File Creation Failed'
+    raise RuntimeError('Barcode PS File Creation Failed')
   if test:
     return getPdfOutput(self, new_ps_file_path, file_name='TestReferenceSheet.pdf')
 

bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.Agent.py

@@ -80,7 +80,7 @@ class Agent(Folder, Image):
                                   % self.absolute_url())
         return
       else :
-        raise RuntimeError, 'No file or an empty file was specified'
+        raise RuntimeError('No file or an empty file was specified')
 
     import_file.seek(0)
     self.manage_upload(file=import_file)

bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.CausalityMovementGroup.py

@@ -58,7 +58,7 @@ class CausalityMovementGroup(MovementGroup):
         movement = movement.getParentValue().getParentValue()
       explanation_value = movement.getExplanationValue()
       if explanation_value is None:
-        raise ValueError, 'No explanation for movement %s' % movement.getPath()
+        raise ValueError('No explanation for movement %s' % movement.getPath())
     else:
       # This is a temp movement
       explanation_value = None

bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.Url.py

@@ -135,7 +135,7 @@ class Url(Coordinate, UrlMixin):
     if to_url is None:
       to_url = self.getUrlString(None)
     if from_url is None or to_url is None:
-      raise AttributeError, "No mail defined"
+      raise AttributeError("No mail defined")
 
     portal_notifications = getToolByName(self, 'portal_notifications')
 

bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.py

@@ -29,7 +29,7 @@ def generateBarcodeImage(self, barcode_type, data, REQUEST=None):
     fp.seek(0)
     output = fp.read()
   else:
-    raise NotImplementedError, 'barcode_type=%s is not supported' % barcode_type
+    raise NotImplementedError('barcode_type=%s is not supported' % barcode_type)
   if REQUEST is not None:
     REQUEST.RESPONSE.setHeader('Content-Type', 'image/png')
   return output

bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.BuilderMixin.py

@@ -290,8 +290,8 @@ class BuilderMixin(XMLObject, Amount, Predicate):
     for movement in select_method(**kw):
       movement = movement.getObject()
       if movement in movement_set:
-        raise SelectMethodError('%s returned %s twice or more' % \
-                (method_id, movement.getRelativeUrl()))
+        raise SelectMethodError('%s returned %s twice or more'
+            % (method_id, movement.getRelativeUrl()))
       movement_set.add(movement)
       movement_list.append(movement)
 
@@ -493,7 +493,7 @@ class BuilderMixin(XMLObject, Amount, Predicate):
 
       if delivery is None:
         if not self.isDeliveryCreatable():
-          raise SelectMethodError('No updatable delivery found with %s for %s' \
+          raise SelectMethodError('No updatable delivery found with %s for %s'
                   % (self.getPath(), movement_group_node_list))
 
         delivery = self._createDelivery(delivery_module,
@@ -661,8 +661,9 @@ class BuilderMixin(XMLObject, Amount, Predicate):
     else:
       movement_list = movement_group_node.getMovementList()
       if len(movement_list) != 1:
-        raise CollectError, "DeliveryBuilder: %s unable to distinct those\
-              movements: %s" % (self.getId(), str(movement_list))
+        raise CollectError(
+            "DeliveryBuilder: %s unable to distinct those movements: %s"
+            % (self.getId(), movement_list))
       else:
         # XXX Hardcoded value
         base_id = 'movement'
@@ -720,8 +721,8 @@ class BuilderMixin(XMLObject, Amount, Predicate):
                        membership_criterion_base_category_list=movement.\
                                              getVariationBaseCategoryList())
           else:
-            raise MatrixError, 'Cell: %s already exists on %s' % \
-                  (str(cell_key), str(delivery_line))
+            raise MatrixError('Cell: %s already exists on %s'
+                % (cell_key, delivery_line))
           object_to_update = cell
         self._setUpdated(object_to_update, 'cell')
         self._setDeliveryMovementProperties(

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getCareerStartDate.py

@@ -17,4 +17,4 @@ for career_step in career_step_list :
   # for now, we only return the first one.
   return career_step.getStartDate()
 
-raise ValueError, 'No Career Step Defined.'
+raise ValueError('No Career Step Defined.')

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_updateUserSecurityGroup.py

@@ -21,7 +21,7 @@ user_name = context.getId()
 # XXX Note : sometimes, you don't want to update security for users who don't belong to your organisation.
 #            You can then add code in the assignment_workflow script to skip those (if role != internal for instance)
 if user_name not in user_folder.getUserNames():
-  raise RuntimeError, "Error: Zope user '%s' doesn't exist in the acl_users folder"  % (user_name)
+  raise RuntimeError("Error: Zope user %r doesn't exist in the acl_users folder"  % user_name)
 
 category_list = []
 security_group_list = []

bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/script_Assignment_checkActiveAssignmentConsistency.py

@@ -23,4 +23,4 @@ for assignment in person_object.contentValues(filter={'portal_type': 'Assignment
 
 # The only case when several assignments can be started at the same time is when they share the same 'site' value.
 if len(assignment_site_list) != 1:
-  raise ValidationFailed, "Error: started assignments must have the same site value."
+  raise ValidationFailed("Error: started assignments must have the same site value.")

bt5/erp5_big_file/DocumentTemplateItem/portal_components/document.erp5.BigFile.py

@@ -116,7 +116,7 @@ class BigFile(File):
       file = StringIO(file)
 
     if isinstance(file, FileUpload) and not file:
-      raise ValueError, 'File not specified'
+      raise ValueError('File not specified')
 
     seek=file.seek
     read=file.read

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportLineList.py

@@ -42,8 +42,8 @@ for person in person_value_list:
     resource = inventory.resource_relative_url
 
     if inventory.resource_uid in presence_resource_uid_list:
-      raise ValueError, "This report does not work when same resource are"\
-                        " used in presence and leave."
+      raise ValueError("This report does not work when same resource are"
+                       " used in presence and leave.")
 
     person_time = (person_planned_time - person.getAvailableTime(
                       from_date=from_date,

bt5/erp5_certificate_authority/ToolComponentTemplateItem/portal_components/tool.erp5.CertificateAuthorityTool.py

@@ -36,6 +36,7 @@ from Products.ERP5Type.Tool.BaseTool import BaseTool
 from Products.ERP5Type import Permissions
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zLOG import LOG, INFO
+from six import reraise
 
 def popenCommunicate(command_list, input_=None, **kwargs):
   kwargs.update(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -220,7 +221,7 @@ class CertificateAuthorityTool(BaseTool):
           certificate=open(cert).read(),
           id=new_id,
           common_name=common_name)
-      except:
+      except Exception:
         e = sys.exc_info()
         try:
           for p in key, csr, cert:
@@ -229,7 +230,7 @@ class CertificateAuthorityTool(BaseTool):
         except Exception:
           # do not raise during cleanup
           pass
-        raise e[0], e[1], e[2]
+        reraise(*e)
     finally:
       self._unlockCertificateAuthority()
 
@@ -260,7 +261,7 @@ class CertificateAuthorityTool(BaseTool):
         created.append(alias)
         os.symlink(os.path.basename(crl), alias)
         return dict(crl=open(crl).read())
-      except:
+      except Exception:
         e = sys.exc_info()
         try:
           for p in 'index.txt', 'crlnumber':
@@ -272,7 +273,7 @@ class CertificateAuthorityTool(BaseTool):
         except Exception:
           # do not raise during cleanup
           pass
-        raise e[0], e[1], e[2]
+        reraise(*e)
     finally:
       self._unlockCertificateAuthority()
 

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_finalizeShopping.py

@@ -21,7 +21,7 @@ if isAnon:
 
 #Check if payment is sucessfull
 if buyer is None:
-  raise ValueError, "Impossible to finalize and order not payed"
+  raise ValueError("Impossible to finalize and order not payed")
 
 portal_type = "Sale %s" % shopping_cart.getPortalType()
 module = context.getDefaultModule(portal_type)

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_setShoppingCartBuyer.py

 """Set connected user as shopping cart customer"""
 if REQUEST is not None:
-  raise RuntimeError, "You can not call this script from the URL"
+  raise RuntimeError("You can not call this script from the URL")
 
 shopping_cart = context.SaleOrder_getShoppingCart()
 

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testAlarm.py

@@ -338,7 +338,7 @@ class TestAlarm(ERP5TypeTestCase):
       finally:
         self.portal.portal_activities.manageClearActivities(keep=0)
     else:
-      raise Exception, 'Tic did not raise though activity was supposed to fail'
+      raise Exception('Tic did not raise though activity was supposed to fail')
     # Make the sense method succeed and leave a trace
     self.getPortal().portal_skins[skin_folder_id][sense_method_id].ZPythonScript_edit('*args,**kw', 'context.newActiveProcess()')
     alarm.activeSense()

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Catalog.py

@@ -165,7 +165,7 @@ class IndexableDocument(ObjectManager):
     if name.startswith('is') or \
        name.startswith('provides'):
       return lambda: 0
-    raise AttributeError, name
+    raise AttributeError(name)
 
   def getProperty(self, prop, default=None):
     return getattr(aq_base(self), prop, default)
@@ -2155,7 +2155,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
         result = query('SELECT * FROM roles_and_users WHERE allowedRolesAndUsers LIKE "%s:%%" AND uid = %i' % (line['allowedRolesAndUsers'], uid) )
         self.assertNotEqual(len(result), 0, 'No line found for allowedRolesAndUsers=%r and uid=%i' % (line['allowedRolesAndUsers'], uid))
       else:
-        raise Exception, 'Malformed allowedRolesAndUsers value: %r' % (line['allowedRolesAndUsers'], )
+        raise Exception('Malformed allowedRolesAndUsers value: %(allowedRolesAndUsers)r' % line)
 
     # Check that object that 'bar' can view because of 'Author' role can *not*
     # be found when searching for his other 'Whatever' role.

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendPasswordResetLink.py

@@ -9,7 +9,7 @@ if context.hasDocumentReference():
 else:
   message_reference = portal.portal_preferences.getPreferredCredentialPasswordRecoveryMessageReference()
 if message_reference is None:
-  raise ValueError, "Preference not configured"
+  raise ValueError("Preference not configured")
 notification_message = portal.NotificationTool_getDocumentValue(message_reference,
                                                                 context.getLanguage())
 

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRecovery_sendUsernameRecoveryMessage.py

@@ -17,7 +17,7 @@ if context.hasDocumentReference():
 else:
   message_reference = portal.portal_preferences.getPreferredCredentialUsernameRecoveryMessageReference()
 if message_reference is None:
-  raise ValueError, "Preference not configured"
+  raise ValueError("Preference not configured")
 
 notification_message = portal.NotificationTool_getDocumentValue(message_reference,
                                                                 context.getLanguage())

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_createUser.py

@@ -6,7 +6,7 @@
 
 #Don't allow to call from url
 if REQUEST:
-  raise ValueError, "You can not call this script from the url"
+  raise ValueError("You can not call this script from the url")
 
 portal = context.getPortalObject()
 portal_preferences = context.portal_preferences
@@ -27,7 +27,7 @@ if user_id and login.hasPassword():
 reference = context.getReference()
 if not login.hasReference():
   if not reference:
-    raise ValueError, "Impossible to create an account without login"
+    raise ValueError("Impossible to create an account without login")
   login.setReference(reference)
   if not user_id:
     person.setUserId(reference)

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_sendAcceptedNotification.py

@@ -16,7 +16,7 @@ notification_reference = 'credential_request-confirmation-%s' % notification_typ
 notification_message = portal.portal_notifications.getDocumentValue(reference=notification_reference, 
                                                                     language=recipient.getLanguage())
 if notification_message is None:
-  raise ValueError, 'Unable to found Notification Message with reference "%s".' % notification_reference
+  raise ValueError('Unable to found Notification Message with reference "%s".' % notification_reference)
 
 #Set notification mapping
 notification_mapping_dict = {'login_name': login}

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialUpdate_copyDefaultImage.py

@@ -3,7 +3,7 @@ Proxy
 Manager -- allow to update all image property"""
 
 if REQUEST is not None:
-  raise ValueError, "This script can not be call from url"
+  raise ValueError("This script can not be call from url")
 
 def getAccessor(prop):
   return "".join([x.capitalize() for x in prop.split('_')])

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/Credential_checkConsistency.py

@@ -8,4 +8,4 @@ Assignee -- allow to check credential informations"""
 for portal_type in destination_decision_type:
   destination = context.getDestinationDecisionValue(portal_type=portal_type)
   if destination is None:
-    raise ValueError, '%s request must  be in relation with a %s' % (context.getPortalType(),portal_type)
+    raise ValueError('%s request must  be in relation with a %s' % (context.getPortalType(),portal_type))

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/Credential_updatePersonPassword.py

@@ -14,16 +14,16 @@ if context.getPassword():
         if login.getReference() == reference:
           break
       else:
-        raise RuntimeError, 'Person %s does not have a validated Login with reference %r' % \
-            (person.getRelativeUrl(), reference)
+        raise RuntimeError('Person %s does not have a validated Login with reference %r'
+          % (person.getRelativeUrl(), reference))
     else: # BBB when login reference is not set in Credential Update document.
       if login_list:
         user_id = person.Person_getUserId()
         login = sorted(login_list,
                        key=lambda x:x.getReference() == user_id, reverse=True)[0]
       else:
-        raise RuntimeError, 'Person %s does not have a validated Login with reference %r' % \
-            (person.getRelativeUrl(), reference)
+        raise RuntimeError('Person %s does not have a validated Login with reference %r'
+          % (person.getRelativeUrl(), reference))
   else:
     # BBB
     login = person

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_addEvent.py

@@ -47,7 +47,7 @@ elif direction == 'incoming':
   destination_url = destination or person
   destination_section_url = organisation
 else:
-  raise NotImplementedError, 'The specified direction is not handled: %r' % (direction,)
+  raise NotImplementedError('The specified direction is not handled: %r' % (direction,))
 
 event_kw = {
   'portal_type' : portal_type,

bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCrmReports.py

@@ -110,7 +110,7 @@ class CrmTestCase(ERP5ReportTestCase):
     ev = self.event_module.newContent(portal_type=portal_type,**kw)
 
     if simulation_state == 'assigned':
-      raise NotImplementedError, '%r state only exists in the old event workflow.' % simulation_state
+      raise NotImplementedError('%r state only exists in the old event workflow.' % simulation_state)
       """
       ticket=self.portal.restrictedTraverse(ev.getFollowUp())
       self._doWorkflowAction(ev,'assign_action',
@@ -120,7 +120,7 @@ class CrmTestCase(ERP5ReportTestCase):
     elif simulation_state == 'planned':
       ev.plan()
     elif simulation_state == 'posted':
-      raise NotImplementedError, '%r state only exists in the old event workflow.' % simulation_state
+      raise NotImplementedError('%r state only exists in the old event workflow.' % simulation_state)
       """
       ev.start()
       """
@@ -128,12 +128,12 @@ class CrmTestCase(ERP5ReportTestCase):
       ev.start()
       ev.deliver()
     elif simulation_state == 'new':
-      raise NotImplementedError, '%r state only exists in the old event workflow.' % simulation_state
+      raise NotImplementedError('%r state only exists in the old event workflow.' % simulation_state)
       """
       ev.receive()
       """
     elif simulation_state == 'acknowledged':
-      raise NotImplementedError, '%r state only exists in the old event workflow.' % simulation_state
+      raise NotImplementedError('%r state only exists in the old event workflow.' % simulation_state)
       """
       ticket=self.portal.restrictedTraverse(ev.getFollowUp())
       self._doWorkflowAction(ev,'assign_action',
@@ -147,13 +147,13 @@ class CrmTestCase(ERP5ReportTestCase):
     elif simulation_state == 'deleted':
       ev.delete()
     elif simulation_state == 'expired':
-      raise NotImplementedError, '%r state only exists in the old event workflow.' % simulation_state
+      raise NotImplementedError('%r state only exists in the old event workflow.' % simulation_state)
       """
       ev.receive()
       ev.expire()
       """
     elif simulation_state == 'responded':
-      raise NotImplementedError, '%r state only exists in the old event workflow.' % simulation_state
+      raise NotImplementedError('%r state only exists in the old event workflow.' % simulation_state)
       """
       ev.receive()
       ev.respond()
@@ -161,7 +161,7 @@ class CrmTestCase(ERP5ReportTestCase):
     elif simulation_state == 'started':
       ev.start()
     elif simulation_state == 'ordered':
-      raise NotImplementedError, '%r state only exists in the old event workflow.' % simulation_state
+      raise NotImplementedError('%r state only exists in the old event workflow.' % simulation_state)
       """
       ev.plan()
       ev.order()

bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/script_Event_createEventForAcknowledge.py

@@ -24,7 +24,7 @@ follow_up = event.getFollowUp()
 
 if follow_up is None:
   if not (follow_up_ticket_type and follow_up_ticket_title):
-    raise ValueError, 'Follow up must not empty when assign or acknowledge.'
+    raise ValueError('Follow up must not empty when assign or acknowledge.')
 
 if follow_up is None and follow_up_ticket_type and follow_up_ticket_title:
   event.Event_createFollowUpTicket(follow_up_ticket_title,

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_computeReportSection.py

@@ -17,7 +17,7 @@ with portal.Localizer.translationContext(localizer_language):
       if field.getRecursiveTemplateField().meta_type == 'ReportBox':
         report_section_list.extend(field.render())
   else:
-    raise ValueError, 'form meta_type (%r) unknown' %(form.meta_type,)
+    raise ValueError('form meta_type (%r) unknown' %(form.meta_type,))
 
   report_title = portal.Base_translateString((form.getProperty('title')))
 

bt5/erp5_development_wizard/ExtensionTemplateItem/portal_components/extension.erp5.Development.py

@@ -36,7 +36,7 @@ def Base_runPythonScript(self, code):
   code = '\n'.join(code_line_list)
   script.write(code)
   if script._code is None:
-    raise ValueError, repr(script.errors)
+    raise ValueError(repr(script.errors))
 
   return script()
 

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/WebSection_createNewDiscussionThread.py

@@ -119,7 +119,7 @@ if send_notification_text not in ('', None):
     notification_reference = 'forum-new-thread'
     notification_message = context.NotificationTool_getDocumentValue(notification_reference, 'en')
     if notification_message is None:
-      raise ValueError, 'Unable to found Notification Message with reference "%s".' % notification_reference
+      raise ValueError('Unable to found Notification Message with reference "%s".' % notification_reference)
 
     notification_mapping_dict = {'subject': discussion_thread.getTitle(),
                                  'url': discussion_thread.absolute_url(),

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.py

@@ -27,7 +27,7 @@ if searchabletext is None:
     searchabletext = selection_object.get('searchabletext')
 
 if searchabletext is None:
-  raise ValueError, "No search string specified."
+  raise ValueError("No search string specified.")
 
 parsed_search_string = context.Base_parseSearchString(searchabletext)
 

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromAssignmentTree.py

@@ -34,7 +34,7 @@ for assignment in person_object.contentValues(filter={'portal_type': 'Assignment
           if root: category_value=category_value.split('/')[0]
           category_dict[base_category] = category_value
         else:
-          raise RuntimeError, "Error: '%s' property is required in order to update person security group"  % (base_category)
+          raise RuntimeError("Error: '%s' property is required in order to update person security group"  % base_category)
       category_list.append(category_dict)
       # if not strict, we go up the hierarchy (because if you work in group/a/b/c, chances are you 
       # are working in group/a/b, too :)

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromDestination.py

@@ -15,7 +15,7 @@ for ob in obj.getDestinationValueList():
     if category_value not in (None, ''):
       category_dict[base_category] = category_value
     else:
-      raise RuntimeError, "Error: '%s' property is required in order to update person security group"  % (base_category)
+      raise RuntimeError("Error: '%s' property is required in order to update person security group"  % base_category)
   category_list.append(category_dict)
 
 log(category_list)

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ERP5Type_getSecurityCategoryFromUser.py

@@ -18,7 +18,7 @@ for base_category in base_category_list:
   if category_value not in (None, ''):
     category_dict[base_category] = category_value
   else:
-    raise RuntimeError, "Error: '%s' property is required in order to update person security group"  % (base_category)
+    raise RuntimeError("Error: '%s' property is required in order to update person security group"  % base_category)
   category_list.append(category_dict)
 
 return category_list

bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.py

@@ -153,4 +153,4 @@ def setGuard(self, guard):
   if isinstance(self, TransitionDefinition):
     self.guard = guard
   else:
-    raise ValueError, "not a TransitionDefinition"
+    raise ValueError("not a TransitionDefinition")

bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.SubversionClient.py

@@ -122,7 +122,7 @@ try:
     def __call__(self):
       current_time = time.time()
       if current_time - self.client.creation_time > self.client.getTimeout():
-        raise SubversionTimeoutError, 'too long transaction'
+        raise SubversionTimeoutError('too long transaction')
         #return True
       return False
 
@@ -355,7 +355,7 @@ try:
 
     def info(self, path):
       if not os.path.exists(path):
-        raise ValueError, "Repository %s does not exist" % path
+        raise ValueError("Repository %s does not exist" % path)
       # symlinks are not well supported by pysvn
       if os.path.islink(path):
         path = os.path.realpath(path)
@@ -368,7 +368,7 @@ try:
         else:
           raise error
       if entry is None:
-        raise ValueError, "Could not open SVN repository %s" % path
+        raise ValueError("Could not open SVN repository %s" % path)
       # transform entry to dict to make it more usable in zope
       members_tuple = ('url', 'uuid', 'revision', 'kind', \
       'commit_author', 'commit_revision', 'commit_time',)
@@ -413,4 +413,4 @@ except ImportError:
       'could not import pysvn; until pysvn is installed properly,'
       ' this tool will not work.', error=True)
   def newSubversionClient(container, **kw):
-    raise SubversionInstallationError, 'pysvn library is not installed'
+    raise SubversionInstallationError('pysvn library is not installed')

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugLine_send.py

@@ -37,7 +37,7 @@ if to_url is None:
       else:
         to_url_list.append(email)
     else:
-      raise ValueError, 'Recipient %s has no defined email' % recipient
+      raise ValueError('Recipient %s has no defined email' % recipient)
 elif same_type(to_url, ''):
   to_url_list.append(to_url)
 

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/CategoryTool_generateTranslationFile.py

@@ -11,7 +11,7 @@ request = container.REQUEST
 response = request.RESPONSE
 
 if import_filename=='':
-  raise ValueError, "You must upload a file"
+  raise ValueError("You must upload a file")
 
 def addReportLine(error, category, message):
   report_line = newTempBase(context, 'item')
@@ -22,9 +22,8 @@ def invalid_category_spreadsheet_handler(message):
   # action taken when an invalid spreadsheet is provided.
   # we *raise* a Redirect, because we don't want the transaction to succeed
   # note, we could make a dialog parameter to allow import invalid spreadsheet:
-  raise 'Redirect', '%s/view?portal_status_message=%s' % (
-                         context.portal_categories.absolute_url(),
-                         message)
+  context.Base_redirect('view', keep_items={'portal_status_message':message},
+                        abort_transaction=True)
 
 category_list_mapping = context.Base_getCategoriesSpreadSheetMapping(import_file,
                                     invalid_spreadsheet_error_handler=invalid_category_spreadsheet_handler)

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getPOFile.py

@@ -61,7 +61,7 @@ for i in catalog(portal_type='Glossary Term',
 
   if translated_title:
     if not english_title:
-      raise ValueError, 'Title of corresponding English term(%s) to "%s" is empty.' % (english_relative_url, translated_title)
+      raise ValueError('Title of corresponding English term(%s) to "%s" is empty.' % (english_relative_url, translated_title))
     if translated_title!=english_title:
       print formatMessage(english=formatString(english_title),
                           translation=formatString(translated_title),
@@ -69,7 +69,7 @@ for i in catalog(portal_type='Glossary Term',
 
   if translated_description:
     if not english_description:
-      raise ValueError, 'Description of corresponding English term(%s) to "%s" is empty.' % (english_relative_url, translated_description)
+      raise ValueError('Description of corresponding English term(%s) to "%s" is empty.' % (english_relative_url, translated_description))
 
     if translated_description!=english_description:
       print formatMessage(english=formatString(english_description),

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_modifyFieldList.py

@@ -8,7 +8,7 @@ for listbox_line in listbox_line_list:
   if not choice:
     continue
   elif len(choice) > 1:
-    raise ValueError, 'Unknown choice %s' % choice
+    raise ValueError('Unknown choice %s' % choice)
   else:
     choice = choice[0]
     if choice.startswith('0_'):
@@ -29,6 +29,6 @@ for listbox_line in listbox_line_list:
       # skin_folder.manage_addProduct['ERP5Form'].addERP5Form(id=form_id, title='')
       # raise NotImplementedError
     else:
-      raise ValueError, 'Unknown choice %s' % choice
+      raise ValueError('Unknown choice %s' % choice)
 
 context.Base_redirect()

bt5/erp5_full_text_myisam_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_deferFullTextIndexActivity.py

@@ -39,7 +39,7 @@ if len(failed_path_list):
     context.activate(activity='SQLQueue', priority=5).SQLCatalog_deferFullTextIndexActivity(path_list=failed_path_list)
   else:
     # if all objects are failed one, just raise an exception to avoid infinite loop.
-    raise AttributeError, 'exception %r raised in indexing %r' % (exception, failed_path_list)
+    raise AttributeError('exception %r raised in indexing %r' % (exception, failed_path_list))
 
 if parameter_dict:
   return method(**parameter_dict)

bt5/erp5_full_text_sphinxse_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_deferFullTextIndexActivity.py

@@ -39,7 +39,7 @@ if len(failed_path_list):
     context.activate(activity='SQLQueue', priority=5, serialization_tag='sphinxse_indexing').SQLCatalog_deferFullTextIndexActivity(path_list=failed_path_list)
   else:
     # if all objects are failed one, just raise an exception to avoid infinite loop.
-    raise AttributeError, 'exception %r raised in indexing %r' % (exception, failed_path_list)
+    raise AttributeError('exception %r raised in indexing %r' % (exception, failed_path_list))
 
 if parameter_dict:
   method(**parameter_dict)

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.py

@@ -3,7 +3,7 @@ the new Invoice.
 """
 
 if related_simulation_movement_path_list is None:
-  raise RuntimeError, 'related_simulation_movement_path_list is missing. Update ERP5 Product.'
+  raise RuntimeError('related_simulation_movement_path_list is missing. Update ERP5 Product.')
 
 invoice = context
 

bt5/erp5_mrp/TestTemplateItem/portal_components/test.erp5.testProductionOrder.py

@@ -696,8 +696,8 @@ class TestProductionOrderMixin(TestOrderMixin):
         LOG('object.getDeliveryValue()', 0, delivery_value)
         if delivery_value is not None:
           LOG('object.getDeliveryValue().getQuantity()',0,delivery_value.getQuantity())
-        raise AssertionError, "Attribute: %s, Value: %s, Result: %s" %\
-                    (attribute, value, getattr(object, attribute)())
+        raise AssertionError("Attribute: %s, Value: %s, Result: %s"
+          % (attribute, value, getattr(object, attribute)()))
 
   def stepCheckProductionSimulation(self, sequence=None, sequence_list=None,
                                     **kw):

bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/ListBox_getReportTreeStructure.py

@@ -25,7 +25,7 @@ def order_line_list(line_list, current_structure, depth=0, index=0, last_dict=No
       index += 1
       index = order_line_list(line_list, new_structure, depth=new_depth, index=index, last_dict=last_dict)
     elif section_depth > (depth +2):
-      raise ValueError, "A depth is missing"
+      raise ValueError("A depth is missing")
     else:
       return index
   if index < len(line_list):

bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_getReportResultListTitle.py

@@ -10,4 +10,4 @@ if active_process_path is not None:
     return '%s lines imported sucessfully' % \
                       len(context.Base_getReportResultList(active_process_path=active_process_path))
 
-raise AttributeError, 'Unable to get the active process'
+raise AttributeError('Unable to get the active process')

bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFile.py

@@ -114,7 +114,7 @@ else:
 
       # portal_type should be the same for all columns
       if portal_type != mapping[spreadsheet_name][0]:
-        raise AttributeError, "Portal type is not the same for all columns"
+        raise AttributeError("Portal type is not the same for all columns")
 
   # If no mapping is given
   if not mapping:
@@ -165,7 +165,7 @@ else:
                          active_process=active_process_path)
  
         if getattr(context, import_file_line_script, None) is None:
-          raise AttributeError, 'specified script "%s" does not exists' % import_file_line_script
+          raise AttributeError('specified script "%s" does not exists' % import_file_line_script)
 
         getattr(active_object, import_file_line_script)(context.getRelativeUrl(),
                 portal_type,

bt5/erp5_ooo_import/SkinTemplateItem/portal_skins/erp5_ooo_import/Base_importFileLineDefaultScript.py

@@ -30,7 +30,7 @@ for allowed_portal_type in container.allowedContentTypes():
     break
 
 if portal_type_object is None:
-  raise ValueError, 'Disallowed subobject type: %s' % portal_type
+  raise ValueError('Disallowed subobject type: %s' % portal_type)
 else:
   # Default result
   success = 1

bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenSaleOrderLine_getPeriodicityLineValueList.py

@@ -21,4 +21,4 @@ for sale_trade_condition in sale_trade_condition_list:
     if periodicity_line.getResourceUid()==resource_uid:
       return [periodicity_line]
 
-raise RuntimeError, 'Cannot find an appropriate Periodicity Line for the movement: %s' % context.getRelativeUrl()
+raise RuntimeError('Cannot find an appropriate Periodicity Line for the movement: %s' % context.getRelativeUrl())

bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/SaleOrder_copyOpenSaleOrderProperties.py

 if related_simulation_movement_path_list is None:
-  raise RuntimeError, 'related_simulation_movement_path_list is missing. Update ERP5 Product.'
+  raise RuntimeError('related_simulation_movement_path_list is missing. Update ERP5 Product.')
 
 open_sale_order = context.getCausalityValue()
 

bt5/erp5_open_trade_periodicity_line/DocumentTemplateItem/portal_components/document.erp5.PeriodicityLine.py

@@ -54,7 +54,7 @@ class PeriodicityLineMixin(PeriodicityMixin):
     if scope_type:
       method = self._getTypeBasedMethod('calculateScopeTypeStopDate')
       if method is None:
-        raise RuntimeError, 'Type based method calculateScopeTypeStopDate does not exist.'
+        raise RuntimeError('Type based method calculateScopeTypeStopDate does not exist.')
       else:
         return method(scope_type, start_date)
     elif time_scale:
@@ -62,7 +62,7 @@ class PeriodicityLineMixin(PeriodicityMixin):
         day = length_number
         return start_date+day
       else:
-        raise RuntimeError, 'Unknown time scale: %s' % time_scale
+        raise RuntimeError('Unknown time scale: %s' % time_scale)
     else:
       return None
 

bt5/erp5_open_trade_periodicity_line/SkinTemplateItem/portal_skins/erp5_open_trade_periodicity_line/PeriodicityLine_calculateScopeTypeStopDate.py

@@ -28,4 +28,4 @@ elif scope_type=='until_the_end_of_month':
     return DateTime(year, month, day)
   return getEndOfMonth(start_date)
 
-raise ValueError, 'Unknown scope type: %s' % scope_type
+raise ValueError('Unknown scope type: %s' % scope_type)

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.py

@@ -45,8 +45,9 @@ if matrixbox :
             translateString('${contribution_share_title} (Amount or Percent)',
                             mapping=dict(contribution_share_title=category_item[0]))))
         else:
-          raise ValueError, "PaySheetModelLine_asCellRange: the two categories "\
-                "must could be only contribution_share and salary_range"
+          raise ValueError(
+            "%s: base category must be either contribution_share or salary_range"
+            % script.id)
       cell_range.append(category_cell_range)
 
     cell_range = filter(lambda x: x != [], cell_range)

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_asCellRange.py

@@ -9,7 +9,7 @@ category_list = []
 for category in context.getVariationSettingsCategoryList():
   category_name = category.replace('salary_range/','',1)
   if context.portal_categories.getCategoryValue(category) is None:
-    raise ValueError, 'no category %s' % category
+    raise ValueError('no category %s' % category)
   else:
     if matrixbox:
       category_list.extend(context.portal_categories.getCategoryValue(category).getCategoryChildLogicalPathItemList(checked_permission='View', is_right_display=1, base=1)[1:])

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.py

@@ -105,9 +105,9 @@ def getSocialOrganisationValue():
       business_path_list = business_process.getTradeModelPathValueList(trade_phase=\
           'payroll/invoicing/social_security', context=context)
       if len(business_path_list) > 1:
-        raise NotImplementedError, 'For now, it can not support more '\
-              'than one business_path with same trade_phase. '\
-              '%s have same trade_phase' % repr(business_path_list)
+        raise NotImplementedError('For now, it can not support more'
+              ' than one business_path with same trade_phase.'
+              ' %r have same trade_phase' % business_path_list)
       if len(business_path_list) == 1:
         business_path = business_path_list[0]
         return business_path.getSourceSectionValue()

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.py

@@ -26,7 +26,7 @@ base_contribution_uid_list = []
 for category in base_contribution_list:
   category_value = base_amount.restrictedTraverse(category)
   if category_value is None:
-    raise ValueError, 'Category "%s/%s" not found.' % (base_amount.getPath(), category)
+    raise ValueError('Category "%s/%s" not found.' % (base_amount.getPath(), category))
   base_contribution_uid_list.append(category_value.getUid())
 
 params = {

bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateWorkTimeSalary.py

@@ -22,8 +22,8 @@ for paysheet in paysheet_list:
   if annotation_line is None:
     annotation_line = getattr(paysheet, 'work_time_annotation_line', None)
   if annotation_line is None:
-    raise ValueError, "Paysheet %s has no Annotation Line with reference work_time_annotation_line"\
-                             % paysheet.getRelativeUrl()
+    raise ValueError("Paysheet %s has no Annotation Line with reference work_time_annotation_line"
+                             % paysheet.getRelativeUrl())
   nb_heures = annotation_line.getQuantity()
   yearly_work_time += nb_heures
 

bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.py

@@ -172,7 +172,7 @@ class PayzenService(XMLObject, PayzenREST):
         # backward compatibility:
         message_list.append(err[3])
     if message_list:
-      raise ValidationFailed, message_list
+      raise ValidationFailed(message_list)
 
     temp_document = self.newContent(temp_object=True, portal_type='Document', id='id')
     temp_document.edit(

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.py

@@ -97,9 +97,9 @@ for task_line in result_list:
   source_uid = task_line.node_uid
   if source_uid is None:
     # This should not happens, so display an error message
-    raise ValueError, context.Base_translateString(\
+    raise ValueError(context.Base_translateString(
         "This task should have a source : ${task_relative_url}",
-        mapping = {'task_relative_url': task_line.getRelativeUrl()})
+        mapping = {'task_relative_url': task_line.getRelativeUrl()}))
   source_dict = source_uid_dict.get(source_uid, None)
   if source_dict is None:
     source_value = task_line.getSourceValue()

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getPlanningBoxReportList.py

@@ -19,7 +19,7 @@ if selection is not None:
   elif selection.report_path == 'parent':
     return context.searchFolder(**kw)
   else:
-    raise NotImplementedError, "Unknow domain %s" % selection.report_path
+    raise NotImplementedError("Unknow domain %s" % selection.report_path)
 
   return context.portal_catalog(**kw)
 

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSummaryList.py

@@ -33,7 +33,7 @@ for task in task_list:
         update_kw['real_start_date'] = task_line.getStartDate()
         update_kw['real_stop_date'] = task_line.getStopDate()
       else:
-        raise ValueError, "This script more than one causality yet"
+        raise ValueError("This script more than one causality yet")
     elif task_line.getPortalType() == 'Task Line':
       update_kw['initial_quantity'] = task_line.getQuantity()
       update_kw['initial_start_date'] = task_line.getStartDate()

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.py

 """Export the current selection in task report module in iCalendar format.
 """
+from zExceptions import Unauthorized
 # XXX bypass CookieCrumbler
 if context.REQUEST.AUTHENTICATED_USER.getUserName() == 'Anonymous User': 
   if context.REQUEST.get('disable_cookie_login__', 0) \
           or context.REQUEST.get('no_infinite_loop', 0)  :
-    raise 'Unauthorized', context
+    raise Unauthorized(context)
   return context.REQUEST.RESPONSE.redirect(script.id + "?disable_cookie_login__=1&no_infinite_loop=1")
 
 def formatDate(date):

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_copyOrderPropertiesAndNotifyAssignee.py

 if related_simulation_movement_path_list is None:
-  raise RuntimeError, 'related_simulation_movement_path_list is missing. Update ERP5 Product.'
+  raise RuntimeError('related_simulation_movement_path_list is missing. Update ERP5 Product.')
 
 if REQUEST is not None:
   from zExceptions import Unauthorized

bt5/erp5_secure_payment/ToolComponentTemplateItem/portal_components/tool.erp5.SecurePaymentTool.py

@@ -50,7 +50,7 @@ class SecurePaymentTool(BaseTool):
       if len(result) > 0:
         return result[0].getObject().__of__(self)
 
-    raise ValueError, "Impossible to find a payment service with '%s' reference" % service_reference
+    raise ValueError("Impossible to find a payment service with '%s' reference" % service_reference)
 
   def _loginAsSuperUser(self):
     user = getSecurityManager().getUser()

bt5/erp5_short_message/DocumentTemplateItem/portal_components/document.erp5.EssendexGateway.py

@@ -172,7 +172,7 @@ class EssendexGateway(XMLObject):
       return message_ids.split(",")
     elif result['Result'] == "Error":
       #we get an error when call the gateway
-      raise SMSGatewayError, urllib.unquote(result.get('Message', "Impossible to send the SMS"))
+      raise SMSGatewayError(urllib.unquote(result.get('Message', "Impossible to send the SMS")))
     elif result['Result'] == "Test":
       #just a test, no message id
       return None
@@ -199,7 +199,7 @@ class EssendexGateway(XMLObject):
       return result.get('MessageStatus').lower()
     elif result['Result'] == "Error":
       #we get an error when call the gateway
-      raise SMSGatewayError, urllib.unquote(result.get('Message', "Impossible to get the message status"))
+      raise SMSGatewayError(urllib.unquote(result.get('Message', "Impossible to get the message status")))
 
   security.declarePublic('receive')
   def receive(self, REQUEST, **kw):
@@ -209,7 +209,7 @@ class EssendexGateway(XMLObject):
     datas = REQUEST['BODY']
 
     if not datas:
-      raise SMSGatewayError, "Impossible to notify nothing"
+      raise SMSGatewayError("Impossible to notify nothing")
 
     #Get current user
     sm = getSecurityManager()
@@ -231,18 +231,18 @@ class EssendexGateway(XMLObject):
 
       #Check Account id
       if xml['AccountId'] != self.getGatewayAccountId():
-        raise Unauthorized, 'Bad accound id (%s)' % xml['AccountId']
+        raise Unauthorized('Bad accound id (%s)' % xml['AccountId'])
 
       if notification_type == 'InboundMessage':
         self.notifyReception(xml)
       elif notification_type == 'MessageDelivered':
         self.notifyDelivery(xml)
       elif notification_type == 'MessageError':
-        raise SMSGatewayError, "'MessageError' notification is not implemented (%s)" % str(kw)
+        raise SMSGatewayError("'MessageError' notification is not implemented (%s)" % str(kw))
       elif notification_type == 'SubscriptionEvent':
-        raise SMSGatewayError, "'MessageError' notification is not implemented (%s)" % str(kw)
+        raise SMSGatewayError("'MessageError' notification is not implemented (%s)" % str(kw))
       else:
-        raise SMSGatewayError, "Unknow '%s' notification (%s)" % (notification_type, str(kw))
+        raise SMSGatewayError("Unknow '%s' notification (%s)" % (notification_type, str(kw)))
     finally:
       #Restore orinal user
       setSecurityManager(sm)
@@ -345,6 +345,6 @@ class EssendexGateway(XMLObject):
       LOG("EssendexGateway", INFO, result)
     elif result['Result'] == "Error":
       #we get an error when call the gateway
-      raise SMSGatewayError, urllib.unquote(result.get('Message', "Impossible to get last message list"))
+      raise SMSGatewayError(urllib.unquote(result.get('Message', "Impossible to get last message list")))
 
 

bt5/erp5_short_message/DocumentTemplateItem/portal_components/document.erp5.MobytGateway.py

@@ -189,7 +189,7 @@ class MobytGateway(XMLObject):
       return [result.get('status_info', "")] #return message id (gateway side)
     elif result['status'] == "KO":
       #we get an error when call the gateway
-      raise SMSGatewayError, urllib.unquote(result.get('status_info', "Impossible to send the SMS"))
+      raise SMSGatewayError(urllib.unquote(result.get('status_info', "Impossible to send the SMS")))
     elif result['status'] == "Test":
       #just a test, no message id
       return None
@@ -224,7 +224,7 @@ class MobytGateway(XMLObject):
 
     elif result['status'] == "KO":
       #we get an error when call the gateway
-      raise SMSGatewayError, urllib.unquote(result.get('status_info', "Impossible to get the message status"))
+      raise SMSGatewayError(urllib.unquote(result.get('status_info', "Impossible to get the message status")))
 
   security.declarePublic('receive')
   def receive(self,REQUEST):

bt5/erp5_simulation/DocumentTemplateItem/portal_components/document.erp5.VariationEquivalenceTester.py

@@ -79,7 +79,7 @@ class VariationEquivalenceTester(Predicate, EquivalenceTesterMixin):
                  sorted(prevision_value.items())
       else:
         # should not happen
-        raise AttributeError, 'prevision and decision values of this divergence tester should be list, tuple or dict.'
+        raise AttributeError('prevision and decision values of this divergence tester should be list, tuple or dict.')
       if not result:
         try:
           # XXX We should use "getTranslatedTestedPropertyTitleList", but it seems to

bt5/erp5_syncml/DocumentTemplateItem/portal_components/document.erp5.SyncMLSubscription.py

@@ -402,11 +402,11 @@ class SyncMLSubscription(XMLObject):
       try:
         user = user_folder.getUserById(user_id).__of__(user_folder) # __of__ might got AttributeError
       except AttributeError:
-        raise ValueError("User %s cannot be found in user folder, \
-              synchronization cannot work with this kind of user" % (user_id,))
+        raise ValueError("User %s cannot be found in user folder,"
+              " synchronization cannot work with this kind of user" % user_id)
       if user is None:
-        raise ValueError("User %s cannot be found in user folder, \
-              synchronization cannot work with this kind of user" % (user_id,))
+        raise ValueError("User %s cannot be found in user folder,"
+              " synchronization cannot work with this kind of user" % user_id)
       else:
         newSecurityManager(None, user)
     else:
@@ -1036,11 +1036,11 @@ class SyncMLSubscription(XMLObject):
           else:
             result_list = query_method(**kw)
       else:
-        raise KeyError, 'This Subscriber %s provide no list method:%r'\
-          % (self.getPath(), list_method_id)
+        raise KeyError('This Subscriber %s provide no list method:%r'
+          % (self.getPath(), list_method_id))
     else:
-      raise KeyError, 'This Subscriber %s provide no list method with id:%r'\
-        % (self.getPath(), list_method_id)
+      raise KeyError('This Subscriber %s provide no list method with id:%r'
+        % (self.getPath(), list_method_id))
     return result_list
 
   security.declareProtected(Permissions.ModifyPortalContent, 'generateNewSessionId')
@@ -1107,7 +1107,7 @@ class SyncMLSubscription(XMLObject):
         if id == document.getId():
           return signature
     else: # XXX-Aurel : maybe none is expected # pylint: disable=useless-else-on-loop
-      raise KeyError, id
+      raise KeyError(id)
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getSignatureFromGid')

bt5/erp5_syncml/ModuleComponentTemplateItem/portal_components/module.erp5.SyncMLUtils.py

@@ -77,7 +77,7 @@ class PdataHelper(persistent.Persistent):
       value = StringIO(value)
 
     if isinstance(value, FileUpload) and not value:
-      raise ValueError, 'File not specified'
+      raise ValueError('File not specified')
 
     if isinstance(value, Pdata):
       size = self._read_size_from_pdata(value)

bt5/erp5_syncml/ModuleComponentTemplateItem/portal_components/module.erp5.XMLSyncUtils.py

@@ -62,8 +62,8 @@ def encode(format, string_to_encode): # pylint: disable=redefined-builtin
   #elif format is .... put here the other formats
   else:#if there is no format corresponding with format, raise an error
     LOG('encode : unknown or not implemented format : ', INFO, format)
-    raise ValueError, "Sorry, the server ask for the format %s but \
-          it's unknow or not implemented" % format
+    raise ValueError("Sorry, the server ask for the format %s but"
+          " it's unknown or not implemented" % format)
 
 def decode(format, string_to_decode): # pylint: disable=redefined-builtin
   """
@@ -77,8 +77,7 @@ def decode(format, string_to_decode): # pylint: disable=redefined-builtin
   #elif format is .... put here the other formats
   else:#if there is no format corresponding with format, raise an error
     LOG('decode : unknown or not implemented format :', INFO, format)
-    raise ValueError, "Sorry, the format %s is unknow or \
-          not implemented" % format
+    raise ValueError("Sorry, the format %s is unknown or not implemented" % format)
 
 def isDecodeEncodeTheSame(string_encoded, string_decoded, format): # pylint: disable=redefined-builtin
   """

bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.py

@@ -45,7 +45,7 @@ def parseTestSuiteResults(file_handler):
   # when called with a string argument, zipfile.ZipFile will open a local file.
   # we don't want this to happen
   if isinstance(file_handler, basestring):
-    raise Unauthorized, file_handler
+    raise Unauthorized(file_handler)
   zf = zipfile.ZipFile(file_handler)
 
   result = {}

bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.IntegrationModule.py

@@ -88,7 +88,7 @@ class IntegrationModule(XMLObject):
         else:
           return self.getObjectList[item]
     except ValueError, msg:
-      raise KeyError, msg
+      raise KeyError(msg)
 
   security.declareProtected(Permissions.AccessContentsInformation,
                             'getGIDFor')

bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.IntegrationSite.py

@@ -78,7 +78,7 @@ class IntegrationSite(Folder):
     """
     if not category:
       LOG("getCategoryFromMapping", ERROR, "empty category provided")
-      raise ValueError, "Empty category provided"
+      raise ValueError("Empty category provided")
 
     # Split the category to have the base and the variation category
     _, variation_category = category.split('/', 1)
@@ -110,7 +110,7 @@ class IntegrationSite(Folder):
             # only the base category has to be mapped
             if missing_mapping or current_object.getDestinationReference() is None:
               # We do not want the process to go on if base category mappings is missing
-              raise ValueError, "Mapping not defined for %s" % category
+              raise ValueError("Mapping not defined for %s" % category)
             return current_object.getDestinationReference() +'/'+ category.split('/', 1)[1]
           else:
             # Create default line that has to be mapped by user later
@@ -125,12 +125,12 @@ class IntegrationSite(Folder):
             missing_mapping = True
           else:
             LOG("getCategoryFromMapping", ERROR, "Mapping object for %s not found" %(cat,))
-            raise ValueError, "Mapping object for %s not found" %(cat,)
+            raise ValueError("Mapping object for %s not found" % cat)
 
       mapped_category = cat_object.getDestinationReference()
       if mapped_category in ("", None) and cat_object.getPortalType() == "Integration Category Mapping":
         LOG("getCategoryFromMapping", ERROR, "Mapping not defined for %s" % (cat,))
-        raise ValueError, "Mapping not defined for %s" % cat
+        raise ValueError("Mapping not defined for %s" % cat)
       if mapped_base_category is None:
         mapped_base_category = mapped_category
       else:
@@ -143,7 +143,7 @@ class IntegrationSite(Folder):
 ##                                                                                        category))
     if missing_mapping:
       # We do not want the process to go on if mappings are missing
-      raise ValueError, "Mapping not defined for %s" % category
+      raise ValueError("Mapping not defined for %s" % category)
     return mapped_variation_category[-1]
 
   security.declareProtected(Permissions.AccessContentsInformation,
@@ -165,7 +165,7 @@ class IntegrationSite(Folder):
         destination_reference=base_category,
     )
     if len(mapping) != 1:
-      raise IndexError, 'The integration base category mapping %s must be mapped and with only one base_category' % (base_category)
+      raise IndexError('The integration base category mapping %s must be mapped and with only one base_category' % base_category)
 
     mapping = mapping[0].getObject()
     # retrieve the corresponding category integration mapping
@@ -174,7 +174,7 @@ class IntegrationSite(Folder):
         destination_reference=category,
     )
     if len(mapping_line) > 1:
-      raise IndexError, 'The integration category mapping %s must be mapped with only one category' % (variation)
+      raise IndexError('The integration category mapping %s must be mapped with only one category' % variation)
     try:
       # shared variation
       return '/'.join(
@@ -204,7 +204,7 @@ class IntegrationSite(Folder):
                                              destination_reference=property_name,
                                              )
     if len(mapping_line) > 1:
-      raise IndexError, 'The integration property mapping %s must be mapped with only one category' % (property_name)
+      raise IndexError('The integration property mapping %s must be mapped with only one category' % property_name)
     elif len(mapping_line) == 0:
       return property_name
     else:

bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.py

@@ -134,7 +134,7 @@ class WebServiceRequest(XMLObject, ZopePageTemplate):
                    last_request_error="No connection available, connector is %s" %(self.getSourceValue(),))
         return []
       else:
-        raise ValueError, "No connection available"
+        raise ValueError("No connection available")
 
     # Add specific parameters defined on integration site
     site = self.getIntegrationSite()
@@ -236,7 +236,7 @@ class WebServiceRequest(XMLObject, ZopePageTemplate):
           if test_mode:
             self._edit(last_request_error="Bad XML returned by request, impossible to parse it")
           else:
-            raise ValueError, "Bad XML returned by request %s with kw = %s, xml = %s" %(self.getPath(), kw, xml)
+            raise ValueError("Bad XML returned by request %s with kw = %s, xml = %s" %(self.getPath(), kw, xml))
 
     brain = getBrain(self.brain_class_file, self.brain_class_name, reload=1)
 
@@ -269,17 +269,17 @@ class WebServiceRequest(XMLObject, ZopePageTemplate):
     try:
       long(item)
     except ValueError:
-      raise KeyError, "Item %s does not exists call by Web Service Request %s : not a long" % (item,
-                                                                                               self.getTitle(),)
+      raise KeyError("Item %s does not exists call by Web Service Request %s : not a long" % (item,
+                                                                                               self.getTitle(),))
     kw = {self.getIDParameterName() : str(item), }
     object_list = self(**kw)
     if len(object_list) == 1:
       return object_list[0]
     else:
-      raise KeyError, "Item %s does not exists call by Web Service Request %s with params %s return %d results" % (item,
+      raise KeyError("Item %s does not exists call by Web Service Request %s with params %s return %d results" % (item,
                                                                                                                    self.getTitle(),
                                                                                                                    kw,
-                                                                                                                   len(object_list))
+                                                                                                                   len(object_list)))
 
   def parse_dict(self, parser_dict, dict_list):
     """ Render the dict list mapped by the parser dict. """

bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequestGroup.py

@@ -69,6 +69,6 @@ class WebServiceRequestGroup(XMLObject):
     # after browsing all web service requests check that item exists and only
     # one time
     if len(object_list) != 1:
-      raise KeyError, "No entry for the item %s" % item
+      raise KeyError("No entry for the item %s" % item)
     return object_list[0]
 

bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBaseConduit.py

@@ -125,11 +125,11 @@ class TioSafeBaseConduit(ERP5Conduit):
     if getattr(self, 'integration_site', None) is None:
       related_object_list = [x.getObject() for x in sync_object.Base_getRelatedObjectList()]
       if len(related_object_list) != 1:
-        raise ValueError, "Impossible to find related object to %s : %s" %(sync_object.getPath(), related_object_list)
+        raise ValueError("Impossible to find related object to %s : %s" %(sync_object.getPath(), related_object_list))
       integration_site = related_object_list[0].getParentValue()
       if integration_site.getPortalType() != "Integration Site":
-        raise ValueError, "Did not get an Integration Site object instead %s : %s" %(integration_site.getPortalType(),
-                                                                                     integration_site.getPath())
+        raise ValueError("Did not get an Integration Site object instead %s : %s" %(integration_site.getPortalType(),
+                                                                                     integration_site.getPath()))
       self.integration_site = integration_site
     return self.integration_site
 
@@ -142,14 +142,14 @@ class TioSafeBaseConduit(ERP5Conduit):
     module_id = "%s_module" %(object_type.lower())
     module = getattr(site, module_id, None)
     if module is None:
-      raise ValueError, "Impossible to find integration module object on %s for %s" %(site.getPath(), object_type)
+      raise ValueError("Impossible to find integration module object on %s for %s" %(site.getPath(), object_type))
 
     if synchronization_type == "publication":
       return module.getSourceSectionValue()
     elif synchronization_type == "subscription":
       return module.getDestinationSectionValue()
     else:
-      raise ValueError, 'Unknown type %s' %(synchronization_type,)
+      raise ValueError('Unknown type %s' %(synchronization_type,))
 
   def updateNode(self, xml=None, object=None, previous_xml=None, force=False,
       simulate=False, reset=False, xpath_expression=None, **kw):

bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBrain.py

@@ -106,7 +106,7 @@ class TioSafeBrain(Explicit):
           module_list.append(module)
 
       if not len(module_list):
-        raise ValueError, "Impossible to find a module for %s" %(object_type)
+        raise ValueError("Impossible to find a module for %s" % object_type)
 
       sync_object_list = []
       for module in module_list:
@@ -129,12 +129,12 @@ class TioSafeBrain(Explicit):
           #  2. sync_type != tiosafe and destination_portal_type != Integration Module
           sync_object_list.append(module_destination.getPath())
         else:
-          raise ValueError, "Impossible to find pub/sub related to Integration Module, pub = %s with source = %s, sub = %s with source = %s" %(
+          raise ValueError("Impossible to find pub/sub related to Integration Module, pub = %s with source = %s, sub = %s with source = %s" %(
               module.getSourceSection(),
               module_source.getSource(),
               module.getDestinationSection(),
               module_destination.getSource(),
-              )
+              ))
       return sync_object_list
 
     # Cache sync object list
@@ -175,7 +175,7 @@ class TioSafeBrain(Explicit):
         try:
           prop_value = getattr(self, prop)
         except AttributeError:
-          raise AttributeError, "The brain doesn't have the property %s" % prop
+          raise AttributeError("The brain doesn't have the property %s" % prop)
         gid += " %s" %(prop_value,)
 
       self.gid = gid
@@ -401,7 +401,7 @@ class Node(TioSafeBrain):
             organisation_gid = None
 
         if organisation_gid is None:
-          raise ValueError, "Impossible to find organisation for id %s on node %s" %(self.relation, self.path)
+          raise ValueError("Impossible to find organisation for id %s on node %s" %(self.relation, self.path))
       else:
         organisation_gid = ""
       # set the tag
@@ -539,7 +539,7 @@ class Transaction(TioSafeBrain):
         # Must find a better way to browse specialised objects
         specialized_trade_condition = trade_condition.getSpecialiseValue()
         if specialized_trade_condition is None or specialized_trade_condition.getPortalType() == "Business Process":
-          raise ValueError, 'Impossible to find a trade condition containing VAT lines, last trade condition was %s, parent was %s' %(specialized_trade_condition, trade_condition)
+          raise ValueError('Impossible to find a trade condition containing VAT lines, last trade condition was %s, parent was %s' %(specialized_trade_condition, trade_condition))
         else:
           trade_condition = specialized_trade_condition
 
@@ -679,7 +679,7 @@ class Transaction(TioSafeBrain):
             elif line_type == 'Delivery':
               resource = integration_site.getDestinationCarrierValue()
             else:
-              raise ValueError, 'Try to work on "%s" which is an invalid type.' % line_type
+              raise ValueError('Try to work on "%s" which is an invalid type.' % line_type)
           # after the work on the line set the resource value which will be
           # render in the xml
           movement_dict['resource'] = resource_gid

bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeNodeConduit.py

@@ -102,8 +102,9 @@ class TioSafeNodeConduit(TioSafeBaseConduit):
     try:
       previous_value = previous_xml[0].text
     except IndexError:
-      raise IndexError, 'Too little or too many value, only one is required for %s' % (
-          previous_xml
+      raise IndexError(
+        'Too little or too many value, only one is required for %s'
+        % previous_xml
       )
 
     # check if it'a work on person or on address

bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeResourceConduit.py

@@ -164,8 +164,9 @@ class TioSafeResourceConduit(TioSafeBaseConduit):
     try:
       previous_value = previous_xml[0].text
     except IndexError:
-      raise ValueError, 'Too little or too many value, only one is required for %s' % (
-          previous_xml
+      raise ValueError(
+        'Too little or too many value, only one is required for %s'
+        % previous_xml
       )
 
     # check if it'a work on product or on categories
@@ -268,8 +269,9 @@ class TioSafeResourceConduit(TioSafeBaseConduit):
             previous_xml[0].text,
         )
       except IndexError:
-        raise IndexError, 'Too little or too many value, only one is required for %s' % (
-            previous_xml
+        raise IndexError(
+            'Too little or too many value, only one is required for %s'
+            % previous_xml
         )
 
       # retrieve the current value to check if exists a conflict

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.AccountingERP5IntegrationConduit.py

@@ -78,7 +78,7 @@ class AccountingERP5IntegrationConduit(TioSafeBaseConduit):
         'PP', 'SA', 'SR', 'VP', 'VR'):
       return 'Payment Transaction'
     else:
-      raise "getObjectType: ERROR journal code unknow"
+      raise Exception("getObjectType: ERROR journal code unknown")
 
   def constructContent(self, object, object_id, portal_type): # pylint: disable=redefined-builtin
     """

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.ERP5NodeConduit.py

@@ -76,8 +76,8 @@ class ERP5NodeConduit(TioSafeBaseConduit):
     if len(stc_list) == 0:
       self._createSaleTradeCondition(object, **kw)
     elif len(stc_list) > 1:
-      raise ValueError, "Multiple trade condition (%s) retrieved for %s" \
-      % ([x.path for x in stc_list], object.getTitle())
+      raise ValueError("Multiple trade condition (%s) retrieved for %s"
+      % ([x.path for x in stc_list], object.getTitle()))
     else:
       stc = stc_list[0].getObject()
       stc.edit(
@@ -155,7 +155,8 @@ class ERP5NodeConduit(TioSafeBaseConduit):
       if link_object is not None:
         document.setCareerSubordinationValue(link_object)
       else:
-        raise ValueError, "Impossible to find organisation %s in %s" %(organisation_gid, synchronization_list)
+        raise ValueError("Impossible to find organisation %s in %s"
+                         % (organisation_gid, synchronization_list))
     document.reindexObject()
     return []
 

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.ERP5PaymentTransactionConduit.py

@@ -151,7 +151,7 @@ class ERP5PaymentTransactionConduit(TioSafeBaseConduit):
             if tag in node_dict:
               node_dict[tag](document=sub_object, xml=node, **kw)
             else:
-              raise ValueError, "This is an unknown sub-element %s on %s" %(tag, sub_object.getPath())
+              raise ValueError("This is an unknown sub-element %s on %s" %(tag, sub_object.getPath()))
           elif tag in ['start_date', 'stop_date']:
             if not node.text:
               node.text = None

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.ERP5ResourceConduit.py

@@ -141,7 +141,7 @@ class ERP5ResourceConduit(TioSafeBaseConduit):
 
       conflict_list = self._createMapping(sub_object, mapping_list)
       if len(conflict_list):
-        raise ValueError, "Conflict on creation of resource, should not happen, conflict = %r" %(conflict_list)
+        raise ValueError("Conflict on creation of resource, should not happen, conflict = %r" % conflict_list)
 
       self.newObject(
           object=sub_object,
@@ -232,7 +232,7 @@ class ERP5ResourceConduit(TioSafeBaseConduit):
       ss_list = portal.sale_supply_module.searchFolder(title=name,
                                                        validation_state='validated')
       if len(ss_list) > 1:
-        raise ValueError, "Too many sale supplies, does not know which to choose"
+        raise ValueError("Too many sale supplies, does not know which to choose")
       if len(ss_list) == 0:
         # Create a new one
         ss = portal.sale_supply_module.newContent(title=name)
@@ -249,7 +249,7 @@ class ERP5ResourceConduit(TioSafeBaseConduit):
       pref_list = [x for x in portal.portal_preferences.objectValues(portal_type="System Preference")\
                    if x.getPreferenceState()=="global"]
       if len(pref_list) > 1:
-        raise ValueError, "Too many system preferences, does not know which to choose"
+        raise ValueError("Too many system preferences, does not know which to choose")
       elif len(pref_list) == 0:
         pref = portal.portal_preferences.newContent(portal_type="System Preference",
                                              title="default system preference for TioSafe",
@@ -376,8 +376,9 @@ class ERP5ResourceConduit(TioSafeBaseConduit):
     try:
       previous_value = previous_xml[0].text
     except IndexError:
-      raise IndexError, 'Too little or too many value, only one is required for %s' % (
-          previous_xml,
+      raise IndexError(
+          'Too little or too many value, only one is required for %s'
+          % previous_xml
       )
 
     if isinstance(previous_value, unicode):
@@ -545,8 +546,9 @@ class ERP5ResourceConduit(TioSafeBaseConduit):
       try:
         previous_value = previous_xml[0].text
       except IndexError:
-        raise IndexError, 'Too little or too many value, only one is required for %s' % (
-            previous_xml
+        raise IndexError(
+          'Too little or too many value, only one is required for %s'
+          % previous_xml
         )
 
       if isinstance(previous_value, unicode):

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.ERP5TransactionConduit.py

@@ -106,7 +106,7 @@ class ERP5TransactionConduit(TioSafeBaseConduit):
             if tag in node_dict:
               node_dict[tag](document=sub_object, xml=node, **kw)
             else:
-              raise ValueError, "This is an unknown sub-element %s on %s" %(tag, sub_object.getPath())
+              raise ValueError("This is an unknown sub-element %s on %s" %(tag, sub_object.getPath()))
           if tag == 'currency':
             link_object = object.portal_catalog.getResultValue(
                 portal_type='Currency',
@@ -285,7 +285,7 @@ class ERP5TransactionConduit(TioSafeBaseConduit):
               break
         # in the worse case save the line with the unknown product
         if link_object is None:
-          raise ValueError, "Impossible to find related resource for gid %s" %(link_gid)
+          raise ValueError("Impossible to find related resource for gid %s" % link_gid)
 
         # set the resource in the dict
         movement_dict_value[tag] = link_object

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.TioSafeBaseConduit.py

@@ -160,11 +160,11 @@ class TioSafeBaseConduit(ERP5Conduit):
       else:
         related_object_list = [x.getObject() for x in sync_object.Base_getRelatedObjectList()]
       if len(related_object_list) != 1:
-        raise ValueError, "Impossible to find related object to %s : %s" %(sync_object.getPath(), related_object_list)
+        raise ValueError("Impossible to find related object to %s : %s" %(sync_object.getPath(), related_object_list))
       integration_site = related_object_list[0].getParentValue()
       if integration_site.getPortalType() != "Integration Site":
-        raise ValueError, "Did not get an Integration Site object instead %s : %s" %(integration_site.getPortalType(),
-                                                                                     integration_site.getPath())
+        raise ValueError("Did not get an Integration Site object instead %s : %s" %(integration_site.getPortalType(),
+                                                                                     integration_site.getPath()))
       self.integration_site = integration_site
     return self.integration_site
 
@@ -187,7 +187,7 @@ class TioSafeBaseConduit(ERP5Conduit):
       elif synchronization_type == "subscription":
         result_list.append(module.getDestinationSectionValue())
       else:
-        raise ValueError, 'Unknown type %s' %(synchronization_type,)
+        raise ValueError('Unknown type %s' %(synchronization_type,))
 
     return result_list
 

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.TioSafeNodeConduit.py

@@ -104,8 +104,9 @@ class TioSafeNodeConduit(TioSafeBaseConduit):
     try:
       previous_value = previous_xml[0].text
     except IndexError:
-      raise IndexError, 'Too little or too many value, only one is required for %s' % (
-          previous_xml
+      raise IndexError(
+        'Too little or too many value, only one is required for %s'
+        % previous_xml
       )
 
     # check if it'a work on person or on address

bt5/erp5_tiosafe_core/ModuleComponentTemplateItem/portal_components/module.erp5.TioSafeResourceConduit.py

@@ -80,7 +80,7 @@ class TioSafeResourceConduit(TioSafeBaseConduit):
     if create_method is not None:
       create_result = create_method(**keyword)
     else:
-      raise ValueError, 'Impossible to find a create method named %s and object %s' %(create_method_id, object.getPath(),)
+      raise ValueError('Impossible to find a create method named %s and object %s' %(create_method_id, object.getPath(),))
     if len(create_result):
       # We suppose the id of the object created was returned by the plugin
       new_id = create_result[0].getId()
@@ -127,7 +127,7 @@ class TioSafeResourceConduit(TioSafeBaseConduit):
     if delete_method is not None:
       return delete_method(product_id=object_id)
     else:
-      raise ValueError, 'Impossible to find a delete method named %s and object %s' %(delete_method_id, object.getPath(),)
+      raise ValueError('Impossible to find a delete method named %s and object %s' %(delete_method_id, object.getPath(),))
 
 
   def _updateXupdateUpdate(self, document=None, xml=None, previous_xml=None, **kw):
@@ -145,8 +145,9 @@ class TioSafeResourceConduit(TioSafeBaseConduit):
     try:
       previous_value = previous_xml[0].text
     except IndexError:
-      raise ValueError, 'Too little or too many value, only one is required for %s' % (
-          previous_xml
+      raise ValueError(
+        'Too little or too many value, only one is required for %s'
+        % previous_xml
       )
 
     if isinstance(previous_value, unicode):
@@ -206,8 +207,9 @@ class TioSafeResourceConduit(TioSafeBaseConduit):
             selected_previous_xml[0].text,
         )
       except IndexError:
-        raise IndexError, 'Too little or too many value, only one is required for %s' % (
-            previous_xml
+        raise IndexError(
+          'Too little or too many value, only one is required for %s'
+          % previous_xml
         )
       LOG("TiosafeResourceConduit.del", 300, "will remove category %s from %s" %(tag, previous_xml.text))
       # retrieve the current value to check if exists a conflict

bt5/erp5_tiosafe_core/SkinTemplateItem/portal_skins/erp5_integration/IntegrationCategoryMapping_init.py

-raise "yo", context
+raise ValueError(context)

bt5/erp5_tiosafe_core/SkinTemplateItem/portal_skins/erp5_integration/IntegrationModule_getSignatureDiff.py

@@ -2,7 +2,7 @@ im = context
 pub = im.getSourceSectionValue()
 pub_sub_list = pub.objectValues()
 if not len(pub_sub_list):
-  raise ValueError, "%s sub in pub %s for im %s" %(len(pub_sub_list), pub.getPath(), im.getPath())
+  raise ValueError("%s sub in pub %s for im %s" %(len(pub_sub_list), pub.getPath(), im.getPath()))
 else:
   pub_sub = pub_sub_list[0]
 #pub_sub = im.getSourceSectionValue().objectValues()[0]

bt5/erp5_tiosafe_core/SkinTemplateItem/portal_skins/erp5_integration/IntegrationModule_getTioSafeXMLDiff.py

@@ -44,7 +44,7 @@ if pub_method is not None and sub_method is not None:
       sub_xml.append(getattr(ob, sub_xml_method)())
 
 else:
-  raise ValueError, "Impossible to get method, pub_method = %s from %s, sub_method = %s from %s" %(pub_method, pub_list, sub_method, sub_list,)
+  raise ValueError("Impossible to get method, pub_method = %s from %s, sub_method = %s from %s" %(pub_method, pub_list, sub_method, sub_list,))
 
 pub_xml = '\n'.join(pub_xml)
 sub_xml = '\n'.join(sub_xml)

bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/ExpenseValidationRequest_createPurchaseTransaction.py

@@ -56,10 +56,8 @@ except ValidationFailed, error_message:
   if len(message) > 2000: # too long message will generate a too long URI
                           # that would become an error.
     message = "%s ..." % message[:(2000 - 4)]
-  raise Redirect, "%s?portal_status_message=%s" % (
-    context.getAbsoluteUrl(),
-    message
-    )
+  context.Base_redirect(keep_items={'portal_status_message':message})
+
 transaction.confirm()
 
 return transaction.getRelativeUrl()