eric: comparison Plugins/CheckerPlugins/Pep8/Pep8Fixer.py

-:6843b7d23279
+:b601ede6dbbf
 "E231", "E241", "E242", "E251", "E261", "E262",
 "E271", "E272", "E273", "E274", "W291", "W292",
 "W293", "E301", "E302", "E303", "E304", "W391",
 "E401", "E501", "E502", "W603", "E701", "E702",
 "E703", "E711", "E712"
 ]
 class Pep8Fixer(QObject):
 """
 Class implementing a fixer for certain PEP 8 issues.
 self.__eol = ""
 self.__indentWord = self.__getIndentWord()
 if not inPlace:
 self.__origName = self.__filename
-self.__filename = os.path.join(os.path.dirname(self.__filename),
+self.__filename = os.path.join(
+os.path.dirname(self.__filename),
 "fixed_" + os.path.basename(self.__filename))
 self.__fixes = {
 "E101": self.__fixE101,
 "E111": self.__fixE101,
 txt = "".join(self.__source)
 try:
 Utilities.writeEncodedFile(self.__filename, txt, encoding)
 except (IOError, Utilities.CodingError, UnicodeError) as err:
-E5MessageBox.critical(self,
+E5MessageBox.critical(
+self,
 self.trUtf8("Fix PEP 8 issues"),
 self.trUtf8(
 """<p>Could not save the file <b>{0}</b>."""
 """ Skipping it.</p><p>Reason: {1}</p>""")
 .format(self.__filename, str(err))
 )
 return False
 return True
 """
 if self.__reindenter is None:
 self.__reindenter = Pep8Reindenter(self.__source)
 self.__reindenter.run()
 fixedLine = self.__reindenter.fixedLine(line - 1)
-if fixedLine is not None:
+if fixedLine is not None and fixedLine != self.__source[line - 1]:
 self.__source[line - 1] = fixedLine
 if code in ["E101", "W191"]:
 msg = self.trUtf8("Tab converted to 4 spaces.")
 else:
 msg = self.trUtf8(
 "Indentation adjusted to be a multiple of four.")
 return (1, msg, 0)
 else:
-return (0, self.trUtf8("Fix for {0} failed.").format(code), 0)
+return (0, "", 0)
 def __fixE121(self, code, line, pos, apply=False):
 """
 Private method to fix the indentation of continuation lines and
 closing brackets (E121,E124).
 """
 if apply:
 logical = self.__getLogical(line, pos)
 if logical:
 # Fix by adjusting initial indent level.
-self.__fixReindent(line, pos, logical)
+changed = self.__fixReindent(line, pos, logical)
-if code == "E121":
+if changed:
-msg = self.trUtf8("Indentation of continuation line corrected.")
+if code == "E121":
-elif code == "E124":
+msg = self.trUtf8(
-msg = self.trUtf8("Indentation of closing bracket corrected.")
+"Indentation of continuation line corrected.")
-return (1, msg, 0)
+elif code == "E124":
+msg = self.trUtf8(
+"Indentation of closing bracket corrected.")
+return (1, msg, 0)
+return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 line = line - 1
 text = self.__source[line]
 indentation = self.__getIndent(text)
 self.__source[line] = indentation + \
 self.__indentWord + text.lstrip()
 return (
 1,
 self.trUtf8(
 "Missing indentation of continuation line corrected."),
 0)
+return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 row = line - 1
 text = self.__source[row]
 newText = self.__getIndent(logicalLines[0]) + text.lstrip()
 if newText == text:
 # fall back to slower method
-self.__fixReindent(line, pos, logical)
+changed = self.__fixReindent(line, pos, logical)
 else:
 self.__source[row] = newText
-return (
+changed = True
-1,
+if changed:
-self.trUtf8("Closing bracket aligned to opening bracket."),
+return (1, self.trUtf8(
-0)
+"Closing bracket aligned to opening bracket."),
+0)
+return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 if not modified:
 row = line - 1
 text = self.__source[row]
 self.__source[row] = self.__getIndent(text) + \
 self.__indentWord + text.lstrip()
 return (1, self.trUtf8("Indentation level changed."), 0)
+return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 text = self.__source[row]
 newText = self.__getIndent(logicalLines[0]) + \
 self.__indentWord + text.lstrip()
 if newText == text:
 # fall back to slower method
-self.__fixReindent(line, pos, logical)
+changed = self.__fixReindent(line, pos, logical)
 else:
 self.__source[row] = newText
