*: refactor with 2to3's except fixer

bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_dumpPortalSkinsContent.py

@@ -13,7 +13,7 @@ def getSkinHash(skin, skin_container):
       content = skin.formXML()
       if isinstance(content, unicode):
         content = content.encode('utf8', 'repr')
-    except AttributeError, e:
+    except AttributeError as e:
       # This can happen with dead proxy fields.
       content = "broken form %s" % e
     content = 'ignore'

bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelFabricItem_fastInput.py

@@ -196,7 +196,7 @@ try:
               cell.edit(quantity=total_quantity)
 
 
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   redirect_url = '%s/view?%s' % ( context.absolute_url()
                                   , 'portal_status_message=%s' % localizer.erp5_ui.gettext("input failed.")
                                   )

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.py

@@ -21,7 +21,7 @@ else:
   new_id = person.generateNewId()
   try:
     default_career.setId(new_id)
-  except ActivityPendingError, error:
+  except ActivityPendingError as error:
     message = Base_translateString("%s" % error)
     return context.Base_redirect(form_id=form_id,
                                  selection_name=selection_name,

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.py

@@ -14,7 +14,7 @@ if form_id is not None:
   # button itself
   try:
     params = form.validate_all_to_request(request)
-  except FormValidationError, validation_errors:
+  except FormValidationError as validation_errors:
     # Pack errors into the request
     field_errors = form.ErrorFields(validation_errors)
     request.set('field_errors', field_errors)

bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/Base_editContentTranslationMessage.py

@@ -31,7 +31,7 @@ edit_order = form.edit_order
 try:
   # Validate
   form.validate_all_to_request(request)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_getPreviewAsHTML.py

@@ -8,7 +8,7 @@ try:
     return result
   if not context.hasBaseData():
     error_message = context.Base_translateString("This document is not converted yet.")
-except Exception, e:
+except Exception as e:
   from Products.ERP5Type.Log import log
   log("asStrippedHTML", str(e))
   error_message = "%s %s" % (context.Base_translateString("Preview Error:"),

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToConvertToBaseFormat.py

@@ -11,13 +11,13 @@ if context.getExternalProcessingState() not in ('converted', 'empty'):
     return context.convertToBaseFormat()
   except ConflictError:
     raise
-  except ConversionError, e:
+  except ConversionError as e:
     message = 'Conversion Error: %s' % (str(e) or 'undefined.')
-  except Fault, e:
+  except Fault as e:
     message = 'XMLFault: %s' % (repr(e) or 'undefined.')
-  except SocketError, e:
+  except SocketError as e:
     message = 'Socket Error: %s' % (repr(e) or 'undefined.')
-  except Exception, e:
+  except Exception as e:
     message = 'Problem: %s' % (repr(e) or 'undefined.')
   except:
     message = 'Problem: unknown'

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_tryToUpdateBaseMetadata.py

@@ -7,9 +7,9 @@ try:
   return context.updateBaseMetadata(**kw)
 except ConflictError:
   raise
-except ConversionError, e:
+except ConversionError as e:
   message = 'Conversion Error: %s' % (str(e) or 'undefined.')
-except Exception, e:
+except Exception as e:
   message = 'Problem: %s' % (repr(e) or 'undefined.')
 except:
   message = 'Problem: unknown'

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

@@ -44,7 +44,7 @@ for assignment in person_object.contentValues(filter={'portal_type': 'Assignment
           cdict = category_dict.copy()
           cdict[base_category] = '/'.join(grouplist[:-i])
           category_list.append(cdict)
-    except RuntimeError,e:
+    except RuntimeError as e:
       log(str(e))
 
 return category_list

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndNextStep.py

@@ -129,7 +129,7 @@ if not next_url_dict.has_key(form_id):
     message=""
     context.portal_workflow.doActionFor(context,
                                       submit_action)
-  except ValidationFailed, message: 
+  except ValidationFailed as message: 
     context.pdb()
     return request['RESPONSE'].redirect(
                "%s/%s?portal_status_message=%s" %

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_security/ERP5Type_getSecurityCategoryFromAssignmentTree.py

@@ -58,7 +58,7 @@ for assignment in person_object.contentValues(filter={'portal_type': 'Assignment
           cdict = category_dict.copy()
           cdict[base_category] = '/'.join(grouplist[:-i])
           category_list.append(cdict)
-    except RuntimeError,e:
+    except RuntimeError as e:
       log(str(e))
 
 return category_list

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/Workflow_statusModify.py

@@ -15,7 +15,7 @@ try:
   request.set('editable_mode', 1)
   form.validate_all_to_request(request)
   request.set('editable_mode', editable_mode)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)
@@ -54,7 +54,7 @@ try:
     context,
     doaction_param_list['workflow_action'],
     **doaction_param_list)
-except ValidationFailed, error_message:
+except ValidationFailed as error_message:
   if getattr(error_message, 'msg', None):
     # use of Message class to store message+mapping+domain
     message = error_message.msg

bt5/erp5_email_reader/DocumentTemplateItem/portal_components/document.erp5.EmailReader.py

@@ -332,7 +332,7 @@ class EmailReader(ExternalSource):
     # This is very sequential and could be improved probably
     try:
       message_uid_list = self._getMailServer().getMessageUIDList(message_folder=message_folder)
-    except ValueError, error_message:  # Use a better exception here XXX
+    except ValueError as error_message:  # Use a better exception here XXX
       message_uid_list = []
     # Reduce list size based on asumption of growing sequence of uids
     latest_uid = self._latest_uid.get(message_folder, 0)

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

@@ -6,7 +6,7 @@ for form_path, form in context.ZopeFind(
             context.portal_skins, obj_metatypes=['ERP5 Form'], search_sub=1):
   try:
     groups = form.get_groups()
-  except AttributeError, e:
+  except AttributeError as e:
     print "%s is broken: %s" % (form_path, e)
   if 'not_assigned' in groups:
     print 'Not assigned fields in %s: %s' % (form_path,

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnCheckout.py

@@ -3,10 +3,10 @@ from Products.ERP5VCS.SubversionClient import SubversionSSLTrustError, Subversio
 vcs_tool = context.getVcsTool()
 try:
   entry_dict = vcs_tool.checkout(context, url)
-except SubversionSSLTrustError, error:
+except SubversionSSLTrustError as error:
   context.REQUEST.set('portal_status_message', 'SSL Certificate was not recognized')
   return context.asContext(trust_dict = error.getTrustDict(), caller='info').BusinessTemplate_viewSvnSSLTrust()
-except SubversionLoginError, error1 :
+except SubversionLoginError as error1 :
   context.REQUEST.set('portal_status_message', 'Server needs authentication, no cookie found')
   return context.asContext(caller='info', realm = error1.getRealm(), username = vcs_tool.getPreferredUsername()).BusinessTemplate_viewSvnLogin()
 return entry_dict

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsCommit.py

@@ -19,5 +19,5 @@ if not changelog.strip():
 
 try:
   return context.getVcsTool().commit(changelog, **kw)
-except Exception, error:
+except Exception as error:
   return context.BusinessTemplate_handleException(error, script.id)

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsUpdate.py

 try:
   new_bt = context.getVcsTool().update(keep)
-except Exception, error:
+except Exception as error:
   return context.BusinessTemplate_handleException(
     error, script.id, form_id=form_id, keep=keep)
 

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.py

@@ -3,15 +3,15 @@ from Products.ERP5VCS.SubversionClient import SubversionSSLTrustError, Subversio
 
 try:
   raise exception
-except SubversionSSLTrustError, e:
+except SubversionSSLTrustError as e:
   message = 'SSL Certificate was not recognized'
   kw = dict(trust_dict=e.getTrustDict())
   method = 'BusinessTemplate_viewSvnSSLTrust'
-except SubversionLoginError, e:
+except SubversionLoginError as e:
   message = 'Server needs authentication, no cookie found'
   kw = dict(realm=e.getRealm(), username=context.getVcsTool().getPreferredUsername())
   method = 'BusinessTemplate_viewSvnLogin'
-except GitLoginError, e:
+except GitLoginError as e:
   message = str(e)
   kw = dict(remote_url=context.getVcsTool().getRemoteUrl())
   method = 'BusinessTemplate_viewGitLogin'

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

@@ -21,7 +21,7 @@ for group_object in object_list:
   except Unauthorized: # should happen in tricky testERP5Catalog tests only
     # Fake activity success: if indexation cannot View document, ignore it.
     group_object.result = None
-  except Exception, e:
+  except Exception as e:
     group_object.raised()
   else:
     for property, value in tmp_dict.iteritems():

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

@@ -26,7 +26,7 @@ for path in path_list:
     raise
   except Unauthorized: # should happen in tricky testERP5Catalog tests only 
     continue
-  except Exception, e:
+  except Exception as e:
     exception = e
     failed_path_list.append(path)
   else:

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

@@ -26,7 +26,7 @@ for path in path_list:
     raise
   except Unauthorized: # should happen in tricky testERP5Catalog tests only 
     continue
-  except Exception, e:
+  except Exception as e:
     exception = e
     failed_path_list.append(path)
   else:

bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/DCWorkflow_edit.py

@@ -7,7 +7,7 @@ edit_order = form.edit_order
 try:
   # Validate
   form.validate_all_to_request(request, key_prefix='my_')
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   result = {}
   result['field_errors'] = {}

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Workflow_statusModify.py

@@ -18,7 +18,7 @@ try:
   request.set('editable_mode', 1)
   form.validate_all_to_request(request)
   request.set('editable_mode', editable_mode)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)
@@ -69,7 +69,7 @@ try:
     context,
     doaction_param_list['workflow_action'],
     **doaction_param_list)
-except ValidationFailed, error_message:
+except ValidationFailed as error_message:
   if getattr(error_message, 'msg', None):
     # use of Message class to store message+mapping+domain
     message = error_message.msg

bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgeBox_baseEdit.py

@@ -16,7 +16,7 @@ form = getattr(box, form_id)
 try:
   # Validate
   form.validate_all_to_request(request, key_prefix=form_fields_main_prefix)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

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

@@ -57,7 +57,7 @@ else:
                                       **imported_line_property_dict)
   except ConflictError:
     raise
-  except Exception, error:
+  except Exception as error:
     translated_msg = Message('erp5_ui',
                      'An error Occurred while creating object: ${error}',
                      mapping=dict(error=Message('erp5_ui',
@@ -75,7 +75,7 @@ else:
         new_object.edit(**category_dict)
       except ConflictError:
         raise
-      except Exception, error:
+      except Exception as error:
         #context.log('category: %s' %category)
         translated_msg = Message(
                      'erp5_ui',

bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseBt5.py

@@ -18,7 +18,7 @@ try:
   message_list = template_tool.upgradeSite(bt5_list, dry_run=True,
                                  update_catalog=CATALOG_UPDATABLE)
   severity = len(message_list)
-except BusinessTemplateUnknownError, error:
+except BusinessTemplateUnknownError as error:
   severity = -1
   detail = str(error)
 

bt5/erp5_real_time_inventory_accounting_test/TestTemplateItem/portal_components/test.erp5.testRealTimeInventoryAccounting.py

@@ -54,7 +54,7 @@ class TestRealTimeInventoryAccountingMixin:
         self.portal.portal_workflow.doActionFor(document, workflow_method_id)
       else:
         getattr(document, workflow_method_id)()
-    except ValidationFailed, error:
+    except ValidationFailed as error:
       self.fail("Transition '%s' on %r should have succeeded (%s)" % \
                   (workflow_method_id, document,
                    sorted([m.message for m in error.msg])))

bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Base_editConfiguration.py

@@ -33,7 +33,7 @@ try:
   # Update basic attributes
   context.updateConfiguration(**kw)
   context.reindexObject()
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

bt5/erp5_sql_browser/SkinTemplateItem/portal_skins/erp5_sql_browser/ZMySQLDAConnection_getQueryResultAsJSON.py

@@ -10,7 +10,7 @@ try:
   results = context.manage_test(query)
   data = [ results.names() ]
   data.extend(results.tuples())
-except Exception, e:
+except Exception as e:
   response.setStatus(500)
   try:
     response.write(str(e[1]))

bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.ERP5ScalabilityDistributor.py

@@ -129,7 +129,7 @@ class ERP5ScalabilityDistributor(ERP5ProjectUnitTestDistributor):
         if test_node.getValidationState() != 'validated':
           try:
             test_node.validate()
-          except Exception, e:
+          except Exception as e:
             LOG('Test Node Validate',ERROR,'%s' %e)
       return test_node
     return None

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

@@ -184,7 +184,7 @@ class WebServiceRequest(XMLObject, ZopePageTemplate):
     # Call the method
     try:
       url, xml = callRequest(self, method_name, *args, **kw)
-    except ConnectionError, msg:
+    except ConnectionError as msg:
       if test_mode:
         error = msg
         url = connection.url

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

@@ -20,7 +20,7 @@ if context.getLastRequestError() is None:
   for obj in object_list:
     try:
       xml = obj.asXML(debug=True)
-    except (ValueError, NotImplementedError), msg:
+    except (ValueError, NotImplementedError) as msg:
       error = msg
       continue
     if not xml:

bt5/erp5_tiosafe_oscommerce/ExtensionTemplateItem/OscommerceBrain.py

@@ -50,7 +50,7 @@ class OscommerceNode(NodeBrain):
           category = 'Country/%s' % self.country, create_mapping=True,
           create_mapping_line=True,
           ).split('/', 1)[-1]
-      except ValueError, msg:
+      except ValueError as msg:
         LOG("OscommerceBrain.OscommerceNode.__init__", ERROR, "Getting category for %s raise with msg = %s" %(value, msg))
         self.country = ""
 

bt5/erp5_tiosafe_oxatis/ExtensionTemplateItem/OxatisBrain.py

@@ -50,7 +50,7 @@ class OxatisNode(NodeBrain):
           category = 'Country/%s' % self.country, create_mapping=True,
           create_mapping_line=True,
           ).split('/', 1)[-1]
-      except ValueError, msg:
+      except ValueError as msg:
         LOG("OxatisBrain.OxatisNode.__init__", ERROR, "Getting category for %s raise with msg = %s" %(value, msg))
         self.country = ""
 

bt5/erp5_tiosafe_ubercart/ExtensionTemplateItem/UbercartBrain.py

@@ -51,7 +51,7 @@ class UbercartNode(NodeBrain):
           category = 'Country/%s' % self.country, create_mapping=True,
           create_mapping_line=True,
           ).split('/', 1)[-1]
-      except ValueError, msg:
+      except ValueError as msg:
         LOG("UbercartBrain.UbercartNode.__init__", ERROR, "Getting category for %s raise with msg = %s" %(self.country, msg))
         self.country = ""
 

bt5/erp5_tiosafe_virtuemart/ExtensionTemplateItem/VirtuemartBrain.py

@@ -52,7 +52,7 @@ class VirtuemartNode(NodeBrain):
           category = 'Country/%s' % self.country, create_mapping=True,
           create_mapping_line=True,
           ).split('/', 1)[-1]
-      except ValueError, msg:
+      except ValueError as msg:
         LOG("VirtuemartBrain.VirtuemartNode.__init__", ERROR, "Getting category for %s raise with msg = %s" %(self.country, msg))
         self.country = ""
 
@@ -91,7 +91,7 @@ class VirtuemartNode(NodeBrain):
               create_mapping_line=True,
               )
             value = "/".join(value.split('/')[1:])
-          except ValueError, msg:
+          except ValueError as msg:
             LOG("VirtuemartBrain.VirtuemartNode._generateCoordinatesXML", ERROR, "Getting category for %s raise with msg = %s" %(value, msg))
             #return ""
 

bt5/erp5_tiosafe_zencart/ExtensionTemplateItem/ZencartBrain.py

@@ -52,7 +52,7 @@ class ZencartNode(NodeBrain):
           category = 'Country/%s' % self.country, create_mapping=True,
           create_mapping_line=True,
           ).split('/', 1)[-1]
-      except ValueError, msg:
+      except ValueError as msg:
         LOG("ZencartBrain.ZencartNode.__init__", ERROR, "Getting category for %s raise with msg = %s" %(self.country, msg))
         self.country = ""
 
@@ -91,7 +91,7 @@ class ZencartNode(NodeBrain):
               create_mapping_line=True,
               )
             value = "/".join(value.split('/')[1:])
-          except ValueError, msg:
+          except ValueError as msg:
             LOG("ZencartBrain.ZencartNode._generateCoordinatesXML", ERROR, "Getting category for %s raise with msg = %s" %(value, msg))
             #return ""
 

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

@@ -43,7 +43,7 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed
 from zExceptions import Redirect
 try:
   transaction.Base_checkConsistency()
-except ValidationFailed, error_message:
+except ValidationFailed as error_message:
   if getattr(error_message, 'msg', None):
     # use of Message class to store message+mapping+domain
     message = error_message.msg

bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.py

@@ -27,7 +27,7 @@ def urlread(url, safe_return=0):
   import urllib
   try:
     return urllib.urlopen(url).read()
-  except IOError, e:
+  except IOError as e:
     if safe_return:
       # Return an Selenium test code that will obviously fail. This 
       # prevent zelenium test run get Stalled.

bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderUtils.py

@@ -90,7 +90,7 @@ def ERP5Site_runVerificationScript(self, method_id):
     return 'Script %s was not Found!' % (method_id)
   try:
     integrity_result = method()
-  except Exception, e:
+  except Exception as e:
     # Is it required include the trace back
     return 'Script %s fail to run, Exception: %s , message: %s .' % (method_id, e.__class__, e )
   if len(integrity_result) > 0:

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_registerUser.py

