Mercurial Repositories > eric / changeset

--- a/Network/IRC/IrcNetworkManager.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Network/IRC/IrcNetworkManager.py	Tue Mar 07 19:46:57 2017 +0100
@@ -861,12 +861,12 @@
         if name in self.__identities:
             return self.__identities[name]
         elif create:
-            id = IrcIdentity(name)
-            self.__identities[name] = id
+            ircId = IrcIdentity(name)
+            self.__identities[name] = ircId
             
             self.dataChanged.emit()
             
-            return id
+            return ircId
         else:
             return None
     

--- a/PluginManager/PluginInstallDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/PluginManager/PluginInstallDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -291,12 +291,12 @@
                     """writeable. Aborting...</p>""").format(destination), \
                 False
         
-        zip = zipfile.ZipFile(archive, "r")
+        zipFile = zipfile.ZipFile(archive, "r")
         
         # check, if the archive contains a valid plugin
         pluginFound = False
         pluginFileName = ""
-        for name in zip.namelist():
+        for name in zipFile.namelist():
             if self.__pluginManager.isValidPluginName(name):
                 installedPluginName = name[:-3]
                 pluginFound = True
@@ -311,7 +311,7 @@
                 False
         
         # parse the plugin module's plugin header
-        pluginSource = Utilities.decode(zip.read(pluginFileName))[0]
+        pluginSource = Utilities.decode(zipFile.read(pluginFileName))[0]
         packageName = ""
         internalPackages = []
         needsRestart = False
@@ -411,7 +411,7 @@
         self.__installedFiles = []
         try:
             if packageName != "None":
-                namelist = sorted(zip.namelist())
+                namelist = sorted(zipFile.namelist())
                 tot = len(namelist)
                 prog = 0
                 self.progress.setMaximum(tot)
@@ -436,7 +436,7 @@
                             if not os.path.exists(d):
                                 self.__makedirs(d)
                             f = open(outname, "wb")
-                            f.write(zip.read(name))
+                            f.write(zipFile.read(name))
                             f.close()
                             self.__installedFiles.append(outname)
                 self.progress.setValue(tot)
@@ -475,13 +475,13 @@
         
         # now compile the plugins
         if doCompile:
-            dir = os.path.join(destination, packageName)
+            dirName = os.path.join(destination, packageName)
             files = os.path.join(destination, pluginFileName)
             if sys.version_info[0] == 2:
-                dir = dir.encode(sys.getfilesystemencoding())
+                dirName = dirName.encode(sys.getfilesystemencoding())
                 files = files.encode(sys.getfilesystemencoding())
             os.path.join_unicode = False
-            compileall.compile_dir(dir, quiet=True)
+            compileall.compile_dir(dirName, quiet=True)
             compileall.compile_file(files, quiet=True)
             os.path.join_unicode = True
         

--- a/PluginManager/PluginManager.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/PluginManager/PluginManager.py	Tue Mar 07 19:46:57 2017 +0100
@@ -1277,12 +1277,12 @@
                 return
             
             # 3. Check the version of the archive file
-            zip = zipfile.ZipFile(archive, "r")
+            zipFile = zipfile.ZipFile(archive, "r")
             try:
-                aversion = zip.read("VERSION").decode("utf-8")
+                aversion = zipFile.read("VERSION").decode("utf-8")
             except KeyError:
                 aversion = ""
-            zip.close()
+            zipFile.close()
             
             if aversion != version:
                 self.__updateAvailable = True

--- a/PluginManager/PluginRepositoryDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/PluginManager/PluginRepositoryDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -630,12 +630,12 @@
         if not zipfile.is_zipfile(archive):
             return PluginRepositoryWidget.PluginStatusRemoteUpdate
         
-        zip = zipfile.ZipFile(archive, "r")
+        zipFile = zipfile.ZipFile(archive, "r")
         try:
-            aversion = zip.read("VERSION").decode("utf-8")
+            aversion = zipFile.read("VERSION").decode("utf-8")
         except KeyError:
             aversion = ""
-        zip.close()
+        zipFile.close()
         
         if aversion == version:
             if not self.__external:

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Tue Mar 07 19:46:57 2017 +0100
@@ -166,16 +166,16 @@
         taskQueue.put('STOP')
 
 
-def worker(input, output):
+def worker(inputQueue, outputQueue):
     """
     Module function acting as the parallel worker for the style check.
     
-    @param input input queue (multiprocessing.Queue)
-    @param output output queue (multiprocessing.Queue)
+    @param inputQueue input queue (multiprocessing.Queue)
+    @param outputQueue output queue (multiprocessing.Queue)
     """
-    for filename, source, args in iter(input.get, 'STOP'):
+    for filename, source, args in iter(inputQueue.get, 'STOP'):
         result = __checkCodeStyle(filename, source, args)
-        output.put((filename, result))
+        outputQueue.put((filename, result))
 
 
 def __checkCodeStyle(filename, source, args):

--- 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)
 

--- a/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Tue Mar 07 19:46:57 2017 +0100
@@ -810,7 +810,7 @@
         if not nonEmptyLines:
             return
         
-        indent = min([len(l) - len(l.strip()) for l in nonEmptyLines])
+        indent = min(len(l) - len(l.strip()) for l in nonEmptyLines)
         if context.contextType() == "module":
             expectedIndent = 0
         else:
@@ -897,8 +897,8 @@
             return_ = [tokens[i + 1][0] for i, token in enumerate(tokens)
                        if token[1] == "return"]
             if (set(return_) -
-                    set([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE]) !=
-                    set([])):
+                    {tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE} !=
+                    set()):
                 self.__error(docstringContext.end(), 0, "D134")
     
     def __checkNoBlankLineBefore(self, docstringContext, context):
@@ -1062,13 +1062,13 @@
                    if token[1] in ("return", "yield")]
         if "@return" not in docstringContext.ssource():
             if (set(return_) -
-                    set([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE]) !=
-                    set([])):
+                    {tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE} !=
+                    set()):
                 self.__error(docstringContext.end(), 0, "D234")
         else:
             if (set(return_) -
-                    set([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE]) ==
-                    set([])):
+                    {tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE} ==
+                    set()):
                 self.__error(docstringContext.end(), 0, "D235")
     
     def __checkEricFunctionArguments(self, docstringContext, context):
@@ -1141,13 +1141,13 @@
                 "@throws" not in docstringContext.ssource() and \
                 "@raise" not in docstringContext.ssource():
             if (set(exception) -
-                    set([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE]) !=
-                    set([])):
+                    {tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE} !=
+                    set()):
                 self.__error(docstringContext.end(), 0, "D250")
         else:
             if (set(exception) -
-                    set([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE]) ==
-                    set([])):
+                    {tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE} ==
+                    set()):
                 self.__error(docstringContext.end(), 0, "D251")
     
     def __checkEricBlankAfterSummary(self, docstringContext, context):

--- a/Plugins/CheckerPlugins/CodeStyleChecker/MiscellaneousChecker.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/MiscellaneousChecker.py	Tue Mar 07 19:46:57 2017 +0100
@@ -312,10 +312,10 @@
         """
         Private method to check the __future__ imports.
         """
-        expectedImports = set(
-            [i.strip()
-             for i in self.__args.get("FutureChecker", "").split(",")
-             if bool(i.strip())])
+        expectedImports = {
+            i.strip()
+            for i in self.__args.get("FutureChecker", "").split(",")
+            if bool(i.strip())}
         if len(expectedImports) == 0:
             # nothing to check for; disabling the check
             return
@@ -327,7 +327,7 @@
         for node in ast.walk(self.__tree):
             if (isinstance(node, ast.ImportFrom) and
                     node.module == '__future__'):
-                imports |= set(name.name for name in node.names)
+                imports |= {name.name for name in node.names}
             elif isinstance(node, ast.Expr):
                 if not isinstance(node.value, ast.Str):
                     hasCode = True
@@ -416,7 +416,7 @@
                     else:
                         names.add(fieldMatch.group(1))
                 
-                keywords = set(keyword.arg for keyword in call.keywords)
+                keywords = {keyword.arg for keyword in call.keywords}
                 numArgs = len(call.args)
                 if strArgs:
                     numArgs -= 1

--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Tue Mar 07 19:46:57 2017 +0100
@@ -160,18 +160,18 @@
         taskQueue.put('STOP')
 
 
-def worker(input, output):
+def worker(inputQueue, outputQueue):
     """
     Module function acting as the parallel worker for the style check.
     
-    @param input input queue (multiprocessing.Queue)
-    @param output output queue (multiprocessing.Queue)
+    @param inputQueue input queue (multiprocessing.Queue)
+    @param outputQueue output queue (multiprocessing.Queue)
     """
-    for filename, args in iter(input.get, 'STOP'):
+    for filename, args in iter(inputQueue.get, 'STOP'):
         source, checkFlakes, ignoreStarImportWarnings = args
         result = __syntaxAndPyflakesCheck(filename, source, checkFlakes,
                                           ignoreStarImportWarnings)