-return (
+changed = True
-1,
+if changed:
-self.trUtf8(
+return (1, self.trUtf8(
 "Indentation level of hanging indentation changed."),
 0)
+return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 if startIndex is not None:
 newText = startIndex * ' ' + text.lstrip()
 if newText == text:
 # fall back to slower method
-self.__fixReindent(line, pos, logical)
+changed = self.__fixReindent(line, pos, logical)
 else:
 self.__source[row] = newText
-return (1, self.trUtf8("Visual indentation corrected."), 0)
+changed = True
+if changed:
+return (1, self.trUtf8("Visual indentation corrected."), 0)
+return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 """
 line = line - 1
 text = self.__source[line]
 if '"""' in text or "'''" in text or text.rstrip().endswith('\\'):
-return (
+return (0, "", 0)
-0, self.trUtf8("Extraneous whitespace cannot be removed."), 0)
 newText = self.__fixWhitespace(text, pos, '')
 if newText == text:
 return (0, "", 0)
 """
 line = line - 1
 text = self.__source[line]
 if '"""' in text or "'''" in text or text.rstrip().endswith('\\'):
-return (
+return (0, "", 0)
-0, self.trUtf8("Extraneous whitespace cannot be removed."), 0)
 newText = self.__fixWhitespace(text, pos, ' ')
 if newText == text:
 return (0, "", 0)
 fix (integer)
 """
 line = line - 1
 pos = pos + 1
 self.__source[line] = self.__source[line][:pos] + \
-" " + \
+" " + self.__source[line][pos:]
-self.__source[line][pos:]
 return (1, self.trUtf8("Missing whitespace added."), 0)
 def __fixE251(self, code, line, pos):
 """
 Private method to fix extraneous whitespace around keyword and
 if delta < 0:
 # insert blank lines (one or two)
 while delta < 0:
 self.__source.insert(line, self.__getEol())
 delta += 1
+changed = True
 elif delta > 0:
 # delete superfluous blank lines
 while delta > 0:
 del self.__source[line - 1]
 line -= 1
 delta -= 1
+changed = True
+else:
+changed = False
-if delta < 0:
+if changed:
-msg = self.trUtf8("%n blank line(s) inserted.", "", -delta)
+if delta < 0:
-elif delta > 0:
+msg = self.trUtf8(
-msg = self.trUtf8("%n superfluous lines removed", "", delta)
+"%n blank line(s) inserted.", "", -delta)
-else:
+elif delta > 0:
-msg = ""
+msg = self.trUtf8(
-return (1, msg, 0)
+"%n superfluous lines removed", "", delta)
+else:
+msg = ""
+return (1, msg, 0)
+return (0, "", 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 if self.__source[index].strip() == "":
 del self.__source[index]
 index -= 1
 else:
 break
-return (
+return (1, self.trUtf8(
-1,
+"Superfluous blank lines after function decorator removed."),
-self.trUtf8("Superfluous blank lines after function"
-" decorator removed."),
 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 prevText = ""
 if line < len(self.__source) - 1:
 nextText = self.__source[line + 1]
 else:
 nextText = ""
-shortener = Pep8LineShortener(text, prevText, nextText,
+shortener = Pep8LineShortener(
-maxLength=self.__maxLineLength, eol=self.__getEol(),
+text, prevText, nextText,
-indentWord=self.__indentWord, isDocString=isDocString)
+maxLength=self.__maxLineLength, eol=self.__getEol(),
+indentWord=self.__indentWord, isDocString=isDocString)
 changed, newText, newNextText = shortener.shorten()
 if changed:
 if newText != text:
 self.__source[line] = newText
 if newNextText and newNextText != nextText:
 self.__source[line - 1].rstrip("\n\r \t\\") + self.__getEol()
 return (1, self.trUtf8("Redundant backslash in brackets removed."), 0)
 def __fixE701(self, code, line, pos, apply=False):
 """
-Private method to fix colon-separated compund statements (E701).
+Private method to fix colon-separated compound statements (E701).
 @param code code of the issue (string)
 @param line line number of the issue (integer)
 @param pos position inside line (integer)
 @keyparam apply flag indicating, that the fix should be applied
 first = source[:maxLen]
 second = source[maxLen:]
 else:
 first = source[:blank]
 second = source[blank + 1:]
-return (True,
+return (
+True,
 first + quote + " \\" + self.__eol +
 indent + self.__indentWord + quote + second,
 "")
 else:
 # Cannot break
 indentation = self.__getIndent(newText) + '# '
 maxLength = min(self.__maxLength,
 len(indentation) + 72)
 MIN_CHARACTER_REPEAT = 5
-if (len(newText) - len(newText.rstrip(newText[-1])) >= \
+if len(newText) - len(newText.rstrip(newText[-1])) >= \
-MIN_CHARACTER_REPEAT and
+MIN_CHARACTER_REPEAT and \
-not newText[-1].isalnum()):
+not newText[-1].isalnum():
 # Trim comments that end with things like ---------
 return newText[:maxLength] + self.__eol
 elif isLast and re.match(r"\s*#+\s*\w+", newText):
 import textwrap
 splitLines = textwrap.wrap(newText.lstrip(" \t#"),
 ):
 # Move inline comments to previous line.
 offset = tkn[2][1]
 first = source[:offset]
 second = source[offset:]
-candidates.append(indent + second.strip() + self.__eol +
+candidates.append(
-indent + first.strip() + self.__eol)
+indent + second.strip() + self.__eol +
+indent + first.strip() + self.__eol)
 elif tokenType == tokenize.OP and tokenString != '=':
 # Don't break on '=' after keyword as this violates PEP 8.
 assert tokenType != tokenize.INDENT
 if currentLine.startswith(badStart):
 rank += 100
 for ending in '([{':
 # Avoid lonely opening. They result in longer lines.
-if (currentLine.endswith(ending) and
+if currentLine.endswith(ending) and \
-len(currentLine.strip()) <= \
+len(currentLine.strip()) <= len(self.__indentWord):
-len(self.__indentWord)):
 rank += 100
 if currentLine.endswith('%'):
 rank -= 20

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/Pep8/Pep8Fixer.py

Plugins/CheckerPlugins/Pep8/Pep8Fixer.py