@@ -36,7 +36,7 @@ try:
   user = context.WebSite_createUser(**kwargs)
   log(user)
   msg = 'Thank you for registering. Your password will be sent to the email address that you provided once your account has been validated by the appropriate department.'
-except Exception, e:
+except Exception as e:
   msg = str(e)
 
 return req.RESPONSE.redirect(context.absolute_url() + '?portal_status_message='+msg)

bt5/erp5_xhtml_gadget_style/SkinTemplateItem/portal_skins/erp5_xhtml_gadget_core/Form_save.py

@@ -18,7 +18,7 @@ edit_order = form.edit_order
 try:
   # Validate
   form.validate_all_to_request(request, key_prefix=key_prefix)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   result = {}
   result['field_errors'] = {}

product/CMFActivity/Activity/SQLBase.py

@@ -192,7 +192,8 @@ CREATE TABLE %s (
           db.query("SET @uid := %s" % getrandbits(UID_SAFE_BITSIZE))
         try:
           db.query(self._insert_template % (self.sql_table, values))
-        except MySQLdb.IntegrityError, (code, _):
+        except MySQLdb.IntegrityError as xxx_todo_changeme:
+          (code, _) = xxx_todo_changeme.args
           if code != DUP_ENTRY:
             raise
           reset_uid = True

product/CMFActivity/Activity/SQLJoblib.py

@@ -93,7 +93,8 @@ CREATE TABLE %s (
           db.query("SET @uid := %s" % getrandbits(UID_SAFE_BITSIZE))
         try:
           db.query(self._insert_template % (self.sql_table, values))
-        except MySQLdb.IntegrityError, (code, _):
+        except MySQLdb.IntegrityError as xxx_todo_changeme:
+          (code, _) = xxx_todo_changeme.args
           if code != DUP_ENTRY:
             raise
           reset_uid = True

product/CMFActivity/ActivityTool.py

@@ -406,7 +406,7 @@ Named Parameters: %r
       mail_text += '\nCreated at:\n' + self.call_traceback
     try:
       portal.MailHost.send(mail_text)
-    except (socket.error, MailHostError), message:
+    except (socket.error, MailHostError) as message:
       LOG('ActivityTool.notifyUser', WARNING,
           'Mail containing failure information failed to be sent: %s' % message)
 

product/CMFActivity/sbalance.py

@@ -306,7 +306,7 @@ def main():
   try:
     opts, args = getopt.getopt(sys.argv[1:], "hvb:t:T:dfps",
                                ["help", "version", "bind=", "connect-timeout=", "select-timeout=", "debug", "foreground", "packet-dump", "sticky"])
-  except getopt.GetoptError, msg:
+  except getopt.GetoptError as msg:
     print msg
     print "Try ``sbalance --help'' for more information."
     sys.exit(2)

product/CMFCategory/tests/testCMFCategory.py

@@ -809,7 +809,7 @@ class TestCMFCategory(ERP5TypeTestCase):
 
     try:
       p1.setCareerSubordination(o1)
-    except Exception, e:
+    except Exception as e:
       self.assertTrue(isinstance(e, TypeError))
       self.assertEqual(e.args[0], 'Category must be of string, tuple of '
                                   'string or list of string type.')

product/ERP5/Document/BusinessTemplate.py

@@ -1098,7 +1098,7 @@ class ObjectTemplateItem(BaseTemplateItem):
       try:
         OFS.XMLExportImport.exportXML(old_object._p_jar, old_object._p_oid, old_io)
         old_obj_xml = old_io.getvalue()
-      except (ImportError, UnicodeDecodeError), e: # module is already
+      except (ImportError, UnicodeDecodeError) as e: # module is already
                                                    # removed etc.
         old_obj_xml = '(%s: %s)' % (e.__class__.__name__, e)
       new_io.close()
@@ -1769,7 +1769,7 @@ class PathTemplateItem(ObjectTemplateItem):
       # Ignore any object without PortalType (non-ERP5 objects)
       try:
         portal_type = aq_base(obj).getPortalType()
-      except Exception, e:
+      except Exception as e:
         pass
       else:
         if portal_type not in p.portal_types:
@@ -3875,7 +3875,7 @@ class FilesystemDocumentTemplateItem(BaseTemplateItem):
         path, name = posixpath.split(key)
         try:
           self.local_file_writer_name(name, text, create=0)
-        except IOError, error:
+        except IOError as error:
           LOG(self.__class__.__name__, WARNING,
               "Cannot install class %r on file system" % name)
           if error.errno:
@@ -6530,7 +6530,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
                                               temp_obj.getReference(),
                                               version,
                                               source_reference)
-        except Exception, e:
+        except Exception as e:
           LOG("BusinessTemplate", WARNING,
               "Could not import component '%s' ('%s') from the filesystem" %
               (temp_obj.getReference(),

product/ERP5/Document/Coordinate.py

@@ -230,7 +230,7 @@ class Coordinate(Base):
         self._writeFromPUT( body )
         RESPONSE.setStatus(204)
         return RESPONSE
-      except ResourceLockedError, msg:
+      except ResourceLockedError as msg:
         get_transaction().abort()
         RESPONSE.setStatus(423)
         return RESPONSE

product/ERP5/Document/PDFDocument.py

@@ -235,7 +235,7 @@ class PDFDocument(Image):
                  '-noframes', '-i', tmp.name]
       try:
         command_result = Popen(command, stdout=PIPE).communicate()[0]
-      except OSError, e:
+      except OSError as e:
         if e.errno == errno.ENOENT:
           raise ConversionError('pdftohtml was not found')
         raise
@@ -264,7 +264,7 @@ class PDFDocument(Image):
       command = ['pdf2djvu', tmp.name]
       try:
         command_result = Popen(command, stdout=PIPE).communicate()[0]
-      except OSError, e:
+      except OSError as e:
         if e.errno == errno.ENOENT:
           raise ConversionError('pdf2djvu was not found')
         raise
@@ -293,7 +293,7 @@ class PDFDocument(Image):
       command = ['pdfinfo', '-meta', '-box', tmp.name]
       try:
         command_result = Popen(command, stdout=PIPE).communicate()[0]
-      except OSError, e:
+      except OSError as e:
         if e.errno == errno.ENOENT:
           raise ConversionError('pdfinfo was not found')
         raise

product/ERP5/Document/Resource.py

@@ -804,7 +804,7 @@ class Resource(XMLObject, XMLMatrix, VariatedMixin):
       try:
         result = quantity * self._getConversionRatio(from_unit, variation_list)\
                         / self._getConversionRatio(to_unit, variation_list)
-      except (ArithmeticError, AttributeError, LookupError, TypeError), error:
+      except (ArithmeticError, AttributeError, LookupError, TypeError) as error:
         # For compatibility, we only log the error and return None.
         # No exception for the moment.
         LOG('Resource.convertQuantity', WARNING,

product/ERP5/Document/SQLNonContinuousIncreasingIdGenerator.py

@@ -94,7 +94,7 @@ class SQLNonContinuousIncreasingIdGenerator(IdGenerator):
       new_id = result_query[0]['LAST_INSERT_ID()']
       # Commit the changement of new_id
       portal.IdTool_zCommit()
-    except ProgrammingError, error:
+    except ProgrammingError as error:
       if error[0] != NO_SUCH_TABLE:
         raise
 
@@ -173,7 +173,7 @@ class SQLNonContinuousIncreasingIdGenerator(IdGenerator):
     portal = self.getPortalObject()
     try:
       portal.IdTool_zGetValueList()
-    except ProgrammingError, error:
+    except ProgrammingError as error:
       if error[0] != NO_SUCH_TABLE:
         raise
       portal.IdTool_zDropTable()

product/ERP5/Document/TextDocument.py

@@ -365,7 +365,7 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent
           # if succeeds, not need to change encoding
           # it's already utf-8
           text_content.decode('utf-8')
-        except (UnicodeDecodeError, LookupError), error_message:
+        except (UnicodeDecodeError, LookupError) as error_message:
           text_content, message = guessCharsetAndConvert(self,
                                                     text_content, content_type)
         else:

product/ERP5/Tool/ContributionTool.py

@@ -557,7 +557,7 @@ class ContributionTool(BaseTool):
       try:
         url = content.asURL()
         file_object, filename, content_type = self._openURL(url)
-      except urllib2.URLError, error:
+      except urllib2.URLError as error:
         if repeat == 0 or not batch_mode:
           # XXX - Call the extendBadURLList method,--NOT Implemented--
           raise
@@ -606,7 +606,7 @@ class ContributionTool(BaseTool):
       elif document.getCrawlingDepth() > 0:
         # If this is an index document, stop crawling if crawling_depth is 0
         document.activate().crawlContent()
-    except urllib2.HTTPError, error:
+    except urllib2.HTTPError as error:
       if repeat == 0 or not batch_mode:
         # here we must call the extendBadURLList method,--NOT Implemented--
         # which had to add this url to bad URL list, so next time we avoid

product/ERP5/Tool/InotifyTool.py

@@ -87,7 +87,7 @@ class InotifyTool(TimerServiceMixin, BaseTool):
                   p = os.path.join(inode_path, name)
                   try:
                     s = os.lstat(p)
-                  except OSError, e:
+                  except OSError as e:
                     if e.errno != errno.ENOENT:
                       raise
                   else:

product/ERP5/Tool/SimulationTool.py

@@ -1420,7 +1420,8 @@ class SimulationTool(BaseTool):
         inventory_cache_kw['date'] = to_date
       try:
           cached_sql_result = Resource_zGetInventoryCacheResult(**inventory_cache_kw)
-      except ProgrammingError, (code, _):
+      except ProgrammingError as xxx_todo_changeme:
+          (code, _) = xxx_todo_changeme.args
           if code != NO_SUCH_TABLE:
             raise
           # First use of the optimisation, we need to create the table

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.py

@@ -91,7 +91,7 @@ try:
   request.set('editable_mode', 1)
   form.validate_all_to_request(request)
   request.set('editable_mode', editable_mode)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_configureSortOn.py

@@ -24,7 +24,7 @@ try:
         sort_on += [(k, v, t)]
     i += 1
   context.portal_selections.setSelectionSortOrder(selection_name, sort_on)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_configureUI.py

@@ -67,7 +67,7 @@ try:
     if k != 'None':
       columns += [(k ,  columns_dict[k])]
   context.portal_selections.setSelectionColumns(selection_name, columns, REQUEST=request)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_createRelation.py

@@ -68,7 +68,7 @@ try:
       return context.Base_viewCreateRelationDialog( REQUEST=request )
       pass
       # context.newRelation(base_category, my_field.get_value('portal_type'))
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.py

@@ -37,7 +37,7 @@ edit_order = form.edit_order
 try:
   # Validate
   form.validate_all_to_request(request, key_prefix=key_prefix)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editUnrestricted.py

@@ -19,7 +19,7 @@ form = getattr(context,form_id)
 try:
   # Validate
   form.validate_all_to_request(request)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)
@@ -69,7 +69,7 @@ try:
 
   for encapsulated_editor in encapsulated_editor_list:
     encapsulated_editor.edit(context)
-except ActivityPendingError,e:
+except ActivityPendingError as e:
   message = Base_translateString("%s" % e)
 
 ignore_layout = int(ignore_layout)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_searchHandler.py

@@ -28,7 +28,7 @@ try:
   url_params_string = make_query(kw)
 #  raise str(kw), url_params_string
 
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.py

@@ -179,7 +179,7 @@ try:
       request.set('default_module', my_field.get_value('default_module'))
       request.set('portal_type', portal_type[0])
       return o.Base_viewCreateRelationDialog( REQUEST=request )
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_workflowStatusModify.py

@@ -11,7 +11,7 @@ if 1: # keep indentation
      **kw)
   except WorkflowException:
     pass
-  except ValidationFailed, message:
+  except ValidationFailed as message:
     if getattr(message, 'msg', None) and same_type(message.msg, []):
       message = '. '.join('%s' % x for x in message.msg)
     if not batch :

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyWorkflowStatus.py

@@ -18,7 +18,7 @@ for form in (real_form, target_form):
     request.set('editable_mode', 1)
     form.validate_all_to_request(request)
     request.set('editable_mode', editable_mode)
-  except FormValidationError, validation_errors:
+  except FormValidationError as validation_errors:
     # Pack errors into the request
     field_errors = form.ErrorFields(validation_errors)
     request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.py

@@ -43,7 +43,7 @@ try:
   # Update basic attributes
   context.edit(REQUEST=request, edit_order=edit_order, **kw)
   context.reindexObject()
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/editor/filemanager/browser/zope/connectors/connectorCPS.py.py

@@ -207,7 +207,7 @@ def xmlString(results, resourceType, foldersOnly):
             try:
                xmlFolders.append('\r            <Folder name="%s" title="%s" linkbyuid="%s" uid="%s" type="%s" metatype="%s" />'%(ConvertToXmlAttribute(result.id),ConvertToXmlAttribute(titre), tagLinkbyuid, uid, resourceType, ConvertToXmlAttribute(result.meta_type)))
                
-            except Exception , e:
+            except Exception as e:
                pass
             
         else :
@@ -216,13 +216,13 @@ def xmlString(results, resourceType, foldersOnly):
             size=0
             try:
                size= result.getContent().get_size()
-            except Exception,e:
+            except Exception as e:
                
                pass
             try:
                xmlFiles.append('\r            <File name="%s/preview" size="%s" title="%s" photo="%s" linkbyuid="%s" uid="%s" type="%s" isPA3img="no" isattach="no" attachid="" />'%(ConvertToXmlAttribute(result.getId()),size,ConvertToXmlAttribute(titre), tagPhoto, tagLinkbyuid, uid, resourceType))
                
-            except Exception,e:
+            except Exception as e:
                pass
    
     xmlFiles.append('\r        </Files>')
@@ -264,7 +264,7 @@ def GetFoldersAndFiles( resourceType, currentFolder ):
     if currentFolder != "/" :
       try:
         obj = context.restrictedTraverse(currentFolder.lstrip('/'))
-      except Exception,e:
+      except Exception as e:
         
         obj = context.portal_url.getPortalObject()
     else :
@@ -335,7 +335,7 @@ def GetFolders( resourceType, currentFolder ):
             results.append(object)
           elif user.has_role(rolesSeeUnpublishedContent,object) :
             results.append(object)
-      except Exception,e:
+      except Exception as e:
           pass  
     results = [ s for s in results if user.has_permission('View', s) ]
      
@@ -448,7 +448,7 @@ def UploadFile(resourceType, currentFolder, data, title) :
                 #context.createCPSDocument(context=obj,REQUEST=request)
                 obj.reindexObject()
                 
-            except Exception , e :
+            except Exception as e :
                 
                 error = "103"
                 

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/editor/filemanager/browser/zope/connectors/connectorERP5.py

@@ -203,7 +203,7 @@ def xmlString(results, resourceType, foldersOnly):
             try:
                xmlFolders.append('\r            <Folder name="%s" title="%s" linkbyuid="%s" uid="%s" type="%s" metatype="%s" />'%(ConvertToXmlAttribute(result.id),ConvertToXmlAttribute(titre), tagLinkbyuid, uid, resourceType, ConvertToXmlAttribute(result.meta_type)))
 
-            except Exception , e:
+            except Exception as e:
                pass
 
         else :
@@ -220,12 +220,12 @@ def xmlString(results, resourceType, foldersOnly):
                  unit = " KB"
                else:
                  unit = " Bytes"
-            except Exception,e:
+            except Exception as e:
                pass
             try:
                xmlFiles.append('\r            <File name="%s" size="%s%s" title="%s" photo="%s" linkbyuid="%s" uid="%s" type="%s" isPA3img="no" isattach="no" attachid="" />'%(ConvertToXmlAttribute(result.getId()),size,unit,ConvertToXmlAttribute(titre), tagPhoto, tagLinkbyuid, uid, resourceType))
 
-            except Exception,e:
+            except Exception as e:
                pass
 
     xmlFiles.append('\r        </Files>')
@@ -266,7 +266,7 @@ def GetFoldersAndFiles( resourceType, currentFolder ):
     if currentFolder != "/" :
       try:
         obj = context.restrictedTraverse(currentFolder.lstrip('/'))
-      except Exception,e:
+      except Exception as e:
 
         obj = context.portal_url.getPortalObject()
     else :
@@ -332,7 +332,7 @@ def GetFolders( resourceType, currentFolder ):
             results.append(object)
           elif user.has_role(rolesSeeUnpublishedContent,object) :
             results.append(object)
-      except Exception,e:
+      except Exception as e:
           pass
     results = [ s for s in results if user.has_permission('View', s) ]
 
@@ -435,7 +435,7 @@ def UploadFile(resourceType, currentFolder, data, title) :
                 new_image = obj.newContent(portal_type=typeToAdd, id=idObj, title=titre_data, file=data)
                 new_image.reindexObject()
 
-            except Exception , e :
+            except Exception as e :
                 error = "103"
 
         d= '''

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.py

@@ -17,7 +17,7 @@ try:
   request.set('editable_mode', 1)
   form.validate_all_to_request(request)
   request.set('editable_mode', editable_mode)
-except FormValidationError, validation_errors:
+except FormValidationError as validation_errors:
   # Pack errors into the request
   field_errors = form.ErrorFields(validation_errors)
   request.set('field_errors', field_errors)
@@ -67,7 +67,7 @@ try:
     context,
     doaction_param_list['workflow_action'],
     **doaction_param_list)
-except ValidationFailed, error_message:
+except ValidationFailed as error_message:
   if getattr(error_message, 'msg', None):
     # use of Message class to store message+mapping+domain
     message = error_message.msg

product/ERP5/mixin/mail_message.py

@@ -45,7 +45,7 @@ def testCharsetAndConvert(text_content, content_type, encoding):
       text_content = text_content.decode(encoding).encode('utf-8')
     else:
       text_content = text_content.decode().encode('utf-8')
-  except (UnicodeDecodeError, LookupError), error_message:
+  except (UnicodeDecodeError, LookupError) as error_message:
     encoding = guessEncodingFromText(text_content, content_type)
     if encoding is not None:
       try:
@@ -123,7 +123,7 @@ class MailMessageMixin:
     for (name, value) in self._getMessage().items():
       try:
         decoded_header = decode_header(value)
-      except HeaderParseError, error_message:
+      except HeaderParseError as error_message:
         decoded_header = ()
         LOG('MailMessageMixin.getContentInformation', INFO,
             'Failed to decode %s header of %s with error: %s' %

product/ERP5/tests/erp5_url_checker.py

@@ -147,13 +147,15 @@ class Checker(URLOpener):
       while thread.isAlive():
         sleep(0.5)
       print "Connection to %s went fine" % url
-    except IOError, (errno, strerror):
+    except IOError as xxx_todo_changeme:
+      (errno, strerror) = xxx_todo_changeme.args
       print "Can't connect to %s because of I/O error(%s): %s" % (url, errno, strerror)
 
   def SearchUrl(self, url=None):
     try:
       conn = self.open_http(url)
-    except IOError, (errno, strerror):
+    except IOError as xxx_todo_changeme1:
+      (errno, strerror) = xxx_todo_changeme1.args
       print "Can't connect to %s because of I/O error(%s): %s" % (url, errno, strerror)
 
 

product/ERP5/tests/testInvoice.py

@@ -1000,7 +1000,7 @@ class TestInvoiceMixin(TestPackingListMixin):
     """
     try:
       self.tic()
-    except RuntimeError, exc:
+    except RuntimeError as exc:
       invoice = sequence.get('invoice')
       # check which activities are failing
       self.assertTrue(str(exc).startswith('tic is looping forever.'),

product/ERP5/tests/testReturnedSalePackingList.py

@@ -518,7 +518,7 @@ class TestReturnedSalePackingList(ReturnedSalePackingListMixin, ERP5TypeTestCase
     sequence_list.addSequenceString(sequence_string)
     try:
       sequence_list.play(self, quiet=quiet)
-    except UnsupportedWorkflowMethod, e:
+    except UnsupportedWorkflowMethod as e:
       self.assertTrue(True)
 
   def test_04_ReturnedSalePackingListCreating(self, quiet=quiet,

product/ERP5/tests/testXHTML.py

@@ -123,7 +123,7 @@ class TestXHTMLMixin(ERP5TypeTestCase):
               yield field
           except Exception:
             yield field
-    except AttributeError, e:
+    except AttributeError as e:
       ZopeTestCase._print("%s is broken: %s" % (form_path, e))
 
   def test_deadProxyFields(self):
@@ -236,7 +236,7 @@ class TestXHTMLMixin(ERP5TypeTestCase):
       try:
         stdout, stderr = Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE,
                                close_fds=True).communicate(body)
-      except OSError, e:
+      except OSError as e:
         raise OSError, '%r\n%r' % (os.environ, e)
       if stdout:
         error_list.append((check_path, stdout))

product/ERP5Configurator/Tool/ConfiguratorTool.py

@@ -55,10 +55,10 @@ def _validateFormToRequest(form, REQUEST, **kw):
       form.validate_all_to_request(REQUEST)
       validation_status = 0
       validation_errors = None
-    except FormValidationError, validation_errors:
+    except FormValidationError as validation_errors:
       ## not all fields valid
       validation_status = 1
-    except Exception, validation_errors:
+    except Exception as validation_errors:
       ## missing fields
       validation_status = 2
     ## extract form arguments and remove leading prefixes

product/ERP5Form/CaptchaField.py

@@ -262,7 +262,7 @@ class CaptchaField(ZMIField):
       try:
         # validate the form and get results
         result[field.get_real_field().id] = field.get_real_field().validate(REQUEST)
-      except ValidationError, err:
+      except ValidationError as err:
         if REQUEST:
           message = "Error: %s - %s" % (err.field.get_value('title'),
                                         err.error_text)
@@ -278,7 +278,7 @@ class CaptchaField(ZMIField):
     try:
       # validate the form and get results
       result.update(self.form.validate(REQUEST))
-    except ValidationError, err:
+    except ValidationError as err:
       if REQUEST:
         message = "Error: %s - %s" % (err.field.get_value('title'),
                                       err.error_text)
@@ -328,7 +328,7 @@ class CaptchaField(ZMIField):
       try:
         # validate the form and get results
         result[field.id] = field.validate(REQUEST)
-      except ValidationError, err:
+      except ValidationError as err:
         if REQUEST:
           message = "Error: %s - %s" % (err.field.get_value('title'),
                                         err.error_text)
@@ -341,7 +341,7 @@ class CaptchaField(ZMIField):
     try:
       # validate the form and get results
       result.update(self.tales_form.validate(REQUEST))
-    except ValidationError, err:
+    except ValidationError as err:
       if REQUEST:
         message = "Error: %s - %s" % (err.field.get_value('title'),
                                       err.error_text)

product/ERP5Form/Form.py

@@ -755,12 +755,12 @@ class ERP5Form(Base, ZMIForm, ZopePageTemplate):
                     alternate_name = field.get_value('alternate_name')
                     if alternate_name:
                         result[alternate_name] = value
-                except FormValidationError, e: # XXX JPS Patch for listbox
+                except FormValidationError as e: # XXX JPS Patch for listbox
                     errors.extend(e.errors)
                     result.update(e.result)
-                except ValidationError, err:
+                except ValidationError as err:
                     errors.append(err)
-                except KeyError, err:
+                except KeyError as err:
                     LOG('ERP5Form/Form.py:validate_all', 0, 'KeyError : %s' % (err, ))
 
         if len(errors) > 0:

product/ERP5Form/ListBox.py

@@ -2769,7 +2769,7 @@ class ListBoxValidator(Validator.Validator):
                   value = editable_field._validate_helper(key, REQUEST) # We need cell
                   # Here we set the property
                   row_result[sql] = value
-                except ValidationError, err:
+                except ValidationError as err:
                   pass
                 except KeyError:
                   pass
@@ -2803,7 +2803,7 @@ class ListBoxValidator(Validator.Validator):
                   try:
                     row_result[sql] = editable_field._validate_helper(
                       key, REQUEST) # We need cell
-                  except ValidationError, err:
+                  except ValidationError as err:
                     #LOG("ListBox ValidationError",0,str(err))
                     err.field_id = error_result_key
                     errors.append(err)
@@ -2819,7 +2819,7 @@ class ListBoxValidator(Validator.Validator):
               # because sometimes, we can be provided bad uids
               try :
                 o = here.portal_catalog.getObject(uid)
-              except (KeyError, NotFound, ValueError), err:
+              except (KeyError, NotFound, ValueError) as err:
                 # It is possible that this object is not catalogged yet. So
                 # the object must be obtained from ZODB.
                 if object_list is None:
@@ -2847,7 +2847,7 @@ class ListBoxValidator(Validator.Validator):
                     try:
                       row_result[sql] = error_result[error_result_key] = \
                         editable_field._validate_helper(key, REQUEST)
-                    except ValidationError, err:
+                    except ValidationError as err:
                       err.field_id = error_result_key
                       errors.append(err)
                     except KeyError:

product/ERP5Form/MatrixBox.py

@@ -600,7 +600,7 @@ class MatrixBoxValidator(Validator.Validator):
                         external_validator = my_field.get_value('external_validator')
                         if external_validator and not external_validator(value, REQUEST):
                             my_field.validator.raise_error('external_validator_failed', my_field)
-                      except ValidationError, err :
+                      except ValidationError as err :
                         err.field_id = my_field.id + '_cell_%s_%s_%s%s' % (i,j,k,extra_dimension_index)
                         error_list.append(err)
 

product/ERP5Form/PDFForm.py

@@ -127,7 +127,7 @@ class PDFTk:
         input = input.read()
       try :
         stdin.write(input)
-      except IOError, e:
+      except IOError as e:
         raise IOError, str(e) + " ( make sure "\
           "%s exists and is in your $PATH )"%PDFTK_EXECUTABLE
     stdin.close()
@@ -391,7 +391,7 @@ class PDFForm(File):
     for url in self.getProperty('download_url') :
       try :
         response = urllib.urlopen(url)
-      except IOError, e :
+      except IOError as e :
         LOG("PDFForm", WARNING, "Unable to download from %s" % url, e)
         continue
       if response.headers.getheader('Content-Type') != 'application/pdf':

product/ERP5Form/ProxyField.py

@@ -139,7 +139,7 @@ class ProxyValidator(Validator.Validator):
     proxy_field = field.getRecursiveTemplateField()
     try:
       result = proxy_field.validator.validate(field, key, REQUEST)
-    except ValidationError, error:
+    except ValidationError as error:
       error.field_id = field.id
       raise error
     return result
@@ -195,7 +195,7 @@ class ProxyField(ZMIField):
       try:
         # validate the form and get results
         result = template_field.form.validate(REQUEST)
-      except ValidationError, err:
+      except ValidationError as err:
         if REQUEST:
           message = "Error: %s - %s" % (err.field.get_value('title'),
                                         err.error_text)
@@ -213,7 +213,7 @@ class ProxyField(ZMIField):
     try:
       # validate the form and get results
       result = self.form.validate(REQUEST)
-    except ValidationError, err:
+    except ValidationError as err:
       if REQUEST:
         message = "Error: %s - %s" % (err.field.get_value('title'),
                                       err.error_text)
@@ -305,7 +305,7 @@ class ProxyField(ZMIField):
       try:
         # validate the form and get results
         result = template_field.tales_form.validate(REQUEST)
-      except ValidationError, err:
+      except ValidationError as err:
         if REQUEST:
           message = "Error: %s - %s" % (err.field.get_value('title'),
                                         err.error_text)
@@ -319,7 +319,7 @@ class ProxyField(ZMIField):
     try:
       # validate the form and get results
       result = self.tales_form.validate(REQUEST)
-    except ValidationError, err:
+    except ValidationError as err:
       if REQUEST:
         message = "Error: %s - %s" % (err.field.get_value('title'),
                                       err.error_text)

product/ERP5Form/tests/testListBox.py

@@ -240,7 +240,7 @@ class TestListBox(ERP5TypeTestCase):
     request['here'] = portal.foo_module
     try:
       listbox.get_value('default', render_format='list', REQUEST=request)
-    except UnicodeError, e:
+    except UnicodeError as e:
       self.fail('Rendering failed: %s' % e)
     self.assertIn(u"\xe9lisa", listbox.render(REQUEST=request))
 
@@ -270,7 +270,7 @@ class TestListBox(ERP5TypeTestCase):
     request['here'] = portal.foo_module
     try:
       listbox.get_value('default', render_format='list', REQUEST=request)
-    except UnicodeError, e:
+    except UnicodeError as e:
       self.fail('Rendering failed: %s' % e)
     self.assertIn(u"\xe9lisa", listbox.render(REQUEST=request))
 
@@ -304,7 +304,7 @@ class TestListBox(ERP5TypeTestCase):
     request['here'] = portal.foo_module
     try:
       rendered = listbox.get_value('default', render_format='list', REQUEST=request)
-    except UnicodeError, e:
+    except UnicodeError as e:
       self.fail('Rendering failed: %s' % e)
     self.assertIn(u"http://example.com/?\xe9lisa", listbox.render(REQUEST=request))
 
@@ -338,7 +338,7 @@ class TestListBox(ERP5TypeTestCase):
     request['here'] = portal.foo_module
     try:
       rendered = listbox.get_value('default', render_format='list', REQUEST=request)
-    except UnicodeError, e:
+    except UnicodeError as e:
       self.fail('Rendering failed: %s' % e)
     self.assertIn(u"http://example.com/?\xe9lisa", listbox.render(REQUEST=request))
 
@@ -360,7 +360,7 @@ class TestListBox(ERP5TypeTestCase):
     listbox.get_value('default', render_format='list', REQUEST=request)
     try:
       self.commit()
-    except TypeError, e:
+    except TypeError as e:
       self.fail('Unable to commit transaction: %s' % e)
 
   def test_06_LineFields(self, quiet=0, run=run_all_test):

product/ERP5OOo/Document/OOoDocument.py

@@ -111,12 +111,12 @@ class OOoServerProxy():
           # Cloudooo return result in (200 or 402, dict(), '') format or just based type
           # 402 for error and 200 for ok
           result_set =  func(*args, **kw)
-        except SocketError, e:
+        except SocketError as e:
           message = 'Socket Error: %s' % (repr(e) or 'undefined.')
           socket_error_list.append(message)
           retry_server_list.append(server_proxy)
           continue
-        except ProtocolError, e:
+        except ProtocolError as e:
           # Network issue
           message = "%s: %s %s" % (e.url, e.errcode, e.errmsg)
           if e.errcode == -1:
@@ -124,7 +124,7 @@ class OOoServerProxy():
           protocol_error_list.append(message)
           retry_server_list.append(server_proxy)
           continue
-        except Fault, e:
+        except Fault as e:
           # Return not supported data types
           fault_error_list.append(e)
           continue
@@ -279,7 +279,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
                                 " formats for conversion (Code %s: %s)" % (
                                       response_code, response_message))
 
-      except Fault, f:
+      except Fault as f:
         allowed = server_proxy.getAllowedTargets(content_type)
         warn('Your oood version is too old, using old method '
             'getAllowedTargets instead of getAllowedTargetList',

product/ERP5OOo/OOoUtils.py

@@ -242,7 +242,7 @@ class OOoParser(Implicit):
     # Try to unzip the Open Office doc
     try:
       oo_unzipped = ZipFile(file_descriptor, mode="r")
-    except Exception, e:
+    except Exception as e:
       LOG('ERP5OOo', DEBUG, 'Error in openFile', error=sys.exc_info())
       raise CorruptedOOoFile(e)
     # Test the integrity of the file

product/ERP5OOo/tests/testOOoImport.py

@@ -789,7 +789,7 @@ class TestOOoImport(TestOOoImportMixin):
     try:
       self.portal.portal_categories.Base_getCategoriesSpreadSheetMapping(
              import_file=import_file)
-    except ValueError, error:
+    except ValueError as error:
       # 'france' is the duplicate ID in this spreadsheet
       self.assertTrue('france' in str(error), str(error))
     else:
@@ -818,7 +818,7 @@ class TestOOoImport(TestOOoImportMixin):
     try:
       self.portal.portal_categories.Base_getCategoriesSpreadSheetMapping(
              import_file=import_file)
-    except ValueError, error:
+    except ValueError as error:
       # 'wrong_hierarchy' is the ID of the category where the problem happens
       self.assertTrue('wrong_hierarchy' in str(error), str(error))
     else:
@@ -832,7 +832,7 @@ class TestOOoImport(TestOOoImportMixin):
     try:
       self.portal.portal_categories.Base_getCategoriesSpreadSheetMapping(
              import_file=import_file)
-    except ValueError, error:
+    except ValueError as error:
       self.assertTrue('More that one path is defined' in str(error), str(error))
     else:
       self.fail('ValueError not raised')

product/ERP5OOo/transforms/__init__.py

@@ -26,12 +26,12 @@ for m in modules:
   try:
     ns = __import__(m, g, g, None)
     transforms.append(ns.register())
-  except ImportError, e:
+  except ImportError as e:
     msg = "Problem importing module %s : %s" % (m, e)
     log(msg, severity=ERROR)
-  except MissingBinary, e:
+  except MissingBinary as e:
     log(str(e), severity=DEBUG)
-  except Exception, e:
+  except Exception as e:
     import traceback
     traceback.print_exc()
     log("Raised error %s for %s" % (e, m), severity=ERROR)

product/ERP5Security/ERP5KeyAuthPlugin.py

@@ -277,7 +277,7 @@ class ERP5KeyAuthPlugin(ERP5UserManager, CookieAuthHelper):
           creds['remote_address'] = request.getClientAddr()
         except AttributeError:
           creds['remote_address'] = request.get('REMOTE_ADDR', '')
-    except StandardError, e:
+    except StandardError as e:
       #Log standard error to check error
       LOG('ERP5KeyAuthPlugin.extractCredentials', PROBLEM, str(e))
 
@@ -373,7 +373,7 @@ class ERP5KeyAuthPlugin(ERP5UserManager, CookieAuthHelper):
         return _authenticateCredentials(login=login)
       except _AuthenticationFailure:
         return None
-      except StandardError, e:
+      except StandardError as e:
         #Log standard error
         LOG('ERP5KeyAuthPlugin.authenticateCredentials', PROBLEM, str(e))
         return None

product/ERP5SyncML/ERP5SyncMLMobileServer.py

@@ -172,9 +172,9 @@ def sendResponse(text, to_url, client_url):
 
   try:
     result = urllib2.urlopen(request).read()
-  except socket.error, msg:
+  except socket.error as msg:
     print 'error, url:%s ,data : %s'%(to_url, data)
-  except urllib2.URLError, msg:
+  except urllib2.URLError as msg:
     print "sendResponse, can't open url : %s" % to_url
 
   return result

product/ERP5TioSafe/ConnectionPlugin/HTTPConnection.py

@@ -46,10 +46,10 @@ class MethodWrapper(object):
     try:
       response = urlopen(request)
       return url, response.read()
-    except HTTPError, msg:
+    except HTTPError as msg:
       error = "Impossible to access to the plugin, error code is %s - %s" %(msg.msg, msg.code,)
       raise ConnectionError(error)
-    except URLError, msg:
+    except URLError as msg:
       error = "Impossible to connect to the plugin, reason is %s" %(msg.reason,)
       raise ConnectionError(error)
 

product/ERP5TioSafe/ConnectionPlugin/MagentoXMLRPCConnection.py

@@ -43,7 +43,7 @@ class MethodWrapper(object):
       else:
         return self._method, self._conn.server.call(self._conn.session,
                                                     self._method, [args])
-    except Fault, msg:
+    except Fault as msg:
       error = "XMLRPC error, reason is %s : %s" %(msg.faultCode, msg.faultString,)
       raise ConnectionError(error)
 

product/ERP5TioSafe/ConnectionPlugin/RESTConnection.py

@@ -46,10 +46,10 @@ class MethodWrapper(object):
     try:
       response = urlopen(request)
       return self._conn.url, response.read()
-    except HTTPError, msg:
+    except HTTPError as msg:
       error = "Impossible to access to the plugin, error code is %s - %s" %(msg.msg, msg.code,)
       raise ConnectionError(error)
-    except URLError, msg:
+    except URLError as msg:
       error = "Impossible to connect to the plugin, reason is %s" %(msg.reason,)
       raise ConnectionError(error)
 

product/ERP5TioSafe/Document/IntegrationModule.py

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

product/ERP5TioSafe/Tool/OAuthTool.py

@@ -687,7 +687,7 @@ class OAuthTool(BaseTool):
             # self.end_headers()
             # # return the token
             # self.wfile.write(token.to_string())
-        except OAuthError, err:
+        except OAuthError as err:
             raise
             LOG("Error returned %s" %(err,), 300, "")
             self.send_oauth_error(err, REQUEST)
@@ -709,7 +709,7 @@ class OAuthTool(BaseTool):
             # self.end_headers()
             # # return the callback url (to show server has it)
             # self.wfile.write(token.get_callback_url())
-        except OAuthError, err:
+        except OAuthError as err:
             self.send_oauth_error(err, REQUEST)
         return
 
@@ -723,7 +723,7 @@ class OAuthTool(BaseTool):
             # send okay response
             LOG("calling the callback url %s" %(token.get_callback_url(),), 300, "")
             return REQUEST.RESPONSE.redirect(token.get_callback_url())
-        except OAuthError, err:
+        except OAuthError as err:
             self.send_oauth_error(err, REQUEST)
         return
 
@@ -739,7 +739,7 @@ class OAuthTool(BaseTool):
             # self.end_headers()
             # # return the token
             # self.wfile.write(token.to_string())
-        except OAuthError, err:
+        except OAuthError as err:
             self.send_oauth_error(err, REQUEST)
         return
 
@@ -754,7 +754,7 @@ class OAuthTool(BaseTool):
             # # return the extra parameters - just for something to return
             # self.wfile.write(str(params))
             return str(params)
-        except OAuthError, err:
+        except OAuthError as err:
             self.send_oauth_error(err, REQUEST)
         return
 

product/ERP5TioSafe/__init__.py

@@ -78,7 +78,7 @@ for handler_id, module_id in handler_module_dict.iteritems():
   else:
     try:
       registerConnectionPlugin(handler_id, getattr(module, module_id))
-    except ValueError, msg:
+    except ValueError as msg:
       LOG('ERP5TioSafe.ConnectionPlugin.__init__', WARNING,
           'Unable to register module %r. error is %r.' % \
           (module_id, msg),

product/ERP5Type/Base.py

@@ -239,7 +239,7 @@ class WorkflowMethod(Method):
       except ObjectDeleted:
         # Re-raise with a different result.
         raise ObjectDeleted(result)
-      except ObjectMoved, ex:
+      except ObjectMoved as ex:
         # Re-raise with a different result.
         raise ObjectMoved(ex.getNewObject(), result)
 

product/ERP5Type/ConnectionPlugin/SFTPConnection.py

@@ -94,14 +94,14 @@ class SFTPConnection:
         raise SFTPError("No password or private_key defined")
       # Connect
       self.conn = SFTPClient.from_transport(self.transport)
-    except (gaierror, error), msg:
+    except (gaierror, error) as msg:
       raise SFTPError(str(msg) + ' while establishing connection to %s' % (self.url,))
     # Go to specified directory
     try:
       schema.path.rstrip('/')
       if len(schema.path):
         self.conn.chdir(schema.path)
-    except IOError, msg:
+    except IOError as msg:
       raise SFTPError(str(msg) + ' while changing to dir -%r-' % (schema.path,))
     return self
 
@@ -113,7 +113,7 @@ class SFTPConnection:
     serialized_data = Binary(str(data))
     try:
       self.conn.putfo(StringIO(str(serialized_data)), filepath, confirm=confirm)
-    except error, msg:
+    except error as msg:
       raise SFTPError(str(msg) + ' while writing file %s on %s' % (filepath, path, self.url))
 
   def _getFile(self, filepath):
@@ -125,7 +125,7 @@ class SFTPConnection:
       tmp_file = self.conn.file(filepath, 'rb')
       tmp_file.seek(0)
       return tmp_file.read()
-    except error, msg:
+    except error as msg:
       raise SFTPError(str(msg) + ' while retrieving file %s from %s' % (filepath, self.url))
 
   def readBinaryFile(self, filepath):
@@ -149,7 +149,7 @@ class SFTPConnection:
       if sort_on:
         return [x.filename for x in sorted(self.conn.listdir_attr(path), key=operator.attrgetter(sort_on))]
       return self.conn.listdir(path)
-    except (EOFError, error), msg:
+    except (EOFError, error) as msg:
       raise SFTPError(str(msg) + ' while trying to list %s on %s' % (path, self.url))
 
   def getDirectoryFileList(self, path):
@@ -160,14 +160,14 @@ class SFTPConnection:
     """Delete the file"""
     try:
       self.conn.unlink(filepath)
-    except error, msg:
+    except error as msg:
       raise SFTPError(str(msg) + 'while trying to delete %s on %s' % (filepath, self.url))
 
   def renameFile(self, old_path, new_path):
     """Rename a file"""
     try:
       self.conn.rename(old_path, new_path)
-    except error, msg:
+    except error as msg:
       raise SFTPError('%s while trying to rename "%s" to "%s" on %s.' % \
                      (str(msg), old_path, new_path, self.url))
 

product/ERP5Type/ConnectionPlugin/SOAPWSDLConnection.py

@@ -156,7 +156,7 @@ class MethodWrapper(object):
   def __call__(self, *args, **kw):
     try:
       return self._method(*args, **kw)
-    except SOAPpy.Types.faultType, exception:
+    except SOAPpy.Types.faultType as exception:
       raise SOAPWSDLException(*exception())
 
 # SOAPpy says nothing about thread-safeness of parsed WSDL.

product/ERP5Type/ConnectionPlugin/TimeoutTransport.py

@@ -47,6 +47,6 @@ class TimeoutTransport(SafeTransport):
   def send_content(self, connection, request_body):
     try:
       return SafeTransport.send_content(self, connection, request_body)
-    except socket.error, e:
+    except socket.error as e:
       raise ProtocolError(connection.host, -1,
                           "Could not connect to server", None)

product/ERP5Type/Constraint/PropertyTypeValidity.py

@@ -122,7 +122,7 @@ class PropertyTypeValidity(Constraint):
           if wrong_type:
             try:
               value = self._type_dict[property_type][0](value)
-            except (KeyError, ValueError), error:
+            except (KeyError, ValueError) as error:
               error_message = 'message_incorrect_type_fix_failed'
               mapping['type_cast_error'] = str(error)