From f40b2c66f21f7ab59c543e5b7958e08d29790c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 31 Mar 2020 06:58:00 +0200 Subject: [PATCH] km: fix pylint messages and enable coding style test --- .../erp5_km/Base_getWorkflowEventInfoAsDocumentList.py | 1 - .../ERP5Type_getSecurityCategoryFromMembershipCriterion.py | 6 +++--- .../ERP5Type_getSecurityCategoryFromMembershipCriterion.xml | 2 +- .../portal_skins/erp5_km/WebSite_createWebSiteAccount.py | 4 +--- .../portal_skins/erp5_km/WebSite_getWorklistSettingsFor.py | 2 +- .../Document_getRelatedDocumentListByRelationIdList.xml | 2 +- .../erp5_km_widget_library/WebSite_viewDocumentRender.py | 2 -- bt5/erp5_km/bt/skip_coding_style_test | 1 - 8 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 bt5/erp5_km/bt/skip_coding_style_test diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Base_getWorkflowEventInfoAsDocumentList.py b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Base_getWorkflowEventInfoAsDocumentList.py index c32eb55648..f5c90eea4f 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Base_getWorkflowEventInfoAsDocumentList.py +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/Base_getWorkflowEventInfoAsDocumentList.py @@ -1,7 +1,6 @@ from Products.ERP5Type.Document import newTempBase request = context.REQUEST -portal = context.getPortalObject() # we can use current_web_document in case it's "embedded" into a Web Section document = request.get('current_web_document', context) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.py b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.py index d56a118026..96cb1f327c 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.py +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.py @@ -12,16 +12,16 @@ The parameters are base_category_list -- list of acceptable base categories (used to filter part of the criteria) user_name -- the user identifier (not used) - object -- object which we want to assign roles to + obj -- object which we want to assign roles to portal_type -- portal type of object """ category_list = [] -if object is None: +if obj is None: return [] -criterion_list = object.getMembershipCriterionCategoryList() +criterion_list = obj.getMembershipCriterionCategoryList() for criterion in criterion_list: id_list = criterion.split('/') base_category = id_list[0] diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.xml index bf943e6276..ec6e04e5f6 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/ERP5Type_getSecurityCategoryFromMembershipCriterion.xml @@ -50,7 +50,7 @@ </item> <item> <key> <string>_params</string> </key> - <value> <string>base_category_list, user_name, object, portal_type</string> </value> + <value> <string>base_category_list, user_name, obj, portal_type</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_createWebSiteAccount.py b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_createWebSiteAccount.py index 7e4833719b..a98b9e8afb 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_createWebSiteAccount.py +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_createWebSiteAccount.py @@ -1,8 +1,6 @@ """ Create basic KM account using ERP5 credentials system. """ -from Products.Formulator.Errors import ValidationError, FormValidationError -portal = context.getPortalObject() translateString = context.Base_translateString website = context.getWebSiteValue() @@ -12,7 +10,7 @@ result, result_type = context.Base_edit(form_id, silent_mode=1, field_prefix='yo # Return if not appropriate if result_type != 'edit': return result -kw, encapsulated_editor_list = result +kw, _ = result # XXX: hard coded due to erp5_credentials requirement kw['role_list'] = ['internal'] diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getWorklistSettingsFor.py b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getWorklistSettingsFor.py index e18797234d..7798ca6b0b 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getWorklistSettingsFor.py +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getWorklistSettingsFor.py @@ -10,7 +10,7 @@ kw = {} try: workflow_tool = context.portal_workflow workflow = getattr(workflow_tool, action['workflow_id']) -except: +except AttributeError: return {} # If this is a worklist action, read the worklist definition diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Document_getRelatedDocumentListByRelationIdList.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Document_getRelatedDocumentListByRelationIdList.xml index b66ae2230d..48abe5cf7c 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Document_getRelatedDocumentListByRelationIdList.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Document_getRelatedDocumentListByRelationIdList.xml @@ -50,7 +50,7 @@ </item> <item> <key> <string>_params</string> </key> - <value> <string>relation_id_list=[],**kw</string> </value> + <value> <string>relation_id_list=(), **kw</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewDocumentRender.py b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewDocumentRender.py index 89db023912..14699ebfa7 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewDocumentRender.py +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewDocumentRender.py @@ -1,8 +1,6 @@ """ Returns a document by its reference in a gadget. """ - -request = context.REQUEST portal = context.getPortalObject() if box_relative_url: diff --git a/bt5/erp5_km/bt/skip_coding_style_test b/bt5/erp5_km/bt/skip_coding_style_test deleted file mode 100644 index 56a6051ca2..0000000000 --- a/bt5/erp5_km/bt/skip_coding_style_test +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file -- 2.30.9