Commit 9781e7f9 authored by Jérome Perrin's avatar Jérome Perrin Committed by Arnaud Fontaine

patchs/pylint: update for python3 support

this works with astroid 3.2.0 and pylint 3.2.0
parent 72ec7d78
...@@ -159,14 +159,10 @@ class ComponentTool(BaseTool): ...@@ -159,14 +159,10 @@ class ComponentTool(BaseTool):
erp5.component.filesystem_import_dict = None erp5.component.filesystem_import_dict = None
erp5.component.ref_manager.gc() erp5.component.ref_manager.gc()
# Clear pylint cache # Clear astroid (pylint) cache
try: from astroid import MANAGER
from astroid.builder import MANAGER
except ImportError:
pass
else:
astroid_cache = MANAGER.astroid_cache astroid_cache = MANAGER.astroid_cache
for k in astroid_cache.keys(): for k in list(astroid_cache.keys()):
if k.startswith('erp5.component.') and k not in component_package_list: if k.startswith('erp5.component.') and k not in component_package_list:
del astroid_cache[k] del astroid_cache[k]
......
...@@ -419,7 +419,7 @@ def fill_args_from_request(*optional_args): ...@@ -419,7 +419,7 @@ def fill_args_from_request(*optional_args):
return decorator return decorator
_pylint_message_re = re.compile( _pylint_message_re = re.compile(
'^(?P<type>[CRWEF]):\s*(?P<row>\d+),\s*(?P<column>\d+):\s*(?P<message>.*)$') r'^(?P<type>[CRWEF]):\s*(?P<row>\d+),\s*(?P<column>\d+):\s*(?P<message>.*)$')
def checkPythonSourceCode(source_code_str, portal_type=None): def checkPythonSourceCode(source_code_str, portal_type=None):
""" """
...@@ -462,8 +462,11 @@ def checkPythonSourceCode(source_code_str, portal_type=None): ...@@ -462,8 +462,11 @@ def checkPythonSourceCode(source_code_str, portal_type=None):
message_list = [] message_list = []
output_file = StringIO() output_file = StringIO()
try: try:
with tempfile.NamedTemporaryFile(prefix='checkPythonSourceCode', with tempfile.NamedTemporaryFile(
suffix='.py') as input_file: prefix='checkPythonSourceCode',
suffix='.py',
mode='w',
) as input_file:
input_file.write(source_code_str) input_file.write(source_code_str)
input_file.flush() input_file.flush()
...@@ -493,6 +496,8 @@ def checkPythonSourceCode(source_code_str, portal_type=None): ...@@ -493,6 +496,8 @@ def checkPythonSourceCode(source_code_str, portal_type=None):
# TODO-arnau: Enable it properly would require inspection API # TODO-arnau: Enable it properly would require inspection API
# '%s %r has no %r member' # '%s %r has no %r member'
'--disable=E1101,E1103', '--disable=E1101,E1103',
# XXX duplicate-bases causes too many false positives
'--disable=duplicate-bases',
# map and filter should not be considered bad as in some cases # map and filter should not be considered bad as in some cases
# map is faster than its recommended replacement (list # map is faster than its recommended replacement (list
# comprehension) # comprehension)
...@@ -508,7 +513,26 @@ def checkPythonSourceCode(source_code_str, portal_type=None): ...@@ -508,7 +513,26 @@ def checkPythonSourceCode(source_code_str, portal_type=None):
# unused variables # unused variables
'--dummy-variables-rgx=_$|dummy|__traceback_info__|__traceback_supplement__', '--dummy-variables-rgx=_$|dummy|__traceback_info__|__traceback_supplement__',
] ]
if six.PY3:
args.extend(
(
"--msg-template='{C}: {line},{column}: {msg} ({symbol})'",
'--load-plugins=pylint.extensions.bad_builtin',
# BBB until we drop compatibility with PY2
'--disable=redundant-u-string-prefix,raise-missing-from,keyword-arg-before-vararg',
# XXX acceptable to ignore in the context of ERP5
'--disable=unspecified-encoding',
# XXX to many errors for now
'--disable=arguments-differ,arguments-renamed',
'--disable=duplicate-bases,inconsistent-mro',
)
)
else:
args.extend(
(
'--load-plugins=Products.ERP5Type.patches.pylint_compatibility_disable',
)
)
if portal_type == 'Interface Component': if portal_type == 'Interface Component':
# __init__ method from base class %r is not called # __init__ method from base class %r is not called
args.append('--disable=W0231') args.append('--disable=W0231')
...@@ -521,19 +545,15 @@ def checkPythonSourceCode(source_code_str, portal_type=None): ...@@ -521,19 +545,15 @@ def checkPythonSourceCode(source_code_str, portal_type=None):
# Method should have "self" as first argument (no-self-argument) # Method should have "self" as first argument (no-self-argument)
args.append('--disable=E0213') args.append('--disable=E0213')
try:
from pylint.extensions.bad_builtin import __name__ as ext
args.append('--load-plugins=' + ext)
except ImportError:
pass
try: try:
# Note that we don't run pylint as a subprocess, but directly from # Note that we don't run pylint as a subprocess, but directly from
# ERP5 process, so that pylint can access the code from ERP5Type # ERP5 process, so that pylint can access the code from ERP5Type
# dynamic modules from ZODB. # dynamic modules from ZODB.
Run(args, reporter=TextReporter(output_file), exit=False) Run(args, reporter=TextReporter(output_file), exit=False)
finally: finally:
from astroid.builder import MANAGER from astroid import MANAGER
MANAGER.astroid_cache.pop( astroid_cache = MANAGER.astroid_cache
astroid_cache.pop(
os.path.splitext(os.path.basename(input_file.name))[0], os.path.splitext(os.path.basename(input_file.name))[0],
None) None)
......
...@@ -39,8 +39,7 @@ if getZopeVersion()[0] == 2: # BBB Zope2 ...@@ -39,8 +39,7 @@ if getZopeVersion()[0] == 2: # BBB Zope2
else: else:
IS_ZOPE2 = False IS_ZOPE2 = False
import six import six
if six.PY2: from .patches import pylint
from .patches import pylint
from zLOG import LOG, INFO from zLOG import LOG, INFO
DISPLAY_BOOT_PROCESS = False DISPLAY_BOOT_PROCESS = False
......
This diff is collapsed.
"""A dummy checker to register messages from pylint3, to be able to
disable the messages on python2 without causing bad-option-value
"""
from __future__ import absolute_import
from pylint import checkers, interfaces
class CompatibilityDisableChecker(checkers.BaseChecker):
name = "compatibility-disable"
msgs = {
"E9999": (
"not-an-iterable",
"not-an-iterable",
"",
),
"E9998": (
"misplaced-bare-raise",
"misplaced-bare-raise",
"",
),
"E9997": (
"unused-private-member",
"unused-private-member",
"",
),
"E9996": (
"using-constant-test",
"using-constant-test",
""
),
"E9995": (
"modified-iterating-list",
"modified-iterating-list",
"",
),
"E9994": (
"unsubscriptable-object",
"unsubscriptable-object",
"",
),
"E9993": (
"invalid-unary-operand-type",
"invalid-unary-operand-type",
"",
),
"E9992": (
"unbalanced-dict-unpacking",
"unbalanced-dict-unpacking",
"",
),
"E9991": (
"self-cls-assignment",
"self-cls-assignment",
"",
),
"E9990": (
"deprecated-class",
"deprecated-class",
"",
),
"E9989": (
"possibly-used-before-assignment",
"possibly-used-before-assignment",
""
)
}
def register(linter):
linter.register_checker(CompatibilityDisableChecker(linter))
...@@ -1899,11 +1899,18 @@ class TestZodbModuleComponent(SecurityTestCase): ...@@ -1899,11 +1899,18 @@ class TestZodbModuleComponent(SecurityTestCase):
component.setTextContent("""import unexistent_module component.setTextContent("""import unexistent_module
""" + valid_code) """ + valid_code)
self.tic() self.tic()
if six.PY2:
self.assertEqual( self.assertEqual(
[m.getMessage().translate() for m in component.checkConsistency()], [m.getMessage().translate() for m in component.checkConsistency()],
["Error in Source Code: F: 1, 0: Unable to import 'unexistent_module' (import-error)"]) ["Error in Source Code: F: 1, 0: Unable to import 'unexistent_module' (import-error)"])
self.assertEqual(component.getTextContentErrorMessageList(), self.assertEqual(component.getTextContentErrorMessageList(),
["F: 1, 0: Unable to import 'unexistent_module' (import-error)"]) ["F: 1, 0: Unable to import 'unexistent_module' (import-error)"])
else:
self.assertEqual(
[m.getMessage().translate() for m in component.checkConsistency()],
["Error in Source Code: E: 1, 0: Unable to import 'unexistent_module' (import-error)"])
self.assertEqual(component.getTextContentErrorMessageList(),
["E: 1, 0: Unable to import 'unexistent_module' (import-error)"])
self.assertEqual(component.getTextContentWarningMessageList(), self.assertEqual(component.getTextContentWarningMessageList(),
["W: 1, 0: Unused import unexistent_module (unused-import)"]) ["W: 1, 0: Unused import unexistent_module (unused-import)"])
...@@ -1935,11 +1942,10 @@ class TestZodbModuleComponent(SecurityTestCase): ...@@ -1935,11 +1942,10 @@ class TestZodbModuleComponent(SecurityTestCase):
[ComponentMixin._message_text_content_not_set], [ComponentMixin._message_text_content_not_set],
[], [],
[]), []),
("""def foobar(*args, **kwargs) ("""None()
return 42
""" + valid_code, """ + valid_code,
["Error in Source Code: E: 1, 0: invalid syntax (syntax-error)"], ["Error in Source Code: E: 1, 0: None is not callable (not-callable)"],
["E: 1, 0: invalid syntax (syntax-error)"], ["E: 1, 0: None is not callable (not-callable)"],
[]), []),
# Make sure that foobar NameError is at the end to make sure that after # Make sure that foobar NameError is at the end to make sure that after
# defining foobar function, it is not available at all # defining foobar function, it is not available at all
...@@ -2209,7 +2215,7 @@ def function_foo(*args, **kwargs): ...@@ -2209,7 +2215,7 @@ def function_foo(*args, **kwargs):
def _assertAstroidCacheContent(self, def _assertAstroidCacheContent(self,
must_be_in_cache_set, must_be_in_cache_set,
must_not_be_in_cache_set): must_not_be_in_cache_set):
from astroid.builder import MANAGER from astroid import MANAGER
should_not_be_in_cache_list = [] should_not_be_in_cache_list = []
for modname in MANAGER.astroid_cache: for modname in MANAGER.astroid_cache:
if (modname.startswith('checkPythonSourceCode') or if (modname.startswith('checkPythonSourceCode') or
...@@ -2265,10 +2271,10 @@ def hoge(): ...@@ -2265,10 +2271,10 @@ def hoge():
"""# -*- coding: utf-8 -*- """# -*- coding: utf-8 -*-
# Source code with non-ASCII character should not fail: éàホゲ # Source code with non-ASCII character should not fail: éàホゲ
from %(namespace)s import %(reference1)s from %(namespace)s import %(reference1)s
from %(namespace)s.erp5_version import %(reference1)s from %(namespace)s.erp5_version import %(reference1)s # pylint:disable=reimported
from %(module2)s import hoge from %(module2)s import hoge
from %(module2_with_version)s import hoge from %(module2_with_version)s import hoge # pylint:disable=reimported
import %(module2)s import %(module2)s
import %(module2_with_version)s import %(module2_with_version)s
...@@ -2293,7 +2299,8 @@ from AccessControl.PermissionRole import rolesForPermissionOn, PermissionRole, i ...@@ -2293,7 +2299,8 @@ from AccessControl.PermissionRole import rolesForPermissionOn, PermissionRole, i
# Monkey patch of astroid 1.3.8: it raised 'no-name-in-module' because # Monkey patch of astroid 1.3.8: it raised 'no-name-in-module' because
# Shared.DC was not considered a namespace package # Shared.DC was not considered a namespace package
from Shared.DC.ZRDB.Results import Results # pylint: disable=unused-import from Shared.DC.ZRDB.Results import Results
_ = Results
import lxml.etree import lxml.etree
lxml.etree.Element('test') lxml.etree.Element('test')
...@@ -2340,17 +2347,21 @@ _ = ZBigArray ...@@ -2340,17 +2347,21 @@ _ = ZBigArray
module2_with_version=imported_module2_with_version)) + module2_with_version=imported_module2_with_version)) +
component.getTextContent()) component.getTextContent())
must_be_in_cache_set = set()
if six.PY2:
must_be_in_cache_set.add(namespace)
self._assertAstroidCacheContent( self._assertAstroidCacheContent(
must_be_in_cache_set={'%s' % namespace}, must_be_in_cache_set=must_be_in_cache_set,
must_not_be_in_cache_set={'%s.erp5_version' % namespace, must_not_be_in_cache_set={'%s.erp5_version' % namespace,
imported_module1, imported_module1,
imported_module1_with_version, imported_module1_with_version,
imported_module2, imported_module2,
imported_module2_with_version}) imported_module2_with_version})
component.checkSourceCode() component.checkSourceCode()
if six.PY2:
must_be_in_cache_set.add('%s.erp5_version' % namespace)
self._assertAstroidCacheContent( self._assertAstroidCacheContent(
must_be_in_cache_set={'%s' % namespace, must_be_in_cache_set=must_be_in_cache_set,
'%s.erp5_version' % namespace},
must_not_be_in_cache_set={imported_module1, must_not_be_in_cache_set={imported_module1,
imported_module1_with_version, imported_module1_with_version,
imported_module2, imported_module2,
...@@ -2358,9 +2369,11 @@ _ = ZBigArray ...@@ -2358,9 +2369,11 @@ _ = ZBigArray
self.tic() self.tic()
self.assertEqual(component.getValidationState(), 'modified') self.assertEqual(component.getValidationState(), 'modified')
if six.PY2:
self.assertEqual( self.assertEqual(
component.getTextContentErrorMessageList(), component.getTextContentErrorMessageList(),
["E: 3, 0: No name '%s' in module '%s' (no-name-in-module)" % [
"E: 3, 0: No name '%s' in module '%s' (no-name-in-module)" %
(imported_reference1, namespace), (imported_reference1, namespace),
"E: 4, 0: No name '%s' in module '%s.erp5_version' (no-name-in-module)" % "E: 4, 0: No name '%s' in module '%s.erp5_version' (no-name-in-module)" %
(imported_reference1, namespace), (imported_reference1, namespace),
...@@ -2384,9 +2397,41 @@ _ = ZBigArray ...@@ -2384,9 +2397,41 @@ _ = ZBigArray
"E: 10, 0: No name '%s' in module '%s.erp5_version' (no-name-in-module)" % "E: 10, 0: No name '%s' in module '%s.erp5_version' (no-name-in-module)" %
(imported_reference2, namespace), (imported_reference2, namespace),
"F: 10, 0: Unable to import '%s' (import-error)" % "F: 10, 0: Unable to import '%s' (import-error)" %
imported_module2_with_version]) imported_module2_with_version,
],
)
else:
self.assertEqual(
component.getTextContentErrorMessageList(),
[
"E: 3, 0: No name '%s' in module '%s' (no-name-in-module)" %
(imported_reference1, namespace),
"E: 4, 0: No name '%s' in module '%s.erp5_version' (no-name-in-module)" %
(imported_reference1, namespace),
"E: 6, 0: Unable to import '%s.%s' (import-error)" %
(namespace, imported_reference2),
# Spurious message but same as filesystem modules: 2 errors raised
# (no-name-in-module and import-error)
"E: 6, 0: No name '%s' in module '%s' (no-name-in-module)" %
(imported_reference2, namespace),
"E: 7, 0: Unable to import '%s' (import-error)" %
imported_module2_with_version,
# Spurious message (see above comment)
"E: 7, 0: No name '%s' in module '%s.erp5_version' (no-name-in-module)" %
(imported_reference2, namespace),
"E: 9, 0: Unable to import '%s.%s' (import-error)" %
(namespace, imported_reference2),
# Spurious message (see above comment)
"E: 9, 0: No name '%s' in module '%s' (no-name-in-module)" %
(imported_reference2, namespace),
"E: 10, 0: Unable to import '%s' (import-error)" %
imported_module2_with_version,
# Spurious message (see above comment)
"E: 10, 0: No name '%s' in module '%s.erp5_version' (no-name-in-module)" %
(imported_reference2, namespace),
],
)
self.assertEqual(component.getTextContentWarningMessageList(), []) self.assertEqual(component.getTextContentWarningMessageList(), [])
## Simulate user: ## Simulate user:
# 1) First check and validate 'imported' Components # 1) First check and validate 'imported' Components
self.portal.portal_workflow.doActionFor(imported_component1, 'validate_action') self.portal.portal_workflow.doActionFor(imported_component1, 'validate_action')
...@@ -2397,20 +2442,29 @@ _ = ZBigArray ...@@ -2397,20 +2442,29 @@ _ = ZBigArray
message_list = component.checkSourceCode() message_list = component.checkSourceCode()
self.assertEqual(message_list, []) self.assertEqual(message_list, [])
self._assertAstroidCacheContent( must_be_in_cache_set = {
must_be_in_cache_set={'%s' % namespace,
'%s.erp5_version' % namespace,
imported_module1, imported_module1,
imported_module1_with_version, imported_module1_with_version,
imported_module2, imported_module2,
imported_module2_with_version}, imported_module2_with_version,
}
if six.PY2:
must_be_in_cache_set.update({
'%s' % namespace,
'%s.erp5_version' % namespace,
})
self._assertAstroidCacheContent(
must_be_in_cache_set=must_be_in_cache_set,
must_not_be_in_cache_set=set()) must_not_be_in_cache_set=set())
# 2) Then modify the main one so that it automatically 'validate' # 2) Then modify the main one so that it automatically 'validate'
component.setTextContent(component.getTextContent() + '\n') component.setTextContent(component.getTextContent() + '\n')
self.tic() self.tic()
must_be_in_cache_set = set()
if six.PY2:
must_be_in_cache_set.add(namespace)
self._assertAstroidCacheContent( self._assertAstroidCacheContent(
must_be_in_cache_set={'%s' % namespace}, must_be_in_cache_set=must_be_in_cache_set,
must_not_be_in_cache_set={'%s.erp5_version' % namespace, must_not_be_in_cache_set={'%s.erp5_version' % namespace,
imported_module1, imported_module1,
imported_module1_with_version, imported_module1_with_version,
...@@ -2423,10 +2477,11 @@ _ = ZBigArray ...@@ -2423,10 +2477,11 @@ _ = ZBigArray
component.setTextContent( component.setTextContent(
"""# -*- coding: utf-8 -*- """# -*- coding: utf-8 -*-
from %(module)s import undefined from %(module)s import undefined
from %(module_with_version)s import undefined from %(module_with_version)s import undefined2
# To avoid 'unused-import' warning... # To avoid 'unused-import' warning...
undefined() undefined()
undefined2()
""" % (dict(module=imported_module2, """ % (dict(module=imported_module2,
module_with_version=imported_module2_with_version)) + module_with_version=imported_module2_with_version)) +
...@@ -2437,7 +2492,7 @@ undefined() ...@@ -2437,7 +2492,7 @@ undefined()
component.getTextContentErrorMessageList(), component.getTextContentErrorMessageList(),
["E: 2, 0: No name 'undefined' in module '%s' (no-name-in-module)" % ["E: 2, 0: No name 'undefined' in module '%s' (no-name-in-module)" %
imported_module2_with_version, imported_module2_with_version,
"E: 3, 0: No name 'undefined' in module '%s' (no-name-in-module)" % "E: 3, 0: No name 'undefined2' in module '%s' (no-name-in-module)" %
imported_module2_with_version]) imported_module2_with_version])
self.assertEqual(component.getTextContentWarningMessageList(), []) self.assertEqual(component.getTextContentWarningMessageList(), [])
...@@ -2473,8 +2528,8 @@ def hoge(): ...@@ -2473,8 +2528,8 @@ def hoge():
component = self._newComponent(reference) component = self._newComponent(reference)
component.setTextContent(component.getTextContent() + """ component.setTextContent(component.getTextContent() + """
from %(namespace)s import %(reference)s from %(namespace)s import %(reference)s
from %(namespace)s.bar_version import %(reference)s from %(namespace)s.bar_version import %(reference)s # pylint:disable=reimported
from %(namespace)s.erp5_version import %(reference)s from %(namespace)s.erp5_version import %(reference)s # pylint:disable=reimported
# To avoid 'unused-import' warning... # To avoid 'unused-import' warning...
%(reference)s.hoge() %(reference)s.hoge()
...@@ -2482,7 +2537,7 @@ from %(namespace)s.erp5_version import %(reference)s ...@@ -2482,7 +2537,7 @@ from %(namespace)s.erp5_version import %(reference)s
reference=imported_reference)) reference=imported_reference))
component.checkSourceCode() component.checkSourceCode()
from astroid.builder import MANAGER from astroid import MANAGER
imported_module = self._getComponentFullModuleName(imported_reference) imported_module = self._getComponentFullModuleName(imported_reference)
self.assertEqual( self.assertEqual(
MANAGER.astroid_cache[self._getComponentFullModuleName(imported_reference, version='bar')], MANAGER.astroid_cache[self._getComponentFullModuleName(imported_reference, version='bar')],
......
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