-        output.put((filename, result))
+        outputQueue.put((filename, result))
 
 
 def __syntaxAndPyflakesCheck(filename, codestring, checkFlakes=True,

--- a/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Tue Mar 07 19:46:57 2017 +0100
@@ -121,17 +121,17 @@
         taskQueue.put('STOP')
 
 
-def worker(input, output):
+def worker(inputQueue, outputQueue):
     """
     Module function acting as the parallel worker for the style check.
     
-    @param input input queue (multiprocessing.Queue)
-    @param output output queue (multiprocessing.Queue)
+    @param inputQueue input queue (multiprocessing.Queue)
+    @param outputQueue output queue (multiprocessing.Queue)
     """
-    for filename, args in iter(input.get, 'STOP'):
+    for filename, args in iter(inputQueue.get, 'STOP'):
         source = args[0]
         result = __jsSyntaxCheck(filename, source)
-        output.put((filename, result))
+        outputQueue.put((filename, result))
 
 
 def __jsSyntaxCheck(file, codestring):

--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py	Tue Mar 07 19:46:57 2017 +0100
@@ -178,16 +178,16 @@
         taskQueue.put('STOP')
 
 
-def worker(input, output):
+def worker(inputQueue, outputQueue):
     """
     Module function acting as the parallel worker for the style check.
     
-    @param input input queue (multiprocessing.Queue)
-    @param output output queue (multiprocessing.Queue)
+    @param inputQueue input queue (multiprocessing.Queue)
+    @param outputQueue output queue (multiprocessing.Queue)
     """
-    for filename, source in iter(input.get, 'STOP'):
+    for filename, source in iter(inputQueue.get, 'STOP'):
         result = __check(filename, source)
-        output.put((filename, result))
+        outputQueue.put((filename, result))
 
 
 def __check(file, text=""):

--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -352,17 +352,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -285,17 +285,17 @@
         """
         Private slot to send the input to the hg process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -292,17 +292,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -336,17 +336,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Tue Mar 07 19:46:57 2017 +0100
@@ -257,13 +257,13 @@
             # input channels
             if channel in inputChannels:
                 if channel == "L":
-                    input, isPassword = inputChannels[channel](data)
+                    inputData, isPassword = inputChannels[channel](data)
                     # echo the input to the output if it was a prompt
                     if not isPassword:
-                        outputChannels["o"](input)
+                        outputChannels["o"](inputData)
                 else:
-                    input = inputChannels[channel](data)
-                self.__writeDataBlock(input)
+                    inputData = inputChannels[channel](data)
+                self.__writeDataBlock(inputData)
             
             # output channels
             elif channel in outputChannels:
@@ -291,15 +291,15 @@
         @return data entered by the user (string)
         """
         from .HgClientPromptDialog import HgClientPromptDialog
-        input = ""
+        inputData = ""
         isPassword = False
         dlg = HgClientPromptDialog(size, message)
         if dlg.exec_() == QDialog.Accepted:
-            input = dlg.getInput() + '\n'
+            inputData = dlg.getInput() + '\n'
             isPassword = dlg.isPassword()
-        return input, isPassword
+        return inputData, isPassword
     
-    def runcommand(self, args, prompt=None, input=None, output=None,
+    def runcommand(self, args, prompt=None, inputData=None, output=None,
                    error=None):
         """
         Public method to execute a command via the command server.
@@ -308,8 +308,8 @@
         @keyparam prompt function to reply to prompts by the server. It
             receives the max number of bytes to return and the contents
             of the output channel received so far.
-        @keyparam input function to reply to bulk data requests by the server.
-            It receives the max number of bytes to return.
+        @keyparam inputData function to reply to bulk data requests by the
+            server. It receives the max number of bytes to return.
         @keyparam output function receiving the data from the server (string).
             If a prompt function is given, this parameter will be ignored.
         @keyparam error function receiving error messages from the server
@@ -349,8 +349,8 @@
                 reply, isPassword = self.__prompt(size, msg)
                 return reply, isPassword
             inputChannels["L"] = myprompt
-        if input is not None:
-            inputChannels["I"] = input
+        if inputData is not None:
+            inputChannels["I"] = inputData
         
         self.__cancel = False
         self.__runcommand(args, inputChannels, outputChannels)

--- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -326,17 +326,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -284,17 +284,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.proc.write(input)
+        self.proc.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -564,11 +564,11 @@
         
         col = self.__revs.index(rev)
         color = self.__revColors.pop(rev)
-        next = self.__revs[:]
+        nextRevs = self.__revs[:]
         
         # add parents to next
-        addparents = [p for p in parents if p not in next]
-        next[col:col + 1] = addparents
+        addparents = [p for p in parents if p not in nextRevs]
+        nextRevs[col:col + 1] = addparents
         
         # set colors for the parents
         for i, p in enumerate(addparents):
@@ -582,15 +582,15 @@
         edges = []
         if parents[0] != -1:
             for ecol, erev in enumerate(self.__revs):
-                if erev in next:
+                if erev in nextRevs:
                     edges.append(
-                        (ecol, next.index(erev), self.__revColors[erev]))
+                        (ecol, nextRevs.index(erev), self.__revColors[erev]))
                 elif erev == rev:
                     for p in parents:
                         edges.append(
-                            (ecol, next.index(p), self.__revColors[p]))
+                            (ecol, nextRevs.index(p), self.__revColors[p]))
         
-        self.__revs = next
+        self.__revs = nextRevs
         return col, color, edges
     
     def __generateIcon(self, column, color, bottomedges, topedges, dotColor,
@@ -1973,17 +1973,17 @@
         """
         Private slot to send the input to the mercurial process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -522,17 +522,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -338,17 +338,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -53,14 +53,14 @@
         if self.__version < (3, 9, 0):
             self.hashLabel.setEnabled(False)
             self.hashComboBox.setEnabled(False)
-            hash = "sha1"
+            hashType = "sha1"
         else:
             if fingerprint and fingerprint.startswith("sha"):
-                hash, fingerprint = fingerprint.split(":", 1)
+                hashType, fingerprint = fingerprint.split(":", 1)
             else:
-                hash = ""
+                hashType = ""
         
-        index = self.hashComboBox.findText(hash)
+        index = self.hashComboBox.findText(hashType)
         self.hashComboBox.setCurrentIndex(index)
         self.hostEdit.setText(host)
         self.fingerprintEdit.setText(fingerprint)
@@ -79,13 +79,13 @@
             bool(self.fingerprintEdit.text())
         )
         if self.__version >= (3, 9, 0):
-            hash = self.hashComboBox.currentText()
-            enabled &= bool(hash)
-            if hash:
+            hashType = self.hashComboBox.currentText()
+            enabled &= bool(hashType)
+            if hashType:
                 enabled &= (
                     len(self.fingerprintEdit.text().replace(":", "")) ==
-                    HgUserConfigHostFingerprintDialog.fingerprintLength[hash]
-                )
+                    HgUserConfigHostFingerprintDialog.fingerprintLength[
+                        hashType])
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled)
     
