diff -r ea526b78ee6c -r 6ba512d9f46a Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Tue Mar 07 19:46:57 2017 +0100
@@ -588,9 +588,9 @@
# Single line docstring put on one line.
return (1, "FD121", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD131(self, code, line, pos):
"""
@@ -650,9 +650,9 @@
# Blank line before function/method docstring removed.
return (1, "FD141", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD142(self, code, line, pos, apply=False):
"""
@@ -676,9 +676,9 @@
# Blank line inserted before class docstring.
return (1, "FD142", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD143(self, code, line, pos, apply=False):
"""
@@ -702,9 +702,9 @@
# Blank line inserted after class docstring.
return (1, "FD143", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD144(self, code, line, pos, apply=False):
"""
@@ -732,9 +732,9 @@
# Blank line inserted after docstring summary.
return (1, "FD144", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD145(self, code, line, pos, apply=False):
"""
@@ -758,9 +758,9 @@
# Blank line inserted after last paragraph of docstring.
return (1, "FD145", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD221(self, code, line, pos, apply=False):
"""
@@ -802,9 +802,9 @@
msg = "FD222"
return (1, msg, 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD242(self, code, line, pos, apply=False):
"""
@@ -833,9 +833,9 @@
msg = "FD244"
return (1, msg, 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD243(self, code, line, pos, apply=False):
"""
@@ -864,9 +864,9 @@
msg = "FD245"
return (1, msg, 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixD247(self, code, line, pos, apply=False):
"""
@@ -890,9 +890,9 @@
# Blank line after last paragraph removed.
return (1, "FD247", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE101(self, code, line, pos):
"""
@@ -954,9 +954,9 @@
return (1, msg, 0)
return (0, "", 0)
else:
- id = self.__getID()
- self.__stackLogical.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stackLogical.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE122(self, code, line, pos, apply=False):
"""
@@ -989,9 +989,9 @@
return (1, "FE122", 0)
return (0, "", 0)
else:
- id = self.__getID()
- self.__stackLogical.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stackLogical.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE123(self, code, line, pos, apply=False):
"""
@@ -1027,9 +1027,9 @@
return (1, "FE123", 0)
return (0, "", 0)
else:
- id = self.__getID()
- self.__stackLogical.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stackLogical.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE125(self, code, line, pos, apply=False):
"""
@@ -1061,9 +1061,9 @@
return (1, "FE125", 0)
return (0, "", 0)
else:
- id = self.__getID()
- self.__stackLogical.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stackLogical.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE126(self, code, line, pos, apply=False):
"""
@@ -1101,9 +1101,9 @@
return (1, "FE126", 0)
return (0, "", 0)
else:
- id = self.__getID()
- self.__stackLogical.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stackLogical.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE127(self, code, line, pos, apply=False):
"""
@@ -1156,9 +1156,9 @@
return (1, "FE127", 0)
return (0, "", 0)
else:
- id = self.__getID()
- self.__stackLogical.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stackLogical.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE201(self, code, line, pos):
"""
@@ -1355,9 +1355,9 @@
# One blank line inserted.
return (1, "FE301", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE302(self, code, line, pos, apply=False):
"""
@@ -1405,9 +1405,9 @@
else:
return (0, "", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE303(self, code, line, pos, apply=False):
"""
@@ -1435,9 +1435,9 @@
# Superfluous blank lines removed.
return (1, "FE303", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE304(self, code, line, pos, apply=False):
"""
@@ -1466,9 +1466,9 @@
# Superfluous blank lines after function decorator removed.
return (1, "FE304", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE401(self, code, line, pos, apply=False):
"""
@@ -1503,9 +1503,9 @@
# Imports were put on separate lines.
return (1, "FE401", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE501(self, code, line, pos, apply=False):
"""
@@ -1553,9 +1553,9 @@
else:
return (0, "", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE502(self, code, line, pos):
"""
@@ -1602,9 +1602,9 @@
# Compound statement corrected.
return (1, "FE701", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE702(self, code, line, pos, apply=False):
"""
@@ -1638,9 +1638,9 @@
# Compound statement corrected.
return (1, "FE702", 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixE711(self, code, line, pos):
"""
@@ -1720,9 +1720,9 @@
# '{0}' argument added.
return (1, ("FN804", (arg,)), 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixN806(self, code, line, pos, apply=False):
"""
@@ -1781,9 +1781,9 @@
# '{0}' argument removed.
return (1, ("FN806", arg), 0)
else:
- id = self.__getID()
- self.__stack.append((id, code, line, pos))
- return (-1, "", id)
+ fixId = self.__getID()
+ self.__stack.append((fixId, code, line, pos))
+ return (-1, "", fixId)
def __fixW291(self, code, line, pos):
"""
@@ -2671,7 +2671,7 @@
for symbol in '([{':
offset = max(offset, 1 + lines[0].find(symbol))
- maxLength = max([offset + len(x.strip()) for x in lines])
+ maxLength = max(offset + len(x.strip()) for x in lines)
rank += maxLength
rank += len(lines)
