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

-:6a042a54e0f7
+:385f60c94548
 @type str
 @param backup flag indicating to create a backup before fixing
 anything
 @type bool
 """
-super(CodeStyleFixer, self).__init__()
+super().__init__()
 self.__filename = filename
 self.__origName = ""
 self.__source = sourceLines[:]  # save a copy
 self.__fixCodes = [c.strip() for c in fixCodes.split(",") if c.strip()]
 try:
 (logical_start, logical_end) = self.__findLogical()
 except (SyntaxError, tokenize.TokenError):
 return None
-line = line - 1
+line -= 1
 ls = None
 le = None
 for i in range(0, len(logical_start)):
 x = logical_end[i]
 if x[0] > line or (x[0] == line and x[1] > pos):
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 quotes = re.match(r"""\s*[ru]?('''|'|\")""",
 self.__source[line]).group(1)
 left, right = self.__source[line].split(quotes, 1)
 self.__source[line] = left + '"""' + right
 while line < len(self.__source):
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 if code == "D112":
 insertChar = "r"
 else:
 return (0, "", 0)
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 if not self.__source[line].lstrip().startswith(
 ('"""', 'r"""', 'u"""')):
 # only correctly formatted docstrings will be fixed
 return (0, "", [], 0)
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 newText = ""
 if (
 self.__source[line].rstrip().endswith(('"""', "'''")) and
 self.__source[line].lstrip().startswith(('"""', 'r"""', 'u"""'))
 ):
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 self.__source[line - 1] = ""
 # Blank line before function/method docstring removed.
 return (1, "FIXD141", [], 0)
 else:
 fixId = self.__getID()
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 self.__source[line] = self.__eol + self.__source[line]
 # Blank line inserted before class docstring.
 return (1, "FIXD142", [], 0)
 else:
 fixId = self.__getID()
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 self.__source[line] += self.__eol
 # Blank line inserted after class docstring.
 return (1, "FIXD143", [], 0)
 else:
 fixId = self.__getID()
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 if not self.__source[line].rstrip().endswith("."):
 # only correct summary lines can be fixed here
 return (0, "", 0)
 self.__source[line] += self.__eol
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 self.__source[line] = self.__eol + self.__source[line]
 # Blank line inserted after last paragraph of docstring.
 return (1, "FIXD145", [], 0)
 else:
 fixId = self.__getID()
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 indent = self.__getIndent(self.__source[line])
 source = self.__source[line].strip()
 if code == "D221":
 # leading
 if source.startswith(("r", "u")):
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 self.__source[line - 1] = ""
 if code == "D242":
 # Blank line before class docstring removed.
 msg = "FIXD242"
 else:
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 self.__source[line + 1] = ""
 if code == "D243":
 # Blank line after class docstring removed.
 msg = "FIXD243"
 else:
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 self.__source[line - 1] = ""
 # Blank line after last paragraph removed.
 return (1, "FIXD247", [], 0)
 else:
 fixId = self.__getID()
 if logical:
 # Fix by adding an initial indent.
 modified = self.__fixReindent(line, pos, logical)
 if not modified:
 # fall back to simple method
-line = line - 1
+line -= 1
 text = self.__source[line]
 indentation = self.__getIndent(text)
 self.__source[line] = (
 indentation +
 self.__indentWord + text.lstrip()
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 text = self.__source[line]
 if '"""' in text or "'''" in text or text.rstrip().endswith('\\'):
 return (0, "", [], 0)
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 text = self.__source[line]
 if '"""' in text or "'''" in text or text.rstrip().endswith('\\'):
 return (0, "", [], 0)
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 text = self.__source[line]
 if '"""' in text or "'''" in text or text.rstrip().endswith('\\'):
 return (0, "", [], 0)
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
-pos = pos + 1
+pos += 1
 self.__source[line] = (
 self.__source[line][:pos] +
 " " +
 self.__source[line][pos:]
 )
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 text = self.__source[line]
 # This is necessary since pycodestyle sometimes reports columns that
 # goes past the end of the physical line. This happens in cases like,
 # foo(bar\n=None)
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 text = self.__source[line]
 left = text[:pos].rstrip(' \t#')
 right = text[pos:].lstrip(' \t#')
 newText = left + ("  # " + right if right.strip() else right)
 self.__source[line] = newText
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 text = self.__source[line]
 if not text.lstrip().startswith("import"):
 return (0, "", [], 0)
 # pycodestyle (1.3.1) reports false positive if there is an import
 if apply:
 multilineStringLines, docStringLines = (
 self.__multilineStringLines()
 )
 isDocString = line in docStringLines
-line = line - 1
+line -= 1
 text = self.__source[line]
 if line > 0:
 prevText = self.__source[line - 1]
 else:
 prevText = ""
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 text = self.__source[line]
-pos = pos + 1
+pos += 1
 newText = (
 text[:pos] +
 self.__eol +
 self.__getIndent(text) +
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 text = self.__source[line]
 if text.rstrip().endswith("\\"):
 # normalize '1; \\\n2' into '1; 2'
 self.__source[line] = text.rstrip("\n\r \t\\")
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
-line = line - 1
+line -= 1
 text = self.__source[line]
 rightPos = pos + 2
 if rightPos >= len(text):
 return (0, "", 0)
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 text = self.__source[line]
 if code == "N804":
 arg = "cls"
 else:
 arg = "self"
 a message code for the fix, a list of arguments for the
 message and an ID for a deferred fix
 @rtype tuple of (int, str, list or int, int)
 """
 if apply:
-line = line - 1
+line -= 1
 text = self.__source[line]
 index = text.find("(") + 1
 left = text[:index]
 right = text[index:]
 right = right.lstrip(", ")
 newText = left + right
 self.__source[line] = newText
 else:
 # they are on the next line
-line = line + 1
+line += 1
 text = self.__source[line]
 indent = self.__getIndent(text)
 right = text.lstrip()
 if right.startswith("cls"):
 right = right[3:]

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py