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

-:5af61402d74d
+:c5432abceb25
 """
 Module implementing a class to fix certain code style issues.
 """
-from __future__ import unicode_literals
+try:
+# Python 2
+from StringIO import StringIO       # __IGNORE_EXCEPTION__
+except ImportError:
+# Python 3
+from io import StringIO             # __IGNORE_WARNING__
 import os
 import re
+import sys
 import tokenize
-import io
+import pep8
-from PyQt4.QtCore import QObject
+# Tell 'lupdate' which strings to keep for translation.
-from E5Gui import E5MessageBox
+QT_TRANSLATE_NOOP = lambda mod, txt: txt
-from . import pep8
-import Utilities
 FixableCodeStyleIssues = [
 "D111", "D112", "D113", "D121", "D131", "D141",
 "D142", "D143", "D144", "D145",
 "D221", "D222", "D231", "D242", "D243", "D244",
 "N804", "N805", "N806",
 "W191", "W291", "W292", "W293", "W391", "W603",
 ]
-class CodeStyleFixer(QObject):
+class CodeStyleFixer(object):
 """
 Class implementing a fixer for certain code style issues.
 """
-def __init__(self, project, filename, sourceLines, fixCodes, noFixCodes,
+def __init__(self, filename, sourceLines, fixCodes, noFixCodes,
-maxLineLength, inPlace):
+maxLineLength, inPlace, eol):
 """
 Constructor
-@param project  reference to the project object (Project)
 @param filename name of the file to be fixed (string)
 @param sourceLines list of source lines including eol marker
 (list of string)
 @param fixCodes list of codes to be fixed as a comma separated
 string (string)
 @param noFixCodes list of codes not to be fixed as a comma
 separated string (string)
 @param maxLineLength maximum allowed line length (integer)
 @param inPlace flag indicating to modify the file in place (boolean)
+@param eol end of line character(s) (string)
 """
 super(CodeStyleFixer, self).__init__()
-self.__project = project
 self.__filename = filename
 self.__origName = ""
 self.__source = sourceLines[:]  # save a copy
 self.__fixCodes = [c.strip() for c in fixCodes.split(",") if c.strip()]
 self.__noFixCodes = [
 c.strip() for c in noFixCodes.split(",") if c.strip()]
 self.__maxLineLength = maxLineLength
 self.fixed = 0
 self.__reindenter = None
-self.__eol = ""
 self.__indentWord = self.__getIndentWord()
-if not inPlace:
+if inPlace:
+# TODO: Do a backup before any changes
+pass
+else:
 self.__origName = self.__filename
 self.__filename = os.path.join(
 os.path.dirname(self.__filename),
 "fixed_" + os.path.basename(self.__filename))
