diff -r fb0ef164f536 -r 698ae46f40a4 eric6/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py Sat May 01 14:27:20 2021 +0200
@@ -18,7 +18,7 @@
ast.AsyncFunctionDef = ast.FunctionDef
-class NamingStyleChecker(object):
+class NamingStyleChecker:
"""
Class implementing a checker for naming conventions.
"""
@@ -96,12 +96,10 @@
@yield tuple giving line number, offset within line and error code
@ytype tuple of (int, int, str)
"""
- for error in self.__visitNode(node):
- yield error
+ yield from self.__visitNode(node)
self.__parents.append(node)
for child in ast.iter_child_nodes(node):
- for error in self.__visitTree(child):
- yield error
+ yield from self.__visitTree(child)
self.__parents.pop()
def __visitNode(self, node):
@@ -344,15 +342,21 @@
yield self.__error(node, "N804")
return
- if functionType == "method":
- if argNames[0] != "self":
- yield self.__error(node, "N805")
- elif functionType == "classmethod":
- if argNames[0] != "cls":
- yield self.__error(node, "N804")
- elif functionType == "staticmethod":
- if argNames[0] in ("cls", "self"):
- yield self.__error(node, "N806")
+ if (
+ functionType == "method" and
+ argNames[0] != "self"
+ ):
+ yield self.__error(node, "N805")
+ elif (
+ functionType == "classmethod" and
+ argNames[0] != "cls"
+ ):
+ yield self.__error(node, "N804")
+ elif (
+ functionType == "staticmethod" and
+ argNames[0] in ("cls", "self")
+ ):
+ yield self.__error(node, "N806")
for arg in argNames:
if not self.LowercaseRegex.match(arg):
yield self.__error(node, "N803")
