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

-:866adc8c315b
+:0acf98cd089a
 from collections import defaultdict
 import tokenize
 import AstUtilities
+from eradicate import Eradicator
+from .MiscellaneousDefaults import MiscellaneousCheckerDefaultArgs
 def composeCallPath(node):
 """
 Generator function to assemble the call path of a given node.
 @param node node to assemble call path for
 @type ast.Node
-@return call path components
+@yield call path components
-@rtype str
+@ytype str
 """
 if isinstance(node, ast.Attribute):
 for v in composeCallPath(node.value):
 yield v
 yield node.attr
 r'^(?:[^\'"]*[\'"][^\'"]*[\'"])*\s*%|^\s*%')
 import builtins
 self.__builtins = [b for b in dir(builtins)
 if b not in self.BuiltinsWhiteList]
+self.__eradicator = Eradicator()
 # statistics counters
 self.counters = {}
 # collection of detected errors
 (self.__checkReturn, ("M831", "M832", "M833", "M834")),
 (self.__checkLineContinuation, ("M841",)),
 (self.__checkCommentedCode, ("M891",)),
 ]
-self.__defaultArgs = {
+# the eradicate whitelist
-"BuiltinsChecker": {
+commentedCodeCheckerArgs = self.__args.get(
-"chr": ["unichr", ],
+"CommentedCodeChecker",
-"str": ["unicode", ],
+MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"])
-},
+commentedCodeCheckerWhitelist = commentedCodeCheckerArgs.get(
-"CodingChecker": 'latin-1, utf-8',
+"WhiteList",
-"CopyrightChecker": {
+MiscellaneousCheckerDefaultArgs[
-"Author": "",
+"CommentedCodeChecker"]["WhiteList"])
-"MinFilesize": 0,
+self.__eradicator.update_whitelist(commentedCodeCheckerWhitelist,
-},
+extend_default=False)
-"CommentedCodeChecker": {
-"Aggressive": False,
-}
-}
 self.__checkers = []
 for checker, codes in checkersWithCodes:
 if any(not (code and self.__ignoreCode(code))
 for code in codes):
 if len(self.__source) == 0:
 return
 encodings = [e.lower().strip()
 for e in self.__args.get(
-"CodingChecker", self.__defaultArgs["CodingChecker"])
+"CodingChecker",
+MiscellaneousCheckerDefaultArgs["CodingChecker"])
 .split(",")]
 lineno, coding = self.__getCoding()
 if coding:
 if coding.lower() not in encodings:
 self.__error(lineno, 0, "M102", coding)
 """
 Private method to check the presence of a copyright statement.
 """
 source = "".join(self.__source)
 copyrightArgs = self.__args.get(
-"CopyrightChecker", self.__defaultArgs["CopyrightChecker"])
+"CopyrightChecker",
+MiscellaneousCheckerDefaultArgs["CopyrightChecker"])
 copyrightMinFileSize = copyrightArgs.get(
 "MinFilesize",
-self.__defaultArgs["CopyrightChecker"]["MinFilesize"])
+MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["MinFilesize"])
 copyrightAuthor = copyrightArgs.get(
 "Author",
-self.__defaultArgs["CopyrightChecker"]["Author"])
+MiscellaneousCheckerDefaultArgs["CopyrightChecker"]["Author"])
 copyrightRegexStr = (
 r"Copyright\s+(\(C\)\s+)?(\d{{4}}\s+-\s+)?\d{{4}}\s+{author}"
 )
 tocheck = max(1024, copyrightMinFileSize)
 def __checkCommentedCode(self):
 """
 Private method to check for commented code.
 """
-from eradicate import commented_out_code_line_numbers
 source = "".join(self.__source)
 commentedCodeCheckerArgs = self.__args.get(
-"CommentedCodeChecker", self.__defaultArgs["CommentedCodeChecker"])
+"CommentedCodeChecker",
+MiscellaneousCheckerDefaultArgs["CommentedCodeChecker"])
 aggressive = commentedCodeCheckerArgs.get(
 "Aggressive",
-self.__defaultArgs["CommentedCodeChecker"]["Aggressive"])
+MiscellaneousCheckerDefaultArgs[
-for markedLine in commented_out_code_line_numbers(
+"CommentedCodeChecker"]["Aggressive"])
+for markedLine in self.__eradicator.commented_out_code_line_numbers(
 source, aggressive=aggressive):
 self.__error(markedLine - 1, 0, "M891")
 def __checkLineContinuation(self):
 """
 keywords = {keyword.arg for keyword in call.keywords}
 numArgs = len(call.args)
 if strArgs:
 numArgs -= 1
-if sys.version_info < (3, 5):
+hasKwArgs = any(kw.arg is None for kw in call.keywords)
-hasKwArgs = bool(call.kwargs)
+hasStarArgs = sum(1 for arg in call.args
-hasStarArgs = bool(call.starargs)
+if isinstance(arg, ast.Starred))
-else:
-hasKwArgs = any(kw.arg is None for kw in call.keywords)
+if hasKwArgs:
-hasStarArgs = sum(1 for arg in call.args
+keywords.discard(None)
-if isinstance(arg, ast.Starred))
+if hasStarArgs:
+numArgs -= 1
-if hasKwArgs:
-keywords.discard(None)
-if hasStarArgs:
-numArgs -= 1
 # if starargs or kwargs is not None, it can't count the
 # parameters but at least check if the args are used
 if hasKwArgs:
 if not names:
 functionDefs.append(ast.AsyncFunctionDef)
 except AttributeError:
 pass
 ignoreBuiltinAssignments = self.__args.get(
-"BuiltinsChecker", self.__defaultArgs["BuiltinsChecker"])
+"BuiltinsChecker",
+MiscellaneousCheckerDefaultArgs["BuiltinsChecker"])
 for node in ast.walk(self.__tree):
 if isinstance(node, ast.Assign):
 # assign statement
 for element in node.targets:
 Public method to handle f-string arguments.
 @param node reference to the node to be processed
 @type ast.JoinedStr
 """
-if sys.version_info >= (3, 6):
+if self.__withinLoggingStatement():
-if self.__withinLoggingStatement():
+if any(isinstance(i, ast.FormattedValue) for i in node.values):
-if any(isinstance(i, ast.FormattedValue) for i in node.values):
+if self.__withinLoggingArgument():
-if self.__withinLoggingArgument():
+self.violations.append((node, "M654"))
-self.violations.append((node, "M654"))
+super(LoggingVisitor, self).generic_visit(node)
-super(LoggingVisitor, self).generic_visit(node)
 class BugBearVisitor(ast.NodeVisitor):
 """
 Class implementing a node visitor to check for various topics.
 Public method to handle f-string arguments.
 @param node reference to the node to be processed
 @type ast.JoinedStr
 """
-if sys.version_info >= (3, 6):
+for value in node.values:
-for value in node.values:
+if isinstance(value, ast.FormattedValue):
-if isinstance(value, ast.FormattedValue):
+return
-return
+self.violations.append((node, "M508"))
-self.violations.append((node, "M508"))
 def __checkForM502(self, node):
 """
 Private method to check the use of *strip().

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/MiscellaneousChecker.py