--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Sun Feb 23 12:42:47 2025 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Mon Feb 24 15:11:18 2025 +0100
@@ -22,82 +22,82 @@
import pycodestyle
FixableCodeStyleIssues = [ # noqa: U200
- "D111",
- "D112",
- "D121",
- "D131",
- "D141",
- "D142",
- "D143",
- "D144",
- "D145",
- "D221",
- "D222",
- "D231",
- "D242",
- "D243",
- "D244",
- "D245",
- "D246",
- "D247",
- "E101",
- "E111",
- "E121",
- "E122",
- "E123",
- "E124",
- "E125",
- "E126",
- "E127",
- "E128",
- "E133",
- "E201",
- "E202",
- "E203",
- "E211",
- "E221",
- "E222",
- "E223",
- "E224",
- "E225",
- "E226",
- "E227",
- "E228",
- "E231",
- "E241",
- "E242",
- "E251",
- "E261",
- "E262",
- "E271",
- "E272",
- "E273",
- "E274",
- "E301",
- "E302",
- "E303",
- "E304",
- "E305",
- "E306",
- "E307",
- "E308",
- "E401",
- "E501",
- "E502",
- "E701",
- "E702",
- "E703",
- "E711",
- "E712",
- "N804",
- "N805",
- "N806",
- "W191",
- "W291",
- "W292",
- "W293",
- "W391",
- "W603",
+ "D-111",
+ "D-112",
+ "D-121",
+ "D-131",
+ "D-141",
+ "D-142",
+ "D-143",
+ "D-144",
+ "D-145",
+ "D-221",
+ "D-222",
+ "D-231",
+ "D-242",
+ "D-243",
+ "D-244",
+ "D-245",
+ "D-246",
+ "D-247",
+ "E-101",
+ "E-111",
+ "E-121",
+ "E-122",
+ "E-123",
+ "E-124",
+ "E-125",
+ "E-126",
+ "E-127",
+ "E-128",
+ "E-133",
+ "E-201",
+ "E-202",
+ "E-203",
+ "E-211",
+ "E-221",
+ "E-222",
+ "E-223",
+ "E-224",
+ "E-225",
+ "E-226",
+ "E-227",
+ "E-228",
+ "E-231",
+ "E-241",
+ "E-242",
+ "E-251",
+ "E-261",
+ "E-262",
+ "E-271",
+ "E-272",
+ "E-273",
+ "E-274",
+ "E-301",
+ "E-302",
+ "E-303",
+ "E-304",
+ "E-305",
+ "E-306",
+ "E-307",
+ "E-308",
+ "E-401",
+ "E-501",
+ "E-502",
+ "E-701",
+ "E-702",
+ "E-703",
+ "E-711",
+ "E-712",
+ "N-804",
+ "N-805",
+ "N-806",
+ "W-191",
+ "W-291",
+ "W-292",
+ "W-293",
+ "W-391",
+ "W-603",
]
@@ -174,82 +174,82 @@
self.__eol = eol
self.__fixes = {
- "D111": self.__fixD111,
- "D112": self.__fixD112,
- "D121": self.__fixD121,
- "D131": self.__fixD131,
- "D141": self.__fixD141,
- "D142": self.__fixD142,
- "D143": self.__fixD143,
- "D144": self.__fixD144,
- "D145": self.__fixD145,
- "D221": self.__fixD221,
- "D222": self.__fixD221,
- "D231": self.__fixD131,
- "D242": self.__fixD242,
- "D243": self.__fixD243,
- "D244": self.__fixD242,
- "D245": self.__fixD243,
- "D246": self.__fixD144,
- "D247": self.__fixD247,
- "E101": self.__fixE101,
- "E111": self.__fixE101,
- "E121": self.__fixE121,
- "E122": self.__fixE122,
- "E123": self.__fixE123,
- "E124": self.__fixE121,
- "E125": self.__fixE125,
- "E126": self.__fixE126,
- "E127": self.__fixE127,
- "E128": self.__fixE127,
- "E133": self.__fixE126,
- "E201": self.__fixE201,
- "E202": self.__fixE201,
- "E203": self.__fixE201,
- "E211": self.__fixE201,
- "E221": self.__fixE221,
- "E222": self.__fixE221,
- "E223": self.__fixE221,
- "E224": self.__fixE221,
- "E225": self.__fixE225,
- "E226": self.__fixE225,
- "E227": self.__fixE225,
- "E228": self.__fixE225,
- "E231": self.__fixE231,
- "E241": self.__fixE221,
- "E242": self.__fixE221,
- "E251": self.__fixE251,
- "E261": self.__fixE261,
- "E262": self.__fixE261,
- "E271": self.__fixE221,
- "E272": self.__fixE221,
- "E273": self.__fixE221,
- "E274": self.__fixE221,
- "E301": self.__fixBlankLinesBefore,
- "E302": self.__fixBlankLinesBefore,
- "E303": self.__fixBlankLinesBefore,
- "E304": self.__fixE304,
- "E305": self.__fixBlankLinesBefore,
- "E306": self.__fixBlankLinesBefore,
- "E307": self.__fixBlankLinesBefore,
- "E308": self.__fixBlankLinesBefore,
- "E401": self.__fixE401,
- "E501": self.__fixE501,
- "E502": self.__fixE502,
- "E701": self.__fixE701,
- "E702": self.__fixE702,
- "E703": self.__fixE702,
- "E711": self.__fixE711,
- "E712": self.__fixE711,
- "N804": self.__fixN804,
- "N805": self.__fixN804,
- "N806": self.__fixN806,
- "W191": self.__fixE101,
- "W291": self.__fixW291,
- "W292": self.__fixW292,
- "W293": self.__fixW291,
- "W391": self.__fixW391,
- "W603": self.__fixW603,
+ "D-111": self.__fixD111,
+ "D-112": self.__fixD112,
+ "D-121": self.__fixD121,
+ "D-131": self.__fixD131,
+ "D-141": self.__fixD141,
+ "D-142": self.__fixD142,
+ "D-143": self.__fixD143,
+ "D-144": self.__fixD144,
+ "D-145": self.__fixD145,
+ "D-221": self.__fixD221,
+ "D-222": self.__fixD221,
+ "D-231": self.__fixD131,
+ "D-242": self.__fixD242,
+ "D-243": self.__fixD243,
+ "D-244": self.__fixD242,
+ "D-245": self.__fixD243,
+ "D-246": self.__fixD144,
+ "D-247": self.__fixD247,
+ "E-101": self.__fixE101,
+ "E-111": self.__fixE101,
+ "E-121": self.__fixE121,
+ "E-122": self.__fixE122,
+ "E-123": self.__fixE123,
+ "E-124": self.__fixE121,
+ "E-125": self.__fixE125,
+ "E-126": self.__fixE126,
+ "E-127": self.__fixE127,
+ "E-128": self.__fixE127,
+ "E-133": self.__fixE126,
+ "E-201": self.__fixE201,
+ "E-202": self.__fixE201,
+ "E-203": self.__fixE201,
+ "E-211": self.__fixE201,
+ "E-221": self.__fixE221,
+ "E-222": self.__fixE221,
+ "E-223": self.__fixE221,
+ "E-224": self.__fixE221,
+ "E-225": self.__fixE225,
+ "E-226": self.__fixE225,
+ "E-227": self.__fixE225,
+ "E-228": self.__fixE225,
+ "E-231": self.__fixE231,
+ "E-241": self.__fixE221,
+ "E-242": self.__fixE221,
+ "E-251": self.__fixE251,
+ "E-261": self.__fixE261,
+ "E-262": self.__fixE261,
+ "E-271": self.__fixE221,
+ "E-272": self.__fixE221,
+ "E-273": self.__fixE221,
+ "E-274": self.__fixE221,
+ "E-301": self.__fixBlankLinesBefore,
+ "E-302": self.__fixBlankLinesBefore,
+ "E-303": self.__fixBlankLinesBefore,
+ "E-304": self.__fixE304,
+ "E-305": self.__fixBlankLinesBefore,
+ "E-306": self.__fixBlankLinesBefore,
+ "E-307": self.__fixBlankLinesBefore,
+ "E-308": self.__fixBlankLinesBefore,
+ "E-401": self.__fixE401,
+ "E-501": self.__fixE501,
+ "E-502": self.__fixE502,
+ "E-701": self.__fixE701,
+ "E-702": self.__fixE702,
+ "E-703": self.__fixE702,
+ "E-711": self.__fixE711,
+ "E-712": self.__fixE711,
+ "N-804": self.__fixN804,
+ "N-805": self.__fixN804,
+ "N-806": self.__fixN806,
+ "W-191": self.__fixE101,
+ "W-291": self.__fixW291,
+ "W-292": self.__fixW292,
+ "W-293": self.__fixW291,
+ "W-391": self.__fixW391,
+ "W-603": self.__fixW603,
}
self.__modified = False
self.__stackLogical = []
@@ -299,7 +299,7 @@
fp.write(txt)
except (OSError, UnicodeError) as err:
# Could not save the file! Skipping it. Reason: {0}
- return ("FIXWRITE_ERROR", [str(err)])
+ return ("FIX-WRITE_ERROR", [str(err)])
return None
@@ -633,7 +633,7 @@
line += 1
# Triple single quotes converted to triple double quotes.
- return (1, "FIXD111", [], 0)
+ return (1, "FIX-D111", [], 0)
def __fixD112(self, code, line, _pos):
"""
@@ -653,7 +653,7 @@
@rtype tuple of (int, str, list or int, int)
"""
line -= 1
- if code == "D112":
+ if code == "D-112":
insertChar = "r"
else:
return (0, "", 0)
@@ -665,7 +665,7 @@
)
self.__source[line] = newText
# Introductory quotes corrected to be {0}"""
- return (1, "FIXD112", [insertChar], 0)
+ return (1, "FIX-D112", [insertChar], 0)
def __fixD121(self, code, line, pos, apply=False):
"""
@@ -702,7 +702,7 @@
self.__source[line] = docstring
self.__source[line + 1] = ""
# Single line docstring put on one line.
- return (1, "FIXD121", [], 0)
+ return (1, "FIX-D121", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -752,7 +752,7 @@
if newText:
self.__source[line] = newText
# Period added to summary line.
- return (1, "FIXD131", [], 0)
+ return (1, "FIX-D131", [], 0)
else:
return (0, "", [], 0)
@@ -780,7 +780,7 @@
line -= 1
self.__source[line - 1] = ""
# Blank line before function/method docstring removed.
- return (1, "FIXD141", [], 0)
+ return (1, "FIX-D141", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -810,7 +810,7 @@
line -= 1
self.__source[line] = self.__eol + self.__source[line]
# Blank line inserted before class docstring.
- return (1, "FIXD142", [], 0)
+ return (1, "FIX-D142", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -840,7 +840,7 @@
line -= 1
self.__source[line] += self.__eol
# Blank line inserted after class docstring.
- return (1, "FIXD143", [], 0)
+ return (1, "FIX-D143", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -874,7 +874,7 @@
self.__source[line] += self.__eol
# Blank line inserted after docstring summary.
- return (1, "FIXD144", [], 0)
+ return (1, "FIX-D144", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -904,7 +904,7 @@
line -= 1
self.__source[line] = self.__eol + self.__source[line]
# Blank line inserted after last paragraph of docstring.
- return (1, "FIXD145", [], 0)
+ return (1, "FIX-D145", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -934,7 +934,7 @@
line -= 1
indent = self.__getIndent(self.__source[line])
source = self.__source[line].strip()
- if code == "D221":
+ if code == "D-221":
# leading
if source.startswith(("r", "u")):
first, second = source[:4], source[4:].strip()
@@ -945,12 +945,12 @@
first, second = source[:-3].strip(), source[-3:]
newText = indent + first + self.__eol + indent + second + self.__eol
self.__source[line] = newText
- if code == "D221":
+ if code == "D-221":
# Leading quotes put on separate line.
- msg = "FIXD221"
+ msg = "FIX-D221"
else:
# Trailing quotes put on separate line.
- msg = "FIXD222"
+ msg = "FIX-D222"
return (1, msg, [], 0)
else:
fixId = self.__getID()
@@ -980,12 +980,12 @@
if apply:
line -= 1
self.__source[line - 1] = ""
- if code == "D242":
+ if code == "D-242":
# Blank line before class docstring removed.
- msg = "FIXD242"
+ msg = "FIX-D242"
else:
# Blank line before function/method docstring removed.
- msg = "FIXD244"
+ msg = "FIX-D244"
return (1, msg, [], 0)
else:
fixId = self.__getID()
@@ -1015,12 +1015,12 @@
if apply:
line -= 1
self.__source[line + 1] = ""
- if code == "D243":
+ if code == "D-243":
# Blank line after class docstring removed.
- msg = "FIXD243"
+ msg = "FIX-D243"
else:
# Blank line after function/method docstring removed.
- msg = "FIXD245"
+ msg = "FIX-D245"
return (1, msg, [], 0)
else:
fixId = self.__getID()
@@ -1051,7 +1051,7 @@
line -= 1
self.__source[line - 1] = ""
# Blank line after last paragraph removed.
- return (1, "FIXD247", [], 0)
+ return (1, "FIX-D247", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1080,12 +1080,12 @@
fixedLine = self.__reindenter.fixedLine(line - 1)
if fixedLine is not None and fixedLine != self.__source[line - 1]:
self.__source[line - 1] = fixedLine
- if code in ["E101", "W191"]:
+ if code in ["E-101", "W-191"]:
# Tab converted to 4 spaces.
- msg = "FIXE101"
+ msg = "FIX-E101"
else:
# Indentation adjusted to be a multiple of four.
- msg = "FIXE111"
+ msg = "FIX-E111"
return (1, msg, [], 0)
else:
return (0, "", [], 0)
@@ -1116,12 +1116,12 @@
# Fix by adjusting initial indent level.
changed = self.__fixReindent(line, pos, logical)
if changed:
- if code == "E121":
+ if code == "E-121":
# Indentation of continuation line corrected.
- msg = "FIXE121"
- elif code == "E124":
+ msg = "FIX-E121"
+ elif code == "E-124":
# Indentation of closing bracket corrected.
- msg = "FIXE124"
+ msg = "FIX-E124"
return (1, msg, [], 0)
return (0, "", [], 0)
else:
@@ -1162,7 +1162,7 @@
indentation + self.__indentWord + text.lstrip()
)
# Missing indentation of continuation line corrected.
- return (1, "FIXE122", [], 0)
+ return (1, "FIX-E122", [], 0)
return (0, "", [], 0)
else:
fixId = self.__getID()
@@ -1204,7 +1204,7 @@
changed = True
if changed:
# Closing bracket aligned to opening bracket.
- return (1, "FIXE123", [], 0)
+ return (1, "FIX-E123", [], 0)
return (0, "", [], 0)
else:
fixId = self.__getID()
@@ -1243,7 +1243,7 @@
self.__getIndent(text) + self.__indentWord + text.lstrip()
)
# Indentation level changed.
- return (1, "FIXE125", [], 0)
+ return (1, "FIX-E125", [], 0)
return (0, "", [], 0)
else:
fixId = self.__getID()
@@ -1290,7 +1290,7 @@
changed = True
if changed:
# Indentation level of hanging indentation changed.
- return (1, "FIXE126", [], 0)
+ return (1, "FIX-E126", [], 0)
return (0, "", [], 0)
else:
fixId = self.__getID()
@@ -1352,7 +1352,7 @@
changed = True
if changed:
# Visual indentation corrected.
- return (1, "FIXE127", [], 0)
+ return (1, "FIX-E127", [], 0)
return (0, "", [], 0)
else:
fixId = self.__getID()
@@ -1388,7 +1388,7 @@
self.__source[line] = newText
# Extraneous whitespace removed.
- return (1, "FIXE201", [], 0)
+ return (1, "FIX-E201", [], 0)
def __fixE221(self, _code, line, pos):
"""
@@ -1419,7 +1419,7 @@
return (0, "", [], 0)
self.__source[line] = newText
- return (1, "FIXE221", [], 0)
+ return (1, "FIX-E221", [], 0)
def __fixE225(self, _code, line, pos):
"""
@@ -1464,7 +1464,7 @@
self.__source[line] = newText
# Missing whitespaces added.
- return (1, "FIXE225", [], 0)
+ return (1, "FIX-E225", [], 0)
def __fixE231(self, _code, line, pos):
"""
@@ -1489,7 +1489,7 @@
self.__source[line][:pos] + " " + self.__source[line][pos:]
)
# Missing whitespace added.
- return (1, "FIXE231", [], 0)
+ return (1, "FIX-E231", [], 0)
def __fixE251(self, _code, line, pos):
"""
@@ -1527,7 +1527,7 @@
else:
self.__source[line] = newText
# Extraneous whitespace removed.
- return (1, "FIXE251", [], 0)
+ return (1, "FIX-E251", [], 0)
def __fixE261(self, _code, line, pos):
"""
@@ -1553,7 +1553,7 @@
newText = left + (" # " + right if right.strip() else right)
self.__source[line] = newText
# Whitespace around comment sign corrected.
- return (1, "FIXE261", [], 0)
+ return (1, "FIX-E261", [], 0)
def __fixBlankLinesBefore(self, code, line, pos, apply=False):
"""
@@ -1576,9 +1576,9 @@
@rtype tuple of (int, str, list or int, int)
"""
if apply:
- if code in ["E301", "E306", "E307"]:
+ if code in ["E-301", "E-306", "E-307"]:
blankLinesBefore = self.__blankLines["method"]
- elif code == "E308":
+ elif code == "E-308":
blankLinesBefore = 1
else:
blankLinesBefore = self.__blankLines["toplevel"]
@@ -1601,7 +1601,7 @@
self.__source.insert(line, self.__eol)
delta += 1
# %n blank line(s) inserted.
- return (1, "FIXE302+", blankLinesBefore - blanks, 0)
+ return (1, "FIX-E302+", blankLinesBefore - blanks, 0)
elif delta > 0:
# delete superfluous blank lines
while delta > 0:
@@ -1609,7 +1609,7 @@
line -= 1
delta -= 1
# %n superfluous line(s) removed.
- return (1, "FIXE302-", blanks - blankLinesBefore, 0)
+ return (1, "FIX-E302-", blanks - blankLinesBefore, 0)
else:
return (0, "", [], 0)
else:
@@ -1646,7 +1646,7 @@
else:
break
# Superfluous blank lines after function decorator removed.
- return (1, "FIXE304", [], 0)
+ return (1, "FIX-E304", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1692,7 +1692,7 @@
)
self.__source[line] = newText
# Imports were put on separate lines.
- return (1, "FIXE401", [], 0)
+ return (1, "FIX-E401", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1748,7 +1748,7 @@
newNextText = ""
self.__source[line + 1] = newNextText
# Long lines have been shortened.
- return (1, "FIXE501", [], 0)
+ return (1, "FIX-E501", [], 0)
else:
return (0, "", [], 0)
else:
@@ -1777,7 +1777,7 @@
self.__source[line - 1].rstrip("\n\r \t\\") + self.__eol
)
# Redundant backslash in brackets removed.
- return (1, "FIXE502", [], 0)
+ return (1, "FIX-E502", [], 0)
def __fixE701(self, code, line, pos, apply=False):
"""
@@ -1813,7 +1813,7 @@
)
self.__source[line] = newText
# Compound statement corrected.
- return (1, "FIXE701", [], 0)
+ return (1, "FIX-E701", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1853,7 +1853,7 @@
second = text[pos:].lstrip("\n\r \t;")
self.__source[line] = first + self.__getIndent(text) + second
# Compound statement corrected.
- return (1, "FIXE702", [], 0)
+ return (1, "FIX-E702", [], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1899,7 +1899,7 @@
self.__source[line] = " ".join([left, center, right])
# Comparison to None/True/False corrected.
- return (1, "FIXE711", [], 0)
+ return (1, "FIX-E711", [], 0)
def __fixN804(self, code, line, pos, apply=False):
"""
@@ -1924,7 +1924,7 @@
if apply:
line -= 1
text = self.__source[line]
- if code == "N804":
+ if code == "N-804":
arg = "cls"
else:
arg = "self"
@@ -1949,7 +1949,7 @@
newText = left + center + right
self.__source[line] = newText
# '{0}' argument added.
- return (1, "FIXN804", [arg], 0)
+ return (1, "FIX-N804", [arg], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -2013,7 +2013,7 @@
self.__source[line] = indent + right
# '{0}' argument removed.
- return (1, "FIXN806", [arg], 0)
+ return (1, "FIX-N806", [arg], 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -2040,7 +2040,7 @@
r"[\t ]+(\r?)$", r"\1", self.__source[line - 1]
)
# Whitespace stripped from end of line.
- return (1, "FIXW291", [], 0)
+ return (1, "FIX-W291", [], 0)
def __fixW292(self, _code, line, _pos):
"""
@@ -2061,7 +2061,7 @@
"""
self.__source[line - 1] += self.__eol
# newline added to end of file.
- return (1, "FIXW292", [], 0)
+ return (1, "FIX-W292", [], 0)
def __fixW391(self, _code, line, _pos):
"""
@@ -2088,7 +2088,7 @@
else:
break
# Superfluous trailing blank lines removed from end of file.
- return (1, "FIXW391", [], 0)
+ return (1, "FIX-W391", [], 0)
def __fixW603(self, _code, line, _pos):
"""
@@ -2109,7 +2109,7 @@
"""
self.__source[line - 1] = self.__source[line - 1].replace("<>", "!=")
# '<>' replaced by '!='.
- return (1, "FIXW603", [], 0)
+ return (1, "FIX-W603", [], 0)
class Reindenter:
