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

-:fb0ef164f536
+:698ae46f40a4
 """
 import os
 import re
 import tokenize
+import contextlib
 from io import StringIO
 # CodeStyleCheckerDialog tries to import FixableCodeStyleIssues which fails
 # under Python3. So ignore it.
-try:
+with contextlib.suppress(ImportError):
 import pycodestyle
-except ImportError:
-pass
 FixableCodeStyleIssues = [
 "D111", "D112", "D121", "D131", "D141", "D142",
 "D143", "D144", "D145",
 "D221", "D222", "D231", "D242", "D243", "D244",
 "N804", "N805", "N806",
 "W191", "W291", "W292", "W293", "W391", "W603",
 ]
-class CodeStyleFixer(object):
+class CodeStyleFixer:
 """
 Class implementing a fixer for certain code style issues.
 """
 def __init__(self, filename, sourceLines, fixCodes, noFixCodes,
 maxLineLength, blankLines, inPlace, eol, backup=False):
 @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()]
 # create a backup file before writing any changes
 if os.path.islink(self.__filename):
 bfn = '{0}~'.format(os.path.realpath(self.__filename))
 else:
 bfn = '{0}~'.format(self.__filename)
-try:
+with contextlib.suppress(OSError):
 os.remove(bfn)
-except OSError:
+with contextlib.suppress(OSError):
-# if there was an error, ignore it
-pass
-try:
 os.rename(self.__filename, bfn)
-except OSError:
-# if there was an error, ignore it
-pass
 txt = "".join(self.__source)
 try:
 enc = 'utf-8' if encoding == 'utf-8-bom' else encoding
 txt = txt.encode(enc)
 @return flag indicating that one string starts with the other
 (boolean)
 """
 return b.startswith(a) or a.startswith(b)
-if self.__noFixCodes:
+if (
-for noFixCode in [c.strip() for c in self.__noFixCodes]:
+self.__noFixCodes and
-if mutualStartswith(code.lower(), noFixCode.lower()):
+any(mutualStartswith(code.lower(), noFixCode.lower())
-return False
+for noFixCode in [c.strip() for c in self.__noFixCodes])
+):
+return False
 if self.__fixCodes:
-for fixCode in [c.strip() for c in self.__fixCodes]:
+return any(mutualStartswith(code.lower(), fixCode.lower())
-if mutualStartswith(code.lower(), fixCode.lower()):
+for fixCode in [c.strip() for c in self.__fixCodes])
-return True
-return False
 return True
 def fixIssue(self, line, pos, code):
 """
 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 string to be used for an indentation (string)
 """
 sio = StringIO("".join(self.__source))
 indentWord = "    "     # default in case of failure
-try:
+with contextlib.suppress(SyntaxError, tokenize.TokenError):
 for token in tokenize.generate_tokens(sio.readline):
 if token[0] == tokenize.INDENT:
 indentWord = token[1]
 break
-except (SyntaxError, tokenize.TokenError):
-pass
 return indentWord
 def __getIndent(self, line):
 """
 Private method to get the indentation string.
 source = "".join(self.__source)
 sio = StringIO(source)
 self.__multiLineNumbers = set()
 self.__docLineNumbers = set()
 previousTokenType = ''
-try:
+with contextlib.suppress(SyntaxError, tokenize.TokenError):
 for t in tokenize.generate_tokens(sio.readline):
 tokenType = t[0]
 startRow = t[2][0]
 endRow = t[3][0]
 else:
 self.__docLineNumbers |= set(
 range(startRow, 1 + endRow))
 previousTokenType = tokenType
-except (SyntaxError, tokenize.TokenError):
-pass
 return self.__multiLineNumbers, self.__docLineNumbers
 def __fixReindent(self, line, pos, logical):
 """
 @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)
 col = min(pos, len(text) - 1)
-if text[col].strip():
+newText = (
-newText = text
+text
-else:
+if text[col].strip() else
-newText = text[:col].rstrip() + text[col:].lstrip()
+text[:col].rstrip() + text[col:].lstrip()
+)
 # There could be an escaped newline
 if newText.endswith(('=\\\n', '=\\\r\n', '=\\\r')):
 self.__source[line] = newText.rstrip("\n\r \t\\")
 self.__source[line + 1] = self.__source[line + 1].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]
 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:]
 self.__source[line - 1] = self.__source[line - 1].replace("<>", "!=")
 # '<>' replaced by '!='.
 return (1, "FIXW603", [], 0)
-class Reindenter(object):
+class Reindenter:
 """
 Class to reindent badly-indented code to uniformly use four-space
 indentation.
 Released to the public domain, by Tim Peters, 03 October 2000.
 while i < n and line[i] == " ":
 i += 1
 return i
-class IndentationWrapper(object):
+class IndentationWrapper:
 """
 Class used by fixers dealing with indentation.
 Each instance operates on a single logical line.
 """
 )
 hang = rel_indent[row] - rel_indent[open_row]
 if token_type == tokenize.OP and text in ']})':
 pass
-elif visual_indent is True:
+elif visual_indent is True and not indent[depth]:
-if not indent[depth]:
+indent[depth] = start[1]
-indent[depth] = start[1]
 # line altered: comments shouldn't define a visual indent
 if parens[row] and not indent[depth] and token_type not in (
 tokenize.NL, tokenize.COMMENT
 ):
 last_token_multiline = (start[0] != end[0])
 return valid_indents
-class LineShortener(object):
+class LineShortener:
 """
 Class used to shorten lines to a given maximum of characters.
 """
 def __init__(self, curLine, prevLine, nextLine, maxLength=79, eol="\n",
 indentWord="    ", isDocString=False):
 badStartingSymbol = {
 '(': ')',
 '[': ']',
 '{': '}'}.get(lines[0][-1], None)
-if len(lines) > 1:
+if (
-if (badStartingSymbol and
+len(lines) > 1 and
-lines[1].lstrip().startswith(badStartingSymbol)):
+badStartingSymbol and
-rank += 20
+lines[1].lstrip().startswith(badStartingSymbol)
+):
+rank += 20
 if re.match(r".*[+\-\*/] \($", lines[0]):
 # "1 * (\n" is ugly as hell.
 rank += 100

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py