Commit d692e641 authored by Jérome Perrin's avatar Jérome Perrin

Make erp5_administration pass coding style test

/reviewed-on !993
parents 01c1218c 00e1736b
......@@ -102,8 +102,8 @@ def MessageCatalog_getNotTranslatedMessageDict(self):
"""
not_translated_message_dict = {}
messages = MessageCatalog_getMessageDict(self)
for k,v in messages.iteritems():
if not len(v) or not len(filter(lambda x:x, v.values())):
for k, v in messages.iteritems():
if not [x for x in v.values() if x]:
not_translated_message_dict[k] = v
return not_translated_message_dict
......@@ -153,7 +153,7 @@ def checkConversionToolAvailability(self):
_, html_result = temp_document.convert(format='html')
except ConflictError:
raise
except: #Which Errors should we catch ?
except Exception:
#Transformation failed
message = 'Conversion tool got unexpected error:\n%s' % ''.join(ExceptionFormatter.format_exception(*sys.exc_info()))
else:
......
......@@ -45,10 +45,7 @@
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple>
<string>W:106, 29: map/filter on lambda could be replaced by comprehension (deprecated-lambda)</string>
<string>W:156, 2: No exception type(s) specified (bare-except)</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
from zpprofile import getProfiler, getStatisticalProfilerAndThread
# these names are used in external methods
from zpprofile import getProfiler, getStatisticalProfilerAndThread # pylint: disable=unused-import
\ No newline at end of file
......@@ -43,10 +43,7 @@
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple>
<string>W: 1, 0: Unused getProfiler imported from zpprofile (unused-import)</string>
<string>W: 1, 0: Unused getStatisticalProfilerAndThread imported from zpprofile (unused-import)</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......
......@@ -6,13 +6,13 @@ alarm_warn_ratio = 0.25
localizer = context.Localizer
for message_catalog in localizer.objectValues('MessageCatalog'):
all = len(message_catalog.MessageCatalog_getMessageDict().keys())
all_messages = len(message_catalog.MessageCatalog_getMessageDict().keys())
not_translated = len(message_catalog.MessageCatalog_getNotTranslatedMessageDict().keys())
enable_warning = not_translated > all*alarm_warn_ratio
enable_warning = not_translated > all_messages * alarm_warn_ratio
if enable_warning:
# we have more than allowed number of untranslated messages,
# fire alarm
context.log("Too many untranslated Localizer messages for %s %s/%s" %(message_catalog, all, not_translated))
context.log("Too many untranslated Localizer messages for %s %s/%s" %(message_catalog, all_messages, not_translated))
return True
return False
......@@ -8,13 +8,14 @@ def getDefaultSecurityCategoryMapping():
'ERP5Type_getSecurityCategoryFromAssignment',
context.getPortalObject().getPortalAssignmentBaseCategoryList()
),)
getSecurityCategoryMapping = getattr(context, 'ERP5Type_getSecurityCategoryMapping', getDefaultSecurityCategoryMapping)
# XXX end of code duplication
for method_id, base_category_list in getSecurityCategoryMapping():
try:
security_category_dict.setdefault(tuple(base_category_list), []).extend(
getattr(context, method_id)(base_category_list, login, context, ''))
except: # XXX: it is not possible to log message with traceback from python script
except Exception: # XXX: it is not possible to log message with traceback from python script
print 'It was not possible to invoke method %s with base_category_list %s'%(method_id, base_category_list)
for base_category_list, category_value_list in security_category_dict.items():
......
......@@ -21,11 +21,11 @@ field_library_id_dict = {
modified_object_dict = {}
def calculateFieldLibraryID(id):
def calculateFieldLibraryID(bt_title):
# The field library name could be automatically calculated or hardcoded in
# the script
return field_library_id_dict.get(id) or 'Base_view%sFieldLibrary' % \
''.join([x.capitalize() for x in id.split('_')[1:]])
return field_library_id_dict.get(bt_title) or 'Base_view%sFieldLibrary' % \
''.join([x.capitalize() for x in bt_title.split('_')[1:]])
def getForm(skin_folder, form_id):
try:
......
......@@ -71,9 +71,13 @@ for script_container in script_container_list:
# Check components
for component_id in (
context.getTemplateExtensionIdList() +
context.getTemplateDocumentIdList() +
context.getTemplateTestIdList()):
context.getTemplateExtensionIdList()
+ context.getTemplateDocumentIdList()
+ context.getTemplateMixinIdList()
+ context.getTemplateTestIdList()
+ context.getTemplateModuleComponentIdList()
+ context.getTemplateToolComponentIdList()
):
checkComponent(portal.portal_components[component_id])
return line_list
......@@ -54,7 +54,7 @@ if catalog_uid_list is None:
'tag': tag,
'fixit': fixit,
}
for activity in xrange(activity_count):
for _ in xrange(activity_count):
if len(catalog_uid_list) == 0:
result_list.append('No more uids to check, stop spawning activities.')
break
......
......@@ -46,7 +46,7 @@ class TestFieldLibraryGuideline(ERP5TypeTestCase):
return (
'erp5_base',
'erp5_crm',
'erp5_forge',
'erp5_administration',
)
def beforeTearDown(self):
......
......@@ -77,18 +77,32 @@ def getSkinPrefixList(self):
# Add other prefix
skin_prefix_list.extend((
'ERP5Type',
'Module',
'Brain', # Catalog brains
'DCWorkflow', # some workflow script use this, not sure it's correct.
'SkinsTool',
'Entity', # A base class for Person / Organisation
'Zuite', # Products.Zelenium test suites
'Form', # Acceptable for ERP5 Forms which will soon become portal types too
# ERP5Form
'Form',
'ListBox',
'DCWorkflow', # some workflow script use this, not sure it's correct.
'Zuite', # from Zelenium
'Brain', # Catalog brains
'PlanningBox',
'OOoChart',
))
return set(skin_prefix_list)
# Some skin names that does not respect our conventions but are ignored, for example
# when this naming is used by zope.
ignored_skin_id_set = {
'twiddleAuthCookie',
'setAuthCookie',
}
# Generic method to check consistency of a skin item
def checkConsistency(self, fixit=0, source_code=None):
"""
......@@ -103,7 +117,7 @@ def checkConsistency(self, fixit=0, source_code=None):
# Make sure id is acceptable
document_id = self.id
if document_id != document_id.lower():
if document_id != document_id.lower() and document_id not in ignored_skin_id_set:
# Only test prefix with big caps
prefix = document_id.split('_')[0]
if prefix not in getSkinPrefixList(self):
......
......@@ -93,6 +93,11 @@ class ConstraintMixin(IdAsReferenceMixin('_constraint'), Predicate):
return self._checkConsistency(obj, fixit, **kw)
def _checkConsistency(self, obj, fixit=0, **kw):
"""Implementation of constraint logic.
"""
raise NotImplementedError()
security.declareProtected(Permissions.AccessContentsInformation,
'fixConsistency')
def fixConsistency(self, obj, **kw):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment