--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py Sun Feb 23 12:42:47 2025 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py Mon Feb 24 15:11:18 2025 +0100
@@ -26,25 +26,25 @@
"""
Codes = [
- "N801",
- "N802",
- "N803",
- "N804",
- "N805",
- "N806",
- "N807",
- "N808",
- "N809",
- "N811",
- "N812",
- "N813",
- "N814",
- "N815",
- "N818",
- "N821",
- "N822",
- "N823",
- "N831",
+ "N-801",
+ "N-802",
+ "N-803",
+ "N-804",
+ "N-805",
+ "N-806",
+ "N-807",
+ "N-808",
+ "N-809",
+ "N-811",
+ "N-812",
+ "N-813",
+ "N-814",
+ "N-815",
+ "N-818",
+ "N-821",
+ "N-822",
+ "N-823",
+ "N-831",
]
def __init__(self, source, filename, tree, select, ignore, expected, repeat, args):
@@ -87,23 +87,23 @@
self.__checkersWithCodes = {
"classdef": [
- (self.__checkClassName, ("N801", "N818")),
- (self.__checkNameToBeAvoided, ("N831",)),
+ (self.__checkClassName, ("N-801", "N-818")),
+ (self.__checkNameToBeAvoided, ("N-831",)),
],
"module": [
- (self.__checkModule, ("N807", "N808")),
+ (self.__checkModule, ("N-807", "N-808")),
],
}
for name in ("functiondef", "asyncfunctiondef"):
self.__checkersWithCodes[name] = [
- (self.__checkFunctionName, ("N802", "N809")),
- (self.__checkFunctionArgumentNames, ("N803", "N804", "N805", "N806")),
- (self.__checkNameToBeAvoided, ("N831",)),
+ (self.__checkFunctionName, ("N-802", "N-809")),
+ (self.__checkFunctionArgumentNames, ("N-803", "N-804", "N-805", "N-806")),
+ (self.__checkNameToBeAvoided, ("N-831",)),
]
for name in ("assign", "namedexpr", "annassign"):
self.__checkersWithCodes[name] = [
- (self.__checkVariableNames, ("N821",)),
- (self.__checkNameToBeAvoided, ("N831",)),
+ (self.__checkVariableNames, ("N-821",)),
+ (self.__checkNameToBeAvoided, ("N-831",)),
]
for name in (
"with",
@@ -117,11 +117,11 @@
"setcomp",
):
self.__checkersWithCodes[name] = [
- (self.__checkVariableNames, ("N821",)),
+ (self.__checkVariableNames, ("N-821",)),
]
for name in ("import", "importfrom"):
self.__checkersWithCodes[name] = [
- (self.__checkImportAs, ("N811", "N812", "N813", "N814", "N815")),
+ (self.__checkImportAs, ("N-811", "N-812", "N-813", "N-814", "N-815")),
]
self.__checkers = collections.defaultdict(list)
@@ -335,13 +335,13 @@
if isinstance(node, (ast.ClassDef, ast.FunctionDef, ast.AsyncFunctionDef)):
name = node.name
if self.__isNameToBeAvoided(name):
- self.__error(node, "N831")
+ self.__error(node, "N-831")
elif isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
argNames = self.__getArgNames(node)
for arg in argNames:
if self.__isNameToBeAvoided(arg):
- self.__error(node, "N831")
+ self.__error(node, "N-831")
elif isinstance(node, (ast.Assign, ast.NamedExpr, ast.AnnAssign)):
if isinstance(node, ast.Assign):
@@ -352,14 +352,14 @@
if isinstance(target, ast.Name):
name = target.id
if bool(name) and self.__isNameToBeAvoided(name):
- self.__error(node, "N831")
+ self.__error(node, "N-831")
elif isinstance(target, (ast.Tuple, ast.List)):
for element in target.elts:
if isinstance(element, ast.Name):
name = element.id
if bool(name) and self.__isNameToBeAvoided(name):
- self.__error(node, "N831")
+ self.__error(node, "N-831")
def __getClassdef(self, name, parents):
"""
@@ -422,11 +422,11 @@
name = node.name
strippedName = name.strip("_")
if not strippedName[:1].isupper() or "_" in strippedName:
- self.__error(node, "N801")
+ self.__error(node, "N-801")
superClasses = self.__superClassNames(name, parents)
if "Exception" in superClasses and not name.endswith("Error"):
- self.__error(node, "N818")
+ self.__error(node, "N-818")
def __checkFunctionName(self, node, _parents):
"""
@@ -451,9 +451,9 @@
return
if name.lower() != name:
- self.__error(node, "N802")
+ self.__error(node, "N-802")
if functionType == "function" and name[:2] == "__" and name[-2:] == "__":
- self.__error(node, "N809")
+ self.__error(node, "N-809")
def __checkFunctionArgumentNames(self, node, _parents):
"""
@@ -472,12 +472,12 @@
if node.args.kwarg is not None:
kwarg = node.args.kwarg.arg
if kwarg.lower() != kwarg:
- self.__error(node, "N803")
+ self.__error(node, "N-803")
elif node.args.vararg is not None:
vararg = node.args.vararg.arg
if vararg.lower() != vararg:
- self.__error(node, "N803")
+ self.__error(node, "N-803")
else:
argNames = self.__getArgNames(node)
@@ -485,19 +485,19 @@
if not argNames:
if functionType == "method":
- self.__error(node, "N805")
+ self.__error(node, "N-805")
elif functionType == "classmethod":
- self.__error(node, "N804")
+ self.__error(node, "N-804")
elif functionType == "method" and argNames[0] != "self":
- self.__error(node, "N805")
+ self.__error(node, "N-805")
elif functionType == "classmethod" and argNames[0] != "cls":
- self.__error(node, "N804")
+ self.__error(node, "N-804")
elif functionType == "staticmethod" and argNames[0] in ("cls", "self"):
- self.__error(node, "N806")
+ self.__error(node, "N-806")
for arg in argNames:
if arg.lower() != arg:
- self.__error(node, "N803")
+ self.__error(node, "N-803")
break
def __checkVariableNames(self, node, parents):
@@ -607,7 +607,7 @@
@rtype str or None
"""
if self.__isMixedCase(name):
- return "N823"
+ return "N-823"
return None
@@ -621,7 +621,7 @@
@rtype str or None
"""
if self.__isMixedCase(name):
- return "N822"
+ return "N-822"
return None
@@ -637,7 +637,7 @@
@rtype str or None
"""
if varName not in func.global_names and varName.lower() != varName:
- return "N821"
+ return "N-821"
return None
@@ -675,13 +675,13 @@
if self.__filename:
moduleName = os.path.splitext(os.path.basename(self.__filename))[0]
if moduleName.lower() != moduleName:
- self.__error(node, "N807")
+ self.__error(node, "N-807")
if moduleName == "__init__":
# we got a package
packageName = os.path.split(os.path.dirname(self.__filename))[1]
if packageName.lower() != packageName:
- self.__error(node, "N808")
+ self.__error(node, "N-808")
def __checkImportAs(self, node, _parents):
"""
@@ -701,14 +701,14 @@
originalName = name.name
if originalName.isupper():
if not asname.isupper():
- self.__error(node, "N811")
+ self.__error(node, "N-811")
elif originalName.islower():
if asname.lower() != asname:
- self.__error(node, "N812")
+ self.__error(node, "N-812")
elif asname.islower():
- self.__error(node, "N813")
+ self.__error(node, "N-813")
elif asname.isupper():
if "".join(filter(str.isupper, originalName)) == asname:
- self.__error(node, "N815")
+ self.__error(node, "N-815")
else:
- self.__error(node, "N814")
+ self.__error(node, "N-814")