@@ -123,8 +123,8 @@
             self.fingerprintEdit.setText(txt)
         
         if txt.startswith(tuple(
-            [h + ":" for h in
-             HgUserConfigHostFingerprintDialog.supportedHashes])):
+            h + ":" for h in
+                HgUserConfigHostFingerprintDialog.supportedHashes)):
             parts = txt.split(":", 1)
             if len(parts) == 2:
                 self.fingerprintEdit.setText(parts[1])

--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Tue Mar 07 19:46:57 2017 +0100
@@ -43,20 +43,20 @@
         if self.purgeListDialog is not None:
             self.purgeListDialog.close()
     
-    def __getEntries(self, repodir, all):
+    def __getEntries(self, repodir, deleteAll):
         """
         Private method to get a list of files/directories being purged.
         
         @param repodir directory name of the repository (string)
-        @param all flag indicating to delete all files including ignored ones
-            (boolean)
+        @param deleteAll flag indicating to delete all files including ignored
+            ones (boolean)
         @return name of the current patch (string)
         """
         purgeEntries = []
         
         args = self.vcs.initCommand("purge")
         args.append("--print")
-        if all:
+        if deleteAll:
             args.append("--all")
         
         client = self.vcs.getClient()
@@ -78,13 +78,13 @@
         
         return purgeEntries
     
-    def hgPurge(self, name, all=False):
+    def hgPurge(self, name, deleteAll=False):
         """
         Public method to purge files and directories not tracked by Mercurial.
         
         @param name file/directory name (string)
-        @param all flag indicating to delete all files including ignored ones
-            (boolean)
+        @param deleteAll flag indicating to delete all files including ignored
+            ones (boolean)
         """
         # find the root of the repo
         repodir = self.vcs.splitPath(name)[0]