+self.__eol = eol
 self.__fixes = {
 "D111": self.__fixD111,
 "D112": self.__fixD112,
 "D113": self.__fixD112,
 "D121": self.__fixD121,
 Public method to save the modified file.
 @param encoding encoding of the source file (string)
 @return flag indicating success (boolean)
 """
+import codecs
 if not self.__modified:
 # no need to write
 return True
 txt = "".join(self.__source)
 try:
-Utilities.writeEncodedFile(self.__filename, txt, encoding)
+if sys.version_info[0] == 3:
-except (IOError, Utilities.CodingError, UnicodeError) as err:
+txt = txt.encode(encoding)
-E5MessageBox.critical(
+if encoding == 'utf-8-bom':
-self,
+txt = codecs.BOM_UTF8 + txt
-self.trUtf8("Fix Code Style Issues"),
-self.trUtf8(
+with open(self.__filename, "wb") as fp:
-"""<p>Could not save the file <b>{0}</b>."""
+fp.write(txt)
-""" Skipping it.</p><p>Reason: {1}</p>""")
+except (IOError, UnicodeError):  # as err:
-.format(self.__filename, str(err))
+#            E5MessageBox.critical(
-)
+#                self,
+#                self.trUtf8("Fix Code Style 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
 def __codeMatch(self, code):
 @return ID for a deferred fix (integer)
 """
 self.__lastID += 1
 return self.__lastID
-def __getEol(self):
-"""
-Private method to get the applicable eol string.
-@return eol string (string)
-"""
-if not self.__eol:
-if self.__origName:
-fn = self.__origName
-else:
-fn = self.__filename
-if self.__project.isOpen() and self.__project.isProjectFile(fn):
-self.__eol = self.__project.getEolString()
-else:
-self.__eol = Utilities.linesep()
-return self.__eol
 def __findLogical(self):
 """
 Private method to extract the index of all the starts and ends of
 lines.
 of lines
 """
 logical_start = []
 logical_end = []
 last_newline = True
-sio = io.StringIO("".join(self.__source))
+sio = StringIO("".join(self.__source))
 parens = 0
 for t in tokenize.generate_tokens(sio.readline):
 if t[0] in [tokenize.COMMENT, tokenize.DEDENT,
 tokenize.INDENT, tokenize.NL,
 tokenize.ENDMARKER]:
 """
 Private method to determine the indentation type.
 @return string to be used for an indentation (string)
 """
-sio = io.StringIO("".join(self.__source))
+sio = StringIO("".join(self.__source))
 indentWord = "    "     # default in case of failure
 try:
 for token in tokenize.generate_tokens(sio.readline):
 if token[0] == tokenize.INDENT:
 indentWord = token[1]
 string and a set of line numbers belonging to a multi line
 documentation string (tuple of two set of integer)
 """
 if self.__multiLineNumbers is None:
 source = "".join(self.__source)
-sio = io.StringIO(source)
+sio = StringIO(source)
 self.__multiLineNumbers = set()
 self.__docLineNumbers = set()
 previousTokenType = ''
 try:
 for t in tokenize.generate_tokens(sio.readline):
 left, right = self.__source[line].rsplit("'''", 1)
 self.__source[line] = left + '"""' + right
 break
 line += 1
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer',
-self.trUtf8(
+"Triple single quotes converted to triple double quotes."), 0)
-"Triple single quotes converted to triple double quotes."),
-0)
 def __fixD112(self, code, line, pos):
 """
 Private method to fix docstring 'r' or 'u' in leading quotes.
 return (0, "", 0)
 newText = self.__getIndent(self.__source[line]) + \
 insertChar + self.__source[line].lstrip()
 self.__source[line] = newText
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer',
-self.trUtf8('Introductory quotes corrected to be {0}"""')
+'Introductory quotes corrected to be {0}"""') +
-.format(insertChar),
+'@@{0}'.format(insertChar), 0)
-0)
 def __fixD121(self, code, line, pos, apply=False):
 """
 Private method to fix a single line docstring on multiple lines.
 return (0, "", 0)
 docstring = self.__source[line].rstrip() + \
 self.__source[line + 1].strip()
 if docstring.endswith('"""'):
-docstring += self.__getEol()
+docstring += self.__eol
 else:
 docstring += self.__source[line + 2].lstrip()
 self.__source[line + 2] = ""
 self.__source[line] = docstring
 self.__source[line + 1] = ""
 return (
 1,
-self.trUtf8("Single line docstring put on one line."),
+QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
+"Single line docstring put on one line."),
 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 newText = ""
 if self.__source[line].rstrip().endswith(('"""', "'''")) and \
 self.__source[line].lstrip().startswith(('"""', 'r"""', 'u"""')):
 # it is a one-liner
 newText = self.__source[line].rstrip()[:-3].rstrip() + "." + \
-self.__source[line].rstrip()[-3:] + self.__getEol()
+self.__source[line].rstrip()[-3:] + self.__eol
 else:
 if line < len(self.__source) - 1 and \
 (not self.__source[line + 1].strip() or
 self.__source[line + 1].lstrip().startswith("@") or
 (self.__source[line + 1].strip() in ('"""', "'''") and
 not self.__source[line].lstrip().startswith("@"))):
-newText = self.__source[line].rstrip() + "." + self.__getEol()
+newText = self.__source[line].rstrip() + "." + self.__eol
 if newText:
 self.__source[line] = newText
