py3: 2to3 -j 20 --write --nobackups --no-diffs --fix=raise master

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/SaleInvoiceTransaction_postSlapOSGeneration.py

@@ -7,7 +7,7 @@ from DateTime import DateTime
 portal = context.getPortalObject()
 
 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
 price_currency = invoice.getPriceCurrency()

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/SalePackingList_postSlapOSGeneration.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.')
 
 packing_list = context
 

master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSCatalogToolCacheMixin.py

@@ -48,7 +48,7 @@ class SlapOSCatalogToolCacheMixin(object):
         validation_state="validated",
         reference=reference)
     if len(compute_node_list) != 1:
-      raise NotFound, "No document found with parameters: %s" % reference
+      raise NotFound("No document found with parameters: %s" % reference)
     else:
       return _assertACI(compute_node_list[0].getObject()).getRelativeUrl()
 
@@ -88,7 +88,7 @@ class SlapOSCatalogToolCacheMixin(object):
       parent_uid=self._getNonCachedComputeNodeUid(
           compute_node_reference))
     if len(compute_partition_list) != 1:
-      raise NotFound, "No document found with parameters: %s %s" % \
-        (compute_node_reference, compute_partition_reference)
+      raise NotFound("No document found with parameters: %s %s" % \
+        (compute_node_reference, compute_partition_reference))
     else:
       return _assertACI(compute_partition_list[0].getObject())

master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSComputeNodeMixin.py

@@ -276,8 +276,8 @@ class SlapOSComputeNodeMixin(object):
         software_instance = _assertACI(software_instance_list[0].getObject())
       elif software_instance_count > 1:
         # XXX do not prevent the system to work if one partition is broken
-        raise NotImplementedError, "Too many instances linked to %s" % \
-           compute_partition_document.getRelativeUrl()
+        raise NotImplementedError("Too many instances linked to %s" % \
+           compute_partition_document.getRelativeUrl())
 
     if software_instance is not None:
       state = software_instance.getSlapState()

master/bt5/slapos_cloud/MixinTemplateItem/portal_components/mixin.erp5.SlapOSComputePartitionMixin.py

@@ -98,9 +98,9 @@ class SlapOSComputePartitionMixin(object):
         software_instance = _assertACI(software_instance_list[0].getObject())
       elif software_instance_count > 1:
         # XXX do not prevent the system to work if one partition is broken
-        raise NotImplementedError, "Too many instances %s linked to %s" % \
+        raise NotImplementedError("Too many instances %s linked to %s" % \
           ([x.path for x in software_instance_list],
-           self.getRelativeUrl())
+           self.getRelativeUrl()))
 
     if software_instance is not None:
       state = software_instance.getSlapState()

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToGarbageCollect.py

@@ -11,8 +11,8 @@ if (instance.getSlapState() != "destroy_requested"):
     elif instance.getPortalType() == 'Slave Instance':
       is_slave = True
     else:
-      raise NotImplementedError, "Unknown portal type %s of %s" % \
-        (instance.getPortalType(), instance.getRelativeUrl())
+      raise NotImplementedError("Unknown portal type %s of %s" % \
+        (instance.getPortalType(), instance.getRelativeUrl()))
 
     if requester is None:
       # This instance has no successor (link removed) and should be trashed

master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToStopCollect.py

@@ -16,8 +16,8 @@ if (instance_tree.getSlapState() == "stop_requested"):
   elif instance.getPortalType() == 'Slave Instance':
     is_slave = True
   else:
-    raise NotImplementedError, "Unknown portal type %s of %s" % \
-        (instance.getPortalType(), instance.getRelativeUrl())
+    raise NotImplementedError("Unknown portal type %s of %s" % \
+        (instance.getPortalType(), instance.getRelativeUrl()))
 
   # Buildout may not propagate the stop request
   requester = instance.getSuccessorRelatedValue()

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/script_RequestedInstance_allocatePartition.py

@@ -9,7 +9,7 @@ kwargs = state_change.kwargs
 try:
   compute_partition_url = kwargs['compute_partition_url']
 except KeyError:
-  raise TypeError, "RequestedInstance_allocatePartition takes exactly 1 argument"
+  raise TypeError("RequestedInstance_allocatePartition takes exactly 1 argument")
 
 assert instance.getAggregateValue() is None
 compute_partition = portal.restrictedTraverse(compute_partition_url)

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/script_RequestedInstance_rename.py

@@ -26,7 +26,7 @@ request_software_instance_list = portal.portal_catalog(
   limit=1,
 )
 if len(request_software_instance_list) == 1:
-  raise ValueError, "Too many instances '%s' found: %s" % (software_title, [x.path for x in request_software_instance_list])
+  raise ValueError("Too many instances '%s' found: %s" % (software_title, [x.path for x in request_software_instance_list]))
 
 # Change the title
 previous_title = instance.getTitle()

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/script_RequestedInstance_updateConnectionInformation.py