@@ -93,7 +93,7 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
-        if all:
+        if deleteAll:
             title = self.tr("Purge All Files")
             message = self.tr(
                 """Do really want to delete all files not tracked by"""
@@ -102,13 +102,13 @@
             title = self.tr("Purge Files")
             message = self.tr(
                 """Do really want to delete files not tracked by Mercurial?""")
-        entries = self.__getEntries(repodir, all)
+        entries = self.__getEntries(repodir, deleteAll)
         from UI.DeleteFilesConfirmationDialog import \
             DeleteFilesConfirmationDialog
         dlg = DeleteFilesConfirmationDialog(None, title, message, entries)
         if dlg.exec_() == QDialog.Accepted:
             args = self.vcs.initCommand("purge")
-            if all:
+            if deleteAll:
                 args.append("--all")
             args.append("-v")
             
@@ -117,13 +117,13 @@
             if res:
                 dia.exec_()
     
-    def hgPurgeList(self, name, all=False):
+    def hgPurgeList(self, name, deleteAll=False):
         """
         Public method to list files and directories not tracked by Mercurial.
         
         @param name file/directory name (string)
-        @param all flag indicating to list all files including ignored ones
-            (boolean)
+        @param deleteAll flag indicating to list all files including ignored
+            ones (boolean)
         """
         # find the root of the repo
         repodir = self.vcs.splitPath(name)[0]
@@ -132,7 +132,7 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
-        entries = self.__getEntries(repodir, all)
+        entries = self.__getEntries(repodir, deleteAll)
         from .HgPurgeListDialog import HgPurgeListDialog
         self.purgeListDialog = HgPurgeListDialog(entries)
         self.purgeListDialog.show()

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -408,17 +408,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Tue Mar 07 19:46:57 2017 +0100
@@ -814,8 +814,8 @@
         self.vcs.getExtensionObject("mq")\
             .hgQueueShowHeader(self.project.getProjectPath())
     
-    def __hgQueuePushPopPatches(self, name, operation, all=False, named=False,
-                                force=False):
+    def __hgQueuePushPopPatches(self, name, operation, doAll=False,
+                                named=False, force=False):
         """
         Private method to push patches onto the stack or pop patches off the
         stack.
@@ -823,13 +823,13 @@
         @param name file/directory name (string)
         @param operation operation type to be performed (Queues.POP,
             Queues.PUSH, Queues.GOTO)
-        @keyparam all flag indicating to push/pop all (boolean)
+        @keyparam doAll flag indicating to push/pop all (boolean)
         @keyparam named flag indicating to push/pop until a named patch
             is at the top of the stack (boolean)
         @keyparam force flag indicating a forceful pop (boolean)
         """
         shouldReopen = self.vcs.getExtensionObject("mq")\
-            .hgQueuePushPopPatches(name, operation=operation, all=all,
+            .hgQueuePushPopPatches(name, operation=operation, doAll=doAll,
                                    named=named, force=force)
         if shouldReopen:
             res = E5MessageBox.yesNo(

--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Tue Mar 07 19:46:57 2017 +0100
@@ -185,18 +185,18 @@
         
         return message
     
-    def getGuardsList(self, repodir, all=True):
+    def getGuardsList(self, repodir, allGuards=True):
         """
         Public method to get a list of all guards defined.
         
         @param repodir directory name of the repository (string)
-        @param all flag indicating to get all guards (boolean)
+        @param allGuards flag indicating to get all guards (boolean)
         @return sorted list of guards (list of strings)
         """
         guardsList = []
         
         args = self.vcs.initCommand("qselect")
-        if all:
+        if allGuards:
             args.append("--series")
         
         client = self.vcs.getClient()
@@ -216,7 +216,7 @@
         
         for guard in output.splitlines():
             guard = guard.strip()
-            if all:
+            if allGuards:
                 guard = guard[1:]
             if guard not in guardsList:
                 guardsList.append(guard)
@@ -339,7 +339,7 @@
         QApplication.processEvents()
         self.qheaderDialog.start(name)
     
-    def hgQueuePushPopPatches(self, name, operation, all=False, named=False,
+    def hgQueuePushPopPatches(self, name, operation, doAll=False, named=False,
                               force=False):
         """
         Public method to push patches onto the stack or pop patches off the
@@ -348,7 +348,7 @@
         @param name file/directory name (string)
         @param operation operation type to be performed (Queues.POP,
             Queues.PUSH, Queues.GOTO)
-        @keyparam all flag indicating to push/pop all (boolean)
+        @keyparam doAll flag indicating to push/pop all (boolean)
         @keyparam named flag indicating to push/pop until a named patch
             is at the top of the stack (boolean)
         @keyparam force flag indicating a forceful pop (boolean)
@@ -379,7 +379,7 @@
         args.append("-v")
         if force:
             args.append("--force")
-        if all and operation in (Queues.POP, Queues.PUSH):
+        if doAll and operation in (Queues.POP, Queues.PUSH):
             args.append("--all")
         elif named or operation == Queues.GOTO:
             patchnames = self.__getPatchesList(repodir, listType)
@@ -678,7 +678,7 @@
         
         guardsList = self.getGuardsList(repodir)
         if guardsList:
-            activeGuardsList = self.getGuardsList(repodir, all=False)
+            activeGuardsList = self.getGuardsList(repodir, allGuards=False)
             from .HgQueuesGuardsSelectionDialog import \
                 HgQueuesGuardsSelectionDialog
             dlg = HgQueuesGuardsSelectionDialog(
@@ -734,7 +734,7 @@
             if os.path.splitdrive(repodir)[1] == os.sep:
                 return
         
-        guardsList = self.getGuardsList(repodir, all=False)
+        guardsList = self.getGuardsList(repodir, allGuards=False)
         if guardsList:
             from .HgQueuesGuardsSelectionDialog import \
                 HgQueuesGuardsSelectionDialog

--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -425,18 +425,18 @@
         """
         Private slot to send the input to the mercurial process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         self.errorGroup.show()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Tue Mar 07 19:46:57 2017 +0100
@@ -2518,7 +2518,7 @@
             if dlg.exec_() != QDialog.Accepted:
                 return
             
-            revs, baseRevs, compression, all = dlg.getParameters()
+            revs, baseRevs, compression, bundleAll = dlg.getParameters()
         else:
             revs = bundleData["revs"]
             if bundleData["base"]:
@@ -2526,7 +2526,7 @@
             else:
                 baseRevs = []
             compression = ""
-            all = bundleData["all"]
+            bundleAll = bundleData["all"]
         
         fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
             None,
@@ -2558,7 +2558,7 @@
         self.__lastChangeGroupPath = os.path.dirname(fname)
         
         args = self.initCommand("bundle")
-        if all:
+        if bundleAll:
             args.append("--all")
         for rev in revs:
             args.append("--rev")

--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -224,17 +224,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -239,17 +239,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -225,17 +225,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.proc.write(input)
+        self.proc.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -435,17 +435,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -734,18 +734,18 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         self.errorGroup.show()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -458,17 +458,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -548,17 +548,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Tue Mar 07 19:46:57 2017 +0100
@@ -310,17 +310,17 @@
         """
         Private slot to send the input to the subversion process.
         """
-        input = self.input.text()
-        input += os.linesep
+        inputTxt = self.input.text()
+        inputTxt += os.linesep
         
         if self.passwordCheckBox.isChecked():
             self.errors.insertPlainText(os.linesep)
             self.errors.ensureCursorVisible()
         else:
-            self.errors.insertPlainText(input)
+            self.errors.insertPlainText(inputTxt)
             self.errors.ensureCursorVisible()
         
-        self.process.write(input)
+        self.process.write(inputTxt)
         
         self.passwordCheckBox.setChecked(False)
         self.input.clear()

--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Tue Mar 07 19:46:57 2017 +0100
@@ -393,14 +393,14 @@
             self.changeCaption.emit("")
         self.editorChangedEd.emit(aw)
         
-    def _addView(self, win, fn=None, noName="", next=False):
+    def _addView(self, win, fn=None, noName="", addNext=False):
         """
         Protected method to add a view (i.e. window).
         
         @param win editor assembly to be added
         @param fn filename of this editor (string)
         @param noName name to be used for an unnamed editor (string)
-        @param next flag indicating to add the view next to the current
+        @param addNext flag indicating to add the view next to the current
             view (bool)
         """
         editor = win.getEditor()

--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Tue Mar 07 19:46:57 2017 +0100
@@ -443,19 +443,19 @@
             if fn:
                 self.vm.editorLineChanged.emit(fn, lineno + 1)
         
-    def removeWidget(self, object):
+    def removeWidget(self, widget):
         """
         Public method to remove a widget.
         
-        @param object object to be removed (QWidget)
+        @param widget widget to be removed (QWidget)
         """
-        if isinstance(object, QScintilla.Editor.Editor):
-            object.cursorLineChanged.disconnect(self.__cursorLineChanged)
-            object.captionChanged.disconnect(self.__captionChange)
-            self.editors.remove(object)
-            index = self.indexOf(object.parent())
+        if isinstance(widget, QScintilla.Editor.Editor):
+            widget.cursorLineChanged.disconnect(self.__cursorLineChanged)
+            widget.captionChanged.disconnect(self.__captionChange)
+            self.editors.remove(widget)
+            index = self.indexOf(widget.parent())
         else:
-            index = self.indexOf(object)
+            index = self.indexOf(widget)
         if index > -1:
             self.removeTab(index)
         
@@ -547,16 +547,16 @@
         """
         super(TabWidget, self).setCurrentWidget(assembly)
         
-    def indexOf(self, object):
+    def indexOf(self, widget):
         """
         Public method to get the tab index of the given editor.
         
-        @param object object to get the index for (QLabel or Editor)
+        @param widget widget to get the index for (QLabel or Editor)
         @return tab index of the editor (integer)
         """
-        if isinstance(object, QScintilla.Editor.Editor):
-            object = object.parent()
-        return super(TabWidget, self).indexOf(object)
+        if isinstance(widget, QScintilla.Editor.Editor):
+            widget = widget.parent()
+        return super(TabWidget, self).indexOf(widget)
         
     def hasEditor(self, editor):
         """
@@ -870,14 +870,14 @@
             self.changeCaption.emit("")
         self.editorChangedEd.emit(aw)
         
-    def _addView(self, win, fn=None, noName="", next=False):
+    def _addView(self, win, fn=None, noName="", addNext=False):
         """
         Protected method to add a view (i.e. window).
         
         @param win editor assembly to be added
         @param fn filename of this editor (string)
         @param noName name to be used for an unnamed editor (string)
-        @param next flag indicating to add the view next to the current
+        @param addNext flag indicating to add the view next to the current
             view (bool)
         """
         editor = win.getEditor()
@@ -885,7 +885,7 @@
             if not noName:
                 self.untitledCount += 1
                 noName = self.tr("Untitled {0}").format(self.untitledCount)
-            if next:
+            if addNext:
                 index = self.currentTabWidget.currentIndex() + 1
                 self.currentTabWidget.insertWidget(index, win, noName)
             else:
@@ -900,7 +900,7 @@
                 txt = "...{0}".format(txt[-self.maxFileNameChars:])
             if not QFileInfo(fn).isWritable():
                 txt = self.tr("{0} (ro)").format(txt)
-            if next:
+            if addNext:
                 index = self.currentTabWidget.currentIndex() + 1
                 self.currentTabWidget.insertWidget(index, win, txt)
             else:

--- a/ViewManager/ViewManager.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/ViewManager/ViewManager.py	Tue Mar 07 19:46:57 2017 +0100
@@ -384,14 +384,14 @@
         """
         raise RuntimeError('Not implemented')
         
-    def _addView(self, win, fn=None, noName="", next=False):
+    def _addView(self, win, fn=None, noName="", addNext=False):
         """
         Protected method to add a view (i.e. window).
         
         @param win editor assembly to be added
         @param fn filename of this editor
         @param noName name to be used for an unnamed editor (string)
-        @param next flag indicating to add the view next to the current
+        @param addNext flag indicating to add the view next to the current
             view (bool)
         @exception RuntimeError Not implemented
         """
@@ -509,11 +509,11 @@
         """
         pass
         
-    def eventFilter(self, object, event):
+    def eventFilter(self, qobject, event):
         """
         Public method called to filter an event.
         
-        @param object object, that generated the event (QObject)
+        @param qobject object, that generated the event (QObject)
         @param event the event, that was generated by object (QEvent)
         @return flag indicating if event was filtered out
         """
@@ -4261,13 +4261,13 @@
         #     2: Directory of currently active project
         #     3: CWD
         import QScintilla.Lexers
-        filter = self._getOpenFileFilter()
+        fileFilter = self._getOpenFileFilter()
         progs = E5FileDialog.getOpenFileNamesAndFilter(
             self.ui,
             QCoreApplication.translate('ViewManager', "Open files"),
             self._getOpenStartDir(),
             QScintilla.Lexers.getOpenFileFiltersList(True, True),
-            filter)[0]
+            fileFilter)[0]
         for prog in progs:
             self.openFiles(prog)
     
@@ -4432,7 +4432,7 @@
         self.__setSbFile()
         
     def openSourceFile(self, fn, lineno=-1, filetype="",
-                       selStart=0, selEnd=0, pos=0, next=False):
+                       selStart=0, selEnd=0, pos=0, addNext=False):
         """
         Public slot to display a file in an editor.
         
@@ -4444,11 +4444,12 @@
         @param selStart start of an area to be selected (integer)
         @param selEnd end of an area to be selected (integer)
         @param pos position within the line to place the cursor at (integer)
-        @param next flag indicating to add the file next to the current
+        @param addNext flag indicating to add the file next to the current
             editor (bool)
         """
         try:
-            newWin, editor = self.getEditor(fn, filetype=filetype, next=next)
+            newWin, editor = self.getEditor(fn, filetype=filetype,
+                                            addNext=addNext)
         except (IOError, UnicodeDecodeError):
             return
         
@@ -4733,7 +4734,7 @@
         
         return filenames
         
-    def getEditor(self, fn, filetype="", next=False):
+    def getEditor(self, fn, filetype="", addNext=False):
         """
         Public method to return the editor displaying the given file.
         
@@ -4742,8 +4743,8 @@
         
         @param fn filename to look for
         @param filetype type of the source file (string)
-        @param next flag indicating that if a new editor needs to be created,
-            it should be added next to the current editor (bool)
+        @param addNext flag indicating that if a new editor needs to be
+            created, it should be added next to the current editor (bool)
         @return tuple of two values giving a flag indicating a new window
             creation and a reference to the editor displaying this file
         """
@@ -4767,7 +4768,7 @@
                 newWin = True
         
         if newWin:
-            self._addView(assembly, fn, next=next)
+            self._addView(assembly, fn, addNext=addNext)
         else:
             self._showView(editor.parent(), fn)
         
@@ -6609,18 +6610,17 @@
         """
         self.breakpointToggled.emit(editor)
         
-    def getActions(self, type):
+    def getActions(self, actionSetType):
         """
         Public method to get a list of all actions.
         
-        @param type string denoting the action set to get.
-                It must be one of "edit", "file", "search",
-                "view", "window", "macro", "bookmark" or
-                "spelling".
+        @param actionSetType string denoting the action set to get.
+            It must be one of "edit", "file", "search", "view", "window",
+            "macro", "bookmark" or "spelling".
         @return list of all actions (list of E5Action)
         """
         try:
-            return self.__actions[type][:]
+            return self.__actions[actionSetType][:]
         except KeyError:
             return []
         
@@ -6795,16 +6795,16 @@
                 message
             )
     
-    def receive(self, hash, fileName, command):
+    def receive(self, projectHash, fileName, command):
         """
         Public slot to handle received editor commands.
         
-        @param hash hash of the project (string)
+        @param projectHash hash of the project (string)
         @param fileName project relative file name of the editor (string)
         @param command command string (string)
         """
         project = e5App().getObject("Project")
-        if hash == project.getHash():
+        if projectHash == project.getHash():
             fn = project.getAbsoluteUniversalPath(fileName)
             editor = self.getOpenEditor(fn)
             if editor:

--- a/install.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/install.py	Tue Mar 07 19:46:57 2017 +0100
@@ -1231,12 +1231,12 @@
         if "snapshot" not in sipVersion and "dev" not in sipVersion:
             while sipVersion.count('.') < 2:
                 sipVersion += '.0'
-            (maj, min, pat) = sipVersion.split('.')
-            maj = int(maj)
-            min = int(min)
+            (major, minor, pat) = sipVersion.split('.')
+            major = int(major)
+            minor = int(minor)
             pat = int(pat)
-            if maj < 4 or (maj == 4 and min < 14) or \
-                    (maj == 4 and min == 14 and pat < 2):
+            if major < 4 or (major == 4 and minor < 14) or \
+                    (major == 4 and minor == 14 and pat < 2):
                 print('Sorry, you must have sip 4.14.2 or higher or'
                       ' a recent snapshot release.')
                 exit(3)
@@ -1262,13 +1262,13 @@
     if "snapshot" not in pyqtVersion and "dev" not in pyqtVersion:
         while pyqtVersion.count('.') < 2:
             pyqtVersion += '.0'
-        (maj, min, pat) = pyqtVersion.split('.')
-        maj = int(maj)
-        min = int(min)
+        (major, minor, pat) = pyqtVersion.split('.')
+        major = int(major)
+        minor = int(minor)
         pat = int(pat)
-        if maj < 4 or \
-            (maj == 4 and min < 10) or \
-                (maj == 5 and min < 3):
+        if major < 4 or \
+            (major == 4 and minor < 10) or \
+                (major == 5 and minor < 3):
             print('Sorry, you must have PyQt 4.10.0 or better or')
             print('PyQt 5.3.0 or better or'
                   ' a recent snapshot release.')
@@ -1292,11 +1292,11 @@
     if "snapshot" not in scintillaVersion and "dev" not in scintillaVersion:
         while scintillaVersion.count('.') < 2:
             scintillaVersion += '.0'
-        (maj, min, pat) = scintillaVersion.split('.')
-        maj = int(maj)
-        min = int(min)
+        (major, minor, pat) = scintillaVersion.split('.')
+        major = int(major)
+        minor = int(minor)
         pat = int(pat)
-        if maj < 2 or (maj == 2 and min < 8):
+        if major < 2 or (major == 2 and minor < 8):
             print('Sorry, you must have QScintilla 2.8.0 or higher or'
                   ' a recent snapshot release.')
             exit(5)