eric: comparison eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py

-:fb0ef164f536
+:698ae46f40a4
 import queue
 import ast
 import sys
 import multiprocessing
+import contextlib
 import pycodestyle
 from Naming.NamingStyleChecker import NamingStyleChecker
 # register the name checker
 from DocStyle.DocStyleChecker import DocStyleChecker
 from Miscellaneous.MiscellaneousChecker import MiscellaneousChecker
 from Complexity.ComplexityChecker import ComplexityChecker
 from Security.SecurityChecker import SecurityChecker
 from PathLib.PathlibChecker import PathlibChecker
+from Simplify.SimplifyChecker import SimplifyChecker
 def initService():
 """
 Initialize the service and return the entry point.
 """
 Constructor
 @param options options for the report (optparse.Values)
 """
-super(CodeStyleCheckerReport, self).__init__(options)
+super().__init__(options)
 self.__repeat = options.repeat
 self.errors = []
 def error_args(self, line_number, offset, code, check, *args):
 @param code message code (string)
 @param check reference to the checker function (function)
 @param args arguments for the message (list)
 @return error code (string)
 """
-code = super(CodeStyleCheckerReport, self).error_args(
+code = super().error_args(
 line_number, offset, code, check, *args)
 if code and (self.counters[code] == 1 or self.__repeat):
 self.errors.append(
 {
 "file": self.filename,
 @param filename source filename
 @type str
 @param source string containing the code to check
 @type str
-@return tuple containing the error dictionary with syntax error details
+@return tuple containing the error dictionary with syntax error details,
-and a statistics dictionary or a tuple containing two None
+a statistics dictionary and None or a tuple containing two None and
-@rtype tuple of (dict, dict) or tuple of (None, None)
+the generated AST tree
+@rtype tuple of (dict, dict, None) or tuple of (None, None, ast.Module)
 """
 src = "".join(source)
 try:
-ast.parse(src, filename, 'exec')
+tree = (
-return None, None
+ast.parse(src, filename, 'exec', type_comments=True)
+# need the 'type_comments' parameter to include type annotations
+if sys.version_info >= (3, 8) else
+ast.parse(src, filename, 'exec')
+)
+return None, None, tree
 except (SyntaxError, TypeError):
 exc_type, exc = sys.exc_info()[:2]
 if len(exc.args) > 1:
 offset = exc.args[1]
 if len(offset) > 2:
 offset = offset[1:3]
 else:
 offset = (1, 0)
-return ({
+return (
-"file": filename,
+{
-"line": offset[0],
+"file": filename,
-"offset": offset[1],
+"line": offset[0],
-"code": "E901",
+"offset": offset[1],
-"args": [exc_type.__name__, exc.args[0]],
+"code": "E901",
-}, {
+"args": [exc_type.__name__, exc.args[0]],
-"E901": 1,
+}, {
-})
+"E901": 1,
+},
+None
+)
 def __checkCodeStyle(filename, source, args):
 """
 Private module function to perform the code style check and/or fix
 ignore = [i.strip() for i in
 excludeMessages.split(',') if i.strip()]
 else:
 ignore = []
-syntaxError, syntaxStats = __checkSyntax(filename, source)
+syntaxError, syntaxStats, tree = __checkSyntax(filename, source)
-if syntaxError:
-errors = [syntaxError]
+# perform the checks only, if syntax is ok and AST tree was generated
-stats.update(syntaxStats)
+if tree:
-# perform the checks only, if syntax is ok
-else:
 # check coding style
 pycodestyle.BLANK_LINES_CONFIG = {
 # Top level class and function.
 'top_level': blankLines[0],
 # Methods and nested class and function.
 stats.update(docStyleChecker.counters)
 errors += docStyleChecker.errors
 # miscellaneous additional checks
 miscellaneousChecker = MiscellaneousChecker(
-source, filename, select, ignore, [], repeatMessages,
+source, filename, tree, select, ignore, [], repeatMessages,
 miscellaneousArgs)
 miscellaneousChecker.run()
 stats.update(miscellaneousChecker.counters)
 errors += miscellaneousChecker.errors
 # check code complexity
 complexityChecker = ComplexityChecker(
-source, filename, select, ignore, codeComplexityArgs)
+source, filename, tree, select, ignore, codeComplexityArgs)
 complexityChecker.run()
 stats.update(complexityChecker.counters)
 errors += complexityChecker.errors
 # check function annotations
-if sys.version_info >= (3, 5, 0):
+if sys.version_info >= (3, 8, 0):
-# annotations are supported from Python 3.5 on
+# annotations with type comments are supported from
+# Python 3.8 on
 from Annotations.AnnotationsChecker import AnnotationsChecker
 annotationsChecker = AnnotationsChecker(
-source, filename, select, ignore, [], repeatMessages,
+source, filename, tree, select, ignore, [], repeatMessages,
 annotationArgs)
 annotationsChecker.run()
 stats.update(annotationsChecker.counters)
 errors += annotationsChecker.errors
+# check for security issues
 securityChecker = SecurityChecker(
-source, filename, select, ignore, [], repeatMessages,
+source, filename, tree, select, ignore, [], repeatMessages,
 securityArgs)
 securityChecker.run()
 stats.update(securityChecker.counters)
 errors += securityChecker.errors
+# check for pathlib usage
 pathlibChecker = PathlibChecker(
-source, filename, select, ignore, [], repeatMessages)
+source, filename, tree, select, ignore, [], repeatMessages)
 pathlibChecker.run()
 stats.update(pathlibChecker.counters)
 errors += pathlibChecker.errors
+# check for code simplifications
+simplifyChecker = SimplifyChecker(
+source, filename, tree, select, ignore, [], repeatMessages)
+simplifyChecker.run()
+stats.update(simplifyChecker.counters)
+errors += simplifyChecker.errors
+elif syntaxError:
+errors = [syntaxError]
+stats.update(syntaxStats)
 errorsDict = {}
 for error in errors:
 if error["line"] > len(source):
 error["line"] = len(source)
 })
 if source:
 code = error["code"]
 lineFlags = extractLineFlags(source[lineno - 1].strip())
-try:
+with contextlib.suppress(IndexError):
 lineFlags += extractLineFlags(source[lineno].strip(),
 flagsLine=True)
-except IndexError:
-pass
 if securityOk(code, lineFlags):
 error["securityOk"] = True
 if ignoreCode(code, lineFlags):

Mercurial Repositories > eric / file comparison

comparison: eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py

eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py