-return (1, self.trUtf8("Period added to summary line."), 0)
+return (
+1,
+QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
+"Period added to summary line."),
+0)
 else:
 return (0, "", 0)
 def __fixD141(self, code, line, pos, apply=False):
 """
 if apply:
 line = line - 1
 self.__source[line - 1] = ""
 return (
 1,
-self.trUtf8(
+QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
 "Blank line before function/method docstring removed."),
 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
 if apply:
 line = line - 1
-self.__source[line] = self.__getEol() + self.__source[line]
+self.__source[line] = self.__eol + self.__source[line]
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer',
-self.trUtf8("Blank line inserted before class docstring."),
+"Blank line inserted before class docstring."), 0)
-0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
 if apply:
 line = line - 1
-self.__source[line] += self.__getEol()
+self.__source[line] += self.__eol
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer',
-self.trUtf8("Blank line inserted after class docstring."),
+"Blank line inserted after class docstring."), 0)
-0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 line = line - 1
 if not self.__source[line].rstrip().endswith("."):
 # only correct summary lines can be fixed here
 return (0, "", 0)
-self.__source[line] += self.__getEol()
+self.__source[line] += self.__eol
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer',
-self.trUtf8("Blank line inserted after docstring summary."),
+"Blank line inserted after docstring summary."), 0)
-0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
 if apply:
 line = line - 1
-self.__source[line] = self.__getEol() + self.__source[line]
+self.__source[line] = self.__eol + self.__source[line]
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer', "Blank line inserted after last paragraph"
-self.trUtf8("Blank line inserted after last paragraph"
+" of docstring."), 0)
-" of docstring."),
-0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 else:
 first, second = source[:3], source[3:].strip()
 else:
 # trailing
 first, second = source[:-3].strip(), source[-3:]
-newText = indent + first + self.__getEol() + \
+newText = indent + first + self.__eol + \
-indent + second + self.__getEol()
+indent + second + self.__eol
 self.__source[line] = newText
 if code == "D221":
-msg = self.trUtf8("Leading quotes put on separate line.")
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Leading quotes put on separate line.")
 else:
-msg = self.trUtf8("Trailing quotes put on separate line.")
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Trailing quotes put on separate line.")
 return (1, msg, 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 """
 if apply:
 line = line - 1
 self.__source[line - 1] = ""
 if code == "D242":
-msg = self.trUtf8("Blank line before class docstring removed.")
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
+"Blank line before class docstring removed.")
 else:
