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

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

@@ -114,13 +114,13 @@ try:
     instance_tree.activate(activity="SQLQueue", tag=tag,
         after_tag="allocate_%s" % compute_partition_url).getId()
 
-except ValueError, e:
+except ValueError as e:
   # It was not possible to find free Compute Partition
   markHistory(software_instance, 'Allocation failed: no free Compute Partition %s' % e)
-except Unauthorized, e:
+except Unauthorized as e:
   # user has bad balance
   markHistory(software_instance, 'Allocation failed: %s' % e)
-except NotImplementedError, e:
+except NotImplementedError as e:
   # user has bad balance
   markHistory(software_instance, 'Allocation failed: %s' % e)
 else:

master/bt5/slapos_slap_tool/ToolComponentTemplateItem/portal_components/tool.erp5.SlapTool.py

@@ -92,11 +92,11 @@ def convertToREST(function):
     """
     try:
       retval = function(self, *args, **kwd)
-    except (ValueError, AttributeError), log:
+    except (ValueError, AttributeError) as log:
       LOG('SlapTool', INFO, 'Converting ValueError to NotFound, real error:',
           error=True)
       raise NotFound(log)
-    except SoftwareInstanceNotReady, log:
+    except SoftwareInstanceNotReady as log:
       self.REQUEST.response.setStatus(408)
       self.REQUEST.response.setHeader('Cache-Control', 'private')
       return self.REQUEST.response