@@ -4,7 +4,7 @@ instance = state_change['object']
 try:
   connection_xml = state_change.kwargs['connection_xml']
 except KeyError:
-  raise TypeError, "RequestedInstance_updateConnectionInformation takes exactly 1 arguments"
+  raise TypeError("RequestedInstance_updateConnectionInformation takes exactly 1 arguments")
 
 edit_kw = {
   'connection_xml': connection_xml,

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/script_RequestedInstance_updateParameterInformation.py

@@ -11,7 +11,7 @@ try:
   sla_xml = kwargs["sla_xml"]
   is_slave = kwargs["shared"]
 except KeyError:
-  raise TypeError, "RequestedInstance_updateParameterInformation takes exactly 5 arguments"
+  raise TypeError("RequestedInstance_updateParameterInformation takes exactly 5 arguments")
 
 edit_kw = {
   'url_string': software_release_url_string,
@@ -22,21 +22,21 @@ edit_kw = {
 
 # Check the slave management
 if is_slave not in [True, False]:
-  raise ValueError, "shared should be a boolean"
+  raise ValueError("shared should be a boolean")
 instance_portal_type = instance.getPortalType()
 if instance_portal_type == "Instance Tree":
   edit_kw['root_slave'] = is_slave
 elif instance_portal_type == "Software Instance":
   if is_slave:
-    raise NotImplementedError, "Please destroy before doing a slave instance (%s)" % \
-      (instance.getRelativeUrl(), )
+    raise NotImplementedError("Please destroy before doing a slave instance (%s)" % \
+      (instance.getRelativeUrl(), ))
 elif instance_portal_type == "Slave Instance":
   if not is_slave:
-    raise NotImplementedError, "Please destroy before doing a software instance (%s)" % \
-      (instance.getRelativeUrl(), )
+    raise NotImplementedError("Please destroy before doing a software instance (%s)" % \
+      (instance.getRelativeUrl(), ))
 else:
-  raise NotImplementedError, "Not supported portal type %s (%s)" % \
-    (instance.getPortalType(), instance.getRelativeUrl())
+  raise NotImplementedError("Not supported portal type %s (%s)" % \
+    (instance.getPortalType(), instance.getRelativeUrl()))
 
 instance.edit(**edit_kw)
 # Prevent storing broken XML in text content (which prevent to update parameters after)

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/script_RequesterInstance_request.py

@@ -20,7 +20,7 @@ except KeyError:
   #raise TypeError, "RequesterInstance_request takes exactly 7 arguments"
 
 if is_slave not in [True, False]:
-  raise ValueError, "shared should be a boolean"
+  raise ValueError("shared should be a boolean")
 
 # Instance tree is used as the root of the instance tree
 if requester_instance.getPortalType() == "Instance Tree":
@@ -80,7 +80,7 @@ if instance_count == 0:
 elif instance_count == 1:
   request_software_instance = request_software_instance_list[0].getObject()
 else:
-  raise ValueError, "Too many instances '%s' found: %s" % (software_title, [x.path for x in request_software_instance_list])
+  raise ValueError("Too many instances '%s' found: %s" % (software_title, [x.path for x in request_software_instance_list]))
 
 if (request_software_instance is None):
   if (root_state == "destroyed"):
@@ -161,7 +161,7 @@ if instance_found:
     request_software_instance.requestDestroy(**promise_kw)
     context.REQUEST.set('request_instance', None)
   else:
-    raise ValueError, "state should be started, stopped or destroyed"
+    raise ValueError("state should be started, stopped or destroyed")
 
   successor_list = requester_instance.getSuccessorList()
   successor_uid_list = requester_instance.getSuccessorUidList()

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/script_Person_requestComputeNode.py

@@ -8,12 +8,12 @@ kwargs = state_change.kwargs
 try:
   compute_node_title = kwargs['compute_node_title']
 except KeyError:
-  raise TypeError, "Person_requestComputeNode takes exactly 2 arguments. Missing compute_node_title."
+  raise TypeError("Person_requestComputeNode takes exactly 2 arguments. Missing compute_node_title.")
 
 try:
   project_reference = kwargs['project_reference']
 except KeyError:
-  raise TypeError, "Person_requestComputeNode takes exactly 2 arguments. Missing project_reference."
+  raise TypeError("Person_requestComputeNode takes exactly 2 arguments. Missing project_reference.")
 
 tag = "%s_%s_ComputeNodeInProgress" % (person.getUid(), 
                                compute_node_title)

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/script_Person_requestNetwork.py

@@ -8,12 +8,12 @@ kwargs = state_change.kwargs
 try:
   computer_network_title = kwargs['network_title']
 except KeyError:
-  raise TypeError, "Person_requestNetwork takes exactly 2 arguments. Missing network_title."
+  raise TypeError("Person_requestNetwork takes exactly 2 arguments. Missing network_title.")
 
 try:
   project_reference = kwargs['project_reference']
 except KeyError:
-  raise TypeError, "Person_requestNetwork takes exactly 2 arguments. Missing project_reference."
+  raise TypeError("Person_requestNetwork takes exactly 2 arguments. Missing project_reference.")
 
 tag = "%s_%s_NetworkInProgress" % (person.getUid(),
                                computer_network_title)

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/script_Person_requestSoftwareInstance.py

@@ -15,10 +15,10 @@ try:
   root_state = kwargs["state"]
   project_reference = kwargs['project_reference']
 except KeyError:
-  raise TypeError, "Person_requestSoftwareInstance takes exactly 8 arguments"
+  raise TypeError("Person_requestSoftwareInstance takes exactly 8 arguments")
 
 if is_slave not in [True, False]:
-  raise ValueError, "shared should be a boolean"
+  raise ValueError("shared should be a boolean")
 
 instance_tree_portal_type = "Instance Tree"
 
@@ -46,7 +46,7 @@ request_instance_tree_list = portal.portal_catalog(
   limit=2,
   )
 if len(request_instance_tree_list) > 1:
-  raise NotImplementedError, "Too many instance tree %s found %s" % (software_title, [x.path for x in request_instance_tree_list])
+  raise NotImplementedError("Too many instance tree %s found %s" % (software_title, [x.path for x in request_instance_tree_list]))
 elif len(request_instance_tree_list) == 1:
   request_instance_tree = request_instance_tree_list[0].getObject()
   assert request_instance_tree.getFollowUp() == project_list[0].getRelativeUrl()
@@ -54,7 +54,7 @@ elif len(request_instance_tree_list) == 1:
      (request_instance_tree.getTitle() != software_title) or \
      (request_instance_tree.getValidationState() != "validated") or \
      (request_instance_tree.getDestinationSection() != person.getRelativeUrl()):
-    raise NotImplementedError, "The system was not able to get the expected instance tree"
+    raise NotImplementedError("The system was not able to get the expected instance tree")
   # Do not allow user to change the release/type/shared status
   # This is not compatible with invoicing the service
   # Instance release change will be handled by allocation supply and upgrade decision
@@ -62,7 +62,7 @@ elif len(request_instance_tree_list) == 1:
       (request_instance_tree.getSourceReference() != software_type) or \
       (request_instance_tree.getRootSlave() != is_slave)) and \
      (not kwargs.get("force_software_change", False)):
-    raise NotImplementedError, "You can not change the release / type / shared states"
+    raise NotImplementedError("You can not change the release / type / shared states")
 else:
   if (root_state == "destroyed"):
     # No need to create destroyed subscription.
@@ -97,7 +97,7 @@ elif (root_state == "destroyed"):
   request_instance_tree.requestDestroy(**promise_kw)
   context.REQUEST.set('request_instance_tree', None)
 else:
-  raise ValueError, "state should be started, stopped or destroyed"
+  raise ValueError("state should be started, stopped or destroyed")
 
 request_instance_tree.requestInstance(
   software_release=software_release_url_string,

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/script_Person_requestToken.py

@@ -8,7 +8,7 @@ kwargs = state_change.kwargs
 try:
   request_url = kwargs['request_url']
 except KeyError:
-  raise TypeError, "Person_requestToken takes exactly 1 argument"
+  raise TypeError("Person_requestToken takes exactly 1 argument")
 
 request_method = "POST"
 access_token = portal.access_token_module.newContent(

master/bt5/slapos_payzen/WorkflowTemplateItem/portal_workflow/payzen_interface_workflow/script_PayzenEvent_generateNavigationPage.py

@@ -14,7 +14,7 @@ try:
   vads_url_success = kwargs['vads_url_success']
   vads_url_return = kwargs['vads_url_return']
 except KeyError:
-  raise TypeError, "PayzenEvent_generateNavigationPage takes exactly 6 arguments"
+  raise TypeError("PayzenEvent_generateNavigationPage takes exactly 6 arguments")
 
 payment_transaction = payzen_event.getDestinationValue(portal_type="Payment Transaction")
 now = DateTime()
@@ -22,7 +22,7 @@ payment_transaction.AccountingTransaction_updateStartDate(now)
 
 transaction_date, transaction_number = payment_transaction.PaymentTransaction_generatePayzenId()
 if transaction_number is None:
-  raise ValueError, "Transaction already registered"
+  raise ValueError("Transaction already registered")
 
 transaction_id = transaction_date.Date().replace("/", "") + "-" + transaction_number
 

master/bt5/slapos_wechat/WorkflowTemplateItem/portal_workflow/wechat_interface_workflow/script_WechatEvent_generateNavigationPage.py

@@ -7,7 +7,7 @@ payment_transaction.AccountingTransaction_updateStartDate(now)
 
 _, transaction_id = payment_transaction.PaymentTransaction_generateWechatId()
 if transaction_id is None:
-  raise ValueError, "Transaction already registered"
+  raise ValueError("Transaction already registered")
 
 wechat_dict = {
   'out_trade_no': payment_transaction.getId().encode('utf-8'),