-msg = self.trUtf8(
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
 "Blank line before function/method docstring removed.")
 return (1, msg, 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 """
 if apply:
 line = line - 1
 self.__source[line + 1] = ""
 if code == "D243":
-msg = self.trUtf8("Blank line after class docstring removed.")
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
+"Blank line after class docstring removed.")
 else:
-msg = self.trUtf8(
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
 "Blank line after function/method docstring removed.")
 return (1, msg, 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 fix (integer)
 """
 if apply:
 line = line - 1
 self.__source[line - 1] = ""
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer', "Blank line after last paragraph removed."),
-self.trUtf8("Blank line after last paragraph removed."),
 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 self.__reindenter.run()
 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"]:
-msg = self.trUtf8("Tab converted to 4 spaces.")
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Tab converted to 4 spaces.")
 else:
-msg = self.trUtf8(
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
 "Indentation adjusted to be a multiple of four.")
 return (1, msg, 0)
 else:
 return (0, "", 0)
 if logical:
 # Fix by adjusting initial indent level.
 changed = self.__fixReindent(line, pos, logical)
 if changed:
 if code == "E121":
-msg = self.trUtf8(
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
 "Indentation of continuation line corrected.")
 elif code == "E124":
-msg = self.trUtf8(
+msg = QT_TRANSLATE_NOOP(
+'CodeStyleFixer',
 "Indentation of closing bracket corrected.")
 return (1, msg, 0)
 return (0, "", 0)
 else:
 id = self.__getID()
 line = line - 1
 text = self.__source[line]
 indentation = self.__getIndent(text)
 self.__source[line] = indentation + \
 self.__indentWord + text.lstrip()
-return (
+return (1, QT_TRANSLATE_NOOP(
-1,
+'CodeStyleFixer', "Missing indentation of continuation"
-self.trUtf8(
+" line corrected."), 0)
-"Missing indentation of continuation line corrected."),
-0)
 return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 changed = self.__fixReindent(line, pos, logical)
 else:
 self.__source[row] = newText
 changed = True
 if changed:
-return (1, self.trUtf8(
+return (1, QT_TRANSLATE_NOOP('CodeStyleFixer',
-"Closing bracket aligned to opening bracket."),
+"Closing bracket aligned to opening bracket."), 0)
-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 (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Indentation level changed."), 0)
 return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 changed = self.__fixReindent(line, pos, logical)
 else:
 self.__source[row] = newText
 changed = True
 if changed:
-return (1, self.trUtf8(
+return (1, QT_TRANSLATE_NOOP(
-"Indentation level of hanging indentation changed."),
+'CodeStyleFixer',
-0)
+"Indentation level of hanging indentation "
+"changed."), 0)
 return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 changed = self.__fixReindent(line, pos, logical)
 else:
 self.__source[row] = newText
 changed = True
 if changed:
-return (1, self.trUtf8("Visual indentation corrected."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Visual indentation corrected."),
+0)
 return (0, "", 0)
 else:
 id = self.__getID()
 self.__stackLogical.append((id, code, line, pos))
 return (-1, "", id)
 newText = self.__fixWhitespace(text, pos, '')
 if newText == text:
 return (0, "", 0)
 self.__source[line] = newText
-return (1, self.trUtf8("Extraneous whitespace removed."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Extraneous whitespace removed."), 0)
 def __fixE221(self, code, line, pos):
 """
 Private method to fix extraneous whitespace around operator or
 keyword.
 if newText == text:
 return (0, "", 0)
 self.__source[line] = newText
 if code in ["E225", "E226", "E227", "E228"]:
-return (1, self.trUtf8("Missing whitespace added."), 0)
+return (1, QT_TRANSLATE_NOOP(
-else:
+'CodeStyleFixer', "Missing whitespace added."), 0)
-return (1, self.trUtf8("Extraneous whitespace removed."), 0)
+else:
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Extraneous whitespace removed."), 0)
 def __fixE231(self, code, line, pos):
 """
 Private method to fix missing whitespace after ',;:'.
 """
 line = line - 1
 pos = pos + 1
 self.__source[line] = self.__source[line][:pos] + \
 " " + self.__source[line][pos:]
-return (1, self.trUtf8("Missing whitespace added."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Missing whitespace added."), 0)
 def __fixE251(self, code, line, pos):
 """
 Private method to fix extraneous whitespace around keyword and
 default parameter equals.
 if newText.endswith(('=\\\n', '=\\\r\n', '=\\\r')):
 self.__source[line] = newText.rstrip("\n\r \t\\")
 self.__source[line + 1] = self.__source[line + 1].lstrip()
 else:
 self.__source[line] = newText
-return (1, self.trUtf8("Extraneous whitespace removed."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Extraneous whitespace removed."), 0)
 def __fixE261(self, code, line, pos):
 """
 Private method to fix whitespace before or after inline comment.
 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
-return (1, self.trUtf8("Whitespace around comment sign corrected."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Whitespace around comment sign corrected."),
+0)
 def __fixE301(self, code, line, pos, apply=False):
 """
 Private method to fix the need for one blank line.
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
 if apply:
-self.__source.insert(line - 1, self.__getEol())
+self.__source.insert(line - 1, self.__eol)
-return (1, self.trUtf8("One blank line inserted."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "One blank line inserted."), 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 line -= 1
 if delta < 0:
 # insert blank lines (one or two)
 while delta < 0:
-self.__source.insert(line, self.__getEol())
+self.__source.insert(line, self.__eol)
 delta += 1
 changed = True
 elif delta > 0:
 # delete superfluous blank lines
 while delta > 0:
 else:
 changed = False
 if changed:
 if delta < 0:
-msg = self.trUtf8(
+msg = QT_TRANSLATE_NOOP(
-"%n blank line(s) inserted.", "", -delta)
+'CodeStyleFixer', "{0} blank line(s) inserted.") + \
+'@@{0}'.format(-delta)
 elif delta > 0:
-msg = self.trUtf8(
+msg = QT_TRANSLATE_NOOP(
-"%n superfluous lines removed", "", delta)
+'CodeStyleFixer',
+"{0} superfluous line(s) removed.") + \
+'@@{0}'.format(delta)
 else:
 msg = ""
 return (1, msg, 0)
 return (0, "", 0)
 else:
 if self.__source[index].strip() == "":
 del self.__source[index]
 index -= 1
 else:
 break
-return (1, self.trUtf8("Superfluous blank lines removed."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Superfluous blank lines removed."), 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 (1, self.trUtf8(
+return (1, QT_TRANSLATE_NOOP('CodeStyleFixer',
-"Superfluous blank lines after function decorator removed."),
+"Superfluous blank lines after function decorator "
-0)
+"removed."), 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 # statement followed by a semicolon and some unrelated
 # statement with commas in it.
 if ';' in text:
 return (0, "", 0)
-newText = text[:pos].rstrip("\t ,") + self.__getEol() + \
+newText = text[:pos].rstrip("\t ,") + self.__eol + \
 self.__getIndent(text) + "import " + text[pos:].lstrip("\t ,")
 self.__source[line] = newText
-return (1, self.trUtf8("Imports were put on separate lines."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Imports were put on separate lines."),
+0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 nextText = self.__source[line + 1]
 else:
 nextText = ""
 shortener = LineShortener(
 text, prevText, nextText,
-maxLength=self.__maxLineLength, eol=self.__getEol(),
+maxLength=self.__maxLineLength, eol=self.__eol,
 indentWord=self.__indentWord, isDocString=isDocString)
 changed, newText, newNextText = shortener.shorten()
 if changed:
 if newText != text:
 self.__source[line] = newText
 if newNextText and newNextText != nextText:
 if newNextText == " ":
 newNextText = ""
 self.__source[line + 1] = newNextText
-return (1, self.trUtf8("Long lines have been shortened."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Long lines have been shortened."),
+0)
 else:
 return (0, "", 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
 self.__source[line - 1] = \
-self.__source[line - 1].rstrip("\n\r \t\\") + self.__getEol()
+self.__source[line - 1].rstrip("\n\r \t\\") + self.__eol
-return (1, self.trUtf8("Redundant backslash in brackets removed."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Redundant backslash in brackets removed."),
+0)
 def __fixE701(self, code, line, pos, apply=False):
 """
 Private method to fix colon-separated compound statements.
 if apply:
 line = line - 1
 text = self.__source[line]
 pos = pos + 1
-newText = text[:pos] + self.__getEol() + self.__getIndent(text) + \
+newText = text[:pos] + self.__eol + self.__getIndent(text) + \
 self.__indentWord + text[pos:].lstrip("\n\r \t\\") + \
-self.__getEol()
+self.__eol
 self.__source[line] = newText
-return (1, self.trUtf8("Compound statement corrected."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Compound statement corrected."), 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 if text.rstrip().endswith("\\"):
 # normalize '1; \\\n2' into '1; 2'
 self.__source[line] = text.rstrip("\n\r \t\\")
 self.__source[line + 1] = self.__source[line + 1].lstrip()
 elif text.rstrip().endswith(";"):
-self.__source[line] = text.rstrip("\n\r \t;") + self.__getEol()
+self.__source[line] = text.rstrip("\n\r \t;") + self.__eol
 else:
-first = text[:pos].rstrip("\n\r \t;") + self.__getEol()
+first = text[:pos].rstrip("\n\r \t;") + self.__eol
 second = text[pos:].lstrip("\n\r \t;")
 self.__source[line] = first + self.__getIndent(text) + second
-return (1, self.trUtf8("Compound statement corrected."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Compound statement corrected."), 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 center = "is not"
 else:
 return (0, "", 0)
 self.__source[line] = " ".join([left, center, right])
-return (1, self.trUtf8("Comparison to None/True/False corrected."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Comparison to None/True/False corrected."),
+0)
 def __fixN804(self, code, line, pos, apply=False):
 """
 Private method to fix a wrong first argument of normal and
 class methods.
 else:
 arg = "self"
 if text.rstrip().endswith("("):
 newText = text + self.__getIndent(text) + \
-self.__indentWord + arg + "," + self.__getEol()
+self.__indentWord + arg + "," + self.__eol
 else:
 index = text.find("(") + 1
 left = text[:index]
 right = text[index:]
 if right.startswith(")"):
 center = arg
 else:
 center = arg + ", "
 newText = left + center + right
 self.__source[line] = newText
-return (1, self.trUtf8("'{0}' argument added.").format(arg), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "'{0}' argument added.") +
+'@@{0}'.format(arg), 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 self.__source[line - 1].rstrip() + right
 self.__source[line] = ""
 else:
 self.__source[line] = indent + right
-return (1, self.trUtf8("'{0}' argument removed.").format(arg), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "'{0}' argument removed.") +
+'@@{0}'.format(arg), 0)
 else:
 id = self.__getID()
 self.__stack.append((id, code, line, pos))
 return (-1, "", id)
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
 self.__source[line - 1] = re.sub(r'[\t ]+(\r?)$', r"\1",
 self.__source[line - 1])
-return (1, self.trUtf8("Whitespace stripped from end of line."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "Whitespace stripped from end of line."), 0)
 def __fixW292(self, code, line, pos):
 """
 Private method to fix a missing newline at the end of file.
 @param pos position inside line (integer)
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
-self.__source[line - 1] += self.__getEol()
+self.__source[line - 1] += self.__eol
-return (1, self.trUtf8("newline added to end of file."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "newline added to end of file."), 0)
 def __fixW391(self, code, line, pos):
 """
 Private method to fix trailing blank lines.
 if self.__source[index].strip() == "":
 del self.__source[index]
 index -= 1
 else:
 break
-return (1, self.trUtf8(
+return (1, QT_TRANSLATE_NOOP(
-"Superfluous trailing blank lines removed from end of file."), 0)
+'CodeStyleFixer',
+"Superfluous trailing blank lines removed from end of file."),
+0)
 def __fixW603(self, code, line, pos):
 """
 Private method to fix the not equal notation.
 @return value indicating an applied/deferred fix (-1, 0, 1),
 a message for the fix (string) and an ID for a deferred
 fix (integer)
 """
 self.__source[line - 1] = self.__source[line - 1].replace("<>", "!=")
-return (1, self.trUtf8("'<>' replaced by '!='."), 0)
+return (1, QT_TRANSLATE_NOOP(
+'CodeStyleFixer', "'<>' replaced by '!='."), 0)
 class Reindenter(object):
 """
 Class to reindent badly-indented code to uniformly use four-space
 (list of strings)
 """
 self.lines = physical_lines
 self.tokens = []
 self.rel_indent = None
-sio = io.StringIO(''.join(physical_lines))
+sio = StringIO(''.join(physical_lines))
 for t in tokenize.generate_tokens(sio.readline):
 if not len(self.tokens) and t[0] in self.SKIP_TOKENS:
 continue
 if t[0] != tokenize.ENDMARKER:
 self.tokens.append(t)
 return True, newText, newNext
 indent = self.__getIndent(self.__text)
 source = self.__text[len(indent):]
 assert source.lstrip() == source
-sio = io.StringIO(source)
+sio = StringIO(source)
 # Check for multi line string.
 try:
 tokens = list(tokenize.generate_tokens(sio.readline))
 except (SyntaxError, tokenize.TokenError):

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py

Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py